Bug 1410646 - Fix SeaMonkey help "log into/onto" and related instances. r=frg
☠☠ backed out by 8f0391949050 ☠ ☠
authorTon <tonnes.mb@gmail.com>
Sat, 21 Oct 2017 19:39:18 +0200
changeset 29230 afdac93f14107db31e1f9d82b966b1b06e46d777
parent 29229 85fa84e4ffdc2222075f8f69df5d81a90f798e49
child 29231 f01fe3bcd422ad48ada57f9bfe726c654e7ea098
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg
bugs1410646
Bug 1410646 - Fix SeaMonkey help "log into/onto" and related instances. r=frg
suite/locales/en-US/chrome/common/help/certs_help.xhtml
suite/locales/en-US/chrome/common/help/composer_help.xhtml
suite/locales/en-US/chrome/common/help/mailnews_account_settings.xhtml
suite/locales/en-US/chrome/common/help/mailnews_using_mail.xhtml
suite/locales/en-US/chrome/common/help/passwords_help.xhtml
suite/locales/en-US/chrome/common/help/using_certs_help.xhtml
suite/locales/en-US/chrome/common/help/using_priv_help.xhtml
--- a/suite/locales/en-US/chrome/common/help/certs_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/certs_help.xhtml
@@ -337,17 +337,17 @@
 
 <p>When you select a module or device, information about the selected item
   appears in the middle of the window, and some of the buttons on the right
   side of the window become available. In general, you perform an action on
   a module or device by selecting its name and clicking the appropriate
   button:</p>
 
 <ul>
-  <li><strong>Log In</strong>: Log into the selected security device.</li>
+  <li><strong>Log In</strong>: Log in to the selected security device.</li>
   <li><strong>Log Out</strong>: Log out of the selected security device. After
     you have logged out of the device, the device and the certificates it
     contains will not be available until you log in again.</li>
   <li><strong>Change Password</strong>: Change the master password for the
     selected security device.</li>
   <li><strong>Load</strong>: Displays a dialog box that allows you to specify
     the name and location of a new PKCS #11 module. Before adding a new module,
     you should first install the module software on your computer and if
--- a/suite/locales/en-US/chrome/common/help/composer_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/composer_help.xhtml
@@ -2405,17 +2405,17 @@
     address of your publishing home directory. This is the web address of the
     home page at your website. Do not include a filename or subdirectory as
     part of the URL.
 
     <p>This URL must always begin with <tt>http://</tt>. In some cases, this
       URL is the same as the publishing address. If you are not sure what to
       enter, ask your ISP or system administrator, or else leave it blank.</p>
   </li>
-  <li><strong>User name</strong>: Specifies the user name you use to log into
+  <li><strong>User name</strong>: Specifies the user name you use to log in to
     your ISP or network.</li>
   <li><strong>Password</strong>: Specifies the password for your user
     name.</li>
   <li><strong>Save Password</strong>: Select this to encrypt and save your
     password securely using Password Manager so that you don&apos;t have to
     enter it each time you publish pages at this site.</li>
 </ul>
 
--- a/suite/locales/en-US/chrome/common/help/mailnews_account_settings.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mailnews_account_settings.xhtml
@@ -238,17 +238,17 @@
         user&apos;s credentials as supported by the server, such as
         <a href="glossary.xhtml#cram_md5">CRAM-MD5</a>. This option is safe
         to use even if the connection security setting is <q>None</q>, but
         only the password would be secured in this way, not any content.</li>
       <li><strong>Kerberos / GSSAPI</strong>: Choose this option if your
         computer is set up for secure authentication using
         <a href="glossary.xhtml#kerberos">Kerberos</a>. You may need to
         acquire a Kerberos ticket by using a separate program, or it may be
-        assigned to you when logging into your computer.</li>
+        assigned to you when logging in to your computer.</li>
       <li><strong>NTLM</strong>: Choose this option if your computer is set up
         for secure authentication using an <a href="glossary.xhtml#ntlm">NT
         LAN Manager</a>. In general, Kerberos should be preferred over NTLM as
         it provides for a higher level of security.</li>
       <li><strong>TLS Certificate</strong>: Choose this option to use
         <a href="glossary.xhtml#certificate-based_authentication">certificate-based
         authentication</a> on a connection with SSL/TLS or STARTTLS enabled,
         without the need to provide any password for authentication.</li>
