On 16/07/14 23:52, Albert Astals Cid wrote:
> El Dimecres, 16 de juliol de 2014, a les 23:47:17, Steve Allewell va escriure:
>> On 16/07/14 22:57, Luigi Toscano wrote:
>>> Steve Allewell ha scritto:
>>>> On 16/07/14 01:23, Luigi Toscano wrote:
>>>>> Steve Allewell ha scritto:
>>>>>> Greetings all
>>>>>>
>>>>>> Branch release-1.2.0 has been created for project KXStitch and marked
>>>>>> as
>>>>>> stable in project settings.  This branch is now in string freeze for
>>>>>> translations.
>>>>>
>>>>> If I didn't mistakes, translations in the stable branch (copied from
>>>>> trunk)
>>>>> should now track release-1.2.0 (I also tracked symboleditor
>>>>> release-1.4.0).
>>>>>
>>>>> Ciao
>>>>
>>>> I'll be able to confirm the next time scripty updates.
>>>>
>>>> I made the assumption that setting the 'i18n stable branch' in project
>>>> settings to the git branch release-1.2.0 would update the stable messages
>>>> and the trunk messages will continue being updated by the git master
>>>> branch which is set in 'i18n trunk branch'
>>>
>>> Unfortunately the process involves some manual steps.
>>
>> I have looked at the po files in trunk and stable and both have been
>> updated with the modified strings.  I am not sure what extra manual
>> steps would be required.
>>
>>>> I made some commits a few days ago that changed some strings and haven't
>>>> seen those appear in the templates yet, but from another post I read,
>>>> that was to be expected and they would get updated after 4.14 was
>>>> branched.
>>>
>>> If it was in trunk, yes, because trunk did not receive updates.
>>
>> I did commit them to trunk before tagging and branching 1.2.0
>>
>>> Is there a reason why the stable branch of SymbolEditor uses a different
>>> name for documentation templates? I would say that the usual name should
>>> be used (aka: move the contento of doc/en under doc).
>>
>> Release 1.4.0 of SymbolEditor was created and released before importing
>> to the KDE repositories. Since the import, the docs files in trunk were
>> moved under doc rather than doc/en, but the branch wasn't done.  I was
>> deciding whether to create a minor revision with some extra
>> translations, but I think I will more likely go to 1.5.0 instead, in
>> which case the docs will be in the right place.
>>
>> It might be better if I set the stable branch to none so that these pot
>> files are not created until 1.5.0 is ready.
>
> Questio is, are you going to release the branch you just marked as stable in
> the future? If not, yes, you should set it to none.
>
> Cheers,
>    Albert
>
>>
>>> Ciao
>>
>> Thanks for the feedback
>>
>> Regards
>>
>> Steve
>
Just to clarify, it is SymbolEditor stable that has been set to none. 
KXStitch stable is still release-1.2.0

Regards

Steve