24.0: sync suite with en-US rev14213:6129078bfffc
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Thu, 01 Aug 2013 21:15:32 +0900
changeset 1133 f659f2361e436e86cd863bccc3592730a1fee08b
parent 1132 439a479775a8b3d9238ab748fd702e65e660c1d1
child 1134 0c5f8b92bf81120aca09a9630a605d031afba50e
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs24
24.0: sync suite with en-US rev14213:6129078bfffc
suite/chrome/browser/navigator.properties
suite/chrome/browser/pageInfo.dtd
suite/chrome/common/help/cert_dialog_help.xhtml
suite/chrome/common/help/certs_prefs_help.xhtml
suite/chrome/common/help/glossary.xhtml
suite/chrome/common/help/help-glossary.rdf
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/images/mail_newmail_alert.png
suite/chrome/common/help/images/mail_newmail_balloon.png
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/mailnews_security.xhtml
suite/chrome/common/help/privacy_help.xhtml
suite/chrome/common/help/privsec_help.xhtml
suite/chrome/common/help/shortcuts_navigator.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/help/using_certs_help.xhtml
suite/chrome/common/help/using_priv_help.xhtml
suite/chrome/common/help/validation_help.xhtml
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/mailnews/folderWidgets.properties
suite/chrome/mailnews/localMsgs.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/pref/am-server-advanced.dtd
suite/chrome/mailnews/pref/pref-notifications.dtd
--- a/suite/chrome/browser/navigator.properties
+++ b/suite/chrome/browser/navigator.properties
@@ -1,66 +1,67 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-nv_done=Done
+nv_done=完了
 nv_timeout=タイムアウト
 nv_stopped=中止
 openFile=ファイルを開く
 uploadFile=ファイルをアップロード
 
 droponhomebutton=ホームページに設定したいリンクやファイルをドロップしてください
 droponhometitle=ホームページ設定
 droponhomemsg=このドキュメントを新しいホームページに設定しますか?
 droponhomeokbutton=ホームページに設定
 
 jserror=このページでエラーが発生しました。詳細はダブルクリックして参照してください。
 
 #SessionHistory.js
 nothingAvailable=(利用できません)
 
-#nsContextMenu.js (setWallpaper confirmation dialog)
-wallpaperConfirmTitle  = 壁紙に設定
-wallpaperConfirmButton = 壁紙に設定する
-wallpaperConfirmMsg    = この画像をデスクトップの壁紙に設定しますか?
+#nsBrowserStatusHandler.js
+# LOCALIZATION NOTE: %S is the security certifiate issuer
+securityButtonTooltipSecure=%S の署名者
+securityButtonTooltipMixedContent=警告: 認証されていないコンテンツが含まれています
+securityButtonTooltipInsecure=現在のページについてのセキュリティ情報を表示します
 
 # menu_close labels
 tabs.closeTab.label=タブを閉じる
 tabs.closeTab.accesskey=C
 tabs.close.label=閉じる
 tabs.close.accesskey=C
 
 tabs.recentlyClosed.format=%1$S %2$S
 
 windows.recentlyClosed.format=%1$S %2$S
 
 tabs.closeWarningTitle=ブラウザの終了
-tabs.closeWarning=%S 個のタブが開かれたままになっていますが、ウィンドウを閉じてもいいですか?
+tabs.closeWarning=%S 個のタブが開かれていますが、ウィンドウを閉じてもよろしいですか?
 tabs.closeButton=すべてのタブを閉じる
-tabs.closeWarningPromptMe=複数のタブを開いたままウィンドウを閉じようとした場合、警告します。
+tabs.closeWarningPromptMe=複数のタブを開いたままウィンドウを閉じようとした場合に警告する
 tabs.historyItem=タブのグループ
 
 menuOpenAllInTabs.label=タブですべて開く
 
 # urlbarBindings.xml
 # LOCALIZATION NOTE: This is for the location bar drop-down string:
 #   "Search " + search_engine_name + " for " + user_input
 #   e.g. "Search Google for abc"
 # DO NOT change the %S order when translate, the first %S must be the search engine name.
 searchFor=%1$S で検索: "%2$S"
 
 # Star button
 starButtonOn.tooltip=このブックマークを編集
 starButtonOff.tooltip=このページをブックマーク
 
 # Edit Bookmark UI
-editBookmarkPanel.pageBookmarkedTitle=ページをブックマーク完了
+editBookmarkPanel.pageBookmarkedTitle=ページをブックマークに追加しました
 editBookmarkPanel.pageBookmarkedDescription=%S は、あなたのためにこのページを覚えています。
-editBookmarkPanel.bookmarkedRemovedTitle=ブックマークを削除完了
+editBookmarkPanel.bookmarkedRemovedTitle=ブックマークを削除しました
 editBookmarkPanel.editBookmarkTitle=このブックマークを編集
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
 # Semi-colon list of plural forms. Replacement for #1 is
 # the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=ブックマークを削除 (#1 件)
--- a/suite/chrome/browser/pageInfo.dtd
+++ b/suite/chrome/browser/pageInfo.dtd
@@ -88,16 +88,17 @@
 <!ENTITY  permAskAlways         "毎回確認する">
 <!ENTITY  permAllow             "許可">
 <!ENTITY  permAllowSession      "セッション中のみ許可">
 <!ENTITY  permBlock             "ブロック">
 <!ENTITY  permissionsFor        "許可情報:">
 <!ENTITY  permImage             "画像の読み込み">
 <!ENTITY  permPopup             "ポップアップウィンドウを開く">
 <!ENTITY  permCookie            "Cookie の保存">
+<!ENTITY  permNotifications     "通知の表示">
 <!ENTITY  permInstall           "拡張機能またはテーマのインストール">
 <!ENTITY  permGeo               "位置情報の送信">
 
 <!ENTITY  securityTab           "セキュリティ">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "このページのセキュリティ情報">
 <!ENTITY  securityView.certView "証明書の表示">
 <!ENTITY  securityView.accesskey "V">
--- a/suite/chrome/common/help/cert_dialog_help.xhtml
+++ b/suite/chrome/common/help/cert_dialog_help.xhtml
@@ -91,17 +91,17 @@
         identify you for the purposes of digitally signing email messages.</li>
       <li><strong>Email Recipient Certificate</strong>: Certificate used to
         identify someone else, for example so you can send that person
         encrypted email.</li>
       <li><strong>Status Responder Certificate</strong>: Certificate used to
         identify an online status responder that uses the Online Certificate
         Status Protocol (OCSP) to check the validity of certificates. For more
         information about OCSP, see
-        <a href="validation_help.xhtml">Validation Settings</a>.</li>
+        <a href="certs_prefs_help.xhtml">Certificates Settings</a>.</li>
       <li><strong>SSL Certificate Authority</strong>: Certificate used to
         identify a certificate authority&mdash;that is, a service that issues
         certificates for use as identification over computer networks.</li>
     </ul>
   </li>
   <li><strong>Issued To</strong>: Summarizes the following information about
     the certificate:
     <ul>
--- a/suite/chrome/common/help/certs_prefs_help.xhtml
+++ b/suite/chrome/common/help/certs_prefs_help.xhtml
@@ -67,22 +67,62 @@
 
 <h3 id="manage_certificates">Manage Certificates</h3>
 
 <p>Certificates are the digital equivalent of ID cards&mdash;they help other
   people identify you, and they help you identify other people, websites, and
   organizations.</p>
 
 <p>To examine or configure the certificates you have on file, click Manage
-  Certificates.</p>
+  Certificates. See <a href="using_certs_help.xhtml#managing_certificates">Managing
+  Certificates</a> for further information on this dialog.</p>
 
 <h3 id="manage_security_devices">Manage Security Devices</h3>
 
 <p>A security device is a hardware or software device that stores your
   certificates and keys. For example, a smart card is a security device. Your
   browser has its own built-in software security device, and you can use
   additional security devices, such as smart cards, at the same time.</p>
 
 <p>To examine or configure your security devices, click Manage Security
-  Devices.</p>
+  Devices. See <a href="using_certs_help.xhtml#managing_smart_cards_and_other_security_devices">Managing
+  Smart Cards and Other Security Devices</a> for further information on
+  this dialog.</p>
+
+<h3 id="ocsp">OCSP</h3>
+
+<p>A certificate revocation list (CRL) is a list of revoked certificates that
+  is generated and signed by a
+  <a href="glossary.xhtml#certificate_authority">certificate authority
+  (CA)</a>. The Online Certificate Status Protocol (OCSP) makes it possible for
+  Certificate Manager to perform an online check of a certificate&apos;s
+  validity each time the certificate is viewed or used. This process involves
+  checking the certificate against a CRL maintained at a server specified by
+  the CA of that certificate. Your computer must be online for OCSP to work.</p>
+
+<p>The following settings in the OCSP section of the Certificates preferences
+  panel determine how Certificate Manager uses OCSP:</p>
+
+<ul>
+  <li><strong>Use the Online Certificate Status Protocol (OCSP) to confirm the
+    current validity of certificates</strong>: Select this if you want
+    Certificate Manager to perform an online status check each time it verifies
+    a certificate. Certificate Manager makes sure that the certificate is
+    listed as valid at the URL and checks validity period and trust settings.
+
+    <p><strong>Note</strong>: If this setting is not selected, Certificate
+      Manager will only confirm the certificate&apos;s validity period and that
+      it is correctly signed by a CA whose own CA certificate is both listed
+      under the CA Certificates tab (in the main Certificate Manager window)
+      and marked as trusted for issuing that kind of certificate.</p>
+  </li>
+  <li><strong>When an OCSP server connection fails, treat the certificate as
+    invalid</strong>: Select this if you want the validation to fail if a
+    connection to the OCSP server can&apos;t be established, thus enforcing
+    that a certificate always must be positively validated for each use.</li>
+</ul>
+
+<p>For more detailed information on certificate validation, see
+  <a href="using_certs_help.xhtml#controlling_validation">How Certificate
+  Validation Works</a>.</p>
 
 </body>
 </html>
--- a/suite/chrome/common/help/glossary.xhtml
+++ b/suite/chrome/common/help/glossary.xhtml
@@ -536,16 +536,23 @@
   that requires you to download new messages to your local
   computer&mdash;although you can choose to leave copies on the server. With
   POP, you can store all your messages, including sent mail, drafts, and custom
   folders, on one computer only. By contrast,
   <a href="#imap">IMAP</a> allows you to permanently store all your messages
   and any changes to them on the server, where you can access them from any
   computer. Most <a href="#isp">ISPs</a> currently support POP.</dd>
 
+<dt id="private_browsing">private browsing</dt><dd>Browsing in a session in
+  which no private data (like browsing history, <a href="#cookie">cookies</a>,
+  and <a href="#cache">cached</a> content) are retained beyond the duration of
+  the private session. Private browsing should not be confused with anonymous
+  browsing and does not prevent <a href="#user_tracking">user tracking</a> or
+  monitoring of web activity by an internet provider or employer.</dd>
+
 <dt id="private_key">private key</dt><dd>One of a pair of
   <a href="#key">keys</a> used in public-key cryptography. The private key is
   kept secret and is used to decrypt data that has been encrypted with the
   corresponding public key.</dd>
 
 <dt id="proxy">proxy</dt><dd>An intermediary or <q>go-between</q> program that
   acts as both a <a href="#server">server</a> and a
   <a href="#client">client</a> for the purpose of making requests on behalf of
