22.0: sync suite with en-US rev13702:a02b40a24fec
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Sat, 11 May 2013 00:30:11 +0900
changeset 1069 8db4738b514586573649365f8e5ad1b0bce9deba
parent 1068 82baeb376746e561f822804b7be298ccc441dab6
child 1070 45bef68bcbe9e8ce566263fa7df68531170beed3
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs22
22.0: sync suite with en-US rev13702:a02b40a24fec
suite/chrome/branding/aboutRights.dtd
suite/chrome/common/consoleOverlay.dtd
suite/chrome/common/contentAreaCommands.properties
suite/chrome/common/dataman/dataman.dtd
suite/chrome/common/dataman/dataman.properties
suite/chrome/common/help/cert_dialog_help.xhtml
suite/chrome/common/help/certs_help.xhtml
suite/chrome/common/help/certs_prefs_help.xhtml
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/developer_tools.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/mailnews_getting_started.xhtml
suite/chrome/common/help/mailnews_security.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/privacy_help.xhtml
suite/chrome/common/help/privsec_help.xhtml
suite/chrome/common/help/shortcuts.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/help/using_priv_help.xhtml
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-cookies.dtd
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/mailnews/SearchDialog.dtd
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/smime/am-smime.properties
--- a/suite/chrome/branding/aboutRights.dtd
+++ b/suite/chrome/branding/aboutRights.dtd
@@ -38,17 +38,17 @@
      preferences/security.dtd, so that we can refer to text the user sees in
      the UI, without this page being forgotten every time those strings are
      updated.  -->
 <!-- intro paragraph for branded builds -->
 <!ENTITY rights.webservices-a "&brandFullName; は、アドオン更新サービスなどのオプションのサービス (以下「本サービス」と呼びます) を提供しており、これらは下記の通り &brandShortName; のバイナリ版とともに利用できます。本サービスをご利用になりたくない場合、または以下の利用規約を受け入れられない場合は、アプリケーション設定画面の [">
 <!ENTITY rights.webservices-b "詳細">
 <!ENTITY rights.webservices-c "] セクションの [ ">
 <!ENTITY rights.webservices-d "ソフトウェアのインストール">
-<!ENTITY rights.webservices-e "] エントリで、[次の更新を自動的にチェックする] の設定項目のチェックを外していただければ、アドオン更新サービスを無効化できます。">
+<!ENTITY rights.webservices-e "] エントリで、[次の更新を自動的に確認する] の設定項目のチェックを外していただければ、アドオン更新サービスを無効化できます。">
 
 <!-- points 1-6 text for branded builds -->
 <!ENTITY rights.webservices-term1 "&vendorShortName; は、独自の判断に基づいて本サービスを変更または中止することがあります。">
 <!ENTITY rights.webservices-term2 "本サービスは、&brandShortName; に付属するバージョンとともにご利用いただけます。あなたは、そのために必要なすべての権利を保有します。&vendorShortName; およびそのライセンサは、本サービスに関するそれ以外のすべての権利を保留しています。本利用規約の規定は、&brandShortName; および &brandShortName; のソースコードについて、オープンソースライセンスにより許諾される権利を何ら制限するものではありません。">
 <!ENTITY rights.webservices-term3 "本サービスは、「現状のまま」で提供されるものです。&vendorShortName; ならびにその貢献者、ライセンサ、およびディストリビュータは、あらゆる明示的および黙示的な保証を否認します。否認される保証には、本サービスに商業性があること、および本サービスが特定の目的に適合することの保証が含まれますが、これらに限定されません。目的に対するサービスの選択、ならびにサービスの品質および性能に関するリスクは、すべてあなたが負います。国や地域によっては黙示的な保証の除外または制限が法律上認められない場合がありますが、その場合にはこの条項は適用されません。">
 <!ENTITY rights.webservices-term4 "法の定めによる場合を除き、&vendorShortName; ならびにその貢献者、ライセンサ、およびディストリビュータは、&brandShortName;、または本サービスの使用もしくは使用できないことに起因またはいかなる形においても関連して生じた、間接的損害、特別損害、付随的損害、派生的損害、または懲罰的損害に関して一切責任を負いません。本利用規約に基づく責任の総額は、500 米ドルを上限とします。国や地域によっては特定の損害の除外または制限が法律上認められない場合がありますが、その場合にはこの条項は適用されません。">
 <!ENTITY rights.webservices-term5 "&vendorShortName; では、本利用規約を必要に応じて改訂することがあります。本利用規約は、&vendorShortName; の書面による合意なしに変更もしくは終了されることはありません。">
 <!ENTITY rights.webservices-term6 "本利用規約は、法の抵触に関する規定を除いて米国カリフォルニア州法に準拠するものとします。本契約の一部が無効または執行不能と判断された場合でも、残りの部分は引き続き有効に存続するものとします。本利用規約は、参考のために作成した日本語訳文であり、ライセンスの内容を表示するものではありません。利用規約の内容については英文の規約によるものとします。本訳文と英文の規約に矛盾があった場合には英文の規約が優先します。">
--- a/suite/chrome/common/consoleOverlay.dtd
+++ b/suite/chrome/common/consoleOverlay.dtd
@@ -13,9 +13,9 @@
 <!ENTITY toolbarEval.accesskey "J">
 
 <!ENTITY all.accesskey         "A">
 <!ENTITY errors.accesskey      "r">
 <!ENTITY warnings.accesskey    "n">
 <!ENTITY messages.accesskey    "M">
 <!ENTITY clear.accesskey       "l">
 <!ENTITY evaluate.accesskey    "u">
-<!ENTITY filter.accesskey      "k">
+<!ENTITY filter2.accesskey     "i">
--- a/suite/chrome/common/contentAreaCommands.properties
+++ b/suite/chrome/common/contentAreaCommands.properties
@@ -1,15 +1,15 @@
 # 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/.
 
 # context menu strings
 
-# LOCALIZATION NOTE (contextMenuSearchText): %1$S is the search engine,
+# LOCALIZATION NOTE (searchSelected): %1$S is the search engine,
 # %2$S is the selection string.
-contextMenuSearchText=%1$S で "%2$S" を検索
-contextMenuSearchText.accesskey=S
+searchSelected=%1$S で "%2$S" を検索
+searchSelected.accesskey=e
 
 blockImage=%S の画像をブロック
 blockImage.accesskey=c
 unblockImage=%S の画像のブロックを解除
 unblockImage.accesskey=c
--- a/suite/chrome/common/dataman/dataman.dtd
+++ b/suite/chrome/common/dataman/dataman.dtd
@@ -6,16 +6,17 @@
 
 <!ENTITY selectAll.key "a">
 
 <!ENTITY select.all.label "すべてのデータ">
 <!ENTITY select.cookies.label "Cookie のみ">
 <!ENTITY select.permissions.label "許可設定のみ">
 <!ENTITY select.preferences.label "個人設定のみ">
 <!ENTITY select.passwords.label "パスワードのみ">
+<!ENTITY select.storage.label "ストレージのみ">
 
 <!ENTITY domain.search.placeholder "ドメインを検索">
 <!ENTITY domain.search.key "f">
 
 <!ENTITY domain.tree.domain.label "ドメイン">
 
 <!ENTITY domain.ctx.forgetdomain.label "このドメインのデータを消去">
 <!ENTITY domain.ctx.forgetdomain.accesskey "F">
@@ -23,16 +24,17 @@
 <!ENTITY domain.ctx.forgetglobal.accesskey "F">
 
 <!ENTITY data.search.key "k">
 
 <!ENTITY tab.cookies.label "Cookie">
 <!ENTITY tab.permissions.label "許可設定">
 <!ENTITY tab.preferences.label "個人設定">
 <!ENTITY tab.passwords.label "パスワード">
+<!ENTITY tab.storage.label "ストレージ">
 <!ENTITY tab.formdata.label "フォームデータ">
 <!ENTITY tab.forget.label "データ消去">
 
 <!-- cookies -->
 <!ENTITY cookies.description "このドメインは、以下の Cookie をあなたのコンピュータに保存しました:">
 
 <!ENTITY cookies.tree.host.label "Web サイト">
 <!ENTITY cookies.tree.name.label "Cookie 名">
@@ -99,16 +101,31 @@
 <!ENTITY pwd.ctx.copyPasswordCmd.label "パスワードをコピー">
 <!ENTITY pwd.ctx.copyPasswordCmd.accesskey "C">
 <!ENTITY pwd.ctx.selectAll.label "すべて選択">
 <!ENTITY pwd.ctx.selectAll.accesskey "A">
 
 <!ENTITY pwd.button.remove.label "削除">
 <!ENTITY pwd.button.remove.accesskey "R">
 
+<!-- storage -->
+<!ENTITY storage.description "このドメインは、あなたのコンピュータに保存された次の Web ストレージを使用します:">
+
+<!ENTITY storage.tree.host.label "Web サイト">
+<!ENTITY storage.tree.type.label "種類">
+<!ENTITY storage.tree.size.label "サイズ">
+
+<!ENTITY storage.ctx.remove.label "削除">
+<!ENTITY storage.ctx.remove.accesskey "R">
+<!ENTITY storage.ctx.selectAll.label "すべて選択">
+<!ENTITY storage.ctx.selectAll.accesskey "A">
+
+<!ENTITY storage.button.remove.label "削除">
+<!ENTITY storage.button.remove.accesskey "R">
+
 <!-- form data -->
 <!ENTITY fdata.search.placeholder "フィールドデータを検索">
 
 <!ENTITY fdata.tree.fieldname.label "フィールド名">
 <!ENTITY fdata.tree.value.label "入力した値">
 <!ENTITY fdata.tree.usecount.label "使用回数">
 <!ENTITY fdata.tree.firstused.label "最初の使用日時">
 <!ENTITY fdata.tree.lastused.label "最近の使用日時">
@@ -125,13 +142,15 @@
 <!ENTITY forget.cookies.label "Cookie">
 <!ENTITY forget.cookies.accesskey "C">
 <!ENTITY forget.permissions.label "許可設定">
 <!ENTITY forget.permissions.accesskey "P">
 <!ENTITY forget.preferences.label "コンテンツの個人設定">
 <!ENTITY forget.preferences.accesskey "o">
 <!ENTITY forget.passwords.label "パスワード">
 <!ENTITY forget.passwords.accesskey "a">
+<!ENTITY forget.storage.label "ストレージ">
+<!ENTITY forget.storage.accesskey "S">
 <!ENTITY forget.formdata.label "フォームデータ">
 <!ENTITY forget.formdata.accesskey "D">
 
 <!ENTITY forget.button.label "選択したデータを消去">
 <!ENTITY forget.button.accesskey "F">
--- a/suite/chrome/common/dataman/dataman.properties
+++ b/suite/chrome/common/dataman/dataman.properties
@@ -15,24 +15,25 @@ cookies.deleteSelected		= 選択した Cookie を削除してもよろしいですか?
 cookies.deleteSelectedTitle	= 選択した Cookie の削除
 cookies.deleteSelectedYes	= 削除(&R)
 
 # permissions
 perm.allowXULXBL.label		= XUL/XBL マークアップの使用
 perm.cookie.label		= Cookie データの保存
 perm.geo.label			= 位置情報の共有
 perm.image.label		= 画像の読み込み
+perm.indexedDB.label		= ローカルデータベースに保存
 perm.install.label		= アドオンのインストール
 perm.offline-app.label		= オフラインの Web アプリケーション
 perm.object.label		= プラグインの実行
 perm.password.label		= パスワードの保存
 perm.plugins.label		= プラグインの有効化
 perm.popup.label		= ポップアップウィンドウを開く
 perm.script.label		= スクリプトの実行
-perm.stylesheet.label		= スタイルシートの読込
+perm.stylesheet.label		= スタイルシートの読み込み
 perm.sts/use.label		= Strict Transport Security を使用する
 perm.sts/subd.label		= Strict Transport Security をサブドメインにも適用する
 
 perm.type.default		= (許可設定を選択)
 
 # passwords
 pwd.hidePasswords		= パスワードを隠す
 pwd.hidePasswords.accesskey	= P
@@ -44,16 +45,28 @@ pwd.deleteSelected		= 選択したパスワードを削除してもよろしいですか?
 pwd.deleteSelectedTitle		= 選択したパスワードの削除
 pwd.deleteSelectedYes		= 削除(&R)
 
 # preferences
 prefs.deleteSelected		= 選択した個人設定を削除してもよろしいですか?
 prefs.deleteSelectedTitle	= 選択した個人設定の削除
 prefs.deleteSelectedYes		= 削除(&R)
 
+# storage
+
+# LOCALIZATION NOTE: The next string is for disk usage of any storage
+#   e.g. storageUsage: "50.23 MB"
+#   %1$S = size (in bytes or megabytes, ...)
+#   %2$S = unit of measure (bytes, KB, MB, ...)
+storageUsage			= %1$S %2$S
+
+storage.deleteSelected		= 選択した Web ストレージを削除してもよろしいですか?
+storage.deleteSelectedTitle	= 選択したストレージの削除
+storage.deleteSelectedYes	= 削除(&R)
+
 # form data
 fdata.deleteSelected		= 選択したフォームの入力履歴のエントリを削除してもよろしいですか?
 fdata.deleteSelectedTitle	= 選択したフォームデータの削除
 fdata.deleteSelectedYes		= 削除(&R)
 
 # forget
 forget.desc.domain.pre		= "%S" ドメインに関連付けられた次のデータをすべて消去します:
 forget.desc.domain.post		= "%S" ドメインに関連付けられた次の種類のデータがすべて削除されました:
--- a/suite/chrome/common/help/cert_dialog_help.xhtml
+++ b/suite/chrome/common/help/cert_dialog_help.xhtml
@@ -31,17 +31,17 @@
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#certificate_viewer">Certificate Viewer</a></li>
     <li><a href="#choose_security_device">Choose Security Device</a></li>
     <li><a href="#encryption_key_copy">Encryption Key Copy</a></li>
     <li><a href="#certificate_backup">Certificate Backup</a></li>
     <li><a href="#user_identification_request">User Identification Request</a></li>
     <li><a href="#new_certificate_authority">New Certificate Authority</a></li>
-    <li><a href="#web_site_certificates">Website Certificates</a></li>
+    <li><a href="#website_certificates">Website Certificates</a></li>
   </ul>
 </div>
 
 <h2 id="certificate_viewer">Certificate Viewer</h2>
 
 <p>The Certificate Viewer displays information about a certificate you selected
   in one of the Certificate Manager tabs. The General tab summarizes
   information about who issued the certificate, its verification status, what
@@ -329,17 +329,17 @@
   provides.</p>
 
 <ul>
   <li><strong>View</strong>: Click this button to view the CA certificate you
     are about to download. If you decide you don&apos;t want to download this
     certificate, click Cancel.</li>
 </ul>
 
-<h2 id="web_site_certificates">Website Certificates</h2>
+<h2 id="website_certificates">Website Certificates</h2>
 
 <p>When you attempt to go to a website that supports the use of
   <a href="glossary.xhtml#ssl">SSL</a> for
   <a href="glossary.xhtml#authentication">authentication</a> and
   <a href="glossary.xhtml#encryption">encryption</a>, you may be faced with an
   error page. There are two types, one called
   <a href="#secure_connection_failed_page">Secure Connection Failed</a> and one
   called <a href="#untrusted_connection_page">Untrusted Connection</a>.</p>
--- a/suite/chrome/common/help/certs_help.xhtml
+++ b/suite/chrome/common/help/certs_help.xhtml
@@ -205,22 +205,22 @@
   <li><strong>Export</strong>: Export the selected certificates. You can
     choose among various formats.</li>
   <li><strong>Delete</strong>: Delete the selected certificates.</li>
   <li><strong>Add Exception</strong>: Add a security exception for a server
     (website, mail server) that identifies itself with invalid information.
     This is an advanced feature, act with caution.</li>
 </ul>
 
-<h3 id="edit_web_site_certificate_trust_settings">Edit Web Site Certificate
+<h3 id="edit_website_certificate_trust_settings">Edit Website Certificate
   Trust Settings</h3>
 
 <p>When you select a website certificate from the
   <a href="#servers">Servers</a> tab in the Certificate Manager and click Edit,
-  you see a window entitled <q>Edit web site certificate trust settings</q>.
+  you see a window entitled <q>Edit website certificate trust settings</q>.
   Here you specify whether you want to trust the selected certificate for
   identifying the website and setting up an encrypted connection.</p>
 
 <p>The dialog box contains these elements:</p>
 
 <ul>
   <li><strong>The certificate <q><em>name of certificate</em></q> was
     issued by</strong>: Provides information about the
@@ -247,17 +247,17 @@
     certificate. These settings allow you to trust or not to trust different
     kinds of certificates issued by that certificate authority. For example,
     you can choose to trust all website certificates issued by the
     authority.</li>
 </ul>
 
 <p>Click OK to confirm your choice.</p>
 
-<h3 id="delete_web_site_certificates">Delete Website Certificates</h3>
+<h3 id="delete_website_certificates">Delete Website Certificates</h3>
 
 <p>Before deleting a server certificate from the
   <a href="#servers">Servers</a> tab in the Certificate Manager, make sure that
   you won&apos;t need it again for the purposes of identifying a website or
   mail server and setting up an encrypted connection.</p>
 
 <h2 id="authorities">Authorities</h2>
 
