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

Unified Diff: locales/en/android-about.json

Issue 6021528219025408: Issue #1170 More progress migrating adblockplus.org to our CMS. (Closed)
Patch Set: Created Sept. 1, 2014, 10:45 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « locales/en/acceptable-ads-manifesto.json ('k') | locales/en/android-config.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: locales/en/android-about.json
===================================================================
--- a/locales/en/android-about.json
+++ b/locales/en/android-about.json
@@ -6,42 +6,33 @@
"message": "What is Adblock Plus for Android?"
},
"s2": {
- "message": "Adblock Plus for Android is an Android app that runs in the background and filters ads,\nusing the same filter lists as the Adblock Plus browser extensions.\nIt works on Android version 2.1 and higher."
+ "message": "Adblock Plus for Android is an Android app that runs in the background and filters ads,\nusing the same filter lists as the Adblock Plus browser extensions.\nIt works on Android version 2.3 and higher."
},
"s3": {
"message": "Because Android's support for traffic filtering is limited, Adblock Plus uses several approaches,\nautomatically selecting the best one for the device:"
},
"s4": {
- "message": "If the device is"
+ "message": "If the device is <a>rooted</a>,\nAdblock Plus will filter all web traffic out of the box."
},
"s5": {
- "message": "http://en.wikipedia.org/wiki/Rooting_%28Android_OS%29"
+ "message": "On non-rooted devices running Android 4.1.2, 4.2.1 and higher, Adblock Plus will filter all WiFi traffic, but it needs to be\n<a>configured as a proxy server</a> manually. Detailed instructions are provided by Adblock Plus\nfor not experienced users."
},
"s6": {
- "message": "rooted"
+ "message": "On non-rooted devices running Android 3.1 and higher, Adblock Plus will filter all WiFi traffic out of the box."
},
"s7": {
- "message": ",\nAdblock Plus will filter all web traffic out of the box."
+ "message": "On non-rooted devices running Android 3.0 and older, Adblock Plus needs to be\n<a>configured as a proxy server</a> manually. Some devices do not support\nproxy configuration, and Adblock Plus does not work on those."
},
"s8": {
- "message": "On non-rooted devices running Android 4.1.2, 4.2.1 and higher, Adblock Plus will filter all WiFi traffic, but it needs to be\n<a>configured as a proxy server</a> manually. Detailed instructions are provided by Adblock Plus\nfor not experienced users."
+ "message": "Installation"
},
"s9": {
- "message": "On non-rooted devices running Android 3.1 and higher, Adblock Plus will filter all WiFi traffic out of the box."
+ "message": "Follow <a>the installation instructions</a>."
},
"s10": {
- "message": "On non-rooted devices running Android 3.0 and older, Adblock Plus needs to be\n<a>configured as a proxy server</a> manually. Some devices do not support\nproxy configuration, and Adblock Plus does not work on those."
+ "message": "Depending on your device, you might have to change your <a>network configuration</a> for Adblock Plus to work."
},
"s11": {
- "message": "Installation"
- },
- "s12": {
- "message": "Follow <a>the installation instructions</a>."
- },
- "s13": {
- "message": "Depending on your device, you might have to change your <a>network configuration</a> for Adblock Plus to work."
- },
- "s14": {
"message": "Frequently asked questions"
}
}
« no previous file with comments | « locales/en/acceptable-ads-manifesto.json ('k') | locales/en/android-config.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld