Hi Zoltan<br><br>Probably that link might help<br><a href="http://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/">http://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/</a><br><br>You have a conflict somewhere which is not automatically resolvable - so you have to do it..<br>
<br>good luck<br>regards<br>Werner<br><br><div class="gmail_quote">On Sun, Nov 8, 2009 at 2:07 PM, Siki Zoltan <span dir="ltr"><<a href="mailto:siki@agt.bme.hu">siki@agt.bme.hu</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Dear GUI translators,<br>
<br>
I have just downloaded qgis from the trunk to updatemy GUI translation.<br>
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<br>
<<<<<<< .mine<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
.r12010<br>
</blockquote></blockquote></blockquote></blockquote></blockquote></blockquote></blockquote>
=======<br>
No other ts language file contains such lines.<br>
<br>
Do you know why I get those lines?<br>
<br>
Regards,<br>
Zoltan<br>
_______________________________________________<br>
Qgis-community-team mailing list<br>
<a href="mailto:Qgis-community-team@lists.osgeo.org" target="_blank">Qgis-community-team@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/qgis-community-team" target="_blank">http://lists.osgeo.org/mailman/listinfo/qgis-community-team</a><br>
</blockquote></div><br>