On Wed, May 09, 2012 at 10:40:15PM +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.
>
> 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?
>
kdiff3 makes it easier to decide on a per-line basis.
Also take a look at the tool 'comm' which can isolate unique lines or
common lines in both files. Check out 'man comm'.
Regards
Johann
--
Johann Spies Telefoon: 021-808 4699
Databestuurder / Data manager
Sentrum vir Navorsing oor Evaluasie, Wetenskap en Tegnologie
Centre for Research on Evaluation, Science and Technology
Universiteit Stellenbosch.
"My son, despise not the chastening of the LORD;
neither be weary of his correction: For whom the LORD
loveth he correcteth; even as a father the son in
whom he delighteth." Proverbs 3:11,12
Attachment:
signature.asc
Description: Digital signature