Il 12/09/2016 11:08, intrigeri ha scritto:
> Hi,
Hi!
> I've tried to merge this branch, but if I do so our check_po script
> complains a lot: mainly duplicate-header-field-* that probably result
> from mistakes when resolving merge conflicts, plus a couple other
> kinds of small problems. So I could not merge yet.
>
> Can you please fix this?
Yes!
In our last commit you can find all the files repaired..
I'm happy I found out the checker :P
repo
http://git.lattuga.net/transitails/italian
commit: 628902fc02
>
> And while you're at it, please merge from our current master branch,
> that already introduced some new (trivially solvable) merge conflicts.
> Sorry about that!
yep, no problem, only 4 files to merged.
thanks to you!
see you soon
Ignifugo
>> In our branch testing, with last commit ef44601442, you can find our
>> translation based on your branch testing.
> This branch brings the same commits as your master branch, so I expect
> it'll have the aforementioned issues as well => not merging either.
>
> Cheers,
