[Freeipa-devel] [PATCH 13/13] Update Polish and Chinese translations

John Dennis jdennis at redhat.com
Mon Mar 22 14:38:40 UTC 2010


On 03/22/2010 09:26 AM, Rob Crittenden wrote:
> John Dennis wrote:
>>
>>
>
> This patch does not apply
>
> patch -p1 --dry-run <
> /tmp/0013-Update-Polish-and-Chinese-translations.patch
> patching file install/po/pl.po
> Hunk #1 FAILED at 6.
> Hunk #2 FAILED at 104.
> Hunk #4 FAILED at 443.
> Hunk #5 FAILED at 675.
> Hunk #6 FAILED at 687.
> Hunk #7 FAILED at 802.
> Hunk #8 FAILED at 894.
> Hunk #9 FAILED at 935.
> Hunk #10 FAILED at 1250.
> Hunk #11 FAILED at 1306.
> Hunk #12 succeeded at 692 (offset -631 lines).
> Hunk #13 FAILED at 708.
> Hunk #14 FAILED at 967.
> Hunk #15 succeeded at 1477 (offset -172 lines).
> 12 out of 15 hunks FAILED -- saving rejects to file install/po/pl.po.rej
> patching file install/po/zh_CN.po

I don't think "[PATCH 6/6] update Polish translations" was pushed,  that 
would cause the merge failure if that were the case.

-- 
John Dennis <jdennis at redhat.com>

Looking to carve out IT costs?
www.redhat.com/carveoutcosts/




More information about the Freeipa-devel mailing list