--- a/suite/chrome/common/help/help-glossary.rdf
+++ b/suite/chrome/common/help/help-glossary.rdf
@@ -87,16 +87,17 @@
         <rdf:li> <rdf:Description nc:name="Password Manager" nc:link="glossary.xhtml#password_manager"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Personal Toolbar" nc:link="glossary.xhtml#personal_toolbar"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="phishing" nc:link="glossary.xhtml#phishing"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="PKCS #11" nc:link="glossary.xhtml#pkcs_11"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="PKCS #11 module" nc:link="glossary.xhtml#pkcs_11_module"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="PKI" nc:link="glossary.xhtml#pki"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="plugin" nc:link="glossary.xhtml#plugin"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="POP" nc:link="glossary.xhtml#pop"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="private browsing" nc:link="glossary.xhtml#private_browsing"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="private key" nc:link="glossary.xhtml#private_key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="proxy" nc:link="glossary.xhtml#proxy"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="public key" nc:link="glossary.xhtml#public_key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="public-key cryptography" nc:link="glossary.xhtml#public-key_cryptography"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="root CA" nc:link="glossary.xhtml#root_ca"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="RSS" nc:link="glossary.xhtml#rss"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="safe browsing" nc:link="glossary.xhtml#safe_browsing"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="search engine" nc:link="glossary.xhtml#search_engine"/> </rdf:li>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -348,21 +348,16 @@
          nc:link="using_priv_help.xhtml#using_the_cookie_manager"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="copy web pages"
          nc:name="copy"
          nc:link="nav_help.xhtml#copying_saving_and_printing_pages"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="CRLs"
-         nc:name="CRLs"
-         nc:link="using_certs_help.xhtml#how_validation_works"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="Customizing"
          nc:name="Customizing Fonts and Colors"
          nc:link="customize_help.xhtml#changing_fonts_colors_and_themes"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#cache">
@@ -600,46 +595,16 @@
      <rdf:li>
        <rdf:Description ID="cookies:viewing"
          nc:name="viewing cookies"
          nc:link="using_priv_help.xhtml#viewing_cookies"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="#CRLs">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="CRLs:about"
-         nc:name="about CRLs"
-         nc:link="using_certs_help.xhtml#how_validation_works"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="CRLs:auto_upates_for"
-         nc:name="CRL auto update"
-         nc:link="validation_help.xhtml#automatic_crl_update_preferences"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="CRLs:managing"
-         nc:name="managing CRLs"
-         nc:link="validation_help.xhtml#manage_crls"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="CRLs:Next_Update_date"
-         nc:name="Next Update date"
-         nc:link="using_certs_help.xhtml#about_the_next_update_date"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="CRLs:preferences"
-         nc:name="CRL preferences"
-         nc:link="validation_help.xhtml#privacy_and_security_preferences_validation"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="help-indexAZ.rdf#d">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="default_account"
          nc:name="default account"
          nc:link="mailnews_getting_started.xhtml#set_as_default"/>
      </rdf:li>
      <rdf:li>
@@ -929,21 +894,16 @@
          nc:link="customize_help.xhtml#exporting_or_importing_a_bookmark_list"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="import:certificates"
          nc:name="import certificates"
          nc:link="certs_help.xhtml#your_certificates"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="import:crls"
-         nc:name="import CRLs"
-         nc:link="using_certs_help.xhtml#importing_crls"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="import:feeds"
          nc:name="import feeds"
          nc:link="mailnews_blogs_and_feeds.xhtml#exporting_and_importing_feeds"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="import:mail"
          nc:name="import mail or settings from other programs"
          nc:link="mailnews_getting_started.xhtml#importing_mail_from_other_programs"/>
@@ -1393,21 +1353,16 @@
          nc:link="mailnews_account_settings.xhtml#server_settings"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#o">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="OSCP"
-         nc:name="OSCP"
-         nc:link="using_certs_help.xhtml#how_validation_works"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="Offline"
          nc:name="Offline"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="OPML"
          nc:name="OPML"
          nc:link="glossary.xhtml#opml"/>
      </rdf:li></rdf:Seq>
@@ -1700,21 +1655,16 @@
        <rdf:Description ID="preferences:SSL"
          nc:name="SSL preferences"
          nc:link="ssl_help.xhtml#privacy_and_security_preferences_ssl"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:Tabbed_Browsing"
          nc:name="Tabbed Browsing preferences"
          nc:link="cs_nav_prefs_navigator.xhtml#tabbed_browsing"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="preferences:validation"
-         nc:name="validation preferences"
-         nc:link="validation_help.xhtml#privacy_and_security_preferences_validation"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#privacy">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="privacy:about"
@@ -2001,21 +1951,16 @@
        <rdf:Description ID="settings:signed_and_encrypted mail"
          nc:name="signed and encrypted mail settings"
          nc:link="mailnews_account_settings.xhtml#security"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="settings:SSL"
          nc:name="SSL settings"
          nc:link="ssl_help.xhtml#ssl_settings"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="settings:validation"
-         nc:name="validation settings"
-         nc:link="validation_help.xhtml#validation_settings"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Sidebar">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Sidebar:adding_tabs"
@@ -2227,39 +2172,24 @@
 <rdf:Description about="#validation">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="validation:about"
          nc:name="about validation"
          nc:link="using_certs_help.xhtml#how_validation_works"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="validation:auto_updating_CRLs"
-         nc:name="auto updating CRLs"
-         nc:link="validation_help.xhtml#automatic_crl_update_preferences"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="validation:CRLs"
-         nc:name="CRLs"
-         nc:link="validation_help.xhtml#privacy_and_security_preferences_validation"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="validation:managing_CRLs"
-         nc:name="managing CRLs"
-         nc:link="validation_help.xhtml#manage_crls"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="validation:OCSP"
          nc:name="OCSP"
-         nc:link="validation_help.xhtml#privacy_and_security_preferences_validation"/>
+         nc:link="certs_prefs_help.xhtml#ocsp"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="validation:settings"
          nc:name="validation settings"
-         nc:link="validation_help.xhtml#validation_settings"/>
+         nc:link="certs_prefs_help.xhtml#privacy_and_security_preferences_certificates"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#w">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="web_pages"
index 763503f8f320a6abc9e8da4f639f150fd295135d..7c49c4b6129e5c6b87ad118bc2df682694882a2d
GIT binary patch
literal 9048
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
E0nBr?Z2$lO
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9a2e180bcce7256edbf97df95f893f229e70ce59
GIT binary patch
literal 3019
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
N002ovPDHLkV1g$_-dz9y
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -102,52 +102,71 @@
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
 <h2 id="message_display">Mail &amp; Newsgroups Preferences - Message
   Display</h2>
 
-<p>Message Display preferences allow you to choose how messages are
-  displayed (for example, font style and color) in all accounts. If you are not
-  already viewing the Message Display settings, follow these steps:</p>
+<p>Message Display preferences allow you to choose how messages are displayed
+  in all accounts. If you are not already viewing the Message Display settings,
+  follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences. You see the
     Preferences dialog box.</li>
   <li>Under the Mail &amp; Newsgroups category, click Message Display. (If no
     subcategories are visible, double-click Mail &amp; Newsgroups to expand
     the list.)</li>
 </ol>
 
 <ul>
-  <li><strong>When opening messages, display them in</strong>: Here you can
-    choose if you want to reuse a message window for the next mail or if you
-    want to open a new one for each.</li>
+  <li><strong>When opening messages, display them in</strong>: These options
+    control the behavior when opening messages in a separate window, e.g., by
+    double-clicking on it in the message list of a folder:
+    <ul>
+      <li><strong>A new message window</strong>: Choose this if you want to
+        open each message in a new window.</li>
+      <li><strong>An existing message window</strong>: Choose this if you want
+        to reuse an already opened message window for the next mail.</li>
+      <li><strong>Close message window when deleting a message</strong>: Check
+        this if you want the message window to be closed automatically when
+        the message you are viewing in it is deleted.</li>
+    </ul>
+  </li>
   <li><strong>Block images and other content from remote sources</strong>:
     Select this checkbox if you do not want to display remote images and other
     content in received messages, except from senders in your address books
     whom you have allowed. (This checkbox is selected by default.)</li>
-  <li><strong>Wait [__] seconds before marking a message as read</strong>:
-    Choose this option if you do not want a message to be marked as read when
-    you are only taking a brief look at it. Enter the number of seconds you
-    want a message to be displayed before it gets marked as read automatically.
-
-    <p><strong>Tip</strong>: If you do not want Mail &amp; Newsgroups to mark
-      your messages as read automatically at all, you can select this option
-      and enter a very large number of seconds.</p>
+  <li><strong>Show only display name for people in my address book</strong>:
+    Check this if you want to save some space in the message headers where
+    email addresses are shown. If selected, known senders and recipients are
+    only listed with their display names, their email addresses are hidden.
+    You can see the full email addresses when hovering over such entries with
+    the mouse.</li>
+  <li><strong>Automatically mark messages as read</strong>: Check this option
+    to mark messages as read once they are opened. (This checkbox is selected
+    by default.)
+    <ul>
+      <li><strong>Only after displaying for [__] seconds</strong>: Check this
+        option if you do not want a message to be marked as read when you are
+        only taking a brief look at it. Enter the number of seconds you want a
+        message to be displayed before it gets marked as read automatically.
+        If this box is not checked, messages are marked as read as soon as
+        they are opened.</li>
+    </ul>
   </li>
-  <li><strong>Plain Text Messages</strong>: Select the font you prefer for
-    viewing plain-text messages: fixed width or variable width. Choosing a font
-    style, size, and color for quoted plain-text messages can help you more
-    easily distinguish quoted text (usually a message that&apos;s been
-    forwarded to you or by you).
+  <li><strong>Plain Text Messages</strong>: These settings control how
+    plain-text messages are displayed. These options do not have any effect
+    when viewing HTML (rich-text) messages, or when writing new messages.
     <ul>
+      <li><strong>Font</strong>: Select the font you prefer for viewing
+        plain-text messages: fixed width or variable width.</li>
       <li><strong>Wrap text to fit window width</strong>: Select this so that
         incoming messages are word-wrapped to fit the width of your Mail
         window.</li>
       <li><strong>Display emoticons as graphics</strong>: Select this so that
         when you receive messages that contain emoticons (also called smiley
         faces) Mail &amp; Newsgroups can convert them to graphics, for example:
         <table border="1">
           <tr align="center">
@@ -174,17 +193,37 @@
             <td>;-)</td>
             <td><span class="smiley moz-smiley-s3"/></td>
           </tr>
           <tr align="center">
             <td>;-p</td>
             <td><span class="smiley moz-smiley-s4"/></td>
           </tr>
         </table>
+        This option also controls some common plain-text formatting conventions:
+        <table border="1">
+          <tr align="center">
+            <td><strong>This</strong>:</td>
+            <td><strong>Displays as</strong>:</td>
+          </tr>
+          <tr align="center">
+            <td>mm^2</td>
+            <td>mm<sup>2</sup></td>
+          </tr>
+          <tr align="center">
+            <td>+/-1</td>
+            <td>±1</td>
+          </tr>
+        </table>
       </li>
+      <li><strong>Settings for quoted messages</strong>: Choose a different
+        font style, size, and/or color for quoted plain-text messages to more
+        easily distinguish quoted text (usually the content of a message for
+        which the sender replied to you, or quoted parts of a message you
+        replied to).</li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
 <h2 id="notifications">Mail &amp; Newsgroups Preferences - Notifications</h2>
--- a/suite/chrome/common/help/mailnews_security.xhtml
+++ b/suite/chrome/common/help/mailnews_security.xhtml
@@ -422,18 +422,18 @@
 
 <p>The Message Security window displays the following information:</p>
 
 <ul>
   <li><strong>Digital Signature</strong>: The top section describes whether the
     message is digitally signed and if so, whether the signature is valid.</li>
   
   <p>If validation failed while OCSP was enabled, check the OCSP settings in
