gnucash unstable: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/7fc29156 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9ba7ed5f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4533f779 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e1807c99 (commit)
	from  https://github.com/Gnucash/gnucash/commit/ad1267da (commit)



commit 7fc29156873bde11a64ef7d357a48342d529fdeb
Merge: 9ba7ed5 e1807c9
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jan 25 21:50:34 2018 +0100

    Merge es.po from Translation Project into unstable
    
    Rsovled conflicts:
    	po/es.po
    
    - all conflicts related to goffice strings were resolved in favor or the goffice translation
    - all other conflicts were resolved in favor of the TP po file

commit 9ba7ed5f61f6fb60b4a511f640d30f6f406ea21c
Merge: ad1267d 4533f77
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jan 25 21:28:11 2018 +0100

    Merge branch maint into unstable

commit 4533f77904ce54f0438e48fe41510eda6d7261b6
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jan 25 21:15:21 2018 +0100

    Import new Spanish translation from the Translation Project

commit e1807c99e2958dbf6e584d67e919137555c371d4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jan 25 21:14:13 2018 +0100

    Import new Spanish translation from the Translation Project



Summary of changes:
 po/es.po | 9365 +++++++++++++++++++++-----------------------------------------
 1 file changed, 3128 insertions(+), 6237 deletions(-)