Bug 1248046 - clarify "content updates" label under Home in Settings r=margaret
authorGrigory Kruglov <gkruglov@mozilla.com>
Wed, 09 Mar 2016 10:23:07 -0800
changeset 311802 fd53c862d17a3a2ab146ec2f4c8b1e1c31d5198e
parent 311801 5782e6b86f6a0dad680ec12ec8f5c5e2fc06bca6
child 311803 12637684d990bb6daa08fa7049f66af21c6706a5
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs1248046
milestone48.0a1
Bug 1248046 - clarify "content updates" label under Home in Settings r=margaret MozReview-Commit-ID: JBNhZUOel7h
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/xml/preferences_home.xml
mobile/android/base/strings.xml.in
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -188,17 +188,18 @@
 <!ENTITY pref_category_home_panels "Panels">
 <!ENTITY home_add_panel_title "Add new panel">
 <!ENTITY home_add_panel_empty "Sorry, we couldn\'t find any panels for you to add.">
 <!-- Localization note (home_add_panel_installed):
      The &formatS; will be replaced with the name of the new panel the user just
      selected to be added to the home page. -->
 <!ENTITY home_add_panel_installed "\'&formatS;\' added to homepage">
 <!ENTITY pref_category_home_content_settings "Content settings">
-<!ENTITY pref_home_updates "Automatic updates">
+<!ENTITY pref_category_home_add_ons "Add-ons">
+<!ENTITY pref_home_updates2 "Content updates">
 <!ENTITY pref_home_updates_enabled "Enabled">
 <!ENTITY pref_home_updates_wifi "Only over Wi-Fi">
 <!ENTITY pref_home_suggested_sites "Show site suggestions">
 <!ENTITY pref_home_suggested_sites_summary "Display shortcuts to sites on your homepage that we think you might find interesting">
 <!ENTITY pref_category_home_homepage "Homepage">
 <!ENTITY home_homepage_title "Set a Homepage">
 <!-- Localization note (home_homepage_radio_user_address): The user will see a series of radio
      buttons to choose the homepage they'd like to start on. When they click the radio
--- a/mobile/android/base/resources/xml/preferences_home.xml
+++ b/mobile/android/base/resources/xml/preferences_home.xml
@@ -23,16 +23,20 @@
 
     <PreferenceCategory android:title="@string/pref_category_home_content_settings">
 
         <CheckBoxPreference android:key="android.not_a_preference.home_suggested_sites"
                             android:title="@string/pref_home_suggested_sites"
                             android:summary="@string/pref_home_suggested_sites_summary"
                             android:defaultValue="true" />
 
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_category_home_add_ons">
+
         <ListPreference android:key="home.sync.updateMode"
                         android:title="@string/pref_home_updates"
                         android:entries="@array/pref_home_updates_entries"
                         android:entryValues="@array/pref_home_updates_values"
                         android:persistent="false" />
 
     </PreferenceCategory>
 
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -181,21 +181,22 @@
 
   <string name="pref_category_home">&pref_category_home;</string>
   <string name="pref_category_home_summary">&pref_category_home_summary;</string>
   <string name="pref_category_home_panels">&pref_category_home_panels;</string>
   <string name="home_add_panel_title">&home_add_panel_title;</string>
   <string name="home_add_panel_empty">&home_add_panel_empty;</string>
   <string name="home_add_panel_installed">&home_add_panel_installed;</string>
   <string name="pref_category_home_content_settings">&pref_category_home_content_settings;</string>
-  <string name="pref_home_updates">&pref_home_updates;</string>
-  <string name="pref_home_updates_enabled">&pref_home_updates_enabled;</string>
   <string name="pref_home_updates_wifi">&pref_home_updates_wifi;</string>
   <string name="pref_home_suggested_sites">&pref_home_suggested_sites;</string>
   <string name="pref_home_suggested_sites_summary">&pref_home_suggested_sites_summary;</string>
+  <string name="pref_category_home_add_ons">&pref_category_home_add_ons;</string>
+  <string name="pref_home_updates">&pref_home_updates2;</string>
+  <string name="pref_home_updates_enabled">&pref_home_updates_enabled;</string>
   <string name="pref_category_home_homepage">&pref_category_home_homepage;</string>
   <string name="home_homepage_title">&home_homepage_title;</string>
   <string name="home_homepage_radio_default">&home_homepage_radio_default;</string>
   <string name="home_homepage_radio_user_address">&home_homepage_radio_user_address;</string>
   <string name="home_homepage_hint_user_address">&home_homepage_hint_user_address;</string>
 
   <string name="pref_header_general">&pref_header_general;</string>
   <string name="pref_header_search">&pref_header_search;</string>