Re: Spanish locale for Trunk

On 16 September 2011 14:48, Jacob Nevins
<0jacobnk.gna <at> chiark.greenend.org.uk> wrote:
> Jordi Negrevernis i Font writes:
>> En/na Jacob Nevins ha escrit:
>>> Jordi Negrevernis i Font writes:
>>> I assume you've taken care of merging translations from S2_3 to trunk,
>>> so we developers shouldn't try to do that again once S2_4 has branched,

 *before* branching S2_4 so that trunk gets updated too once each cycle.

>>> as we usually do?
>>>
>>     You're right, I did the merge, but the other translations I supposed
>> didn't do that. I will have to do a 'svn resolve' command some day... 
>
> Shouldn't need to, as long as we remember not to try to copy yours
> across from S2_3. Usually we ask nearer the time, I think, anyway.

 It's not copy, but real merge of new translations from two branches
(S2_3 and TRUNK). So if there's updates to S2_3 during remaining 1.5
Months before S2_4 branching, new merge will make sense anyway.

 I'll remind about 02-Nov-11 S2_4 branching when it gets closer.

 - ML

_______________________________________________
Freeciv-i18n mailing list
Freeciv-i18n <at> gna.org
https://mail.gna.org/listinfo/freeciv-i18n