-    <a href="validation_help.xhtml#privacy_and_security_preferences_validation">Privacy
-    &amp; Security Preferences - Validation</a>. If you are not familiar with
+    <a href="certs_prefs_help.xhtml#privacy_and_security_preferences_certificates">Privacy
+    &amp; Security Preferences - Certificates</a>. If you are not familiar with
     OCSP, confirm the settings with your system administrator. If your settings
     are correct, there may be a problem with the OCSP service or the
     certificate used to create the signature is no longer valid.</p>
   
   <p>If the signature is invalid because of a problem with a certificate&apos;s
     trust settings, you can use the <a href="certs_help.xhtml">Certificate
     Manager</a> to view or edit those settings.</p>
 
--- a/suite/chrome/common/help/privacy_help.xhtml
+++ b/suite/chrome/common/help/privacy_help.xhtml
@@ -31,16 +31,20 @@
 
 <div class="contentsBox">Privacy topics:
   <ul>
     <li><a href="#privacy_on_the_internet">Privacy on the Internet</a></li>
     <li><a href="using_priv_help.xhtml#using_the_cookie_manager">Using the
       Cookie Manager</a></li>
     <li><a href="using_priv_help.xhtml#using_the_password_manager">Using the
       Password Manager</a></li>
+    <li><a href="using_priv_help.xhtml#clearing_private_data">Clearing Private
+      Data</a></li>
+    <li><a href="using_priv_help.xhtml#browsing_in_a_private_window">Browsing
+      in a Private Window</a></li>
     <li><a href="using_priv_help.xhtml#encrypting_stored_sensitive_information">Encrypting
       Stored Sensitive Information</a></li>
     <li><a href="using_priv_help.xhtml#managing_images">Managing Images</a></li>
     <li><a href="cs_priv_prefs_popup.xhtml#controlling_popups">Controlling Popups</a></li>
     <li><a href="privsec_help.xhtml">Privacy &amp; Security Preferences</a></li>
   </ul>
 </div>
 
--- a/suite/chrome/common/help/privsec_help.xhtml
+++ b/suite/chrome/common/help/privsec_help.xhtml
@@ -39,17 +39,16 @@
     <li><a href="using_priv_help.xhtml#private_data_prefs">Private Data</a></li>
     <li><a href="using_priv_help.xhtml#cookies">Cookies</a></li>
     <li><a href="using_priv_help.xhtml#images">Images</a></li>
     <li><a href="cs_priv_prefs_popup.xhtml#privacy_and_security_preferences_popup_windows">Popup Windows</a></li>
     <li><a href="passwords_help.xhtml#passwords">Passwords</a></li>
     <li><a href="passwords_help.xhtml#master_passwords">Master Passwords</a></li>
     <li><a href="ssl_help.xhtml#privacy_and_security_preferences_ssl">SSL</a></li>
     <li><a href="certs_prefs_help.xhtml#privacy_and_security_preferences_certificates">Certificates</a></li>
-    <li><a href="validation_help.xhtml#privacy_and_security_preferences_validation">Validation</a></li>
   </ul>
 </div>
 
 <h2 id="privacy_and_security">Privacy &amp; Security Preferences -
   Privacy &amp; Security</h2>
 
 <p>This section describes how to use the main Privacy &amp; Security
   preferences panel. If you&apos;re not already viewing it, follow these
--- a/suite/chrome/common/help/shortcuts_navigator.xhtml
+++ b/suite/chrome/common/help/shortcuts_navigator.xhtml
@@ -209,16 +209,22 @@
   </tr>
   <tr>
     <td>New Browser Window</td>
     <td>Ctrl+N</td>
     <td>Cmd+N</td>
     <td>Ctrl+N</td>
   </tr>
   <tr>
+    <td>New Private Window</td>
+    <td>Ctrl+Shift+B</td>
+    <td>Cmd+Shift+B</td>
+    <td>Ctrl+Shift+B</td>
+  </tr>
+  <tr>
     <td>Move to Next/Previous Link or Form Element in a Web Page</td>
     <td>Tab/Shift+Tab</td>
     <td>Tab/Shift+Tab</td>
     <td>Tab/Shift+Tab</td>
   </tr>
   <tr>
     <td>Open File</td>
     <td>Ctrl+O</td>
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -47,44 +47,45 @@
 
 <p>The <a href="glossary.xhtml#ssl">Secure Sockets Layer (SSL)</a> protocol
   defines rules governing mutual authentication between a website and browser
   software and the encryption of information that flows between them. It is
   also used for secure communication in various other protocols, e.g., for
   protection of sensitive information exchanged with email, calendar, or
   directory servers. The newer Transport Layer Security (TLS) protocol is an
   IETF standard based on SSL but with its own version numbering. TLS 1.0 can
-  be thought of as SSL 3.1, and TLS 1.1 is in turn an update to TLS 1.0. Newer
+  be thought of as SSL 3.1, TLS 1.1 is in turn an update to TLS 1.0, etc. Newer
   protocols are preferred over older ones as they provide better security and
   more features. Older protocols are supported to ensure compatibility.</p>
 
 <p>By default, &brandShortName; will select the most secure version which is
   widely supported to connect to the server. If that attempt doesn&apos;t
   succeed, it will try to connect with the next older version, etc., to the
   extent allowed by the settings in this panel. The connection will fail if no
   protocol supported by both sides is found. You can exclude older versions
   explicitly or allow newer versions which may not be widely supported yet
   with the following options:</p>
 
 <ul>
   <li><strong>Enable</strong>: Check the <strong>SSL 3.0</strong>, <strong>TLS
-    1.0</strong>, and/or <strong>TLS 1.1</strong> boxes to indicate which
-    protocol versions can be used for a secure connection to a server.</li>
+    1.0</strong>, <strong>TLS 1.1</strong>, and/or <strong>TLS 1.2</strong>
+    boxes to indicate which protocol versions can be used for a secure
+    connection to a server.</li>
 </ul>
 
 <p><strong>Notes</strong>:</p>
 
 <ul>
   <li>At least one protocol version must be selected, thus it is not possible
     to uncheck the last remaining box.</li>
   <li>Also, the selection must be contiguous. It is not possible to select both
     SSL 3.0 and TLS 1.1 but to exclude the intermediate TLS 1.0 version.</li>
   <li>You can extend the range by multiple versions. For example, if only SSL
-    3.0 is currently checked and you select TLS 1.1, the TLS 1.0 version is
-    automatically selected as well.</li>
+    3.0 is currently checked and you select TLS 1.2, the TLS 1.0 and TLS 1.1
+    versions are automatically selected as well.</li>
   <li>Checkboxes may appear checked but grayed out if you cannot uncheck them
     without violating these rules. Uncheck the outermost boxes to regain
     access to an enclosed intermediate version.</li>
 </ul>
 
 <h3 id="ssl_warnings">SSL Warnings</h3>
 
 <p>It&apos;s easy to tell when the website you are viewing is using an encrypted
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -827,16 +827,17 @@
 <!-- USING PRIVACY FEATURES CONTENT -->
 <rdf:Description about="#using-priv-help">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="privacy-doc" nc:name="Privacy on the Internet" nc:link="privacy_help.xhtml#privacy_on_the_internet"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-cookies" nc:name="Using the Cookie Manager" nc:link="using_priv_help.xhtml#using_the_cookie_manager"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-password" nc:name="Using the Password Manager" nc:link="using_priv_help.xhtml#using_the_password_manager"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-private-data" nc:name="Clearing Private Data" nc:link="using_priv_help.xhtml#clearing_private_data"/> </rdf:li>
+        <rdf:li><rdf:Description ID="private-browsing" nc:name="Browsing in a Private Window" nc:link="using_priv_help.xhtml#browsing_in_a_private_window"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt" nc:name="Encrypting Stored Sensitive Information" nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/> </rdf:li>
         <rdf:li><rdf:Description ID="images-help-managing" nc:name="Managing Images" nc:link="using_priv_help.xhtml#managing_images"/> </rdf:li>
         <rdf:li><rdf:Description ID="pop_up_blocking" nc:name="Controlling Popups" nc:link="cs_priv_prefs_popup.xhtml"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen" nc:name="Privacy &amp; Security Preferences" nc:link="privsec_help.xhtml"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
@@ -905,16 +906,26 @@
       <rdf:Seq>
         <rdf:li><rdf:Description ID="types_of_private_data" nc:name="Types of Private Data" nc:link="using_priv_help.xhtml#types_of_private_data"/> </rdf:li>
         <rdf:li><rdf:Description ID="privatedata_prefs" nc:name="Private Data Preferences" nc:link="using_priv_help.xhtml#private_data_prefs"/> </rdf:li>
         <rdf:li><rdf:Description ID="clear_private_data_now" nc:name="Clear Private Data Now" nc:link="using_priv_help.xhtml#clear_private_data_now"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
+<rdf:Description about="#private-browsing">
+    <nc:subheadings>
+      <rdf:Seq>
+        <rdf:li><rdf:Description ID="opening_a_private_window" nc:name="Opening a Private Window" nc:link="using_priv_help.xhtml#opening_a_private_window"/> </rdf:li>
+        <rdf:li><rdf:Description ID="behavior_of_a_private_window" nc:name="Behavior of a Private Window" nc:link="using_priv_help.xhtml#behavior_of_a_private_window"/> </rdf:li>
+        <rdf:li><rdf:Description ID="leaving_the_private_browsing_mode" nc:name="Leaving the Private Browsing Mode" nc:link="using_priv_help.xhtml#leaving_the_private_browsing_mode"/> </rdf:li>
+      </rdf:Seq>
+    </nc:subheadings>
+  </rdf:Description>
+
 <rdf:Description about="#using-priv-help-encrypt">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-master" nc:name="Setting a Master Password" nc:link="using_priv_help.xhtml#setting_a_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-change" nc:name="Changing Your Master Password" nc:link="using_priv_help.xhtml#changing_your_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-logout" nc:name="Logging Out of Your Master Password" nc:link="using_priv_help.xhtml#logging_out_of_your_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-forget" nc:name="What to Do If You Forget Your Master Password" nc:link="using_priv_help.xhtml#what_to_do_if_you_forget_your_master_password"/> </rdf:li>
       </rdf:Seq>
@@ -944,17 +955,16 @@
         <rdf:li><rdf:Description ID="sec_gen_private_data" nc:name="Private Data" nc:link="using_priv_help.xhtml#private_data_prefs"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen_cookies" nc:name="Cookies" nc:link="using_priv_help.xhtml#cookies"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen_images" nc:name="Images" nc:link="using_priv_help.xhtml#images"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen_popup_windows" nc:name="Popup Windows" nc:link="cs_priv_prefs_popup.xhtml#privacy_and_security_preferences_popup_windows"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen_passwords" nc:name="Passwords" nc:link="passwords_help.xhtml#passwords"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen_master_passwords" nc:name="Master Passwords" nc:link="passwords_help.xhtml#master_passwords"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen_ssl" nc:name="SSL" nc:link="ssl_help.xhtml#privacy_and_security_preferences_ssl"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen_certificates" nc:name="Certificates" nc:link="certs_prefs_help.xhtml#privacy_and_security_preferences_certificates"/> </rdf:li>
-        <rdf:li><rdf:Description ID="sec_gen_validation" nc:name="Validation" nc:link="validation_help.xhtml#privacy_and_security_preferences_validation"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <!-- USING CERTIFICATES CONTENT -->
 <rdf:Description about="#using-help-certs">
     <nc:subheadings>
       <rdf:Seq>
