Issue 2980 - The Adblock Browser settings item says Eyeo

Issue 2980 - The Adblock Browser settings item says Eyeo

[Felix Dahlke, 2015-09-03 15:19:20]

Shouldn't we also revert our change to en-US/android_strings.dtd as well?

[René Jeschke, 2015-09-03 15:26:41]

On 2015/09/03 15:19:20, Felix Dahlke wrote:
> Shouldn't we also revert our change to en-US/android_strings.dtd as well?

Done.

[Felix Dahlke, 2015-09-03 15:50:18]

LGTM, address my comment if you want.

https://codereview.adblockplus.org/29325839/diff/29325842/mobile/android/base...
File mobile/android/base/locales/en-US/android_strings.dtd (right):

https://codereview.adblockplus.org/29325839/diff/29325842/mobile/android/base...
mobile/android/base/locales/en-US/android_strings.dtd:136: <!ENTITY
pref_category_vendor "&vendorShortName;">
Sorry for the death by many cuts strategy, but don't we usually a comment
wherever we make a change to upstream code? If not, nevermind.

[René Jeschke, 2015-09-03 16:03:01]

https://codereview.adblockplus.org/29325839/diff/29325842/mobile/android/base...
File mobile/android/base/locales/en-US/android_strings.dtd (right):

https://codereview.adblockplus.org/29325839/diff/29325842/mobile/android/base...
mobile/android/base/locales/en-US/android_strings.dtd:136: <!ENTITY
pref_category_vendor "&vendorShortName;">
On 2015/09/03 15:50:17, Felix Dahlke wrote:
> Sorry for the death by many cuts strategy, but don't we usually a comment
> wherever we make a change to upstream code? If not, nevermind.

We're not applying an upstream change here, we're reverting an upstream change,
see:
http://hg.mozilla.org/mozilla-central/file/74fbd245369c/mobile/android/base/l...

[Felix Dahlke, 2015-09-03 16:05:04]

https://codereview.adblockplus.org/29325839/diff/29325842/mobile/android/base...
File mobile/android/base/locales/en-US/android_strings.dtd (right):

https://codereview.adblockplus.org/29325839/diff/29325842/mobile/android/base...
mobile/android/base/locales/en-US/android_strings.dtd:136: <!ENTITY
pref_category_vendor "&vendorShortName;">
On 2015/09/03 16:03:01, René Jeschke wrote:
> On 2015/09/03 15:50:17, Felix Dahlke wrote:
> > Sorry for the death by many cuts strategy, but don't we usually a comment
> > wherever we make a change to upstream code? If not, nevermind.
> 
> We're not applying an upstream change here, we're reverting an upstream
change,
> see:
>
http://hg.mozilla.org/mozilla-central/file/74fbd245369c/mobile/android/base/l...
> 

Not sure I follow - we change upstream code, this file was not created by us,
that's what I mean.

[Felix Dahlke, 2015-09-03 16:07:41]

https://codereview.adblockplus.org/29325839/diff/29325842/mobile/android/base...
File mobile/android/base/locales/en-US/android_strings.dtd (right):

https://codereview.adblockplus.org/29325839/diff/29325842/mobile/android/base...
mobile/android/base/locales/en-US/android_strings.dtd:136: <!ENTITY
pref_category_vendor "&vendorShortName;">
On 2015/09/03 16:05:04, Felix Dahlke wrote:
> On 2015/09/03 16:03:01, René Jeschke wrote:
> > On 2015/09/03 15:50:17, Felix Dahlke wrote:
> > > Sorry for the death by many cuts strategy, but don't we usually a comment
> > > wherever we make a change to upstream code? If not, nevermind.
> > 
> > We're not applying an upstream change here, we're reverting an upstream
> change,
> > see:
> >
>
http://hg.mozilla.org/mozilla-central/file/74fbd245369c/mobile/android/base/l...
> > 
> 
> Not sure I follow - we change upstream code, this file was not created by us,
> that's what I mean.

Sorry, my bad, I meant strings.xml.in - this change just makes this file
identical to upstream, no need for a comment about that indeed :D

[Felix Dahlke, 2015-09-03 16:12:25]

LGTM!