Unified Diff: mobile/android/base/locales/en-US/android_strings.dtd
Issue 29330952:
Issue 3127 - Merge conflicts, base 42.0.1 (Closed)
Patch Set:
Created Nov. 26, 2015, 11:01 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/home/HomeConfigPrefsBackend.java ('k')
|
mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/base/locales/en-US/android_strings.dtd |
| diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd |
| index b15834309c00d8fa7cc22f6edb2961ce1d0d0995..d902714a8728fee7fb9f7dc022e161bea23bcc73 100644 |
| --- a/mobile/android/base/locales/en-US/android_strings.dtd |
| +++ b/mobile/android/base/locales/en-US/android_strings.dtd |
| @@ -189,7 +189,9 @@ |
| <!ENTITY pref_header_privacy_short "Privacy"> |
| <!ENTITY pref_header_help "Help"> |
| <!ENTITY pref_header_language "Language"> |
| -<!ENTITY pref_header_vendor "&vendorShortName;"> |
| +<!-- We changed this to display the brand name instead of the vendor name |
| + in Adblock Browser --> |
| +<!ENTITY pref_header_vendor "&brandShortName;"> |
| <!ENTITY pref_header_devtools "Developer tools"> |
| <!ENTITY pref_cookies_menu "Cookies"> |
« no previous file with comments
|
« mobile/android/base/home/HomeConfigPrefsBackend.java ('k')
|
mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png » ('j')
|
no next file with comments »