--- a/suite/chrome/common/help/certs_prefs_help.xhtml
+++ b/suite/chrome/common/help/certs_prefs_help.xhtml
@@ -33,18 +33,18 @@
       Preferences</a></li>
     <li><a href="certs_help.xhtml">Certificate Manager</a></li>
     <li><a href="certs_help.xhtml#device_manager">Device Manager</a></li>
     <li><a href="cert_dialog_help.xhtml">Certificate Information and
       Decisions</a></li>
   </ul>
 </div>
 
-<h1 id="privacy_and_security_preferences_certificates">Privacy &amp; Security
-  Preferences - Certificates</h1>
+<h2 id="privacy_and_security_preferences_certificates">Privacy &amp; Security
+  Preferences - Certificates</h2>
 
 <p>This section describes use the Certificates preferences panel. 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 Certificates. (If no
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -31,16 +31,17 @@
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#advanced">Advanced</a></li>
     <li><a href="#scripts_and_plugins">Scripts &amp; Plugins</a></li>
     <li><a href="#keyboard_navigation">Keyboard Navigation</a></li>
     <li><a href="#fayt">Find As You Type</a></li>
     <li><a href="#cache">Cache</a></li>
+    <li><a href="#offline_apps">Offline Apps</a></li>
     <li><a href="#proxies">Proxies</a></li>
     <li><a href="#http_networking">HTTP Networking</a></li>
     <li><a href="#software_installation">Software Installation</a></li>
     <li><a href="#mouse_wheel">Mouse Wheel</a></li>
     <li><a href="#dom_inspector">DOM Inspector</a></li>
   </ul>
 </div>
 
@@ -293,16 +294,89 @@
     page that uses prefetching. For more information about Link Prefetching, see
     the online
     <a href="http://www.mozilla.org/projects/netlib/Link_Prefetching_FAQ.html">Link
     Prefetching FAQ</a>.</li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
+<h2 id="offline_apps">Advanced Preferences - Offline Apps</h2>
+
+<p>This section describes how to use the Offline Web Applications preferences
+  panel. If you&apos;re not already viewing it, follow these steps:</p>
+
+<ol>
+  <li>Open the <span class="mac">&brandShortName;</span>
+    <span class="noMac">Edit</span> menu and choose Preferences.</li>
+  <li>Under the Advanced category, click Offline Apps. (If no subcategories are
+    visible, double-click Advanced to expand the list.)</li>
+</ol>
+
+<p>The Offline Web Applications panel allows you to control and monitor how
+  websites use &brandShortName;&apos;s offline storage. Websites can provide
+  complex functionality beyond just the presentation of content, implementing
+  <a href="glossary.xhtml#web_application">web applications</a>. In general,
+  such web applications require you to stay online in order to use them, thus
+  won&apos;t function when you are disconnected from the network (offline).
+  If permitted, websites can store their content and any data you entered
+  locally in &brandShortName;. In this way, web applications can be used even
+  without a network connection.</p>
+
+<p>The <strong>Offline Web Content and User Data</strong> section provides the
+  following functions:</p>
+
+<ul>
+  <li><strong>Your application cache is currently using [__] of disk
+    space</strong>: This entry is informational and provides you with an
+    estimate of the offline data currently used by all web applications
+    combined.</li>
+  <li><strong>Clear</strong>: Immediately clears data that has been saved
+    by all websites for use when you are offline.</li>
+  <li><strong>Notify me when a website wants to store data for offline
+    use</strong>: Check this box if you want to be notified when a website
+    wants to utilize the offline feature but does not currently have the
+    permissions to do so. An information bar will appear for this site with
+    the following options:
+    <ul>
+      <li><strong>Allow</strong>: Permanently allow this site the use of the
+        offline storage for this and future accesses.</li>
+      <li><strong>Never for This Site</strong>: Permanently deny this site
+        the use of the offline storage for this and future accesses.</li>
+      <li><strong>Not Now</strong>: Deny this site the use of the offline
+        storage for this request but ask again for future accesses.</li>
+    </ul>
+    <p><strong>Note</strong>: If the notification box is <em>not</em> checked,
+      &brandShortName; will proceed as if <q>Not Now</q> was selected.</p>
+  </li>
+  <!-- NOTE: link "Data Manager" below once bug 599097 has been fixed -->
+  <li><strong>Manage Permissions</strong>: Opens the Data Manager in a new
+    tab or window where you can modify the Offline Web Applications permissions
+    for each domain:
+    <ul>
+      <li><strong>Use Default</strong>: Check this box to return to the default
+        behavior, thus presenting the information bar with the next request
+        from a site within each domain if the notification option is chosen
+        (effectively removes the entry from this listing).</li>
+      <li><strong>Allow</strong>: Select this option to allow this site
+        the use of the offline storage for all accesses.</li>
+      <li><strong>Block</strong>: Select this option to deny this site
+        the use of the offline storage for all accesses.</li>
+    </ul>
+  </li>
+  <li><strong>The following websites are allowed to store data for offline
+    use</strong>: Lists the domains of all websites which have stored offline
+    data, along with the amount of data currently used by this domain.</li>
+  <li><strong>Clear data</strong>: Select a website domain and click this
+    button to delete all offline data for the specified domain. Click <q>Remove
+    offline data</q> after being prompted for confirmation to do so.</li>
+</ul>
+       
+<p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
+
 <h2 id="proxies">Advanced Preferences - Proxies</h2>
 
 <p>This section describes how to use the Proxies preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
@@ -441,17 +515,17 @@
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Advanced category, click Software Installation. (If no
     subcategories are visible, double-click Advanced to expand the list.)</li>
 </ol>
 
 <p>The Software Installation preferences panel is used to enable add-on
-  installation and updates. The Add-on Manager allows you to view and manage
+  installation and updates. The Add-ons Manager allows you to view and manage
   all your installed extensions and themes.</p>
 
 <ul>
   <li><strong>Add-ons</strong>:
     <ul>
       <li><strong>Allow websites to install add-ons and updates</strong>:
         Select this if you want to allow websites to install add-ons and
         updates to be used with &brandShortName;. You will be prompted before
@@ -473,23 +547,23 @@
             automatically the next time you start &brandShortName;.</li>
         </ul>
       </li>
       <li><strong>Personalize Add-on recommendations</strong>: Select this to
         be offered suggestions for add-ons in the &quot;Get Add-ons&quot; tab
         of the manager:
         <ul>
           <li>Note that this function involves sending a list of your
-            currently installed add-ons to the add-on web site.</li>
+            currently installed add-ons to the add-on website.</li>
           <li>Disabling this option will also suppress contacting the add-on
             site periodically for any new information about installed add-ons,
             but won't affect automated updates.</li>
         </ul>
       </li>
-      <li><strong>Manage Add-ons</strong>: Click this link to open the Add-on
+      <li><strong>Manage Add-ons</strong>: Click this link to open the Add-ons
         Manager in a new browser tab.</li>
     </ul>
   </li>
   <li><strong>&brandShortName;</strong>:
     <ul>
       <li><strong>Automatically check for updates</strong>:Select this to be
         notified when a new version of &brandShortName; is available. Choose
         whether you want &brandShortName; to do a <strong>daily</strong> or
@@ -544,42 +618,39 @@
   is set in the upper panel <strong>Vertical scrolling</strong> while the 
   horizontal mode is controlled by the lower panel <strong>Horizontal
   scrolling</strong>.</p>
 
 <ul>
   <li>Select <q>No modifier key</q> or select a key that you want to use
     along with the mouse wheel. Use the checkboxes below to configure mouse
     wheel behavior:
-    
+
     <ul>
-      <li><strong>Scroll the document by</strong>: Choose this to scroll the
-        document by the number of lines (or characters for horizontal movement)
-        typed in the field.
-        <ul>
-          <li><strong>Use system default</strong>: Choose this to use your
-            system&apos;s default setting&mdash;the number of lines (characters)
-            you may have previously entered will be overridden. Read your
-            system&apos;s documentation to find out where to change the
-            system default mouse wheel/scroll settings.</li>
-        </ul>
-      </li>
-      <li><strong>Scroll a page up (left) or a page down (right)</strong>:
-        Choose this to scroll up or down one page at a time. This setting allows
-        faster, but less accurate scrolling through a page with your mouse
-        wheel.</li>
+      <li><strong>Same as vertical scrolling</strong>: Choose this when your
+        mouse has a single control that provides both vertical and horizontal
+        scrolling. If your mouse has a separate horizontal scrolling control
+        then you can choose to assign a different function to it.</li>
+      <li><strong>Do nothing</strong>: Choose this to disable the scroll wheel
+        when used with the specified modifier key.</li>
+      <li><strong>Scroll the document</strong>: Choose this to scroll the
+        document by the system default number of lines or characters.</li>
       <li><strong>Move back and forward in the browsing history</strong>:
         Choose this to use the mouse wheel to navigate back or forward to
         previous pages you&apos;ve visited.</li>
-      <li><strong>Make the text larger or smaller</strong>: Choose this to use
-        the mouse wheel to increase or decrease the size of text on a web page.
+      <li><strong>Zoom the page in or out</strong>: Choose this to use
+        the mouse wheel to increase or decrease the size of a web page.
         This setting can help you better read a page, or make text fit on the
         screen.</li>
     </ul>
 
+    <p>Use the <strong>Mouse wheel speed</strong> option to adjust the
+      responsiveness of the wheel. To reverse the scroll direction, use negative
+      numbers or select <strong>Reverse direction</strong>.</p>
+
     <p><strong>Note</strong>: Each modifier key can be assigned to a different
       function.</p>
   </li>
   <li>If your mouse does not have a mode for horizontal scrolling, any setting
     in the lower panel <strong>Horizontal scrolling</strong> will be ignored.
   </li>
 </ul>
 
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -136,17 +136,17 @@
   <li><strong>Resize large images to fit in the browser window</strong>: Select
     this if you want &brandShortName; to automatically shrink large stand-alone
     images so they will fit in the browser window. Clicking on the resized
     image will make it appear at full size.</li>
   <li><strong>Zoom only text instead of full pages</strong>: Select this if you
     want &brandShortName; to only resize text of websites when using the
     &quot;Zoom&quot; function. If this is not selected, the whole page,
     including images, will be zoomed.</li>
-  <li><strong>Warn me when web sites try to redirect or reload the
+  <li><strong>Warn me when websites try to redirect or reload the
     page</strong>: Select this to let &brandShortName; block automatic meta
     redirection (HTTP-EQUIV=refresh) requests by default. When a redirect is
     supposed to be executed, a notification bar is shown instead which allows
     you to permit the redirect on a case-by-case basis.</li>
   <li><strong>Remember zoom levels on a per-site basis</strong>: Select
     this if you want the system to remember the specific zoom level for
     each website you visit.</li>
 </ul>
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -248,20 +248,19 @@
 
 <p>The Helper Applications preferences panel lets you choose applications and
   other handlers to handle different types of content (e.g. PDF documents).
   It shows you a list of content types and lets you select a handler for each
   type. To filter the list, use the search field. Text entered in there will
   narrow the list to entries containing that text either in the type description
   or the currently selected action.</p>
 <p>You can choose a local application to handle any type. For some types, you
-  can also choose a web application to handle the type, choose
-  <!-- a feature (like <a href="glossary.xhtml#live_bookmark">Live Bookmarks</a> for
-  feeds) or --> a <a href="glossary.xhtml#plugin">plugin</a> in &brandShortName; to
-  handle the type, or save the type on your computer.</p>
+  can also choose a <a href="glossary.xhtml#web_application">web application</a>
+  to handle the type, choose a <a href="glossary.xhtml#plugin">plugin</a> in
+  &brandShortName; to handle the type, or save the type on your computer.</p>
 <p>To choose a handler for a type, select the type from the list. The current
   handler for the type will turn into a menu. Open the menu and select the
   handler you want to handle the type. Depending on the actual type, you can:</p>
 
 <ul>
   <li>Choose an application by selecting it from the menu. If you want a local
     application that is not in the menu to handle the type, select
     <strong>Use other...</strong> from the menu and navigate to its location.</li>
--- a/suite/chrome/common/help/customize_help.xhtml
+++ b/suite/chrome/common/help/customize_help.xhtml
@@ -490,35 +490,40 @@
 
 <p>[<a href="#changing_fonts_colors_and_themes">Return to beginning of
   section</a>]</p>
 
 <h3 id="changing_the_theme">Changing the Theme</h3>
 
 <p>You can change the look and feel of &brandShortName; by using a different
   theme. Changing the theme can be done either from the View menu or from the
-  Add-on Manager.</p>
+  Add-ons Manager.</p>
 
 <p>From the View menu:</p>
 
 <ol>
   <li>Open the View menu and choose Apply Theme, and then select a theme from
     the menu.</li>
   <li>Quit and restart &brandShortName;.</li>
 </ol>
 
-<p>From the Add-on Manager:</p>
+<p>From the Add-ons Manager:</p>
 
 <ol>
-  <li>Open the Tools menu and choose Add-on Manager.</li>
-  <li>Click the Themes button in the toolbar.</li>
-  <li>Select a theme from the list, and then click the Use Theme button.</li>
-  <li>Quit and restart &brandShortName;.</li>
+  <li>Open the Tools menu and choose Add-ons Manager.</li>
+  <li>Click the Appearance button in the toolbar.</li>
+  <li>Select a theme from the list, and then click the Enable button.</li>
+  <li>Restart &brandShortName; by clicking <q>Restart Now</q> in the
+    Theme&apos;s entry.</li>
 </ol>
 
+<p><strong>Note</strong>: &brandShortName; does not need to be restarted if
+  changing between light-weight themes (Personas) or between Personas and the
+  Default theme.</p>
+
 <p>[<a href="#changing_fonts_colors_and_themes">Return to beginning of
   section</a>]</p>
 
 <h2 id="toolbars">Toolbars</h2>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#navigation_toolbar">Navigation Toolbar</a></li>
@@ -1018,23 +1023,23 @@
   folders from that file. It does not create two bookmarks files.</p>
 
 <p>[<a href="#bookmarks">Return to beginning of section</a>]</p>
 
 <h2 id="add-ons">Add-ons</h2>
 
 <p>One of the most exciting ways to customize &brandShortName; is through the
   addition of Add-ons. In this section, you will learn what Add-ons are, how
-  to install them, and how to use the Add-on Manager.</p>
+  to install them, and how to use the Add-ons Manager.</p>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#about_add-ons">About Add-ons</a></li>
     <li><a href="#installing_add-ons">Installing Add-ons</a></li>
-    <li><a href="#using_the_add-on_manager">Using the Add-on Manager</a></li>
+    <li><a href="#using_the_add-ons_manager">Using the Add-ons Manager</a></li>
   </ul>
 </div>
 
 <h3 id="about_add-ons">About Add-ons</h3>
 
 <p>An Add-on is a piece of software that can be added to &brandShortName; to
   change its appearance, behavior, or to add new features. It can also change
   the language shown in the user interface. Add-ons can be classified in four
@@ -1044,266 +1049,323 @@
   <li><strong>Extensions</strong>: This type of Add-on either changes the way
     &brandShortName; behaves or adds new features to it. For instance, there
     are extensions that provide you with weather forecasts, that add a
     full-featured FTP client, or that block advertisements in web pages. Some
     extensions are designed to work only with specific websites.</li>
   <li><strong>Themes</strong>: Themes change the appearance and design of
     &brandShortName;, but don&apos;t add or change features. They act as a
     skin. &brandShortName; ships with two themes, Default Theme and Modern
-    Theme, but you can add more to fit your style.</li>
+    Theme, but you can add more to fit your style. <strong>Personas</strong>
+    are light-weight themes which, in contrast to the complete themes,
+    change the background of the user interface only.</li>
+  <li><strong>Plugins</strong>: Plugins act as connectors between
+    &brandShortName; and other programs. They enable you to see special
+    content (like Flash movies, or Adobe PDF documents) directly inside the
+    &brandShortName; browser window, instead of opening the target program
+    in a separate window.</li>
   <li><strong>Languages</strong>: While you can download &brandShortName; in
     a number of languages, you may add additional languages to it in the form
     of language packs. This way, different users may use &brandShortName; in
     their own language without having to install the program for everyone.
     This is specially useful if you are going to install &brandShortName; on a
     computer that is shared by different users in, for example, a computer lab.
 
     <p><strong>Note</strong>: Language packs only change the user interface
       language. Web pages, messages, newsgroup and news &amp; blog posts will
       still be shown in the original language in which they were written.</p>
   </li>
-  <li><strong>Plugins</strong>: Plugins act as connectors between
-    &brandShortName; and other programs. They enable you to see special content
-    (like Flash movies, or Adobe PDF documents) directly inside the
-    &brandShortName; browser window, instead of opening the target program in a
-    separate window.</li>
 </ul>
 
 <p>Add-ons always come as packages. Each Add-on is a single file with the XPI
   extension, except in the case of plugins which usually are binaries specific
   to the target operating system.</p>
 
 <p>[<a href="#add-ons">Return to beginning of section</a>]</p>
 
 <h3 id="installing_add-ons">Installing Add-ons</h3>
 
 <p>There are a number of ways to install Add-ons:</p>
 
 <ul>
-  <li>By clicking a link for an Add-on on a web page. This will trigger
-    a &brandShortName; dialog asking you to confirm or cancel the
+  <li>By clicking a link or a button for an Add-on on a web page. This will
+    trigger a &brandShortName; dialog asking you to confirm or cancel the
     installation, with the Install button disabled for some seconds in
-    order to avoid accidentally clicking it just as the dialog shows up.
-    
-    <p><strong>Note</strong>: As an additonal security measure,
-      &brandShortName; only allows installing Add-ons from a list of permitted
-      websites in the <a
-      href="cs_nav_prefs_advanced.xhtml#software_installation">Software
-      Installation preferences panel</a>.</p>
-  </li>
+    order to avoid accidentally clicking it just as the dialog shows up.</li>
   <li>By opening a previously saved Add-on package, just like you open a
     regular file that you previously saved on your hard drive: Select Open file
     from the File menu, or press <span class="mac"><kbd>Cmd</kbd></span><span
-    class="noMac"><kbd>Ctrl</kbd></span>+<kbd>O</kbd>.</li>
-  <li>By using the Get Add-ons panel in the Add-on Manager or clicking the
-    Install button in any of the panels in the Add-on Manager.</li>
+    class="noMac"><kbd>Ctrl</kbd></span>+<kbd>O</kbd>; you can also open the
+    Tools menu in the Add-ons Manager (next to the search box) and select
+    <q>Install Add-on from File</q>, or just drag-and-drop the installer file
+    into the Add-ons Manager tab or window.</li>
+  <li>By using the Search functionality or the Get Add-ons panel of the
+    Add-ons Manager, as described in the next section.</li>
 </ul>
 
-<p><strong>Note</strong>: Plugins are usually installed as a separate program
-  while &brandShortName; is closed so both the external program and the
-  corresponding plugin for &brandShortName; get installed correctly.</p>
+<p><strong>Notes</strong>:</p>
+<ul>
+  <li>For security, &brandShortName; only allows installing Add-ons from
+    a list of permitted websites in the
+    <a href="cs_nav_prefs_advanced.xhtml#software_installation">Software
+    Installation preferences panel</a>.</li>
+  <li>Also, if you unchecked <q>Allow websites to install add-ons and
+    updates</q> there, you will be prompted to enable that function before
+    anything else happens. This is <em>not</em> a temporary change, you would
+    have to uncheck that box again to disallow installations and updates in
+    the future.</li>
+  <li>Plugins are usually installed as a separate program while
+    &brandShortName; is closed so both the external program and the
+    corresponding plugin for &brandShortName; get installed correctly.</li>
+</ul>
 
 <p>[<a href="#add-ons">Return to beginning of section</a>]</p>
 
-<h3 id="using_the_add-on_manager">Using the Add-on Manager</h3>
+<h3 id="using_the_add-ons_manager">Using the Add-ons Manager</h3>
 
-<p>The Add-on Manager enables you to install and uninstall Add-ons, enable and
+<p>The Add-ons Manager enables you to install and uninstall Add-ons, enable and
   disable them and, in some cases, set preferences for them.</p>
   
-<p id="accessing_the_add-on_manager">To access the Add-on Manager, follow any
+<p id="accessing_the_add-ons_manager">To access the Add-ons Manager, follow any
   of these steps:</p>
 
 <ul>
-  <li>Open the Tools menu, then select Add-on Manager.</li>
+  <li>Open the Tools menu, then select Add-ons Manager.</li>
   <li>Open the <span class="mac">&brandShortName;</span><span
     class="noMac">Edit</span> menu and choose Preferences, expand the Advanced
-    category and click Software Installation.</li>
+    category, click Software Installation, then Manage Add-ons.</li>
 </ul>
 
 <div class="contentsBox">In this section:
   <ul>
+    <li><a href="#searching_for_add-ons">Searching for Add-ons</a></li>
     <li><a href="#the_get_add-ons_panel">The Get Add-ons panel</a></li>
     <li><a href="#the_extensions_panel">The Extensions panel</a></li>
-    <li><a href="#the_themes_panel">The Themes panel</a></li>
+    <li><a href="#the_appearance_panel">The Appearance panel</a></li>
+    <li><a href="#the_plugins_panel">The Plugins panel</a></li>
     <li><a href="#the_languages_panel">The Languages panel</a></li>
-    <li><a href="#the_plugins_panel">The Plugins panel</a></li>
+    <li><a href="#updating_add-ons">Updating Add-ons</a></li>
   </ul>
 </div>
 
+<h4 id="searching_for_add-ons">Searching for Add-ons</h4>
+
+<p>After <a href="#accessing_the_add-ons_manager">accessing the Add-ons
+  Manager</a>, you can search all available Mozilla Add-ons directly from
+  the Add-ons Manager and install them as desired:</p>
+
+<ul>
+  <li>To search for Add-ons based on name, description or tags, type a
+    word or phrase into the Search box and press
+    <span class="mac"><kbd>Return</kbd></span><span
+    class="noMac"><kbd>Enter</kbd></span>. The search panel will open and
+    display a list of matching Add-ons that are compatible with your current
+    version of &brandShortName;. You can sort the results by name or date of
+    the most recent release. You can also search your installed Add-ons by
+    clicking <q>My Add-ons</q>.</li>
+  <li>To get additional information about a specific Add-on in the list,
+    click <q>More</q> for that entry.</li>
+  <li>To install an Add-on in the list, click its Install button.</li>
+</ul>
+
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
+
 <h4 id="the_get_add-ons_panel">The Get Add-ons panel</h4>
 
-<p>The Get Add-ons panel in the Add-on Manager uses web services provided by
+<p>The Get Add-ons panel in the Add-ons Manager uses web services provided by
   the Mozilla Add-ons website to present a list of recommended Add-ons, as
-  well as giving you the option to search all available Mozilla Add-ons
-  directly from the Add-on Manager. After
-  <a href="#accessing_the_add-on_manager">accessing the Add-on Manager</a>,
-  click the Get Add-ons button to show the Get Add-ons panel. There, you can
-  perform the following actions:</p>
+  well as giving you the option to browse the available Mozilla Add-ons. After
+  <a href="#accessing_the_add-ons_manager">accessing the Add-ons Manager</a>,
+  click the Get Add-ons button to show the Get Add-ons panel:</p>
 
 <ul>
-  <li>To search for Add-ons based on name, description or tags, use the
-    Search box. Type a word or phrase and press <span
-    class="mac"><kbd>Return</kbd></span><span
-    class="noMac"><kbd>Enter</kbd></span>. You will get a list of matching
-    Add-ons. To clear the search box terms and the result list, click the
-    icon inside the search box.
-
-    <p><strong>Note</strong>: Add-ons that are already installed or
-      incompatible with your current version of &brandShortName; will not be
-      displayed in the list of search results.</p>
+  <li>To get more information about one of the recommended Add-ons in the list
+    displayed by default, click that entry. The entry will expand to use the
+    full tab, showing screenshots, a description of the Add-on, and reviews
+    as available. You will also be able to directly install the Add-on by
+    clicking the Add to &brandShortName; button inside the expanded entry.
+    <p><strong>Note</strong>: If you disallowed websites to install add-ons
+      and updates in the <a
+      href="cs_nav_prefs_advanced.xhtml#software_installation">Software
+      Installation preferences panel</a>, you will be prompted to enable
+      that function before anything else happens. This is <em>not</em> a
+      temporary change, you would have to uncheck that box again to
+      disallow installations and updates in the future.</p>
   </li>
-  <li>To open the Mozilla Add-ons website in a new browser window (or a new
-    browser tab, depending on your preferences), click Browse All Add-ons.</li>
-  <li>To get more information about one of the recommended Add-ons in the list
-    displayed by default, click the entry. The entry will expand, displaying
-    a larger image, a full description of the Add-on, and an indication of the
-    Add-on type (extension, theme, etc.). You will also be able to install the
-    Add-on by clicking the Add to &brandShortName; button inside the
-    expanded entry.</li>
-  <li>To display the full list of recommended Add-ons for &brandShortName; in a
-    new browser window (or a new browser tab, depending on your preferences),
-    scroll down the recommended Add-ons list until you see the See All
-    Recommended Add-ons link.</li>
+  <li>The Get Add-ons panel also allows you to open the Mozilla Add-ons website
+    in a new browser window (or a new browser tab, depending on your preference
+    settings) to browse extensions and themes.</li>
 </ul>
 
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p><strong>Note</strong>: Personalized Add-on recommendations require a list of
+  your currently installed Add-ons to be sent to the Mozilla Add-ons website.
+  If you have privacy concerns, this function can be switched off in the
+  <a href="cs_nav_prefs_advanced.xhtml#software_installation">Software
+  Installation preferences panel</a>.</p>
+
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
 <h4 id="the_extensions_panel">The Extensions panel</h4>
 
-<p>The Extensions panel in the Add-on Manager lists the installed extensions.
-  After <a href="#accessing_the_add-on_manager">accessing the Add-on
+<p>The Extensions panel in the Add-ons Manager lists the installed extensions.
+  After <a href="#accessing_the_add-ons_manager">accessing the Add-ons
   Manager</a>, click the Extensions button to show the Extensions panel. There,
   you can perform the following actions:</p>
 
 <ul>
-  <li>To get more information about any of the installed extensions, click the
-    entry in the list. The entry will expand and show the full description of
-    the extension.
+  <li>To get more information about any of the installed extensions, click
+    <q>More</q> for the entry in the list. The entry will expand into the full
+    tab and show the description of the extension along with its update
+    options.
 
     <p><strong>Note</strong>: Disabled extensions will appear greyed out.
       Incompatible extensions will appear greyed out, since they are also
       disabled, and with a forbidden sign over the extension icon (incompatible
       extensions are those which define themselves as not compatible for the
       version of &brandShortName; you are using).</p>
   </li>
-  <li>To access preferences of an extension (if the extension features a
-    preferences panel), click the entry corresponding to the desired extension,
-    then click the Preferences button.
+  <li>To access options of an extension (if the extension features a
+    preferences panel), click the Options button for the entry corresponding
+    to the desired extension.
 
     <p><strong>Note</strong>: If the extension does not feature a preferences
-      panel, the Preferences button will be disabled. You can&apos;t access
+      panel, the Options button will be hidden. You can&apos;t access
       preferences of disabled or incompatible extensions.</p>
   </li>
-  <li>To disable an extension, click the entry corresponding to the desired
-    extension, then click the Disable button. An info bar will appear to remind
-    you that changes will apply once you restart &brandShortName;. The info bar
-    features a Restart &brandShortName; button.</li>
-  <li>To enable an extension, click the entry corresponding to the desired
-    extension, then click the Enable button. An info bar will appear to remind
-    you that changes will apply once you restart &brandShortName;. The info bar
-    features a Restart &brandShortName; button.</li>
-  <li>To uninstall an extension, click the entry corresponding to the
-    desired extension, then click the Uninstall button. An info bar will
-    appear to remind you that changes will apply once you restart
-    &brandShortName;. The info bar features a Restart &brandShortName;
-    button.</li>
-  <li>To find updates for any extension in the list (including those marked as
-    incompatible), click the Find Updates button at the bottom of the
-    Add-on Manager.
-
-    <p>If updates are found, they will be displayed in a new panel. In the
-      panel, you can choose what extensions you want to update and then use the
-      Install Updates button to retrieve updated Add-ons. Once downloaded, you
-      will need to restart &brandShortName; to apply the updates.</p>
-  </li>
+  <li>To disable an extension, click the Disable button for the entry
+    corresponding to the desired extension. An info bar appears if
+    the changes will apply only once you restart &brandShortName;.
+    The info bar features a <q>Restart Now</q> option.</li>
+  <li>To enable an extension, click the Enable button for the entry
+    corresponding to the desired extension. An info bar appears if
+    the changes will apply only once you restart &brandShortName;.
+    The info bar features a <q>Restart Now</q> option.</li>
+  <li>To uninstall an extension, click the Remove button for the entry
+    corresponding to the desired extension. An info bar appears if
+    the changes will apply only once you restart &brandShortName;.
+    The info bar features a <q>Restart Now</q> option.</li>
 </ul>
 
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
-<h4 id="the_themes_panel">The Themes panel</h4>
+<h4 id="the_appearance_panel">The Appearance panel</h4>
 
-<p>The Themes panel in the Add-on Manager lists the installed themes. After
-  <a href="#accessing_the_add-on_manager">accessing the Add-on Manager</a>,
-  click the Themes button to show the Themes panel. There, you can perform the
-  following actions:</p>
+<p>The Appearance panel in the Add-ons Manager lists the installed themes. After
+  <a href="#accessing_the_add-ons_manager">accessing the Add-ons Manager</a>,
+  click the Appearance button to show the Appearance panel. There, you can
+  perform the following actions:</p>
 
 <ul>
-  <li>To get more information and a preview on any of the installed themes,
-    click an entry in the list. The entry will expand and show the full
-    description of the theme, along with a preview in the right side of the
-    Add-on Manager dialog (you may need to resize the dialog to properly see
-    the preview pane).</li>
-  <li>To use a theme, click the entry corresponding to the desired theme, then
-    click the Use Theme button. An info bar will appear to remind you that
-    changes will apply once you restart &brandShortName;. The info bar features
-    a Restart &brandShortName; button.
+  <li>To get more information about any of the installed themes, click
+    <q>More</q> for the entry in the list. The entry will expand into the
+    full tab and show the description of the theme along with its version
+    information.</li>
+  <li>To use a theme, click the Enable button for the entry corresponding
+    to the desired theme. An info bar appears if the changes will apply only
+    once you restart &brandShortName;. The info bar features a <q>Restart
+    Now</q> option.
     
-    <p><strong>Note</strong>: Contrary to extensions, you only can use one
+    <p><strong>Note</strong>: Contrary to extensions, you can use only one
     theme at a time.</p>
   </li>
-  <li>To uninstall a theme, click the entry corresponding to the desired theme,
-    then click the Uninstall button. An info bar will appear to remind
-    you that changes will apply once you restart &brandShortName;. The info bar
-    features a Restart &brandShortName; button.</li>
+  <li>To uninstall a theme, click the Remove button for the entry corresponding
+    to the desired theme. An info bar appears if the changes will apply only
+    once you restart &brandShortName;. The info bar features a <q>Restart
+    Now</q> option.</li>
 </ul>
 
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
+
+<h4 id="the_plugins_panel">The Plugins panel</h4>
+
+<p>The Plugins panel in the Add-ons Manager lists the plugins found. After
+  <a href="#accessing_the_add-ons_manager">accessing the Add-ons Manager</a>,
+  click the Plugins button to show the Plugins panel. There, you can perform
+  the following actions:</p>
+
+<ul>
+  <li>To get more information about any of the plugins found, click <q>More</q>
+    for the entry in the list. The entry will expand into the full tab and show
+    the description of the plugin along with its version information.</li>
+  <li>Click <q>Check to see if your plugins are up to date</q> to open a new
+    tab or window connecting to a Mozilla website to check for status and
+    update information on all of your enabled plugins.</li>
+  <li>To disable a plugin, click the Disable button for the entry corresponding
+    to the desired plugin.</li>
+  <li>To enable a plugin, click the Enable button for the entry corresponding
+    to the desired plugin.</li>
+</ul>
+
+<p><strong>Notes</strong>:</p>
+
+<ul>
+  <li>Contrary to other types of Add-ons, enabling and disabling plugins
+    doesn&apos;t require restarting &brandShortName;.</li>
+  <li>Info bars may appear for any plugins which are determined to be outdated,
+    incompatible, or blocked for security reasons.</li>
+</ul>
+
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
 <h4 id="the_languages_panel">The Languages panel</h4>
 
-<p>The Languages panel in the Add-on Manager lists the installed Language
-  Packs. This panel only appears if you have installed a Language Pack.</p>
+<p>The Languages panel in the Add-ons Manager lists the installed language
+  packs. This panel only appears if you have installed a language pack.</p>
 
-<p>After <a href="#accessing_the_add-on_manager">accessing the Add-on
+<p>After <a href="#accessing_the_add-ons_manager">accessing the Add-ons
   Manager</a>, click the Languages button to show the Languages panel. There,
   you can perform the following actions:</p>
 
 <ul>
-  <li>To disable a language pack, click the entry corresponding to the desired
-    language pack, then click the Disable button. An info bar will appear to
-    remind you that changes will apply once you restart &brandShortName;. The
-    info bar features a Restart &brandShortName; button.</li>
-  <li>To enable a language pack, click the entry corresponding to the desired
-    language pack, then click the Enable button. An info bar will appear to
-    remind you that changes will apply once you restart &brandShortName;. The
-    info bar features a Restart &brandShortName; button.</li>
-  <li>To uninstall a language pack, click the entry corresponding to the
-    desired language pack, then click the Uninstall button. An info bar will
-    appear to remind you that changes will apply once you restart
-    &brandShortName;. The info bar features a Restart &brandShortName;
-    button.</li>
+  <li>To get more information about any of the language packs, click <q>More</q>
+    for the entry in the list. The entry will expand into the full tab and show
+    the description of the language pack along with its update options.</li>
+  <li>To disable a language pack, click the Disable button for the entry
+    corresponding to the desired language pack.</li>
+  <li>To enable a language pack, click the Enable button for the entry
+    corresponding to the desired language pack.</li>
+  <li>To uninstall a language pack, click the Remove button for the entry
+    corresponding to the desired language pack.</li>
 </ul>
 
 <p><strong>Note</strong>: Enabling a language pack in the Language panel
   doesn&apos;t change the language shown in &brandShortName;&apos;s user
   interface, it only makes the language available for selection in the
   <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences
   panel</a>.</p>
 
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
-<h4 id="the_plugins_panel">The Plugins panel</h4>
+<h4 id="updating_add-ons">Updating Add-ons</h4>
 
-<p>The Plugins panel in the Add-on Manager lists the installed Add-ons of type
-  Plugin. After <a href="#accessing_the_add-on_manager">accessing the Add-on
-  Manager</a>, click the Plugins button to show the Plugins panel. There, you
-  can perform the following actions:</p>
+<p>Updates are by default performed automatically for any Add-ons installed
+  through the Search or Get Add-ons panels if such updates are offered through
+  the Mozilla Add-ons website. The global settings can be found in the
+  <a href="cs_nav_prefs_advanced.xhtml#software_installation">Software
+  Installation preferences panel</a>. You can override those for individual
+  Add-ons by clicking <q>More</q> and then selecting the desired option.
+</p>
+
+<p>Update functions are also offered in the Add-ons Manager&apos;s Tools menu,
+  found next to the search box:</p>
 
 <ul>
-  <li>To disable a plugin, click the entry corresponding to the desired plugin,
-    then click the Disable button.</li>
-  <li>To enable a plugin, click the entry corresponding to the desired plugin,
-    then click the Enable button.</li>
+  <li>You can check for updates for all installed Add-ons manually and set or
+    reset automated updates for all Add-ons.</li>
+  <li>If new updates are found for one or more Add-ons, an Update Now button
+    appears for each Add-on. They are also listed in a new Available Updates
+    panel. Rather than updating each Add-on separately, the Include in Update
+    checkbox can be used to select the updates to be performed, then click the
+    Install Updates button.</li>
+  <li>View Recent Updates opens a Recent Updates panel which lists Add-ons of
+    all types for which updates have been performed, along with the date of
+    that update.</li>
 </ul>
 
-<p><strong>Note</strong>: Contrary to other types of Add-ons, enabling and
-  disabling plugins doesn&apos;t require restarting &brandShortName;.</p>
-
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
 <h2 id="specifying_how_mozilla_starts_up">Specifying How &brandShortName;
   Starts Up</h2>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#specifying_a_starting_page">Specifying a Starting Page</a></li>
     <li><a href="#session_restore">Session Restore</a></li>
--- a/suite/chrome/common/help/developer_tools.xhtml
+++ b/suite/chrome/common/help/developer_tools.xhtml
@@ -16,25 +16,25 @@
 <link rel="stylesheet" href="helpFileLayout.css"
   type="text/css"/>
 </head>
 <body>
 
 <h1 id="web_development_tools">Web Development Tools</h1>
 
 <p>For web developers, &brandShortName; provides several tools to aid in
-  developing and debugging Web applications. Some of these are optional
-  installs. To access these tools, open the Tools menu and choose Web
-  Development.</p>
+  developing and debugging <a href="glossary.xhtml#web_application">web
+  applications</a>. Some of these are optional installs. To access these
+  tools, open the Tools menu and choose Web Development.</p>
 
 <ul class="separate">
   <li id="js_console">
     <strong>Error Console</strong>: a console window that reports problems
     with <a href="glossary.xhtml#javascript">JavaScript</a> and CSS code in
-    Web applications and the &brandShortName; application itself. By default, 
+    web applications and the &brandShortName; application itself. By default, 
     CSS parsing errors and JavaScript errors are displayed. The console can 
     also be used to display logged messages from <a href="glossary.xhtml#xul">
     XUL</a> and JavaScript code.
   </li>
   <li id="inspector">
     <strong>DOM Inspector</strong>: a tool that can be
     used to inspect and edit the DOM of any web document or XUL
     application.
--- a/suite/chrome/common/help/glossary.xhtml
+++ b/suite/chrome/common/help/glossary.xhtml
@@ -61,17 +61,17 @@
   browser accumulates these copies as you browse the Web. When you click a link
   or type a <a href="#url">URL</a> to fetch a particular web page for which the
   cache already contains a copy, the browser compares the cached copy to the
   original. If there have been no changes, the browser uses the cached copy
   rather than refetching the original, saving processing and download
   time.</dd>
 
 <dt id="caret_browsing">caret browsing</dt><dd>A &brandShortName; feature that
-  allows you to navigate through text in Web pages and e-mail messages (or this
+  allows you to navigate through text in Web pages and email messages (or this
   Help window) with a caret. Using your keyboard, you can navigate and select
   text like you do in a text editor. You can turn caret browsing mode on or off
   by pressing the <kbd>F7</kbd> key. Caret browsing mode can also be enabled or
   disabled in Advanced Preferences - Keyboard Navigation.</dd>
 
 <dt id="certificate">certificate</dt><dd>The digital equivalent of an ID card.
   A certificate specifies the name of an individual, company, or other entity
   and certifies that a public key, which is included in the certificate,
@@ -170,24 +170,24 @@
   also <a href="#client_authentication">client authentication</a>.</dd>
 
 <dt id="component_bar">Component Bar</dt><dd>The toolbar located at the bottom
   left of any &brandShortName; window. The Component Bar allows you to switch
   between &brandShortName; components by clicking icons for Browser,
   Mail &amp; Newsgroups, Composer, and so on.</dd>
 
 <dt id="cookie">cookie</dt><dd>A small bit of information stored on your
-  computer by some <a href="#web_site">websites</a>. When you visit such a
+  computer by some <a href="#website">websites</a>. When you visit such a
   website, the website asks your browser to place one or more cookies on your
   hard disk. Later, when you return to the website, your browser sends the
   website the cookies that belong to it. Cookies help websites keep track of
   information about you, such as the contents of your shopping cart. You can set
   your cookie preferences to control how cookies are used and how much
   information you are willing to let websites store on them. See also
-  <a href="#foreign_cookie">foreign cookie</a>.</dd>
+  <a href="#third-party_cookie">third-party cookie</a>.</dd>
 
 <dt id="cookie_manager">Cookie Manager</dt><dd>The part of the browser
   that you can use to control <a href="#cookie">cookies</a>.</dd>
 
 <dt id="crl">CRL (certificate revocation list)</dt><dd>A list of revoked
   certificates that is generated and signed by a
   <a href="#certificate_authority">certificate authority (CA)</a>. You can
   download the latest CRL to your browser or to a server, then check against it
@@ -223,16 +223,24 @@
   for similar legal purposes. See also
   <a href="#nonrepudiation">nonrepudiation</a>,
   <a href="#tamper_detection">tamper detection</a>.</dd>
 
 <dt id="distinguished_name">distinguished name (DN)</dt><dd>A specially
   formatted name that uniquely identifies the subject of a
   <a href="#certificate">certificate</a>.</dd>
 
+<dt id="do_not_track">Do Not Track</dt><dd>A mechanism that allows users
+  to inform <a href="#website">websites</a> that they do not want to be
+  <a href="#user_tracking">tracked</a> by third-party websites and
+  <a href="#web_application">web applications</a>. A user&apos; tracking
+  preferences is included in the <a href="#http">HTTP</a> header and sent
+  to the website. &brandShortName; supports sending <q>Do Not Track</q>
+  requests, but websites are not obligated to honor those.</dd>
+
 <dt id="dual_key_pairs">dual key pairs</dt><dd>Two public-private key
   pairs&mdash;four keys altogether&mdash;corresponding to two separate
   certificates. The private key of one pair is used for signing operations, and
   the public and private keys of the other pair are used for encryption and
   decryption operations. Each pair corresponds to a separate
   <a href="#certificate">certificate</a>. See also
   <a href="#public-key_cryptography">public-key cryptography</a>.</dd>
 
@@ -269,33 +277,33 @@
   each one containing some metadata (possibly including a summary) and an URL
   to the full blog or news article. The XML document is regenerated at fixed
   intervals, or whenever a new article is published to the website. Web
   applications can subscribe to the URL serving the feed and present the new
   articles as they are updated in the underlying XML document. There are
   specific XML formats for feeds, most common of which are
   <a href="#rss">RSS</a> and Atom.</dd>
 
-<dt id="fingerprint">fingerprint</dt><dd>See
+<dt id="fingerprint">fingerprint (certificate)</dt><dd>See
   <a href="#certificate_fingerprint">certificate fingerprint</a>.</dd>
 
+<dt id="fingerprinting">fingerprinting (browser)</dt><dd>A method of
+  <a href="#user_tracking">user tracking</a> by which a user is identified
+  based on browser characteristics like browser and operating system versions,
+  stated language preferences, or <a href="#plugin">plugins</a> installed.</dd>
+
 <dt id="fips_pubs_140-1">FIPS PUBS 140-1</dt><dd>Federal Information Processing
   Standards Publications (FIPS PUBS) 140-1 is a US government standard for
   implementations of cryptographic modules&mdash;that is, hardware or software
   that encrypts and decrypts data or performs other cryptographic operations
   (such as creating or verifying digital signatures). Many products sold to the
   US government must comply with one or more of the FIPS standards.</dd>
 
-<dt id="foreign_cookie">foreign cookie</dt><dd>A <a href="#cookie">cookie</a>
-  from one website that gets stored on your computer when you visit a different
-  website. Sometimes a <a href="#web_site">website</a> displays content that is
-  hosted on another website. That content can be anything from an image to text
-  or an advertisement. The second website that hosts such elements also has the
-  ability to store a cookie in your browser, even though you don&apos;t visit
-  it directly. Also known as <q>third-party cookie</q>.</dd>
+<dt id="foreign_cookie">foreign cookie</dt><dd>See
+  <a href="#third-party_cookie">third-party cookie</a>.</dd>
 
 <dt id="frame">frame</dt><dd>Frames are <a href="#web_page">web pages</a>
   contained inside of an all-encompasssing <q>meta</q> page.</dd>
 
 <dt id="ftp">FTP (File Transfer Protocol)</dt><dd>A
   standard that allows users to transfer files from one computer to another
   over a network. You can use your browser to fetch files using FTP.</dd>
 
@@ -339,17 +347,18 @@
   Not all <a href="#isp">ISPs</a> support IMAP.</dd>
 
 <dt id="implicit_consent">implicit consent</dt><dd>Also known as implied or
   <q>opt-out</q> consent. Used to describe privacy settings that may allow
   websites to gather information about you (for example by means of
   <a href="#cookie">cookies</a> and online forms) unless you explicitly choose
   to withhold your consent by selecting an option on a page that the website
   provides for that purpose. Your consent may not be requested when the
-  information is actually gathered.</dd>
+  information is actually gathered. See also <a href="#user_tracking">user
+  tracking</a>.</dd>
 
 <dt id="internet">Internet</dt><dd>A worldwide network of millions of computers
   that communicate with each other using standard protocols such as
   <a href="#tcp_ip">TCP/IP</a>. Originally developed for the US military in
   1969, the Internet grew to include educational and research institutions and,
   in the late 1990s, millions of businesses, organizations, and individuals.
   Today the Internet is used for email, browsing the
   <a href="#world_wide_web">World Wide Web (WWW)</a>, instant messaging,
@@ -397,16 +406,24 @@
   across multiple platforms. You can set up your browser to access LDAP
   directories from the Address Book. You can also set up Mail &amp; Newsgroups
   to use an LDAP directory for email address autocompletion.</dd>
 
 <dt id="location_bar">Location Bar</dt><dd>The field (and associated buttons)
   near the top of a browser window where you can type a
   <a href="#url">URL</a> or search terms.</dd>
 
+<dt id="malware">Malware</dt><dd>Short for <q><u>Mal</u>icious
+  Soft<u>ware</u></q> and a general term for a variety of software designed
+  to disrupt computer operation, gather sensitive information, or gain access
+  to your computer. They can be distributed by infected <a href="#web_page">web
+  pages</a> or as attachments to email messages. Examples include viruses,
+  worms, trojans, spyware, or adware. Malware may redistribute itself by
+  sending out email messages to infect other computers.</dd>
+
 <dt id="master_key">master key</dt><dd>A symmetric key used by
   <a href="#certificate_manager">Certificate Manager</a> to encrypt
   information. For example, <a href="#password_manager">Password Manager</a>
   uses Certificate Manager and your master key to encrypt email passwords,
   website passwords, and other stored sensitive information. See also
   <a href="#symmetric_encryption">symmetric encryption</a>.</dd>
 
 <dt id="master_password">master password</dt><dd>A password used by
@@ -556,16 +573,23 @@
   <a href="#certificate_authority">certificate authority (CA)</a> with a
   self-signed certificate at the top of a
   <a href="#certificate_chain">certificate chain</a>. See also
   <a href="#subordinate_ca">subordinate CA</a>.</dd>
 
 <dt id="rss">RSS (Really Simple Syndication)</dt><dd>An <a href="#xml">XML</a>
   data format for web <a href="#feed">feeds</a>.</dd>
 
+<dt id="safe_browsing">safe browsing</dt><dd>Protection against common threats
+  from <a href="#malware">Malware</a> and <a href="#phishing">Phishing</a> by
+  checking each <a href="#web_page">web page</a> against a list of reported
+  websites. If the web page you are about to visit has been reported as
+  containing malicious content, &brandShortName; prevents it from loading
+  and shows a warning instead.</dd>
+
 <dt id="search_engine">search engine</dt><dd>A web-based program that allows
   users to search for and retrieve specific information from the
   <a href="#world_wide_web">World Wide Web (WWW)</a>. The search engine may
   search the full text of web documents or a list of keywords, or use
   librarians who review web documents and index them manually for retrieval.
   Typically, the user types a word or phrase, also called a query, into a
   search box, and the search engine displays links to relevant web pages.</dd>
 
@@ -716,18 +740,24 @@
 <dt id="tcp_ip">TCP/IP (Transmission Control Protocol/Internet
   Protocol)</dt><dd>A Unix protocol used to connect computers running a variety
   of operating systems. TCP/IP is an essential Internet protocol and has become
   a global standard.</dd>
 
 <dt id="theme">theme</dt><dd>A type of <a href="#add-on">add-on</a> that changes
   the appearance of &brandShortName;.</dd>
 
-<dt id="third-party_cookie">third-party cookie</dt><dd>See
-  <a href="#foreign_cookie">foreign cookie</a>.</dd>
+<dt id="third-party_cookie">third-party cookie</dt><dd>A
+  <a href="#cookie">cookie</a> from one <a href="#website">website</a> that
+  gets stored on your computer when you visit a different website. Sometimes a
+  website displays content that is hosted on another website. That content can
+  be anything from an image to text or an advertisement. The second website
+  that hosts such elements also has the ability to store a cookie in your
+  browser, even though you don&apos;t visit it directly. Also known as
+  <q>foreign cookie</q>.</dd>
 
 <dt id="tls">TLS</dt><dd>Transport Layer Security (TLS) is the new Internet
   Engineering Task Force (IETF) standard based on SSL (Secure Sockets Layer).
   See also <a href="#ssl">SSL</a> and
   <a href="#encryption">encryption</a>.</dd>
 
 <dt id="token">token</dt><dd>See <a href="#security_device">security
   device</a>.</dd>
@@ -749,21 +779,39 @@
 <dt id="url">URL (Uniform Resource Locator)</dt><dd>The standardized address
   that tells your browser how to locate a file or other resource on the Web.
   For example: <tt>http://www.mozilla.org.</tt> You can type URLs into the
   browser&apos;s <a href="#location_bar">Location Bar</a> to access
   <a href="#web_page">web pages</a>. URLs are also used in the links on web
   pages that you can click to go to other web pages. Also known as an Internet
   address or Web address.</dd>
 
+<dt id="user_tracking">user tracking</dt><dd>Methods that some
+  <a href="#website">websites</a>, including advertisers and analytics services,
+  employ to determine patterns in how you browse the web (e.g., what websites
+  you have visited, which preferences you have voiced using buttons embedded by
+  social networks, and your purchase history). This information is mostly used
+  to show you specifically targeted offers or advertisements for products or
+  services. Mechanisms for user tracking include <a href="#cookie">cookies</a>
+  and <a href="#fingerprinting">browser fingerprinting</a>. See also
+  <a href="#do_not_track">Do Not Track</a>.</dd>
+
+<dt id="web_application">web application</dt><dd>An application that is not
+  running on your computer but remotely on a <a href="#website">website</a>.
+  Examples include web-mail systems or web-based systems where you enter
+  information into a form and receive a response as a <a href="#web_page">web
+  page</a>. An <i>offline</i> web application can work without a current
+  connection to the <a href="#internet">Internet</a> by saving the relevant
+  pages locally before running the application.</dd>
+
 <dt id="web_page">web page</dt><dd>A single document on the World Wide Web that
   is specified by a unique address or <a href="#url">URL</a> and that may
   contain text, hyperlinks, and graphics.</dd>
 
-<dt id="web_site">website</dt><dd>A group of related web pages linked by
+<dt id="website">website</dt><dd>A group of related web pages linked by
   hyperlinks and managed by a single company, organization, or individual. A
   website may include text, graphics, audio and video files, and links to
   other websites.</dd>
 
 <dt id="world_wide_web">World Wide Web (WWW)</dt><dd>Also known as the Web. A
   portion of the <a href="#internet">Internet</a> that is made up of web pages
   stored by web <a href="#server">servers</a> and displayed by
   <a href="#client">clients</a> called web browsers (such as
--- a/suite/chrome/common/help/help-glossary.rdf
+++ b/suite/chrome/common/help/help-glossary.rdf
@@ -36,24 +36,26 @@
         <rdf:li> <rdf:Description nc:name="Cookie Manager" nc:link="glossary.xhtml#cookie_manager"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="CRL" nc:link="glossary.xhtml#crl"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="cryptographic algorithm" nc:link="glossary.xhtml#cryptographic_algorithm"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="cryptography" nc:link="glossary.xhtml#cryptography"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="decryption" nc:link="glossary.xhtml#decryption"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="digital ID" nc:link="glossary.xhtml#digital_id"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="digital signature" nc:link="glossary.xhtml#digital_signature"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="distinguished name (DN)" nc:link="glossary.xhtml#distinguished_name"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="Do Not Track" nc:link="glossary.xhtml#do_not_track"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="dual key pairs" nc:link="glossary.xhtml#dual_key_pairs"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="eavesdropping" nc:link="glossary.xhtml#eavesdropping"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="encryption" nc:link="glossary.xhtml#encryption"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="encryption certificate" nc:link="glossary.xhtml#encryption_certificate"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="encryption key" nc:link="glossary.xhtml#encryption_key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="extension" nc:link="glossary.xhtml#extension"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="feed" nc:link="glossary.xhtml#feed"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="fingerprint" nc:link="glossary.xhtml#fingerprint"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="fingerprint (certificate)" nc:link="glossary.xhtml#fingerprint"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="fingerprinting (browser)" nc:link="glossary.xhtml#fingerprinting"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FIPS PUBS 140-1" nc:link="glossary.xhtml#fips_pubs_140-1"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="foreign cookie" nc:link="glossary.xhtml#foreign_cookie"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="frame" nc:link="glossary.xhtml#frame"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FTP" nc:link="glossary.xhtml#ftp"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="helper application" nc:link="glossary.xhtml#helper_application"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="home page" nc:link="glossary.xhtml#home_page"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="HTML" nc:link="glossary.xhtml#html"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="HTTP" nc:link="glossary.xhtml#http"/> </rdf:li>
@@ -65,16 +67,17 @@
         <rdf:li> <rdf:Description nc:name="IRC" nc:link="glossary.xhtml#irc"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="ISP" nc:link="glossary.xhtml#isp"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Java" nc:link="glossary.xhtml#java"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="JavaScript" nc:link="glossary.xhtml#javascript"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="key" nc:link="glossary.xhtml#key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="LDAP" nc:link="glossary.xhtml#ldap"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="language pack" nc:link="glossary.xhtml#language_pack"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Location Bar" nc:link="glossary.xhtml#location_bar"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="Malware" nc:link="glossary.xhtml#malware"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="master key" nc:link="glossary.xhtml#master_key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="master password" nc:link="glossary.xhtml#master_password"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="misrepresentation" nc:link="glossary.xhtml#misrepresentation"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Navigation Toolbar" nc:link="glossary.xhtml#navigation_toolbar"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="nonrepudiation" nc:link="glossary.xhtml#nonrepudiation"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="notification bar" nc:link="glossary.xhtml#notification_bar"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="object signing" nc:link="glossary.xhtml#object_signing"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="object-signing certificate" nc:link="glossary.xhtml#object-signing_certificate"/> </rdf:li>
@@ -90,16 +93,17 @@
         <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 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>
         <rdf:li> <rdf:Description nc:name="secure authentication" nc:link="glossary.xhtml#secure_authentication"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="secure connection" nc:link="glossary.xhtml#secure_connection"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="security certificate" nc:link="glossary.xhtml#security_certificate"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="security device" nc:link="glossary.xhtml#security_device"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="security module" nc:link="glossary.xhtml#security_module"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="security token" nc:link="glossary.xhtml#security_token"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="server" nc:link="glossary.xhtml#server"/> </rdf:li>
@@ -125,18 +129,20 @@
         <rdf:li> <rdf:Description nc:name="theme" nc:link="glossary.xhtml#theme"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="TCP/IP" nc:link="glossary.xhtml#tcp_ip"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="third-party cookie" nc:link="glossary.xhtml#third-party_cookie"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="TLS" nc:link="glossary.xhtml#tls"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="token" nc:link="glossary.xhtml#token"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="tooltip" nc:link="glossary.xhtml#tooltip"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="trust" nc:link="glossary.xhtml#trust"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="URL" nc:link="glossary.xhtml#url"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="user tracking" nc:link="glossary.xhtml#user_tracking"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="web application" nc:link="glossary.xhtml#web_application"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="web page" nc:link="glossary.xhtml#web_page"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="website" nc:link="glossary.xhtml#web_site"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="website" nc:link="glossary.xhtml#website"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="World Wide Web (WWW)" nc:link="glossary.xhtml#world_wide_web"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="WPAD" nc:link="glossary.xhtml#wpad"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="XML" nc:link="glossary.xhtml#xml"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="XSLT" nc:link="glossary.xhtml#xslt"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="XUL" nc:link="glossary.xhtml#xul"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -23,16 +23,21 @@
          nc:link="customize_help.xhtml#add-ons"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="address_books"
          nc:name="address books"
          nc:link="mailnews_addressbooks.xhtml#about_address_books"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="appearance_panel"
+         nc:name="appearance panel"
+         nc:link="customize_help.xhtml#the_appearance_panel"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="attaching_files_to_messages"
          nc:name="attaching files to messages"
          nc:link="mailnews_using_mail.xhtml#attaching_a_file_or_web_page"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#adding">
@@ -115,47 +120,57 @@
      <rdf:li>
        <rdf:Description ID="add-ons:installing"
          nc:name="installing"
          nc:link="customize_help.xhtml#installing_add-ons"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="add-ons:manager"
          nc:name="Add-ons Manager"
-         nc:link="customize_help.xhtml#using_the_add-on_manager"/>
+         nc:link="customize_help.xhtml#using_the_add-ons_manager"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#add-ons:manager">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
+       <rdf:Description ID="add-ons:searching_for_add-ons"
+         nc:name="Searching for Add-ons"
+         nc:link="customize_help.xhtml#searching_for_add-ons"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="add-ons:get_add-ons"
          nc:name="Get Add-ons Panel"
          nc:link="customize_help.xhtml#the_get_add-ons_panel"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="add-ons:extensions_panel"
          nc:name="Extensions Panel"
          nc:link="customize_help.xhtml#the_extensions_panel"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="add-ons:themes_panel"
-         nc:name="Themes Panel"
-         nc:link="customize_help.xhtml#the_themes_panel"/>
+       <rdf:Description ID="add-ons:appearance_panel"
+         nc:name="Appearance Panel"
+         nc:link="customize_help.xhtml#the_appearance_panel"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="add-ons:plugins_panel"
+         nc:name="Plugins Panel"
+         nc:link="customize_help.xhtml#the_plugins_panel"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="add-ons:languages_panel"
          nc:name="Languages Panel"
          nc:link="customize_help.xhtml#the_languages_panel"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="add-ons:plugins_panel"
-         nc:name="Plugins Panel"
-         nc:link="customize_help.xhtml#the_plugins_panel"/>
+       <rdf:Description ID="add-ons:updating_add-ons"
+         nc:name="Updating Add-ons"
+         nc:link="customize_help.xhtml#updating_add-ons"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#b">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="backing_up_certificates"
@@ -403,17 +418,17 @@
          nc:link="using_certs_help.xhtml#using_certificates"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Certificates:validation"
          nc:name="certificate validation"
          nc:link="using_certs_help.xhtml#controlling_validation"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="Certificates:web_site"
+       <rdf:Description ID="Certificates:website"
          nc:name="website identity"
          nc:link="using_certs_help.xhtml#managing_certificates_that_identify_servers"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Certificates:your_own"
          nc:name="Your own identity"
          nc:link="using_certs_help.xhtml#managing_certificates_that_identify_you"/>
      </rdf:li></rdf:Seq>
@@ -558,36 +573,36 @@
          nc:link="using_priv_help.xhtml#using_the_cookie_manager"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="cookies:email_and"
          nc:name="e-mail and cookies"
          nc:link="privacy_help.xhtml#how_can_i_control_web_pages_in_email_messages"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="cookies:foreign"
-         nc:name="foreign cookies"
-         nc:link="privacy_help.xhtml#what_are_third-party_cookies"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="cookies:managing_per_site"
          nc:name="managing cookies per website"
          nc:link="using_priv_help.xhtml#managing_cookies_site-by-site"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="cookies:preferences"
          nc:name="cookie preferences"
          nc:link="using_priv_help.xhtml#cookies"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="cookies:removing"
          nc:name="removing cookies"
          nc:link="using_priv_help.xhtml#removing_cookies"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="cookies:third-party"
+         nc:name="third-party cookies"
+         nc:link="privacy_help.xhtml#what_are_third-party_cookies"/>
+     </rdf:li>
+     <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">
@@ -1402,16 +1417,21 @@
 <rdf:Description about="#Offline">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Offline:general_preferences"
          nc:name="offline preferences"
          nc:link="mailnews_preferences.xhtml#network_and_storage_preferences"/>
      </rdf:li>
      <rdf:li>
+        <rdf:Description ID="Offline:offline_apps"
+          nc:name="Offline Web Applications"
+          nc:link="cs_nav_prefs_advanced.xhtml#offline_apps"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Offline:Mail_and_Newsgroups"
          nc:name="Offline Mail and News"
          nc:link="mailnews_offline.xhtml#working_offline"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#p">
@@ -1816,16 +1836,21 @@
          nc:link="mailnews_using_mail.xhtml#confirming_that_your_message_was_opened"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#s">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
+       <rdf:Description ID="safe_browsing"
+         nc:name="safe browsing preferences"
+         nc:link="privsec_help.xhtml#safe_browsing"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="save"
          nc:name="save"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="security"
          nc:name="security"/>
      </rdf:li>
      <rdf:li>
@@ -1843,16 +1868,21 @@
          nc:link="using_certs_help.xhtml#about_security_devices_and_modules"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="search"
          nc:name="search"
          nc:link="nav_help.xhtml#searching_the_web"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="searching_for_add-ons"
+         nc:name="searching for add-ons"
+         nc:link="customize_help.xhtml#searching_for_add-ons"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Sidebar"
          nc:name="Sidebar"
          nc:link="customize_help.xhtml#what_is_sidebar"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="signing_email_messages"
          nc:name="signing e-mail messages"
          nc:link="mailnews_security.xhtml#signing_and_encrypting_messages"/>
@@ -2083,21 +2113,16 @@
          nc:link="mailnews_organizing.xhtml#tagging_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="themes"
          nc:name="themes"
          nc:link="customize_help.xhtml#changing_the_theme"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="themes_panel"
-         nc:name="themes panel"
-         nc:link="customize_help.xhtml#the_themes_panel"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="toolbar"
          nc:name="toolbar"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Tabbed_Browsing">
    <nc:subheadings>
@@ -2167,19 +2192,29 @@
          nc:link="customize_help.xhtml#personal_toolbar"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#u">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
+       <rdf:Description ID="updating_add-ons"
+         nc:name="updating add-ons"
+         nc:link="customize_help.xhtml#updating_add-ons"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="uploading_pages"
          nc:name="uploading pages"
          nc:link="composer_help.xhtml#publishing_your_pages_on_the_web"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="user_tracking"
+         nc:name="user tracking preferences"
+         nc:link="privsec_help.xhtml#privacy_and_security"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#v">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="validation"
--- a/suite/chrome/common/help/mailnews_getting_started.xhtml
+++ b/suite/chrome/common/help/mailnews_getting_started.xhtml
@@ -163,17 +163,17 @@
     <ul>
       <li>Indicate whether you want a POP account or an IMAP account. Not all
         service providers can support both options. For more information, see
         <a href="mailnews_account_settings.xhtml#server_settings">Mail &amp;
         Newsgroups Account Settings - Server Settings</a>.</li>
       <li>Enter the name of your incoming mail server.</li>
       <li>Check the <q>Leave messages on server</q> checkbox if you want to
         leave messages on the server so that when you download messages, 
-        SeaMonkey does not remove the messages from the server.</li>
+        &brandShortName; does not remove the messages from the server.</li>
       <li>If you want this account to be a part of the Local Folders Global
         Inbox account, check the <q>Use Global Inbox</q> box. Mail for
         this account will then be stored in your Local Folders. Otherwise, if
         the checkbox is unchecked, mail will be stored in its own
         directory.</li>
       <li>Enter the name of your outgoing mail server (SMTP).
 
         <p><strong>Note</strong>: You need to specify only one outgoing mail
--- a/suite/chrome/common/help/mailnews_security.xhtml
+++ b/suite/chrome/common/help/mailnews_security.xhtml
@@ -375,16 +375,20 @@
       <li><strong>Not possible</strong>: Encryption has been enabled for this
         message. However, a valid certificate for at least one of the listed
         recipients is not available, or no recipients are listed, or there is
         some other problem that makes encryption impossible.</li>
     </ul>
   </li>
 </ul>
 
+<p>When you compose a message and select a different account, the signing
+  and encryption preferences are updated to reflect the settings of
+  the newly selected account.</p>
+
 <p>The Message Security window also lists the certificates available for the
   recipients of your message:</p>
 
 <ul>
   <li><strong>View</strong>: To view the details for any certificate in the
     list, select its name, then click View.</li>
 </ul>
 
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -1187,22 +1187,22 @@
 <p>To see a full list of &brandShortName; plugins you can install, see the
   <a href="http://plugindoc.mozdev.org/">PluginDoc</a> page on MozDev.org.</p>
 
 <p>To see what plugins you currently have installed, do any of the following:
 </p>
 
 <ul>
   <li>Open the Help menu and choose About Plugins.</li>
-  <li>Open the Tools menu, choose Add-on Manager, and select the Plugins
+  <li>Open the Tools menu, choose Add-ons Manager, and select the Plugins
     panel.
     
-    <p><strong>Tip</strong>: To learn more about the Add-on Manager and its
+    <p><strong>Tip</strong>: To learn more about the Add-ons Manager and its
       features, see the section
-      <a href="customize_help.xhtml#using_the_add-on_manager">Using the Add-on
+      <a href="customize_help.xhtml#using_the_add-ons_manager">Using the Add-ons
       Manager</a>.</p>
   </li>
   <li>Click in the Location Bar, type <kbd>about:plugins</kbd> and press
     <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>.</li>
 </ul>
 
 <p>[<a href="#plugins_and_downloads">Return to beginning of
   section</a>]</p>
--- a/suite/chrome/common/help/privacy_help.xhtml
+++ b/suite/chrome/common/help/privacy_help.xhtml
@@ -48,43 +48,45 @@
 
 <p>This section summarizes some background information about privacy on the
   Internet. It also describes several things you can do to help safeguard your
   own privacy. It is not intended to provide a complete description of Internet
   privacy issues.</p>
 
 <div class="contentsBox">In this section:
   <ul>
-    <li><a href="#what_information_does_my_browser_give_to_a_web_site">What
+    <li><a href="#what_information_does_my_browser_give_to_a_website">What
       Information Does My Browser Give to a Website?</a></li>
     <li><a href="#what_are_cookies_and_how_do_they_work">What Are Cookies, and
       How Do They Work?</a></li>
+    <li><a href="#why_and_how_are_websites_tracking_me">Why and How Are
+      Websites Tracking Me?</a></li>
     <li><a href="#how_can_i_control_web_pages_in_email_messages">How Can I
       Control Web Pages in Email Messages?</a></li>
     <li><a href="#how_can_i_make_sure_unauthorized_people_dont_use_information_about_me">How
       Can I Make Sure Unauthorized People Don&apos;t Use Information About
       Me?</a></li>
     </ul>
 </div>
 
-<h2 id="what_information_does_my_browser_give_to_a_web_site">What Information
+<h2 id="what_information_does_my_browser_give_to_a_website">What Information
   Does My Browser Give to a Website?</h2>
 
 <p>When your browser displays a web page&mdash;for example, each time you click
   a link or type a URL, or when a web page is displayed in an email
   message&mdash;it gives certain kinds of information to the website. This
   information may include (but is not limited to) your operating environment,
   your Internet address, and the page you&apos;re coming from.</p>
 
 <h3>Operating Environment</h3>
 
 <p>The website is told something about your operating environment, such as your
   browser type and operating system. This helps the website present the page in
   the best way for your screen. For example, the website might learn that you
-  use the French version of SeaMonkey 2.1 on a Windows 2000 computer.</p>
+  use &brandShortName;&nbsp;2.19 on a Windows&nbsp;7 computer.</p>
 
 <h3 id="internet_address">Internet Address</h3>
 
 <p>Your browser must tell the website your Internet address (also known as the
   Internet Protocol, or IP address) so the website knows where to send the page
   you are requesting. The website can&apos;t present the page you want to see
   unless it knows your IP address.</p>
 
@@ -157,18 +159,113 @@
 <p>Cookies that are stored by a website other than the one you are visiting are
   called <strong>third-party cookies</strong> or <strong>foreign
   cookies</strong>. Websites sometimes use third-party cookies with
   <strong>transparent GIFs</strong>, which are special images that help websites
   count users, track email responses, learn more about how visitors use the
   website, or customize your browsing experience. (Transparent GIFs are also
   known as web beacons or web bugs.)</p>
 
-<p>If you want, you can adjust your cookie preferences so that websites can
-  store ordinary cookies but not third-party ones.</p>
+<p>If you want, you can <a href="using_priv_help.xhtml#cookies">adjust your
+  cookie preferences</a> so that websites can store ordinary cookies but not
+  third-party ones, or only for those sites that you have previously visited.
+</p>
+
+<p>[<a href="#privacy_on_the_internet">Return to beginning of section</a>]</p>
+
+<h2 id="why_and_how_are_websites_tracking_me">Why and How Are Websites
+  Tracking Me?</h2>
+
+<p>Websites are frequently interested in how they are used and by whom.
+  Thus, they may perform analytics on your browsing behavior, either by
+  themselves, or by utilizing a third-party service.</p>
+
+<p>Motivations for such user tracking may be a more personalized browsing
+  experience, e.g., by offering you services or products corresponding to your
+  previous browsing pattern, thus making it more likely that you are interested
+  in those. Third-party services are mostly interested in placing advertisements
+  that match your interests, thus making it more likely that you would click on
+  those ads, which in turn generates revenue.</p>
+
+<p>Of course, this list isn&apos;t all inclusive, other reasons may exist to
+  track the user&apos;s browsing behavior. To summarize, the trade-off is:</p>
+
+<ul>
+  <li><strong>Pros</strong>: Tracking of the user&apos;s browsing activity
+    allows the website to provide a more specific browsing experience, by
+    analyzing and matching your interests. You may even get offers you
+    wouldn&apos;t receive without prior knowledge of your usage pattern.</li>
+  <li><strong>Cons</strong>: In most cases, especially with third-party
+    tracking services, the information is gathered without the user&apos;s
+    consent, and its usage is not transparent. Comprehensive user profiling
+    across websites and over long periods of time may be considered intrusive
+    and a questionable practice violating the user&apos;s privacy.</li>
+</ul>
+
+<h3>What Are the Mechanisms of User Tracking?</h3>
+
+<p>There isn&apos;t any single tracking mechanism, rather several methods
+  exist. For example, a website may employ one or more of these methods:</p>
+
+<ul>
+  <li><a href="#what_are_cookies_and_how_do_they_work">Cookies</a>: This is
+    the most direct form of user tracking. When visiting a website for the
+    first time, a random but unique identifier is created by that site and
+    stored as a cookie in &brandShortName;. When returning to the website,
+    this cookie associates you with any previous visit to that site. This is
+    especially effective for third-party tracking given that such a service
+    can collect data from multiple websites they have contracts with based on
+    just a single tracking cookie.</li>
+  <li><a href="#internet_address">Internet Address</a>: The IP address
+    identifies your location on your provider&apos;s network. It may also
+    serve as a reference to your geographical location. Even without cookies,
+    multiple accesses to one or more websites from the same location can be
+    associated with each other in this way.</li>
+  <li><a href="#what_information_does_my_browser_give_to_a_website">Browser
+    Fingerprinting</a>: This method attempts to identify specific users based
+    on the characteristics of the browser that they are using. Such
+    characteristics include browser type and version, platform used, language
+    preferences, and possibly installed plugins or add-ons.</li>
+</ul>
+
+<h3>What Can I Do to Prevent User Tracking?</h3>
+
+<p>In general, there is no complete protection against unwanted tracking of
+  one&apos;s browsing activities. However, there are a couple of ways to make
+  it harder to get tracked:</p>
+
+<ul>
+  <li><a href="privsec_help.xhtml#privacy_and_security">Do Not Track</a>:
+    This is a method that allows users to explicitly opt out of (or consent
+    to) their browsing behavior being tracked. &brandShortName; supports
+    sending <q>Do Not Track</q> requests to websites, but they are not
+    obligated to honor such requests.</li>
+  <!-- NOTE: link "Data Manager" below once bug 599097 has been fixed -->
+  <li><a href="using_priv_help.xhtml#cookies">Cookies</a>: The power of
+    tracking cookies is their persistence across sessions. Thus, when you
+    restart &brandShortName;, the identifying cookie will still be sent to
+    the website performing the analytics. One measure against third-party
+    tracking is to prohibit third-party cookies altogether; another option is
+    the restriction of cookies to the current session only. Some websites may
+    no longer function correctly, but you can add exceptions to such sites in
+    the Data Manager or with the Cookie Manager options in the Tools menu.</li>
+  <li><a href="nav_help.xhtml#plugins">Plugins</a>: Obscure plugins make
+    browser fingerprinting easier. Thus, if you need such plugins for some
+    websites but not in general, disable them in the Add-ons Manager until
+    you need them, to avoid that they are disclosed to tracking sites.</li>
+  <li><a href="customize_help.xhtml#add-ons">Add-ons</a>: There is a variety
+    of extensions available for privacy &amp; security support. Some of them
+    will block unwanted content from advertisers or tracking services, others
+    provide more control on private data collected by plugins (e.g., Flash
+    cookies), or when and how to run scripts or embedded content.</li>
+</ul>
+
+<p><strong>Note</strong>: The issues related to user tracking are complex.
+  This description is not intended to be complete but to provide you with some
+  basic information on this topic.</p>
 
 <p>[<a href="#privacy_on_the_internet">Return to beginning of section</a>]</p>
 
 <h2 id="how_can_i_control_web_pages_in_email_messages">How Can I Control Web
   Pages in Email Messages?</h2>
 
 <p>You can disable cookies, images, and plugins completely (JavaScript is
   always disabled) for web pages that are received as part of email
--- a/suite/chrome/common/help/privsec_help.xhtml
+++ b/suite/chrome/common/help/privsec_help.xhtml
@@ -13,37 +13,169 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Privacy &amp; Security Preferences</title>
 <link rel="stylesheet" href="helpFileLayout.css"
   type="text/css"/>
 </head>
 <body>
 
-<h1>Privacy &amp; Security Preferences</h1>
+<h1 id="privsec_preferences">Privacy &amp; Security Preferences</h1>
 
 <p>The sections listed below describe the Privacy &amp; Security preferences.
   To see the preference panels, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Click the Privacy &amp; Security category. If no subcategories are
     visible, double-click Privacy &amp; Security to expand the list, then
     click the name for the preferences you want to view or change.</li>
 </ol>
 
 <p>For help with a panel&apos;s settings, click the appropriate link below.</p>
 
 <div class="contentsBox">Related sections:
   <ul>
+    <li><a href="#privacy_and_security">Privacy &amp; Security</a></li>
+    <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="passwords_help.xhtml">Passwords</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">SSL</a></li>
-    <li><a href="certs_prefs_help.xhtml">Certificates</a></li>
-    <li><a href="validation_help.xhtml">Validation</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
+  steps:</p>
+
+<ol>
+  <li>Open the <span class="mac">&brandShortName;</span>
+    <span class="noMac">Edit</span> menu and choose Preferences.</li>
+  <li>Click the Privacy &amp; Security category.</li>
+</ol>
+
+<h3>User Tracking</h3>
+
+<p>These settings allow you to communicate your tracking preferences to
+  websites. <a href="glossary.xhtml#user_tracking">User tracking</a> refers
+  to websites (including advertisers, analytics providers, and social sites)
+  collecting and analyzing comprehensive data on your web browsing patterns,
+  thus affecting your privacy. For more information on this topic, see
+  <a href="privacy_help.xhtml#why_and_how_are_websites_tracking_me">Why and How
+  Are Websites Tracking Me?</a> The <a href="glossary.xhtml#do_not_track">Do
+  Not Track</a> technology allows you to tell a website whether or not you
+  agree to tracking. The following options are available in this section:</p>
+
+<ul>
+  <li><strong>Tell websites about my tracking preference</strong>: Check this
+    to instruct &brandShortName; to inform every website you explicitly visit
+    (along with any providers of third-party content embedded in its pages)
+    whether or not you want your browsing behavior being tracked:
+    <ul>
+      <li><strong>I do not want to be tracked</strong>: Select this option
+        to send a Do Not Track request to each website visited.</li>
+      <li><strong>I consent to being tracked</strong>: Select this option
+        to explicitly tell each website visited that you agree with your
+        browsing behavior being tracked.</li>
+    </ul>
+  </li>
+</ul>
+
+<p><strong>Notes</strong>:</p>
+
+<ul>
+  <li>Honoring a Do Not Track request is voluntary, thus individual websites
+    are <em>not required</em> to obey it. Websites and services that follow
+    the policy should stop gathering and using information about your web
+    browsing pattern for all activity for which Do Not Track is selected.</li>
+  <li>Requesting Do Not Track from a website should not affect your ability
+    to use the website properly (e.g., when using a
+    <a href="glossary.xhtml#web_application">web application</a> or when
+    putting items into a cart while shopping).</li>
+  <li>Note that Do Not Track does not <em>prevent</em> advertisements from
+    being presented to you while browsing. Since the website is not allowed to
+    gather and utilize information about you, the content of the advertisements
+    will be less specific if you have the Do Not Track option selected.</li>
+</ul>
+
+<h3 id="safe_browsing">Safe Browsing</h3>
+
+<p>Some websites contain potentially dangerous content and may have been
+  reported as malicious. The preferences located in the lower section of the
+  <a href="#privacy_and_security">Privacy &amp; Security panel</a> allow you
+  to select which types of reported websites will be blocked. If enabled,
+  &brandShortName; compares each website&apos;s address you are about to visit
+  against regularly updated lists. A warning is issued prior to actually
+  loading a reported website, thus giving you the opportunity to cancel the
+  loading process. The following options are available in this section:</p>
+
+<ul>
+  <li><strong>Block reported attack sites</strong>: Check this if you want
+    &brandShortName; to warn you if the website you are about to visit has
+    been reported as a site that is trying to infect your computer with
+    malicious software. Such <a href="glossary.xhtml#malware">malware</a> may
+    interfere with your computer&apos;s functions or steal your personal
+    information. It is also frequently used to send spam email or to spread
+    more malware.</li>
+  <li><strong>Block reported web forgeries</strong>: Check this if you want
+    &brandShortName; to warn you if the website you are about to visit has
+    been reported as a site that pretends to be a legitimate website of some
+    well-known organization or service. Websites like this are frequently set
+    up to mislead you in providing username and password or other sensitive
+    personal information (commonly known as
+    <a href="glossary.xhtml#phishing">phishing</a>).</li>
+</ul>
+
+<p>When you are trying to visit a website that has been reported as malicious
+  (and the feature is enabled), you will see one of the following warnings:</p>
+
+<ul>
+  <li><strong>Reported Attack Page!</strong> This website has been reported
+    as a website trying to infect your computer with malware.</li>
+  <li><strong>Reported Web Forgery!</strong> This website has been reported
+    as a website trying to steal your personal information.</li>
+</ul>
+
+<p>No harm has been done at this point. Select one of the following options:</p>
+
+<ul>
+  <li><strong>Get me out of here!</strong> Do <em>not</em> load this website.
+    Instead, go to &brandShortName;&apos;s default start page.</li>
+  <li><strong>Why was this page blocked?</strong> Opens a web page showing you
+    the information reported on this specific website (this is an external
+    page located with the provider of this service). If no such report data is
+    available, a page with general information is shown.</li>
+  <li><strong>Ignore this warning</strong>: Proceed with loading the page. Only
+    use this when you are <em>certain</em> that the selected page is authentic
+    and safe to visit. At the top of the page, a notification bar will appear,
+    giving you an option to report errors to the provider of this service:
+    <ul>
+      <li><strong>This isn&apos;t an attack site</strong> or <strong>This
+        isn&apos;t a web forgery</strong>: Click this button to open a new tab
+        allowing you to report false warnings (this is an external page).</li>
+    </ul>
+  </li>
+</ul>
+
+<p><strong>Important</strong>: The Safe Browsing feature is switched on by
+  default. It is <em>not</em> recommended to disable either function as this
+  may result in you visiting unsafe sites.</p>
+
+<p><strong>Note</strong>: If no warning is shown for a specific website, it
+  does not <em>guarantee</em> that this site is trustworthy; it just means
+  that it has not been reported. Attack and phishing websites may <em>look</em>
+  safe but are secretly trying to attack you or to steal personal information.
+  The website&apos;s owner or provider may not be aware that the site has been
+  compromised.</p>
+
+<p>[<a href="#privsec_preferences">Return to beginning of section</a>]</p>
+
 </body>
 </html>
--- a/suite/chrome/common/help/shortcuts.xhtml
+++ b/suite/chrome/common/help/shortcuts.xhtml
@@ -253,17 +253,17 @@
   </tr>
   <tr>
     <td>Start IRC Chat</td>
     <td>Ctrl+6</td>
     <td>Cmd+6</td>
     <td>Ctrl+6</td>
   </tr>
   <tr>
-    <td>Open Add-on Manager</td>
+    <td>Open Add-ons Manager</td>
     <td>Ctrl+Shift+A</td>
     <td>Cmd+Shift+A</td>
     <td>Ctrl+Shift+A</td>
   </tr>
   <tr>
     <td>Open Download Manager</td>
     <td>Ctrl+J</td>
     <td>Cmd+J</td>
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -41,17 +41,17 @@
   <li>Under the Privacy &amp; Security category, click SSL. (If no
     subcategories are visible, double-click Privacy &amp; Security to expand
     the list.)</li>
 </ol>
 
 <h3 id="ssl_protocol_versions">SSL Protocol Versions</h3>
 
 <p>The Secure Sockets Layer (SSL) protocol defines rules governing mutual
-  authentication between a web site and browser software and the encryption of
+  authentication between a website and browser software and the encryption of
   information that flows between them. The Transport Layer Security (TLS)
   protocol is an IETF standard based on SSL. TLS 1.0 can be thought of as SSL
   3.1.</p>
 
 <p>You should normally leave all of the following checkboxes selected to ensure
   that both older and newer web servers can work with the browser:</p>
 
 <ul>
@@ -68,17 +68,17 @@
 
 <p>When the Enable TLS 1.0 option in the SSL preferences panel is selected, the
   browser attempts to use the TLS protocol when making secure connections with
   a server. If that connection fails because the server is TLS intolerant, the
   browser will fall back to using SSL 3.0 (if enabled).</p>
 
 <h3 id="ssl_warnings">SSL Warnings</h3>
 
-<p>It&apos;s easy to tell when the web site you are viewing is using an encrypted
+<p>It&apos;s easy to tell when the website you are viewing is using an encrypted
   connection. If the connection is encrypted, the lock icon in the lower-right
   corner of the browser window is locked. If the connection is not encrypted,
   the lock icon is unlocked.</p>
 
 <p>If you want additional warnings, you can select one or more of the warning
   checkboxes in the SSL preferences panel. Some people find these warnings
   annoying.</p>
 
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -758,17 +758,17 @@
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#cust-addons">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="cust-addons-about" nc:name="About Add-ons"  nc:link="customize_help.xhtml#about_add-ons"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-addons-installing" nc:name="Installing Add-ons"  nc:link="customize_help.xhtml#installing_add-ons"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="cust-addons-manager" nc:name="Using the Add-on Manager"  nc:link="customize_help.xhtml#using_the_add-on_manager"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="cust-addons-manager" nc:name="Using the Add-ons Manager"  nc:link="customize_help.xhtml#using_the_add-ons_manager"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#cust-page">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="cust-startpage" nc:name="Specifying a Starting Page"  nc:link="customize_help.xhtml#specifying_a_starting_page"/> </rdf:li>
@@ -806,16 +806,17 @@
 
 <rdf:Description about="#advanced_pref_advanced">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="advanced_pref_scripts" nc:name="Scripts &amp; Plugins" nc:link="cs_nav_prefs_advanced.xhtml#scripts_and_plugins"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_keyboard_nav" nc:name="Keyboard Navigation" nc:link="cs_nav_prefs_advanced.xhtml#keyboard_navigation"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_find_as_you_type" nc:name="Find As You Type" nc:link="cs_nav_prefs_advanced.xhtml#fayt"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_cache" nc:name="Cache" nc:link="cs_nav_prefs_advanced.xhtml#cache"/> </rdf:li>
+        <rdf:li><rdf:Description ID="advanced_pref_offlineapps" nc:name="Offline Apps" nc:link="cs_nav_prefs_advanced.xhtml#offline_apps"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_proxies" nc:name="Proxies" nc:link="cs_nav_prefs_advanced.xhtml#proxies"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_http_networking" nc:name="HTTP Networking" nc:link="cs_nav_prefs_advanced.xhtml#http_networking"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_installation" nc:name="Software Installation" nc:link="cs_nav_prefs_advanced.xhtml#software_installation"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_mouse_wheel" nc:name="Mouse Wheel" nc:link="cs_nav_prefs_advanced.xhtml#mouse_wheel"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_dom_inspector" nc:name="DOM Inspector" nc:link="cs_nav_prefs_advanced.xhtml#dom_inspector"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
@@ -825,29 +826,31 @@
 
 <!-- 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="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>
 
 <rdf:Description about="#privacy-doc">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li><rdf:Description ID="privacy-doc-visit" nc:name="What Information Does My Browser Give to a Website?"  		nc:link="privacy_help.xhtml#what_information_does_my_browser_give_to_a_web_site"/> </rdf:li>
+        <rdf:li><rdf:Description ID="privacy-doc-visit" nc:name="What Information Does My Browser Give to a Website?"  		nc:link="privacy_help.xhtml#what_information_does_my_browser_give_to_a_website"/> </rdf:li>
         <rdf:li><rdf:Description ID="privacy-doc-cookies" nc:name="What Are Cookies, and How Do They Work?"  		nc:link="privacy_help.xhtml#what_are_cookies_and_how_do_they_work"/> </rdf:li>
+        <rdf:li><rdf:Description ID="privacy-doc-tracking" nc:name="Why and How Are Websites Tracking Me?"  		nc:link="privacy_help.xhtml#why_and_how_are_websites_tracking_me"/> </rdf:li>
         <rdf:li><rdf:Description ID="privacy-doc-email" nc:name="How Can I Control Web Pages in Email Messages?"  		nc:link="privacy_help.xhtml#how_can_i_control_web_pages_in_email_messages"/> </rdf:li>
         <rdf:li><rdf:Description ID="privacy-doc-unauth" nc:name="How Can I Make Sure Unauthorized People Don't Use Information About Me?"  		nc:link="privacy_help.xhtml#how_can_i_make_sure_unauthorized_people_dont_use_information_about_me"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#using-priv-help-cookies">
     <nc:subheadings>
@@ -892,16 +895,26 @@
         <rdf:li><rdf:Description ID="master-prefs-change" nc:name="Change Master Password" nc:link="passwords_help.xhtml#change_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="master-prefs-timeout" nc:name="Master Password Timeout" nc:link="passwords_help.xhtml#master_password_timeout"/> </rdf:li>
         <rdf:li><rdf:Description ID="master-prefs-reset" nc:name="Reset Master Password" nc:link="passwords_help.xhtml#reset_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="choosing-good-password" nc:name="Choosing a Good Password" nc:link="passwords_help.xhtml#choosing_a_good_password"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
+<rdf:Description about="#using-priv-help-private-data">
+    <nc:subheadings>
+      <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="#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>
@@ -920,16 +933,31 @@
 <rdf:Description about="#images-help-managing">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="images_prefs" nc:name="Image Preferences" nc:link="using_priv_help.xhtml#images"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
+<rdf:Description about="#sec_gen">
+    <nc:subheadings>
+      <rdf:Seq>
+        <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>
         <rdf:li><rdf:Description ID="using-help-certs-get" nc:name="Getting Your Own Certificate" nc:link="using_certs_help.xhtml#getting_your_own_certificate"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-help-certs-info" nc:name="Checking Security For a Web Page" nc:link="using_certs_help.xhtml#checking_security_for_a_web_page"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-help-certs-manage" nc:name="Managing Certificates" nc:link="using_certs_help.xhtml#managing_certificates"/> </rdf:li>
@@ -1055,18 +1083,18 @@
         <rdf:li><rdf:Description ID="delete_email_certs" nc:name="Delete Email Certificates" nc:link="certs_help.xhtml#delete_email_certificates"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#web_certs">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li><rdf:Description ID="edit_web_certs" nc:name="Edit Website Certificate Settings" nc:link="certs_help.xhtml#edit_web_site_certificate_trust_settings"/> </rdf:li>
-        <rdf:li><rdf:Description ID="delete_web_certs" nc:name="Delete Website Certificate" nc:link="certs_help.xhtml#delete_web_site_certificates"/> </rdf:li>
+        <rdf:li><rdf:Description ID="edit_web_certs" nc:name="Edit Website Certificate Settings" nc:link="certs_help.xhtml#edit_website_certificate_trust_settings"/> </rdf:li>
+        <rdf:li><rdf:Description ID="delete_web_certs" nc:name="Delete Website Certificate" nc:link="certs_help.xhtml#delete_website_certificates"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#ca_certs">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="edit_ca_certs" nc:name="Edit CA Certificate Settings" nc:link="certs_help.xhtml#edit_ca_certificate_trust_settings"/> </rdf:li>
@@ -1080,17 +1108,17 @@
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="cert_details" nc:name="Certificate Viewer" nc:link="cert_dialog_help.xhtml#certificate_viewer"/> </rdf:li>
         <rdf:li><rdf:Description ID="which_token" nc:name="Choose Security Device" nc:link="cert_dialog_help.xhtml#choose_security_device"/> </rdf:li>
         <rdf:li><rdf:Description ID="priv_key_copy" nc:name="Encryption Key Copy" nc:link="cert_dialog_help.xhtml#encryption_key_copy"/> </rdf:li>
         <rdf:li><rdf:Description ID="backup_your_cert" nc:name="Certificate Backup" nc:link="cert_dialog_help.xhtml#certificate_backup"/> </rdf:li>
         <rdf:li><rdf:Description ID="which_cert" nc:name="User Identification Request" nc:link="cert_dialog_help.xhtml#user_identification_request"/> </rdf:li>
         <rdf:li><rdf:Description ID="new_ca" nc:name="New Certificate Authority" nc:link="cert_dialog_help.xhtml#new_certificate_authority"/> </rdf:li>
-        <rdf:li><rdf:Description ID="cert-dialog-help-website" nc:name="Website Certificates" nc:link="cert_dialog_help.xhtml#web_site_certificates"/> </rdf:li>
+        <rdf:li><rdf:Description ID="cert-dialog-help-website" nc:name="Website Certificates" nc:link="cert_dialog_help.xhtml#website_certificates"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#cert_details">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="cert-dialog-help-details-general" nc:name="General Tab" nc:link="cert_dialog_help.xhtml#general_tab"/> </rdf:li>
--- a/suite/chrome/common/help/using_priv_help.xhtml
+++ b/suite/chrome/common/help/using_priv_help.xhtml
@@ -47,19 +47,17 @@
     <li><a href="#removing_cookies">Removing Cookies</a></li>
     <li><a href="#cookie_manager_settings">Cookie Manager Settings</a></li>
   </ul>
 </div>
 
 <h2 id="enabling_and_disabling_cookies">Enabling &amp; Disabling Cookies</h2>
 
 <p>You can specify how cookies should be handled by setting your Cookies
-  preferences. The default setting is <q>Allow all cookies</q>.</p>
-
-<p>To change your Cookies preferences:</p>
+  preferences. To change your Cookies preferences:</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 Cookies. (If no
     subcategories are visible, double-click Privacy &amp; Security to expand
     the list.)</li>
   <li>Set your Cookies preferences.</li>
@@ -189,18 +187,18 @@
       Cookies</a></li>
     <li><a href="#stored_cookies">Stored Cookies</a></li>
     <li><a href="#cookie_sites">Cookie Websites</a></li>
   </ul>
 </div>
 
 <h2 id="cookies">Privacy &amp; Security Preferences - Cookies</h2>
 
-<p>Your browser is set by default to accept all cookies. This section describes
-  how to use the Cookies preferences panel to change that setting. If
+<p>This section describes how to use the Cookies preferences panel to change
+  which cookies &brandShortName; will accept from and return to websites. If
   you&apos;re not already viewing it, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Privacy &amp; Security category, click Cookies. (If no
     subcategories are visible, double-click Privacy &amp; Security to expand
     the list.)</li>
@@ -211,24 +209,29 @@
   to know about. For a brief overview, see
   <a href="privacy_help.xhtml#what_are_cookies_and_how_do_they_work">What Are
   Cookies and How Do They Work?</a></p>
 
 <p>You can select one of these options:</p>
 
 <ul>
   <li><strong>Block cookies</strong>: Select this option to refuse all
-    cookies.</li>
+    cookies from websites not explicitly allowed to set cookies.</li>
   <li><strong>Allow cookies for the originating website only</strong>: Select
     this option if you don&apos;t want to accept or return
-    <a href="privacy_help.xhtml#what_are_third-party_cookies">foreign
-    cookies</a>.</li>
-  <li><strong>Allow all cookies</strong>: This is the default option. Select
-    this option to permit all websites not explicitly blocked to set cookies on
-    your computer.</li>
+    <a href="privacy_help.xhtml#what_are_third-party_cookies">third-party
+    (foreign) cookies</a> for any websites other than the one you are actively
+    visiting.</li>
+  <li><strong>Allow third-party cookies for previously visited websites
+    only</strong>: Select this option if you want to accept or return
+    <a href="privacy_help.xhtml#what_are_third-party_cookies">third-party
+    cookies</a> only for websites that stored cookies when you explicitly
+    visited them previously.</li>
+  <li><strong>Allow all cookies</strong>: Select this option to permit all
+    websites not explicitly blocked to set cookies on your computer.</li>
 </ul>
 
 <p><strong>Note</strong>: Blocking cookies does not remove old cookies. By
   blocking cookies you only block websites from setting new cookies, and old
   cookies will still be sent to websites. To completely block a website from
   receiving old cookies, you need to <a href="#removing_cookies">remove its
   cookies</a>.
 </p>
@@ -583,16 +586,221 @@
     time you log into the website, you can use the stored user name and
     password (if available) or indicate that you want Password Manager to save
     the information for that website.</li>
 </ul>
 
 <p>[<a href="#using_the_password_manager">Return to beginning of
   section</a>]</p>
 
+<h1 id="clearing_private_data">Clearing Private Data</h1>
+
+<p>While browsing the web, various items of potentially private information 
+  may be gathered and stored by &brandShortName;. This section describes the
+  types of such private data and options to remove them either manually by
+  request or automatically when shutting down &brandShortName;.</p>
+
+<div class="contentsBox">In this section:
+  <ul>
+    <li><a href="#types_of_private_data">Types of Private Data</a></li>
+    <li><a href="#private_data_prefs">Private Data Preferences</a></li>
+    <li><a href="#clear_private_data_now">Clear Private Data Now</a></li>
+  </ul>
+</div>
+
+<h2 id="types_of_private_data">Types of Private Data</h2>
+
+<p>Several types of information are gathered and kept by &brandShortName; while
+  you are browsing websites. Some of these data are necessary for those sites to
+  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>The following private information may be stored locally by
+  &brandShortName;:</p>
+
+<table class="defaultTable">
+  <thead>
+    <tr>
+      <th>Type</th>
+      <th>Explanation</th>
+    </tr>
+  </thead>
+  <tbody class="tbody-default">
+    <tr>
+      <td>Browsing History</td>
+      <td>If enabled in the
+        <a href="cs_nav_prefs_navigator.xhtml#history">History preferences</a>,
+        a history of any website pages you have <em>visited</em> is kept and
+        may be suggested to complete website addresses in the location bar.</td>
+    </tr>
+    <tr>
+      <td>Location Bar History</td>
+      <td>This is a history of web addresses which were <em>entered</em>
+        manually or copy-pasted into the location bar of the browser. This
+        list is available in the location bar menu.</td>
+    </tr>
+    <tr>
+      <td>Download History</td>
+      <td>Depending on the options selected in the
+        <a href="cs_nav_prefs_navigator.xhtml#downloads">Downloads
+        preferences</a>, a history of <em>files downloaded</em> from
+        websites is maintained in the Download Manager.</td>
+    </tr>
+    <tr>
+      <td>Saved Form and Search History</td>
+      <td>If enabled in the
+        <a href="cs_nav_prefs_navigator.xhtml#history">History preferences</a>,
+        text entered into <em>elements of forms</em> (e.g., user names, but not
+        passwords) will be stored for the specified number of days; matches are
+        suggested in a list when you revisit that page. If you put the search
+        box onto your toolbar, the history of <em>search terms</em> will be
+        stored as well.</td>
+    </tr>
+    <tr>
+      <td>Cache</td>
+      <td>The cache is a <em>short-term store</em> for web pages and other
+        data (like e-mail attachments for IMAP accounts or remote images in
+        messages) to avoid having these items being requested again from the
+        server if they were just recently accessed. The cache on your disk
+        may contain data up to the limit specified in the
+        <a href="cs_nav_prefs_advanced.xhtml#cache">Cache preferences</a>.</td>
+    </tr>
+    <tr>
+      <td>Cookies</td>
+      <td>Cookies are <em>small pieces of information</em> that websites use to
+        keep track of users and sessions, or to store website preferences. Use
+        the <a href="using_priv_help.xhtml#cookies">Cookies preferences</a> to
+        specify to what extent cookies are permitted and for how long they are
+        kept.</td>
+    </tr>
+    <tr>
+      <td>Offline Website Data</td>
+      <td>Websites may be permitted to store their pages&apos; contents and
+        related data locally so that they are available for use <em>without
+        a network connection</em>. See the
+        <a href="cs_nav_prefs_advanced.xhtml#offline_apps">Offline Apps
+        preferences</a> for options to control this behavior and to inspect
+        the contents of stored offline website data.</td>
+    </tr>
+    <tr>
+      <td>Saved Passwords</td>
+      <td>If enabled in the
+        <a href="passwords_help.xhtml#passwords">Passwords preferences</a>,
+        &brandShortName; keeps <em>entered passwords</em> for later use, thus
+        you don&apos;t have to retype them every time you visit a website.</td>
+    </tr>
+    <tr>
+      <td>Authenticated Sessions</td>
+      <td>Websites may require <em>authentication</em> (username and password,
+        asked for with a pop-up dialog) and can keep track of such by
+        authenticated sessions. A site will ask you for your credentials
+        again when you proceed to the next page after this information is
+        cleared.</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>[<a href="#clearing_private_data">Return to beginning of section</a>]</p>
+
+<h2 id="private_data_prefs">Privacy &amp; Security Preferences
+  - Private Data</h2>
+
+<p>This section describes how to use the Private Data preferences panel to
+  determine when and which type of private data should be deleted. If
+  you&apos;re not already viewing it, follow these steps:</p>
+
+<ol>
+  <li>Open the <span class="mac">&brandShortName;</span>
+    <span class="noMac">Edit</span> menu and choose Preferences.</li>
+  <li>Under the Privacy &amp; Security category, click Private Data. (If no
+    subcategories are visible, double-click Privacy &amp; Security to expand
+    the list.)</li>
+</ol>
+
+<p>The <strong>Clear Private Data</strong> section provides the following
+  options:</p>
+
+<ul>
+  <li><strong>Always clear my private data when I close
+    &brandShortName;</strong>: Check this option to always initiate clearing
+    of the selected private data when the application is shut down.</li>
+  <li><strong>Ask me before clearing private data</strong>: Check this option
+    for &brandShortName; to prompt you with a dialog box before clearing the
+    selected private data. The dialog box also allows you to change the
+    selection, rather than clearing them without any interaction.</li>
+  <li><strong>When I ask &brandShortName; to clear my private data, it should
+    erase</strong>: For each <a href="#types_of_private_data">type of private
+    data</a>, a separate option is provided whether or not to clear any
+    stored items of this specific type. Check the respective box for each
+    item to be deleted by default when clearing is requested by you or
+    initiated on shutdown.</li>
+  <li><strong>Clear Now</strong>: Click this button to initiate clearing of
+    private data immediately, depending on the preferences selected in
+    this panel:
+    <ul>
+      <li>When the <q>Ask me before clearing private data</q> option is checked,
+        &brandShortName; opens a dialog box where you can confirm and change
+        any items to be cleared.</li>
+      <li>When <q>Ask me before clearing private data</q> is <em>not</em>
+        checked, all types selected to be cleared by default will be deleted
+        immediately without the dialog box being shown.</li>
+    </ul>
+  </li>
+</ul>
+
+<!-- link up "Data Manager" below once bug 599097 has been taken care of -->
+
+<p><strong>Note</strong>: Also consider more selective alternatives to delete
+  private data. For example, the individual preference panels for each type may
+  provide additional options, and the Data Manager allows to clear private data
+  by type and the specific domain of a website. Rather than clearing all cookies
+  when shutting down &brandShortName;, you could specify to allow cookies for
+  sessions only, thus giving you the opportunity to establish exceptions for
+  selected websites for which you want to retain cookies.</p>
+
+<p>[<a href="#clearing_private_data">Return to beginning of section</a>]</p>
+
+<h2 id="clear_private_data_now">Clear Private Data Now</h2>
+
+<p>Private data can be cleared at any time, either from the
+  <a href="#private_data_prefs">Private Data preferences</a> by clicking
+  the Clear Now button, or by selecting Clear Private Data from the Tools
+  menu of a browser window. This initiates one of the following actions:</p>
+
+<ul>
+  <li>When the <q>Ask me before clearing private data</q> option is checked
+    in the <a href="#private_data_prefs">Private Data preference panel</a>,
+    &brandShortName; opens a dialog window where you can confirm and change
+    the <a href="#types_of_private_data">types of private data</a> to be
+    cleared as follows:
+    <ul>
+      <li>The defaults for the individual types are determined by the
+        <a href="#private_data_prefs">Private Data preferences</a>.
+        Note that individual boxes may be disabled if no items of that
+        type are available for deletion.</li>
+      <li>Check or uncheck boxes as desired if you want to clear a different
+        set of private data.</li>
+      <li>Click <q>Clear Private Data Now</q> to clear the selected items,
+        or Cancel to quit the dialog.</li>
+    </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>
+
 <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>
 
 <p>For example, if your computer is in an area where unauthorized people have
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -17,17 +17,17 @@ carbonfailurepluginsMessage.button.acces
 
 missingpluginsMessage.title			= このページを完全に表示するには、プラグインを追加する必要があります。
 missingpluginsMessage.button.label		= 追加インストール...
 missingpluginsMessage.button.accesskey		= I
 
 blockedpluginsMessage.title			= このページが要求したプラグインは、安全上の理由からブロックされました。
 blockedpluginsMessage.infoButton.label		= 詳細...
 blockedpluginsMessage.infoButton.accesskey	= D
-blockedpluginsMessage.searchButton.label	= 更新の有無をチェック...
+blockedpluginsMessage.searchButton.label	= 更新の有無を確認...
 blockedpluginsMessage.searchButton.accesskey	= U
 
 crashedpluginsMessage.title			= %S プラグインがクラッシュしました。
 crashedpluginsMessage.reloadButton.label	= ページを再読み込み
 crashedpluginsMessage.reloadButton.accesskey	= R
 crashedpluginsMessage.submitButton.label	= クラッシュレポートを送信
 crashedpluginsMessage.submitButton.accesskey	= S
 crashedpluginsMessage.learnMore			= 詳細を確認...
@@ -145,24 +145,32 @@ refreshBlocked.redirectLabel			= %S は自動的に別のページにリダイレクトしようとしたため、このページをブロックしました。
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
 lockPrompt.text					= %S のファイルは別のアプリケーションで使用されているため、ブックマークと履歴のシステムが機能しません。いくつかのセキュリティソフトウェアは、この問題を引き起こす可能性があります。
 lockPromptInfoButton.label			= 詳細はこちら
 lockPromptInfoButton.accesskey			= L
 
 # LOCALIZATION NOTE (updatePrompt.text)
 # %S will be replaced with the application name.
-updatePrompt.text				= 自動更新のチェックが無効に設定されています。使用中の %S はセキュリティ上の欠陥があります。 新しいバージョンに更新してください。
+updatePrompt.text				= 自動更新の確認が無効に設定されています。使用中の %S はセキュリティ上の欠陥があります。 新しいバージョンに更新してください。
 updatePromptCheckButton.label			= アップデートを確認
 updatePromptCheckButton.accesskey		= C
 
 SecurityTitle					= セキュリティ警告
 MixedContentMessage				= 要求したページは暗号化されていますが、暗号化されていない項目を含んでいます。あなたがこのページで表示や入力する情報は第三者が簡単に傍受できます。
+MixedActiveContentMessage			= 要求したページは暗号化されていますが、安全でない情報を含んでいます。あなたがこのページで表示や入力する情報は第三者が簡単に傍受できます。
+MixedDisplayContentMessage			= 要求したページは部分的に暗号化されており、盗聴を防ぐことはできません。
+BlockedActiveContentMessage			= このページの安全でない情報はブロックされました。
+BlockedDisplayContentMessage			= このページの暗号化されていない情報はブロックされました。
 EnterInsecureMessage				= 暗号化されたページから去ろうとしています。今後送受信する情報は第三者が簡単に傍受できます。
 EnterSecureMessage				= 暗号化されたページを要求しています。このサイトの認証情報は正しく検証されており、あなたがこのページで表示や入力する情報は第三者が簡単に傍受できません。
+SecurityKeepBlocking.label			= ブロック維持
+SecurityKeepBlocking.accesskey			= K
+SecurityUnblock.label				= ブロック解除
+SecurityUnblock.accesskey			= U
 SecurityPreferences.label			= 設定
 SecurityPreferences.accesskey			= P
 PostToInsecureFromInsecureMessage		= あなたが入力した情報は暗号化されていない接続を通して送信されようとしており、第三者が簡単に傍受できます。\n本当にこの情報の送信を続けてもよろしいですか?
 PostToInsecureFromInsecureShowAgain		= 暗号化されていない情報を送信しようとしたときには毎回警告する
 PostToInsecureContinue				= 続ける
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
--- a/suite/chrome/common/pref/pref-cookies.dtd
+++ b/suite/chrome/common/pref/pref-cookies.dtd
@@ -1,42 +1,44 @@
 <!-- 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/. -->
 
-<!ENTITY pref.cookies.title "Cookie">
+<!ENTITY pref.cookies.title		"Cookie">
 
 <!-- cookies -->
 
-<!ENTITY cookiePolicy.label "Cookie 受け入れポリシー">
+<!ENTITY cookiePolicy.label		"Cookie 受け入れポリシー">
 
-<!ENTITY accAllCookiesRadio.label "すべての Cookie を許可する">
-<!ENTITY accAllCookiesRadio.accesskey "c">
+<!ENTITY disableCookies.label		"すべての Cookie を拒否する">
+<!ENTITY disableCookies.accesskey	"B">
 
-<!ENTITY accOrgCookiesRadio.label "文書がある Web サイトから送信される Cookie のみ許可する">
-<!ENTITY accOrgCookiesRadio.accesskey "o">
+<!ENTITY accNo3rdPartyCookies.label	"文書がある Web サイトからの Cookie のみ許可する (第三者 Cookie を除く)">
+<!ENTITY accNo3rdPartyCookies.accesskey	"o">
 
-<!ENTITY disableCookies.label "すべての Cookie を拒否する">
-<!ENTITY disableCookies.accesskey "B">
+<!ENTITY acc3rdPartyVisited.label	"以前訪れた Web サイトのみ第三者 Cookie として許可する">
+<!ENTITY acc3rdPartyVisited.accesskey	"v">
 
-<!ENTITY cookieRetentionPolicy.label "Cookie 保持ポリシー">
+<!ENTITY accAllCookies.label		"すべての Cookie を許可する">
+<!ENTITY accAllCookies.accesskey	"c">
 
-<!ENTITY acceptNormally.label "すべての Cookie を許可する (サイト管理者の指示に従う)">
-<!ENTITY acceptNormally.accesskey "n">
+<!ENTITY cookieRetentionPolicy.label	"Cookie 保持ポリシー">
 
-<!ENTITY acceptForSession.label "現在のセッションのみ許可する (ブラウザ終了時にリセット)">
-<!ENTITY acceptForSession.accesskey "s">
+<!ENTITY acceptNormally.label		"すべての Cookie を許可する (サイト管理者の指示に従う)">
+<!ENTITY acceptNormally.accesskey	"n">
 
-<!ENTITY acceptforNDays.label "有効期限を指定する:">
-<!ENTITY acceptforNDays.accesskey "f">
-<!ENTITY days.label "日">
+<!ENTITY acceptForSession.label		"現在のセッションのみ許可する (ブラウザ終了時にリセット)">
+<!ENTITY acceptForSession.accesskey	"s">
+
+<!ENTITY acceptforNDays.label		"有効期限を指定する:">
+<!ENTITY acceptforNDays.accesskey	"f">
+<!ENTITY days.label			"日">
 
-<!ENTITY warnAboutCookies.label "常に処理方法を確認する">
-<!ENTITY warnAboutCookies.accesskey "A">
-<!ENTITY forCurrentSession.label "セッション Cookie を除く">
-<!ENTITY forCurrentSession.accesskey "e">
+<!ENTITY warnAboutCookies.label		"常に処理方法を確認する">
+<!ENTITY warnAboutCookies.accesskey	"A">
+<!ENTITY forCurrentSession.label	"セッション Cookie を除く">
+<!ENTITY forCurrentSession.accesskey	"e">
 
-<!ENTITY manageCookies.label "Cookie とサイト設定の管理">
-<!ENTITY manageCookiesDescription.label "Cookie マネージャは、保存されている Cookie を整理したりサイト設定を見直したりできます。また、上記の設定に関係なく、サイト別の設定を追加することもできます。">
+<!ENTITY manageCookies.label		"Cookie とサイト設定の管理">
+<!ENTITY manageCookiesDescription.label	"Cookie マネージャは、保存されている Cookie を整理したりサイト設定を見直したりできます。また、上記の設定に関係なく、サイト別の設定を追加することもできます。">
 
-<!ENTITY viewCookies.label "Cookie の管理">
-<!ENTITY viewCookies.accesskey "M">
-
+<!ENTITY viewCookies.label		"Cookie の管理">
+<!ENTITY viewCookies.accesskey		"M">
--- a/suite/chrome/common/pref/pref-ssl.dtd
+++ b/suite/chrome/common/pref/pref-ssl.dtd
@@ -1,14 +1,15 @@
 <!-- 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/. -->
 
 <!ENTITY  SSLProtocolVersions.caption       "SSL プロトコルのバージョン">
 <!ENTITY  SSLWarnings.caption               "SSL の警告">
+<!ENTITY  SSLMixedContent.caption           "SSL 混在コンテンツ">
 <!ENTITY  SSLClientAuthMethod.caption       "クライアント証明書の選択">
 
 <!ENTITY pref.ssl.title                     "Secure Sockets Layer (SSL)">
 <!ENTITY enable.ssl30.label                 "SSL 3.0 を有効にする">
 <!ENTITY enable.ssl30.accesskey             "3">
 <!ENTITY enable.tls10.label                 "TLS 1.0 を有効にする">
 <!ENTITY enable.tls10.accesskey             "T">
 
@@ -17,13 +18,22 @@
 <!ENTITY warn.enteringsecure.accesskey      "L">
 <!ENTITY warn.insecurepost                  "暗号化されていないページから暗号化されていないページへデータを送信するとき">
 <!ENTITY warn.insecurepost.accesskey        "S">
 <!ENTITY warn.leavingsecure                 "暗号化されたページから離れるとき">
 <!ENTITY warn.leavingsecure.accesskey       "a">
 <!ENTITY warn.viewmixed                     "暗号化されたページと暗号化されていないページが混在するとき">
 <!ENTITY warn.viewmixed.accesskey           "V">
 
+<!ENTITY warn.mixedactivecontent            "暗号化されたページに安全でないコンテンツが含まれるとき警告する">
+<!ENTITY warn.mixedactivecontent.accesskey  "W">
+<!ENTITY block.activecontent                "暗号化されたページ上の安全でないコンテンツは読み込まない">
+<!ENTITY block.activecontent.accesskey      "D">
+<!ENTITY warn.mixeddisplaycontent           "暗号化されたページに他の混在コンテンツが含まれるとき警告する">
+<!ENTITY warn.mixeddisplaycontent.accesskey "c">
+<!ENTITY block.displaycontent               "暗号化されたページ上の混在コンテンツは読み込まない">
+<!ENTITY block.displaycontent.accesskey     "m">
+
 <!ENTITY certselect.description             "個人証明書を要求されたとき、&brandShortName; がどのように Web サイトにセキュリティ証明書を提示するか決定してください:">
 <!ENTITY certselect.auto                    "自動選択する">
 <!ENTITY certselect.auto.accesskey          "A">
 <!ENTITY certselect.ask                     "毎回確認する">
 <!ENTITY certselect.ask.accesskey           "E">
--- a/suite/chrome/mailnews/SearchDialog.dtd
+++ b/suite/chrome/mailnews/SearchDialog.dtd
@@ -12,24 +12,24 @@
 <!ENTITY resetButton.label           "リセット">
 <!ENTITY resetButton.accesskey       "C">
 <!ENTITY openButton.label            "開く">
 <!ENTITY openButton.accesskey        "O">
 <!ENTITY deleteButton.label          "削除">
 <!ENTITY deleteButton.accesskey      "D">
 <!ENTITY searchDialogTitle.label     "メッセージ検索">
 <!ENTITY results.label               "検索結果">
-<!ENTITY fileHereMenu.label          "ここへ移動">
-<!ENTITY fileHereMenu.accesskey      "r">
-<!ENTITY fileButton.label            "移動">
-<!ENTITY fileButton.accesskey        "F">
+<!ENTITY moveHereMenu.label          "ここへ移動">
+<!ENTITY moveHereMenu.accesskey      "H">
+<!ENTITY moveButton.label            "移動">
+<!ENTITY moveButton.accesskey        "T">
 <!ENTITY goToFolderButton.label      "フォルダを開く">
 <!ENTITY goToFolderButton.accesskey  "n">
-<!ENTITY saveAsVFButton.label      "検索フォルダとして保存">
-<!ENTITY saveAsVFButton.accesskey  "v">
+<!ENTITY saveAsVFButton.label        "検索フォルダとして保存">
+<!ENTITY saveAsVFButton.accesskey    "v">
 
 <!-- for ABSearchDialog.xul -->
 <!ENTITY abSearchHeading.label       "次の中から連絡先を検索:">
 <!ENTITY abSearchHeading.accesskey   "e">
 <!ENTITY propertiesButton.label      "プロパティ">
 <!ENTITY propertiesButton.accesskey  "P">
 <!ENTITY composeButton.label         "新しいメッセージ">
 <!ENTITY composeButton.accesskey     "o">
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -209,20 +209,16 @@ 5054	= サーバ %S への接続がタイムアウトしました。
 ## @name IMAP_NO_NEW_MESSAGES
 ## @loc None
 5056	= サーバに新着メッセージはありません。
 
 ## @name IMAP_DEFAULT_ACCOUNT_NAME
 ## @loc None
 5057	= %S のメール
 
-## @name IMAP_EMPTY_TRASH_CONFIRM
-## @loc None
-5061	= ごみ箱を空にすると %S とそこに含まれているすべてのメッセージが削除されます。このフォルダを削除しますか?
-
 ## @name IMAP_SPECIAL_CHAR
 ## @loc None
 5065	= この IMAP サーバでは %c という文字は予約されています。他の名前を指定してください。
 
 ## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_NAME
 ## @loc None
 5066	= 個人用フォルダ
 
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -390,19 +390,16 @@ confirmPhishingUrl2		= %1$0.S不審なサイトを開こうとしています。このサイトは別のサイトになりすましている可能性があります。%2$S を開いてもよろしいですか?
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender	= %1$S からのメールで常にリモートコンテンツを読み込むには、ここをクリックしてください。
 
 #LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
 mdnBarMessageNormal		=%1$S がこのメールの開封確認を求めています。
 #LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
 mdnBarMessageAddressDiffers	=%1$S がこのメールの開封確認を %2$S に送付するように求めています。
 
-# Strings for growl notifications on Mac OS X
-growlNotification		= 新着メール
-
 # mailCommands.js
 emptyJunkTitle			= 確認
 emptyJunkMessage		= 迷惑メールフォルダから削除されたメッセージおよびサブフォルダは一切元に戻せません。本当に削除してもよろしいですか?
 emptyJunkDontAsk		= 次回からは確認しない
 emptyTrashTitle			= 確認
 emptyTrashMessage		= ごみ箱から削除されたメッセージおよびサブフォルダは一切元に戻せません。本当に削除してもよろしいですか?
 emptyTrashDontAsk		= 次回からは確認しない
 
--- a/suite/chrome/mailnews/smime/am-smime.properties
+++ b/suite/chrome/mailnews/smime/am-smime.properties
@@ -2,18 +2,18 @@
 # 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/.
 
 ## S/MIME error strings.
 ## Note to localization: %S is a placeholder
 NoSenderSigningCert=メッセージにデジタル署名するよう指定されましたが、アカウント設定で指定した署名証明書が見つからないか期限切れになっています。
 NoSenderEncryptionCert=メッセージを暗号化するよう指定されましたが、アカウント設定で指定した暗号化証明書が見つからないか期限切れになっています。
 MissingRecipientEncryptionCert=メッセージを暗号化するよう指定されましたが、%S の暗号化証明書が見つかりません。
-ErrorCanNotEncrypt=メッセージを暗号化できません。受信者全員の有効なメール証明書を持っているか、アカウント設定で指定した証明書が有効かつ信頼されているものであるか確認してください。
-ErrorCanNotSign=メッセージに署名できません。アカウント設定で指定した証明書が有効かつ信頼されているものであるか確認してください。
+ErrorEncryptMail=メッセージを暗号化できません。受信者全員の有効なメール証明書を持っているか、アカウント設定で指定した証明書が有効かつ信頼されているものであるか確認してください。
+ErrorCanNotSignMail=メッセージに署名できません。アカウント設定で指定した証明書が有効かつ信頼されているものであるか確認してください。
 
 ## Strings used for in the prefs.
 prefPanel-smime=セキュリティ
 NoSigningCert=証明書マネージャはメッセージのデジタル署名に使用する有効な証明書を見つけられませんでした。
 NoEncryptionCert=証明書マネージャは他の人があなたに暗号化したメールを送信する際に使用する有効な証明書を見つけられませんでした。
 
 encryption_needCertWantSame=他の人があなたに暗号化したメールを送信する際に使用する証明書も指定してください。あなたへのメッセージの暗号化と復号にも同じ証明書を使用しますか?
 encryption_wantSame=あなたへのメッセージの暗号化と復号にも同じ証明書を使用しますか?