@@ -1009,40 +1019,17 @@
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#using-help-certs-validation">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="using-help-certs-validation-how" nc:name="How Validation Works" nc:link="using_certs_help.xhtml#how_validation_works"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-help-certs-validation-crls" nc:name="Managing CRLs" nc:link="using_certs_help.xhtml#managing_crls"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-help-certs-validation-ocsp" nc:name="Configuring OCSP" nc:link="using_certs_help.xhtml#configuring_ocsp"/> </rdf:li>
-        <rdf:li><rdf:Description ID="validation_prefs" nc:name="Validation Settings" nc:link="validation_help.xhtml"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-<rdf:Description about="#using-help-certs-validation-crls">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li><rdf:Description ID="using-help-certs-validation-crls-next" nc:name="About the Next Update Date" nc:link="using_certs_help.xhtml#about_the_next_update_date"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-help-certs-validation-crls-import" nc:name="Importing CRLs" nc:link="using_certs_help.xhtml#importing_crls"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-help-certs-validation-crls-view" nc:name="Viewing and Managing CRLs" nc:link="using_certs_help.xhtml#viewing_and_managing_crls"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-<rdf:Description about="#validation_prefs">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li><rdf:Description ID="validation-prefs" nc:name="Validation Preferences" nc:link="validation_help.xhtml#privacy_and_security_preferences_validation"/> </rdf:li>
-        <rdf:li><rdf:Description ID="validation-crl-manage" nc:name="Manage CRLs" nc:link="validation_help.xhtml#manage_crls"/> </rdf:li>
-        <rdf:li><rdf:Description ID="validation-crl-import" nc:name="CRL Import Status" nc:link="validation_help.xhtml#crl_import_status"/> </rdf:li>
-        <rdf:li><rdf:Description ID="validation-crl-auto-update-prefs" nc:name="Automatic CRL Update Preferences" nc:link="validation_help.xhtml#automatic_crl_update_preferences"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#using-help-certs-context-help">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="certs_prefs" nc:name="Certificate Preferences" nc:link="certs_prefs_help.xhtml#privacy_and_security_preferences_certificates"/> </rdf:li>
--- a/suite/chrome/common/help/using_certs_help.xhtml
+++ b/suite/chrome/common/help/using_certs_help.xhtml
@@ -526,19 +526,17 @@
   familiarity with <a href="glossary.xhtml#public-key_cryptography">public-key
   cryptography</a>. If you are not familiar with the use of certificates, you
   should check with your system administrator before attempting to change any
   of your browser&apos;s certificate validation settings.</p>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#how_validation_works">How Validation Works</a></li>
-    <li><a href="#managing_crls">Managing CRLs</a></li>
     <li><a href="#configuring_ocsp">Configuring OCSP</a></li>
-    <li><a href="validation_help.xhtml">Validation Settings</a></li>
   </ul>
 </div>
 
 <h2 id="how_validation_works">How Validation Works</h2>
 
 <p>Whenever you use or view a certificate stored by Certificate Manager, it
   takes several steps to verify the certificate. At a minimum, it confirms that
   the CA&apos;s digital signature on the certificate was created by a CA whose
@@ -555,177 +553,47 @@
   unverified and won&apos;t recognize the identity it certifies.</p>
 
 <p>A certificate can pass all these tests and still be compromised in some way;
   for example, the certificate may be revoked because an unauthorized person
   has gained access to the certificate&apos;s private key. A compromised
   certificate can allow an unauthorized person (or website) to pretend to be
   the certificate owner.</p>
 
-<p>One way to combat this threat is for Certificate Manager to check a
-  certificate revocation list (CRL) as part of the verification process (see
-  <a href="#managing_crls">Managing CRLs</a>, below). Typically, you download a
-  CRL to your browser by clicking a link. If a CRL is present, Certificate
-  Manager checks any certificate issued by the same CA against the list as part
-  of the verification process.</p>
+<p>One way to combat this threat would be for Certificate Manager to check a
+  previously downloaded certificate revocation list (CRL) as part of the
+  verification process. However, those lists may be large and need to be
+  updated frequently in order to remain current and thus useful.</p>
 
-<p>The reliability of CRLs depends on the frequency with which they are both
-  updated by a server and checked by a client. You can configure your
-  <a href="validation_help.xhtml#automatic_crl_update_preferences">Automatic
-  CRL Update Preferences</a> so that a CRL will be updated automatically at
-  regular intervals with the version currently on the server.</p>
-
-<p>Another way to combat the threat of compromised certificates is to use a
-  special server that supports the Online Certificate Status Protocol (OCSP).
+<p>The preferred way to combat the threat of compromised certificates is to use
+  a special server that supports the Online Certificate Status Protocol (OCSP).
   Such a server can answer client queries about individual certificates (see
   <a href="#configuring_ocsp">Configuring OCSP</a>, below).</p>
 
 <p>The server, called an OCSP responder, receives an updated CRL periodically
   from the CA that issues the certificates to be verified. You can configure
   Certificate Manager to submit a status request for a certificate to the OCSP
   responder, and the OCSP responder confirms whether the certificate is
   valid.</p>
 
 <p>[<a href="#controlling_validation">Return to beginning of section</a>]</p>
 
-<h2 id="managing_crls">Managing CRLs</h2>
-
-<p>A certificate revocation list (CRL) is a list of revoked certificates. A
-  <a href="glossary.xhtml#certificate_authority">certificate authority (CA)</a>
-  might revoke a certificate, for example, if it has been compromised in some
-  way&mdash;much the way a credit card company might revoke your credit card if
-  you report that it&apos;s been stolen.</p>
-
-<p>This section describes how to import and manage CRLs.</p>
-
-<p>For background information, see
-  <a href="#how_validation_works">How Validation Works</a>.</p>
-
-<p>For detailed descriptions of CRL settings that you can control, see
-  <a href="validation_help.xhtml">Validation Settings</a>.</p>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#about_the_next_update_date">About the <q>Next Update</q>
-      Date</a></li>
-    <li><a href="#importing_crls">Importing CRLs</a></li>
-    <li><a href="#viewing_and_managing_crls">Viewing and Managing CRLs</a></li>
-  </ul>
-</div>
-
-<h3 id="about_the_next_update_date">About the <q>Next Update</q> Date</h3>
-
-<p>The browser uses the CRLs it has available to check the validity of
-  certificates issued by the corresponding CAs. If a certificate is listed as
-  revoked, the browser won&apos;t accept it as evidence of identity.</p>
-
-<p>A CA typically publishes an updated CRL at regular intervals. Every CRL
-  includes a date, specified in the Next Update field, by which the CA will
-  publish the next update of that CRL. In general, if the date in the Next
-  Update field is earlier than the current date, you should obtain the most
-  recent version of the CRL. To view CRL information and set up automatic CRL
-  updating, see <a href="#viewing_and_managing_crls">Viewing and Managing
-  CRLs</a>.</p>
-
-<p>CAs are required to produce a new CRL by the Next Update date. However, the
-  absence of the most recent CRL does not by itself invalidate a certificate.
-  For this reason, if the most recent CRL is not available, a certificate may
-  be validated even though the most recent CRL shows it as expired. Automatic
-  CRL updating can help to avoid this situation.</p>
+<h2 id="configuring_ocsp">Configuring OCSP</h2>
 
