Side by Side Diff: mobile/android/base/resources/xml-v11/preferences.xml
Issue 29370610:
Issue 4760 - Change Ad blocking settings text (Closed)
Patch Set:
Created Jan. 2, 2017, 4:07 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/locales/adblockbrowser/en-US/android_strings.dtd ('k')
|
mobile/android/base/resources/xml-v11/preferences_abb_abp.xml » ('j')
|
mobile/android/base/resources/xml-v11/preferences_abb_abp.xml » ('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')
| 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 19 matching lines...) Expand all Loading... | |
| 30 | 30 |
| 31 <PreferenceScreen android:title="@string/pref_category_privacy_short" | 31 <PreferenceScreen android:title="@string/pref_category_privacy_short" |
| 32 android:summary="@string/pref_category_privacy_summary" | 32 android:summary="@string/pref_category_privacy_summary" |
| 33 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 33 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 34 <extra android:name="resource" | 34 <extra android:name="resource" |
| 35 android:value="preferences_privacy" /> | 35 android:value="preferences_privacy" /> |
| 36 </PreferenceScreen> | 36 </PreferenceScreen> |
| 37 | 37 |
| 38 <!-- Adblocking preferences --> | 38 <!-- Adblocking preferences --> |
| 39 <PreferenceScreen android:title="@string/abb_pref_category_adblocking" | 39 <PreferenceScreen android:title="@string/abb_pref_category_adblocking" |
| 40 android:summary="@string/abb_pref_category_adblocking_summ ary_main" | 40 android:summary="@string/abb_pref_category_adblocking_summ ary" |
| 41 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 41 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 42 <extra android:name="resource" | 42 <extra android:name="resource" |
| 43 android:value="preferences_abb_abp" /> | 43 android:value="preferences_abb_abp" /> |
| 44 </PreferenceScreen> | 44 </PreferenceScreen> |
| 45 | 45 |
| 46 <PreferenceScreen android:title="@string/pref_category_language" | 46 <PreferenceScreen android:title="@string/pref_category_language" |
| 47 android:summary="@string/pref_category_language_summary" | 47 android:summary="@string/pref_category_language_summary" |
| 48 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 48 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 49 <extra android:name="resource" | 49 <extra android:name="resource" |
| 50 android:value="preferences_locale" /> | 50 android:value="preferences_locale" /> |
| 51 </PreferenceScreen> | 51 </PreferenceScreen> |
| 52 | 52 |
| 53 <PreferenceScreen android:title="@string/pref_category_vendor" | 53 <PreferenceScreen android:title="@string/pref_category_vendor" |
| 54 android:summary="@string/pref_category_vendor_summary" | 54 android:summary="@string/pref_category_vendor_summary" |
| 55 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 55 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 56 <extra android:name="resource" | 56 <extra android:name="resource" |
| 57 android:value="preferences_vendor"/> | 57 android:value="preferences_vendor"/> |
| 58 </PreferenceScreen> | 58 </PreferenceScreen> |
| 59 | 59 |
| 60 <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2353 --> | 60 <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2353 --> |
| 61 | 61 |
| 62 </PreferenceScreen> | 62 </PreferenceScreen> |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/locales/adblockbrowser/en-US/android_strings.dtd ('k')
|
mobile/android/base/resources/xml-v11/preferences_abb_abp.xml » ('j')
|
mobile/android/base/resources/xml-v11/preferences_abb_abp.xml » ('J')
