From dfe8f0ad4e8132102727a450877cb55ac8496181 Mon Sep 17 00:00:00 2001
From: Nicolas Carlo <nickecarlo@gmail.com>
Date: Thu, 11 Jul 2013 10:43:36 -0400
Subject: [PATCH] Bug 888144 - Add a "Maybe later" option for Feedback prompt.
 r=mleibovic

---
 mobile/android/chrome/content/aboutFeedback.xhtml     | 7 +++++--
 mobile/android/locales/en-US/chrome/aboutFeedback.dtd | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mobile/android/chrome/content/aboutFeedback.xhtml b/mobile/android/chrome/content/aboutFeedback.xhtml
index b9d5ab59f79..27bcc957092 100644
--- a/mobile/android/chrome/content/aboutFeedback.xhtml
+++ b/mobile/android/chrome/content/aboutFeedback.xhtml
@@ -33,7 +33,9 @@
     <div class="link-box-bottom" onclick="switchSection('sad');">
       <a>&intro.sadLink;</a>
     </div>
-    <div id="sumo-message" class="fine-print">&support.pre;<a id="sumo-link">&support.link;</a>&support.post;</div>
+    <div class="bottom-links">
+      <a onclick="maybeLater();">&intro.maybeLater;</a>
+    </div>
   </section>
 
   <section id="happy">
@@ -47,7 +49,7 @@
       <a>&happy.ratingLink;</a>
     </div>
     <div class="bottom-links">
-      <a onclick="maybeLater();">&happy.maybeLater;</a>
+      <a onclick="maybeLater();">&happy.maybeLater2;</a>
       <a onclick="window.close();">&happy.noThanks;</a>
     </div>
   </section>
@@ -61,6 +63,7 @@
       <div class="fine-print">&feedback.privacy;</div>
       <input class="send-feedback" type="submit" value="&feedback.send;"/>
     </form>
+    <div id="sumo-message" class="fine-print">&support.pre2;<a id="sumo-link">&support.link;</a>&support.post2;</div>
   </section>
 
   <section id="thanks-sad">
diff --git a/mobile/android/locales/en-US/chrome/aboutFeedback.dtd b/mobile/android/locales/en-US/chrome/aboutFeedback.dtd
index 8051313c197..c42c5c50e8b 100644
--- a/mobile/android/locales/en-US/chrome/aboutFeedback.dtd
+++ b/mobile/android/locales/en-US/chrome/aboutFeedback.dtd
@@ -12,13 +12,14 @@
 <!ENTITY intro.message             "Tell us what you think about &brandShortName; for Android so far.">
 <!ENTITY intro.happyLink           "I love it">
 <!ENTITY intro.sadLink             "I ran into some problems">
+<!ENTITY intro.maybeLater          "Maybe later">
 
 <!-- LOCALIZATION NOTE (support.pre): Include a trailing space as needed. -->
 <!-- LOCALIZATION NOTE (support.link): Avoid leading/trailing spaces, this text is a link. -->
 <!-- LOCALIZATION NOTE (support.post): Include a starting space as needed. -->
-<!ENTITY support.pre               "If you need help or have a problem with &brandShortName;, please visit ">
+<!ENTITY support.pre2              "You can also visit ">
 <!ENTITY support.link              "&brandShortName; Support">
-<!ENTITY support.post              ".">
+<!ENTITY support.post2             " for more information.">
 
 <!ENTITY happy.header              "That's great to hear!">
 
@@ -31,7 +32,7 @@
 <!ENTITY happy.finePrint           "It takes less than a minute and feels great.">
 
 <!ENTITY happy.ratingLink          "Yes, go to Google Play">
-<!ENTITY happy.maybeLater          "Maybe Later">
+<!ENTITY happy.maybeLater2         "Maybe later">
 <!ENTITY happy.noThanks            "No thanks">
 
 <!ENTITY sad.message               "We're sorry that you had some problems with &brandShortName;. Please tell us what happened so that we can fix it.">