Re: How to merge files

2012-05-13 Thread Andrei POPESCU
On Mi, 09 mai 12, 22:40:15, Benjamí Villoslada wrote: > I can't see how to merge two files. There are two SPIP CMS translation files: Oh no, another translation format. > A) ca.php with catalan translation from a old version. > B) fr.php with the original and last version (french). > > The goal

Re: How to merge files

2012-05-09 Thread Johann Spies
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 line

Re: How to merge files

2012-05-09 Thread Camaleón
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

Re: How to merge files

2012-05-09 Thread andrea
Maybe cat A B | sort | uniq > C could be worth a try. sort | uniq just eliminates duplicated lines. Best regards. On Wed, 2012-05-09 at 22:40 +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

How to merge files

2012-05-09 Thread Benjamí Villoslada
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 & pa