Bug 890529 - Update localization note on crashprompt strings. r=ally
authorJim Mathies <jmathies@mozilla.com>
Tue, 23 Jul 2013 15:29:00 -0500
changeset 139658 e17e3530022579324a5835b4462fe6fb476b3dc4
parent 139657 c0ae4eae38ebaf4b225339bbe0f58502ae5fb025
child 139659 43a95d462272b7c8653d52b6697ce7a60c9885fa
push id31434
push userjmathies@mozilla.com
push dateTue, 23 Jul 2013 20:34:07 +0000
treeherdermozilla-inbound@e17e35300225 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersally
bugs890529
milestone25.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 890529 - Update localization note on crashprompt strings. r=ally
browser/metro/base/content/prompt/prompt.js
browser/metro/locales/en-US/chrome/crashprompt.properties
--- a/browser/metro/base/content/prompt/prompt.js
+++ b/browser/metro/base/content/prompt/prompt.js
@@ -78,17 +78,17 @@ var CrashPrompt = {
       return;
     }
     // populate the text blurb with localized text
     let brandName = Services.strings.createBundle("chrome://branding/locale/brand.properties")
                                     .GetStringFromName("brandShortName");
     let vendorName = Services.strings.createBundle("chrome://branding/locale/brand.properties")
                                      .GetStringFromName("vendorShortName");
     let crashBundle = Services.strings.createBundle("chrome://browser/locale/crashprompt.properties");
-    let message = crashBundle.formatStringFromName("crashprompt.messagebody", [brandName, vendorName, brandName], 3);
+    let message = crashBundle.formatStringFromName("crashprompt.messagebody2", [brandName, vendorName], 2);
     let descElement = document.getElementById("privacy-crash-blurb");
     descElement.textContent = message;
 
     // focus the send button
     document.getElementById('crash-button-accept').focus();
   },
 
   accept: function() {
--- a/browser/metro/locales/en-US/chrome/crashprompt.properties
+++ b/browser/metro/locales/en-US/chrome/crashprompt.properties
@@ -1,6 +1,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE: '%S' is short brand name
-crashprompt.messagebody=We are sorry, %S just recovered from a crash. Sending crash reports will help %S make %S more stable and secure. You can always change your preference in Settings/Options.
+# LOCALIZATION NOTE (crashprompt.messagebody2): %1$S - short brand name, %2$S - vendor name
+crashprompt.messagebody2=We are sorry, %1$S just recovered from a crash. Sending crash reports will help %2$S make %1$S more stable and secure. You can always change your preference in Settings/Options.