Bug 749955 - Update en-GB for SeaMonkey 2.10 (help files) - review pending
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 14 May 2012 13:44:07 +0100
changeset 462 f968240e6df82361ca92e55dd4140e1efe418c2f
parent 461 e2938a12387f5eb9c0dcb0645257f80281d50e87
child 463 c3702a302c55a89808126d4883de1f6b72ac8c2c
push id168
push useriann_cvs@blueyonder.co.uk
push dateMon, 14 May 2012 12:48:06 +0000
bugs749955
Bug 749955 - Update en-GB for SeaMonkey 2.10 (help files) - review pending
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/ssl_help.xhtml
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -46,23 +46,30 @@
   you&apos;re not already viewing it, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Click the Advanced category.</li>
 </ol>
 
-<p class="unix">The main Advanced preferences panel allows you to:</p>
+<p>The main Advanced preferences panel allows you to:</p>
 
 <ul>
-  <li class="unix"><strong>Use Preferences from System</strong>: Select
-    this to use the already set system preferences, overriding 
-    &brandShortName;&apos; ones.
-  </li>
+  <li class="unix"><strong>Use Preferences from System</strong>: Select this to
+    use the already set system preferences, overriding &brandShortName;&apos;.</li>
+  <li class="win"><strong>Check default application settings on startup</strong>:
+    Select this to have &brandShortName; check whether it is the default
+    application for tasks like browsing and mail. If &brandShortName; detects
+    on startup that it is not the default application for any of these tasks,
+    a dialogue will appear that allows you to choose which tasks
+    &brandShortName; should handle by default.</li>
+  <li><strong>Submit crash reports</strong>: Select this to enable the Mozilla
+    Crash Reporter. If &brandShortName; crashes, you will be asked in each case
+    whether to report the issue.</li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="scripts_and_plugins">Advanced Preferences - Scripts &amp;
   Plugins</h2>
 
 <p>This section describes how to use the Scripts &amp; Plugins preferences
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -88,35 +88,51 @@
   </li>
   <li class="win"><strong>Default Browser</strong>: Allows you to set
     &brandShortName; as the default browser or shows you that it is.
     <ul>
       <li><strong>Set Default Browser</strong>: Unless it is greyed out, click
         this to set &brandShortName; as your default browser.</li>
     </ul>
   </li>
-  <li><strong>Home Page</strong>: In the field, type the web page you want as
+  <li><strong>When restoring sessions and windows</strong>: Choose how many
+    (if any) browser tabs should be restored at a time upon startup.
+    <ul>
+      <li><strong>Restore all tabs immediately</strong>: All the tabs you had
+        open the last time will be restored and loaded at once. This can affect
+        startup performance negatively if a large amount of tabs needs to be
+        restored in parallel.</li>
+      <li><strong>Restore [__] tab(s) at a time</strong>: If you choose this,
+        only the specified amount of tabs will be restored at a time. If you
+        had more tabs open than specified here, any extra tabs will only be
+        loaded once the loading of one of the other tabs has finished.</li>
+      <li><strong>Only restore tabs when I need them</strong>: This disables
+        automatic restoring of tabs, i.e. tabs will only be loaded if you
+        switch to or reload them.</li>
+    </ul>
+  </li>
+  <li>Home button preferences: In the field, type the web page you want as
     your home page or do one of the following:
     <ul>
+      <li><strong>Choose File</strong>: Click this to locate a file on disc
+        that you want to load as your home page.</li>
       <li><strong>Use Current Page</strong>: Click this to use the web page
         currently displayed in the browser as your home page.</li>
       <li><strong>Use Current Group</strong>: If you have two or more browser
         tabs open, click this to set them as your Home Page Group (a group of
         tabs that are opened as your home page). After clicking this button,
         the message <q>Home Page Group is Set</q> appears in the location
         field.
 
         <p><strong>Caution</strong>: If you edit the field after clicking Use
           Current Group, your Home Page Group will be lost.</p>
 
       </li>
       <li><strong>Restore Default</strong>: Click this to revert to the
         default home page.</li>
