889500 - Australis: restore unused strings in browser.dtd

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Francesco Lodolo [:flod]]

Longer explanation here
https://mail.mozilla.org/pipermail/firefox-dev/2013-July/000479.html

Plan is to land Australis on central and disabling it for at least one cycle on Aurora. To avoid problems with l10n tools, removed strings should be restored in browser.dtd and deleted only when Australis is ready for Aurora.

Comment 1

[Francesco Lodolo [:flod]]

Attachment: Patch adding back unused strings (ux project)

This patch adds back 29 strings removed from browser.dtd

I kept them at the end of the file to make removal easier (not sure if it's needed).

Comment 2

[Justin Dolske [:Dolske]]

I was wondering if we should also go ahead and move these strings on m-c, so that Australis merging/backout would be a bit cleaner. Jared agreed, so I've got a patch.

Comment 3

[Justin Dolske [:Dolske]]

Attachment: Patch for mozilla-central

Comment 4

[Justin Dolske [:Dolske]]

Attachment: Patch for UX

This is flod's patch; with a tiny whitespace change, and I added a comment at the bottom of the block to delineate it.

Comment 5

[Justin Dolske [:Dolske]]

Attachment: Diff of m-c and ux with patches applied

(This isn't a real patch, just a diff to show that the two trees have expected state)

Comment 6

[:Gijs (he/him)]

Comment on attachment 774966 [details] [diff] [review]
Patch for mozilla-central

LGTM!

(Stealing because I punted one to Jared in bug 861703, it all evens out in the end! :-) )

Comment 7

[Justin Dolske [:Dolske]]

Pushed patches to their respective trees. Hope this doesn't cause any merge pains!

https://hg.mozilla.org/integration/mozilla-inbound/rev/9fd04fd70fc2
https://hg.mozilla.org/projects/ux/rev/9b41e04e51a8

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/9fd04fd70fc2

Comment 9

[:Gijs (he/him)]

(In reply to Justin Dolske [:Dolske] from comment #7)
> Pushed patches to their respective trees. Hope this doesn't cause any merge
> pains!
> 
> https://hg.mozilla.org/integration/mozilla-inbound/rev/9fd04fd70fc2
> https://hg.mozilla.org/projects/ux/rev/9b41e04e51a8

Merged in https://hg.mozilla.org/projects/ux/rev/e4177c0221d0, AFAICT the diff matches the one in attachment 774968 [details] [diff] [review] except for bug 896161.

Comment 10

[:Gijs (he/him)]

https://hg.mozilla.org/mozilla-central/rev/9b41e04e51a8