Side by Side Diff: libadblockplus-android-settings/res/values/adblock_settings_strings.xml
Issue 29379647:
Issue 4948 - add possibility to not send data depending on connection properties (Closed)
Patch Set: simplified ConnectionType, added android permissions note in README
Created March 29, 2017, 6:03 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« libadblockplus-android-settings/AndroidManifest.xml ('k')
|
libadblockplus-android-settings/res/values/adblock_settings_strings_internal.xml » ('j')
|
libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/IsAllowedConnectionCallbackImpl.java » ('J')
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')
| OLD | NEW |
|---|---|
| 1 <resources> | 1 <resources> |
| 2 | 2 |
| 3 <string name="fragment_adblock_settings_general_title">Adblock Plus</string> | 3 <string name="fragment_adblock_settings_general_title">Adblock Plus</string> |
| 4 <string name="fragment_adblock_settings_enabled_title">Adblock Plus</string> | 4 <string name="fragment_adblock_settings_enabled_title">Adblock Plus</string> |
| 5 <string name="fragment_adblock_settings_filter_lists_title">Filter lists</st ring> | 5 <string name="fragment_adblock_settings_filter_lists_title">Filter lists</st ring> |
| 6 <string name="fragment_adblock_settings_filter_lists_summary">Change your fi lter list language</string> | 6 <string name="fragment_adblock_settings_filter_lists_summary">Change your fi lter list language</string> |
| 7 <string name="fragment_adblock_settings_aa_enabled_title">Acceptable Ads</st ring> | 7 <string name="fragment_adblock_settings_aa_enabled_title">Acceptable Ads</st ring> |
| 8 <string name="fragment_adblock_settings_aa_enabled_summary">We\'d like to en courage websites to use straightforward, non-intrusive advertising. That\'s why we\'ve established strict guidelines to identify Acceptable Ads, which are shown under default settings. If you wish to browser ad-free, you can disable this se ttings at any time.</string> | 8 <string name="fragment_adblock_settings_aa_enabled_summary">We\'d like to en courage websites to use straightforward, non-intrusive advertising. That\'s why we\'ve established strict guidelines to identify Acceptable Ads, which are shown under default settings. If you wish to browser ad-free, you can disable this se ttings at any time.</string> |
| 9 <string name="fragment_adblock_settings_wl_title">Whitelisted domains</strin g> | 9 <string name="fragment_adblock_settings_wl_title">Whitelisted domains</strin g> |
| 10 <string name="fragment_adblock_settings_wl_summary">Add websites that you wa nt to see ads on to this list</string> | 10 <string name="fragment_adblock_settings_wl_summary">Add websites that you wa nt to see ads on to this list</string> |
| 11 <string name="fragment_adblock_settings_add_domain">Add domain</string> | 11 <string name="fragment_adblock_settings_add_domain">Add domain</string> |
| 12 <string name="fragment_adblock_settings_wl_domains">Whitelisted domains</str ing> | 12 <string name="fragment_adblock_settings_wl_domains">Whitelisted domains</str ing> |
| 13 <string name="fragment_adblock_settings_allowed_connection_type">Configure a utomatic updates</string> | |
| 14 <string name="fragment_adblock_settings_allowed_connection_type_wifi_non_met ered">Non-metered WiFi networks</string> | |
| 15 <string name="fragment_adblock_settings_allowed_connection_type_wifi">All Wi Fi networks</string> | |
| 16 <string name="fragment_adblock_settings_allowed_connection_type_all">Always< /string> | |
| 13 | 17 |
| 14 </resources> | 18 </resources> |
| OLD | NEW |
« no previous file with comments
|
« libadblockplus-android-settings/AndroidManifest.xml ('k')
|
libadblockplus-android-settings/res/values/adblock_settings_strings_internal.xml » ('j')
|
libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/IsAllowedConnectionCallbackImpl.java » ('J')
