Re: Upcoming Repo Merge - fedora-web.git

[Kévin Raymond <shaiton@xxxxxxxxxxxxxxxxx>]

On Wed, Oct 26, 2011 at 5:37 AM, Sijis Aviles <sijis@xxxxxxxxxxxxxxxxx> wrote:
>
>
> On Fri, Oct 21, 2011 at 12:23 PM, Sijis Aviles <sijis@xxxxxxxxxxxxxxxxx>
> wrote:
>>
>> All,
>>
>> In anticipation for the GA release, I'm planning on merging the
>> fedora-web.git repo and consolidating everything to the master branch.
>>
>> i'll be merging [1] f15-beta and spins-update branch into master this
>> weekend (likely Saturday night).
>>
>> After the merge, we'll have to make changes to the 'master' branch for any
>> GA release updates.
>>
>> Also, as an FYI, we are currently building fp.o and spins.fp.o from
>> f15-beta branch.
>>
>> If there a concern or issue about this, let me know.
>>
>> Thanks,
>>
>> Sijis
>>
>> [1] - http://fedoraproject.org/wiki/Fedora_Websites_Release_SOP#For_GA
>
> All,
>
> I finally merged the two branches to master. To be clear, i merged
> 'spins-update' and 'f16-beta' branch.
>
> Any changes needed for F16 GA should be applied to 'master' branch. The two
> staging websites for fp.o[1] and spins.fp.o[2] should be ready to build any
> changes done to that branch.
>
> Sijis
>
> [1] - http://spins.stg.fedoraproject.org
> [2] - http://stg.fedoraproject.org
>
>


Great thanks Sijis,
Currently, translations are like the following:
- spins is building in f16-beta, pulling translations from
fedora-web.spins-fedoraproject-org
- spins staging is (or is going to) building from master pulling
translations from  fedora-web.spins-fedoraproject-org
- fpo is  building in f16-beta, pulling translations from
fedora-web.fedoraproject-org-f16-beta
- fpo staging is building in master, pulling translations from
fedora-web.fedoraproject-org-f16-beta

Wouldn't it be a clever change to pull staging translations from
master, and create a fedora-web.spins-fedoraproject-org-f16-beta
resource under transifex in order to keep the current one
translatable?
I would also propose to pull the fpo staging translations from master
(fedora-web.fedoraproject-org).
If you agree, tell me and I'll make necessary .tx/config changes and
merge current translations. Also setting the Importance flag in TXN
would be great. I am also going to write to the translators mailing
list.



-- 
Kévin Raymond
User:shaiton
GPG-Key: A5BCB3A2
-- 
websites mailing list
websites@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/websites