-<h3 id="importing_crls">Importing CRLs</h3>
-
-<p>You can import the latest CRL from a CA into your browser. To import a CRL,
-  follow these steps:</p>
-
-<ol>
-  <li>Go to the URL specified by the CA or by your system administrator and
-    click the link for the CRL that you want to import.
-    
-    <p>The Import Status dialog box appears.</p>
-  </li>
-  <li>Confirm that the CRL was imported successfully and that it&apos;s the one
-    you wanted. In most cases you should also click Yes, which enables
-    automatic updating of the CRL you just imported.</li>
-  <li>The next step depends on whether you click Yes or No in the Import Status
-    dialog box: 
-    <ul>
-      <li><strong>Yes</strong>: The Automatic CRL Update Preferences dialog box
-        appears. In this case, go on to step 4.</li>
-      <li><strong>No</strong>: The Import Status dialog box closes. If you
-        change your mind and decide to enable automatic updates after all, see
-        <a href="#viewing_and_managing_crls">Viewing and Managing
-        CRLs</a>.</li>
-    </ul>
-  </li>
-  <li>Select the option labeled <q>Enable Automatic Update for this
-    CRL</q>.</li>
-  <li>Decide how you want to schedule the automatic updates:
-    <ul>
-      <li><strong>Update [__] days before Next Update date</strong>: Select
-        this option if you want to base the update frequency on the frequency
-        with which the CRL publisher publishes a new version of the CRL.</li>
-      <li><strong>Update every [__] days</strong>: Select this option if you
-        want to specify an update interval unrelated to the CRL&apos;s Next
-        Update date.</li>
-    </ul>
-  </li>
-  <li>Click OK to confirm your choices.</li>
-</ol>
-
-<h3 id="viewing_and_managing_crls">Viewing and Managing CRLs</h3>
-
-<p>You can view and manage CRLs available to the browser through the
-  browser&apos;s Validation preferences:</p>
+<p>The settings that control OCSP are part of Certificates preferences. To view
+  Certificates preferences, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Under the Privacy &amp; Security category, click Validation. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Click Manage CRLs in the Validation panel to see a list of the CRLs
-    available to Certificate Manager.</li>
-</ol>
-
-<p>To delete or update a CRL, select it and click the appropriate button.</p>
-
-<p>To set up automatic updates for a CRL, select the CRL and click Settings.
-  The Automatic CRL Update Preferences dialog box appears:</p>
-
-<ol>
-  <li>Select the option labeled <q>Enable Automatic Update for this
-    CRL</q>.</li>
-  <li>Decide how you want to schedule the automatic updates:
-    <ul>
-      <li><strong>Update [__] days before Next Update date</strong>: Select
-        this option if you want to base the update frequency on the frequency
-        with which the CRL publisher publishes a new version of the CRL.</li>
-      <li><strong>Update every [__] days</strong>: Select this option if you
-        want to specify an update interval unrelated to the CRL&apos;s Next
-        Update date.</li>
-    </ul>
-  </li>
-  <li>Click OK to confirm your choices.</li>
-</ol>
-
-<p>[<a href="#controlling_validation">Return to beginning of section</a>]</p>
-
-<h2 id="configuring_ocsp">Configuring OCSP</h2>
-
-<p>The settings that control OCSP are part of Validation preferences. To view
-  Validation preferences, follow these steps:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Under the Privacy &amp; Security category, click Validation. (If no
+  <li>Under the Privacy &amp; Security category, click Certificates. (If no
     subcategories are visible, double-click Privacy &amp; Security to expand
     the list.)</li>
 </ol>
 
 <p>For information about the OCSP options available, see
-  <a href="validation_help.xhtml#ocsp">OCSP</a>.</p>
+  <a href="certs_prefs_help.xhtml#ocsp">Privacy &amp; Security Preferences -
+  Certificates, OCSP</a>.</p>
 
 <p>[<a href="#controlling_validation">Return to beginning of section</a>]</p>
 
 </body>
 </html>
--- a/suite/chrome/common/help/using_priv_help.xhtml
+++ b/suite/chrome/common/help/using_priv_help.xhtml
@@ -613,16 +613,19 @@
   function properly or more efficiently, others are for your convenience.</p>
 
 <p>Privacy implications vary from type to type. For example, browsing history
   and cache contents provide a snapshot of your recent browsing activity which
   is local to your computer; cookies or offline web content may be used by a
   website to track a user directly across visits (e.g., for statistical
   purposes or for targeted advertisements).</p>
 
+<p>In <a href="#browsing_in_a_private_window">private browsing mode</a>, no
+  private data will be retained beyond the duration of the private session.</p>
+
 <p>The following private information may be stored locally by
   &brandShortName;:</p>
 
 <table class="defaultTable">
   <thead>
     <tr>
       <th>Type</th>
       <th>Explanation</th>
@@ -788,18 +791,183 @@
     </ul>
   </li>
   <li>When <q>Ask me before clearing private data</q> is <em>not</em> checked,
     all types selected in the <a href="#private_data_prefs">Private Data
     preferences</a> to be cleared by default will be deleted immediately
     without the dialog box being shown.</li>
 </ul>
 
+<p>[<a href="#clearing_private_data">Return to beginning of section</a>]</p>
 
-<p>[<a href="#clearing_private_data">Return to beginning of section</a>]</p>
+<h1 id="browsing_in_a_private_window">Browsing in a Private Window</h1>
+
+<p>There may be occasions where you don&apos;t want &brandShortName; to keep
+  track of your browsing activities. For example, when someone else quickly
+  wants to use your computer and you don&apos;t want your current browsing
+  context disturbed; or, for confidential tasks such as online banking.</p>
+
+<p>Opening a private window starts a
+  <a href="glossary.xhtml#private_browsing">private browsing</a> session
+  in which no <a href="#types_of_private_data">private data</a> on the sites
+  and pages you visit are made available beyond the scope and duration of that
+  session. Each subsequently opened private window becomes part of the same
+  private session. It ends when the last private window is closed.</p>
+
+<p>Private windows are not entirely isolated from non-private windows; private
+  browsing just implies that &brandShortName; will not keep any local record
+  of your activities in such a window. Some private data may be shared between
+  private but not non-private windows and vice versa, others accessed in a
+  read-only mode from a private window.</p>
+
+<p>Note that <a href="customize_help.xhtml#add-ons">Add-ons</a> like plugins
+  and extensions may not be subjected to these policies and may change their
+  settings or modify their locally kept data even in a private window.</p>
+
+<div class="contentsBox">In this section:
+  <ul>
+    <li><a href="#opening_a_private_window">Opening a Private Window</a></li>
+    <li><a href="#behavior_of_a_private_window">Behavior of a Private
+      Window</a></li>
+    <li><a href="#leaving_the_private_browsing_mode">Leaving the Private
+      Browsing Mode</a></li>
+  </ul>
+</div>
+
+<h2 id="opening_a_private_window">Opening a Private Window</h2>
+
+<p>A browser window can be either in regular (non-private) or in private
+  browsing mode. It is not possible to switch a non-private browser window
+  into private mode, but you can open a new private window in two ways:</p>
+
+<ul>
+  <li>From a browser window, open the File menu, choose New, then Private
+    Window. The new window opens with a page explaining that you are now in
+    private browsing mode.</li>
+  <li>Right-click on a link in a web page you are viewing, then select <q>Open
+    Link in Private Window</q> from the menu. The new private window will open,
+    showing the page referred to by the selected link.</li>
+</ul>
+
+<p>Any number of private and non-private windows can be open at the same time,
+  but be aware in this case for which windows history information is kept.</p>
+
+<p>[<a href="#browsing_in_a_private_window">Return to beginning of
+  section</a>]</p>
+
+<h2 id="behavior_of_a_private_window">Behavior of a Private Window</h2>
+
+<p>A private window behaves differently than a non-private window in the way
+  it handles private data (see <a href="#types_of_private_data">Types of
+  Private Data</a> for detailed information of the individual categories).
+  Specifically, after closing a private session when closing the last private
+  window, no information related to that session will be retained in
+  &brandShortName;. Private data gathered in one private session won&apos;t
+  be available to any future private session either.</p>
+
+<h3>Recognizing a Private Window</h3>
+
+<p>To determine whether or not a window is in private browsing mode, have a
+  look at its title bar. Private windows show
+  <q>-&nbsp;<span class="noMac">&brandShortName; </span>Private Browsing</q>
+  <span class="noMac">rather than just <q>-&nbsp;&brandShortName;</q></span>
+  at the end of the window&apos;s title.</p>
+
+<h3>Navigation and Bookmarks</h3>
+
+<ul>
+  <li>Navigating within a private window is identical to a non-private
+    window. You can use the Back and Forward buttons as well as the Go
+    menu as usual.</li>
+  <li>Links will not be marked as visited when browsing in a private
+    window.</li>
+  <li>Bookmarks can be added in a private window in the same way as for a
+    non-private window. They will not be cleared once the private session
+    has ended.</li>
+</ul>
+
+<h3>Browsing and other Histories</h3>
+
+<ul>
+  <li>Previously established Browsing History and Location Bar History will
+    be available to a private window, but new sites visited and locations
+    entered into the location bar will not be recorded and saved.</li>
+  <li>Files can be downloaded as usual, but no entries will be added to the
+    Download Manager. The downloaded files themselves will not be removed.</li>
+  <li>Saved Form and Search History will be available to a private window,
+    thus providing suggestions for form fields or searches. However, any
+    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
+    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>
+</ul>
+
+<h3>Cached and Offline Content</h3>
+
+<ul>
+  <li>While a private window can use the memory cache for performance, it is
+    not permitted to access the disk cache regardless of the settings for a
+    non-private window. Thus, no cached content will be available after
+    restarting &brandShortName;.</li>
+  <li>A private window cannot use any stored offline content deposited by
+    websites. Thus, you will not be able to use web applications while being
+    offline, even if they have already stored offline content locally.</li>
+</ul>
+
+<h3>Passwords and Authenticated Sessions</h3>
+
+<ul>
+  <li>No new passwords will be stored in the Password Manager when entered
+    in a private window.</li>
+  <li>Authenticated sessions do not carry over from a non-private to a private
+    window. Thus, you cannot continue a session started in a non-private window
+    in a private window or vice versa.</li>
+</ul>
+
+<h3>Preferences and Permissions</h3>
+
+<ul>
+  <li>Any changes to settings and permissions made from a private window are
+    handled in the same way as from a non-private window and retained after
+    the private session has ended.</li>
+  <li>Per-site preferences such as zoom levels or download locations are
+    observed in a private window. However, any changes you make will not be
+    retained, e.g., zoom levels revert to the initial value when navigating
+    or switching tabs.</li>
+</ul>
+
+<p>[<a href="#browsing_in_a_private_window">Return to beginning of
+  section</a>]</p>
+
+<h2 id="leaving_the_private_browsing_mode">Leaving the Private Browsing
+  Mode</h2>
+
+<p>There is no special function or command to leave the private mode,
+  and it is not possible to continue working in non-private mode with
+  a private window.</p>
+
+<p>To end a private browsing session, just close all private windows.
+  There will be no record on &brandShortName;&apos;s side on any browsing
+  activities performed in any of the associated private windows.</p>
+
+<p>[<a href="#browsing_in_a_private_window">Return to beginning of
+  section</a>]</p>
 
 <h1 id="encrypting_stored_sensitive_information">Encrypting Stored Sensitive
   Information</h1>
 
 <p>If you use Password Manager to save passwords, then this sensitive
   information is stored on your computer in a file that&apos;s difficult, but
   not impossible, for an intruder to read.</p>
 
deleted file mode 100644
--- a/suite/chrome/common/help/validation_help.xhtml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-  %brandDTD;
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Validation Settings</title>
-<link rel="stylesheet" href="helpFileLayout.css"
-  type="text/css"/>
-</head>
-<body>
-
-<h1 id="validation_settings">Validation Settings</h1>
-
-<p>This section describes how to set Validation preferences and how to control
-  Certificate Revocation List (CRL) settings.</p>
-
-<p>For step-by-step descriptions of various tasks related to validation and
-  CRLs, see <a href="using_certs_help.xhtml#controlling_validation">How
-  Certificate Validation Works</a>.</p>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#privacy_and_security_preferences_validation">Privacy &amp;
-      Security Preferences - Validation</a></li>
-    <li><a href="#manage_crls">Manage CRLs</a></li>
-    <li><a href="#crl_import_status">CRL Import Status</a></li>
-    <li><a href="#automatic_crl_update_preferences">Automatic CRL Update
-      Preferences</a></li>
-  </ul>
-</div>
-
-<h2 id="privacy_and_security_preferences_validation">Privacy &amp; Security
-  Preferences - Validation</h2>
-
-<p>This section describes how to use the Validation Settings panel. If you are
-  not already viewing the panel, follow these steps:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Under the Privacy &amp; Security category, click Validation. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-</ol>
-
-<p>For background information on certificate validation, see
-  <a href="using_certs_help.xhtml#controlling_validation">How Certificate
-  Validation Works</a>.</p>
-
-<h3 id="crl">CRL</h3>
-
-<p>A certificate revocation list (CRL) is a list of revoked certificates that
-  is generated and signed by a
-  <a href="glossary.xhtml#certificate_authority">certificate authority
-  (CA)</a>. It&apos;s possible to download a CRL to your browser, which can
-  check it to ensure that certificates are still valid before permitting their
-  use for authentication.</p>
-
-<p>Click Manage CRLs to see a list of the CRLs available to Certificate
-  Manager.</p>
-
-<p>For more information about managing CRLs, see
-  <a href="using_certs_help.xhtml#managing_crls">Managing CRLs</a>.</p>
-
-<h3 id="ocsp">OCSP</h3>
-
-<p>The Online Certificate Status Protocol (OCSP) makes it possible for
-  Certificate Manager to perform an online check of a certificate&apos;s
-  validity each time the certificate is viewed or used. This process involves
-  checking the certificate against a certificate revocation list (CRL)
-  maintained at a specified server. Your computer must be online for OCSP to
-  work.</p>
-
-<p>To specify how Certificate Manager uses OCSP, choose one of these settings
-  in the OCSP section of Validation Settings:</p>
-
-<ul>
-  <li><strong>Use the Online Certificate Status Protocol (OCSP) to confirm the
-    current validity of certificates</strong>: Select this setting if you want
-    Certificate Manager to perform an online status check each time it verifies
-    a certificate. If this setting is off, Certificate Manager will only
-    confirm the certificate&apos;s validity period and that it is correctly
-    signed by a CA whose own CA certificate is both listed under the CA
-    Certificates tab (in the main Certificate Manager window) and marked as
-    trusted for issuing that kind of certificate.</li>
-  <li><strong>Validate a certificate if it specifies a OCSP server</strong>:
-    Select this setting for online validation of certificates that provides a
-    validation service address (Service URL). Certificate Manager makes sure
-    that the certificate is listed as valid at the URL and checks validity
-    period and trust settings.</li>
-  <li><strong>Validate all certificates using the following OSCP
-    server</strong>: Select this setting if you want to specify a OCSP server
-    for the validation of all certificates. If you select this setting, you
-    should also choose the certificate from the Response Signer pop-up menu
-    that identifies the signer of the OCSP responses. With this setting, the
-    only certificates Certificate Manager recognizes are those that can be
-    verified by an OCSP response signed with the Response Signer certificate
-    (or signed using a certificate that chains to it).
-
-    <p>When you choose a Response Signer certificate from the pop-up menu,
-      Certificate Manager fills in the Service URL (if available) for that
-      signer automatically. If the Service URL is not filled in automatically,
-      you must provide it yourself; ask your system administrator for
-      details.</p>
-  </li>
-  <li><strong>When an OCSP server connection fails, treat the certificate as
-    invalid</strong>: Select this if you want the validation to fail if a
-    connection to the OCSP server can&apos;t be established.</li>
-</ul>
-
-<h2 id="manage_crls">Manage CRLs</h2>
-
-<p>This section describes how to use the Manage CRLs dialog box. To view 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>Under the Privacy &amp; Security category, click Validation. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Click Manage CRLs.</li>
-</ol>
-
-<p>This dialog box displays a list of the
-  <a href="glossary.xhtml#crl">CRLs</a> that you have
-  downloaded for use by your browser. Typically, you download a CRL by
-  clicking a URL. For information about how CRLs work, see
-  <a href="using_certs_help.xhtml#managing_crls">Managing CRLs</a>.</p>
-
-<p>To select a CRL, click it. You can then perform any of these actions:</p>
-
-<ul>
-  <li><strong>Delete</strong>: Deletes the CRL permanently from your hard disk.
-    Don&apos;t do this unless you&apos;re sure you no longer need the CRL for
-    validating certificates. If in doubt, consult your system
-    administrator.</li>
-  <li><strong>Settings</strong>: Opens the
-    <a href="#automatic_crl_update_preferences">Automatic CRL Update
-    Preferences</a> dialog box, which allows you to activate automatic CRL
-    updates for the selected CRL and specify how frequently they should be
-    performed.</li>
-  <li><strong>Update</strong>: Immediately updates the selected CRL
-  (if possible).</li>
-</ul>
-
-<p>The Manage CRLs dialog box provides the following information about each
-  CRL:</p>
-
-<ul>
-  <li><strong>Organization (O)</strong>: The name of the organization that
-    issued the CRL.</li>
-  <li><strong>Organizational Unit (OU)</strong>: The name of the organizational
-    unit that issued the CRL (such as the root CA for a particular kind of
-    certificate).</li>
-  <li><strong>Last Update</strong>: The date on which the browser&apos;s copy
-    of this CRL was last updated.</li>
-  <li><strong>Next Update</strong>: The next date on which an updated version
-    of this CRL will be published by the CRL issuer.</li>
-  <li><strong>Auto Update</strong>: Indicates whether Auto Update has been
-    enabled for this CRL. To view the settings that control auto updating,
-    select the CRL and click Settings.</li>
-  <li><strong>Auto Update Status</strong>:
-    <ul>
-      <li>If Auto Update has not been enabled, or if it has been enabled but
-        the next scheduled update has not yet occurrred, this field will be
-        blank.</li>
-      <li>After at least one auto update has occurred, this field shows
-        <q>failed</q> if the most recent auto update failed, or
-        <q>OK</q> if the most recent auto update was successful.</li>
-    </ul>
-  </li>
-</ul>
-
-<h2 id="crl_import_status">CRL Import Status</h2>
-
-<p>This section describes how to use the CRL Import Status dialog box, which
-  appears when you first attempt to import a CRL or when you successfully
-  update it manually.</p>
-
-<p>This dialog box informs you</p>
-
-<ul>
-  <li>whether your attempt to import or update the CRL was successful</li>
-  <li>what organization issued the CRL</li>
-  <li>when the next update of this CRL will be published</li>
-  <li>whether Automatic Update is enabled for this CRL</li>
-</ul>
-
-<p>If Automatic Update is not enabled, you can turn it on from here:</p>
-
-<ul>
-  <li><strong>Yes</strong>: Click Yes to enable automatic updating of this CRL.
-    If you click this button, the Automatic CRL Update Preferences dialog box
-    appears next. The next section describes how to set these preferences.</li>
-  <li><strong>No</strong>: Click No if you wish to leave Automatic Update
-    disabled.</li>
-</ul>
-
-<h2 id="automatic_crl_update_preferences">Automatic CRL Update Preferences</h2>
-
-<p>This section describes how to use the Automatic CRL Update Preferences
-  dialog box. If you are 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>Under the Privacy &amp; Security category, click Validation. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Click Manage CRLs, then select the CRL whose auto update preferences you
-    want to view or change.</li>
-  <li>Click Settings.</li>
-</ol>
-
-<p>This dialog box displays the following options and information:</p>
-
-<ul>
-  <li><strong>Enable Automatic Update for this CRL</strong>: Select this option
-    if you want the CRL you selected to be updated automatically according to
-    the schedule you set here. (Note that you can&apos;t select this option if
-    the CRL doesn&apos;t specify a Next Update date.)
-
-    <p>If you enable Automatic Update, you must select one of these radio
-      buttons:</p>
-      <ul>
-        <li><strong>Update X days before Next Update date</strong>: Select this
-          option if you want to base the update frequency on the frequency with
-          which the CRL publisher publishes a new version of the CRL.</li>
-        <li><strong>Update every X days</strong>: Select this option if you
-          want to specify an update interval unrelated to the CRL&apos;s Next
-          Update date.</li>
-      </ul>
-  </li>
-  <li><strong>CRL would be imported from</strong>: Indicates the URL from which
-    the browser originally imported the CRL. This setting cannot be changed. To
-    specify a different location, delete the CRL and re-import it from the new
-    location.</li>
-  <li><strong>Previous Consecutive Update Failures</strong>: Indicates how
-    many times update attempts for this CRL have failed consecutively,
-    including the most recent failure:
-    <ul>
-      <li>If the most recent attempt was successful, this reads
-        <q>None</q> even if there were previous unsuccessful
-        attempts.</li>
-      <li>If the most recent attempt failed, this indicates the number of
-        consecutive failures and the error message for the most recent
-        failure.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>Click OK to confirm your choices.</p>
-
-</body>
-</html>
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -37,24 +37,32 @@ activatepluginsMessage.activate.label		= プラグインを有効にする
 activatepluginsMessage.activate.accesskey	= A
 activatepluginsMessage.dismiss.label		= 有効にしない
 activatepluginsMessage.dismiss.accesskey	= D
 activatepluginsMessage.remember			= このサイトの設定を記憶する
 activatepluginsMessage.always.label		= 常にこのサイトでは有効にする
 activatepluginsMessage.always.accesskey		= c
 activatepluginsMessage.never.label		= このサイトでは無効にする
 activatepluginsMessage.never.accesskey		= N
+activateSinglePlugin				= 有効化
+PluginClickToActivate				= %S を有効化する。
+PluginVulnerableUpdatable			= このプラグインのバージョンには脆弱性があります。更新してください。
+PluginVulnerableNoUpdate			= このプラグインにはセキュリティ上の脆弱性があります。
+vulnerableUpdatablePluginWarning		= 古いバージョンです!
+vulnerableNoUpdatePluginWarning			= 脆弱性のあるプラグインです!
+vulnerablePluginsMessage			= 安全のため一部のプラグインは無効化されました。
+pluginInfo.unknownPlugin			= 不明
 
-popupWarning					= %S は、このサイトが開くポップアップをブロックしました。
-popupWarningMultiple				= %S は、このサイトが開くポップアップ (%S 件) をブロックしました。
+popupWarning					= このサイトが開くポップアップを %S がブロックしました。
+popupWarningMultiple				= このサイトが開くポップアップ (%S 件) を %S がブロックしました。
 popupWarningButton				= 設定
 popupWarningButton.accesskey			= P
 
 xpinstallHostNotAvailable			= 不明なホスト
-xpinstallPromptWarning				= %S はサイト "%S" からのソフトウェアのインストールをブロックしました。
+xpinstallPromptWarning				= "%S" サイトからのソフトウェアのインストールを %S がブロックしました。
 xpinstallPromptInstallButton			= ソフトウェアのインストール...
 xpinstallPromptInstallButton.accesskey		= I
 xpinstallDisabledMessageLocked			= システム管理者によってソフトウェアのインストール機能は無効にされています。
 xpinstallDisabledMessage			= ソフトウェアのインストール機能は現在無効です。[有効にする] をクリックして再度実行してください。
 xpinstallDisabledButton				= 有効にする
 xpinstallDisabledButton.accesskey		= n
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled):
@@ -114,49 +122,61 @@ lwthemeNeedsRestart.restartButton.access
 geolocation.shareLocation			= 許可
 geolocation.shareLocation.accesskey		= a
 geolocation.dontShareLocation			= ブロック
 geolocation.dontShareLocation.accesskey		= o
 geolocation.alwaysShareLocation			= 常に共有
 geolocation.alwaysShareLocation.accesskey	= A
 geolocation.neverShareLocation			= 共有しない
 geolocation.neverShareLocation.accesskey	= N
