Bug 476477: improve wording of the about:sessionrestore page, r=gavin, ui-r=faaborg,madhava, a=mconnor
authorMike Beltzner <beltzner@mozilla.com>
Fri, 20 Mar 2009 00:33:49 -0400
changeset 26408 4be589e93b22
parent 26407 bd315a993149
child 26409 542e7bcb3e0f
push id6051
push userdgottwald@mozilla.com
push dateFri, 20 Mar 2009 08:38:30 +0000
treeherdermozilla-central@451c1f1753f0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin, faaborg, madhava, mconnor
bugs476477
milestone1.9.2a1pre
Bug 476477: improve wording of the about:sessionrestore page, r=gavin, ui-r=faaborg,madhava, a=mconnor
browser/components/sessionstore/content/aboutSessionRestore.xhtml
browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd
browser/themes/gnomestripe/browser/aboutSessionRestore.css
browser/themes/pinstripe/browser/aboutSessionRestore.css
browser/themes/winstripe/browser/aboutSessionRestore.css
--- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml
+++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml
@@ -47,50 +47,51 @@
   %restorepageDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&restorepage.tabtitle;</title>
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all"/>
     <link rel="stylesheet" href="chrome://browser/skin/aboutSessionRestore.css" type="text/css" media="all"/>
-    <link rel="icon" type="image/png" href="chrome://global/skin/icons/question-16.png"/>
+    <link rel="icon" type="image/png" href="chrome://global/skin/icons/warning-16.png"/>
 
     <script type="application/javascript" src="chrome://browser/content/aboutSessionRestore.js"/>
   </head>
 
   <body dir="&locale.dir;">
 
     <!-- PAGE CONTAINER (for styling purposes only) -->
     <div id="errorPageContainer">
     
       <!-- Error Title -->
       <div id="errorTitle">
-        <h1 id="errorTitleText">&restorepage.pagetitle;</h1>
+        <h1 id="errorTitleText">&restorepage.errorTitle;</h1>
       </div>
       
       <!-- LONG CONTENT (the section most likely to require scrolling) -->
       <div id="errorLongContent">
       
         <!-- Short Description -->
         <div id="errorShortDesc">
-          <p id="errorShortDescText">&restorepage.issueDesc;</p>
+          <p id="errorShortDescText">&restorepage.problemDesc;</p>
         </div>
 
         <!-- Long Description (Note: See netError.dtd for used XHTML tags) -->
         <div id="errorLongDesc">
-          <p>&restorepage.remedies;</p>
+          <p>&restorepage.tryThis;</p>
           <ul>
-            <li>&restorepage.dueToChrome;</li>
-            <li>&restorepage.dueToContent;</li>
+            <li>&restorepage.restoreSome;</li>
+            <li>&restorepage.startNew;</li>
           </ul>
         </div>
 
         <!-- Short Description -->
         <div id="errorTrailerDesc">
+          <p>&nbsp;</p>
           <tree xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
                 id="tabList" flex="1" seltype="single" hidecolumnpicker="true"
                 onclick="onListClick(event);" onkeydown="onListKeyDown(event);"
                 _window_label="&restorepage.windowLabel;">
             <treecols>
               <treecol id="restore" type="checkbox" label="&restorepage.restoreHeader;"/>
               <splitter class="tree-splitter"/>
               <treecol primary="true" id="title" label="&restorepage.listHeader;" flex="1"/>
@@ -101,21 +102,21 @@
       </div>
 
       <!-- Buttons -->
       <hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="buttons">
 #ifdef XP_UNIX
         <button id="errorCancel" label="&restorepage.cancelButton;"
                 accesskey="&restorepage.cancel.access;"
                 oncommand="startNewSession();"/>
-        <button id="errorTryAgain" label="&restorepage.restoreButton;"
+        <button id="errorTryAgain" label="&restorepage.tryagainButton;"
                 accesskey="&restorepage.restore.access;"
                 oncommand="restoreSession();"/>
 #else
