gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e2e15038 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c85c4529 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dd544de7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/08a43949 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/620832f4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dca16c89 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a61f6140 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5f2eab3b (commit)
	from  https://github.com/Gnucash/gnucash/commit/735ee38b (commit)



commit e2e15038e1def912270c498dc9a32b6700cedc5d
Merge: 735ee38 c85c452
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 14 20:02:29 2014 -0800

    Merge branch 'maint'

diff --cc src/libqof/qof/gnc-numeric.cpp
index 94c0bd3,693fdf9..57fdd22
--- a/src/libqof/qof/gnc-numeric.cpp
+++ b/src/libqof/qof/gnc-numeric.cpp
@@@ -33,21 -29,26 +33,25 @@@ extern "C
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 +#ifdef __cplusplus
 +}
 +#endif
+ #include <stdint.h>
  
  #include "gnc-numeric.h"
 +#include "gnc-rational.hpp"
  
 -/* Note: The qofmath128 functions are used mostly here and almost
 -         nowhere else. Hence, we inline the C code directly into here so
 -         that the compiler can potentially inline the code as-is and speed
 -         up the gnc-numeric.c functions. */
 -#include "qofmath128.c"
 +using GncNumeric = GncRational;
  
 -/* static short module = MOD_ENGINE; */
  static const gint64 pten[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
- 			       10000000, 100000000, 1000000000, 10000000000,
- 			       100000000000, 1000000000000, 10000000000000,
- 			       100000000000000, 10000000000000000,
- 			       100000000000000000, 1000000000000000000};
- static const int POWTEN_OVERFLOW {-5};
+ 			       10000000, 100000000, 1000000000,
+ 			       INT64_C(10000000000), INT64_C(100000000000),
+ 			       INT64_C(1000000000000), INT64_C(10000000000000),
+ 			       INT64_C(100000000000000),
+ 			       INT64_C(10000000000000000),
+ 			       INT64_C(100000000000000000),
+ 			       INT64_C(1000000000000000000)};
+ #define POWTEN_OVERFLOW -5
  
  static inline gint64
  powten (int exp)
diff --cc src/scm/Makefile.am
index ce9dff2,ea07c85..09bd916
--- a/src/scm/Makefile.am
+++ b/src/scm/Makefile.am
@@@ -47,9 -47,10 +47,9 @@@ GUILE_COMPILE_ENV = 
    --guile-load-dir ${top_builddir}/src/gnc-module \
    --guile-load-dir ${top_builddir}/src/scm \
    --library-dir    ${top_builddir}/src/core-utils \
-   --library-dir    ${top_builddir}/src/libqof/qof \
-   --library-dir    ${top_builddir}/src/gnc-module
+   --library-dir    ${top_builddir}/src/gnc-module \
+   --library-dir    ${top_builddir}/src/libqof/qof
  
 -
  %.go : %.scm .scm-links
  	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
  	$(GUILD) compile -o $@ $<

commit c85c4529fd5b132b3f0dc554c58646b8636799c4
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 14 16:38:48 2014 -0800

    Still more Guile library path additions, this time in tests.

diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am
index f80c4f0..d3383c7 100644
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@@ -17,6 +17,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --guile-load-dir ${top_builddir}/src/core-utils \
   --guile-load-dir ${top_builddir}/src/app-utils \
   --guile-load-dir ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/gnome-utils \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am
index 98b12fc..d713f76 100644
--- a/src/report/report-gnome/test/Makefile.am
+++ b/src/report/report-gnome/test/Makefile.am
@@ -38,6 +38,8 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --guile-load-dir ${top_builddir}/src/report/utility-reports \
   --guile-load-dir ${top_builddir}/src/report/report-gnome \
 \
+  --library-dir    ${top_builddir}/src/report/report-gnome \
+  --library-dir    ${top_builddir}/src/report/report-system \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/app-utils \
diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am
index 3e5dd8c..1df692f 100644
--- a/src/report/report-system/test/Makefile.am
+++ b/src/report/report-system/test/Makefile.am
@@ -41,6 +41,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --guile-load-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/report/report-system/test \
 \
+  --library-dir    ${top_builddir}/src/report/report-system \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/app-utils \
diff --git a/src/report/standard-reports/test/Makefile.am b/src/report/standard-reports/test/Makefile.am
index 61c48af..c0bbe49 100644
--- a/src/report/standard-reports/test/Makefile.am
+++ b/src/report/standard-reports/test/Makefile.am
@@ -31,6 +31,8 @@ GNC_TEST_DEPS = \
   --guile-load-dir ${top_builddir}/src/report/standard-reports \
   --guile-load-dir ${top_builddir}/src/report/standard-reports/test \
 \
+  --library-dir    ${top_builddir}/src/report/report-system \
+  --library-dir    ${top_builddir}/src/report/standard-reports \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/app-utils \
diff --git a/src/report/utility-reports/test/Makefile.am b/src/report/utility-reports/test/Makefile.am
index 939305c..e4bfad4 100644
--- a/src/report/utility-reports/test/Makefile.am
+++ b/src/report/utility-reports/test/Makefile.am
@@ -16,6 +16,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --guile-load-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/report/utility-reports \
 \
+  --library-dir    ${top_builddir}/src/report/report-system \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/app-utils \

commit dd544de7ed576fb7120f857a1c4aa78d2a49b85b
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 14 16:37:47 2014 -0800

    Use standard macro INT64_C() to silence gcc-4.2 complaint
    
    About constants being too large for an int.

diff --git a/src/libqof/qof/gnc-numeric.c b/src/libqof/qof/gnc-numeric.c
index 5207ce2..693fdf9 100644
--- a/src/libqof/qof/gnc-numeric.c
+++ b/src/libqof/qof/gnc-numeric.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 
 #include "gnc-numeric.h"
 
@@ -40,10 +41,13 @@
 
 /* static short module = MOD_ENGINE; */
 static const gint64 pten[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
-			       10000000, 100000000, 1000000000, 10000000000,
-			       100000000000, 1000000000000, 10000000000000,
-			       100000000000000, 10000000000000000,
-			       100000000000000000, 1000000000000000000};
+			       10000000, 100000000, 1000000000,
+			       INT64_C(10000000000), INT64_C(100000000000),
+			       INT64_C(1000000000000), INT64_C(10000000000000),
+			       INT64_C(100000000000000),
+			       INT64_C(10000000000000000),
+			       INT64_C(100000000000000000),
+			       INT64_C(1000000000000000000)};
 #define POWTEN_OVERFLOW -5
 
 static inline gint64

commit 08a4394955fdc39524e84db6a89c3ea6fc241d12
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 14 16:36:53 2014 -0800

    Correct inadvertent change to a still-needed function.

diff --git a/src/libqof/qof/gnc-date.c b/src/libqof/qof/gnc-date.c
index e49be5c..a62c750 100644
--- a/src/libqof/qof/gnc-date.c
+++ b/src/libqof/qof/gnc-date.c
@@ -126,7 +126,7 @@ gnc_g_date_time_new_local (gint year, gint month, gint day, gint hour, gint minu
 }
 
 static GDateTime*