-      <li><strong>Choose File</strong>: Click this to locate a file on disc
-        that you want to load as your home page.</li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="history">Browser Preferences - History</h2>
 
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -280,16 +280,34 @@
     you are currently composing automatically at the given interval. After a
     computer crash or program failure you can find the latest saved version of
     the message in your Drafts folder.</li>
   <li><strong>Confirm when using keyboard shortcut to send message</strong>:
     Tick this option if want to be asked if you&apos;re sure to be ready to
     send the message when you&apos;re pressing Ctrl+Return in message editor.
     This may help you avoid accidentally sending the message if you enter the
     keyboard shortcut by mistake when composing a message.</li>
+  <li><strong>Select reply header type</strong>:
+    Select the type of reply header you wish to use. There are four choices
+    available:
+    <ol>
+      <li>No Reply Header</li>
+      <li>[Author] wrote:<br/>
+        This setting is based on the mailnews.reply_header_authorwrote 
+        preference.</li>
+      <li>On [date], [author] wrote:<br/>
+        This setting is based on a combination of the mailnews.reply_header_ondate, 
+        mailnews.reply_header_separator and mailnews.reply_header_authorwrote 
+        preferences.</li>
+      <li>[Author] wrote, On [date]:<br/>
+        This setting is based on a combination of the 
+        mailnews.reply_header_authorwrote, mailnews.reply_header_separator and 
+        mailnews.reply_header_ondate preferences.</li>
+    </ol>
+  </li>
   <li><strong>Wrap plain text messages at [__] characters</strong>: Enter a
     number to set the right margin for text in the message area.</li>
   <li><strong>Defaults for HTML Messages</strong>: Here you can define what the
     defaults are for font, size, text and background colour if you choose to
     send mails in HTML format.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -42,35 +42,35 @@
 <h3 id="ssl_protocol_versions">SSL Protocol Versions</h3>
 
 <p>The Secure Sockets Layer (SSL) protocol defines rules governing mutual
   authentication between a web site and browser software and the encryption of
   information that flows between them. The Transport Layer Security (TLS)
   protocol is an IETF standard based on SSL. TLS 1.0 can be thought of as SSL
   3.1.</p>
 
-<p>You should normally leave these three tickboxes selected to ensure that
-  both older and newer web servers can work with the browser:</p>
+<p>You should normally leave all of the following tickboxes selected to ensure
+  that both older and newer web servers can work with the browser:</p>
 
 <ul>
-  <li><strong>Enable SSL version 3</strong>: Allows newer web servers to work
-    with the browser.</li>
-  <li><strong>Enable TLS</strong>: Allows web servers that support TLS to take
-    advantage of it.</li>
+  <li><strong>Enable SSL 3.0</strong>: Allows web servers that support SSL 3.0
+    to work with the browser.</li>
+  <li><strong>Enable TLS 1.0</strong>: Allows newer web servers that support TLS
+    to take advantage of it.</li>
 </ul>
 
 <p><strong>Important note regarding TLS</strong>: Some servers that do not
   implement SSL correctly cannot negotiate the SSL handshake with client
   software (such as the browser) that supports TLS. Such servers are known as
   <q>TLS intolerant</q>.</p>
 
-<p>When the Enable TLS option in the SSL preferences panel is selected, the
+<p>When the Enable TLS 1.0 option in the SSL preferences panel is selected, the
   browser attempts to use the TLS protocol when making secure connections with
   a server. If that connection fails because the server is TLS intolerant, the
-  browser will fall back to using SSL 3.0.</p>
+  browser will fall back to using SSL 3.0 (if enabled).</p>
 
 <h3 id="ssl_warnings">SSL Warnings</h3>
 
 <p>It&apos;s easy to tell when the web site you are viewing is using an encrypted
   connection. If the connection is encrypted, the lock icon in the lower-right
   corner of the browser window is locked. If the connection is not encrypted,
   the lock icon is unlocked.</p>