Delta Between Two Patch Sets: mobile/android/base/strings.xml.in
Issue 4920541991403520:
Create a minimal settings UI (Closed)
Left Patch Set: Addressed issues
Created March 22, 2015, 3:32 p.m.
Right Patch Set: Removed default case
Created March 22, 2015, 9:23 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« mobile/android/base/resources/xml/preferences_abb_abp_acceptable_ads.xml ('k')
|
mobile/android/chrome/content/browser.js » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 @SYNCSTRINGSPATH@ | 10 #includesubst @SYNCSTRINGSPATH@ |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 445 <string name="actionbar_done">&actionbar_done;</string> | 445 <string name="actionbar_done">&actionbar_done;</string> |
| 446 | 446 |
| 447 <!-- Miscellaneous --> | 447 <!-- Miscellaneous --> |
| 448 <string name="ellipsis">&ellipsis;</string> | 448 <string name="ellipsis">&ellipsis;</string> |
| 449 | 449 |
| 450 <string name="colon">:</string> | 450 <string name="colon">:</string> |
| 451 | 451 |
| 452 <string name="remote_tabs_last_synced">&remote_tabs_last_synced;</string> | 452 <string name="remote_tabs_last_synced">&remote_tabs_last_synced;</string> |
| 453 | 453 |
| 454 <!-- Adblock Browser --> | 454 <!-- Adblock Browser --> |
| 455 <string name="adblockbrowser_pref_category_adblocking">Adblocking</string> | 455 <string name="abb_pref_category_adblocking">Adblocking</string> |
| 456 <string name="adblockbrowser_pref_category_adblocking_summary">Configure your filter subscriptions</string> | 456 <string name="abb_pref_category_adblocking_summary">Configure your filter subs criptions</string> |
| 457 | 457 |
| 458 <string name="adblockbrowser_pref_category_blocking">Blocking</string> | 458 <string name="abb_pref_category_blocking">Blocking</string> |
| 459 | 459 |
| 460 <string name="adblockbrowser_pref_category_further_blocking">Further blocking options</string> | 460 <string name="abb_pref_category_further_blocking">Further blocking options</st ring> |
| 461 <string name="adblockbrowser_pref_category_further_blocking_summary">Disable t racking and malware sites or add custom filter lists</string> | 461 <string name="abb_pref_category_further_blocking_summary">Disable tracking and malware sites or add custom filter lists</string> |
| 462 | 462 |
| 463 <string name="adblockbrowser_pref_category_exceptions">Exceptions</string> | 463 <string name="abb_pref_category_exceptions">Exceptions</string> |
| 464 | 464 |
| 465 <string name="adblockbrowser_pref_category_acceptable_ads">Acceptable Ads</str ing> | 465 <string name="abb_pref_category_acceptable_ads">Acceptable Ads</string> |
| 466 <string name="adblockbrowser_pref_category_acceptable_ads_summary">Configure A cceptable Ads</string> | 466 <string name="abb_pref_category_acceptable_ads_summary">Configure Acceptable A ds</string> |
| 467 | 467 |
| 468 <string name="adblockbrowser_pref_category_whitelisted_sites">Whitelisted Webs ites</string> | 468 <string name="abb_pref_category_whitelisted_sites">Whitelisted Websites</strin g> |
| 469 <string name="adblockbrowser_pref_category_whitelisted_sites_summary">Add exce ptions for websites</string> | 469 <string name="abb_pref_category_whitelisted_sites_summary">Add exceptions for websites</string> |
| 470 | 470 |
| 471 <string name="adblockbrowser_pref_acceptable_ads">Allow some non-intrusive adv ertising</string> | 471 <string name="abb_pref_acceptable_ads">Allow some non-intrusive advertising</s tring> |
| 472 <!-- This is currently just a filler-text --> | 472 <!-- This is currently just a filler-text --> |
| 473 <string name="adblockbrowser_pref_category_acceptable_ads_extra_summary">We\'d like to encourage websites to use starightforward, unobtrusive | 473 <string name="abb_pref_category_acceptable_ads_extra_summary">We\'d like to en courage websites to use starightforward, unobtrusive |
| 474 advertising. That\'s why we established strict guidelines to identify acceptable ads, which are shown under default settings. If you | 474 advertising. That\'s why we established strict guidelines to identify acceptable ads, which are shown under default settings. If you |
| 475 still wanto to block every ad you can disable this in a few seconds.</string> | 475 still wanto to block every ad you can disable this in a few seconds.</string> |
| 476 | 476 |
| 477 </resources> | 477 </resources> |
| 478 | 478 |
| LEFT | RIGHT |
« mobile/android/base/resources/xml/preferences_abb_abp_acceptable_ads.xml ('k')
|
mobile/android/chrome/content/browser.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