@@ -383,17 +383,17 @@
         user&apos;s credentials as supported by the server, such as
         <a href="glossary.xhtml#cram_md5">CRAM-MD5</a> or APOP. This option is
         safe to use even if the connection security setting is <q>None</q>, but
         only the password would be secured in this way, not any content.</li>
       <li><strong>Kerberos / GSSAPI</strong>: Choose this option if your
         computer is set up for secure authentication using
         <a href="glossary.xhtml#kerberos">Kerberos</a>. You may need to
         acquire a Kerberos ticket by using a separate program, or it may be
-        assigned to you when logging into your computer.</li>
+        assigned to you when logging in to your computer.</li>
       <li><strong>NTLM</strong>: Choose this option if your computer is set up
         for secure authentication using an <a href="glossary.xhtml#ntlm">NT
         LAN Manager</a>. In general, Kerberos should be preferred over NTLM as
         it provides for a higher level of security.</li>
       <li><strong>TLS Certificate</strong>: Choose this option to use
         <a href="glossary.xhtml#certificate-based_authentication">certificate-based
         authentication</a> on a connection with SSL/TLS or STARTTLS enabled,
         without the need to provide any password for authentication.</li>
@@ -1200,17 +1200,17 @@
         user&apos;s credentials as supported by the server, such as
         <a href="glossary.xhtml#cram_md5">CRAM-MD5</a>. This option is safe
         to use even if the connection security setting is <q>None</q>, but
         only the password would be secured in this way, not any content.</li>
       <li><strong>Kerberos / GSSAPI</strong>: Choose this option if your
         computer is set up for secure authentication using
         <a href="glossary.xhtml#kerberos">Kerberos</a>. You may need to
         acquire a Kerberos ticket by using a separate program, or it may be
-        assigned to you when logging into your computer.</li>
+        assigned to you when logging in to your computer.</li>
       <li><strong>NTLM</strong>: Choose this option if your computer is set up
         for secure authentication using an <a href="glossary.xhtml#ntlm">NT
         LAN Manager</a>. In general, Kerberos should be preferred over NTLM as
         it provides for a higher level of security.</li>
     </ul>
     If you are unsure which options are supported by your server, contact your
     service provider or system administrator.
   </li>
--- a/suite/locales/en-US/chrome/common/help/mailnews_using_mail.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mailnews_using_mail.xhtml
@@ -125,17 +125,17 @@
 <p>To get new messages for all your mail accounts, begin from the Mail
   window:</p>
 
 <ol>
   <li>Click the triangle on the Get Msgs button in the Mail toolbar.</li>
   <li>Choose Get All New Messages. &brandShortName; Mail &amp; Newsgroups
     retrieves new messages for all your mail accounts.
 
-    <p>If you are not currently logged into one of your mail accounts, Mail
+    <p>If you are not currently logged in to one of your mail accounts, Mail
       &amp; Newsgroups first prompts you to enter your user name and password
       before retrieving new messages for that account. (If you have already
       stored your user name and password using the Password Manager, Mail &amp;
       Newsgroups doesn&apos;t prompt you for this information.)</p>
   </li>
 </ol>
 
 <p><strong>Note</strong>: You can also open the File menu (in the Mail window)
--- a/suite/locales/en-US/chrome/common/help/passwords_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/passwords_help.xhtml
@@ -125,17 +125,17 @@
   Manage Stored Passwords from the submenu.</p>
 
 <p>The Password Manager has two tabs:</p>
 
 <ol>
   <li><strong>Passwords Saved</strong>: Click this tab to view the list of
     websites for which Password Manager has saved your user name and
     password&mdash;that is, the websites for which you selected <q>Yes</q>
-    in response to Password Manager&apos;s request to store logon
+    in response to Password Manager&apos;s request to store login
     information.
 
     <p>The second column shows the user name for each website. If the password
       is stored in encrypted form, <q>(encrypted)</q> appears after the user
       name.</p>
 
     <p>By default, stored passwords are not displayed.</p>
 
