It seems that, even though torbutton is overlaying these checkbox labels with localized strings, XUL still wants to look up the original labels in tor-browser.git, which exist only in the en-US locale. So the solution seems to be to remove any references to localized strings in tor-browser.git. But we want to keep those references in our original #20244 (moved) patches so that Mozilla can uplift and localize them. Therefore I'm proposing this separate follow-up patch that removes the references for Tor Browser only.
r=mcs
I think this is an okay solution, although it looks strange to use hard-coded strings.
Maybe the commit message state that this is a fixup for 20244 instead of using this new ticket number?
r=mcs
I think this is an okay solution, although it looks strange to use hard-coded strings.
Maybe the commit message state that this is a fixup for 20244 instead of using this new ticket number?
The reason I did it this way is that I wanted to keep the original patch separate for possible uplift. The hard-coded strings are merely placeholders that are hidden by the torbutton overlay.
Okay, let's take it for the alpha. Seems to be an okay stopgap solution. This is commit 70b2e4769bc4a7dd877e8ca82403d71561dbeec8 on tor-browser-45.5.0esr-6.5-1.
Trac: Status: needs_review to closed Resolution: N/Ato fixed
I noticed that this is indeed fixed in the 45.5.0esr-6.5-1 branch, but the commit was not included in the 6.5a5(-hardened) upload. So feel free to close this ticket again or see this as a reminder to include the fix in the next upload.
BTW, there were also three other commits in the 45.5.0esr-6.5-1 branch which were not included in the 6.5a5(-hardened) upload. I couldn't find any "master" branch or something similar, so I assumed that only the latest branch is relevant for bug fixing, especially since this is a ticket concerning the alpha version.
Yes, normally all the changes on tor-browser-45.5.0esr-6.5-1 would have made it into 6.5a5 but dealing with a 0-day exploit is quite non-normal. Thus, in order to minimize the risk for breakage I decided to include only the most important patches into the update which left out the things you mentioned. 6.5a6 getting released next week will contain them.
Trac: Resolution: N/Ato fixed Status: reopened to closed