mobile/android/base/resources/xml-v11/preferences.xml - Issue 29323321: Issue 2806 - Text changes for various pages within Menu > Settings > Ad blocking

Side by Side Diff

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

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

Side by Side Diff: mobile/android/base/resources/xml-v11/preferences.xml

Issue 29323321: Issue 2806 - Text changes for various pages within Menu > Settings > Ad blocking (Closed)

Patch Set: Created Aug. 6, 2015, 4:03 p.m.

Left:
Right:

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

Jump to:

View unified diff | Download patch

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- This Source Code Form is subject to the terms of the Mozilla Public	2 <!-- This Source Code Form is subject to the terms of the Mozilla Public

3 - License, v. 2.0. If a copy of the MPL was not distributed with this	3 - License, v. 2.0. If a copy of the MPL was not distributed with this

4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->	4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

5	5

6 <!-- Phone v11+ only: Sync is a top-level menu item.	6 <!-- Phone v11+ only: Sync is a top-level menu item.

7 See xml-v11/preference_headers.xml for tablet layout.	7 See xml-v11/preference_headers.xml for tablet layout.

8 Preference changes here should be mirrored to xml/preferences.xml.in. -->	8 Preference changes here should be mirrored to xml/preferences.xml.in. -->

9	9

10 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"	10 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

(...skipping 18 matching lines...) Expand all Loading...
29	29

30 <PreferenceScreen android:title="@string/pref_category_privacy_short"	30 <PreferenceScreen android:title="@string/pref_category_privacy_short"

31 android:summary="@string/pref_category_privacy_summary"	31 android:summary="@string/pref_category_privacy_summary"

32 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" >	32 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" >

33 <extra android:name="resource"	33 <extra android:name="resource"

34 android:value="preferences_privacy" />	34 android:value="preferences_privacy" />

35 </PreferenceScreen>	35 </PreferenceScreen>

36	36

37 <!-- Adblocking preferences -->	37 <!-- Adblocking preferences -->

38 <PreferenceScreen android:title="@string/abb_pref_category_adblocking"	38 <PreferenceScreen android:title="@string/abb_pref_category_adblocking"

	39 android:summary="@string/abb_pref_category_adblocking_summ ary_main"

39 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" >	40 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" >

40 <extra android:name="resource"	41 <extra android:name="resource"

41 android:value="preferences_abb_abp" />	42 android:value="preferences_abb_abp" />

42 </PreferenceScreen>	43 </PreferenceScreen>

43	44

44 <PreferenceScreen android:title="@string/pref_category_language"	45 <PreferenceScreen android:title="@string/pref_category_language"

45 android:summary="@string/pref_category_language_summary"	46 android:summary="@string/pref_category_language_summary"

46 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" >	47 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" >

47 <extra android:name="resource"	48 <extra android:name="resource"

48 android:value="preferences_locale" />	49 android:value="preferences_locale" />

49 </PreferenceScreen>	50 </PreferenceScreen>

50	51

51 <PreferenceScreen android:title="@string/pref_category_vendor"	52 <PreferenceScreen android:title="@string/pref_category_vendor"

52 android:summary="@string/pref_category_vendor_summary"	53 android:summary="@string/pref_category_vendor_summary"

53 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" >	54 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" >

54 <extra android:name="resource"	55 <extra android:name="resource"

55 android:value="preferences_vendor"/>	56 android:value="preferences_vendor"/>

56 </PreferenceScreen>	57 </PreferenceScreen>

57	58

58 <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2353 -->	59 <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2353 -->

59	60

60 </PreferenceScreen>	61 </PreferenceScreen>

OLD	NEW