@@ -146,23 +146,23 @@
     </ul>
 
     <p>If you remove an entry from the list, the stored user name and password
       will be discarded, and you will need to log in manually the next time you
       visit that website.</p>
   </li>
   <li><strong>Passwords Never Saved</strong>: Click this tab to view the list
     of websites for which you selected <q>Never for this site</q> in response
-    to Password Manager&apos;s request to store logon information.
+    to Password Manager&apos;s request to store login information.
 
     <p>If a website is included on this list, you will always have to type in
-      your user name and password manually when you log onto the website.</p>
+      your user name and password manually when you log in to the website.</p>
 
     <p>If you remove an entry from this list, Password Manager will again ask
-      you, the next time you log onto the website, whether to store your user
+      you, the next time you log in to the website, whether to store your user
       name and password.</p>
   </li>
 </ol>
 
 <p>Regardless of which tab you are viewing, you can remove entries from the
   list as follows:</p>
 
 <ul>
--- a/suite/locales/en-US/chrome/common/help/using_certs_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/using_certs_help.xhtml
@@ -395,19 +395,19 @@
   security devices managed by each module below its name.</p>
 
 <p>When you select a security device, information about it appears in the
   middle of the Device Manager window, and some of the buttons on the right
   side of the window become available. For example, if you select the Software
   Security Device, you can perform these actions:</p>
 
 <ul>
-  <li>Click Login or Logout to log in or out of the Software Security Device.
+  <li>Click Log In or Log Out to log in to or out of the Software Security Device.
     If you are logging in, you will be asked to supply the master password for
-    the device. You must be logged into a security device before your browser
+    the device. You must be logged in to a security device before your browser
     software can use it to provide cryptographic services.</li>
   <li>Click Change Password to change the master password for the device.</li>
 </ul>
 
 <p>You can perform these actions on most security devices. However, you cannot
   perform them on the Builtin Object Token or Generic Crypto Services, which
   are special devices that must normally be available at all times.</p>
 
--- a/suite/locales/en-US/chrome/common/help/using_priv_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/using_priv_help.xhtml
@@ -406,17 +406,17 @@
 <h1 id="using_the_password_manager">Using the Password Manager</h1>
 
 <p>Many websites require you to type a user name and password before you can
   enter the website. For instance, personalized pages and websites containing
   your financial information usually require you to log in.</p>
 
 <p>The user name and password you use at a particular website can be read by the
   site&apos;s administrator. Potentially, that person could then attempt to log
-  into other websites where you may have used the same user name and password.
+  in to other websites where you may have used the same user name and password.
   If this concerns you, you may wish to use a different password at every
   website with which you register.</p>
 
 <p>Password Manager can help you remember some or all of your names and
   passwords by storing them on your computer&apos;s hard disk, and entering
   them for you automatically when you visit such websites.</p>
 
 <div class="contentsBox">In this section:
@@ -436,45 +436,45 @@
 
 <h2 id="using_password_manager_to_remember_user_names_and_passwords">Using
   Password Manager to Remember User Names and Passwords</h2>
 
 <p>When Password Manager is active (as it is by default), it gives you an
   opportunity to save user names and passwords on your hard drive that you
   enter while using the Internet.</p>
 
-<p>For example, after you log onto a website from a page that requests a user
+<p>For example, after you log in to a website from a page that requests a user
   name and password, a dialog box appears asking, <q>Do you want Password
-  Manager to remember this logon?</q> When you see this dialog box, you can
+  Manager to remember this login?</q> When you see this dialog box, you can
   click one of the following buttons:</p>
 
 <ul>
   <li><strong>Yes</strong>: The next time you return to the website you&apos;ll
     see that your user name and password are already filled in. All you have to
-    do is click the Login button (or equivalent) to send them to the
+    do is click the Log In button (or equivalent) to send them to the
     server.</li>
   <li><strong>Never for this site</strong>: Password Manager will not ask in
     the future if you want to save your user name and password for that
     website.</li>
   <li><strong>No</strong>: Password Manager won&apos;t remember the user name
     and password, but will ask again the next time you visit the website.</li>
 </ul>
 
