Bug 886231 - Rename datareporting_fhr_summary to reflect string change (follow-up from Bug 879558). r=trivial
authorRichard Newman <rnewman@mozilla.com>
Mon, 24 Jun 2013 08:40:35 -0700
changeset 136249 d4b39b7a0c5afd1c9716b0ea1f150421e8fd3667
parent 136247 1da2051be4574296df6a32ec186a46e8a062d1b7
child 136250 25d1683000014cd8cf3b97b92c40aaa4b01624f8
push id24872
push usernalexander@mozilla.com
push dateMon, 24 Jun 2013 17:22:25 +0000
treeherdermozilla-central@25d168300001 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstrivial
bugs886231, 879558
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 886231 - Rename datareporting_fhr_summary to reflect string change (follow-up from Bug 879558). r=trivial
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/xml/preferences_datareporting.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
@@ -135,24 +135,24 @@ size. -->
 
 <!ENTITY datareporting_notification_title "&brandShortName; stats &amp; data">
 <!ENTITY datareporting_notification_action_long "Choose what information to share">
 <!ENTITY datareporting_notification_action "Choose what to share">
 <!ENTITY datareporting_notification_summary "To improve your experience, &brandShortName; automatically sends some information to &vendorShortName;.">
 <!ENTITY datareporting_notification_summary_short "To improve your experience, &brandShortName;…">
 <!ENTITY datareporting_notification_ticker_text "&datareporting_notification_title;: &datareporting_notification_action_long;">
 
-<!-- Localization note (datareporting_fhr_title, datareporting_fhr_summary,
+<!-- Localization note (datareporting_fhr_title, datareporting_fhr_summary2,
      reporting_telemetry_title, datareporting_telemetry_summary,
      datareporting_crashreporter_summary) : These match the strings in
      en-US/chrome/browser/preferences/advanced.dtd (healthReportSection.label,
      healthReportDesc.label, telemetrySection.label, telemetryDesc.label,
      crashReporterDesc.label). -->
 <!ENTITY datareporting_fhr_title "&brandShortName; Health Report">
-<!ENTITY datareporting_fhr_summary "Shares data with &vendorShortName; about your browser health and helps you understand your browser performance">
+<!ENTITY datareporting_fhr_summary2 "Shares data with &vendorShortName; about your browser health and helps you understand your browser performance">
 <!ENTITY datareporting_abouthr_title "View my Health Report">
 <!ENTITY datareporting_telemetry_title "Telemetry">
 <!ENTITY datareporting_telemetry_summary "Shares performance, usage, hardware and customization data about your browser with &vendorShortName; to help us make &brandShortName; better">
 <!ENTITY datareporting_crashreporter_summary "&brandShortName; submits crash reports to help &vendorShortName; make your browser more stable and secure">
 <!-- Localization note (datareporting_crashreporter_title_short) : This string matches
      (crashReporterSection.label) in en-US/chrome/browser/preferences/advanced.dtd.-->
 <!ENTITY datareporting_crashreporter_title_short "Crash Reporter">
 <!ENTITY datareporting_wifi_title "&vendorShortName; location services">
--- a/mobile/android/base/resources/xml/preferences_datareporting.xml
+++ b/mobile/android/base/resources/xml/preferences_datareporting.xml
@@ -19,15 +19,15 @@
                         android:defaultValue="false" />
 
     <CheckBoxPreference android:key="app.geo.reportdata"
                         android:title="@string/datareporting_wifi_title"
                         android:summary="@string/datareporting_wifi_summary" />
 
     <CheckBoxPreference android:key="android.not_a_preference.healthreport.uploadEnabled"
                         android:title="@string/datareporting_fhr_title"
-                        android:summary="@string/datareporting_fhr_summary"
+                        android:summary="@string/datareporting_fhr_summary2"
                         android:defaultValue="true" />
 
     <org.mozilla.gecko.AlignRightLinkPreference android:key="android.not_a_preference.healthreport.link"
                                                 android:title="@string/datareporting_abouthr_title"
                                                 url="about:healthreport" />
 </PreferenceScreen>
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -139,17 +139,17 @@
   <string name="datareporting_notification_action">&datareporting_notification_action;</string>
   <string name="datareporting_notification_summary">&datareporting_notification_summary;</string>
   <string name="datareporting_notification_summary_short">&datareporting_notification_summary_short;</string>
   <string name="datareporting_notification_ticker_text">&datareporting_notification_ticker_text;</string>
 
   <string name="datareporting_telemetry_title">&datareporting_telemetry_title;</string>
   <string name="datareporting_telemetry_summary">&datareporting_telemetry_summary;</string>
   <string name="datareporting_fhr_title">&datareporting_fhr_title;</string>
-  <string name="datareporting_fhr_summary">&datareporting_fhr_summary;</string>
+  <string name="datareporting_fhr_summary2">&datareporting_fhr_summary2;</string>
   <string name="datareporting_abouthr_title">&datareporting_abouthr_title;</string>
   <string name="datareporting_crashreporter_title_short">&datareporting_crashreporter_title_short;</string>
   <string name="datareporting_crashreporter_summary">&datareporting_crashreporter_summary;</string>
   <string name="datareporting_wifi_title">&datareporting_wifi_title;</string>
   <string name="datareporting_wifi_summary">&datareporting_wifi_summary;</string>
 
   <string name="go">&go;</string>
   <string name="search">&search;</string>