-geolocation.siteWantsToKnow			= この Web サイト (%S) があなたの位置情報を求めてきています。
+geolocation.siteWantsToKnow			= この Web サイト (%S) があなたの位置情報を求めています。
 geolocation.fileWantsToKnow			= ファイル %S があなたの位置情報を求めてきています。
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore				= 詳細を表示...
 geolocation.remember				= このサイトでは今後も同様に処理する
 
+# Desktop Notifications
+webNotifications.showForSession=通知を表示する
+webNotifications.showForSession.accesskey=w
+webNotifications.dontShowForSession=このセッションのみ表示しない
+webNotifications.dontShowForSession.accesskey=o
+webNotifications.alwaysShow=常に表示する
+webNotifications.alwaysShow.accesskey=A
+webNotifications.neverShow=表示しない
+webNotifications.neverShow.accesskey=N
+webNotifications.showFromSite=%S からの通知を表示しますか?
+webNotifications.remember=このサイトでは今後も同様に処理する
+
 # IndexedDB
-offlineApps.permissions				= このサイト (%S) はオフラインで利用するためにあなたのコンピュータにデータを保存することを求めています。
-offlineApps.quota				= この Web サイト (%1$S) は、オフラインで利用するためのデータとしてあなたのコンピュータに %2$SMB のデータを保存しようとしています。
+offlineApps.permissions				= このサイト (%S) はオフラインで利用するデータをコンピュータに保存することを求めています。
+offlineApps.quota				= この Web サイト (%1$S) は、オフラインで利用するデータとしてあなたのコンピュータに %2$SMB のデータを保存しようとしています。
 offlineApps.allow				= 許可
 offlineApps.allow.accesskey			= A
 offlineApps.later				= 今回は拒否
 offlineApps.later.accesskey			= N
 offlineApps.deny				= このサイトは常に拒否
 offlineApps.deny.accesskey			= e
 
 # Block autorefresh
 refreshBlocked.goButton				= 許可
 refreshBlocked.goButton.accesskey		= A
-refreshBlocked.refreshLabel			= %S は自動的に再読み込みを繰り返すため、このページをブロックしました。
-refreshBlocked.redirectLabel			= %S は自動的に別のページにリダイレクトしようとしたため、このページをブロックしました。
+refreshBlocked.refreshLabel			= 自動的に再読み込みを繰り返すため、%S がこのページをブロックしました。
+refreshBlocked.redirectLabel			= 自動的に別のページへリダイレクトしようとしたため、%S がこのページをブロックしました。
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
-lockPrompt.text					= %S のファイルは別のアプリケーションで使用されているため、ブックマークと履歴のシステムが機能しません。いくつかのセキュリティソフトウェアは、この問題を引き起こす可能性があります。
+lockPrompt.text					= %S のファイルが別のアプリケーションで使用されているため、ブックマークと履歴のシステムが機能しません。いくつかのセキュリティソフトウェアは、この問題を引き起こす可能性があります。
 lockPromptInfoButton.label			= 詳細はこちら
 lockPromptInfoButton.accesskey			= L
 
 # LOCALIZATION NOTE (updatePrompt.text)
 # %S will be replaced with the application name.
 updatePrompt.text				= 自動更新の確認が無効に設定されています。使用中の %S はセキュリティ上の欠陥があります。 新しいバージョンに更新してください。