-g_date_time_adjust_for_dst (GDateTime *gdt, GTimeZone *tz)
+gnc_g_date_time_adjust_for_dst (GDateTime *gdt, GTimeZone *tz)
 {
     GDateTime *ngdt;
     g_return_val_if_fail (gdt != NULL, NULL);
@@ -142,6 +142,8 @@ gnc_g_date_time_new_from_unix_local (time64 time)
 {
     GTimeZone *tz = gnc_g_time_zone_new_local ();
     GDateTime *gdt = g_date_time_new_from_unix_utc (time);
+    if (gdt)
+	gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
     return gdt;
 }
 
@@ -151,7 +153,7 @@ gnc_g_date_time_new_from_timeval_local (const GTimeVal* tv)
     GTimeZone *tz = gnc_g_time_zone_new_local ();
     GDateTime *gdt = g_date_time_new_from_timeval_utc (tv);
     if (gdt)
-	gdt = g_date_time_adjust_for_dst (gdt, tz);
+	gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
     return gdt;
 }
 
@@ -161,7 +163,7 @@ gnc_g_date_time_new_now_local (void)
     GTimeZone *tz = gnc_g_time_zone_new_local ();
     GDateTime *gdt = g_date_time_new_now_utc ();
     if (gdt)
-	gdt = g_date_time_adjust_for_dst (gdt, tz);
+	gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
     return gdt;
 
 }
@@ -173,7 +175,7 @@ gnc_g_date_time_to_local (GDateTime* gdt)
     if (gdt)
     {
 	tz = gnc_g_time_zone_new_local ();
-	gdt = g_date_time_adjust_for_dst (g_date_time_to_utc (gdt), tz);
+	gdt = gnc_g_date_time_adjust_for_dst (g_date_time_to_utc (gdt), tz);
     }
     return gdt;
 }
