From c8cbe621e9653fbc06a211949b72e6c7e0394a06 Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Thu, 9 Jan 2014 19:56:58 +0100
Subject: [PATCH] Bug 957167 - MetroFX crash prompt: Allow positioning privacy
 policy link at arbitrary position in sentence. r=tabraldes

---
 browser/metro/base/content/pages/crashprompt.xhtml | 8 +++-----
 browser/metro/locales/en-US/chrome/crashprompt.dtd | 7 ++++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/browser/metro/base/content/pages/crashprompt.xhtml b/browser/metro/base/content/pages/crashprompt.xhtml
index a3287167ace..a0ffa9575cf 100644
--- a/browser/metro/base/content/pages/crashprompt.xhtml
+++ b/browser/metro/base/content/pages/crashprompt.xhtml
@@ -103,11 +103,9 @@
           <label id="crashpromptDetailedMessage">
             &crashprompt.detailedMessage.firstParagraph;<br />
             &crashprompt.detailedMessage.secondParagraph;<br />
-            &crashprompt.detailedMessage.thirdParagraph;
-            <a id="privacyPolicyLink"
-               href="javascript:togglePrivacyDetails();">
-              &crashprompt.privacyPolicyLink;
-            </a>
+            &crashprompt.detailedMessage.thirdParagraphBeforeLink;<!--
+            --><a id="privacyPolicyLink" href="javascript:togglePrivacyDetails();">&crashprompt.privacyPolicyLink;</a><!--
+            -->&crashprompt.detailedMessage.thirdParagraphAfterLink;
           </label>
         </div>
       </p>
diff --git a/browser/metro/locales/en-US/chrome/crashprompt.dtd b/browser/metro/locales/en-US/chrome/crashprompt.dtd
index ac0b81211d4..d023a21a524 100644
--- a/browser/metro/locales/en-US/chrome/crashprompt.dtd
+++ b/browser/metro/locales/en-US/chrome/crashprompt.dtd
@@ -8,8 +8,13 @@
 <!ENTITY crashprompt.detailsLink     "What's in a crash report?">
 <!ENTITY crashprompt.detailedMessage.firstParagraph "A crash report contains some details about the crash, your machine, as well as a snapshot of the state of your browser when it crashed.">
 <!ENTITY crashprompt.detailedMessage.secondParagraph "This may include things like open pages, text typed into forms and the content of open messages, recent browsing history, or geolocation shared with a site.">
-<!ENTITY crashprompt.detailedMessage.thirdParagraph "We use crash reports to try to fix problems and improve our products. We handle your information as we describe in our ">
+<!-- LOCALIZATION NOTE (crashprompt.detailedMessage.thirdParagraphBeforeLink, crashprompt.privacyPolicyLink, crashprompt.detailedMessage.thirdParagraphAfterLink):
+     These three entities form a single sentence. crashprompt.detailedMessage.thirdParagraphBeforeLink is the start of the sentence,
+     crashprompt.privacyPolicyLink is a clickable link the middle and crashprompt.detailedMessage.thirdParagraphAfterLink is the end of the sentence.
+     -->
+<!ENTITY crashprompt.detailedMessage.thirdParagraphBeforeLink "We use crash reports to try to fix problems and improve our products. We handle your information as we describe in our ">
 <!ENTITY crashprompt.privacyPolicyLink "&brandShortName; privacy policy">
+<!ENTITY crashprompt.detailedMessage.thirdParagraphAfterLink ".">
 <!ENTITY crashprompt.includeURLLabel "Include the address of the page I was on">
 <!ENTITY crashprompt.acceptbutton    "Send reports">
 <!ENTITY crashprompt.refusebutton    "Don't send">