[Qgis-community-team] ts file format

[Yves Jacolin (free)]

Le dimanche 08 novembre 2009, Siki Zoltan a écrit :
> Dear GUI translators,
>
> I have just downloaded qgis from the trunk to updatemy GUI translation.
> I used to usee QT Linguist for translation, but now QT Linguist doesn't
> open the ts file because of errors in the file. I have several lines with
> <<<<<<< .mine
>
> >>>>>>> .r12010
>
> =======
> No other ts language file contains such lines.
>
> Do you know why I get those lines?

Which files appears this line ?

Y.
-- 
Yves Jacolin
-------------
"Donner la liberté aux individus ne suffit pas, il faut aussi leur donner du
pouvoir, de la puissance d'agir." M Gauchet

"Give freedom to people is not enough, we also have to give them the power 
to use this freedom, to act". M Gauchet
-------------
http://yjacolin.gloobe.org
http://softlibre.gloobe.org