@@ -193,7 +195,7 @@ void
 _gnc_date_time_init (_GncDateTime *gncdt)
 {
     gncdt->new_local = gnc_g_date_time_new_local;
-    gncdt->adjust_for_dst = g_date_time_adjust_for_dst;
+    gncdt->adjust_for_dst = gnc_g_date_time_adjust_for_dst;
     gncdt->new_from_unix_local = gnc_g_date_time_new_from_unix_local;
     gncdt->new_from_timeval_local = gnc_g_date_time_new_from_timeval_local;
     gncdt->new_now_local = gnc_g_date_time_new_now_local;

commit 620832f4811e9e30818e23870c88fb213ea48395
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Dec 13 17:15:40 2014 -0800

    Remove Windows specializations from gnc-date.c
    
    Now that we're building with a recent GLib version they're no longer needed.

diff --git a/src/libqof/qof/gnc-date.c b/src/libqof/qof/gnc-date.c
index 33c390f..e49be5c 100644
--- a/src/libqof/qof/gnc-date.c
+++ b/src/libqof/qof/gnc-date.c
@@ -94,123 +94,15 @@ static int dateCompletionBackMonths = 6;
 /* This static indicates the debugging module that this .o belongs to. */
 static QofLogModule log_module = QOF_MOD_ENGINE;
 
-/***********************************************************\
- * GLib's GTimeZone doesn't work with MSWindows, which in turn breaks
- * g_date_time_new_local, g_date_time_new_from_unix_local,
- * g_date_time_new_from_timeval_local, and gnc_g_date_time_to_local. The
- * following functions provide a work-around.
- */
+/* Getting a timezone is expensive, and we do it a lot. Cache the value. */
 static GTimeZone*
 gnc_g_time_zone_new_local (void)
 {
     static GTimeZone* tz = NULL;
     if (tz)
         return tz;
-#ifndef G_OS_WIN32
     tz = g_time_zone_new_local();
     return tz;
-#else
-    {
-        TIME_ZONE_INFORMATION tzinfo;
-        gint64 dst = GetTimeZoneInformation (&tzinfo);
-        gint bias = tzinfo.Bias + tzinfo.StandardBias;
-        gint hours = -bias / 60; // 60 minutes per hour
-        gint minutes = (bias < 0 ? -bias : bias) % 60;
-        gchar *tzstr = g_strdup_printf ("%+03d:%02d", hours, minutes);
-        tz = g_time_zone_new(tzstr);
-        g_free (tzstr);
-    }
-    return tz;
-#endif
-}
-
-#ifdef G_OS_WIN32
-/* Obtain the actual date of a transition in the specified year. The
-   SYSTEMTIME is overloaded for this purpose, so that wMonth contains
-   the month of the transition, wDayOfWeek contains the weekday (0-6,
-   Sunday to Saturday) of the transition, and wDay contains the
-   occurrence of that day in the month: e.g. wMonth = 3, wDayOfWeek =
-   0, and wDay = 5 means the fifth (or the last, if there are only 4
-   that year) Sunday of March. wHour has the time in the previous
-   state that the shift takes place.
-   See TIME_ZONE_INFORMATION at http://msdn.microsoft.com for more detail.
- */
-static void
-dst_systemtime_to_gdate (SYSTEMTIME stime, GDate *gdate, gint year)
-{
-  guint32 wkday, days;
-  /* We must convert between GDate's weekdays, where 0 is a bad day
-     and 7 is Sunday and SYSTEMTIME's, where 0 is a Sunday.
-   */
-  static const int gdate_sunday = 7;
-  static const int week_length = 7;
-
-  g_date_clear (gdate, 1);
-  g_date_set_dmy (gdate, 1, stime.wMonth, year);
-  wkday = g_date_get_weekday (gdate) % gdate_sunday;
-
-  days = week_length * stime.wDay + stime.wDayOfWeek - wkday;
-  while (days > g_date_get_days_in_month (stime.wMonth, year))
-    days -= week_length;
-  g_date_add_days (gdate, days);
-  wkday = g_date_get_weekday (gdate) % gdate_sunday;
-  if (wkday < stime.wDayOfWeek)
-    g_date_add_days (gdate, stime.wDayOfWeek - wkday);
-  else
-    g_date_subtract_days (gdate, wkday - stime.wDayOfWeek);
-  return;
-}
-
-static gboolean
-win32_in_dst (GDateTime *date, TIME_ZONE_INFORMATION *tzinfo)
-{
-    gint year, month, day;
-    GDate std, dlt, gdate;
-
-
-    if (tzinfo == NULL || tzinfo->StandardDate.wMonth == 0)
-      return FALSE;
-    g_date_time_get_ymd (date, &year, &month, &day);
-    g_date_clear (&gdate, 1);
-    g_date_set_dmy (&gdate, day, month, year);
-    dst_systemtime_to_gdate (tzinfo->StandardDate, &std, year);
-    dst_systemtime_to_gdate (tzinfo->DaylightDate, &dlt, year);
-    /* In the southern hemisphere, where DST ends in spring and begins in fall, we look for the date being before std or after dlt; in the northern hemisphere we look for them to be between dlt and std.
-     */
-    if ((g_date_compare (&std, &dlt) < 0 &&
-	 (g_date_compare (&gdate, &std) < 0 ||
-	  g_date_compare (&gdate, &dlt) > 0)) ||
-	 (g_date_compare (&std, &dlt) > 0 &&
-	 g_date_compare (&gdate, &std) < 0 &&
-	 g_date_compare (&gdate, &dlt) > 0) ||
-	(g_date_compare (&gdate, &std) == 0 &&
-	 g_date_time_get_hour (date) < tzinfo->StandardDate.wHour) ||
-	(g_date_compare (&gdate, &dlt) == 0 &&
-	 g_date_time_get_hour (date) >= tzinfo->DaylightDate.wHour))
-      return TRUE;
-    return FALSE;
-}
-#endif
-
-static GTimeZone*
-gnc_g_time_zone_adjust_for_dst (GTimeZone* tz, GDateTime *date)
-{
-#ifdef G_OS_WIN32
-    TIME_ZONE_INFORMATION tzinfo;
-    gint64 dst = GetTimeZoneInformation (&tzinfo);
-    gint bias, hours, minutes;
-    gchar *tzstr;
-    g_return_val_if_fail (date != NULL, NULL);
-    if (dst > 0 && win32_in_dst (date, &tzinfo))
-    {
-	bias = tzinfo.Bias + tzinfo.DaylightBias;
-	hours = -bias / 60; // 60 minutes per hour
-	minutes = (bias < 0 ? -bias : bias) % 60;
-	tzstr = g_strdup_printf ("%+03d:%02d", hours, minutes);
-	tz = g_time_zone_new(tzstr);
-    }
-#endif
-    return tz;
 }
 
 static GDateTime*
@@ -221,7 +113,6 @@ gnc_g_date_time_new_local (gint year, gint month, gint day, gint hour, gint minu
 				      hour, minute, seconds);
     if (!gdt)
 	return gdt;
-    tz = gnc_g_time_zone_adjust_for_dst (tz, gdt);
     g_date_time_unref (gdt);
 /* g_date_time_new truncates nanoseconds to microseconds. Sometimes in
  * converting (particularly when parsing from a string) the
@@ -235,13 +126,12 @@ gnc_g_date_time_new_local (gint year, gint month, gint day, gint hour, gint minu
 }
 
 static GDateTime*
-gnc_g_date_time_adjust_for_dst (GDateTime *gdt, GTimeZone *tz)
+g_date_time_adjust_for_dst (GDateTime *gdt, GTimeZone *tz)
 {
     GDateTime *ngdt;
     g_return_val_if_fail (gdt != NULL, NULL);
     ngdt = g_date_time_to_timezone (gdt, tz);
     g_date_time_unref (gdt);
-    tz = gnc_g_time_zone_adjust_for_dst (tz, ngdt);
     gdt = g_date_time_to_timezone (ngdt, tz);
     g_date_time_unref (ngdt);
     return gdt;
@@ -252,8 +142,6 @@ gnc_g_date_time_new_from_unix_local (time64 time)
 {
     GTimeZone *tz = gnc_g_time_zone_new_local ();
     GDateTime *gdt = g_date_time_new_from_unix_utc (time);
-    if (gdt)
-	gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
     return gdt;
 }
 
@@ -263,7 +151,7 @@ gnc_g_date_time_new_from_timeval_local (const GTimeVal* tv)
     GTimeZone *tz = gnc_g_time_zone_new_local ();
     GDateTime *gdt = g_date_time_new_from_timeval_utc (tv);
     if (gdt)
-	gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
+	gdt = g_date_time_adjust_for_dst (gdt, tz);
     return gdt;
 }
 
@@ -273,7 +161,7 @@ gnc_g_date_time_new_now_local (void)
     GTimeZone *tz = gnc_g_time_zone_new_local ();
     GDateTime *gdt = g_date_time_new_now_utc ();
     if (gdt)
-	gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
+	gdt = g_date_time_adjust_for_dst (gdt, tz);
     return gdt;
 
 }
@@ -285,7 +173,7 @@ gnc_g_date_time_to_local (GDateTime* gdt)
     if (gdt)
     {
 	tz = gnc_g_time_zone_new_local ();
-	gdt = gnc_g_date_time_adjust_for_dst (g_date_time_to_utc (gdt), tz);
+	gdt = g_date_time_adjust_for_dst (g_date_time_to_utc (gdt), tz);
     }
     return gdt;
 }
@@ -305,7 +193,7 @@ void
 _gnc_date_time_init (_GncDateTime *gncdt)
 {
     gncdt->new_local = gnc_g_date_time_new_local;
-    gncdt->adjust_for_dst = gnc_g_date_time_adjust_for_dst;
+    gncdt->adjust_for_dst = g_date_time_adjust_for_dst;
     gncdt->new_from_unix_local = gnc_g_date_time_new_from_unix_local;
     gncdt->new_from_timeval_local = gnc_g_date_time_new_from_timeval_local;
     gncdt->new_now_local = gnc_g_date_time_new_now_local;

commit dca16c893374949fdaaac971e39f0cf6ac08e547
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Dec 12 12:55:05 2014 -0800

    Still more Guile precompilation fixes.
    
    This time for gcc-4.2, used for OSX 10.5-compatible releases.

diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index d29163e..144b8b9 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -114,7 +114,9 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --library-dir    ${top_builddir}/src/core-utils
+  --library-dir    ${top_builddir}/src/core-utils \
+  --library-dir    ${top_builddir}/src/libqof/qof
+
 
 %.go : %.scm .scm-links $(lib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 720e209..150e09a 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -194,7 +194,10 @@ if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/gnc-module
+  --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/core-utils \
+  --library-dir    ${top_builddir}/src/libqof/qof
+
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 3c05ef3..71f0048 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -67,7 +67,9 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --library-dir    ${top_builddir}/src/gnc-module
+  --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/core-utils \
+  --library-dir    ${top_builddir}/src/libqof/qof
 
 %.go : %.scm .scm-links $(lib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index c981699..b46ed7a 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -284,6 +284,7 @@ GUILE_COMPILE_ENV = \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
   --library-dir    ${top_builddir}/src/app-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
   --library-dir    ${top_builddir}/src/gnome-utils
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am
index a0bf4fa..ea07c85 100644
--- a/src/scm/Makefile.am
+++ b/src/scm/Makefile.am
@@ -47,7 +47,9 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/scm \
   --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module
+  --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/libqof/qof
+
 
 %.go : %.scm .scm-links
 	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index d55cd5e..cfa7f6d 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -99,7 +99,9 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --library-dir    ${top_builddir}/src/test-core
+  --library-dir    ${top_builddir}/src/test-core \
+  --library-dir    ${top_builddir}/src/libqof/qof
+
 
 %.go : %.scm .scm-links $(noinst_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \

commit a61f61406f4f5d4d3108303aa22b2adb384c13de
Author: Mike Alexander <mta at umich.edu>
Date:   Mon Dec 8 22:56:58 2014 -0500

    Fix line endings in repository to match recent change to .gitattributes

diff --git a/doc/README-de.win32-bin.txt b/doc/README-de.win32-bin.txt
index 87a125e..6bde138 100644
--- a/doc/README-de.win32-bin.txt
+++ b/doc/README-de.win32-bin.txt
@@ -1,56 +1,56 @@
-GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
-erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
-Solaris, Mac OSX und Microsoft Windows.
-
-Das Programm ist eine Komplettlösung zur Verwaltung der Finanzen von
-Privatanwendern und Kleinbetrieben. Das aus dem Rechnungswesen
-bekannte Prinzip der doppelten Buchführung wird in GnuCash konsequent
-umgesetzt, so dass GnuCash höchste Ansprüche an die Kontenführung
-erfüllen kann. Auch Onlinebanking über HBCI wird unterstützt.
-
--------------------
-
-Verfügbarer Support
-
-Englische FAQ-Seite:  http://wiki.gnucash.org/wiki/FAQ
-Deutsche Mailingliste:  http://lists.gnucash.org/mailman/listinfo/gnucash-de
-IRC (Online-Chat):   Channel #gnucash auf Server irc.gnome.org, auch
-beschrieben auf http://wiki.gnucash.org/wiki/IRC
-
-Sollten Probleme auftreten, bitten die Entwickler darum, diese als
-englischsprachigen Fehlerbericht in »Bugzilla« einzutragen:
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Feature-Ãœbersicht:
-
-    * Doppelte Buchführung
-    * Aktienkonten, Währungskonten
-    * HBCI Online-Banking
-    * QIF/OFX/MT940 Importieren
-    * Berichte, Diagramme
-    * Buchführung für Kleinbetriebe
-    * Verwaltung von Kunden, Lieferanten, Aufträgen, Rechnungen
-    * Terminierte Buchungen
-    * Finanzrechner
-
-Weitere Informationen und eine (bisher nur englischsprachige)
-Einführung sind im Menü »Hilfe« zu finden unter dem Menüpunkt »GnuCash
-Kurs und Konzepte«.
-
--------------------
-
-Ãœber GnuCash:
-
-GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
-erhältlich unter der GNU GPL Lizenz. Das Programm wird von 12
-Programmierern aus mehr als 6 Ländern gemeinsam weiterentwickelt.
-
-Die Anfänge von GnuCash reichen ins Jahr 1997 zurück. Die erste
-Veröffentlichung war im Jahr 1998.
-
--------------------
-
-This is the German GnuCash 2.2.x README file for Windows binary
-packages.
+GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
+erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
+Solaris, Mac OSX und Microsoft Windows.
+
+Das Programm ist eine Komplettlösung zur Verwaltung der Finanzen von
+Privatanwendern und Kleinbetrieben. Das aus dem Rechnungswesen
+bekannte Prinzip der doppelten Buchführung wird in GnuCash konsequent
+umgesetzt, so dass GnuCash höchste Ansprüche an die Kontenführung
+erfüllen kann. Auch Onlinebanking über HBCI wird unterstützt.
+
+-------------------
+
+Verfügbarer Support
+
+Englische FAQ-Seite:  http://wiki.gnucash.org/wiki/FAQ
+Deutsche Mailingliste:  http://lists.gnucash.org/mailman/listinfo/gnucash-de
+IRC (Online-Chat):   Channel #gnucash auf Server irc.gnome.org, auch
+beschrieben auf http://wiki.gnucash.org/wiki/IRC
+
+Sollten Probleme auftreten, bitten die Entwickler darum, diese als
+englischsprachigen Fehlerbericht in »Bugzilla« einzutragen:
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Feature-Ãœbersicht:
+
+    * Doppelte Buchführung
+    * Aktienkonten, Währungskonten
+    * HBCI Online-Banking
+    * QIF/OFX/MT940 Importieren
+    * Berichte, Diagramme
+    * Buchführung für Kleinbetriebe
+    * Verwaltung von Kunden, Lieferanten, Aufträgen, Rechnungen
+    * Terminierte Buchungen
+    * Finanzrechner
+
+Weitere Informationen und eine (bisher nur englischsprachige)
+Einführung sind im Menü »Hilfe« zu finden unter dem Menüpunkt »GnuCash
+Kurs und Konzepte«.
+
+-------------------
+
+Ãœber GnuCash:
+
+GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
+erhältlich unter der GNU GPL Lizenz. Das Programm wird von 12
+Programmierern aus mehr als 6 Ländern gemeinsam weiterentwickelt.
+
+Die Anfänge von GnuCash reichen ins Jahr 1997 zurück. Die erste
+Veröffentlichung war im Jahr 1998.
+
+-------------------
+
+This is the German GnuCash 2.2.x README file for Windows binary
+packages.
diff --git a/doc/README-fr.win32-bin.txt b/doc/README-fr.win32-bin.txt
index d34dae7..29e3b6f 100644
--- a/doc/README-fr.win32-bin.txt
+++ b/doc/README-fr.win32-bin.txt
@@ -1,58 +1,58 @@
-GnuCash est un logiciel de comptabilité gratuit et de source
-libre, émis sous licence GNU Public Licence (GPL) et disponible
-sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
-
-Conçu pour une utilisation aisée, tout en étant puissant et flexible,
-GnuCash permet le suivi des comptes bancaires, des titres, des
-revenus et des dépenses. D'utilisation aussi rapide et intuitive
-qu'un registre de chèques, il est basé sur des principes comptables
-professionnels afin d'assurer des comptes en balance et des rapports
-précis.
-
-------------------- 
-
-Sources disponibles d'assistance :
-
-FAQ en ligne:		http://wiki.gnucash.org/wiki/FAQ
-Listes de diffusions:	http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):		Canal #gnucash sur le serveur irc.gnome.org,
-Aussi à consulter:		http://wiki.gnucash.org/wiki/IRC
-
-N'hésitez pas à rapporter toute erreur ou tout problème rencontré
-sur notre outil de suivi des bogues "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Survol des fonctionnalités::
-
-    * Comptabilité à partie double
-    * Comptes de titres en Actions/Obligations/Fonds d'investissement
-    * Importation de fichiers QIF/OFX
-    * Transactions bancaires en ligne OFX/HBCI
-    * Rapports et graphiques
-    * Comptabilité des petites entreprises
-    * Listes des clients, fournisseurs et prestations
-    * Facturation, Comptes clients et comptes fournisseurs
-    * Transactions récurrentes
-    * Calculs financiers
-
-Vous trouverez des informations additionnelles et un tutoriel sur la
-mise en route (en anglais, pour l'instant) en cliquant sur "Tutoriel
-et guide des concepts" dans le menu d'aide.
-
--------------------
-
-À propos du logiciel:
-
-GnuCash est un logiciel de comptabilité gratuit et de source
-libre, émis sous licence GNU Public Licence (GPL). Il est développé
-en collaboration par 12 personnes provenant d'au moins 6 pays.
-
-La programmation de GnuCash a commencé en 1997, sa première version
-a été lancée en 1998.
-
--------------------
-
-Ceci est le fichier README de GnuCash 2.2.x pour les paquetages en
-binaire pour Windows.
+GnuCash est un logiciel de comptabilité gratuit et de source
+libre, émis sous licence GNU Public Licence (GPL) et disponible
+sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
+
+Conçu pour une utilisation aisée, tout en étant puissant et flexible,
+GnuCash permet le suivi des comptes bancaires, des titres, des
+revenus et des dépenses. D'utilisation aussi rapide et intuitive
+qu'un registre de chèques, il est basé sur des principes comptables
+professionnels afin d'assurer des comptes en balance et des rapports
+précis.
+
+------------------- 
+
+Sources disponibles d'assistance :
+
+FAQ en ligne:		http://wiki.gnucash.org/wiki/FAQ
+Listes de diffusions:	http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):		Canal #gnucash sur le serveur irc.gnome.org,
+Aussi à consulter:		http://wiki.gnucash.org/wiki/IRC
+
+N'hésitez pas à rapporter toute erreur ou tout problème rencontré
+sur notre outil de suivi des bogues "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Survol des fonctionnalités::
+
+    * Comptabilité à partie double
+    * Comptes de titres en Actions/Obligations/Fonds d'investissement
+    * Importation de fichiers QIF/OFX
+    * Transactions bancaires en ligne OFX/HBCI
+    * Rapports et graphiques
+    * Comptabilité des petites entreprises
+    * Listes des clients, fournisseurs et prestations
+    * Facturation, Comptes clients et comptes fournisseurs
+    * Transactions récurrentes
+    * Calculs financiers
+
+Vous trouverez des informations additionnelles et un tutoriel sur la
+mise en route (en anglais, pour l'instant) en cliquant sur "Tutoriel
+et guide des concepts" dans le menu d'aide.
+
+-------------------
+
+À propos du logiciel:
+
+GnuCash est un logiciel de comptabilité gratuit et de source
+libre, émis sous licence GNU Public Licence (GPL). Il est développé
+en collaboration par 12 personnes provenant d'au moins 6 pays.
+
+La programmation de GnuCash a commencé en 1997, sa première version
+a été lancée en 1998.
+
+-------------------
+
+Ceci est le fichier README de GnuCash 2.2.x pour les paquetages en
+binaire pour Windows.
diff --git a/doc/README-it.win32-bin.txt b/doc/README-it.win32-bin.txt
index ae5fe55..96a420c 100644
--- a/doc/README-it.win32-bin.txt
+++ b/doc/README-it.win32-bin.txt
@@ -1,51 +1,51 @@
-GnuCash è un programma di contabilità  libero e a codice aperto rilasciato con
-licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
-Solaris, Mac OSX e Microsoft Windows.
-
-Progettato per essere di facile utilizzo, ma allo stesso tempo potente e flessibile, 
-GnuCash permette di tenere traccia dei propri conti bancari, delle azioni, dei costi e dei ricavi. 
-Veloce e intuitivo come il registro degli assegni, GnuCash si basa su concetti fondamentali della
-contabilità  assicurando il bilancio dei conti e l'accurattezza dei resoconti.
-
--------------------
-
-Disponibilità  di supporto
-
-FAQ online (in inglese):    http://wiki.gnucash.org/wiki/FAQ
-Mailing List:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    canale #gnucash sul server irc.gnome.org; vedere anche http://wiki.gnucash.org/wiki/IRC
-
-Se si riscontrassero dei problemi o dei bug utilizzando il programma, è possibile comunicarli nel sistema
-di tracciamento dei bug di GnuCash denominato "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Caratteristiche principali: 
-
-    * Contabilità a partita doppia
-    * Conti per azioni, obbligazioni(bond) e fondi comuni
-    * Importazione di file QIF/OFX
-    * OFX/HBCI Online Banking
-    * Resoconti e grafici
-    * Contabilità   di piccole imprese
-    * Clienti, venditori, lavori, fatture, conti per debiti e crediti correnti
-    * Transazioni pianificate
-    * Calcolatrice finanziaria
-
-Maggiori informazioni e una guida su come iniziare a utilizzare il programma, sono
-raggiungibili tramite il menu "Aiuto" selezionando la voce "Guida ai concetti e manuale".
-
--------------------
-
-Informazioni sul programma:
-
-GnuCash è un programma di contabilità  libero e a codice aperto rilasciato con
-licenza GNU Public Licence (GPL). E' sviluppato con la collaborazione di
-12 programmatori provenienti da oltre 6 paesi.
-
-La programmazione di GnuCash è iniziata nel 1997 e il primo rilascio risale al 1998. 
-
--------------------
-
-Questo è il file LEGGIMI di GnuCash 2.2.x dei pacchetti binari per Windows.
+GnuCash è un programma di contabilità  libero e a codice aperto rilasciato con
+licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
+Solaris, Mac OSX e Microsoft Windows.
+
+Progettato per essere di facile utilizzo, ma allo stesso tempo potente e flessibile, 
+GnuCash permette di tenere traccia dei propri conti bancari, delle azioni, dei costi e dei ricavi. 
+Veloce e intuitivo come il registro degli assegni, GnuCash si basa su concetti fondamentali della
+contabilità  assicurando il bilancio dei conti e l'accurattezza dei resoconti.
+
+-------------------
+
+Disponibilità  di supporto
+
+FAQ online (in inglese):    http://wiki.gnucash.org/wiki/FAQ
+Mailing List:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    canale #gnucash sul server irc.gnome.org; vedere anche http://wiki.gnucash.org/wiki/IRC
+
+Se si riscontrassero dei problemi o dei bug utilizzando il programma, è possibile comunicarli nel sistema
+di tracciamento dei bug di GnuCash denominato "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Caratteristiche principali: 
+
+    * Contabilità a partita doppia
+    * Conti per azioni, obbligazioni(bond) e fondi comuni
+    * Importazione di file QIF/OFX
+    * OFX/HBCI Online Banking
+    * Resoconti e grafici
+    * Contabilità   di piccole imprese
+    * Clienti, venditori, lavori, fatture, conti per debiti e crediti correnti
+    * Transazioni pianificate
+    * Calcolatrice finanziaria
+
+Maggiori informazioni e una guida su come iniziare a utilizzare il programma, sono
+raggiungibili tramite il menu "Aiuto" selezionando la voce "Guida ai concetti e manuale".
+
+-------------------
+
+Informazioni sul programma:
+
+GnuCash è un programma di contabilità  libero e a codice aperto rilasciato con
+licenza GNU Public Licence (GPL). E' sviluppato con la collaborazione di
+12 programmatori provenienti da oltre 6 paesi.
+
+La programmazione di GnuCash è iniziata nel 1997 e il primo rilascio risale al 1998. 
+
+-------------------
+
+Questo è il file LEGGIMI di GnuCash 2.2.x dei pacchetti binari per Windows.
diff --git a/doc/README-nl.win32-bin.txt b/doc/README-nl.win32-bin.txt
index 2dd7243..500847b 100644
--- a/doc/README-nl.win32-bin.txt
+++ b/doc/README-nl.win32-bin.txt
@@ -1,51 +1,51 @@
-GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
-onder de GNU General Public License (GPL) en is beschikbaar voor
-GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
-
-Het is een eenvoudig te gebruiken, en tegelijkertijd krachtig en flexibel
-programma dat je helpt om je bankrekeningen, aandelen, inkomsten en uitgaven
-te beheren. Zo vlot en intuïtief te gebruiken als een dagboek enerzijds, en
-anderzijds gebaseerd op professionele boekhoudkundige principes om boeken in
-balans en nauwkeurige rapporten te verzekeren.
-
--------------------
-
-Beschikbare bronnen voor ondersteuning
-
-Online veel gestelde vragen (FAQ):    http://wiki.gnucash.org/wiki/FAQ
-Mailing Lijsten:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
-
-Als je programmafouten (bugs) of problemen ervaart, aarzel niet om deze te melden in ons
-bug opvolgsysteem "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Interessante functies: 
-
-    * Dubbele boekhouding
-    * Aandelen-/belegginsrekeningen
-    * QIF/OFX/HBCI import met dubbele transactie herkenning
-    * Rapporten, grafieken
-    * Klein-ondernemingsboekhouding
-    * Klanten, verkopers, opdrachten, Facturen, Lopende rekening
-    * Periodieke Transacties
-    * Financiële berekeningen
-
-Meer informatie en een handleiding om je op weg te helpen vind je
-in het "Hulp" menu onder het "Tutorial en concepten gids".
-
--------------------
-
-Over het programma:
-
-GnuCash is a  vrij, open source boekhoudprogramma uitgegeven onder de
-GNU General Public License (GPL). Het wordt door 12 personen uit meer dan
-6 landen gezamelijk ontwikkeld.
-
-De ontwikkeling van GnuCash begon in 1997, de de eerste uitgave was in 1998. 
-
--------------------
-
-Dit is het Nederlandstalige GnuCash 2.2.x LEESMIJ bestand voor het Windows installatie programma.
+GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
+onder de GNU General Public License (GPL) en is beschikbaar voor
+GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
+
+Het is een eenvoudig te gebruiken, en tegelijkertijd krachtig en flexibel
+programma dat je helpt om je bankrekeningen, aandelen, inkomsten en uitgaven
+te beheren. Zo vlot en intuïtief te gebruiken als een dagboek enerzijds, en
+anderzijds gebaseerd op professionele boekhoudkundige principes om boeken in
+balans en nauwkeurige rapporten te verzekeren.
+
+-------------------
+
+Beschikbare bronnen voor ondersteuning
+
+Online veel gestelde vragen (FAQ):    http://wiki.gnucash.org/wiki/FAQ
+Mailing Lijsten:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
+
+Als je programmafouten (bugs) of problemen ervaart, aarzel niet om deze te melden in ons
+bug opvolgsysteem "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Interessante functies: 
+
+    * Dubbele boekhouding
+    * Aandelen-/belegginsrekeningen
+    * QIF/OFX/HBCI import met dubbele transactie herkenning
+    * Rapporten, grafieken
+    * Klein-ondernemingsboekhouding
+    * Klanten, verkopers, opdrachten, Facturen, Lopende rekening
+    * Periodieke Transacties
+    * Financiële berekeningen
+
+Meer informatie en een handleiding om je op weg te helpen vind je
+in het "Hulp" menu onder het "Tutorial en concepten gids".
+
+-------------------
+
+Over het programma:
+
+GnuCash is a  vrij, open source boekhoudprogramma uitgegeven onder de
+GNU General Public License (GPL). Het wordt door 12 personen uit meer dan
+6 landen gezamelijk ontwikkeld.
+
+De ontwikkeling van GnuCash begon in 1997, de de eerste uitgave was in 1998. 
+
+-------------------
+
+Dit is het Nederlandstalige GnuCash 2.2.x LEESMIJ bestand voor het Windows installatie programma.
diff --git a/doc/README-zh_CN.win32-bin.txt b/doc/README-zh_CN.win32-bin.txt
index c9f8915..01f9ea7 100644
--- a/doc/README-zh_CN.win32-bin.txt
+++ b/doc/README-zh_CN.win32-bin.txt
@@ -1,41 +1,41 @@
-GnuCash æ˜¯ä¸€ä¸ªå…è´¹çš„ã€å¼€æ”¾æºä»£ç çš„ç†è´¢è½¯ä»¶ï¼Œå®ƒä½¿ç”¨ GNU 通用公共许可证(GPL)，可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
-
-致力于易于使用，但功能强大而且灵活。GnuCash å…è®¸æ‚¨è·Ÿè¸ªé“¶è¡Œè´¦æˆ·ã€è‚¡ç¥¨ã€æ”¶å…¥å’Œæ”¯å‡ºã€‚å°±åƒè´¦ç°¿ä¸€æ ·å¿«æ·è€Œä¸”ç›´è§‚ï¼Œå®ƒæ˜¯åŸºäºŽä¸“ä¸šçš„ä¼šè®¡ç†å¿µæ¥ç¡®ä¿å¹³è¡¡çš„è´¦ç°¿å’Œå‡†ç¡®çš„æŠ¥å‘Šã€‚
-
--------------------
-
-您可以获得支持的途径
-
-在线常见问题解答:    http://wiki.gnucash.org/wiki/FAQ
-邮件列表:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道，另见 http://wiki.gnucash.org/wiki/IRC
-
-如果您遇到了任何 bug 或者问题，请不要犹豫，将它们报告到我们的 bug 跟踪工具“Bugzilla”：http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-功能亮点：
-
-    * 复式记账会计
-    * 股票/债券/基金科目
-    * QIF/OFX 导入
-    * OFX/HBCI 网上银行
-    * 报告、图表
-    * 小型企业财会
-    * 客户、厂商、任务、发票、应付账款及应收账款
-    * 计划的交易
-    * 金融计算工具
-
-当点击“教程和理念指南”时，可以在“帮助”菜单中找到更多的信息以及如何开始的教程。
-
--------------------
-
-关于程序：
-
-GnuCash æ˜¯ä¸€ä¸ªå…è´¹çš„ã€å¼€æ”¾æºä»£ç çš„ç†è´¢è½¯ä»¶ï¼Œå®ƒä½¿ç”¨ GNU 通用公共许可证(GPL)。它是由横跨6个国家共12个开发人员共同合作开发而成。
-
-程序撰写开始于1997年，并且于1998年第一次发布。
-
--------------------
-
-这是 GnuCash 2.2.x 用于 Windows 二进制发布包的自述文件。
+GnuCash æ˜¯ä¸€ä¸ªå…è´¹çš„ã€å¼€æ”¾æºä»£ç çš„ç†è´¢è½¯ä»¶ï¼Œå®ƒä½¿ç”¨ GNU 通用公共许可证(GPL)，可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
+
+致力于易于使用，但功能强大而且灵活。GnuCash å…è®¸æ‚¨è·Ÿè¸ªé“¶è¡Œè´¦æˆ·ã€è‚¡ç¥¨ã€æ”¶å…¥å’Œæ”¯å‡ºã€‚å°±åƒè´¦ç°¿ä¸€æ ·å¿«æ·è€Œä¸”ç›´è§‚ï¼Œå®ƒæ˜¯åŸºäºŽä¸“ä¸šçš„ä¼šè®¡ç†å¿µæ¥ç¡®ä¿å¹³è¡¡çš„è´¦ç°¿å’Œå‡†ç¡®çš„æŠ¥å‘Šã€‚
+
+-------------------
+
+您可以获得支持的途径
+
+在线常见问题解答:    http://wiki.gnucash.org/wiki/FAQ
+邮件列表:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道，另见 http://wiki.gnucash.org/wiki/IRC
+
+如果您遇到了任何 bug 或者问题，请不要犹豫，将它们报告到我们的 bug 跟踪工具“Bugzilla”：http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+功能亮点：
+
+    * 复式记账会计
+    * 股票/债券/基金科目
+    * QIF/OFX 导入
+    * OFX/HBCI 网上银行
+    * 报告、图表
+    * 小型企业财会
+    * 客户、厂商、任务、发票、应付账款及应收账款
+    * 计划的交易
+    * 金融计算工具
+
+当点击“教程和理念指南”时，可以在“帮助”菜单中找到更多的信息以及如何开始的教程。
+
+-------------------
+
+关于程序：
+
+GnuCash æ˜¯ä¸€ä¸ªå…è´¹çš„ã€å¼€æ”¾æºä»£ç çš„ç†è´¢è½¯ä»¶ï¼Œå®ƒä½¿ç”¨ GNU 通用公共许可证(GPL)。它是由横跨6个国家共12个开发人员共同合作开发而成。
+
+程序撰写开始于1997年，并且于1998年第一次发布。
+
+-------------------
+
+这是 GnuCash 2.2.x 用于 Windows 二进制发布包的自述文件。
diff --git a/doc/README-zh_TW.win32-bin.txt b/doc/README-zh_TW.win32-bin.txt
index 19f62d4..d0f0397 100644
--- a/doc/README-zh_TW.win32-bin.txt
+++ b/doc/README-zh_TW.win32-bin.txt
@@ -1,42 +1,42 @@
-GnuCash 是一個自由、開放原始碼的帳務軟體，它使用 GNU 通用公共許可證(GPL)，支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
-
-GnuCash ä¸åƒ…è¨­è¨ˆæˆæ˜“æ–¼ä½¿ç”¨ï¼Œè€Œä¸”åŠŸèƒ½å¼·å¤§åˆæœ‰å½ˆæ€§ã€‚å®ƒå¯ä»¥è¿½è¹¤éŠ€è¡Œå¸³æˆ¶ã€è‚¡ç¥¨ã€æ”¶å…¥èˆ‡æ”¯å‡ºï¼Œå°±åƒç”¨å¸³ç°¿ä¸€æ¨£å¿«æ·ã€ç›´è¦ºã€‚åŸºæ–¼å°ˆæ¥­çš„æœƒè¨ˆåŽŸå‰‡ç¢ºä¿å¸³ç›®å¹³è¡¡ä¸¦æä¾›æº–ç¢ºçš„å ±è¡¨ã€‚
-
--------------------
-
-可獲得支援的管道
-
-常見問題解答:   http://wiki.gnucash.org/wiki/FAQ
-通信論壇:       http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (聊天):     irc.gnome.org 伺服器的 #gnucash é »é“ï¼Œè¦‹ http://wiki.gnucash.org/wiki/IRC
-
-如果您遇到了任何 bug æˆ–å•é¡Œï¼Œè«‹ä¸è¦é²ç–‘ï¼Œå°‡å•é¡Œå ±å‘Šåˆ°æˆ‘å€‘çš„ bug 追蹤系統 "Bugzilla": (請用英文)
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-功能特點:
-
-    * 複式簿記
-    * 股票/債券/基金帳號
-    * 匯入 QIF/OFX
-    * OFX/HBCI 網路銀行
-    * å„å¼å ±å‘Šã€åœ–è¡¨
-    * 小企業財務管理
-    * å®¢æˆ¶ã€å» å•†ã€å·¥ä½œã€æ”¶æ“šã€æ‡‰ä»˜å¸³æ¬¾ã€æ‡‰æ”¶å¸³æ¬¾
-    * 交易排程
-    * 金融計算工具
-
-更多資訊及入門教學可以在功能表 "說明" 裡的 "教學與觀念指南" 找到。
-
--------------------
-
-關於程式:
-
-GnuCash 是一個自由、開放原始碼的帳務軟體，它使用 GNU 通用公共許可證(GPL)發布。它是由橫跨 6 國共 12 個開發人員共同合作開發而成。
-
-GnuCash 的程式撰寫始於 1997 年，第一版發布於 1998 年。
-
--------------------
-
-這是 GnuCash 2.2.x 在 Windows 二進位套件的 README 檔案。
+GnuCash 是一個自由、開放原始碼的帳務軟體，它使用 GNU 通用公共許可證(GPL)，支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
+
+GnuCash ä¸åƒ…è¨­è¨ˆæˆæ˜“æ–¼ä½¿ç”¨ï¼Œè€Œä¸”åŠŸèƒ½å¼·å¤§åˆæœ‰å½ˆæ€§ã€‚å®ƒå¯ä»¥è¿½è¹¤éŠ€è¡Œå¸³æˆ¶ã€è‚¡ç¥¨ã€æ”¶å…¥èˆ‡æ”¯å‡ºï¼Œå°±åƒç”¨å¸³ç°¿ä¸€æ¨£å¿«æ·ã€ç›´è¦ºã€‚åŸºæ–¼å°ˆæ¥­çš„æœƒè¨ˆåŽŸå‰‡ç¢ºä¿å¸³ç›®å¹³è¡¡ä¸¦æä¾›æº–ç¢ºçš„å ±è¡¨ã€‚
+
+-------------------
+
+可獲得支援的管道
+
+常見問題解答:   http://wiki.gnucash.org/wiki/FAQ
+通信論壇:       http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (聊天):     irc.gnome.org 伺服器的 #gnucash é »é“ï¼Œè¦‹ http://wiki.gnucash.org/wiki/IRC
+
+如果您遇到了任何 bug æˆ–å•é¡Œï¼Œè«‹ä¸è¦é²ç–‘ï¼Œå°‡å•é¡Œå ±å‘Šåˆ°æˆ‘å€‘çš„ bug 追蹤系統 "Bugzilla": (請用英文)
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+功能特點:
+
+    * 複式簿記
+    * 股票/債券/基金帳號
+    * 匯入 QIF/OFX
+    * OFX/HBCI 網路銀行
+    * å„å¼å ±å‘Šã€åœ–è¡¨
+    * 小企業財務管理
+    * å®¢æˆ¶ã€å» å•†ã€å·¥ä½œã€æ”¶æ“šã€æ‡‰ä»˜å¸³æ¬¾ã€æ‡‰æ”¶å¸³æ¬¾
+    * 交易排程
+    * 金融計算工具
+
+更多資訊及入門教學可以在功能表 "說明" 裡的 "教學與觀念指南" 找到。
+
+-------------------
+
+關於程式:
+
+GnuCash 是一個自由、開放原始碼的帳務軟體，它使用 GNU 通用公共許可證(GPL)發布。它是由橫跨 6 國共 12 個開發人員共同合作開發而成。
+
+GnuCash 的程式撰寫始於 1997 年，第一版發布於 1998 年。
+
+-------------------
+
+這是 GnuCash 2.2.x 在 Windows 二進位套件的 README 檔案。
diff --git a/doc/README.win32-bin.txt b/doc/README.win32-bin.txt
index 69a4b93..5bf8c2b 100644
--- a/doc/README.win32-bin.txt
+++ b/doc/README.win32-bin.txt
@@ -1,52 +1,52 @@
-GnuCash is a free, open source accounting program released under the
-GNU General Public License (GPL) and available for GNU/Linux, *BSD,
-Solaris, Mac OSX, and Microsoft Windows.
-
-Designed to be easy to use, yet powerful and flexible, GnuCash allows
-you to track bank accounts, stocks, income and expenses. As quick and
-intuitive to use as a checkbook register, it is based on professional
-accounting principles to ensure balanced books and accurate reports.
-
--------------------
-
-Available Support Options
-
-Online FAQ:    http://wiki.gnucash.org/wiki/FAQ
-Mailing Lists:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
-
-If you encounter any bugs or problems, do not hesitate to report them
-into our bug tracking tool "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Feature Highlights: 
-
-    * Double-Entry Accounting
-    * Stock/Bond/Mutual Fund Accounts
-    * QIF/OFX Import
-    * OFX/HBCI Online Banking
-    * Reports, Graphs
-    * Small-Business Accounting
-    * Customers, Vendors, Jobs, Invoices, Accounts/Payables and /Receivables
-    * Scheduled Transactions
-    * Financial Calculations
-
-More information and a Tutorial on how to get started can be found in
-the "Help" menu when clicking on "Tutorial and Concepts Guide".
-
--------------------
-
-About the Program:
-
-GnuCash is a free, open source accounting program released under the
-GNU General Public License (GPL). It is collaboratively developed by
-12 people from over 6 countries.
-
-Programming on GnuCash began in 1997, and its first release was in
-1998. 
-
--------------------
-
-This is the GnuCash 2.2.x README file for Windows binary packages.
+GnuCash is a free, open source accounting program released under the
+GNU General Public License (GPL) and available for GNU/Linux, *BSD,
+Solaris, Mac OSX, and Microsoft Windows.
+
+Designed to be easy to use, yet powerful and flexible, GnuCash allows
+you to track bank accounts, stocks, income and expenses. As quick and
+intuitive to use as a checkbook register, it is based on professional
+accounting principles to ensure balanced books and accurate reports.
+
+-------------------
+
+Available Support Options
+
+Online FAQ:    http://wiki.gnucash.org/wiki/FAQ
+Mailing Lists:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
+
+If you encounter any bugs or problems, do not hesitate to report them
+into our bug tracking tool "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Feature Highlights: 
+
+    * Double-Entry Accounting
+    * Stock/Bond/Mutual Fund Accounts
+    * QIF/OFX Import
+    * OFX/HBCI Online Banking
+    * Reports, Graphs
+    * Small-Business Accounting
+    * Customers, Vendors, Jobs, Invoices, Accounts/Payables and /Receivables
+    * Scheduled Transactions
+    * Financial Calculations
+
+More information and a Tutorial on how to get started can be found in
+the "Help" menu when clicking on "Tutorial and Concepts Guide".
+
+-------------------
+
+About the Program:
+
+GnuCash is a free, open source accounting program released under the
+GNU General Public License (GPL). It is collaboratively developed by
+12 people from over 6 countries.
+
+Programming on GnuCash began in 1997, and its first release was in
+1998. 
+
+-------------------
+
+This is the GnuCash 2.2.x README file for Windows binary packages.
diff --git a/doc/examples/downloaded.mt940 b/doc/examples/downloaded.mt940
index 3ddb2e1..64afa9a 100644
--- a/doc/examples/downloaded.mt940
+++ b/doc/examples/downloaded.mt940
@@ -1,9 +1,9 @@
-:20:STARTUMS  
-:25:80007777/2602272001
-:28C:0
-:60F:C060228EUR0,00
-:61:0604280228D12,56N020NONREF//
-:86:020?00ÜBERWEISUNG?100?20TESTING GNUCASH FOR HBCI?21AND MT940
-?3080007777?312602272003?32GNUCASH?34000
-:62F:D060228EUR12,56
--
+:20:STARTUMS  
+:25:80007777/2602272001
+:28C:0
+:60F:C060228EUR0,00
+:61:0604280228D12,56N020NONREF//
+:86:020?00ÜBERWEISUNG?100?20TESTING GNUCASH FOR HBCI?21AND MT940
+?3080007777?312602272003?32GNUCASH?34000
+:62F:D060228EUR12,56
+-

commit 5f2eab3ba85b1011b88ed675aba95c8c27f1b09a
Author: VERDOÏA Laurent <verdoialaurent at gmail.com>
Date:   Mon Dec 8 01:00:10 2014 +0900

    French typo correction
    
    ctte -> cette
    
    Cherry picked from master because I first applied it there by mistake.

diff --git a/po/fr.po b/po/fr.po
index c991122..7fac220 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7010,7 +7010,7 @@ msgid ""
 "of this same transaction and delete the split from that register."
 msgstr ""
 "C'est la répartition qui lie la transaction au registre. Vous ne pouvez pas "
-"la supprimer de ctte fenêtre de registre. Vous pouvez supprimer la "
+"la supprimer de cette fenêtre de registre. Vous pouvez supprimer la "
 "transaction entière depuis cette fenêtre ou vous pouvez allez dans un "
 "registre qui montre une autre vue de cette transaction et supprimer la "
 "répartition depuis ce registre."



Summary of changes:
 src/libqof/qof/gnc-date.cpp                  | 111 +--------------------------
 src/libqof/qof/gnc-numeric.cpp               |  14 ++--
 src/report/report-gnome/test/Makefile.am     |   2 +
 src/report/standard-reports/test/Makefile.am |   1 +
 src/scm/Makefile.am                          |   4 +-
 5 files changed, 15 insertions(+), 117 deletions(-)