Delta Between Two Patch Sets: adblockplussbrowser/res/values/strings.xml
Issue 29673565:
Issue 6066 - Implement 'force update' functionality for subscriptions (Closed)
Left Patch Set: Fixed typos and line length
Created Jan. 19, 2018, 11:01 a.m.
Right Patch Set: Fixes
Created Jan. 23, 2018, 3:12 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« no previous file
|
adblockplussbrowser/res/values/sysstrings.xml » ('j')
|
adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/util/ConnectivityUtils.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')
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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_another_list">Add another filter list</string> | 52 <string name="add_another_list">Add another filter list</string> |
| 53 <string name="add_another_list_url_hint">https://www.example.com/filterlist. txt</string> | 53 <string name="add_another_list_url_hint">https://www.example.com/filterlist. txt</string> |
| 54 <string name="update_subscriptions">Update subscriptions</string> | 54 <string name="update_subscriptions">Update subscriptions</string> |
| 55 <string name="update_subscriptions_summary">Update all active subscriptions< /string> | 55 <string name="update_subscriptions_summary">Update all active subscriptions< /string> |
| 56 <string name="updating_subscriptions">Updating subscriptions in background…< /string> | 56 <string name="updating_subscriptions">Updating subscriptions in background…< /string> |
| 57 <string name="metered_connection_warning">You are using your phone\'s data p lan. Are you sure you want to update? This could take a while.</string> | 57 <string name="metered_connection_warning">You are using your phone\'s data p lan. Are you sure you want to update? This could take a while.</string> |
| 58 <string name="check_your_connection">It looks like you are offline. Please c heck your Internet connection.</string> | 58 <string name="check_your_connection">It looks like you are offline. Please c heck your internet connection.</string> |
|
jens
2018/01/23 15:13:28
Tamara asked me to change this to a small 'i'
| |
| 59 | 59 |
| 60 </resources> | 60 </resources> |
| LEFT | RIGHT |
« no previous file
|
adblockplussbrowser/res/values/sysstrings.xml » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
