mobile/android/base/strings.xml.in - Issue 29322610: Issue 2720 - [Adblocking settings] Add the other filter lists category

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 29322610: Issue 2720 - [Adblocking settings] Add the other filter lists category (Closed)

Patch Set: Even more naming Created July 30, 2015, 9:29 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

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

diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in

index d254e11aedb96d5ad0e0bca34c97a2e484a69d72..ee3de17074cb4243e9f7214663c1d1ca993528d3 100644

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

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

@@ -534,8 +534,8 @@

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

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

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

+ <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>

@@ -550,6 +550,19 @@

<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>

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

Felix Dahlke 2015/07/30 17:37:59 Nit: I know I know, I suggested "list" myself here

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

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

+ <string name="abb_list_disable_social_media">&abb_list_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_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>