xin: > anonym:
>> I am not sure I'll get it right if I try to resolve it myself so,
>> xin, could you give it try? If you don't see this in time for when
>> I start preparing Tails 3.12 (latest 2019-01-28 noon) I'll
>> try myself. > I have fix the conflict, it was caused by the .po update which happened
> two days ago.
And where is the fix? (I'll let anonym deal with this then.)