-        <button id="errorTryAgain" label="&restorepage.restoreButton;"
+        <button id="errorTryAgain" label="&restorepage.tryagainButton;"
                 accesskey="&restorepage.restore.access;"
                 oncommand="restoreSession();"/>
         <button id="errorCancel" label="&restorepage.cancelButton;"
                 accesskey="&restorepage.cancel.access;"
                 oncommand="startNewSession();"/>
 #endif
       </hbox>
       <!-- holds the session data for when the tab is closed -->
--- a/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd
@@ -1,18 +1,19 @@
 <!ENTITY restorepage.tabtitle       "Restore Session">
-<!ENTITY restorepage.pagetitle      "Would you like to restore your session?">
-<!-- LOCALIZATION NOTE: If "closed unexpectedly" sounds too awkward in the translation,
-                        you may translate "crash" instead (even though it's IT-speak) -->
-<!ENTITY restorepage.issueDesc      "Your previous &brandShortName; session closed unexpectedly. We sincerely apologize for the inconvenience. You can restore the tabs and windows from your previous session, or start a new session if they are no longer needed.">
-<!ENTITY restorepage.remedies       "If &brandShortName; closes repeatedly:">
-<!ENTITY restorepage.dueToChrome    "Try disabling any recently added extensions in the Add-ons Manager.">
-<!ENTITY restorepage.dueToContent   "Try restoring your session without any Web pages you suspect might be causing the problem:">
 
-<!ENTITY restorepage.restoreButton  "Restore Previous Session">
+<!-- LOCALIZATION NOTE: The title is intended to be apologetic and disarming, expressing dismay
+     and regret that we are unable to restore the session for the user -->
+<!ENTITY restorepage.errorTitle     "Well, this is embarassing.">
+<!ENTITY restorepage.problemDesc    "&brandShortName; is having trouble recovering your windows and tabs. This is usually caused by a recently opened web page.">
+<!ENTITY restorepage.tryThis        "You can try:">
+<!ENTITY restorepage.restoreSome    "Removing one or more tabs that you think may be causing the problem">
+<!ENTITY restorepage.startNew       "Starting an entirely new browsing session">
+
+<!ENTITY restorepage.tryagainButton "Restore">
 <!ENTITY restorepage.restore.access "R">
 <!ENTITY restorepage.cancelButton   "Start New Session">
 <!ENTITY restorepage.cancel.access  "S">
 
 <!ENTITY restorepage.restoreHeader  "Restore">
 <!ENTITY restorepage.listHeader     "Windows and Tabs">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
 <!ENTITY restorepage.windowLabel    "Window &#37;S">
--- a/browser/themes/gnomestripe/browser/aboutSessionRestore.css
+++ b/browser/themes/gnomestripe/browser/aboutSessionRestore.css
@@ -33,17 +33,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 %endif
 
 #errorPageContainer {
-  background-image: url("moz-icon://stock/gtk-dialog-question?size=dialog");
+  background-image: url("moz-icon://stock/gtk-dialog-warning?size=dialog");
 }
 
 #tabList {
   width: 100%;
   height: 12em;
 }
 
 treechildren::-moz-tree-image(icon),
--- a/browser/themes/pinstripe/browser/aboutSessionRestore.css
+++ b/browser/themes/pinstripe/browser/aboutSessionRestore.css
@@ -32,17 +32,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 %endif
 
 #errorPageContainer {
-  background-image: url("chrome://global/skin/icons/question-64.png");
+  background-image: url("chrome://global/skin/icons/warning-64.png");
 }
 
 #tabList {
   width: 100%;
   height: 12em;
 }
 
 treechildren::-moz-tree-image(icon),
--- a/browser/themes/winstripe/browser/aboutSessionRestore.css
+++ b/browser/themes/winstripe/browser/aboutSessionRestore.css
@@ -32,17 +32,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 %endif
 
 #errorPageContainer {
-  background-image: url("chrome://global/skin/icons/question-48.png");
+  background-image: url("chrome://global/skin/icons/warning-large.png");
 }
 
 #tabList {
   width: 100%;
   height: 12em;
 }
 
 treechildren::-moz-tree-image(icon),