gnucash unstable: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Tue Jan 16 10:57:26 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/3c1dc14d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c935fdfd (commit)
	 via  https://github.com/Gnucash/gnucash/commit/67baa0a9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2d341df8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/bc82d7b4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b0eb6ed4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a4f1ed92 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/944590ef (commit)
	from  https://github.com/Gnucash/gnucash/commit/8900b19d (commit)



commit 3c1dc14d00a38c809b936bc26f6897b2347c8cd4
Merge: 8900b19 c935fdf
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Jan 16 16:51:33 2018 +0100

    Merge branch 'Translation27DE' of https://github.com/Mechtilde/gnucash into unstable
    
    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.

commit c935fdfd8e70f72d1cf9dc42ecd3ec73a2a289c9
Author: Mechtilde <ooo at mechtilde.de>
Date:   Sun Jan 14 19:58:47 2018 +0100

    add even further translations

commit 67baa0a9a055e38cfbab4e80e1fa39b405f5a2ec
Author: Mechtilde <ooo at mechtilde.de>
Date:   Fri Jan 12 13:31:26 2018 +0100

    add some more translations

commit 2d341df80c4c8c0ba52c9de4ed7d77fd1377aa56
Author: Mechtilde <ooo at mechtilde.de>
Date:   Thu Jan 11 20:53:32 2018 +0100

    add some more translations

commit bc82d7b43d169c35f41a9d4eee6e0e877b838278
Author: Mechtilde <ooo at mechtilde.de>
Date:   Wed Jan 10 13:42:07 2018 +0100

    correct typo

commit b0eb6ed43d1894dd738e07c6256d6547dd44f520
Author: Mechtilde <ooo at mechtilde.de>
Date:   Wed Jan 10 13:39:50 2018 +0100

    first part overworked

commit a4f1ed9270b63c7cdde43effcf2584e031c06406
Author: Mechtilde <ooo at mechtilde.de>
Date:   Wed Jan 10 13:01:43 2018 +0100

    translate new strings from goffice

commit 944590ef24d60ee341e4e421342b0a974bd5ae96
Author: Mechtilde <ooo at mechtilde.de>
Date:   Wed Jan 10 12:15:05 2018 +0100

    renewed de.po to 2.7.3



Summary of changes:
 po/de.po | 847 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 650 insertions(+), 197 deletions(-)



More information about the gnucash-patches mailing list