-updatePromptCheckButton.label			= アップデートを確認
+updatePromptCheckButton.label			= 更新を確認
 updatePromptCheckButton.accesskey		= C
 
 SecurityTitle					= セキュリティ警告
 MixedContentMessage				= 要求したページは暗号化されていますが、暗号化されていない項目を含んでいます。あなたがこのページで表示や入力する情報は第三者が簡単に傍受できます。
 MixedActiveContentMessage			= 要求したページは暗号化されていますが、安全でない情報を含んでいます。あなたがこのページで表示や入力する情報は第三者が簡単に傍受できます。
 MixedDisplayContentMessage			= 要求したページは部分的に暗号化されており、盗聴を防ぐことはできません。
 BlockedActiveContentMessage			= このページの安全でない情報はブロックされました。
 BlockedDisplayContentMessage			= このページの暗号化されていない情報はブロックされました。
--- a/suite/chrome/common/pref/pref-ssl.dtd
+++ b/suite/chrome/common/pref/pref-ssl.dtd
@@ -11,16 +11,18 @@
 <!ENTITY limit.description                  "安全な接続に使用する暗号化プロトコルを制限できます。単一のバージョンまたは連続するバージョンの範囲を選択してください。">
 <!ENTITY limit.enable.label                 "有効:">
 <!ENTITY limit.ssl30.label                  "SSL 3.0">
 <!ENTITY limit.ssl30.accesskey              "3">
 <!ENTITY limit.tls10.label                  "TLS 1.0">
 <!ENTITY limit.tls10.accesskey              "T">
 <!ENTITY limit.tls11.label                  "TLS 1.1">
 <!ENTITY limit.tls11.accesskey              "1">
+<!ENTITY limit.tls12.label                  "TLS 1.2">
+<!ENTITY limit.tls12.accesskey              "2">
 
 <!ENTITY warn.description                   "&brandShortName; はあなたが見ている Web ページのセキュリティ状態を警告することができます。警告もしくは事前に許可を求めるダイアログを表示させたいケースを、&brandShortName; に設定します:">
 <!ENTITY warn.enteringsecure                "暗号化されたページを読み込むとき">
 <!ENTITY warn.enteringsecure.accesskey      "L">
 <!ENTITY warn.insecurepost                  "暗号化されていないページから暗号化されていないページへデータを送信するとき">
 <!ENTITY warn.insecurepost.accesskey        "S">
 <!ENTITY warn.leavingsecure                 "暗号化されたページから離れるとき">
 <!ENTITY warn.leavingsecure.accesskey       "a">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/folderWidgets.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE(globalInbox)
+# %S=name of the Local folders account
+globalInbox=共通受信トレイ (%S)
--- a/suite/chrome/mailnews/localMsgs.properties
+++ b/suite/chrome/mailnews/localMsgs.properties
@@ -14,211 +14,134 @@ pop3EnterPasswordPromptTitle= パスワードを入力してください
 pop3EnterPasswordPrompt= %2$S サーバのユーザ %1$S のパスワードを入力してください:
 
 # LOCALIZATION NOTE(pop3PreviouslyEnteredPasswordIsInvalidPrompt): Do not
 # translate the words "%1$S" and "%2$S" below. Place the word %1$S where the
 # user name should appear, and %2$S where the host name should appear.
 pop3PreviouslyEnteredPasswordIsInvalidPrompt= %2$S のユーザ %1$S 用の新しいパスワードを入力してください:
 
 # Status - Downloading message n of m to account
-## @name receivingMsgs
-## @loc None
 #LOCALIZATION NOTE (receivingMsgs): Do not translate %1$S, %2$S, or %3$S in the following lines.
 # Place the word %1$S where the number of messages downloaded so far should appear.
 # Place the word %2$S where the total number of messages to receive should appear;
 # Place %3$S where the account name should appear.
 receivingMsgs= メッセージを %3$S にダウンロードしています %1$S / %2$S
 
 # Status - connecting to host
-## @name hostContacted
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S in the following line.
 # Place %1$S where the account name should appear
 hostContacted= 接続: ホストに %1$S のログイン情報を送信しています...
 
 # Status - no messages to download 
-## @name noMessages
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S in the following line.
 # Place %1$S where the account name should appear
 noMessages= %1$S の新着メッセージはありませんでした。
 
 # Status - messages received after the download
-## @name receivedMessages
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S, %2$S or %3$S in the following line.
 # %1$S will receive the number of messages received
 # %2$S will receive the total number of messages
 # Place %3$S where the account name should appear
 receivedMessages= %3$S へのメッセージを受信しました %1$S / %2$S
 
-## @name MK_POP3_OUT_OF_DISK_SPACE
-## @loc None
--321= 新着メッセージをダウンロードするのに充分なディスク領域がありません。古いメールを削除、ごみ箱を空にする、メールフォルダを最適化するなどしてもう一度やり直してください。
+pop3OutOfDiskSpace= 新着メッセージをダウンロードするのに充分なディスク領域がありません。古いメールを削除、ごみ箱を空にする、メールフォルダを最適化するなどしてもう一度やり直してください。
 
 # Status - parsing folder
-## @name LOCAL_STATUS_SELECTING_MAILBOX
-## @loc None
-#LOCALIZATION NOTE (4000): Do not translate %s in the following line.
-# Place the word %s where the name of the mailbox should appear
-4000= %S の要約ファイルを作成しています...
+#LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
+# Place the word %S where the name of the mailbox should appear
+buildingSummary= %S の要約ファイルを作成しています...
 
 # Status - parsing folder
-## @name LOCAL_STATUS_DOCUMENT_DONE
-## @loc None
-4001= 完了
+localStatusDocumentDone= 完了
 
 # Status - pop3 server error
-## @name POP3_SERVER_ERROR
-## @loc None
-#LOCALIZATION NOTE (4003): Do not translate POP3 in the following line.
-4003= POP3 サーバでエラーが発生しました。
+#LOCALIZATION NOTE (pop3ServerError): Do not translate POP3 in the following line.
+pop3ServerError= POP3 サーバでエラーが発生しました。
 
 # Status - pop3 user name failed
-## @name POP3_USERNAME_FAILURE
-## @loc None
-4004= ユーザ名を送信できませんでした。
+pop3UsernameFailure= ユーザ名を送信できませんでした。
 
 # Status - password failed
-## @name POP3_PASSWORD_FAILURE
-## @loc None
-4005= パスワードを送信できませんでした。
-
-# Status - write error occurred
-## @name POP3_MESSAGE_WRITE_ERROR
-## @loc None
-4006= メールボックスにメールを書き込めませんでした。ファイルシステムに書き込み権限があるか、ディスクに十分な空き容量があるか確認してください。
+pop3PasswordFailure= パスワードを送信できませんでした。
 
 # Status - write error occurred
-## @name POP3_MESSAGE_FOLDER_BUSY
-## @loc None
-4029= このフォルダは処理中です。処理が終了するまでしばらくお待ちください。
+pop3MessageWriteError= メールボックスにメールを書き込めませんでした。ファイルシステムに書き込み権限があるか、ディスクに十分な空き容量があるか確認してください。
+
+# Status - write error occurred
+pop3MessageFolderBusy= このフォルダは処理中です。処理が終了するまでしばらくお待ちください。
 
 # Status - retr failure from the server
-## @name POP3_RETR_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4012): Do not translate the word "POP3" below.
-4012= RETR コマンドを正常に完了できず、メッセージを取得できませんでした。
+pop3RetrFailure= RETR コマンドを正常に完了できず、メッセージを取得できませんでした。
 
 # Status - password undefined 
-## @name POP3_PASSWORD_UNDEFINED
-## @loc None
-4013=  メールパスワードを取得できませんでした。
+pop3PasswordUndefined=  メールパスワードを取得できませんでした。
 
 # Status - username undefined 
-## @name POP3_USERNAME_UNDEFINED
-## @loc None
-4014= このサーバ用のユーザ名が設定されていません。アカウント設定でユーザ名を設定してください。
+pop3UsernameUndefined= このサーバ用のユーザ名が設定されていません。アカウント設定でユーザ名を設定してください。
 
 # Status - list failure
-## @name POP3_LIST_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4015): Do not translate the word "POP3" below.
-4015= LIST コマンドを正常に完了できず、メッセージの ID とサイズを取得できませんでした。
+pop3ListFailure= LIST コマンドを正常に完了できず、メッセージの ID とサイズを取得できませんでした。
 
 # Status - delete error 
-## @name POP3_DELE_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4016): Do not translate the word "POP3" below.
-4016= DELE コマンドを正常に完了できず、メッセージを削除できませんでした。
+pop3DeleFailure= DELE コマンドを正常に完了できず、メッセージを削除できませんでした。
 
 # Status - stat failed
-## @name POP3_STAT
-## @loc None
-4024= STAT コマンドを正常に完了できず、メッセージの数とサイズを取得できませんでした。
+pop3StatFail= STAT コマンドを正常に完了できず、メッセージの数とサイズを取得できませんでした。
 
-## @name POP3_SERVER_SAID
-## @loc None
-4025= メールサーバ %S からの応答:
+#LOCALIZATION NOTE (pop3ServerSaid): Do not remove the leading space during translation.
+pop3ServerSaid= メールサーバ %S からの応答:
 
-## @name COPYING_MSGS_STATUS
-## @loc None
-4027= メッセージを %3$S にコピーしています %1$S / %2$S
+copyingMessagesStatus= メッセージを %3$S にコピーしています %1$S / %2$S
 
-## @name MOVING_MSGS_STATUS
-## @loc None
-4028= メッセージを %3$S に移動しています %1$S / %2$S
+movingMessagesStatus= メッセージを %3$S に移動しています %1$S / %2$S
 
-## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
-## @loc None
-4033= メールスプールファイル %S を開けませんでした。
+movemailCantOpenSpoolFile= メールスプールファイル %S を開けませんでした。
 
-## @name MOVEMAIL_CANT_CREATE_LOCK
-## @loc None
-4034= ロックファイル %S を作成できませんでした。Movemail が機能するにはメールスプールディレクトリにロックファイルを作成する必要があります。多くのシステムではスプールディレクトリのモードを 01777 に設定します。
+movemailCantCreateLock= ロックファイル %S を作成できませんでした。Movemail が機能するにはメールスプールディレクトリにロックファイルを作成する必要があります。多くのシステムではスプールディレクトリのモードを 01777 に設定します。
 
-## @name MOVEMAIL_CANT_DELETE_LOCK
-## @loc None
-4035= ロックファイル %S を削除できませんでした。
+movemailCantDeleteLock= ロックファイル %S を削除できませんでした。
+
+movemailCantTruncateSpoolFile= スプールファイル %S を整理できませんでした。
 
-## @name MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE
-## @loc None
-4036= スプールファイル %S を整理できませんでした。
+movemailSpoolFileNotFound= メールスプールファイルが見つかりませんでした。
 
-## @name MOVEMAIL_SPOOL_FILE_NOT_FOUND
-## @loc None
-4037= メールスプールファイルが見つかりませんでした。
+#LOCALIZATION NOTE (movemailCantParseSpool): %S is file name
+movemailCantParseSpool= スプールファイル %S をパースできませんでした。ファイルが壊れているか正しくない可能性があります。
 
