Re: How to merge files
On Wed, 09 May 2012 22:40:15 +0200, Benjamí Villoslada wrote:
> I can't see how to merge two files. There are two SPIP CMS translation
> files:
>
> A) ca.php with catalan translation from a old version.
> B) fr.php with the original and last version (french).
>
> The goal is to put B new lines into A, but without removing the
> previously translated lines in A.
Mmm, the problem I see here is the format of the translation files
because to the "diff" eyes every single line will just differ :-/
> Diff & patch (with my limited knowledge of this tool) replaces
> translated lines in A because B have those same lines, but in original
> french. Perhaps diff & patch is not the right tool. Any idea?
Nope, sorry :-( unless you do a bit of manual work to visually compare
both files and look for the "extra" lines:
diff -y -W 72 ca fr > compare
Greetings,
--
Camaleón
Reply to: