Bug 871938 - Use &vendorShortName; in Crash Reporter strings rather than a hardcoded "Mozilla". r=kats
authorShane Tully <stully@mozilla.com>
Wed, 29 May 2013 20:37:35 -0400
changeset 133349 5c1d109eccfb2b63e0a8b50937c8842536a353a6
parent 133348 50d9e3c1574fed0d560d450394121229cd7ad25b
child 133350 48b38e667074a73f2b5069e217782a9b6d096aaf
push id28724
push userryanvm@gmail.com
push dateThu, 30 May 2013 00:37:49 +0000
treeherdermozilla-inbound@17143afc4fab [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs871938
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 871938 - Use &vendorShortName; in Crash Reporter strings rather than a hardcoded "Mozilla". r=kats
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/layout/crash_reporter.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
@@ -11,21 +11,21 @@
 
 <!ENTITY  awesomebar_all_pages_title "Top Sites">
 <!ENTITY  awesomebar_bookmarks_title "Bookmarks">
 <!ENTITY  awesomebar_history_title "History">
 <!ENTITY  awesomebar_switch_to_tab "Switch to tab">
 
 <!ENTITY  crash_reporter_title "&brandShortName; Crash Reporter">
 <!ENTITY  crash_message2 "&brandShortName; had a problem and crashed. Your tabs should be listed on the &brandShortName; Start page when you restart.">
-<!ENTITY  crash_send_report_message2 "Tell Mozilla about this crash so they can fix it">
+<!ENTITY  crash_send_report_message3 "Tell &vendorShortName; about this crash so they can fix it">
 <!ENTITY  crash_include_url2 "Include the address of the page I was on">
 <!ENTITY  crash_sorry "We\'re sorry">
 <!ENTITY  crash_comment "Add a comment (comments are publicly visible)">
-<!ENTITY  crash_allow_contact "Allow Mozilla to contact me about this report">
+<!ENTITY  crash_allow_contact2 "Allow &vendorShortName; to contact me about this report">
 <!ENTITY  crash_email "Your email">
 <!ENTITY  crash_closing_alert "Exit without sending a crash report?">
 <!ENTITY  sending_crash_report "Sending crash report\u2026">
 <!ENTITY  crash_close_label "Close">
 <!ENTITY  crash_restart_label "Restart &brandShortName;">
 <!ENTITY  exit_label "Exit">
 
 <!ENTITY  launcher_shortcuts_title "&brandShortName; Web Apps">
--- a/mobile/android/base/resources/layout/crash_reporter.xml
+++ b/mobile/android/base/resources/layout/crash_reporter.xml
@@ -35,17 +35,17 @@
                       android:text="@string/crash_message2"/>
 
             <CheckBox android:id="@+id/send_report"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:checked="true"
                       android:textColor="@color/primary_text"
                       android:layout_marginBottom="10dp"
-                      android:text="@string/crash_send_report_message2"/>
+                      android:text="@string/crash_send_report_message3"/>
 
             <EditText android:id="@+id/comment"
                       style="@style/CrashReporter.EditText"
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
                       android:ems="10"
                       android:inputType="textMultiLine"
                       android:lines="5"
@@ -64,17 +64,17 @@
                       android:text="@string/crash_include_url2"/>
 
             <CheckBox android:id="@+id/allow_contact"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:textColor="@color/primary_text"
                       android:textAppearance="@style/TextAppearance"
                       android:layout_marginBottom="10dp"
-                      android:text="@string/crash_allow_contact"/>
+                      android:text="@string/crash_allow_contact2"/>
 
             <org.mozilla.gecko.ClickableWhenDisabledEditText
                     android:id="@+id/email"
                     style="@style/CrashReporter.EditText"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:ems="10"
                     android:inputType="textEmailAddress"
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -25,21 +25,21 @@
 
   <string name="awesomebar_all_pages_title">&awesomebar_all_pages_title;</string>
   <string name="awesomebar_bookmarks_title">&awesomebar_bookmarks_title;</string>
   <string name="awesomebar_history_title">&awesomebar_history_title;</string>
   <string name="awesomebar_switch_to_tab">&awesomebar_switch_to_tab;</string>
 
   <string name="crash_reporter_title">&crash_reporter_title;</string>
   <string name="crash_message2">&crash_message2;</string>
-  <string name="crash_send_report_message2">&crash_send_report_message2;</string>
+  <string name="crash_send_report_message3">&crash_send_report_message3;</string>
   <string name="crash_include_url2">&crash_include_url2;</string>
   <string name="crash_sorry">&crash_sorry;</string>
   <string name="crash_comment">&crash_comment;</string>
-  <string name="crash_allow_contact">&crash_allow_contact;</string>
+  <string name="crash_allow_contact2">&crash_allow_contact2;</string>
   <string name="crash_email">&crash_email;</string>
   <string name="crash_closing_alert">&crash_closing_alert;</string>
   <string name="sending_crash_report">&sending_crash_report;</string>
   <string name="crash_close_label">&crash_close_label;</string>
   <string name="crash_restart_label">&crash_restart_label;</string>
   <string name="exit_label">&exit_label;</string>
 
   <string name="launcher_shortcuts_title">&launcher_shortcuts_title;</string>