Il 04/07/2013 08:09, Aurimas Fišeras ha scritto:
2013.07.03 23:07, Cristian Marchi rašė:
Il 03/07/2013 21:36, Aurimas Fišeras ha scritto:
2013.07.03 21:45, Cristian Marchi rašė:
I've a problem applying this patch to trunk. Did you update locally the
template?
Yes, I did. But this shouldn't matter since only lt.po is modified and
the patch is generated against trunk. And the rebased patch is identical
to the one I sent on Sunday.

What is the error exactly?
Ok, you are right about the lt.po.

I get a long list of "Hunk # FAILED at"
Hello, Cristian.

Maybe you have local changes in your tree.

I saved the patch from my email, and tested it in a branch:
git checkout 13cb1fa54f4ab3aa4f11641ff451adefd23b9398 -b ltpo
git am out/0003-po-update-Lithuanian-translation.patch
Patch format detection failed.

Hmm, there is an unneeded ">" at the start of the first line of the
patch. I don't know how it got there.

After removing it:
git am out/0003-po-update-Lithuanian-translation.patch
Applying: po: update Lithuanian translation

Patch applies, no "Hunk # FAILED at" messages.


Finally I discovered the problem: if I saved the patch from thunderbird the locale get screwed up. So I tried downloading the patch from the net [1] and it worked. This is the first time I had this problem and I don't know what caused it. By the way your patch is now on trunk: thanks Aurimas for your patience!

[1]http://gnucash.1415818.n4.nabble.com/PATCH-Update-and-improve-Lithuanian-translation-td4662804.html
_______________________________________________
gnucash-devel mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel

Reply via email to