Delta Between Two Patch Sets: adblockplussbrowser/res/values/strings.xml
Issue 29524668:
Issue 3916 - Supporting Adding filter lists via URL (Closed)
Left Patch Set: Issue 3916 - Supporting Adding filer lists via URL
Created Aug. 23, 2017, 2:20 p.m.
Right Patch Set: Use TAG constant for log, fix in MoreBlockingPreferenceCategory
Created Oct. 10, 2017, 1:57 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« adblockplussbrowser/res/values-tr/strings.xml ('k')
|
adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/InputValidatorDialogPreference.java » ('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 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <resources> | 2 <resources> |
| 3 | 3 |
| 4 <string name="app_name">Adblock Plus for Samsung Internet</string> | 4 <string name="app_name">Adblock Plus for Samsung Internet</string> |
| 5 <string name="automatic_updates">Configure automatic updates</string> | 5 <string name="automatic_updates">Configure automatic updates</string> |
| 6 <string name="manage_subscriptions">Configure your filter lists</string> | 6 <string name="manage_subscriptions">Configure your filter lists</string> |
| 7 <string name="manage_subscriptions_summary">Change ad blocking languages</st ring> | 7 <string name="manage_subscriptions_summary">Change ad blocking languages</st ring> |
| 8 <string name="more_blocking">More blocking options</string> | 8 <string name="more_blocking">More blocking options</string> |
| 9 <string name="more_blocking_category">Other filter lists</string> | 9 <string name="more_blocking_category">Other filter lists</string> |
| 10 <string name="more_blocking_summary">Disable tracking and malware sites</str ing> | 10 <string name="more_blocking_summary">Disable tracking and malware sites</str ing> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 <string name="whitelist_website_invalid_url_error">Invalid URL</string> | 42 <string name="whitelist_website_invalid_url_error">Invalid URL</string> |
| 43 <string name="whitelist_remove_dialog_title">Remove whitelisted website</str ing> | 43 <string name="whitelist_remove_dialog_title">Remove whitelisted website</str ing> |
| 44 <string name="whitelist_remove_dialog_message">"Are you sure you want to rem ove <b>%1s</b>?"</string> | 44 <string name="whitelist_remove_dialog_message">"Are you sure you want to rem ove <b>%1s</b>?"</string> |
| 45 <string name="add_subscription_dialog_message">Adding subscription…</s tring> | 45 <string name="add_subscription_dialog_message">Adding subscription…</s tring> |
| 46 <string name="remove_subscription_dialog_message">Removing subscription̷ 0;</string> | 46 <string name="remove_subscription_dialog_message">Removing subscription̷ 0;</string> |
| 47 <string name="about">About</string> | 47 <string name="about">About</string> |
| 48 <string name="privacy_policy">Privacy Policy</string> | 48 <string name="privacy_policy">Privacy Policy</string> |
| 49 <string name="terms_of_use">Terms of Use</string> | 49 <string name="terms_of_use">Terms of Use</string> |
| 50 <string name="imprint">Imprint</string> | 50 <string name="imprint">Imprint</string> |
| 51 <string name="imprint_text"><![CDATA[<p><b><font color=\"#ffffff\">eyeo GmbH </font></b><br/>Lichtstraße 25<br/>50825 Cologne<br/>Germany</p><p>Support:<br/> <a href=\"https://adblockplus.org/forum/\">Adblock Plus Forum</a><br/>Email:<br/ ><a href=\"mailto:info@eyeo.com\">info@eyeo.com</a><br/>Telephone:<br/>+49 (0)22 1 / 65028 598<br/>Fax:<br/>+49 (0)221 / 65028 599</p><p>VAT-ID:<br/>DE279292414< br/>District Court Cologne:<br/>HRB 73508</p><p><b><font color=\"#ffffff\">Manag ing Directors</font></b>:<br/>Till Faida<br/>Felix Dahlke<br/>Steffen Kiedel</p> ]]></string> | 51 <string name="imprint_text"><![CDATA[<p><b><font color=\"#ffffff\">eyeo GmbH </font></b><br/>Lichtstraße 25<br/>50825 Cologne<br/>Germany</p><p>Support:<br/> <a href=\"https://adblockplus.org/forum/\">Adblock Plus Forum</a><br/>Email:<br/ ><a href=\"mailto:info@eyeo.com\">info@eyeo.com</a><br/>Telephone:<br/>+49 (0)22 1 / 65028 598<br/>Fax:<br/>+49 (0)221 / 65028 599</p><p>VAT-ID:<br/>DE279292414< br/>District Court Cologne:<br/>HRB 73508</p><p><b><font color=\"#ffffff\">Manag ing Directors</font></b>:<br/>Till Faida<br/>Felix Dahlke<br/>Steffen Kiedel</p> ]]></string> |
| 52 <string name="add_other_list">Add other filter list</string> | 52 <string name="add_another_list">Add another filter list</string> |
| 53 <string name="add_other_list_url">https://www.example.com/filterlist.txt</st ring> | 53 <string name="add_another_list_url_hint">https://www.example.com/filterlist. txt</string> |
|
diegocarloslima
2017/09/08 15:06:07
I would suggest to rename it to `add_other_list_ur
jens
2017/09/13 08:50:29
Acknowledged.
| |
| 54 | 54 |
| 55 </resources> | 55 </resources> |
| LEFT | RIGHT |
