[GNC-dev] commit 67b508babecd12b8f16eda5abf8d5d5b16402c21

[John Ralls]

> On Dec 29, 2019, at 9:31 AM, Christian Stimming <christian at cstimming.de> wrote:
> 
> Am Samstag, 28. Dezember 2019, 01:49:09 CET schrieb John Ralls:
>>> commit 67b508babecd12b8f16eda5abf8d5d5b16402c21
>>> Author: Christian Stimming <christian at cstimming.de>
>>> Date:   Thu Dec 26 17:46:15 2019 +0100
>>> 
>>>   Improve translations by scriptedly removing the removed colon suffix.
>>> 
>>>   The trailing colons have been removed in the source e.g.
>>>   here 6897f13e ff, but this created a lot of fuzzy translations.
>>>   With the po/remove-suffix.sh script, those changes are
>>>   adapted in all po files in order to make translators' life
>>>   easier.
>>> (...)
>>> 56 files changed, 1009363 insertions(+), 905064 deletions(-)
>> 
>> Christian,
>> 
>> Unfortunately you neglected to pull in the latest translations from the
>> translation project before undertaking this. There are two translations
>> there, uk.po and zh_CN.po. 
> 
> Dear John,
> 
> I'm sorry. When I edited all those other languages as well, I was well aware 
> that my changes might get overwritten by other contributions from translation 
> project or yet other channels. My rationale was rather this: I had to do the 
> work for my own language (de.po) anyway. It was only little additional work to 
> extend it to all available languages, which would then benefit from my work. 
> If it's not all 50 languages which benefit but "only" 48, very well, we still 
> have enough benefit for all of us.
> 
>> I tried reverting these commits, installing the
>> new translations, and reapplying these commits but that introduced too many
>> conflicts that to be resolved by hand so I resorted to just installing the
>> new translations on top of these commits instead. 
> 
> I'm sorry to hear about the extra work. Turned out that the trick here is to 
> run msgmerge first on both before merging (so that the TP version and our git 
> version originate from the same gnucash.pot template), and then merging went 
> surprisingly smooth.
> 
>> Since your changes were
>> scripted perhaps you can re-run the scripts on those two translations
>> before the release on Sunday.
> 
> I was kept AFK until Sunday morning Berlin time and contributed the merge 
> then, but seems like I missed your tagging time somewhat earlier. 
> 
> Anyway, I don't think it's a large problem. The commit still contributed an 
> improvement to many other languages, which is just fine.

Christian,

Thanks. I've retagged the release and re-spun the tarballs so that the TP will have the changes on all of the files. Without that we run the risk that the problem will repeat next time and I'll have forgotten about it. That would lose the changes forever.

Besides, it turned out that there was a problem in the tarballs: https://bugs.gnucash.org/show_bug.cgi?id=797536.

Regards,
John Ralls