Issue 2980 - The Adblock Browser settings item says Eyeo

mobile/android/base/locales/en-US/android_strings.dtd

 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <!ENTITY  no_space_to_start_error "There is not enough space available for &brandShortName; to start.">
 <!ENTITY  error_loading_file "An error occurred when trying to load files required to run &brandShortName;">
 
 <!ENTITY  onboard_start_message3 "Browse with &brandShortName;">
 <!ENTITY  onboard_start_subtext3 "Make your mobile Web browsing experience truly your own.">
@@ skipping 115 matching lines @@
      them): the first notifying the user about the failure and the second
      telling the user what to do about it. -->
 <!ENTITY overlay_share_tab_not_sent "Your tab could not be sent.\nPlease try again later.">
 
 <!ENTITY pref_category_search3 "Search">
 <!ENTITY pref_category_search_summary "Customize your search providers">
 <!ENTITY pref_category_display "Display">
 <!ENTITY pref_category_display_summary "Text, title bar, full-screen browsing">
 <!ENTITY pref_category_privacy_short "Privacy">
 <!ENTITY pref_category_privacy_summary "Control passwords, cookies, tracking, data">
-<!ENTITY pref_category_vendor "&brandShortName;">
+<!ENTITY pref_category_vendor "&vendorShortName;">

[Felix Dahlke, 2015/09/03 15:50:17]

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]

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]

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]

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

 <!ENTITY pref_category_vendor_summary "About &brandShortName;, FAQs, data choices">
 <!ENTITY pref_category_datareporting "Data choices">
 <!ENTITY pref_learn_more "Learn more">
 <!ENTITY pref_category_installed_search_engines "Installed search engines">
 <!ENTITY pref_category_add_search_providers "Add more search providers">
 <!ENTITY pref_category_search_restore_defaults "Restore search engines">
 <!ENTITY pref_search_restore_defaults "Restore defaults">
 <!ENTITY pref_search_restore_defaults_summary "Restore defaults">
 <!-- Localization note (pref_search_hint) : "TIP" as in "hint", "clue" etc. Displayed as an
      advisory message on the customise search providers settings page explaining how to add new
@@ skipping 495 matching lines @@
      their desktop or laptop.-->
 <!ENTITY remote_tabs_last_synced "Last synced: &formatS;">
 <!-- Localization note: Used when the sync has not happend yet, showed in place of a date -->
 <!ENTITY remote_tabs_never_synced "Last synced: never">
 
 <!-- Find-In-Page strings -->
 <!-- LOCALIZATION NOTE (find_matchcase): This is meant to appear as an icon that changes color
      if match-case is activated. i.e. No more than two letters, one uppercase, one lowercase. -->
 <!ENTITY find_matchcase "Aa">