mobile/android/base/strings.xml.in - Issue 29543774: Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: mobile/android/base/strings.xml.in

Issue 29543774: Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen (Closed)

Patch Set: Adjustments accordingly to Thomas's comments. Also, adjusting strings for multilocale build Created Sept. 19, 2017, 3:18 p.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

« mobile/android/base/locales/adblockbrowser/ar/android_strings.dtd ('K') | « mobile/android/base/resources/xml/preferences_abb_whitelisted_websites.xml ('k') | mobile/android/thirdparty/org/adblockplus/browser/AddOnBridge.java » ('j') | mobile/android/thirdparty/org/adblockplus/browser/UrlUtils.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mobile/android/base/strings.xml.in

===================================================================

--- a/mobile/android/base/strings.xml.in

+++ b/mobile/android/base/strings.xml.in

@@ -667,18 +667,18 @@

<string name="abb_pref_category_more_blocking">&abb_pref_category_more_blocking;</string>

<string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more_blocking_summary;</string>

<string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</string>

<string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ads;</string>

<string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acceptable_ads_summary;</string>

- <string name="abb_pref_category_whitelisted_sites">&abb_pref_category_whitelisted_sites;</string>

- <string name="abb_pref_category_whitelisted_sites_summary">&abb_pref_category_whitelisted_sites_summary;</string>

+ <string name="abb_pref_category_whitelisted_websites">&abb_pref_category_whitelisted_websites;</string>

+ <string name="abb_pref_category_whitelisted_websites_summary">&abb_pref_category_whitelisted_websites_summary;</string>

<string name="abb_pref_about_acceptable_ads">&abb_pref_about_acceptable_ads;</string>

<string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string>

<string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string>

<string name="abb_pref_category_add_other_list">&abb_pref_category_add_other_list;</string>

@@ -686,16 +686,24 @@

<string name="abb_subscription_disable_malware">&abb_subscription_disable_malware;</string>

<string name="abb_subscription_disable_anti_adblock">&abb_subscription_disable_anti_adblock;</string>

<string name="abb_subscription_disable_social_media">&abb_subscription_disable_social_media;</string>

<string name="abb_add_subscription_url">&abb_add_subscription_url;</string>

<string name="abb_add_subscription_button">&abb_add_subscription_button;</string>

<string name="abb_add_subscription_adding">&abb_add_subscription_adding;</string>

+ <string name="abb_whitelisted_websites_loading">&abb_whitelisted_websites_loading;</string>

+ <string name="abb_whitelisted_websites_add_button">&abb_whitelisted_websites_add_button;</string>

+ <string name="abb_whitelist_website_dialog_title">&abb_whitelist_website_dialog_title;</string>

+ <string name="abb_whitelist_website_dialog_message">&abb_whitelist_website_dialog_message;</string>

+ <string name="abb_whitelist_website_dialog_hint">&abb_whitelist_website_dialog_hint;</string>

+ <string name="abb_whitelist_remove_dialog_title">&abb_whitelist_remove_dialog_title;</string>

+ <string name="abb_whitelist_remove_dialog_message">&abb_whitelist_remove_dialog_message;</string>

<string name="abb_invalid_url">&abb_invalid_url;</string>

<string name="abb_frp_button_1">&abb_frp_button_1;</string>

<string name="abb_frp_button_2">&abb_frp_button_2;</string>

<string name="abb_frp_button_3">&abb_frp_button_3;</string>

<string name="abb_frp_headline_1">&abb_frp_headline_1;</string>