Logged In: NO

This is a duplicate of Bug 1261570 . You can fix it by opening the affected files in a text editor and recreating the damaged parts by reference to the French file. I would post a patch, but I am not at all sure that that diffing/patching a file with conflict markers would be successful. Someone needs to replace the current nibs with new ones.

Hope this helps