[Qgis-community-team] ts file format

[Werner Macho]

Hi Zoltan

Probably that link might help
http://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/

You have a conflict somewhere which is not automatically resolvable - so you
have to do it..

good luck
regards
Werner

On Sun, Nov 8, 2009 at 2:07 PM, Siki Zoltan <siki at agt.bme.hu> wrote:

> 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?
>
> Regards,
> Zoltan
> _______________________________________________
> Qgis-community-team mailing list
> Qgis-community-team at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/qgis-community-team
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/qgis-community-team/attachments/20091108/5efe44f0/attachment.html