Resolved conflicts:
gnucash/gnome-search/dialog-search.c
gnucash/gnome-utils/gnc-splash.c
gnucash/import-export/aqb/gnc-plugin-aqbanking.c
gnucash/import-export/import-account-matcher.c
po/de.po
src/report/standard-reports/budget-barchart.scm
src/report/standard-reports/budget.scm
Note the de.po conflict was resolved by dropping all changes
and merging the file again with gnucash.pot (generated after
the merge but before committing).
GLib's scribbling of freed memory is enabled on Arch so attempting to
read the deleted members of inst and book crash instead of reaturning
invalid results. These weren't really useful tests anyway.
Resolved conflicts:
po/de.po
Note: it took several attempts to get this merge right. In the end I used
git mergetool (with kdiff3 as backend), then chose to take the remote end
(C in kdiff3) for all changes (conflicting or not) and then went back to
the goffice strings and changed each resolved conflict in the goffice strings
to the HEAD version (B in kdiff3). This worked because both Mechtilde's po
file and the one in unstable were merged against the same po file and I
was only interested in overriding goffice translations where Mechtilde's
translation differed from the one imported before by script. And even then
I had one more error to fix in line 430 (where msgstring appeared on two
consecutive rows). I'm mainly adding this info a reference in case we
see similar merge conflicts from future translations.
The first attempt to fix this, a17bc85a, doesn't work because the
boost::date_time constructor gets enough information in most cases to
generate a date, just not the one we expect. This change looks for '-' in
the fourth position and if it's there assumes iso-extended format, otherwise
it assumes delimiter-less ISO without the 'T', i.e. %Y%m%d%H%M%S.
* newlines at the end of the pythonpath insertions.
* Get the DBI block out from the middle of the XDG stuff.
* Make the installed XDG_DATA_DIRS relocatable.
* Add GDK_PIXBUF_MODULE_FILE, allows running the Mac bundle without a
launcher script.
pango_font_decription_get_family() returns a pointer into its struct,
which is immediately freed so the ptr points at garbage, which was
strduped.
Instead, do the strdup before freeing font_desc.
Also don't raise an error and do return a default value if run outside
the GUI.
This bugfix affects net-linechart and net-barchart - assumes the min-date for dates must be 0. Net worth charts straddling the date 01-01-1970 were incorrect. I'll fix in time64-ftw as well.
