[Qgis-community-team] git pull conflicts on the server

[Raymond Nijssen]

Otto,

Sorry, I understood the file was invalid.

Raymond


On 11/06/2012 06:38 PM, Otto Dassau wrote:
> Hi,
>
> ok, but this should not make problems with git pull, I guess.
>
> Regards
> Otto
>
> Am Tue, 06 Nov 2012 18:25:27 +0100
> schrieb Raymond Nijssen <r.nijssen at terglobo.nl>:
>
>> Otto, Richard,
>>
>> Someone else (Milo) made that translation and did a pull request. He
>> used a text editor to translate and made some mistakes. I already
>> suggested him to use Linguist or gtranslate but apparently he did not
>> yet solve the problems.
>>
>> Regards!
>> Raymond
>>
>> On 11/06/2012 06:14 PM, Otto Dassau wrote:
>>> Hi Richard,
>>>
>>> i18n/nl/LC_MESSAGES/user_manual/preamble/foreword.po gives a conflict,
>>> if I make a git pull on qgis.org. Did you create the last changes via
>>> pootle? Or was it just a checkout, update with linguist and commit and
>>> push back again.
>>>
>>> thanks
>>> Otto
>>> _______________________________________________
>>> Qgis-community-team mailing list
>>> Qgis-community-team at lists.osgeo.org
>>> http://lists.osgeo.org/mailman/listinfo/qgis-community-team
> _______________________________________________
> Qgis-community-team mailing list
> Qgis-community-team at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/qgis-community-team
>

-- 
Terglobo
Ampèrestraat 110
5223 CT 's-Hertogenbosch
06-25314983