-## @name POP3_TMP_DOWNLOAD_FAILED
-## @loc None
-4038= 以下のメッセージをダウンロード中にエラーが発生しました:\n差出人: %S\n   件名: %S\n このメッセージにウイルスが含まれているか、ディスク領域が足りない可能性があります。このメッセージをスキップしますか?
+pop3TmpDownloadError= 以下のメッセージをダウンロード中にエラーが発生しました:\n差出人: %S\n   件名: %S\n このメッセージにウイルスが含まれているか、ディスク領域が足りない可能性があります。このメッセージをスキップしますか?
 
 # Status - the server doesn't support UIDL...
-## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
-## @loc None
-# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
+# LOCALIZATION NOTE(pop3ServerDoesNotSupportUidlEtc): The following sentence should be translated in this way:
 # Do not translate "POP3"
 # Do not translate "%S". Place %S in your translation where the name of the server should appear.
 # Do not translate "UIDL"
-4040= POP3 メールサーバ (%S) が UIDL, XTND, XLST をサポートしていないため、[ダウンロード後もサーバにメッセージを残す]、[最大メッセージサイズ]、[ヘッダのみを取得する] 設定は利用できません。メールをダウンロードするには、アカウント設定ウィンドウの [サーバ設定] でこれらのオプションを無効化してください。
+pop3ServerDoesNotSupportUidlEtc= POP3 メールサーバ (%S) が UIDL, XTND, XLST をサポートしていないため、[ダウンロード後もサーバにメッセージを残す]、[最大メッセージサイズ]、[ヘッダのみを取得する] 設定は利用できません。メールをダウンロードするには、アカウント設定ウィンドウの [サーバ設定] でこれらのオプションを無効化してください。
 
 # Status - the server doesn't support the top command
-## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
-## @loc None
-# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
+# LOCALIZATION NOTE(pop3ServerDoesNotSupportTopCommand): The following sentence should be translated in this way:
 # Do not translate "POP3"
 # Do not translate "%S". Place %S in your translation where the name of the server should appear.
 # Do not translate "TOP"
-4041= POP3 メールサーバ (%S) が TOP コマンドをサポートしていないため、[最大メッセージサイズ]、[ヘッダのみを取得する] 設定は利用できません。このオプションが無効なため、メッセージは、そのサイズに関わらずダウンロードされます。
+pop3ServerDoesNotSupportTopCommand= POP3 メールサーバ (%S) が TOP コマンドをサポートしていないため、[最大メッセージサイズ]、[ヘッダのみを取得する] 設定は利用できません。このオプションが無効なため、メッセージは、そのサイズに関わらずダウンロードされます。
 
-## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
-## @loc None
-4043= POP3 サーバへの TLS 接続が確立できません。サーバがダウンしているか、設定が正しくありません。アカウント設定ウィンドウの [サーバ設定] で、このメールサーバの設定が正しいか確認して再度試してください。
+nsErrorCouldNotConnectViaTls= POP3 サーバへの TLS 接続が確立できません。サーバがダウンしているか、設定が正しくありません。アカウント設定ウィンドウの [サーバ設定] で、このメールサーバの設定が正しいか確認して再度試してください。
 
-## @name POP3_MOVE_FOLDER_TO_TRASH
-## @loc None
-# LOCALIZATION NOTE (4044): Do not translate the word %S below.
+# LOCALIZATION NOTE (pop3MoveFolderToTrash): Do not translate the word %S below.
 # "%S" is the name of the folder.
-4044= 本当に次のフォルダを削除してもよろしいですか: %S
+pop3MoveFolderToTrash= 本当に次のフォルダを削除してもよろしいですか: %S
 
-## @name POP3_DELETE_FOLDER_DIALOG_TITLE
-## @loc None
-4045= フォルダを削除
+pop3DeleteFolderDialogTitle= フォルダを削除
 
-## @name POP3_DELETE_FOLDER_BUTTON_LABEL
-## @loc None
-4046= フォルダを削除(&D)
+pop3DeleteFolderButtonLabel= フォルダを削除(&D)
 
-## @name POP3_AUTH_INTERNAL_ERROR
-## @loc None
-4047= POP3 サーバによる認証中に内部状態エラーが発生しました。これはアプリケーション内部の予期しないエラーです。バグとして報告してください。
+pop3AuthInternalError= POP3 サーバによる認証中に内部状態エラーが発生しました。これはアプリケーション内部の予期しないエラーです。バグとして報告してください。
 
-## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-## @loc None
-4048= POP3 サーバが暗号化されたパスワードをサポートしていないようです。アカウントの設定直後の場合は、[アカウント設定] の [サーバ設定] で [認証方式] を [平文のパスワード認証 (安全でない)] に変更し、再度試してください。認証が突然失敗するようになった場合は、誰かがパスワードを盗もうとしていることが考えられます。
+pop3AuthChangeEncryptToPlainNoSSL= POP3 サーバが暗号化されたパスワードをサポートしていないようです。アカウントの設定直後の場合は、[アカウント設定] の [サーバ設定] で [認証方式] を [平文のパスワード認証 (安全でない)] に変更し、再度試してください。認証が突然失敗するようになった場合は、誰かがパスワードを盗もうとしていることが考えられます。
 
-## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-## @loc None
-4049= POP3 サーバが暗号化されたパスワードをサポートしていないようです。アカウントの設定直後の場合は、[アカウント設定] の [サーバ設定] で [認証方式] を [通常のパスワード認証] に変更し、再度試してください。認証が突然失敗するようになった場合は、あなたのメールの管理者かプロバイダに問い合わせてください。
+pop3AuthChangeEncryptToPlainSSL= POP3 サーバが暗号化されたパスワードをサポートしていないようです。アカウントの設定直後の場合は、[アカウント設定] の [サーバ設定] で [認証方式] を [通常のパスワード認証] に変更し、再度試してください。認証が突然失敗するようになった場合は、あなたのメールの管理者かプロバイダに問い合わせてください。
 
-## @name POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-## @loc None
-4050= POP3 サーバが平文のパスワードを許可していません。[アカウント設定] の [サーバ設定] で [認証方式] を [暗号化されたパスワード認証] に変更し、再度試してください。
+pop3AuthChangePlainToEncrypt= POP3 サーバが平文のパスワードを許可していません。[アカウント設定] の [サーバ設定] で [認証方式] を [暗号化されたパスワード認証] に変更し、再度試してください。
 
 # Authentication server caps and pref don't match
-## @name POP3_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-4051= サーバが選択された認証方式をサポートしていません。[アカウント設定] の [サーバ設定] で [認証方式] を変更してください。
+pop3AuthMechNotSupported= サーバが選択された認証方式をサポートしていません。[アカウント設定] の [サーバ設定] で [認証方式] を変更してください。
 
 # Status - Could not log in to GSSAPI, and it was the only method
-## @name POP3_GSSAPI_FAILURE
-## @loc None
-4052= Kerberos/GSSAPI チケットが POP サーバ %S によって受け入れられませんでした。Kerberos/GSSAPI レルムにログインしているか確認してください。
+pop3GssapiFailure= Kerberos/GSSAPI チケットが POP サーバ %S によって受け入れられませんでした。Kerberos/GSSAPI レルムにログインしているか確認してください。
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -417,21 +417,21 @@ tabs.closeWarning		= このメッセンジャーウィンドウには %S 個のタブが開いています。このウィンドウ内のタブをすべて閉じてもよろしいですか?
 tabs.closeButton		= すべてのタブを閉じる
 tabs.closeWarningPromptMe	= 同時に複数のメッセンジャータブを閉じるときは確認する
 
 # Messenger bootstrapping messages
 fileNotFoundTitle		= ファイルが見つかりません
 #LOCALIZATION NOTE(fileNotFoundMsg): %S is the filename
 fileNotFoundMsg			= %S ファイルが見つかりません。
 
-confirmMsgDelete.title		= 削除の確認
-confirmMsgDelete.collapsed.desc	= 折りたたまれたスレッドのメッセージをすべて削除します。本当に削除してもよろしいですか?
-confirmMsgDelete.shiftDel.desc	= メッセージのコピーをごみ箱に残さずに削除します。本当に削除してもよろしいですか?
-confirmMsgDelete.dontAsk.label	= 次回からは確認しない
-confirmMsgDelete.delete.label	= 削除
+confirmMsgDelete.title			= 削除の確認
+confirmMsgDelete.collapsed.desc		= 折りたたまれたスレッドのメッセージをすべて削除します。本当に削除してもよろしいですか?
+confirmMsgDelete.deleteNoTrash.desc	= メッセージのコピーをごみ箱に残さずに削除します。本当に削除してもよろしいですか?
+confirmMsgDelete.dontAsk.label		= 次回からは確認しない
+confirmMsgDelete.delete.label		= 削除
 
 mailServerLoginFailedTitle			= ログイン失敗
 # LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
 # translation where you wish to display the hostname of the server to which
 # login failed.
 mailServerLoginFailed				= サーバ %S へのログインに失敗しました。
 mailServerLoginFailedRetryButton		= 再試行(&R)
 mailServerLoginFailedEnterNewPasswordButton	= 新しいパスワードを入力(&E)
--- a/suite/chrome/mailnews/pref/am-server-advanced.dtd
+++ b/suite/chrome/mailnews/pref/am-server-advanced.dtd
@@ -20,16 +20,14 @@
 <!ENTITY personalNamespace.accesskey	"P">
 <!ENTITY publicNamespace.label		"公開(共有)名前空間:">
 <!ENTITY publicNamespace.accesskey	"u">
 <!ENTITY otherUsersNamespace.label	"他のユーザの名前空間:">
 <!ENTITY otherUsersNamespace.accesskey	"O">
 <!ENTITY overrideNamespaces.label	"サーバによる名前空間の上書きを許可する">
 <!ENTITY overrideNamespaces.accesskey	"A">
 <!ENTITY pop3Desc.label			"このサーバの POP メールをダウンロードするとき、新着メールを次のフォルダに保存する">
-<!ENTITY globalInbox.label		"共通受信トレイ (ローカルフォルダアカウント)">
-<!ENTITY globalInbox.accesskey		"G">
 <!ENTITY accountDirectory.label		"このサーバアカウントの受信トレイ">
 <!ENTITY accountDirectory.accesskey	"S">
 <!ENTITY deferToServer.label		"別のアカウントの受信トレイ">
 <!ENTITY deferToServer.accesskey	"D">
 <!ENTITY deferGetNewMail.label		"新着メールの取得時にこのサーバも同時に受信">
 <!ENTITY deferGetNewMail.accesskey	"I"> 
--- a/suite/chrome/mailnews/pref/pref-notifications.dtd
+++ b/suite/chrome/mailnews/pref/pref-notifications.dtd
@@ -9,17 +9,16 @@
 <!-- LOCALIZATION NOTE: (showAlertFor.label, showAlertTimeEnd.label)
      showAlertFor.label is associated with the checkbox to show the alert,
      leading into a numerical field to enter a time in seconds, followed by
      showAlertTimeEnd.label which in en-US is the unit of the value -->
 
 <!ENTITY showAlertFor.label               "警告を">
 <!ENTITY showAlertFor.accesskey           "S">
 <!ENTITY showAlertTimeEnd.label           "秒間表示する">
-<!ENTITY showAlertTimeEnd.accesskey       "d">
 
 <!ENTITY showAlertPreviewText.label       "メッセージテキストのプレビューを表示する">
 <!ENTITY showAlertPreviewText.accesskey   "v">
 <!ENTITY showAlertSubject.label           "件名を表示する">
 <!ENTITY showAlertSubject.accesskey       "u">
 <!ENTITY showAlertSender.label            "送信者を表示する">
 <!ENTITY showAlertSender.accesskey        "n">