gnucash unstable: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Wed Jan 17 12:08:16 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/2364c560 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6f181196 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e4d1c7de (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a88ed868 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/902acf7c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/90b79c56 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2b388d54 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/48698e13 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/762c3b8f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4f3879df (commit)
	 via  https://github.com/Gnucash/gnucash/commit/34200a7e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/766e7409 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/74119fbb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/71c0a538 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4fe2eb2e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3f82940e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7ec552d8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/acc899da (commit)
	from  https://github.com/Gnucash/gnucash/commit/26fa2acf (commit)



commit 2364c5607f31a0680df806e5adef00bcd551923d
Merge: 26fa2ac 6f18119
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Jan 17 17:37:33 2018 +0100

    Merge branch 'maint' into unstable
    
    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).

commit 6f181196d576cfc8601398864a3b8f8c3c8b01cb
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Jan 17 15:40:03 2018 +0100

    Fix our appstream id as per the appstream recommendation
    
    https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html

commit e4d1c7def5c448e33dcb30c4d16d2a50a1785607
Merge: a88ed86 48698e1
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Tue Jan 16 23:45:15 2018 +0100

    Merge remote-tracking branch 'Mechtilde/SKR03typo' into maint

commit a88ed868ee76ea248a0fe67314c5583591d82707
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Tue Jan 16 23:35:03 2018 +0100

    update gitignore to the suggestion to have the build dir[s] hidden

commit 902acf7c8568b026ad8033226219e1ecd69dce95
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Tue Jan 16 23:06:05 2018 +0100

    A few fixes of german translation

commit 90b79c56e3eb6ae451800fe9b7bd2d56fa724257
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Tue Jan 16 23:01:18 2018 +0100

    Review my comments on I18N issues

commit 2b388d5468ba2bff39c5e2da989cda1eafac6b38
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Sun Jan 7 09:43:09 2018 +0100

    de.po: msgmerge Improve Translator comments...

commit 48698e1332db293bde213b7ea142925ccfecfbaa
Author: Mechtilde <ooo at mechtilde.de>
Date:   Tue Jan 16 12:42:21 2018 +0100

    correct typo

commit 762c3b8f56939201bb72c55125d292cc645809d8
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Sun Jan 7 08:10:34 2018 +0100

    Improve translator comments, remove an unneeded MsgId
    
    Mostly avoid some unwanted comments, fix typos ...

commit 4f3879df86200abb78b552483052914d240690c2
Merge: 34200a7 766e740
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 9 10:04:50 2018 -0800

    Merge branch 'maint-bugfix-report-collectors' of https://github.com/christopherlam/gnucash into maint

commit 34200a7e8dce7985162dcba126b9d4ff4c59362d
Author: DiMan <DiMan at users.noreply.github.com>
Date:   Sat Jan 6 01:40:28 2018 +0100

    some text changes

commit 766e74096ff6ca61680bee1e7f9d54fb487a91e3
Author: christopherlam <christopher.lck at gmail.com>
Date:   Thu Dec 28 19:21:28 2017 +1100

    bugfix incorrect min-date handling
    
    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.

commit 74119fbb6acdd790efd5d7c5ebfc0f1d8ad8f99c
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Wed Jan 3 11:16:19 2018 +0100

    remove absolute pathes from previous commit

commit 71c0a538e2d60aa4c7892b19d2f6ed422e519773
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Wed Jan 3 07:44:01 2018 +0100

    Msgmerge after source change and fix another typo in de.po

commit 4fe2eb2e49c6223f20ce8b84293e7b8c45e93d55
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Wed Jan 3 07:16:40 2018 +0100

    Mark "_New Account" button label in import-account-matcher translatable
    
    Because the MsgId already exists, it does not break string freeze.
    Thanks to Mechtilde for heads up.

commit 3f82940e325b724206f4e45b40e76abb6836161f
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Wed Jan 3 03:41:15 2018 +0100

    msgmerge and header update for de.po
    
    4682 translated messages, 3 untranslated messages.
    2 missing keyboard accelerator marks.

commit 7ec552d8087c53d348c742da6a8d65fe387a2d5a
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Wed Jan 3 02:04:23 2018 +0100

    Another typo in the german CSV importer texts.

commit acc899daab32b58b3f83c2fe297083428d0cca4b
Author: Mechtilde <ooo at mechtilde.de>
Date:   Sun Dec 31 19:37:54 2017 +0100

    correct typo



Summary of changes:
 .gitignore                                         |   2 +-
 data/accounts/de_DE/acctchrt_skr03.gnucash-xea     |   2 +-
 doc/tip_of_the_day.list.in                         |  22 +++--
 gnucash/gnome-search/dialog-search.c               |   4 +-
 gnucash/gnome-utils/gnc-period-select.c            |   8 +-
 .../gtkbuilder/dialog-preferences.glade            |   2 +-
 gnucash/gnome/dialog-print-check.c                 |  11 ++-
 gnucash/gnome/gnucash.appdata.xml.in               |   2 +-
 gnucash/html/gnc-html-webkit1.c                    |   2 +-
 gnucash/import-export/aqb/dialog-ab-trans.c        |   2 +-
 gnucash/import-export/aqb/gnc-plugin-aqbanking.c   |  14 ++-
 gnucash/import-export/import-account-matcher.c     |   2 +-
 gnucash/import-export/import-main-matcher.c        |  18 +++-
 gnucash/import-export/ofx/gnc-ofx-import.c         |   1 +
 .../register/ledger-core/split-register-model.c    |   1 +
 gnucash/report/business-reports/balsheet-eg.scm    |   7 +-
 .../report/business-reports/customer-summary.scm   |  18 +++-
 gnucash/report/business-reports/fancy-invoice.scm  |   8 +-
 gnucash/report/business-reports/owner-report.scm   |  12 ++-
 gnucash/report/report-system/report-collectors.scm |   2 +-
 gnucash/report/report-system/report.scm            |   4 +-
 .../report/standard-reports/budget-barchart.scm    |   3 +-
 gnucash/report/standard-reports/budget-flow.scm    |   3 +-
 gnucash/report/standard-reports/budget.scm         |   3 +-
 gnucash/report/standard-reports/price-scatter.scm  |   4 +-
 libgnucash/engine/Recurrence.c                     |   4 +-
 po/de.po                                           | 102 +++++++++++----------
 27 files changed, 162 insertions(+), 101 deletions(-)



More information about the gnucash-patches mailing list