Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: mobile/android/base/strings.xml.in

Issue 29325839: Issue 2980 - The Adblock Browser settings item says Eyeo (Closed)
Left Patch Set: Reverted android_strings modification. Created Sept. 3, 2015, 3:26 p.m.
Right Patch Set: Added change comments Created Sept. 3, 2015, 4:10 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « mobile/android/base/locales/en-US/android_strings.dtd ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 #filter substitution 1 #filter substitution
2 <?xml version="1.0" encoding="utf-8"?> 2 <?xml version="1.0" encoding="utf-8"?>
3 <!-- This Source Code Form is subject to the terms of the Mozilla Public 3 <!-- This Source Code Form is subject to the terms of the Mozilla Public
4 - License, v. 2.0. If a copy of the MPL was not distributed with this 4 - License, v. 2.0. If a copy of the MPL was not distributed with this
5 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> 5 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
6 6
7 <!DOCTYPE resources [ 7 <!DOCTYPE resources [
8 #includesubst @BRANDPATH@ 8 #includesubst @BRANDPATH@
9 #includesubst @STRINGSPATH@ 9 #includesubst @STRINGSPATH@
10 #includesubst @ABBSTRINGSPATH@ 10 #includesubst @ABBSTRINGSPATH@
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 <string name="pref_category_customize">&pref_category_customize;</string> 128 <string name="pref_category_customize">&pref_category_customize;</string>
129 <string name="pref_category_customize_summary">&pref_category_customize_summar y;</string> 129 <string name="pref_category_customize_summary">&pref_category_customize_summar y;</string>
130 <string name="pref_category_customize_alt_summary">&pref_category_customize_al t_summary;</string> 130 <string name="pref_category_customize_alt_summary">&pref_category_customize_al t_summary;</string>
131 131
132 <string name="pref_category_search">&pref_category_search3;</string> 132 <string name="pref_category_search">&pref_category_search3;</string>
133 <string name="pref_category_search_summary">&pref_category_search_summary;</st ring> 133 <string name="pref_category_search_summary">&pref_category_search_summary;</st ring>
134 <string name="pref_category_display">&pref_category_display;</string> 134 <string name="pref_category_display">&pref_category_display;</string>
135 <string name="pref_category_display_summary">&pref_category_display_summary;</ string> 135 <string name="pref_category_display_summary">&pref_category_display_summary;</ string>
136 <string name="pref_category_privacy_short">&pref_category_privacy_short;</stri ng> 136 <string name="pref_category_privacy_short">&pref_category_privacy_short;</stri ng>
137 <string name="pref_category_privacy_summary">&pref_category_privacy_summary;</ string> 137 <string name="pref_category_privacy_summary">&pref_category_privacy_summary;</ string>
138 <!-- We changed this to display the brand name instead of the vendor name
139 in Adblock Browser, see: https://issues.adblockplus.org/ticket/2980 -->
138 <string name="pref_category_vendor">&brandShortName;</string> 140 <string name="pref_category_vendor">&brandShortName;</string>
139 <string name="pref_category_vendor_summary">&pref_category_vendor_summary;</st ring> 141 <string name="pref_category_vendor_summary">&pref_category_vendor_summary;</st ring>
140 <string name="pref_category_datareporting">&pref_category_datareporting;</stri ng> 142 <string name="pref_category_datareporting">&pref_category_datareporting;</stri ng>
141 <string name="pref_category_installed_search_engines">&pref_category_installed _search_engines;</string> 143 <string name="pref_category_installed_search_engines">&pref_category_installed _search_engines;</string>
142 <string name="pref_category_add_search_providers">&pref_category_add_search_pr oviders;</string> 144 <string name="pref_category_add_search_providers">&pref_category_add_search_pr oviders;</string>
143 <string name="pref_category_search_restore_defaults">&pref_category_search_res tore_defaults;</string> 145 <string name="pref_category_search_restore_defaults">&pref_category_search_res tore_defaults;</string>
144 <string name="pref_search_restore_defaults">&pref_search_restore_defaults;</st ring> 146 <string name="pref_search_restore_defaults">&pref_search_restore_defaults;</st ring>
145 <string name="pref_search_restore_defaults_summary">&pref_search_restore_defau lts_summary;</string> 147 <string name="pref_search_restore_defaults_summary">&pref_search_restore_defau lts_summary;</string>
146 <string name="pref_search_hint">&pref_search_hint;</string> 148 <string name="pref_search_hint">&pref_search_hint;</string>
147 149
(...skipping 15 matching lines...) Expand all
163 <string name="pref_home_updates">&pref_home_updates;</string> 165 <string name="pref_home_updates">&pref_home_updates;</string>
164 <string name="pref_home_updates_enabled">&pref_home_updates_enabled;</string> 166 <string name="pref_home_updates_enabled">&pref_home_updates_enabled;</string>
165 <string name="pref_home_updates_wifi">&pref_home_updates_wifi;</string> 167 <string name="pref_home_updates_wifi">&pref_home_updates_wifi;</string>
166 <string name="pref_home_suggested_sites">&pref_home_suggested_sites;</string> 168 <string name="pref_home_suggested_sites">&pref_home_suggested_sites;</string>
167 <string name="pref_home_suggested_sites_summary">&pref_home_suggested_sites_su mmary;</string> 169 <string name="pref_home_suggested_sites_summary">&pref_home_suggested_sites_su mmary;</string>
168 170
169 <string name="pref_header_customize">&pref_header_customize;</string> 171 <string name="pref_header_customize">&pref_header_customize;</string>
170 <string name="pref_header_display">&pref_header_display;</string> 172 <string name="pref_header_display">&pref_header_display;</string>
171 <string name="pref_header_privacy_short">&pref_header_privacy_short;</string> 173 <string name="pref_header_privacy_short">&pref_header_privacy_short;</string>
172 <string name="pref_header_language">&pref_header_language;</string> 174 <string name="pref_header_language">&pref_header_language;</string>
175 <!-- We changed this to display the brand name instead of the vendor name
176 in Adblock Browser, see: https://issues.adblockplus.org/ticket/2980 -->
173 <string name="pref_header_vendor">&brandShortName;</string> 177 <string name="pref_header_vendor">&brandShortName;</string>
174 <string name="pref_header_devtools">&pref_header_devtools;</string> 178 <string name="pref_header_devtools">&pref_header_devtools;</string>
175 179
176 <string name="pref_learn_more">&pref_learn_more;</string> 180 <string name="pref_learn_more">&pref_learn_more;</string>
177 181
178 <string name="pref_category_logins">&pref_category_logins;</string> 182 <string name="pref_category_logins">&pref_category_logins;</string>
179 <string name="pref_remember_signons">&pref_remember_signons;</string> 183 <string name="pref_remember_signons">&pref_remember_signons;</string>
180 <string name="pref_manage_logins">&pref_manage_logins;</string> 184 <string name="pref_manage_logins">&pref_manage_logins;</string>
181 185
182 <string name="pref_cookies_menu">&pref_cookies_menu;</string> 186 <string name="pref_cookies_menu">&pref_cookies_menu;</string>
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> 596 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>
593 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> 597 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>
594 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> 598 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>
595 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> 599 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>
596 600
597 <!-- This is currently just a filler-text --> 601 <!-- This is currently just a filler-text -->
598 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> 602 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>
599 603
600 </resources> 604 </resources>
601 605
LEFTRIGHT

Powered by Google App Engine
This is Rietveld