650251 - [ast] merge releases/l10n/mozilla-aurora/ast into l10n-central and backout to make next aurora drop easy for Asturian

Status: RESOLVED FIXED

(Mozilla Localizations :: ast / Asturian, defect)

Description

[Axel Hecht [:Pike]]

gandalf backed out a few landings to l10n-central for aurora for your locale, because those were strings that landed in en-US post the aurora cut for en-US.

Now, on the next time you want to merge your work from central to aurora (around May 17), those backouts would just stick and remove the strings from your work again.

The way to make hg likely do the right thing, or at least throw a merge conflict at you, is to land the "backout" changesets from aurora on l10n-central, back them out, and potentially merge. Double negation style, yeah, somewhat hard to wrap your head around.

I can do that for you, but I want to make sure that you're good with it, and that we find the right time window so that your hg work doesn't clash.

Sorry for the trouble, I'll do my best to make the next iteration suck less.

Comment 1

[Axel Hecht [:Pike]]

marquinos, ivarela, seems that neither of you is watching 	
[e-mail], which makes you not get bugmail on new bugs like this one. Mind going to https://bugzilla.mozilla.org/userprefs.cgi?tab=email#new_watched_by_you and fix that? Thanks.

Comment 2

[marquinos]

Hi Axel!
Yes, please, do it for us.
I'm supposing that I must download a new branch with hg.
Thanks in advance!

Comment 3

[Axel Hecht [:Pike]]

http://hg.mozilla.org/l10n-central/ast/pushloghtml?changeset=d22c4adc6fde, l10n-central is fixed now.

For Firefox 5, you want to work on

ssh://hg.mozilla.org/releases/l10n/mozilla-aurora/ast/, with en-US strings from http://hg.mozilla.org/mozilla-aurora/. That's the fx_aurora tree on https://l10n-stage-sj.mozilla.org/shipping/dashboard?locale=ast and has 4 missing strings right now. Signoffs will open later, gotta do some infrastructure juggling.

You'll be able to use the same repositories to work on Firefox 6 in late may, too. Well, the url of the en-US repo may change, but only the url, not the contents.