-<p>Similarly, when you log onto an email account or an FTP site, or perform any
+<p>Similarly, when you log in to an email account or an FTP site, or perform any
   other action that requires the browser itself to display a special dialog box
   for your login information, you can select this option in the dialog box:</p>
 
 <ul>
   <li><strong>Use Password Manager to remember these values</strong></li>
 </ul>
 
 <p>The next time you check your email or perform other tasks that require a
   password only, the password will be submitted directly without any further
   action on your part. For tasks that require you to enter both a user name and
-  password, you need to click a Login button or equivalent after Password
+  password, you need to click a Log In button or equivalent after Password
   Manager fills in the information.</p>
 
 <p>Password Manager saves your user names and passwords on your own computer in
   a file that&apos;s difficult, but not impossible, for an intruder to read.
   See <a href="#encrypting_stored_sensitive_information">Encrypting Stored
   Sensitive Information</a> for information on protecting your stored user
   names and passwords with encryption technology.</p>
 
@@ -498,18 +498,18 @@
 <ul>
   <li>You use Password Manager to remember your user name and password for a
     website (using the three-button dialog box described in
     <a href=
     "#using_password_manager_to_remember_user_names_and_passwords">Using
     Password Manager to Remember User Names and Passwords</a>).
 
     <p>The next time you visit the website, Password Manager automatically fills
-      in your user name and password on the website&apos;s log in page. You can
-      then click the Login button, or equivalent, to send the information to
+      in your user name and password on the website&apos;s login page. You can
+      then click the Log In button, or equivalent, to send the information to
       the server.</p>
   </li>
   <li>You use Password Manager to remember your user name and password for an
     email account, an FTP site, or in any other situation where you type login
     information in a dialog box that displays a checkbox labeled <q>Use
     Password Manager to remember these values</q>.
 
     <p>In most cases, the next time you attempt to access that server, Password
@@ -547,17 +547,17 @@
 
 <p>[<a href="#using_the_password_manager">Return to beginning of
   section</a>]</p>
 
 <h2 id="viewing_and_managing_stored_passwords">Viewing and Managing Stored
   Passwords</h2>
 
 <p>To see the user names and passwords you have stored and to display a list of
-  websites from which logon information never is saved:</p>
+  websites from which login information never is saved:</p>
 
 <ul>
   <li>Open the Tools menu, choose Password Manager, and then choose Manage
     Stored Passwords from the submenu. You see the Password Manager window with
     the Passwords Saved tab opened.
     <ul>
       <li>To see your saved passwords, click Show Passwords and confirm your
         choice.</li>
@@ -565,17 +565,17 @@
       <li>To remove an entry from the list, click it and then click Remove. The
         next time you visit the website, you will need to enter your user name
         and password again, since Password Manager will no longer have the
         information.</li>
     </ul>
     Click the Passwords Never Saved tab to see a list of the websites for which
     you instructed Password Manager never to store user names and passwords. To
     remove a website from this list, click it and then click Remove. The next
-    time you log into the website, you can use the stored user name and
+    time you log in to the website, you can use the stored user name and
     password (if available) or indicate that you want Password Manager to save
     the information for that website.</li>
 </ul>
 
 <p>[<a href="#using_the_password_manager">Return to beginning of
   section</a>]</p>
 
 <h1 id="clearing_private_data">Clearing Private Data</h1>
@@ -884,17 +884,17 @@
     new items or search terms entered will not be recorded and saved.</li>
 </ul>
 
 <h3>Cookies</h3>
 
 <ul>
   <li>A private window can collect cookies from the sites it visits, but a
     private window does not share cookies with a non-private window and vice
-    versa. For example, if you log into a website in a regular window, then
+    versa. For example, if you log in to a website in a regular window, then
     open a private window to continue, you likely will be asked to enter your
     credentials again.</li>
   <li>Cookies in a private session are accepted according to the settings,
     but only retained for the duration of that session regardless of the
     lifetime allowed in a non-private window.</li>
   <li>Existing exceptions to the cookie policy will be honored in private
     windows, and any new exceptions you create will be retained after the
     private session has ended.</li>