Bug 871970 - Rename datareporting_crashreporter_title entity to reflect string change in data reporting string. r=sriram
authorChenxia Liu <liuche@mozilla.com>
Tue, 14 May 2013 14:50:58 -0700
changeset 143428 d08934cfce041a326591ef0a829f5ce9c1f5c5bc
parent 143427 b880a068345e6fc2ec6255a9d1199e33a365a065
child 143429 fa1dc340708bb1abec3c553bf77d1da4a64dda18
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssriram
bugs871970
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 871970 - Rename datareporting_crashreporter_title entity to reflect string change in data reporting string. r=sriram
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
@@ -145,20 +145,19 @@ size. -->
      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 "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">
 <!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) : This string matches
+<!-- Localization note (datareporting_crashreporter_title_short) : This string matches
      (crashReporterSection.label) in en-US/chrome/browser/preferences/advanced.dtd.-->
-<!ENTITY datareporting_crashreporter_title2 "&brandShortName; Crash Reporter">
-<!ENTITY datareporting_crashreporter_title "Crash Reporter">
+<!ENTITY datareporting_crashreporter_title_short "Crash Reporter">
 
 <!ENTITY pref_update_autodownload "Automatic updates">
 <!ENTITY pref_update_autodownload_wifi "Only over Wi-Fi">
 <!ENTITY pref_update_autodownload_disabled "Disabled">
 <!ENTITY pref_update_autodownload_enabled "Enabled">
 
 <!ENTITY quit "Quit">
 
--- a/mobile/android/base/resources/xml/preferences_datareporting.xml
+++ b/mobile/android/base/resources/xml/preferences_datareporting.xml
@@ -14,13 +14,13 @@
                         android:summary="@string/datareporting_telemetry_summary" />
 
     <CheckBoxPreference android:key="android.not_a_preference.healthreport.uploadEnabled"
                         android:title="@string/datareporting_fhr_title"
                         android:summary="@string/datareporting_fhr_summary"
                         android:defaultValue="true" />
 
     <CheckBoxPreference android:key="datareporting.crashreporter.submitEnabled"
-                        android:title="@string/datareporting_crashreporter_title"
+                        android:title="@string/datareporting_crashreporter_title_short"
                         android:summary="@string/datareporting_crashreporter_summary"
                         android:defaultValue="false" />
 
 </PreferenceScreen>
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -139,17 +139,17 @@
   <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_crashreporter_title">&datareporting_crashreporter_title;</string>
+  <string name="datareporting_crashreporter_title_short">&datareporting_crashreporter_title_short;</string>
   <string name="datareporting_crashreporter_summary">&datareporting_crashreporter_summary;</string>
 
   <string name="go">&go;</string>
   <string name="search">&search;</string>
   <string name="reload">&reload;</string>
   <string name="forward">&forward;</string>
   <string name="menu">&menu;</string>
   <string name="back">&back;</string>