merge suite from mozilla-1.9.1 (l10n svn rev 696)
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Thu, 29 Jul 2010 20:14:54 +0900
changeset 42 56aae81bd97e00db543caf099824d981f1563883
parent 41 ec6aecb4617d777e2fe8ea212b7a3c547ecc9d71
child 43 933ece5d95d8ee9015e561c4b257aea3d577ff1c
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
merge suite from mozilla-1.9.1 (l10n svn rev 696)
suite/chrome/branding/aboutRights.dtd
suite/chrome/branding/aboutRights.properties
suite/chrome/branding/brand.dtd
suite/chrome/branding/brand.properties
suite/chrome/browser/linkToolbar.dtd
suite/chrome/browser/mailNavigatorOverlay.dtd
suite/chrome/browser/metadata.properties
suite/chrome/browser/navigator.dtd
suite/chrome/browser/navigator.properties
suite/chrome/browser/pageInfo.dtd
suite/chrome/browser/pageInfo.properties
suite/chrome/browser/region.properties
suite/chrome/browser/tabbrowser.properties
suite/chrome/common/aboutSessionRestore.dtd
suite/chrome/common/bookmarks/addBookmark.dtd
suite/chrome/common/bookmarks/bm-props.dtd
suite/chrome/common/bookmarks/bookmarks.dtd
suite/chrome/common/bookmarks/bookmarks.properties
suite/chrome/common/bookmarks/findBookmark.dtd
suite/chrome/common/bookmarks/sortFolder.dtd
suite/chrome/common/certError.dtd
suite/chrome/common/consoleOverlay.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/contentAreaCommands.properties
suite/chrome/common/defaultClientDialog.dtd
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/composer_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/cs_priv_prefs_popup.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/developer_tools.xhtml
suite/chrome/common/help/forieusers.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/help-win.rdf
suite/chrome/common/help/helpFileLayout.css
suite/chrome/common/help/help_help.xhtml
suite/chrome/common/help/mail_help.xhtml
suite/chrome/common/help/mail_sec_help.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/page_info_help.xhtml
suite/chrome/common/help/passwords_help.xhtml
suite/chrome/common/help/privacy_help.xhtml
suite/chrome/common/help/privsec_help.xhtml
suite/chrome/common/help/profiles_help.xhtml
suite/chrome/common/help/shortcuts-composer.xhtml
suite/chrome/common/help/shortcuts-mailnews.xhtml
suite/chrome/common/help/shortcuts-navigator.xhtml
suite/chrome/common/help/shortcuts.xhtml
suite/chrome/common/help/shortcuts_composer.xhtml
suite/chrome/common/help/shortcuts_mailnews.xhtml
suite/chrome/common/help/shortcuts_navigator.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/help/suitehelp.rdf
suite/chrome/common/help/using_certs_help.xhtml
suite/chrome/common/help/using_priv_help.xhtml
suite/chrome/common/help/validation_help.xhtml
suite/chrome/common/help/welcome_help.xhtml
suite/chrome/common/history/findHistory.dtd
suite/chrome/common/history/history.dtd
suite/chrome/common/history/history.properties
suite/chrome/common/history/historyTreeOverlay.dtd
suite/chrome/common/history/places.properties
suite/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/chrome/common/migration/migration.properties
suite/chrome/common/notification.properties
suite/chrome/common/overrides/netErrorApp.dtd
suite/chrome/common/passwordManager.dtd
suite/chrome/common/permissions/cookieViewer.dtd
suite/chrome/common/permissions/cookieViewer.properties
suite/chrome/common/permissions/permissionsManager.dtd
suite/chrome/common/permissions/permissionsManager.properties
suite/chrome/common/permissions/permissionsNavigatorOverlay.dtd
suite/chrome/common/pref/mac/platformPrefOverlay.dtd
suite/chrome/common/pref/pref-advanced.dtd
suite/chrome/common/pref/pref-appearance.dtd
suite/chrome/common/pref/pref-applicationManager.dtd
suite/chrome/common/pref/pref-applicationManager.properties
suite/chrome/common/pref/pref-applications.dtd
suite/chrome/common/pref/pref-applications.properties
suite/chrome/common/pref/pref-cache.dtd
suite/chrome/common/pref/pref-certs.dtd
suite/chrome/common/pref/pref-colors.dtd
suite/chrome/common/pref/pref-content.dtd
suite/chrome/common/pref/pref-cookies.dtd
suite/chrome/common/pref/pref-download.dtd
suite/chrome/common/pref/pref-fonts.dtd
suite/chrome/common/pref/pref-history.dtd
suite/chrome/common/pref/pref-http.dtd
suite/chrome/common/pref/pref-images.dtd
suite/chrome/common/pref/pref-keynav.dtd
suite/chrome/common/pref/pref-languages.dtd
suite/chrome/common/pref/pref-languages.properties
suite/chrome/common/pref/pref-locationbar.dtd
suite/chrome/common/pref/pref-masterpass.dtd
suite/chrome/common/pref/pref-mousewheel.dtd
suite/chrome/common/pref/pref-navigator.dtd
suite/chrome/common/pref/pref-offline.dtd
suite/chrome/common/pref/pref-passwords.dtd
suite/chrome/common/pref/pref-policies.dtd
suite/chrome/common/pref/pref-popups.dtd
suite/chrome/common/pref/pref-proxies-advanced.dtd
suite/chrome/common/pref/pref-proxies.dtd
suite/chrome/common/pref/pref-scripts.dtd
suite/chrome/common/pref/pref-search.dtd
suite/chrome/common/pref/pref-security.dtd
suite/chrome/common/pref/pref-smartupdate.dtd
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/common/pref/pref-tabs.dtd
suite/chrome/common/pref/pref-validation.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/pref/prefutilities.properties
suite/chrome/common/pref/unix/platformPrefOverlay.dtd
suite/chrome/common/pref/win/platformPrefOverlay.dtd
suite/chrome/common/profile/profileSelection.dtd
suite/chrome/common/profile/profileSelection.properties
suite/chrome/common/quitDialog.properties
suite/chrome/common/region.properties
suite/chrome/common/sanitize.dtd
suite/chrome/common/search/default.htm
suite/chrome/common/search/internetresults.dtd
suite/chrome/common/search/search-editor.dtd
suite/chrome/common/search/search-editor.properties
suite/chrome/common/search/search-panel.dtd
suite/chrome/common/search/search-rdf.dtd
suite/chrome/common/sidebar/customize.dtd
suite/chrome/common/sidebar/local-panels.dtd
suite/chrome/common/sidebar/preview.dtd
suite/chrome/common/sidebar/sidebar.properties
suite/chrome/common/sidebar/sidebarOverlay.dtd
suite/chrome/common/tasksOverlay.dtd
suite/chrome/common/unix/platformCommunicatorOverlay.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/common/utilityOverlay.properties
suite/chrome/common/viewZoomOverlay.properties
suite/chrome/common/win/platformCommunicatorOverlay.dtd
suite/chrome/mailnews/CustomHeaders.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/FilterListDialog.dtd
suite/chrome/mailnews/SearchDialog.dtd
suite/chrome/mailnews/addressbook/abCardOverlay.dtd
suite/chrome/mailnews/addressbook/abCardViewOverlay.dtd
suite/chrome/mailnews/addressbook/abMailListDialog.dtd
suite/chrome/mailnews/addressbook/abMainWindow.dtd
suite/chrome/mailnews/addressbook/abNewCardDialog.dtd
suite/chrome/mailnews/addressbook/abResultsPaneOverlay.dtd
suite/chrome/mailnews/addressbook/abSelectAddressesDialog.dtd
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/addressbook/ldapAutoCompErrs.properties
suite/chrome/mailnews/appleMailImportMsgs.properties
suite/chrome/mailnews/comm4xMailImportMsgs.properties
suite/chrome/mailnews/compose/MsgAttachPage.dtd
suite/chrome/mailnews/compose/askSendFormat.dtd
suite/chrome/mailnews/compose/askSendFormat.properties
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/compose/mailComposeEditorOverlay.dtd
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/compose/sendProgress.dtd
suite/chrome/mailnews/compose/sendProgress.properties
suite/chrome/mailnews/custom.properties
suite/chrome/mailnews/downloadheaders.dtd
suite/chrome/mailnews/eudoraImportMsgs.properties
suite/chrome/mailnews/fieldMapImport.dtd
suite/chrome/mailnews/filter.properties
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/folderpane.dtd
suite/chrome/mailnews/gloda.properties
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/importDialog.dtd
suite/chrome/mailnews/importMsgs.properties
suite/chrome/mailnews/junkLog.dtd
suite/chrome/mailnews/junkMailInfo.dtd
suite/chrome/mailnews/localMsgs.properties
suite/chrome/mailnews/mailEditorOverlay.dtd
suite/chrome/mailnews/mailOverlay.dtd
suite/chrome/mailnews/mailTasksOverlay.dtd
suite/chrome/mailnews/mailViewList.dtd
suite/chrome/mailnews/mailViewSetup.dtd
suite/chrome/mailnews/mailviews.properties
suite/chrome/mailnews/mapi/mapi.properties
suite/chrome/mailnews/markByDate.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/mime.properties
suite/chrome/mailnews/msgAccountCentral.dtd
suite/chrome/mailnews/msgFolderPickerOverlay.dtd
suite/chrome/mailnews/msgHdrViewOverlay.dtd
suite/chrome/mailnews/msgHdrViewPopup.dtd
suite/chrome/mailnews/msgSynchronize.dtd
suite/chrome/mailnews/msgViewPickerOverlay.dtd
suite/chrome/mailnews/msgmdn.properties
suite/chrome/mailnews/newFolderDialog.dtd
suite/chrome/mailnews/news.properties
suite/chrome/mailnews/newsblog/am-newsblog.dtd
suite/chrome/mailnews/newsblog/am-newsblog.properties
suite/chrome/mailnews/newsblog/feed-properties.dtd
suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
suite/chrome/mailnews/newsblog/newsblog.properties
suite/chrome/mailnews/oeImportMsgs.properties
suite/chrome/mailnews/offline.properties
suite/chrome/mailnews/offlineStartup.properties
suite/chrome/mailnews/outlookImportMsgs.properties
suite/chrome/mailnews/pref/AccountManager.dtd
suite/chrome/mailnews/pref/AccountWizard.dtd
suite/chrome/mailnews/pref/am-addressing.dtd
suite/chrome/mailnews/pref/am-advanced.dtd
suite/chrome/mailnews/pref/am-copies.dtd
suite/chrome/mailnews/pref/am-identities-list.dtd
suite/chrome/mailnews/pref/am-identity-edit.dtd
suite/chrome/mailnews/pref/am-junk.dtd
suite/chrome/mailnews/pref/am-main.dtd
suite/chrome/mailnews/pref/am-mdn.dtd
suite/chrome/mailnews/pref/am-mdn.properties
suite/chrome/mailnews/pref/am-offline.dtd
suite/chrome/mailnews/pref/am-server-advanced.dtd
suite/chrome/mailnews/pref/am-server-top.dtd
suite/chrome/mailnews/pref/am-serverwithnoidentities.dtd
suite/chrome/mailnews/pref/mailPrefsOverlay.dtd
suite/chrome/mailnews/pref/pref-addressing.dtd
suite/chrome/mailnews/pref/pref-character_encoding.dtd
suite/chrome/mailnews/pref/pref-composing_messages.dtd
suite/chrome/mailnews/pref/pref-directory-add.dtd
suite/chrome/mailnews/pref/pref-directory.dtd
suite/chrome/mailnews/pref/pref-formatting.dtd
suite/chrome/mailnews/pref/pref-junk.dtd
suite/chrome/mailnews/pref/pref-mailnews.dtd
suite/chrome/mailnews/pref/pref-notifications.dtd
suite/chrome/mailnews/pref/pref-offline.dtd
suite/chrome/mailnews/pref/pref-receipts.dtd
suite/chrome/mailnews/pref/pref-tags.dtd
suite/chrome/mailnews/pref/pref-viewing_messages.dtd
suite/chrome/mailnews/pref/prefs.properties
suite/chrome/mailnews/pref/replicationProgress.properties
suite/chrome/mailnews/pref/smtpEditOverlay.dtd
suite/chrome/mailnews/region.properties
suite/chrome/mailnews/renameFolderDialog.dtd
suite/chrome/mailnews/search-attributes.properties
suite/chrome/mailnews/search-operators.properties
suite/chrome/mailnews/search.properties
suite/chrome/mailnews/searchTermOverlay.dtd
suite/chrome/mailnews/shutdownWindow.properties
suite/chrome/mailnews/smime.properties
suite/chrome/mailnews/smime/am-smime.dtd
suite/chrome/mailnews/smime/am-smime.properties
suite/chrome/mailnews/smime/msgCompSMIMEOverlay.dtd
suite/chrome/mailnews/smime/msgReadSecurityInfo.dtd
suite/chrome/mailnews/smime/msgSecurityInfo.properties
suite/chrome/mailnews/start.dtd
suite/chrome/mailnews/subscribe.dtd
suite/chrome/mailnews/subscribe.properties
suite/chrome/mailnews/textImportMsgs.properties
suite/chrome/mailnews/threadpane.dtd
suite/chrome/mailnews/vcard.properties
suite/chrome/mailnews/viewLog.dtd
suite/chrome/mailnews/virtualFolderListDialog.dtd
suite/chrome/mailnews/virtualFolderProperties.dtd
suite/chrome/mozldap/ldap.properties
suite/installer/os2/README.txt
suite/installer/unix/README
suite/installer/windows/custom.properties
suite/installer/windows/mui.properties
suite/installer/windows/override.properties
suite/profile/bookmarks.extra
suite/profile/bookmarks.html
suite/profile/bookmarks.inc
suite/profile/localstore.rdf
suite/profile/mimeTypes.rdf
suite/profile/panels.extra
suite/profile/panels.rdf
suite/profile/search.rdf
suite/searchplugins/google-jp.png
suite/searchplugins/google-jp.src
suite/searchplugins/yahoo-jp.src
suite/updater/updater.ini
new file mode 100644
--- /dev/null
+++ b/suite/chrome/branding/aboutRights.dtd
@@ -0,0 +1,54 @@
+<!-- (^^; /browser/chrome/browser/aboutRights.dtd がベース -->
+<!-- LOCALIZATION NOTE This file is very similar to the one in Firefox from browser/locales/en-US/chrome/browser/aboutRights.dtd so you can use that file as a starting point -->
+<!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
+<!ENTITY rights.locale-direction "ltr">
+<!ENTITY rights.pagetitle       "about:rights">
+<!ENTITY rights.intro-header    "あなたの権利について">
+<!ENTITY rights.intro "&brandShortName; は無料のオープンソースソフトウェアであり、世界中の多数のコミュニティによって開発されています。ご利用に際してはいくつか知っておいていただきたいことがあります:">
+
+<!-- Note on pointa / pointb / pointc form:
+     These points each have an embedded link in the HTML, so each point is
+     split into chunks for text before the link, the link text, and the text
+     after the link. If a localized grammar doesn't need the before or after
+     chunk, it can be left blank.
+
+     Also note the leading/trailing whitespace in strings here, which is
+     deliberate for formatting around the embedded links. -->
+<!ENTITY rights.intro-point1a "&brandShortName; は ">
+<!ENTITY rights.intro-point1b "Mozilla Public License">
+<!ENTITY rights.intro-point1c " の条項下で提供されます。これにより、あなたは &brandShortName; を使用、複製、配布することができます。あなたはまた、&brandShortName; のソースコードを必要に応じて修正することもできます。Mozilla Public License では、あなたが修正したバージョンを配布することも認めています。">
+
+<!ENTITY rights.intro-point2a "Mozilla は、Mozilla や Firefox の商標およびロゴについては、何らの権利もあなたに与えるものではありません。商標について詳しくは ">
+<!ENTITY rights.intro-point2b "Mozilla 商標ポリシー">
+<!ENTITY rights.intro-point2c " をご確認ください。">
+
+<!-- point 3 text for official branded builds -->
+<!ENTITY rights.intro-point3a "&vendorShortName; の製品における個人情報の取り扱いについては ">
+<!ENTITY rights.intro-point3b "Mozilla プライバシーポリシー">
+<!ENTITY rights.intro-point3c " をご確認ください。">
+
+<!-- point 4 text for official branded builds -->
+<!ENTITY rights.intro-point4a "&brandShortName; は、アドオン更新サービスなど、オプションで Web サイト情報サービスも提供しています。ただし、それらのサービスが 100&#37; 正確であることやエラーが起きないことは保証できません。サービスを無効化する方法を含め、詳しくは ">
+<!ENTITY rights.intro-point4b "サービス利用規約">
+<!ENTITY rights.intro-point4c " をご確認ください。">
+
+<!ENTITY rights.webservices-header "&brandFullName; Web サイトサービス">
+
+<!-- Note that this paragraph references a couple of entities from
+     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 "] エントリで、[次の更新を自動的にチェックする] の設定項目のチェックを外していただければ、アドオン更新サービスを無効化できます。">
+
+<!-- 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 "本利用規約は、法の抵触に関する規定を除いて米国カリフォルニア州法に準拠するものとします。本契約の一部が無効または執行不能と判断された場合でも、残りの部分は引き続き有効に存続するものとします。本利用規約は、参考のために作成した日本語訳文であり、ライセンスの内容を表示するものではありません。利用規約の内容については英文の規約によるものとします。本訳文と英文の規約に矛盾があった場合には英文の規約が優先します。">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/branding/aboutRights.properties
@@ -0,0 +1,3 @@
+buttonLabel = あなたの権利について...
+buttonAccessKey = K
+notifyRightsText = %S は非営利団体 Mozilla Foundation が公開している無料のオープンソースソフトウェアです。
--- a/suite/chrome/branding/brand.dtd
+++ b/suite/chrome/branding/brand.dtd
@@ -1,6 +1,5 @@
 <!ENTITY  brandFullName         "SeaMonkey">
 <!ENTITY  brandShortName        "SeaMonkey">
-<!ENTITY  lang.version          "1.9a1">
+<!ENTITY  vendorShortName       "SeaMonkey">
 <!ENTITY  sidebarName           "Sidebar">
-<!ENTITY  vendorShortName       "SeaMonkey">
-<!ENTITY  copyright.string      "Copyright &copy; 2003-2007 The Mozilla Foundation.">
+<!ENTITY  copyright.string      "Copyright &copy; 2003-2010 Contributors to the Mozilla project.">
--- a/suite/chrome/branding/brand.properties
+++ b/suite/chrome/branding/brand.properties
@@ -1,11 +1,11 @@
 brandFullName=SeaMonkey
 brandShortName=SeaMonkey
 vendorShortName=SeaMonkey
 sidebarName=Sidebar
-extensions.getMoreLocalesURL=http://www.mozilla.org/projects/seamonkey/releases/#l10n
-extensions.getMoreExtensionsURL=http://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/extensions/
-extensions.getMoreThemesURL=http://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/themes/
-spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/dictionaries/
-app.releaseNotesURL=http://www.mozilla.org/projects/seamonkey/releases/seamonkey%VERSION%/
-app.vendorURL=http://www.mozilla.org/projects/seamonkey/
-keyword.moreInfoURL=http://www.mozilla-japan.org/docs/end-user/internet-keywords.html
+extensions.getMoreLocalesURL=http://www.seamonkey-project.org/releases/#l10n
+extensions.getMoreExtensionsURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/
+extensions.getMoreThemesURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/
+extensions.getMorePluginsURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/
+spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/dictionaries/
+app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
+app.vendorURL=http://www.seamonkey-project.org/
--- a/suite/chrome/browser/linkToolbar.dtd
+++ b/suite/chrome/browser/linkToolbar.dtd
@@ -47,17 +47,17 @@
 <!ENTITY linkToolbarAsNeeded.accesskey "O">
 <!ENTITY linkToolbarNever.label "常に隠す">
 <!ENTITY linkToolbarNever.accesskey "H">
 
 <!-- Toolbar buttons, menus, and menuitems -->
 <!ENTITY topButton.label "トップ">
 <!ENTITY upButton.label "上へ">
 <!ENTITY firstButton.label "最初">
-<!ENTITY prevButton.label "前">
+<!ENTITY prevButton.label "前へ">
 <!ENTITY nextButton.label "次へ">
 <!ENTITY lastButton.label "最後">
 
 <!ENTITY documentButton.label "文書">
 
 <!ENTITY tocButton.label "目次">
 <!ENTITY chapterButton.label "章">
 <!ENTITY sectionButton.label "節">
--- a/suite/chrome/browser/mailNavigatorOverlay.dtd
+++ b/suite/chrome/browser/mailNavigatorOverlay.dtd
@@ -1,26 +1,26 @@
 <!ENTITY newMessageCmd.label             "メッセージ">
 <!ENTITY newMessageCmd.accesskey         "M">
 <!ENTITY newMessageCmd.key               "M">
 
-<!ENTITY newCardCmd.label                "アドレス帳のカード...">
-<!ENTITY newCardCmd.accesskey            "C">
+<!ENTITY newContactCmd.label             "連絡先...">
+<!ENTITY newContactCmd.accesskey         "C">
 
-<!ENTITY sendPage.label                  "ページを送る...">
+<!ENTITY sendPage.label                  "ページをメールで送信...">
 <!ENTITY sendPage.accesskey              "S">
 
-<!ENTITY contextSendThisPage.label       "このページを送る...">
+<!ENTITY contextSendThisPage.label       "このページをメールで送信...">
 <!ENTITY contextSendThisPage.accesskey   "d">
-<!ENTITY contextSendThisLink.label       "このリンクを送る...">
+<!ENTITY contextSendThisLink.label       "このリンクをメールで送信...">
 <!ENTITY contextSendThisLink.accesskey   "k">
-<!ENTITY contextSendImage.label          "画像を送る...">
+<!ENTITY contextSendImage.label          "画像をメールで送信...">
 <!ENTITY contextSendImage.accesskey      "n">
-<!ENTITY contextSendVideo.label          "動画を送る...">
+<!ENTITY contextSendVideo.label          "動画をメールで送信...">
 <!ENTITY contextSendVideo.accesskey      "n">
-<!ENTITY contextSendAudio.label          "オーディオを送る...">
+<!ENTITY contextSendAudio.label          "オーディオをメールで送信...">
 <!ENTITY contextSendAudio.accesskey      "n">
-<!ENTITY contextSendFrame.label          "フレームを送る...">
+<!ENTITY contextSendFrame.label          "フレームをメールで送信...">
 <!ENTITY contextSendFrame.accesskey      "d">
 
-<!ENTITY sendLinkCmd.label               "リンクを送る..."> 
+<!ENTITY sendLinkCmd.label               "リンクをメールで送信..."> 
 <!ENTITY sendLinkCmd.accesskey           "d">
 
--- a/suite/chrome/browser/metadata.properties
+++ b/suite/chrome/browser/metadata.properties
@@ -1,15 +1,15 @@
 sameWindowText=同じウィンドウ
 newWindowText=新しいウィンドウ
 parentFrameText=親フレーム
 sameFrameText=同じフレーム
 embeddedText=Embedded
 unableToShowProps=利用できるプロパティはありません。
-altTextMissing=Missing
+altTextMissing=不足
 altTextBlank=空白
 imageSize=%S KB (%S バイト)
 imageSizeUnknown=不明 (キャッシュされていません)
 imageWidth=%Spx
 imageHeight=%Spx
 # LOCALIZATION NOTE: Next two strings are for language name representations
 #                    %1$S = language name, %2$S = region name
 languageRegionFormat=%1$S (%2$S)
--- a/suite/chrome/browser/navigator.dtd
+++ b/suite/chrome/browser/navigator.dtd
@@ -1,43 +1,38 @@
 <!-- extracted from content/navigator.xul -->
 
 <!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items --> 
-<!-- LOCALIZATION NOTE : FILE Do not translate accesskey and commandkey --> 
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 
 <!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE --> 
 <!ENTITY mainWindow.title "&brandShortName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE --> 
 <!ENTITY mainWindow.titlemodifier "&brandShortName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 
-<!ENTITY nothingAvailable.label "(Nothing Available)">
-
-<!ENTITY browserCmd.label	"新しいブラウザウィンドウ">
-<!ENTITY browserCmd.accesskey	"N">
 <!ENTITY tabCmd.label "ブラウザタブ">
 <!ENTITY tabCmd.accesskey "T">
 <!ENTITY tabCmd.commandkey "t">
 <!ENTITY openCmd.label "URLを開く...">
 <!ENTITY openCmd.accesskey "l">
 <!ENTITY openCmd.commandkey "l">
 <!ENTITY openFileCmd.label "ファイルを開く...">
 <!ENTITY openFileCmd.accesskey "o">
 <!ENTITY openFileCmd.commandkey "o">
 <!ENTITY recentTabs.label "最近閉じたタブ">
 <!ENTITY recentTabs.accesskey "R">
 <!ENTITY recentTabs.commandkey "t">
+<!ENTITY recentWindows.label "最近閉じたウィンドウ">
+<!ENTITY recentWindows.accesskey "y">
+<!ENTITY recentWindows.commandkey "y">
 <!ENTITY editPageCmd.label "ページを編集">
 <!ENTITY editPageCmd.accesskey "E">
 <!ENTITY editPageCmd.commandkey "e">
-<!ENTITY editFrameCmd.label "フレームを編集">
-<!ENTITY editFrameCmd.accesskey "m">
-<!ENTITY editFrameSetCmd.label "フレームセットを編集">
-<!ENTITY editFrameSetCmd.accesskey "t">
 
 <!ENTITY uploadFile.label "ファイルをアップロード...">
 <!ENTITY uploadFile.accesskey "F">
 
 <!ENTITY printSetupCmd.label "ページ設定...">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printPreviewCmd.label "印刷プレビュー">
 <!ENTITY printPreviewCmd.accesskey "v">
@@ -72,75 +67,46 @@
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "ページの情報">
 <!ENTITY pageInfoCmd.accesskey "i">
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY fullScreenCmd.label "全画面表示">
 <!ENTITY fullScreenCmd.accesskey "f">
 <!ENTITY translateMenu.label "ページを翻訳">
 <!ENTITY translateMenu.accesskey "T">
-<!ENTITY translate.commandKey "t">
 
 <!ENTITY closeOtherTabs.label "他のタブを閉じる">
 <!ENTITY closeOtherTabs.accesskey "T">
 <!ENTITY closeWindow.label "ウィンドウを閉じる">
 <!ENTITY closeWindow.accesskey "W">
 
 <!ENTITY minimizeButton.tooltip       "最小化">
-<!ENTITY restoreButton.tooltip        "戻す">
+<!ENTITY restoreButton.tooltip        "元のサイズに戻す">
 
-<!-- I'd like all this to move to an overlay or something -->
-<!ENTITY bidiMenu.label "双方向テキスト設定">
-<!ENTITY directionBidiMenu.label "デフォルトの書記方向">
-<!ENTITY directionRTLBidiCmd.label "右から左へ">
-<!ENTITY directionLTRBidiCmd.label "左から右へ">
-<!ENTITY texttypeBidiMenu.label "テキストの形式">
-<!ENTITY charsettexttypeBidiCmd.label "元の文字エンコーディング">
-<!ENTITY logicaltexttypeBidiCmd.label "論理的">
-<!ENTITY visualtexttypeBidiCmd.label "見たまま">
-<!ENTITY numeralBidiMenu.label "数字の形">
-<!ENTITY regularcontextnumeralBidiCmd.label "文脈に合わせる">
-<!ENTITY hindicontextnumeralBidiCmd.label "右から左に書くページでのヒンディ語の数字">
-<!ENTITY arabicnumeralBidiCmd.label "アラビア語">
-<!ENTITY hindinumeralBidiCmd.label "ヒンディー語">
-<!ENTITY controlstextmodeBidiMenu.label "フォームでのテキストモード">
-<!ENTITY logicalcontrolstextmodeBidiCmd.label "論理的">
-<!ENTITY visiualcontrolstextmodeBidiCmd.label "見たまま">
-<!ENTITY containercontrolstextmodeBidiCmd.label "ドキュメントに合わせる">
-<!ENTITY charactersetBidiMenu.label "文字エンコーディング">
-<!ENTITY doccharactersetBidiCmd.label "ドキュメントで指定された文字エンコーディングを使用">
-<!ENTITY defaultcharactersetBidiCmd.label "デフォルトの文字エンコーディングを使い、ドキュメントで指定された文字エンコーディングを上書きする">
-
-<!ENTITY webContentMenu.label "言語と Web コンテンツ">
-<!ENTITY webContentMenu.accesskey "l">
-<!ENTITY downloadMore.label "追加ダウンロード">
-<!ENTITY downloadMore.accesskey "D">
 <!ENTITY applyTheme.label	"テーマを適用"> 
 <!ENTITY applyTheme.accesskey	"A"> 
 <!ENTITY getNewThemesCmd.label "テーマを入手">
 <!ENTITY getNewThemesCmd.accesskey "G">
-<!ENTITY searchMenu.label "検索">
-<!ENTITY searchMenu.accesskey "S">
 <!ENTITY findOnCmd.label "ページ内を検索...">
 <!ENTITY findOnCmd.accesskey "f">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label "再検索">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.commandkey "g">
 <!ENTITY findPrevCmd.label "前を検索">
 <!ENTITY findPrevCmd.accesskey "v">
 <!ENTITY findPrevCmd.commandkey "g">
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
 <!ENTITY findPrevCmd.commandkey2 "VK_F3">
 
 <!ENTITY searchInternetCmd.label "Webを検索">
 <!ENTITY searchInternetCmd.accesskey "S">
 <!ENTITY searchInternet.commandKey "s">
 
-<!ENTITY clearPrivateDataCmd.label "プライバシー情報を消去...">
+<!ENTITY clearPrivateDataCmd.label "プライバシー情報の消去...">
 <!ENTITY clearPrivateDataCmd.accesskey "e">
 
 <!ENTITY goMenu.label "移動">
 <!ENTITY goMenu.accesskey "g">
 <!ENTITY goHomeCmd.label "ホーム">
 <!ENTITY goHomeCmd.accesskey "h">
 
 <!ENTITY bookmarksMenu.label "ブックマーク">
@@ -154,32 +120,25 @@
 <!ENTITY addCurTabsAsCmd.accesskey "G">
 <!ENTITY manBookmarksCmd.label "ブックマークの管理...">
 <!ENTITY manBookmarksCmd.accesskey "M">
 <!ENTITY manBookmarksCmd.commandkey "b">
 <!ENTITY feedsMenu.label "このページを購読する">
 <!ENTITY feedsMenu.accesskey "S">
 <!ENTITY emptyItem.label "(空)">
 
-<!ENTITY helpMenuCmd.label "ヘルプ">
-<!ENTITY helpMenuCmd.accesskey "h">
-<!ENTITY helpContentsCmd.label "ヘルプコンテンツ">
-<!ENTITY softwareUpdatesCmd.label "ソフトウェアの更新を確認">
-<!ENTITY technicalSupportCmd.label "サポート">
-<!ENTITY releaseNotesCmd.label "リリースノート">
-
 <!ENTITY menuBar.tooltip                  "メニューバー">
 <!ENTITY personalToolbar.tooltip          "パーソナルツールバー">
 <!ENTITY navigationToolbar.tooltip        "ナビゲーションツールバー">
 
 <!-- Toolbar items --> 
-<!ENTITY backButton.label             "もどる">
-<!ENTITY backButton.tooltip           "ひとつ前のページにもどる">
-<!ENTITY forwardButton.label          "次へ">
-<!ENTITY forwardButton.tooltip        "一つ先のページへ進む">
+<!ENTITY backButton.label             "戻る">
+<!ENTITY backButton.tooltip           "前のページへ戻る">
+<!ENTITY forwardButton.label          "進む">
+<!ENTITY forwardButton.tooltip        "次のページへ進む">
 <!ENTITY reloadButton.label           "再読み込み">
 <!ENTITY reloadButton.tooltip         "現在のページを再読み込みする">
 <!ENTITY stopButton.label             "中止">
 <!ENTITY stopButton.tooltip           "ページの読み込みを中止">
 <!ENTITY searchButton.label           "検索">
 <!ENTITY searchButton.tooltip         "左の領域に単語を入力し、[検索] をクリックしてください">
 <!ENTITY goButton.label               "移動">
 <!ENTITY goButton.tooltip             "左の領域に URL を入力し、[移動] をクリックしてください">
@@ -187,23 +146,23 @@
 <!ENTITY printButton.tooltip          "このページを印刷する">
 
 <!ENTITY throbber.tooltip             "&vendorShortName; のホームページに移動">
 
 <!ENTITY locationBar.tooltip          "検索する用語、キーワード、または Web アドレスを入力">
 <!ENTITY locationBar.accesskey        "d">
 <!ENTITY locationBar.title            "アドレス (URL)">
 
-<!ENTITY proxyIcon.tooltip            "このアイコンをドラッグ アンド ドロップすると、このページへのリンクが作成されます">
-<!ENTITY internetKeyword.tooltip      "前のページへ戻るかキーワードを選択してください">
+<!ENTITY proxyIcon.tooltip            "このアイコンをドラッグアンドドロップすると、このページへのリンクが作成されます">
 
 <!-- Toolbar items --> 
 <!ENTITY  bookmarksButton.label       "ブックマーク">
 <!ENTITY  bookmarksButton.tooltip     "ブックマークリスト">
 <!ENTITY  homeButton.label            "ホーム">
+<!ENTITY  bookmarksToolbarItem.label  "ブックマークツールバーの項目">
 
 <!-- Statusbar -->
 <!ENTITY  statusText.label            "完了">
 
 <!ENTITY historyCmd.label           "履歴">  
 <!ENTITY historyCmd.accesskey       "i">
 <!ENTITY history.commandKey         "h">
 
--- a/suite/chrome/browser/navigator.properties
+++ b/suite/chrome/browser/navigator.properties
@@ -6,81 +6,41 @@ uploadFile=ファイルをアップロード
 
 droponhomebutton=ホームページに設定したいリンクやファイルをドロップしてください
 droponhometitle=ホームページ設定
 droponhomemsg=このドキュメントを新しいホームページに設定しますか?
 droponhomeokbutton=ホームページに設定
 
 jserror=このページでエラーが発生しました。詳細はダブルクリックして参照してください。
 
-#
-# localizable preference value
-#
-
-# all.js
-#
-# Localization Note: font.language.group controls the initial setting of the
-# language drop-down in the fonts pref panel. Set it to the value of one of the
-# menuitems in the "selectLangs" menulist in
-# /xpfe/components/prefwindow/resources/content/pref-fonts.xul 
-font.language.group=x-western
-# Localization Note: Add the code for your language at the front of this entry,
-# leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
-# "ja-jp, ja, en-us, en"
-intl.accept_languages=en-us, en
-intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
-intl.charsetmenu.browser.more1=ISO-8859-1, ISO-8859-15, IBM850, x-mac-roman, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3
-intl.charsetmenu.browser.more2=ISO-8859-4, ISO-8859-13, windows-1257, IBM852, ISO-8859-2, x-mac-ce, windows-1250, x-mac-croatian, IBM855, ISO-8859-5, ISO-IR-111, KOI8-R, x-mac-cyrillic, windows-1251, IBM866, KOI8-U, x-mac-ukrainian, ISO-8859-16, x-mac-romanian
-intl.charsetmenu.browser.more3=GB2312, x-gbk, gb18030, HZ-GB-2312, ISO-2022-CN, Big5, Big5-HKSCS, x-euc-tw, EUC-JP, ISO-2022-JP, Shift_JIS, EUC-KR, x-windows-949, x-johab, ISO-2022-KR
-intl.charsetmenu.browser.more4=armscii-8, GEOSTD8, TIS-620, ISO-8859-11, windows-874, IBM857, ISO-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, VISCII, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi
-intl.charsetmenu.browser.more5=ISO-8859-6, windows-1256, IBM864, x-mac-arabic, x-mac-farsi, ISO-8859-8-I, windows-1255, ISO-8859-8, IBM862, x-mac-hebrew
-# Localization Note: Do NOT change this entry.
-intl.charsetmenu.browser.unicode=UTF-8, UTF-16, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE, UTF-7
-intl.charset.default=Shift_JIS
-intl.charset.detector=ja_parallel_state_machine
-intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
-# valid intl.menuitems.appendedacceskeys are: true or false, <empty string> (missing or empty preference equals false)
-intl.menuitems.alwaysappendaccesskeys=true
-# valid intl.menuitems.insertseparatorbeforeaccesskeys are: true or false, <empty string> (missing or empty preference equals false)
-intl.menuitems.insertseparatorbeforeaccesskeys=false
-
-linkTargetLabel=リンクを開く:
-linkHREFLabel=URL:
-
 #SessionHistory.js
 nothingAvailable=(利用できません)
 
-#navigator.js
-oldthemetitle=警告: テーマを適用できません
-oldTheme=あなたが選択したテーマは %brand% の以前のバージョン用に作成されています。現在の %brand% のバージョンでは適用できません。%brand% テーマのページで、新しいバージョンが提供されているかもしれません。"OK" ボタンをクリックして、このテーマをアンインストールすることもできます。
-noPopupControl=このサイトのポップアップはコントロールできません
-
 #nsContextMenu.js (setWallpaper confirmation dialog)
 wallpaperConfirmTitle  = 壁紙に設定
 wallpaperConfirmButton = 壁紙に設定する
 wallpaperConfirmMsg    = この画像をデスクトップの壁紙に設定しますか?
 
 # XXX - this sucks and should only be temporary.
 switchskins=テーマの変更は %S を再起動後に変更が適用されます。
 switchskinstitle=テーマを適用
-# Localization Note: Use 'true' or 'false' to control the pref:theme to 
-# show the English description or not
-# for example, in Japanese build, instead of showing English description
-# set the following value to false so it won't show up.
-showskinsdescription=true
+switchskinsnow=今すぐ再起動
+switchskinslater=後で再起動
 
 # menu_close labels
 tabs.closeTab.label=タブを閉じる
 tabs.closeTab.accesskey=C
 tabs.close.label=閉じる
 tabs.close.accesskey=C
 
 tabs.recentlyClosed.format=%1$S %2$S
 
-tabs.closeWarningTitle=ブラウザ の終了
+windows.recentlyClosed.format=%1$S %2$S
+
+tabs.closeWarningTitle=ブラウザの終了
 tabs.closeWarning=%S 枚のタブが開かれたままになっていますが、ウィンドウを閉じてもいいですか?
 tabs.closeButton=すべてのタブを閉じる
 tabs.closeWarningPromptMe=複数のタブを開いたままウィンドウを閉じようとした場合、警告します。
 tabs.historyItem=タブのグループ
 
 # urlbarBindings.xml
 # LOCALIZATION NOTE: This is for the location bar drop-down string:
 #   "Search " + search_engine_name + " for " + user_input
--- a/suite/chrome/browser/pageInfo.dtd
+++ b/suite/chrome/browser/pageInfo.dtd
@@ -33,47 +33,47 @@
 # and other provisions required by the LGPL or the GPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 -->
 
 <!-- Note to localizers, don't localize the strings 'width' or 'height' -->
-<!ENTITY  pageInfoWindow.dimensions  "width: 100ch; height: 30em;">
+<!ENTITY  pageInfoWindow.dimensions  "width: 48.5em; height: 42em;"><!-- en-US: width: 100ch; height: 30em; -->
 
 <!ENTITY  copy.key              "C">
 <!ENTITY  copy.label            "コピー">
 <!ENTITY  copy.accesskey        "C">
 <!ENTITY  selectall.key         "A">
 <!ENTITY  selectall.label       "すべて選択">
 <!ENTITY  selectall.accesskey   "A">
+<!ENTITY  openHelpMac.key       "?">
 <!ENTITY  closeWindow.key       "w">
 
 <!ENTITY  generalTab            "一般">
 <!ENTITY  generalTab.accesskey  "G">
 <!ENTITY  generalURL            "アドレス:">
-<!ENTITY  generalType           "MIMEタイプ:">
+<!ENTITY  generalType           "MIME タイプ:">
 <!ENTITY  generalMode           "描画モード:">
 <!ENTITY  generalSize           "サイズ:">
 <!ENTITY  generalReferrer       "参照元 URL:">
 <!ENTITY  generalSource         "ソース:">
 <!ENTITY  generalModified       "更新日時:">
 <!ENTITY  generalEncoding       "文字エンコーディング:">
 <!ENTITY  generalMetaName       "名前">
 <!ENTITY  generalMetaContent    "コンテンツ">
-<!ENTITY  generalSecurityMore   "その他">
-<!ENTITY  generalSecurityMore.accesskey "o">
+<!ENTITY  generalSecurityDetails           "詳細">
+<!ENTITY  generalSecurityDetails.accesskey "D">
 
 <!ENTITY  formsTab              "フォーム">
 <!ENTITY  formsTab.accesskey    "F">
 <!ENTITY  formAction            "フォームの動作">
 <!ENTITY  formMethod            "メソッド">
 <!ENTITY  formName              "名前">
-<!ENTITY  formNo                "番号">
 <!ENTITY  formEncoding          "文字エンコーディング:">
 <!ENTITY  formTarget            "ターゲット:">
 <!ENTITY  formFields            "フィールド:">
 <!ENTITY  formLabel             "ラベル">
 <!ENTITY  formFName             "フィールドの名前">
 <!ENTITY  formType              "種類">
 <!ENTITY  formCValue            "現在値">
 
@@ -90,58 +90,60 @@
 <!ENTITY  mediaTab.accesskey    "M">
 <!ENTITY  mediaURL              "アドレス:">
 <!ENTITY  mediaAlt              "関連テキスト:">
 <!ENTITY  mediaAltHeader        "関連テキスト">
 <!ENTITY  mediaAddress          "アドレス">
 <!ENTITY  mediaType             "種類">
 <!ENTITY  mediaSize             "サイズ">
 <!ENTITY  mediaCount            "訪問回数">
-<!ENTITY  mediaDimensions       "指定した寸法:">
+<!ENTITY  mediaDimensions       "指定された寸法:">
 <!ENTITY  mediaPhysDimensions   "実寸:">
 <!ENTITY  mediaTitle            "タイトル属性:">
 <!ENTITY  mediaLongdesc         "詳しい説明:">
 <!ENTITY  mediaBlockImage.accesskey "B">
 <!ENTITY  mediaSaveAs           "名前をつけて保存...">
 <!ENTITY  mediaSaveAs.accesskey "A">
 <!ENTITY  mediaSaveAs2.accesskey "e">
 <!ENTITY  mediaPreview          "メディアプレビュー:">
 
 <!ENTITY  feedTab               "フィード">
 <!ENTITY  feedTab.accesskey     "F">
 <!ENTITY  feedSubscribe         "購読">
 <!ENTITY  feedSubscribe.accesskey "u">
 
 <!ENTITY  permTab               "許可">
 <!ENTITY  permTab.accesskey     "P">
-<!ENTITY  permUseDefault        "Use Default">
+<!ENTITY  permUseDefault        "標準設定を使用する">
+<!ENTITY  permAskAlways         "毎回確認する">
 <!ENTITY  permAllow             "許可">
 <!ENTITY  permAllowSession      "セッション中のみ許可">
 <!ENTITY  permBlock             "ブロック">
 <!ENTITY  permissionsFor        "許可情報:">
-<!ENTITY  permImage             "画像を読み込む">
+<!ENTITY  permImage             "画像の読み込み">
 <!ENTITY  permPopup             "ポップアップウィンドウを開く">
-<!ENTITY  permCookie            "Cookieの保存">
+<!ENTITY  permCookie            "Cookie の保存">
 <!ENTITY  permInstall           "拡張機能またはテーマのインストール">
+<!ENTITY  permGeo               "位置情報の送信">
 
 <!ENTITY  securityTab           "セキュリティ">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "このページのセキュリティ情報">
 <!ENTITY  securityView.certView "証明書の表示">
 <!ENTITY  securityView.accesskey "V">
 <!ENTITY  securityView.unknown   "不明">
 
 
 <!ENTITY  securityView.identity.header   "Web サイトの識別情報">
-<!ENTITY  securityView.identity.owner    "運営者: ">
-<!ENTITY  securityView.identity.domain   "Web サイト: ">
-<!ENTITY  securityView.identity.verifier "認証局: ">
+<!ENTITY  securityView.identity.owner    "運営者:">
+<!ENTITY  securityView.identity.domain   "Web サイト:">
+<!ENTITY  securityView.identity.verifier "認証局:">
 
 <!ENTITY  securityView.privacy.header                   "プライバシーと履歴">
 <!ENTITY  securityView.privacy.history                  "昨日までに何回このサイトを訪問したことがあるか?">
-<!ENTITY  securityView.privacy.cookies                  "このサイトはコンピュータに情報 (cookie) を保存しているか?">
-<!ENTITY  securityView.privacy.viewCookies              "Cookieを表示">
+<!ENTITY  securityView.privacy.cookies                  "このサイトはコンピュータに情報 (Cookie) を保存しているか?">
+<!ENTITY  securityView.privacy.viewCookies              "Cookie を表示">
 <!ENTITY  securityView.privacy.viewCookies.accessKey    "k">
 <!ENTITY  securityView.privacy.passwords                "このサイトのパスワードを保存しているか?">
 <!ENTITY  securityView.privacy.viewPasswords            "パスワードを表示">
 <!ENTITY  securityView.privacy.viewPasswords.accessKey  "w">
 
 <!ENTITY  securityView.technical.header                 "技術情報">
--- a/suite/chrome/browser/pageInfo.properties
+++ b/suite/chrome/browser/pageInfo.properties
@@ -53,22 +53,24 @@ mediaBGImg=背景画像
 mediaObject=オブジェクト
 mediaEmbed=埋め込み
 mediaLink=アイコン
 mediaInput=入力
 mediaFileSize=%S KB
 mediaSize=%S x %S (ピクセル)
 mediaSelectFolder=画像を保存するフォルダを選択
 mediaBlockImage=%S の画像をブロックする
+mediaImageType=%S 画像
+mediaAnimatedImageType=%S 画像 (%S フレームアニメーション)
 
 generalQuirksMode=下位互換
 generalStrictMode=標準準拠
 generalNotCached=(キャッシュなし)
-generalDiskCache=ディスク キャッシュ
-generalMemoryCache=メモリ キャッシュ
+generalDiskCache=ディスクキャッシュ
+generalMemoryCache=メモリキャッシュ
 generalSize=%S KB (%S バイト)
 generalMetaTag=Meta タグ (1 件)
 generalMetaTags=Meta タグ (%S 件)
 generalSiteIdentity=Web サイトの運営者: %S\n認証者: %S
 
 formTitle=フォーム %S:
 formUntitled=名前なしフォーム:
 formDefaultTarget=なし (同じウィンドウで開く)
@@ -86,12 +88,11 @@ linkRev=逆方向リンク
 linkX=単純 XLink
 linkScript=スクリプト
 linkScriptInline=インライン
 
 feedRss=RSS
 feedAtom=Atom
 feedXML=XML
 
-securityCertText=詳細な識別情報は、この Web サイトが提示した証明書に記載されています。
-securityNoIdentity=このサイトには識別情報がありません。
+securityNoOwner=検証され信頼できる運営者情報はありません
 securityOneVisit=1 回訪問しています
 securityNVisits=%S 回訪問しています
--- a/suite/chrome/browser/region.properties
+++ b/suite/chrome/browser/region.properties
@@ -1,20 +1,31 @@
 # navigator.properties
-homePageDefault=http://www.mozilla.org/
-keywordList=http://home.netscape.com/escapes/keywords
-webmailKeyword=http://webmail.netscape.com
-fallbackDefaultSearchURL=http://www.google.com/search?q=
-otherSearchURL=http://www.google.com
+fallbackDefaultSearchURL=http://www.google.co.jp/search?q=
+otherSearchURL=http://www.google.co.jp
 #
 # all.js
 #
-browser.startup.homepage=http://www.mozilla.org/projects/seamonkey/start/
-browser.throbber.url=http://www.mozilla.org/projects/seamonkey/
-browser.search.defaulturl=http://www.google.com/search?q=
-general.useragent.contentlocale=ja
+browser.startup.homepage=http://www.seamonkey-project.org/start/
+browser.throbber.url=http://www.seamonkey-project.org/
+browser.search.defaulturl=http://www.google.co.jp/search?q=
 
 browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
 browser.translation.serviceDomain=translate.google.com
 
 #config.js
 #
-startup.homepage_override_url=http://www.mozilla.org/projects/seamonkey/start/
+startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
+
+# This is the default set of web based feed handlers shown in the reader
+# selection UI
+browser.contentHandlers.types.0.title   = Google リーダー
+browser.contentHandlers.types.0.uri     = http://www.google.com/reader/view/feed/%s
+browser.contentHandlers.types.1.title	= My Yahoo!
+browser.contentHandlers.types.1.uri	= http://add.my.yahoo.co.jp/rss?url=%s
+browser.contentHandlers.types.2.title	= Bloglines
+browser.contentHandlers.types.2.uri	= http://www.bloglines.com/login?r=/sub/%s
+browser.contentHandlers.types.3.title	= はてな RSS
+browser.contentHandlers.types.3.uri	= http://r.hatena.ne.jp/append/%s
+browser.contentHandlers.types.4.title	= livedoor Reader
+browser.contentHandlers.types.4.uri	= http://reader.livedoor.com/subscribe/?url=%s
+browser.contentHandlers.types.5.title	= goo RSS リーダー
+browser.contentHandlers.types.5.uri	= http://reader.goo.ne.jp/web/bookmarklet.html?,,%s
--- a/suite/chrome/browser/tabbrowser.properties
+++ b/suite/chrome/browser/tabbrowser.properties
@@ -1,9 +1,6 @@
 tabs.loading=読み込み中...
-tabs.untitled=(タイトル無し)
-tabs.closeWarningTitle=他のタブを閉じる 確認
+tabs.untitled=タイトル無し
+tabs.closeWarningTitle=他のタブを閉じる確認
 tabs.closeWarning=%S の他のタブを閉じようとしています。タブを閉じてもよろしいですか?
 tabs.closeButton=他のタブを閉じる
 tabs.closeWarningPromptMe=他のタブを閉じるとき警告する
-browsewithcaret.checkMsg=このダイアログボックスを今後表示させない
-browsewithcaret.checkWindowTitle=キャレットブラウジング
-browsewithcaret.checkLabel=F7 キーを押すとキャレットブラウズモードのオンとオフが切り替わります。このモードをオンにすると Web ページ中を移動可能なカーソル(キャレット)が表示され、キーボードでテキストを選択できるようになります。キャレットブラウズモードをオンにしますか?
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/aboutSessionRestore.dtd
@@ -0,0 +1,18 @@
+<!ENTITY restorepage.tabtitle		"セッションの復元">
+<!ENTITY restorepage.pagetitle		"前回終了時のウィンドウとタブを復元しますか?">
+<!-- LOCALIZATION NOTE: If "closed unexpectedly" sounds too awkward in the translation,
+                        you may translate "crash" instead (even though it's IT-speak) -->
+<!ENTITY restorepage.issueDesc		"&brandShortName; は前回正常に終了できませんでした。ご不便をおかけして申し訳ありません。前回終了時のウィンドウとタブを復元することもできますし、復元の必要がなければ新しいセッションを開始することもできます。">
+<!ENTITY restorepage.remedies		"&brandShortName; が繰り返し異常終了する場合:">
+<!ENTITY restorepage.dueToChrome	"最近インストールしたアドオンをアドオンマネージャで無効化しててください。">
+<!ENTITY restorepage.dueToContent	"問題の原因となりそうな Web ページを除外して起動してみてください:">
+
+<!ENTITY restorepage.restoreButton	"タブを復元">
+<!ENTITY restorepage.restore.access	"R">
+<!ENTITY restorepage.cancelButton	"状態を復元せずに起動">
+<!ENTITY restorepage.cancel.access	"S">
+
+<!ENTITY restorepage.restoreHeader	"復元">
+<!ENTITY restorepage.listHeader		"ウィンドウとタブ">
+<!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
+<!ENTITY restorepage.windowLabel	"ウィンドウ &#37;S">
--- a/suite/chrome/common/bookmarks/addBookmark.dtd
+++ b/suite/chrome/common/bookmarks/addBookmark.dtd
@@ -39,13 +39,12 @@
 <!ENTITY selectFolder.title         "フォルダを選択">
 <!ENTITY name.label                 "名前:">
 <!ENTITY name.accesskey             "N">
 <!ENTITY url.label                  "URL:">
 <!ENTITY url.accesskey              "L">
 <!ENTITY shortcutURL.label          "キーワード:">
 <!ENTITY shortcutURL.accesskey      "K">
 <!ENTITY destination.label          "フォルダ:">
-<!ENTITY destination.accesskey      "D">
-<!ENTITY newFolder.label            "新しい...">
+<!ENTITY newFolder.label            "新しいフォルダ...">
 <!ENTITY newFolder.accesskey        "w">
 <!ENTITY addGroup.label             "このタブのグループをブックマークする">
 <!ENTITY addGroup.accesskey         "B">
--- a/suite/chrome/common/bookmarks/bm-props.dtd
+++ b/suite/chrome/common/bookmarks/bm-props.dtd
@@ -1,63 +1,108 @@
-<!ENTITY AMeight.label "午前8時">
-<!ENTITY AMeleven.label "午前11時">
-<!ENTITY AMfive.label "午前5時">
-<!ENTITY AMfour.label "午前4時">
-<!ENTITY AMnine.label "午前9時">
-<!ENTITY AMone.label "午前1時">
-<!ENTITY AMseven.label "午前7時">
-<!ENTITY AMsix.label "午前6時">
-<!ENTITY AMten.label "午前10時">
-<!ENTITY AMthree.label "午前3時">
-<!ENTITY AMtwo.label "午前2時">
-<!ENTITY PMeight.label "午後8時">
-<!ENTITY PMeleven.label "午後11時">
-<!ENTITY PMfive.label "午後5時">
-<!ENTITY PMfour.label "午後4時">
-<!ENTITY PMnine.label "午後9時">
-<!ENTITY PMone.label "午後1時">
-<!ENTITY PMseven.label "午後7時">
-<!ENTITY PMsix.label "午後6時">
-<!ENTITY PMten.label "午後10時">
-<!ENTITY PMthree.label "午後3時">
-<!ENTITY PMtwo.label "午後2時">
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corp.
+   - Portions created by the Initial Developer are Copyright (C) 1999
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Stephen Lamm          <slamm@netscape.com>
+   -   Robert John Churchill <rjc@netscape.com>
+   -   Ben Goodger           <ben@netscape.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either of the GNU General Public License Version 2 or later (the "GPL"),
+   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY bookmarks.windowtitle.label  "&quot;**bm_title**&quot; のプロパティ">
+
+<!ENTITY generalInfo.label            "一般情報">
+<!ENTITY bookmarks.name.label         "名前:">
+<!ENTITY bookmarks.name.accesskey     "N">
+<!ENTITY bookmarks.location.label     "URL:">
+<!ENTITY bookmarks.location.accesskey "L">
+<!ENTITY bookmarks.shortcut.label     "キーワード:">
+<!ENTITY bookmarks.shortcut.accesskey "K">
+<!ENTITY bookmarks.description.label  "説明:">
 <!ENTITY bookmarks.description.accesskey "D">
-<!ENTITY bookmarks.description.label "説明:">
-<!ENTITY bookmarks.location.accesskey "L">
-<!ENTITY bookmarks.location.label "URL:">
-<!ENTITY bookmarks.name.accesskey "N">
-<!ENTITY bookmarks.name.label "名前:">
-<!ENTITY bookmarks.shortcut.accesskey "K">
-<!ENTITY bookmarks.shortcut.label "キーワード:">
-<!ENTITY checkeveryday.label "毎日">
+
 <!ENTITY checkforupdates.legend.label "更新確認を有効にする">
-<!ENTITY checkfridays.label "金曜日">
-<!ENTITY checkmondays.label "月曜日">
-<!ENTITY checknever.label "確認しない">
-<!ENTITY checksaturdays.label "土曜日">
-<!ENTITY checksundays.label "日曜日">
-<!ENTITY checkthursdays.label "木曜日">
-<!ENTITY checktuesdays.label "火曜日">
-<!ENTITY checkwednesdays.label "水曜日">
-<!ENTITY checkweekdays.label "平日">
-<!ENTITY checkweekends.label "週末">
-<!ENTITY every.accesskey "e">
-<!ENTITY every.label "毎">
-<!ENTITY from.accesskey "f">
-<!ENTITY from.label "開始時刻:">
-<!ENTITY generalInfo.label "一般情報">
-<!ENTITY midnight.label "午前0時">
-<!ENTITY minutes.label "分ごとに">
-<!ENTITY noon.label "午後0時">
+<!ENTITY when.label                   "曜日:">
+<!ENTITY when.accesskey               "W">
+<!ENTITY from.label                   "開始時刻:">
+<!ENTITY from.accesskey               "f">
+<!ENTITY to.label                     "終了時刻:">
+<!ENTITY to.accesskey                 "t">
+<!ENTITY every.label                  "毎">
+<!ENTITY every.accesskey              "e">
+<!ENTITY minutes.label                "分ごとに">
+<!ENTITY notifications.legend.label   "通知">
+
+<!ENTITY checknever.label             "確認しない">
+<!ENTITY checkeveryday.label          "毎日">
+<!ENTITY checkweekdays.label          "平日">
+<!ENTITY checkweekends.label          "週末">
+<!ENTITY checkmondays.label           "月曜日">
+<!ENTITY checktuesdays.label          "火曜日">
+<!ENTITY checkwednesdays.label        "水曜日">
+<!ENTITY checkthursdays.label         "木曜日">
+<!ENTITY checkfridays.label           "金曜日">
+<!ENTITY checksaturdays.label         "土曜日">
+<!ENTITY checksundays.label           "日曜日">
+
+<!ENTITY midnight.label               "午前0時">
+<!ENTITY AMone.label                  "午前1時">
+<!ENTITY AMtwo.label                  "午前2時">
+<!ENTITY AMthree.label                "午前3時">
+<!ENTITY AMfour.label                 "午前4時">
+<!ENTITY AMfive.label                 "午前5時">
+<!ENTITY AMsix.label                  "午前6時">
+<!ENTITY AMseven.label                "午前7時">
+<!ENTITY AMeight.label                "午前8時">
+<!ENTITY AMnine.label                 "午前9時">
+<!ENTITY AMten.label                  "午前10時">
+<!ENTITY AMeleven.label               "午前11時">
+<!ENTITY noon.label                   "午後0時">
+<!ENTITY PMone.label                  "午後1時">
+<!ENTITY PMtwo.label                  "午後2時">
+<!ENTITY PMthree.label                "午後3時">
+<!ENTITY PMfour.label                 "午後4時">
+<!ENTITY PMfive.label                 "午後5時">
+<!ENTITY PMsix.label                  "午後6時">
+<!ENTITY PMseven.label                "午後7時">
+<!ENTITY PMeight.label                "午後8時">
+<!ENTITY PMnine.label                 "午後9時">
+<!ENTITY PMten.label                  "午後10時">
+<!ENTITY PMeleven.label               "午後11時">
+
+<!ENTITY notification.icon.label      "ブックマークのアイコンの変更">
+<!ENTITY notification.icon.accesskey  "C">
+<!ENTITY notification.sound.label     "サウンドを鳴らす">
+<!ENTITY notification.sound.accesskey "P">
+<!ENTITY notification.alert.label     "メッセージを表示する">
 <!ENTITY notification.alert.accesskey "r">
-<!ENTITY notification.alert.label "メッセージを表示する">
-<!ENTITY notification.icon.accesskey "C">
-<!ENTITY notification.icon.label "ブックマークのアイコンの変更">
-<!ENTITY notification.sound.accesskey "P">
-<!ENTITY notification.sound.label "音を鳴らす">
+<!ENTITY notification.window.label    "Web ページを新しいウィンドウで開く">
 <!ENTITY notification.window.accesskey "O">
-<!ENTITY notification.window.label "Web ページを新しいウィンドウで開く">
-<!ENTITY notifications.legend.label "通知">
-<!ENTITY to.accesskey "t">
-<!ENTITY to.label "終了時刻:">
-<!ENTITY when.accesskey "W">
-<!ENTITY when.label "曜日:">
--- a/suite/chrome/common/bookmarks/bookmarks.dtd
+++ b/suite/chrome/common/bookmarks/bookmarks.dtd
@@ -35,87 +35,86 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- extracted from ./bookmarks.xul -->
 <!ENTITY menuBar.tooltip               "メニューバー">
 <!ENTITY bookmarkToolbar.tooltip       "ブックマークツールバー">
-<!ENTITY bookmarksSearch.tooltip       "ブックマーク検索ツールバー">
 <!ENTITY menuitem.newBookmark.label    "ブックマーク">
-<!ENTITY command.newBookmark.accesskey "B">
+<!ENTITY menuitem.newBookmark.accesskey "B">
 <!ENTITY menuitem.newFolder.label      "フォルダ">
+<!ENTITY menuitem.newFolder.accesskey  "F">
 <!ENTITY button.newFolder.label        "新しいフォルダ">
 <!ENTITY button.newFolder.accesskey    "N">
-<!ENTITY command.newFolder.accesskey   "F">
 <!ENTITY menuitem.newSeparator.label   "区切り">
+<!ENTITY menuitem.newSeparator.accesskey "S">
 <!ENTITY button.newSeparator.label     "新しい区切り">
-<!ENTITY button.newSeparator.accesskey  "o">
-<!ENTITY command.newSeparator.accesskey "S">
+<!ENTITY button.newSeparator.accesskey "o">
 <!ENTITY menuitem.open.label           "ブックマークファイルを開く...">
 <!ENTITY menuitem.open.accesskey       "O">
 <!ENTITY menuitem.import.label         "インポート...">
 <!ENTITY menuitem.import.accesskey     "i">
 <!ENTITY menuitem.export.label         "エクスポート...">
 <!ENTITY menuitem.export.accesskey     "e">
 <!ENTITY menuitem.find.label           "ブックマークを検索...">
+<!ENTITY menuitem.find.accesskey       "S">
+<!ENTITY menuitem.find.find.key        "F">
 <!ENTITY command.findBookmarks.label   "検索...">
-<!ENTITY menuitem.find.accesskey       "S">
-<!ENTITY edit.find.keybinding          "f">
-<!ENTITY command.properties.label      "プロパティ...">
-<!ENTITY button.properties.accesskey  "P">
-<!ENTITY command.properties.accesskey  "o">
-<!ENTITY edit.properties.keybinding    "i">
-<!ENTITY command.rename.label          "名前の変更...">
-<!ENTITY button.rename.accesskey      "R">
-<!ENTITY command.delete.label          "削除">
-<!ENTITY button.delete.accesskey      "D">
-<!ENTITY command.moveBookmark.label    "ブックマークを移動...">
-<!ENTITY command.moveBookmarkShort.label "移動...">
-<!ENTITY command.moveBookmark.accesskey "M">
+<!ENTITY menuitem.properties.label     "プロパティ...">
+<!ENTITY menuitem.properties.accesskey "o">
+<!ENTITY button.properties.label       "プロパティ...">
+<!ENTITY button.properties.accesskey   "P">
+<!ENTITY menuitem.properties.key       "I">
+<!ENTITY button.rename.label           "名前を変更...">
+<!ENTITY button.rename.accesskey       "R">
+<!ENTITY button.delete.label           "削除">
+<!ENTITY button.delete.accesskey       "D">
+<!ENTITY menuitem.moveBookmark.label   "ブックマークを移動...">
+<!ENTITY menuitem.moveBookmark.accesskey "M">
+<!ENTITY button.moveBookmark.label     "移動...">
+<!ENTITY button.moveBookmark.accesskey "M">
 <!ENTITY command.addBookmark.label     "追加...">
 <!ENTITY command.manageBookmarks.label "管理">
 <!ENTITY command.sortFolder.label      "フォルダを並べ替え...">
 <!ENTITY command.sortFolder.accesskey  "S">
-<!ENTITY edit.sortFolder.keybinding    "S">
+<!ENTITY command.sortFolder.key        "S">
 <!ENTITY command.sortFolderByName.label "フォルダを名前で並べ替える">
 <!ENTITY command.sortFolderByName.accesskey "N">
 
 <!ENTITY menuitem.view.command.toolbar.label        "ツールバー">
 <!ENTITY menuitem.view.command.toolbar.accesskey    "t">
-<!ENTITY menuitem.view.command.searchbar.label      "検索バー">
-<!ENTITY menuitem.view.command.searchbar.accesskey  "S">
 <!ENTITY menuitem.view.show_columns.label           "列を表示">
 <!ENTITY menuitem.view.show_columns.accesskey       "c">
 <!ENTITY menuitem.newbookmarkfolder.label           "新しいブックマークフォルダとして設定">
 <!ENTITY menuitem.newbookmarkfolder.accesskey       "b">
 <!ENTITY menuitem.newinternetsearchfolder.label     "新しいインターネット検索フォルダとして設定">
 <!ENTITY menuitem.newinternetsearchfolder.accesskey "i">
-<!ENTITY menuitem.personaltoolbarfolder.label       "パーソナル ツールバーフォルダとして設定">
+<!ENTITY menuitem.personaltoolbarfolder.label       "パーソナルツールバーフォルダとして設定">
 <!ENTITY menuitem.personaltoolbarfolder.accesskey   "p">
 
 <!ENTITY treecol.name.label             "名前">
-<!ENTITY treecol.name.accesskey         "n">
+<!ENTITY treecol.name.accesskey         "N">
 <!ENTITY treecol.name.tooltip           "名前で並べ替える">
 <!ENTITY treecol.url.label              "アドレス(URL)">
-<!ENTITY treecol.url.accesskey          "l">
+<!ENTITY treecol.url.accesskey          "L">
 <!ENTITY treecol.url.tooltip            "アドレス(URL)で並べ替える">
 <!ENTITY treecol.shortcut.label         "キーワード">
-<!ENTITY treecol.shortcut.accesskey     "k">
+<!ENTITY treecol.shortcut.accesskey     "K">
 <!ENTITY treecol.shortcut.tooltip       "キーワードで並べ替える">
 <!ENTITY treecol.description.label      "説明">
-<!ENTITY treecol.description.accesskey  "d">
+<!ENTITY treecol.description.accesskey  "D">
 <!ENTITY treecol.description.tooltip    "説明で並べ替える">
 <!ENTITY treecol.addedon.label          "追加日時">
-<!ENTITY treecol.addedon.accesskey      "a">
+<!ENTITY treecol.addedon.accesskey      "A">
 <!ENTITY treecol.addedon.tooltip        "追加日時で並べ替える">
 <!ENTITY treecol.lastmod.label          "最終更新日時">
-<!ENTITY treecol.lastmod.accesskey      "m">
+<!ENTITY treecol.lastmod.accesskey      "M">
 <!ENTITY treecol.lastmod.tooltip        "最終更新日時で並べ替える">
 <!ENTITY treecol.lastvisit.label        "最終訪問日時">
-<!ENTITY treecol.lastvisit.accesskey    "b">
+<!ENTITY treecol.lastvisit.accesskey    "V">
 <!ENTITY treecol.lastvisit.tooltip      "最終訪問日時で並べ替える">
 
 <!ENTITY bookmarksWindowTitle.label     "ブックマークマネージャ">
 
-<!ENTITY search.label                     "検索">
-<!ENTITY search.accesskey                 "S">
+<!ENTITY search.emptytext               "ブックマークを検索">
+<!ENTITY search.key                     "f">
--- a/suite/chrome/common/bookmarks/bookmarks.properties
+++ b/suite/chrome/common/bookmarks/bookmarks.properties
@@ -64,45 +64,39 @@ cmd_bm_sortfolder.accesskey = S
 cmd_bm_openinnewwindow.label = 新しいウィンドウで開く
 cmd_bm_openinnewwindow.accesskey = W
 cmd_bm_openinnewtab.label = 新しいタブで開く
 cmd_bm_openinnewtab.accesskey = T 
 cmd_bm_newfolder.label = 新しいフォルダ...
 cmd_bm_newfolder.accesskey = F
 
 ile_newfolder = 新しいフォルダ
-ile_newbookmark = 新しいブックマーク
-newfolder_dialog_title = 新しいフォルダの作成
-newfolder_dialog_msg = 新しいフォルダの名前:
 
 window_title = %S - ブックマーク
 search_results_title = 検索結果
 
-file_in = File in "%S"
-
 bookmarks_default_root = ブックマーク
 bookmarks_root = %S のブックマーク
 bookmarks_title = ブックマークマネージャ
 status_foldercount = %S 個
 
 WebPageUpdated = 次の Web ページは更新されています:
 WebPageTitle = タイトル:
 WebPageURL = URL:
 WebPageAskDisplay = 表示してもよろしいですか?
 WebPageAskStopOption = ページの更新の確認を中止する
 
-pleaseEnterALocation = URL を入力してください
 pleaseEnterADuration = 期間を入力してください。
 pleaseSelectANotification = 通知方法を少なくとも1つ選択してください。
 
 SortMenuItem = %S で並べ替え
 
 ShortFindTitle = 検索: '%S'
 FindTitle = 検索: %S %S '%S' in %S
 
 ImportedIEFavorites = IE のお気に入り                                     
 ImportedIEStaticFavorites = IE のお気に入り
 ImportedNetPositiveBookmarks = NetPositive のブックマーク                   
-DefaultPersonalToolbarFolder = パーソナル ツールバー フォルダ                          
+DefaultPersonalToolbarFolder = パーソナルツールバーフォルダ                          
 
 SelectOpen = ブックマークファイルを開く
-SelectImport = インポートするブックマーク ファイル
-EnterExport = エクスポートするブックマーク ファイル
+SelectImport = インポートするブックマークファイル
+EnterExport = エクスポートするブックマークファイル
--- a/suite/chrome/common/bookmarks/findBookmark.dtd
+++ b/suite/chrome/common/bookmarks/findBookmark.dtd
@@ -1,14 +1,17 @@
-<!ENTITY findBookmark.title "ブックマークを検索">
-<!ENTITY findButton.label "検索">
-<!ENTITY save.query.label "ブックマークにクエリを保存">
-<!ENTITY search.contains.label "に以下を含む">
-<!ENTITY search.description.label "説明">
-<!ENTITY search.doesntcontain.label "に以下を含まない">
-<!ENTITY search.endswith.label "が以下で終わる">
-<!ENTITY search.for.label "ブックマークを検索します">
-<!ENTITY search.is.label "が以下と等しい">
-<!ENTITY search.isnot.label "が以下と異なる">
-<!ENTITY search.name.label "名前">
-<!ENTITY search.shortcut.label "キーワード">
-<!ENTITY search.startswith.label "が以下で始まる">
-<!ENTITY search.url.label "アドレス (URL)">
+
+<!ENTITY search.name.label              "名前">
+<!ENTITY search.url.label               "URL">
+<!ENTITY search.shortcut.label          "キーワード">
+<!ENTITY search.description.label       "説明">
+<!ENTITY search.startswith.label        "が以下で始まる">
+<!ENTITY search.endswith.label          "が以下で終わる">
+<!ENTITY search.is.label                "が以下と等しい">
+<!ENTITY search.isnot.label             "が以下と異なる">
+<!ENTITY search.contains.label          "に以下を含む">
+<!ENTITY search.doesntcontain.label     "に以下を含まない">
+<!ENTITY save.query.label               "ブックマークにクエリを保存">
+<!ENTITY save.query.accesskey           "S">
+<!ENTITY search.for.label               "ブックマークを検索します">
+<!ENTITY findBookmark.title             "ブックマークを検索">
+<!ENTITY findButton.label               "検索">
+<!ENTITY findButton.accesskey           "F">
--- a/suite/chrome/common/bookmarks/sortFolder.dtd
+++ b/suite/chrome/common/bookmarks/sortFolder.dtd
@@ -1,16 +1,24 @@
+<!ENTITY window.title "Sort Folder">
+
+<!ENTITY sortOptions.label "Sort options">
 <!ENTITY description.label "&brandShortName; には、フォルダを使いやすい順番に並べ替える機能があります。並べ替えの順序は、以下のオプションの範囲でカスタマイズできます。">
-<!ENTITY sortAscending.label "昇順">
+
+<!ENTITY sortBy.label "並べ替え順序:">
+<!ENTITY sortBy.accesskey "S">
+<!ENTITY sortBy.name.label "名前">
+<!ENTITY sortBy.url.label "URL">
+<!ENTITY sortBy.shortcutUrl.label "キーワード">
+<!ENTITY sortBy.description.label "説明">
 <!ENTITY sortBy.bookmarkAddDate.label "追加日時">
-<!ENTITY sortBy.description.label "説明">
-<!ENTITY sortBy.label "並べ替え順序:">
 <!ENTITY sortBy.lastModifiedDate.label "最終更新日時">
 <!ENTITY sortBy.lastVisitDate.label "最終訪問日時">
-<!ENTITY sortBy.name.label "名前">
-<!ENTITY sortBy.shortcutUrl.label "キーワード">
-<!ENTITY sortBy.url.label "アドレス (URL)">
+
+<!ENTITY sortOrder.label "昇順 / 降順:">
+<!ENTITY sortOrder.accesskey "o">
+<!ENTITY sortAscending.label "昇順">
 <!ENTITY sortDescending.label "降順">
+
 <!ENTITY sortFoldersFirst.label "フォルダを先頭に集める">
-<!ENTITY sortOptions.label "並べ替えのオプション">
-<!ENTITY sortOrder.label "昇順 / 降順:">
-<!ENTITY sortRecursively.label "この順序を崩さない">
-<!ENTITY window.title "フォルダを並べ替え">
+<!ENTITY sortFoldersFirst.accesskey "d">
+<!ENTITY sortRecursively.label "再帰的に並べ替える">
+<!ENTITY sortRecursively.accesskey "c">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/certError.dtd
@@ -0,0 +1,23 @@
+<!-- These strings are used by SeaMonkey's custom about:certerror page,
+a replacement for the standard security certificate errors produced
+by NSS/PSM via netError.xhtml. -->
+
+<!ENTITY certerror.pagetitle			"信頼できない接続">
+<!ENTITY certerror.longpagetitle		"接続の安全性を確認できません">
+
+<!-- Localization note (certerror.introPara1) - The string "#1" will
+be replaced at runtime with the name of the server to which the user
+was trying to connect. -->
+<!ENTITY certerror.introPara1			"<b>#1</b> に安全に接続するように求められましたが、接続の安全性が確認できませんでした。">
+<!ENTITY certerror.introPara2			"安全に接続する場合は通常、あなたが適切な相手と通信することを確認できるように、信頼できる証明書を提供してきます。しかし、このサイトの証明書は信頼性を検証できません。">
+
+<!ENTITY certerror.whatShouldIDo.heading	"どうすればよいのか?">
+<!ENTITY certerror.whatShouldIDo.content	"これまでこのサイトに問題なく接続できていた場合、このエラーが表示されるのは誰かがこのサイトになりすましている可能性があるということであり、接続すべきではありません。">
+<!ENTITY certerror.getMeOutOfHere.label		"スタートページに戻る">
+
+<!ENTITY certerror.expert.heading		"危険性を理解した上で接続するには">
+<!ENTITY certerror.expert.content		"何が起きていて何が問題なのか理解できているのであれば、このサイトの証明書を信頼するよう &brandShortName; にセキュリティ例外を追加することもできます。<b>ただし、たとえこのサイトが信頼できるサイトであっても、誰かが通信を改ざんしているからこのエラーが表示されている可能性があるので十分に注意してください。</b>">
+<!ENTITY certerror.expert.contentPara2		"信頼できる証明書をこのサイトが使用しない正当な理由がない限り、例外として追加しないでください。">
+<!ENTITY certerror.addException.label		"例外を追加...">
+
+<!ENTITY certerror.technical.heading		"技術的詳細を表示">
--- a/suite/chrome/common/consoleOverlay.dtd
+++ b/suite/chrome/common/consoleOverlay.dtd
@@ -32,17 +32,17 @@
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY menuBar.tooltip       "メニューバー">
 <!ENTITY modeToolbar.tooltip   "モードツールバー">
-<!ENTITY entryToolbar.tooltip  "Javaスクリプト入力 ツールバー">
+<!ENTITY entryToolbar.tooltip  "Javaスクリプト入力ツールバー">
 <!ENTITY toolbarsCmd.label     "表示/非表示">
 <!ENTITY toolbarsCmd.accesskey "w">
 <!ENTITY toolbarMode.label     "モード">
 <!ENTITY toolbarMode.accesskey "M">
 <!ENTITY toolbarEval.label     "Javaスクリプト入力">
 <!ENTITY toolbarEval.accesskey "J">
 
 <!ENTITY all.accesskey         "A">
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -1,30 +1,28 @@
 <!-- Context Menu -->
-<!ENTITY popupWindowRejectCmd.label "このサイトのポップアップ ウィンドウを自動的に閉じる">
+<!ENTITY popupWindowRejectCmd.label "このサイトのポップアップウィンドウを自動的に閉じる">
 <!ENTITY popupWindowRejectCmd.accesskey "">
-<!ENTITY popupWindowAllowCmd.label "このサイトのポップアップ ウィンドウを許可する">
+<!ENTITY popupWindowAllowCmd.label "このサイトのポップアップウィンドウを許可する">
 <!ENTITY popupWindowAllowCmd.accesskey "">
 <!ENTITY openLinkCmd.label "新しいウィンドウで開く">
 <!ENTITY openLinkCmd.accesskey "W">
 <!ENTITY openLinkCmdInTab.label "新しいタブで開く">
 <!ENTITY openLinkCmdInTab.accesskey "T">
 <!ENTITY openLinkInWindowCmd.label "開く">
 <!ENTITY openLinkInWindowCmd.accesskey "p">
 <!ENTITY openFrameCmd.label "フレームを新しいウィンドウで開く">
 <!ENTITY openFrameCmd.accesskey "W">
 <!ENTITY openFrameCmdInTab.label "フレームを新しいタブで開く">
 <!ENTITY openFrameCmdInTab.accesskey "T">
 <!ENTITY showOnlyThisFrameCmd.label "このフレームだけを表示">
 <!ENTITY showOnlyThisFrameCmd.accesskey "S">
-<!ENTITY addToBookmarksCmd.label "ページをブックマーク">
-<!ENTITY addToBookmarksCmd.accesskey "B">
 <!ENTITY goBackCmd.label "戻る">
 <!ENTITY goBackCmd.accesskey "B">
-<!ENTITY goForwardCmd.label "次へ">
+<!ENTITY goForwardCmd.label "進む">
 <!ENTITY goForwardCmd.accesskey "F">
 <!ENTITY goUpCmd.label "上へ">
 <!ENTITY goUpCmd.accesskey "U">
 <!ENTITY reloadCmd.label "再読み込み">
 <!ENTITY reloadCmd.accesskey "R">
 <!ENTITY reloadCmd.commandkey "r">
 <!ENTITY stopCmd.label "中止">
 <!ENTITY stopCmd.accesskey "S">
@@ -42,16 +40,18 @@
 <!ENTITY viewFrameInfoCmd.label "フレームの情報を表示">
 <!ENTITY viewFrameInfoCmd.accesskey "I">
 <!ENTITY fitImageCmd.label "画像サイズをウィンドウに合わせる">
 <!ENTITY fitImageCmd.accesskey "F">
 <!ENTITY reloadImageCmd.label         "画像の再読み込み">
 <!ENTITY reloadImageCmd.accesskey     "e">
 <!ENTITY viewImageCmd.label "画像を表示">
 <!ENTITY viewImageCmd.accesskey "I">
+<!ENTITY viewVideoCmd.label           "動画を表示">
+<!ENTITY viewVideoCmd.accesskey       "i">
 <!ENTITY viewBGImageCmd.label "背景画像を表示">
 <!ENTITY viewBGImageCmd.accesskey "w">
 <!ENTITY setWallpaperCmd.label "壁紙に設定">
 <!ENTITY setWallpaperCmd.accesskey "S">
 <!ENTITY bookmarkPageCmd.label "ページをブックマーク">
 <!ENTITY bookmarkPageCmd.accesskey "m">
 <!ENTITY bookmarkLinkCmd.label "リンクをブックマーク">
 <!ENTITY bookmarkLinkCmd.accesskey "L">
@@ -65,40 +65,60 @@
 <!ENTITY saveFrameCmd.label "フレームを保存">
 <!ENTITY saveFrameCmd.accesskey "m">
 <!ENTITY saveLinkAsCmd.label "名前を付けてリンク先を保存...">
 <!ENTITY saveLinkCmd.label "リンク先を保存">
 <!ENTITY saveLinkCmd.accesskey "r">
 <!ENTITY saveImageAsCmd.label "名前を付けて画像を保存...">
 <!ENTITY saveImageCmd.label "画像を保存">
 <!ENTITY saveImageCmd.accesskey "v">
+<!ENTITY saveVideoCmd.label           "名前を付けて動画を保存...">
+<!ENTITY saveVideoCmd.accesskey       "v">
+<!ENTITY saveAudioCmd.label           "名前を付けてオーディオを保存...">
+<!ENTITY saveAudioCmd.accesskey       "v">
 <!ENTITY copyCmd.label "コピー">
 <!ENTITY copyCmd.accesskey "C">
 <!ENTITY selectAllCmd.label "すべて選択">
 <!ENTITY selectAllCmd.accesskey "A">
 <!ENTITY copyLinkCmd.label "リンクの URL をコピー">
 <!ENTITY copyLinkCmd.accesskey "C">
 <!ENTITY copyImageCmd.label "画像をコピー">
 <!ENTITY copyImageCmd.accesskey "o">
+<!ENTITY copyVideoURLCmd.label        "動画の URL をコピー">
+<!ENTITY copyVideoURLCmd.accesskey    "o">
+<!ENTITY copyAudioURLCmd.label        "オーディオの URL をコピー">
+<!ENTITY copyAudioURLCmd.accesskey    "o">
 <!ENTITY metadataCmd.label "プロパティ">
 <!ENTITY metadataCmd.accesskey "P">
-<!ENTITY copyEmailCmd.label "メール アドレスをコピー">
+<!ENTITY copyEmailCmd.label "メールアドレスをコピー">
 <!ENTITY copyEmailCmd.accesskey "E">
 <!ENTITY pasteCmd.label "貼り付け">
 <!ENTITY pasteCmd.accesskey "P">
 <!ENTITY cutCmd.label "切り取り">
 <!ENTITY cutCmd.accesskey "t">
 <!ENTITY deleteCmd.label "削除">
 <!ENTITY deleteCmd.accesskey "D">
 <!ENTITY undoCmd.label "元に戻す">
 <!ENTITY undoCmd.accesskey "U">
 <!ENTITY redoCmd.label "やり直し">
 <!ENTITY redoCmd.accesskey "R">
 <!ENTITY thisFrameMenu.label "フレーム">
 <!ENTITY thisFrameMenu.accesskey "h">
+<!ENTITY mediaPlay.label		"再生">
+<!ENTITY mediaPlay.accesskey		"P">
+<!ENTITY mediaPause.label		"一時停止">
+<!ENTITY mediaPause.accesskey		"P">
+<!ENTITY mediaMute.label		"ミュート">
+<!ENTITY mediaMute.accesskey		"M">
+<!ENTITY mediaUnmute.label		"ミュート解除">
+<!ENTITY mediaUnmute.accesskey		"m">
+<!ENTITY mediaShowControls.label	"コントロールを表示">
+<!ENTITY mediaShowControls.accesskey  "a">
+<!ENTITY mediaHideControls.label	"コントロールを隠す">
+<!ENTITY mediaHideControls.accesskey  "a">
 <!ENTITY search.accesskey "W">
 <!ENTITY bidiSwitchPageDirectionItem.label "ページの書記方向を切り換え">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "テキストの書記方向を切り換え">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey "w">
 <!ENTITY spellAddToDictionary.label "辞書に追加">
 <!ENTITY spellAddToDictionary.accesskey "o">
 <!ENTITY spellIgnoreWord.label          "無視する">
--- a/suite/chrome/common/contentAreaCommands.properties
+++ b/suite/chrome/common/contentAreaCommands.properties
@@ -1,23 +1,27 @@
 # context menu strings
 
-searchText= "%S" を Web 検索
+searchText		= "%S" を Web 検索
+searchText.accesskey	= W
 
-SavePageTitle= Web ページを保存
+blockImage		= %S の画像をブロック
+blockImage.accesskey	= B
+unblockImage		= %S の画像のブロックを解除
+unblockImage.accesskey	= b
+
 SaveImageTitle		= 画像を保存
+SaveVideoTitle		= 動画を保存
+SaveAudioTitle		= オーディオを保存
 SaveLinkTitle		= 名前を付けて保存
-SaveAttachmentTitle=添付ファイルを保存
+SaveAttachmentTitle	= 添付ファイルを保存
 DefaultSaveFileName	= インデックス
 WebPageCompleteFilter	= Web ページ, 完全
 WebPageHTMLOnlyFilter	= Web ページ, HTML のみ
 WebPageXHTMLOnlyFilter	= Web ページ, XHTML のみ
 WebPageSVGOnlyFilter    = Web ページ, SVG のみ
 WebPageXMLOnlyFilter	= Web ページ, XML のみ
 
 # LOCALIZATION NOTE (filesFolder):
 #    This is the name of the folder that is created parallel to a HTML file 
 #    when it is saved "With Images". The %S section is replaced with the
 #    leaf name of the file being saved (minus extension).
 filesFolder=%S_files
-
-saveLinkErrorMsg=リンク先ページを保存できませんでした。 Web ページは削除されたか名前が変更されたかもしれません。
-saveLinkErrorTitle=リンク先の保存
--- a/suite/chrome/common/defaultClientDialog.dtd
+++ b/suite/chrome/common/defaultClientDialog.dtd
@@ -1,10 +1,10 @@
-<!ENTITY defaultClient.title  "Default Client">
-<!ENTITY defaultClient.intro  "Use &brandShortName; as the default client for:">
+<!ENTITY defaultClient.title  "既定のクライアント">
+<!ENTITY defaultClient.intro  "&brandShortName; を 既定のクライアント に設定する:">
 
-<!ENTITY browser.label "Browser">
-<!ENTITY email.label "E-Mail">
-<!ENTITY newsgroups.label "Newsgroups">
-<!ENTITY rss.label "RSS Feeds">
+<!ENTITY browser.label "ブラウザ">
+<!ENTITY email.label "メール">
+<!ENTITY newsgroups.label "ニュース">
+<!ENTITY feeds.label "フィード">
 
-<!ENTITY checkOnStartup.label "Always perform this check when starting &brandShortName;">
+<!ENTITY checkOnStartup.label "&brandShortName; を起動するたびに確認する">
 <!ENTITY checkOnStartup.accesskey "A">
--- a/suite/chrome/common/help/cert_dialog_help.xhtml
+++ b/suite/chrome/common/help/cert_dialog_help.xhtml
@@ -255,17 +255,17 @@
   certificate</strong>: This section of the dialog box lists the following
   information:</p>
 
 <ul>
   <li><strong>Host name</strong>: The name of the server requesting
     identification, used as part of its URL. For example, the host name for the
     Netscape website is <tt>home.netscape.com</tt>.</li>
   <li><strong>Organization</strong>: The name of the organization that runs the
-    web site.</li>
+    website.</li>
   <li><strong>Issued under</strong>: The name of the
     <a href="glossary.xhtml#certificate_authority">certificate authority (CA)</a>
     that issued the certificate.</li>
 </ul>
 
 <p><strong>Choose a certificate to present as identification</strong>: The
   certificates you have available for the purposes of identifying yourself to a
   website are listed in the drop-down list in this section of the dialog box.
@@ -298,17 +298,17 @@
   CA to issue.</p>
 
 <p>Before downloading a new CA certificate, Certificate Manager allows you to
   specify the purposes for which you trust the certificate, if at all. You can
   select any of the following options:</p>
 
 <ul>
   <li><strong>Trust this CA to identify websites</strong>: Website certificates
-    for some sites, such as those that handle financial transactions, can be
+    for some websites, such as those that handle financial transactions, can be
     extremely important, and inappropriate or false identification can have
     negative consequences.</li>
   <li><strong>Trust this CA to identify email users</strong>: If you intend to
     send email users confidential information in encrypted form, or if accurate
     identification of email users is important to you for any other reason, you
     should consider carefully the CA&apos;s procedures for identifying
     prospective certificate owners and whether they are appropriate for your
     purposes before selecting this option.</li>
@@ -331,210 +331,161 @@
 <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>
 
-<p>One of the windows listed here may appear when you attempt to go to a
-  website that supports the use of <a href="glossary.xhtml#ssl">SSL</a> for
+<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>.</p>
+  <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>
 
 <div class="contentsBox">In this section:
   <ul>
-    <li><a href="#web_site_certified_by_an_unknown_authority">Website Certified
-      by an Unknown Authority</a></li>
-    <li><a href="#server_certificate_expired">Server Certificate Expired</a></li>
-    <li><a href="#server_certificate_not_yet_valid">Server Certificate Not Yet
+    <li><a href="#secure_connection_failed_page">Secure Connection Failed
+      Page</a></li>
+    <li><a href="#untrusted_connection_page">Untrusted Connection Page</a></li>
+    <li><a href="#secure_connection_failed_dialog">Secure Connection Failed
+      Dialog</a></li>
+    <li><a href="#certificate_expired">Server Certificate Expired</a></li>
+    <li><a href="#certificate_not_yet_valid">Server Certificate Not Yet
       Valid</a></li>
     <li><a href="#domain_name_mismatch">Domain Name Mismatch</a></li>
   </ul>
 </div>
 
-<h3 id="web_site_certified_by_an_unknown_authority">Website Certified by an Unknown
-  Authority</h3>
+<h3 id="secure_connection_failed_page">Secure Connection Failed Page</h3>
 
-<p>Many websites use certificates to identify themselves when you visit the
-  site. If Certificate Manager doesn&apos;t recognize the
-  <a href="glossary.xhtml#certificate_authority"> certificate authority (CA)</a>
-  that issued a website&apos;s certificate, it displays an alert that allows
-  you to examine the new website certificate and decide what to do.</p>
+<p>In the case where you have disabled the SSL protocol (e.g. through
+  <a href="ssl_help.xhtml#ssl_settings">SSL Settings</a>) or the website that
+  you are accessing is using an older, insecure version of the SSL protocol then
+  you will be presented with a page titled &quot;Secure Connection Failed&quot;.
+  That page contains some basic background information (including the
+  <strong>Error code</strong> that uniquely identifies the type of problem
+  &brandShortName; detected with the website) and a <strong>Try Again</strong>
+  button that triggers a page reload.</p>
 
-<p>Use the buttons to perform the following actions:</p>
+<h3 id="untrusted_connection_page">Untrusted Connection Page</h3>
+
+<p>If SSL itself is enabled then the error page that you will be presented with
+  will be titled &quot;This Connection is Untrusted&quot;. There are many
+  different reasons why a connection can appear untrusted. Here are some of the
+  most common ones:</p>
+
 <ul>
-  <li><strong>View Certificate</strong>: Examine the website&apos;s
-    certificate.</li>
-  <li><strong>Cancel</strong>: Cancel the operation. Certificate Manager
-    will not recognize the certificate as legitimate identification and will not
-    connect to the website.</li>
-  <li><strong>OK</strong>: Accept the certificate and connect to the website.
-    Choose for how long the certificate should be accepted:
-    <ul>
-      <li><strong>Accept this certificate permanently</strong>: Certificate
-        Manager will recognize the certificate as legitimate identification
-        until the certificate expires.</li>
-      <li><strong>Accept this certificate temporarily for this session</strong>:
-        Certificate Manager will recognize the certificate as legitimate
-        identification only during your current &brandShortName; session. You
-        will see the alert again if you restart &brandShortName; and attempt to
-        visit the website.</li>
-    </ul>
-  </li>
+  <li>the certificate of the website is <a href="#certificate_expired">no longer
+    valid (expired)</a></li>
+  <li>the certificate of the website is
+    <a href="#certificate_not_yet_valid">not yet valid</a></li>
+  <li>the certificate of the website is only valid for another website
+    (<a href="#domain_name_mismatch">domain name mismatch</a>)</li>
+  <li>the certificate of the website is self-signed (thus the identity of the
+    website cannot be verified).</li>
+  <li>the issuer certificate is not trusted (&brandShortName; cannot
+    verify the identity of the website because it doesn&apos;t
+    recognize the <a href="glossary.xhtml#certificate_authority">certificate
+    authority (CA)</a> that issued the website&apos;s certificate)</li>
 </ul>
 
-<p><strong>Important note for server administrators</strong>: This alert may be
-  triggered by a server that is not configured correctly. To find out if this
-  is the case, the server administrator or webmaster for the site you are
-  attempting to visit should check the status of any required intermediate CAs
-  and if necessary, install the missing certificate in the server.</p>
+<p>The page displayed in the above cases is meant to help you understand why
+  &brandShortName; was unable to establish a secure connection to the website.
+  It starts by telling you that the website&apos;s identity could not be
+  verified, then offers you to leave the page by clicking the <strong>This
+  sounds bad, take me to my home page instead</strong> button. If you are unsure
+  what to do it is recommended that you follow this advice.</p>
 
-<p>If you decide to contact the website&apos;s webmaster about this issue, you
-  can include the following information:</p>
+<p>If you want to know a little bit more about the actual problem at hand you
+  may expand the corresponding section by clicking the chevron in front of
+  <strong>Technical Details</strong>. That section also contains the
+  <strong>Error code</strong> that uniquely identifies the type of problem
+  &brandShortName; detected with the website.</p>
+
+<h4 id="add_security_exception">Adding a Security Exception</h4>
 
-<ul>
-  <li>The server administrator can obtain more information about intermediate
-    CAs from here:
-    <a href="http://knowledge.verisign.com/search/solution.jsp?id=vs2119">What
-    is the purpose of the Intermediate CA certificate?</a></li>
-  <li>If the server is using a VeriSign certificate, the server administrator
-    can download the appropriate certificate from here:
-    <a href="http://www.verisign.com/support/ssl-certificates-support/install-ssl-certificate.html">SSL
-    Certificates Support</a></li>
-</ul>
+<p>The <strong>I Understand the Risks</strong> section of the Untrusted
+  Connection page allows you to tell &brandShortName; to explicitly override the
+  security checks for this website by adding an exception. If you expand the
+  section by clicking the chevron in front of it you will see an <strong>Add
+  Exception</strong> button that will take you to a dialog allowing you to get
+  and view the website&apos;s certificate and optionally add a Security
+  Exception for it (either permanently or just for the current session). Those
+  exceptions can be administered through the Certificate Manager&apos;s
+  <a href="certs_help.xhtml#servers">Servers</a> tab.</p>
 
-<p><strong>For advanced users</strong>: To ensure that Certificate Manager
-  trusts all certificates issued by a given CA, you can edit the trust
-  settings for the corresponding CA certificate. To do so, follow these
-  steps:</p>
+<h3 id="secure_connection_failed_dialog">Secure Connection Failed Dialog</h3>
 
-<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
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Click Manage Certificates.</li>
-  <li>Click the Authorities tab.</li>
-  <li>Select the CA certificate whose trust settings you want to edit.</li>
-  <li>Click the Edit button and select the appropriate trust settings.</li>
-</ol>
+<p>In cases where &brandShortName; cannot determine the actual cause of the
+  problem a dialog titled &quot;Secure Connection Failed&quot; is shown in
+  addition to the <a href="#untrusted_connection_page">Untrusted Connection
+  page</a>. That dialog includes a <strong>View Certificate</strong> button
+  that allows you to examine the website&apos;s certificate more closely.</p>
 
-<h3 id="server_certificate_expired">Server Certificate Expired</h3>
+<h3 id="certificate_expired">Certificate Expired</h3>
 
 <p>Like a credit card, a driver&apos;s license, and many other forms of
   identification, a <a href="glossary.xhtml#certificate">certificate</a> is
   valid for a specified period of time. When a certificate expires, the owner
   of the certificate needs to get a new one.</p>
 
-<p>Certificate Manager warns you when you attempt to visit a website whose
-  server certificate has expired. The first thing you should do is make sure
-  the time and date displayed by your computer is correct. If your
-  computer&apos;s clock is set to a date that is after the expiration date,
-  Certificate Manager treats the website&apos;s certificate as expired.</p>
+<p>&brandShortName; <a href="#untrusted_connection_page">warns</a> you when you
+  attempt to visit a website whose server certificate has expired. The first
+  thing you should do is make sure the time and date displayed by your computer
+  is correct. If your computer&apos;s clock is set to a date that is after the
+  expiration date, &brandShortName; treats the website&apos;s certificate as
+  expired.</p>
 
 <p>If your computer&apos;s clock is set correctly, you need to make a decision
-  about whether to trust the site. This decision depends on what you intend to
-  do at the site and what else you know about it. Most commercial sites will
-  make sure that they replace their certificates before they expire.</p>
-
-<p>You can take these actions from the Expired Server Certificate dialog
-  box:</p>
+  about whether to trust the website. This decision depends on what you intend
+  to do at the website and what else you know about it. Most commercial sites
+  will make sure that they replace their certificates before they expire. If you
+  choose to continue you need to <a href="#add_security_exception">add a
+  security exception</a>.</p>
 
-<ul>
-  <li><strong>View Certificate</strong>: To examine information about the
-    certificate, including its validity period, click View Certificate.</li>
-  <li><strong>Continue</strong>: If you have reason to believe the
-    certificate&apos;s expiration is an inadvertent error, you may choose to
-    click Continue to accept the certificate anyway for this session, and let
-    the webmaster for the site know about the problem.
-
-    <p>Be cautious about any actions you take while you are visiting the
-      site.</p>
-  </li>
-  <li><strong>Cancel</strong>: If you suspect that there may be a significant
-    problem and you don&apos;t want to risk visiting the site at all, click
-    Cancel (in which case Certificate Manager will not connect you to the
-    site).</li>
-</ul>
-
-<h3 id="server_certificate_not_yet_valid">Server Certificate Not Yet Valid</h3>
+<h3 id="certificate_not_yet_valid">Certificate Not Yet Valid</h3>
 
 <p>Like a credit card, a driver&apos;s license, and many other forms of
   identification, a <a href="glossary.xhtml#certificate">certificate</a> is
   valid for a specified period of time.</p>
 
-<p>Certificate Manager warns you when you attempt to visit a website whose
-  server certificate&apos;s validity period has not yet started. The first
-  thing you should do is make sure the time and date displayed by your own
-  computer is correct. If your computer&apos;s clock is set to the wrong date,
-  Certificate Manager may treat the server certificate as not yet valid even
-  if this is not the case.</p>
+<p>&brandShortName; <a href="#untrusted_connection_page">warns</a> you when you
+  attempt to visit a website whose server certificate&apos;s validity period has
+  not yet started. The first thing you should do is make sure the time and date
+  displayed by your own computer is correct. If your computer&apos;s clock is
+  set to the wrong date, &brandShortName; may treat the server certificate as
+  not yet valid even if this is not the case.</p>
 
 <p>If your computer&apos;s clock is set correctly, you need to make a decision
-  about whether to trust the site. This decision depends on what you intend to
-  do at the site and what else you know about it. Most commercial sites will
-  make sure that the validity period for their certificates has begun before
-  beginning to use them.</p>
-
-<p>You can take these actions from the Server Certificate Not Yet Valid dialog
-  box:</p>
-
-<ul>
-  <li><strong>View Certificate</strong>: To examine information about the
-    certificate, including its validity period, click View Certificate.</li>
-  <li><strong>OK</strong>: If you have reason to believe the problem is an
-    inadvertent error, you may choose to click OK to accept the certificate
-    anyway for this session, and let the webmaster for the site know about the
-    problem.
-
-    <p>Be cautious about any actions you take while you are visiting the
-      site.</p>
-  </li>
-  <li><strong>Cancel</strong>: If you suspect that there may be a significant
-    problem and you don&apos;t want to risk visiting the site at all, click
-    Cancel (in which case Certificate Manager will not connect you to the
-    site).</li>
-</ul>
+  about whether to trust the website. This decision depends on what you intend
+  to do at the website and what else you know about it. Most commercial sites
+  will make sure that the validity period for their certificates has begun
+  before beginning to use them. If you choose to continue you need to
+  <a href="#add_security_exception">add a security exception</a>.</p>
 
 <h3 id="domain_name_mismatch">Domain Name Mismatch</h3>
 
 <p>A server <a href="glossary.xhtml#certificate">certificate</a> specifies the
-  name of the server in the form of the site&apos;s domain name. For example,
+  name of the server in the form of the website&apos;s domain name. For example,
   the domain name for the Mozilla website is <tt>www.mozilla.org</tt>. If the
   domain name in a server&apos;s certificate doesn&apos;t match the actual
   domain name of the website, it may be a sign that someone is attempting to
   intercept your communication with the website.</p>
 
-<p>The decision whether to trust the site anyway depends on what you intend to
-  do at the site and what else you know about it. Most commercial sites will
-  make sure that the host name for a website certificate matches
-  the website&apos;s actual host name.</p>
-
-<p>You can take these actions from the Domain Name Mismatch dialog box:</p>
-
-<ul>
-  <li><strong>View Certificate</strong>: To examine information about the
-    certificate, click View Certificate.</li>
-  <li><strong>OK</strong>: If you have reason to believe the problem is an
-    inadvertent error, you may choose to click OK to accept the certificate
-    anyway for this session, and let the webmaster for the site know about
-    the problem.
+<p>&brandShortName; <a href="#untrusted_connection_page">warns</a> you when you
+  attempt to visit a website whose server certificate&apos;s domain does not
+  match the domain of the website you are trying to visit. The decision whether
+  to trust the website anyway depends on what you intend to do at the site and
+  what else you know about it. Most commercial sites will make sure that the
+  host name for a website certificate matches the website&apos;s actual host
+  name. If you choose to continue you need to
+  <a href="#add_security_exception">add a security exception</a>.</p>
 
-    <p>Be cautious about any actions you take while you are visiting the site,
-      and treat any information you find there as potentially suspect.</p>
-  </li>
-  <li><strong>Cancel</strong>: If you suspect that there may be a significant
-    problem and you don&apos;t want to risk visiting the site at all, click
-    Cancel (in which case Certificate Manager will not connect you to the
-    site).</li>
-</ul>
-
-<p>If you decide to accept the certificate anyway for this session, you should
-  be cautious about what you do on the website, and you should treat any
-  information you find there as potentially suspect.</p>
-
-<p>&copyright.string;</p>
+<p>If you decide to accept the certificate anyway (either for this session or
+  permanently), you should be cautious about what you do on the website, and you
+  should treat any information you find there as potentially suspect.</p>
 
 </body>
 </html>
--- a/suite/chrome/common/help/certs_help.xhtml
+++ b/suite/chrome/common/help/certs_help.xhtml
@@ -37,73 +37,61 @@
     subcategories are visible, double-click Privacy &amp; Security to expand
     the list.)</li>
   <li>Click Manage Certificates.</li>
 </ol>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#your_certificates">Your Certificates</a></li>
-    <li><a href="#other_peoples_certificates">Other People&apos;s
-      Certificates</a></li>
-    <li><a href="#web_site_certificates">Website Certificates</a></li>
+    <li><a href="#people">People</a></li>
+    <li><a href="#servers">Servers</a></li>
     <li><a href="#authorities">Authorities</a></li>
+    <li><a href="#others">Others</a></li>
   </ul>
 </div>
 
 <h2 id="your_certificates">Your Certificates</h2>
 
 <p>The Your Certificates tab in the <a href="#certificate_manager">Certificate
   Manager</a> displays the certificates on file that identify you. Your
   certificates are listed under the names of the organizations that issued
-  them:</p>
+  them. If you can&apos;t see certificate names under an organization&apos;s
+  name, double-click the name to expand it.</p>
 
-<ul>
-  <li>If you can&apos;t see certificate names under an organization&apos;s
-    name, double-click the name.</li>
-  <li>To select a certificate, click its name.</li>
-  <li>To select more than one certificate, hold down the Control key and click
-    their names.</li>
-</ul>
-
-<p>To perform the following actions, select one or more certificates and click
-  one of the following buttons:</p>
+<p>Use the following buttons to view and manage your certificates (most actions
+  require one or more certificates to be selected):</p>
 
 <ul>
   <li><strong>View</strong>: Display detailed information about the selected
     certificates.</li>
   <li><strong>Backup</strong>: Initiate the process of saving the selected
     certificates. A window appears that allows you to choose a password to
     protect the backup. You can then save the backup in a directory of your
     choice.</li>
-  <li><strong>Delete</strong>: Delete the selected certificates.</li>
-</ul>
-
-<p>These actions do not require a certificate to be selected:</p>
-
-<ul>
-  <li><strong>Import</strong>: Import a file containing one or more
-    certificates that were previously backed up. When you click Import,
-    Certificate Manager first asks you to locate the file that contains the
-    backup. The names of certificate backup files typically end in
-    <tt>.p12</tt>; for example, <tt>MyCert.p12</tt>. After you select the file
-    to be imported, Certificate Manager asks you to enter the password that you
-    set when you backed up the certificate.</li>
   <li><strong>Backup All</strong>: Initiate the process of saving all the
     certificates stored in the
     <a href="glossary.xhtml#software_security_device">Software Security
     Device</a>.
 
     <p><strong>Note</strong>: Certificates on smart cards cannot be backed up.
       Whether you select some of your certificates and click Backup, or click
       Backup All, the resulting backup file will not include any certificates
       stored on smart cards or other external security devices. You can only
       back up certificates that are stored on the built-in Software Security
       Device.</p>
   </li>
+  <li><strong>Import</strong>: Import a file containing one or more
+    certificates that were previously backed up. When you click Import,
+    Certificate Manager first asks you to locate the file that contains the
+    backup. The names of certificate backup files typically end in
+    <tt>.p12</tt>; for example, <tt>MyCert.p12</tt>. After you select the file
+    to be imported, Certificate Manager asks you to enter the password that you
+    set when you backed up the certificate.</li>
+  <li><strong>Delete</strong>: Delete the selected certificates.</li>
 </ul>
 
 <h3 id="choose_a_certificate_backup_password">Choose a Certificate Backup
   Password</h3>
 
 <p>A certificate backup password protects one or more certificates that you are
   backing up from the <a href="#your_certificates">Your Certificates</a> tab in
   the Certificate Manager.</p>
@@ -145,92 +133,92 @@
 <h3 id="delete_your_certificates">Delete Your Certificates</h3>
 
 <p>Before deleting one of your own expired certificates from the
   <a href="#your_certificates">Your Certificates</a> tab in the Certificate
   Manager, make sure you won&apos;t need it again some day for reading old
   email messages that you may have encrypted with the corresponding private
   key.</p>
 
-<h2 id="other_peoples_certificates">Other People&apos;s Certificates</h2>
+<h2 id="people">People</h2>
 
-<p>The Other People&apos;s tab in the <a href="#certificate_manager">Certificate
-  Manager</a> displays email certificates you have on file that identify other
-  people.</p>
+<p>The People tab in the <a href="#certificate_manager">Certificate Manager</a>
+  displays email certificates you have on file that identify other people.</p>
 
 <p>When people send you digitally signed email messages, Certificate Manager
   imports their certificates automatically. You can use these certificates to
   send encrypted messages to those people.</p>
 
-<p>Other people&apos;s certificates are listed under the names of the
-  organizations that issued them:</p>
+<p>Certificates that identify people are listed under the names of the
+  organizations that issued them. If you can&apos;t see certificate names under
+  an organization&apos;s name, double-click the name to expand it.</p>
 
-<ul>
-  <li>If you can&apos;t see certificate names under an organization&apos;s
-    name, double-click the name.</li>
-  <li>To select a certificate, click its name.</li>
-  <li>To select more than one certificate, hold down the Control key and click
-    their names.</li>
-</ul>
-
-<p>To perform the following actions, select one or more certificates and click
-  one of the following buttons:</p>
+<p>Use the following buttons to view and manage your certificates (most actions
+  require one or more certificates to be selected):</p>
 
 <ul>
   <li><strong>View</strong>: Display detailed information about the selected
     certificates.</li>
+  <li><strong>Edit</strong>: View or change the trust settings that Certificate
+    Manager associates with the selected certificates. You can use these
+    settings to designate an email certificate as one that you trust or
+    don&apos;t trust for identification purposes.</li>
+  <li><strong>Import</strong>: Import a file containing one or more
+    certificates. When you click Import, Certificate Manager first asks you
+    to locate the file that contains the certificate(s).</li>
+  <li><strong>Export</strong>: Export the selected certificates. You can
+    choose among various formats.</li>
   <li><strong>Delete</strong>: Delete the selected certificates.</li>
 </ul>
 
 <h3 id="delete_email_certificates">Delete Email Certificates</h3>
 
 <p>Before deleting someone else&apos;s certificate from the
-  <a href="#other_peoples_certificates">Other People&apos;s</a> tab in the
-  Certificate Manager, make sure you won&apos;t need it again some day to send
-  encrypted email to that person or to verify digital signatures on messages
-  from that person.</p>
+  <a href="#people">People</a> tab in the Certificate Manager, make sure you
+  won&apos;t need it again some day to send encrypted email to that person or
+  to verify digital signatures on messages from that person.</p>
 
-<h2 id="web_site_certificates">Website Certificates</h2>
-
-<p>The Websites tab in the Certificate Manager displays certificates you have
-  on file that identify websites.</p>
+<h2 id="servers">Servers</h2>
 
-<p>Website certificates are grouped under the names of the organizations that
-  issued them:</p>
+<p>The Servers tab in the Certificate Manager displays certificates you have
+  on file that identify servers (websites, mail servers).</p>
 
-<ul>
-  <li>If you can&apos;t see certificate names under an organization&apos;s
-    name, double-click the name.</li>
-  <li>To select a certificate, click its name.</li>
-  <li>To select more than one certificate, hold down the Control key and click
-    their names.</li>
-</ul>
+<p>Certificates that identify servers are grouped under the names of the
+  organizations that issued them. If you can&apos;t see certificate names under
+  an organization&apos;s name, double-click the name to expand it.</p>
 
-<p>To perform the following actions, select one or more certificates and click
-  one of the following buttons:</p>
+<p>Use the following buttons to view and manage your certificates (most actions
+  require one or more certificates to be selected):</p>
 
 <ul>
   <li><strong>View</strong>: Display detailed information about the selected
     certificates.</li>
   <li><strong>Edit</strong>: View or change the trust settings that Certificate
     Manager associates with the selected certificates. You can use these
     settings to designate a website certificate as one that you trust or
     don&apos;t trust for identification purposes.</li>
+  <li><strong>Import</strong>: Import a file containing one or more
+    certificates. When you click Import, Certificate Manager first asks you
+    to locate the file that contains the certificate(s).</li>
+  <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 Website Certificate
+<h3 id="edit_web_site_certificate_trust_settings">Edit Web Site Certificate
   Trust Settings</h3>
 
 <p>When you select a website certificate from the
-  <a href="#web_site_certificates">Websites</a> tab in the Certificate Manager
-  and click Edit, 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>
+  <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>.
+  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
     <a href="glossary.xhtml#certificate_authority">certificate authority</a>
     that issued this certificate.</li>
@@ -257,62 +245,60 @@
     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>
 
-<p>Before deleting a website certificate from the
-  <a href="#web_site_certificates">Websites</a> tab in the Certificate
-  Manager, make sure that you won&apos;t need it again for the purposes of
-  identifying a website and setting up an encrypted connection.</p>
+<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>
 
 <p>The Authorities tab in the <a href="#certificate_manager">Certificate
   Manager</a> displays the certificates you have on file that identify
   <a href="glossary.xhtml#certificate_authority">certificate authorities
   (CAs)</a>.</p>
 
 <p>CA certificates are grouped under the names of the organizations that issued
-  them:</p>
+  them. If you can&apos;t see certificate names under an organization&apos;s
+  name, double-click the name to expand it.</p>
 
-<ul>
-  <li>If you can&apos;t see CA certificate names under an organization&apos;s
-    name, double-click the name.</li>
-  <li>To select a CA certificate, click its name.</li>
-  <li>To select more than one CA certificate, hold down the Control key and
-    click their names.</li>
-</ul>
-
-<p>To perform these actions, select the certificates on which you want to act
-  and click one of these buttons:</p>
+<p>Use the following buttons to view and manage your certificates (most actions
+  require one or more certificates to be selected):</p>
 
 <ul>
   <li><strong>View</strong>: Display detailed information about the selected
     certificates.</li>
   <li><strong>Edit</strong>: View or change the settings that Certificate
     Manager associates with the selected certificates. You can use these
     settings to designate what kinds of certificates, if any, you trust that
     are issued by the corresponding CAs.</li>
+  <li><strong>Import</strong>: Import a file containing one or more
+    certificates. When you click Import, Certificate Manager first asks you
+    to locate the file that contains the certificate(s).</li>
+  <li><strong>Export</strong>: Export the selected certificates. You can
+    choose among various formats.</li>
   <li><strong>Delete</strong>: Delete the selected certificates.</li>
 </ul>
 
 <p>To ensure that an entire
   <a href="glossary.xhtml#certificate_chain">certificate chain</a> of CAs are
   all trusted, you need to edit the root CA certifiate only.</p>
 
 <p>To import the chain, you click a link on a web page provided by the CA. You
   can then use the authorities tab to locate the root certificate and edit its
   trust settings.</p>
 
 <p>The root and intermediate CAs all appear under the same organization. The
-  root certificate is the one that lists itself as the the issuer.</p>
+  root certificate is the one that lists itself as the issuer.</p>
 
 <p><strong>If you download an intermediate CA</strong>: If you download an
   intermediate CA certificate that chains to a root certificate already marked
   as trusted in your browser, you don&apos;t have to indicate what purposes you
   trust it for. Intermediate certificates automatically inherit the trust
   settings of their roots.</p>
 
 <h3 id="edit_ca_certificate_trust_settings">Edit CA Certificate Trust
@@ -350,16 +336,36 @@
 
 <p>Before deleting a CA certificate from the
   <a href="#authorities">Authorities</a> tab in the Certificate Manager,
   make sure that you won&apos;t need it again to validate certificates issued
   by that CA. If you delete the only valid certificate you have for a CA,
   Certificate Manager will no longer trust any certificates issued by that
   CA.</p>
 
+<h2 id="others">Others</h2>
+
+<p>The Others tab in the Certificate Manager displays certificates you have
+  on file that do not fit in any of the other categories, i.e. certificates
+  that neither belong to you, other people, servers or CAs.</p>
+
+<p>Other certificates are grouped under the names of the organizations that
+  issued them. If you can&apos;t see certificate names under an
+  organization&apos;s name, double-click the name to expand it.</p>
+
+<p>Use the following buttons to view and manage your certificates:</p>
+
+<ul>
+  <li><strong>View</strong>: Display detailed information about the selected
+    certificates.</li>
+  <li><strong>Export</strong>: Export the selected certificates. You can
+    choose among various formats.</li>
+  <li><strong>Delete</strong>: Delete the selected certificates.</li>
+</ul>
+
 <h2 id="device_manager">Device Manager</h2>
 
 <p>This section describes the options available in the Device Manager window.
   For background information and step-by-step instructions on the use of the
   Device Manager, see
   <a href="using_certs_help.xhtml#managing_smart_cards_and_other_security_devices">Managing
   Smart Cards and Other Security Devices</a>.</p>
 
@@ -404,12 +410,10 @@
     module, both the module and its security devices are no longer available
     for use by the browser.</li>
   <li><strong>Enable FIPS</strong>: Turns the FIPS mode on and off. For more
     information, see
     <a href="using_certs_help.xhtml#enable_fips_mode">Enable FIPS
     Mode</a>.</li>
 </ul>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/certs_prefs_help.xhtml
+++ b/suite/chrome/common/help/certs_prefs_help.xhtml
@@ -51,18 +51,17 @@
 <h3 id="client_certificate_selection">Client Certificate Selection</h3>
 
 <p>Some websites require you to identify yourself with a certificate. The
   option you select here determines how the browser identifies the certificate
   to present among those you may have on file:</p>
 
 <ul>
   <li><strong>Select Automatically:</strong> Click this option if you want
-    the browser to select a certificate without asking you. This is the default
-    setting.</li>
+    the browser to select a certificate without asking you.</li>
   <li><strong>Ask Every Time:</strong> Click this option if you want the browser
     to ask you which certificate to use each time a website requests one.</li>
 </ul>
 
 <h3 id="manage_certificates">Manage Certificates</h3>
 
 <p>Certificates are the digital equivalent of ID cards&mdash;they help other
   people identify you, and they help you identify other people, websites, and
@@ -76,13 +75,10 @@
 <p>A security device is a hardware or software device that stores your
   certificates and keys. For example, a smart card is a security device. Your
   browser has its own built-in software security device, and you can use
   additional security devices, such as smart cards, at the same time.</p>
 
 <p>To examine or configure your security devices, click Manage Security
   Devices.</p>
 
-
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/composer_help.xhtml
+++ b/suite/chrome/common/help/composer_help.xhtml
@@ -31,17 +31,17 @@
 
 <ul>
   <li>Click the Composer icon in the lower-left corner of any
     &brandShortName; window.</li>
 </ul>
 
 <div><img src="images/composer_icon.png" width="128" height="23"
   alt="" /></div>
-<div style="margin-left: 80px;"><strong>Composer icon</strong></div>
+<div style="-moz-margin-start: 80px;"><strong>Composer icon</strong></div>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#starting_a_new_page">Starting a New Page</a></li>
     <li><a href="#formatting_your_web_pages">Formatting Your Web Pages</a></li>
     <li><a href="#adding_tables_to_your_web_page">Adding Tables to Your Web
       Page</a></li>
     <li><a href="#adding_images_to_your_web_page">Adding Pictures (Images) to
@@ -395,24 +395,20 @@
 <ol>
   <li>Select the text you want to format.</li>
   <li>Open the Format menu and choose one of the following:
     <ul>
       <li><strong>Font</strong>: Use this to choose a font. If you prefer to
         use fonts specified by the reader&apos;s browser, select Variable
         Width or Fixed Width.
 
-        <p><strong>Note</strong>: Not all fonts installed on your computer
-          appear. Instead of specifying a font that may not be available to all
-          who view your web page, it&apos;s generally best to select one of the
-          fonts provided in the menu since these fonts work on every computer.
-          For example, the fonts Helvetica, Arial, Times, and Courier generally
-          look the same when viewed on different computers. If you select a
-          different font, it may not look the same when viewed using a
-          different computer.</p>
+        <p><strong>Note</strong>: The fonts Helvetica, Arial, Times, and
+          Courier generally look the same when viewed on different computers.
+          If you select a different font, it may not look the same when viewed
+          using a different computer.</p>
       </li>
       <li><strong>Size</strong>: Use this to choose a <em>relative</em> font
         size or select an option to increase or decrease text size (relative
         to the surrounding text).</li>
       <li><strong>Text Style</strong>: Use this to select a style, such as
         italic, bold, or underline, or to apply a structured style, for
         example, Code.</li>
       <li><strong>Text Color</strong>: Use this to choose a color from the
@@ -713,19 +709,19 @@
 <p><strong>Note</strong>: You must be connected to the Internet to use this
   feature.</p>
 
 <p>To validate your document&apos;s HTML syntax:</p>
 
 <ol>
   <li>Open the Tools menu, and choose Validate HTML. If you have unsaved
     changes, Composer asks you to save them before proceeding.</li>
-  <li>When the W3C HTML Validation Service page appears, click Browse and
-    locate the file on your hard disk that you want to validate.</li>
-  <li>Click <q>Validate this document</q>.</li>
+  <li>When the W3C HTML Validation Service page appears, click <q>Browse</q>
+    and locate the file on your hard disk that you want to validate.</li>
+  <li>Click <q>Check</q>.</li>
 </ol>
 
 <p>[<a href="#formatting_your_web_pages">Return to beginning of
   section</a>]</p>
 
 <h2 id="choosing_the_right_editing_mode">Choosing the Right Editing Mode</h2>
 
 <p>Typically, you won&apos;t need to change the editing mode from the default
@@ -859,17 +855,17 @@
         the page. Choose an option from the drop-down list.</li>
       <li><strong>Caption</strong>: Choose the caption placement from the
         drop-down list.</li>
       <li><strong>Background Color</strong>: Use this to choose a color for
         the table background, or leave it as transparent.</li>
     </ul>
   </li>
   <li>To apply additional attributes or JavaScript events, click Advanced Edit
-    to display the <a href="#formatting_paragraphs_headings_and_lists">Advanced
+    to display the <a href="#using_the_advanced_property_editor">Advanced
     Property Editor</a>.
   </li>
   <li>Click Apply to preview your changes without closing the dialog box, or
     click OK to confirm them.</li>
 </ol>
 
 <p>To view, change, or add properties for one or more cells:</p>
 
@@ -983,29 +979,29 @@
   the table&apos;s original rectangular layout, or structure. Otherwise,
   deleting cells can result in a table with empty spaces, or whose outline
   appears irregular due to an uneven number of cells.</p>
 
 <p>To change the default table editing behavior, begin from the Composer
   window:</p>
 
 <ol>
-  <li>Open the Edit menu, choose Preferences, and then choose Composer.</li>
-  <li>Under Table Editing, set the following preference:
+  <li>Open the <span class="mac">&brandShortName;</span>
+    <span class="noMac">Edit</span> menu, choose Preferences, and then choose
+    Composer.</li>
+  <li>Under Editing, set the following preference:
     <ul>
       <li>Make sure that <q>Maintain table layout when inserting or
         deleting cells</q> is checked to ensure that you don&apos;t get an
         irregularly shaped table.</li>
     </ul>
   </li>
-  <li>Click OK.</li>
+  <li class="win">Click OK.</li>
 </ol>
 
-<p>See also <a href="#composer">Setting General Composer Preferences</a>.</p>
-
 <p>[<a href="#adding_tables_to_your_web_page">Return to beginning of
   section</a>]</p>
 
 <h2 id="selecting_table_elements">Selecting Table Elements</h2>
 
 <p>You can use one of two ways to quickly select a table, cell, or group of
   cells:</p>
 
@@ -1513,19 +1509,26 @@
     within the page</a>, or to a
     <a href="#creating_links_to_other_pages">separate local or remote page</a>.
   </li>
 </ol>
 
 <p><strong>Tip</strong>: Drag and drop a linked image from the browser window
   into a Composer window to copy both the image and the link.</p>
 
-<p><strong>Note</strong>: To remove the blue border on images used as links,
-  open the Link Properties dialog box, click the Link tab, and uncheck <q>Show
-  border around linked image</q>.</p>
+<p><strong>Note</strong>: To remove the blue border that can appear around
+  images used as links:</p>
+
+<ol>
+  <li>Select the linked image.</li>
+  <li>Open the Format menu and choose Image and Link Properties.</li>
+  <li>In the dialog box, select the Link tab.</li>
+  <li>Uncheck <q>Show border around linked image</q>.</li>
+  <li>Click OK.</li>
+</ol>
 
 <p>[<a href="#creating_links_in_composer">Return to beginning of
   section</a>]</p>
 
 <h2 id="removing_or_discontinuing_links">Removing or Discontinuing Links</h2>
 
 <p>To remove a link:</p>
 
@@ -2069,19 +2072,16 @@
   <ul>
     <li>Verify that you entered the correct user name and password in the
       Publishing Site Settings dialog box, or in the Publish tab of the
       Publish dialog box.</li>
     <li>Contact your ISP to find out where you can publish your pages at their
       site.</li>
     <li>Find a web hosting service that you can use to publish your pages. In
       the browser, search for <q>web hosting</q>.</li>
-    <li>Use Netscape My Webpage <a href="http://mywebpage.netscape.com/">
-      <tt>http://mywebpage.netscape.com/</tt></a> to host your web pages, up
-      to 20 megabytes for free.</li>
   </ul>
 </div>
 
 <div class="errorMessage">
   <p id="offline_error"><strong>Error Message</strong>:</p>
 
   <div class="contentsBox" style="background-color: #ebebeb;">
     <tt>You are currently offline. Click the icon near the lower-right corner
@@ -2485,12 +2485,10 @@
 <p>To change the author name for an individual page: Open the Format menu and
   choose Page Title and Properties.</p>
 
 <p>To change the page colors and background image for an individual page: Open
   the Format menu and choose Page Colors and Background.</p>
 
 <p>[<a href="#composer_preferences">Return to beginning of section</a>]</p>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -31,17 +31,16 @@
     <li><a href="#scripts_and_plugins">Scripts &amp; Plugins</a></li>
     <li><a href="#keyboard_navigation">Keyboard Navigation</a></li>
     <li><a href="#cache">Cache</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>
-    <li class="win"><a href="#system">System</a></li>
   </ul>
 </div>
 
 <h2 id="advanced">Advanced Preferences - Advanced</h2>
 
 <p>This section describes how to use the main Advanced preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
 
@@ -78,23 +77,20 @@
   <li>Under the Advanced category, click Scripts &amp; Plugins. (If no
     subcategories are visible, double-click Advanced to expand the list.)</li>
 </ol>
 
 <p>The Scripts &amp; Plugins preferences panel allows you to control how
   JavaScript and plugins are used:</p>
 
 <ul>
-  <li><strong>Enable JavaScript for</strong>: Select these checkboxes to turn
-    JavaScript on:
+  <li><strong>Enable JavaScript for</strong>:
     <ul>
-      <li><strong>Browser</strong>: Toggles JavaScript for web pages opened
-        in the browser.</li>
-      <li><strong>Mail &amp; Newsgroups</strong>: Toggles JavaScript for web
-        pages opened in Mail &amp; Newsgroups.</li>
+      <li><strong>Browser</strong>: Select this to turn on JavaScript for web
+        pages opened in the browser.</li>
     </ul>
   </li>
   <li><strong>Allow scripts to</strong>: Select these checkboxes to control
     how JavaScript can be used:
     <ul>
       <li><strong>Move or resize existing windows</strong>: Allows open windows
         to be resized or moved.</li>
       <li><strong>Raise or lower windows</strong>: Allows windows to be placed
@@ -114,16 +110,27 @@
   </li>
   <li><strong>Enable Plugins for</strong>: Check this checkbox to control how
     plugins are used:
     <ul>
       <li><strong>Mail &amp; Newsgroups</strong>: Allows plugins to be used in
         Mail &amp; Newsgroups.</li>
     </ul>
   </li>
+  <li><strong>When additional plugins are required</strong>: Check this
+    checkbox if you want to be informed whenever a website requires additional
+    plugins:
+    <ul>
+      <li><strong>Display a notification bar at the top of the content
+        area</strong>: When a website requires a plugin which is not installed,
+        a notification bar will be displayed above the website content area.
+        From the bar you will be able to download and install the missing
+        plugin.</li>
+    </ul>
+  </li>
 </ul>
 
 <p>For more information about plugins, see
   <a href="nav_help.xhtml#plugins_and_downloads">Plugins and Downloads</a>.
 </p>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
@@ -278,18 +285,18 @@
 
 <h3 id="advanced_proxy_preferences">Advanced Proxy Preferences</h3>
 
 <p>If you want to use different proxies for different protocols or need to use
   a SOCKS proxy:</p>
 
 <ul>
   <li><strong>HTTP Proxy</strong>, <strong>SSL Proxy</strong>,
-    <strong>FTP Proxy</strong>, <strong>Gopher Proxy</strong>: Enter the name
-    or numeric IP address of the proxy server. Type the port in the Port fields.
+    <strong>FTP Proxy</strong>: Enter the name or numeric IP address 
+    of the proxy server. Type the port in the Port fields.
 
     <p><strong>Note</strong>: If you&apos;re using the same settings
       for all types of proxies, click on <q>Use HTTP Proxy settings
       for all protocols</q>.</p>
 
   </li>
   <li><strong>SOCKS Proxy</strong>: Enter the name or numeric IP address
     of the proxy server. Enter the port number in the Port field. 
@@ -358,49 +365,77 @@
   <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 software
   installation and update notification:</p>
 
 <ul>
-  <li><strong>Allow web sites to install extensions and updates</strong>:
-    Select this if you want to allow web sites to install extensions and
+  <li><strong>Allow websites to install extensions and updates</strong>:
+    Select this if you want to allow websites to install extensions and
     updates to be used with &brandShortName;. You will be prompted before each
     installation.</li>
-  <li><strong>Allowed Sites</strong>: Click this to open the Allowed Sites
-    dialog box, where you can view and edit the list of web sites that you
+  <li><strong>Allowed Websites</strong>: Click this to open the Allowed Websites
+    dialog box, where you can view and edit the list of websites that you
     want to allow to install software:
     <ul>
-      <li><strong>Allow</strong>: Click this to add a typed web site to the
-        list of allowed sites.</li>
-      <li><strong>Remove Site</strong>: Click this to remove a selected web
-        site.</li>
-      <li><strong>Remove All Sites</strong>: Click this to remove all of the
-        web sites in the current list.</li>
+      <li><strong>Allow</strong>: Click this to add a typed website to the
+        list of allowed websites.</li>
+      <li><strong>Remove Website</strong>: Click this to remove a selected
+        website.</li>
+      <li><strong>Remove All Websites</strong>: Click this to remove all of the
+        websites in the current list.</li>
     </ul>
   </li>
   <li><strong>Automatically check for updates to</strong>:
     <ul>
       <li><strong>&brandShortName;</strong>: Select this to be notified when
         new versions of &brandShortName; are available. Your personal
         information is not shared when verifying your version of
         &brandShortName;. Choose whether you want &brandShortName; to do a
         <strong>daily</strong> or a <strong>weekly</strong> check for new
         versions.</li>
-      <li><strong>Installed add-ons</strong>: Select this to be notified when a
+      <li><strong>Installed Add-ons</strong>: Select this to be notified when a
         new version of one of your installed add-ons is available. Choose
         whether you want &brandShortName; to do a <strong>daily</strong> or a
         <strong>weekly</strong> check for new versions.</li>
     </ul>
   </li>
   <li><strong>Add-on Manager</strong>: Click this to open the
     Add-on Manager, where you can view and manage all your installed
     extensions and themes.</li>
+  <li><strong>When updates to &brandShortName; are found</strong>:
+    <ul>
+      <li><strong>Ask me what I want to do</strong>: Select this to be notified
+        when new versions of &brandShortName; are available.</li>
+      <li><strong>Automatically download and install the update</strong>: Select
+        this if you want &brandShortName; to automatically download and install
+        updates for you when they become available. The download will happen in
+        the background, with low priority. After the download has finished the
+        update will be installed automatically the next time you start
+        &brandShortName;.</li>
+      <li><strong>Warn me if this will disable any of my add-ons</strong>:
+        Select this to be notified if an automatic update will disable any of
+        your installed add-ons. In that case you will be shown a list of
+        incompatible add-ons and you can choose whether you want to download and
+        install the update or not.</li>
+    </ul>
+
+    <p><strong>Note</strong>: You can use Check for Updates from the Help menu
+      to manually initiate the search for a &brandShortName; update. The label
+      of the menu item will change when an update is being downloaded or ready
+      to be applied.</p>
+  </li>
+  <li><strong>Show Update History</strong>: Click this to open the Update
+    History dialog box which shows a list of &brandShortName; updates that have
+    been installed, including the update type (e.g. Security Update), time of
+    installation and installation status. The Details link next to each update
+    takes you to a web page that contains further information regarding the
+    update.</li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="mouse_wheel">Advanced Preferences - Mouse Wheel</h2>
 
 <p>This section describes how to use the Mouse Wheel preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
@@ -427,17 +462,19 @@
     
     <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.</li>
+            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>Move back and forward in the browsing history</strong>:
         Choose this to use the mouse wheel to navigate back or forward to
@@ -489,52 +526,10 @@
         (in milliseconds) between the flashes.</li>
       <li><strong>Invert Color</strong>: Check this option to paint the
         selected element with the inverted border color. This will cause the
         whole element&mdash;including its border&mdash;to flash.</li>
     </ul>
   </li>
 </ul>
 
-<p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
-
-<div class="win">
-
-  <h2 id="system">Advanced Preferences - System</h2>
-
-    <p>This section describes how to use the System preferences panel. If
-      you&apos;re not already viewing it, follow these steps:</p>
-
-    <ol>
-      <li>Open the Edit menu and choose Preferences.</li>
-      <li>Under the Advanced category, click System. (If no subcategories are
-        visible, double-click Advanced to expand the list.)</li>
-    </ol>
-
-    <p>The System preferences panel allows you to specify what files and
-      protocols are opened using &brandShortName;:</p>
-
-    <ul>
-      <li><strong>Windows should use &brandShortName; to open these file
-        types</strong>: Select the file types that you want to open by default
-        using &brandShortName;.</li>
-      <li><strong>Windows should use &brandShortName; to handle these
-        protocols</strong>: Select the protocols that you want to open by
-        default using &brandShortName;.</li>
-      <li><strong>Alert me if other applications change these
-        settings</strong>: Select this if you want &brandShortName; to alert
-        you when other applications have changed your default &brandShortName;
-        file and protocol settings.</li>
-    </ul>
-
-    <p><strong>Tip</strong>: To make &brandShortName; the default browser
-      easily, see <a href="cs_nav_prefs_navigator.xhtml#navigator">Browser
-      Preferences - Browser</a>. Also select <q>Alert me if other application
-      change these settings</q> to know when other programs become the default
-      programs instead of &brandShortName;.</p>
-
-  <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
-</div>
-
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -50,17 +50,17 @@
   options and customize the user interface:</p>
 
 <ul>
   <li><strong>When &brandShortName; starts up, open</strong>: Select the
     components you want to use when you start up &brandShortName;</li>
   <li>Show toolbars as: 
     <ul>
       <li><strong>Pictures and text</strong>: Select this to see text
-        underneath each of the toolbar buttons..</li>
+        underneath each of the toolbar buttons.</li>
       <li><strong>Pictures only</strong>: Select this to show the toolbar
         buttons only.</li>
       <li><strong>Text only</strong>: Select this to show text buttons
         only.</li>
     </ul>
   </li>
   <li><strong>Show Tooltips</strong>: Select this if you want to have 
     <a href="glossary.xhtml#tooltip">tooltips</a> appear when the cursor
@@ -92,17 +92,17 @@
 <p>The Content preferences panel allows you to change settings that influence
   how website and message content appears in &brandShortName;.</p>
 
 <ul>
   <li>Website Icons:
     <ul>
       <li><strong>Show website icons</strong>: Select this if you want see
         site-specific icons, if available, in place of the bookmark icon
-        <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif"
+        <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
         alt="Bookmark item icon"/>. Website icons are shown to the left of the
         Location Bar and Browser tabs.</li>
       <li><strong>Aggressively look for website icons when the page does not
         define one</strong>: If the page itself does not define a website
         icon, turning on this setting makes &brandShortName; look for a
         &quot;favicon&quot; on the server and use that instead.</li>
       <li>Display website icons in bookmarks menu and toolbar:
         <ul>
@@ -156,18 +156,22 @@
 <p>The Fonts preferences panel allows you to set page font type and size.</p>
 
 <p><strong>Note</strong>: Some font styles may not be selectable because the
   selected language does not have fonts available for that style.</p>
 
 <ul>
   <li><strong>Fonts for</strong>: Choose a language group/script. For instance,
     to set default fonts for West European languages/script (Latin), choose
-    <q>Western.</q>  For a language/script not yet in the list, choose <q>Other
-    Languages.</q>
+    <q>Western.</q> For Unicode or a language/script not yet in the list, choose
+    <q>Other Languages.</q> For more information, including <q>User Defined</q>,
+    see <a href="nav_help.xhtml#selecting_character_encodings_and_fonts">Selecting
+    Character Encodings and Fonts</a>.<br/>
+    All settings below, except for the checkbox, are stored per language group;
+    each can have its own set of font definitions.
     <ul>
       <li><strong>Proportional</strong>: Select whether proportional text
         should be serif (like Times Roman) or sans-serif (like Arial). You can
         also specify what font size you want for proportional text.
         Proportional text is variable in width, so characters and letters vary
         in width.</li>
       <li><strong>Serif</strong>: Select a serif font you want to use for
         web pages.</li>
@@ -231,12 +235,10 @@
         image specified</strong>: Allow you to choose displayed colors,
         ignoring the web page colors and background image.</li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -71,16 +71,21 @@
         <ul>
           <li><strong>Blank page</strong>: Causes the browser to display a blank
             page.</li>
           <li><strong>Home page</strong>: Causes the browser to load your home
             page (specified below).</li>
           <li><strong>Last page visited</strong>: Causes the browser to load the
             page you were viewing right before you last exited
             &brandShortName;.</li>
+          <li><strong>Restore Previous Session</strong>: Causes the browser to
+            restore the windows and tabs you were viewing right before you last
+            exited &brandShortName;, including form data and browsing
+            history. This option is only available in connection with
+            <strong>Display on Browser Startup</strong>.</li>
         </ul>
       </li>
     </ol>
   </li>
   <li class="win"><strong>Default Browser</strong>: Allows you to set
     &brandShortName; as the default browser or shows you that it is.
     <ul>
       <li><strong>Set Default Browser</strong>: Unless it is greyed out, click
@@ -98,68 +103,67 @@
         the message <q>Home Page Group is Set</q> appears in the location
         field.
         
         <p><strong>Caution</strong>: If you edit the field after clicking Use
           Current Group, your Home Page Group will be lost.</p>
       
       </li>
       <li><strong>Restore Default</strong>: Click this to revert to the
-        the default home page.</li>
+        default home page.</li>
       <li><strong>Choose File</strong>: Click this to locate a file on disk
         that you want to load as your home page.</li>
     </ul>
   </li>
-  <li><strong>Select the buttons you want to see in the toolbars</strong>:
-    Select any of the available checkboxes to see them on your
-    toolbars.
-
-    <p>The Go, Search, and Print buttons appear in the Navigation Toolbar near
-      the upper-right corner of the browser window. All other buttons appear
-      in the Personal Toolbar. For information about adding your own bookmarks
-      to this toolbar, see
-      <a href="customize_help.xhtml#personal_toolbar">Personal
-      Toolbar</a>.</p>
-
-  </li>
 </ul>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="history">Browser Preferences - History</h2>
 
 <p>This section describes how to use the History 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 Browser category, click History. (If no subcategories are
     visible, double-click Browser to expand the list.)</li>
 </ol>
 
-<p>The History preferences panel allows you to configure three history settings
+<p>The History preferences panel allows you to configure the history settings
   for the browser.</p>
 
 <ul>
   <li><strong>Browsing History</strong>:
     <ul>
-      <li><strong>Remember visited pages for the last [__] days</strong>: Type
-        the number of days you want &brandShortName; to keep track of the web
-        pages you have previously visited. For example, if you set this number
-        to 10 days, pages 10 days old or less will be kept in the history
-        list.</li>
+      <li><strong>Clear History</strong>: Click this to delete the list of
+        websites visited.</li>
+      <li><strong>Remember visited pages</strong>: Select this to make
+        &brandShortName; remember pages you visit within the browsing history.
+        For example, you need that to be able to search for pages you have
+        already visited from the location bar or history window.</li>
     </ul>
   </li>
-  <li><strong>Clear History</strong>: Click this to delete the list of sites
-    visited.</li>
   <li><strong>Location Bar History</strong>:
     <ul>
       <li><strong>Clear Location Bar</strong>: Click this to clear the list of
-        sites in the Location bar menu.</li>
+        websites in the Location bar menu.</li>
+    </ul>
+  </li>
+  <li><strong>Form and Search History</strong>:
+    <ul>
+      <li><strong>Enable form and search history</strong>: Select this to let
+        &brandShortName; keep a history of the forms you fill in and the
+        searches you do.</li>
+      <li><strong>Remember form and search history for up to [__] days</strong>:
+        Type the maximum number of days you want &brandShortName; to keep track
+        of forms you fill in and searches you do. For example, if you set this
+        number to 180 days, forms and searches 180 days old or less will be
+        kept.</li>
     </ul>
   </li>
 </ul>
 
 <p>For more information about history in &brandShortName;, see
   <a href="nav_help.xhtml#retracing_your_steps">Retracing Your Steps</a>.</p>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
@@ -182,17 +186,24 @@
 
 <ul>
   <li><strong>Languages for Web Pages</strong>:
     <ul>
       <li><strong>Move Up / Move Down</strong>: Click one of these buttons to
         move a selected language up or down, which sets the order of preference
         for the listed languages.</li>
       <li><strong>Add</strong>: Click this to add additional languages for
-        displaying web pages.</li>
+        displaying web pages. In the dialog, select a language from the list.
+        If you want to add a language that is not in the list, type a language
+        code (both two- and three-letter codes can be used) in the field below
+        the list. See the online document
+        <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">Codes
+        for the Representation of Names of Languages</a> for a complete list of
+        language codes. Click OK to close the dialog and save your
+        changes.</li>
       <li><strong>Remove</strong>: Click this to remove a selected
         language.</li>
     </ul>
   </li>
   <li><strong>Character Encoding</strong>:
     <ul>
       <li><strong>Default Character Encoding</strong>: Use the drop-down list
         to select the character encoding you want for displaying web
@@ -216,82 +227,54 @@
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Browser category, click Helper Applications. (If no
     subcategories are visible, double-click Browser to expand the list.)</li>
 </ol>
 
-<p>The Helper Applications preferences panel allows you to control how
-  different file types are opened by other applications in
-  &brandShortName;:</p>
+<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>
+<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><strong>Specify how to handle files of each type</strong>:
-    <ul>
-      <li><strong>File types</strong>: Displays the file types that
-        &brandShortName; uses. Select one of them to show the following
-        information:
-        <ul>
-          <li><strong>Description</strong>: Displays a description of the
-            selected file type.</li>
-          <li><strong>Extension(s)</strong>: Displays the file extension(s) of
-            the selected file type.</li>
-          <li><strong>When encountered</strong>: Displays what kind of action
-            that will be taken when &brandShortName; encounters the selected
-            file type.</li>
-        </ul>
-      </li>
-      <li><strong>New Type</strong>: Click this to add a new file type. You see
-        a dialog box:
-        <ul>
-          <li><strong>Mime Type</strong>: Type the Mime type of the file type
-            you want to add.</li>
-          <li><strong>Description</strong>: Type a Descrition of the file
-            type you want to add.</li>
-          <li><strong>Extension</strong>: Type the file extension of the file
-            type you want to add.</li>
-          <li><strong>When a file of this type is encountered</strong>:
-            Select one option from the checkboxes:
-            <ul>
-              <li><strong>Open it using the default application</strong>:
-                Causes the the file to be opened by the default program in
-                your systems settings.</li>
-              <li><strong>Open it with</strong>: Causes the file to be
-                opened by a program you specify. Use the Choose File button
-                to locate the program on your disk</li>
-              <li><strong>Save it to disk</strong>: The file will be saved
-                to disk.</li>
-            </ul>
-          </li>
-          <li><strong>Always ask me when handling files of this
-            type</strong>: Select this to make the Download Dialog box always
-            appear when files of this type are encountered.</li>
-        </ul>
-      </li>
-      <li><strong>Edit</strong>: Click this to change the file-handling
-        information of a selected file type.</li>
-      <li><strong>Remove</strong>: Click this to remove a selected file
-        type.</li>
-    </ul>
-  </li>
-  <li><strong>Plugin Finder Service</strong>:
-    <ul>
-      <li><strong>Always use the Plugin Finder Service (PFS) to get 
-        plugins</strong>: Select this to always use the Plugin Finder Service
-        (PFS) whenever &brandShortName; needs a new plugin. If left
-        unselected, the PFS is only used when a plugin location is not
-        provided by the web page that requires the plugin.</li>
-    </ul>
-  </li>
+  <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>
+  <li>Choose a <!-- feature or --> plugin by selecting it from the menu.</li>
+  <li>Save files of this type on your computer by selecting
+    <strong>Save File</strong> from the menu. If you have selected the
+    <strong>Automatically download files to specified download folder</strong>
+    preference in the <strong>Downloads</strong> panel, &brandShortName; will
+    save content of this type on your computer automatically. Otherwise, when
+    you encounter this type, &brandShortName; will prompt you for a location on
+    your computer to save it to.</li>
+  <li>Tell &brandShortName; to <strong>always ask</strong> what to do when
+    encountering this type. When you choose this option, a dialog will always be
+    shown when files of this type are accessed, and you can choose how to handle
+    that specific file from there.</li>
 </ul>
 
-<p>To learn more about how to handle different file types with
-  &brandShortName;, see
+<p><strong>Note:</strong> When a plugin is available to handle a type, and you
+  choose another handler for that type, &brandShortName; will only use your
+  chosen handler when you access the type directly. When the type is embedded
+  inside a web page, &brandShortName; will continue to use the plugin to handle
+  it. See also
   <a href="nav_help.xhtml#plugins_and_downloads">Plugins and Downloads</a>.
 </p>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="location_bar">Browser Preferences - Location Bar</h2>
 
 <p>This section describes how to use the Location Bar preferences panel. If
@@ -309,20 +292,47 @@
 
 <ul>
   <li id="location_bar_autocomplete"><strong>Autocomplete</strong>:
     <ul>
       <li><strong>Autocomplete from your browsing history as you type</strong>:
         Select this to let &brandShortName; automatically show suggestions from
         your browsing history when you type in the Location Bar.
         <ul>
-          <li><strong>Match only website&apos;s you&apos;ve typed
-            previously</strong>: Shows only websites that you&apos;ve typed in
-            the Location Bar and not sites that were opened in other ways, such
-            as clicking a link on a web page.</li>
+          <li><strong>Match only websites you&apos;ve typed previously</strong>:
+            Shows only websites that you&apos;ve typed in the Location Bar and
+            not websites that were opened in other ways, such as clicking a link
+            on a web page.</li>
+          <li><strong>Only match locations, not website titles</strong>: Shows
+            only websites where the location matches what you typed. Websites
+            where the title matches what you typed will not show up as
+            autocomplete suggestions unless their location matches, too.</li>
+          <li><strong>Match</strong>:
+            <ul>
+              <li><strong>Anywhere in the location or title</strong>: The
+                autocomplete suggestions will include all websites where what
+                you typed matches any part of the website&apos;s location or
+                title.</li>
+              <li><strong>Anywhere but preferring word boundaries</strong>: The
+                autocomplete suggestions will include all websites where what
+                you typed matches any part of the website&apos;s location or
+                title but matches at word boundaries (see next point) are
+                preferred. This is the default setting.</li>
+              <li><strong>Only on word boundaries</strong>: The autocomplete
+                suggestions will include all websites where what you typed
+                matches the beginning of any word contained in the
+                website&apos;s location or title. Matches may also be found
+                inside a word if it contains medial capital letters (as in
+                CamelCase) since all non-lowercase characters are treated as
+                word boundaries.</li>
+              <li><strong>Only at the beginning of the location or
+                title</strong>: The autocomplete suggestions will include all
+                websites where what you typed matches the beginning of the
+                website&apos;s location or title.</li>
+            </ul></li>
           <li><strong>Automatically prefill the best match</strong>: As you
             type in the Location Bar, &brandShortName; will automatically
             complete your web address using the visited website it most closely
             matches. <span class="unix"><strong>Note</strong>: Having this
             option on will prefill local addresses (like paths to files on your
             hard drive) even if you have turned off <q>Autocomplete from your
             browsing history as you type</q>.</span></li>
           <li><strong>Show list of matching results</strong>: As you type in
@@ -351,21 +361,18 @@
         detailed information about this feature, see the online document
         <a href="http://www.mozilla.org/docs/end-user/domain-guessing.html">
         Domain Guessing</a>.</li>
       <li><strong>Perform a web search when entered text is not a web
         location</strong>: Select this to let &brandShortName; automatically
         search the web for text entered in the Location Bar. If the text
         you&apos;ve typed is not a web location, &brandShortName; will do a web
         search when you press <kbd class="noMac">Enter</kbd>
-        <kbd class="mac">Return</kbd> in the Location Bar. See the online
-        document
-        <a href="http://www.mozilla.org/docs/end-user/internet-keywords.html">
-        Internet Keywords</a> for a more technical description about this
-        feature. <strong>Note</strong>: The search engine used can not be
+        <kbd class="mac">Return</kbd> in the Location Bar.
+        <strong>Note</strong>: The search engine used can not be
         changed by the <a href="#internet_search">Internet Search
         Preferences</a>.</li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
@@ -434,16 +441,19 @@
   <li><strong>Tab Display</strong>:
     <ul>
       <li><strong>Hide the tab bar when only one tab is open</strong>: Select
         this to display the Tabbed Browsing bar only when more then one
         browser tab is open.</li>
       <li><strong>Switch to new tabs opened from links</strong>: Select this to
         make &brandShortName; switch to the new tab when using <q>Open in a
         New Tab</q> to open a link.</li>
+      <li><strong>Warn me when closing a window with multiple tabs</strong>:
+        Select this to make &brandShortName; warn you when you try to close a
+        browser window which has multiple tabs open in it.</li>
     </ul>
   </li>
   <li><strong>When opening a bookmark group</strong>:
     <ul>
       <li><strong>Add tabs</strong>: Select this if you want a bookmark group
         to be opened in new tabs.</li>
       <li><strong>Replace existing tabs</strong>: Select this if you want a
         bookmark group to replace your existing tabs.</li>
@@ -537,58 +547,70 @@
 </ol>
 
 <p>The Downloads preferences panel allows you to set up how &brandShortName;
   handles files you download from web pages:</p>
 
 <ul>
   <li><strong>When starting a download</strong>:
     <ul>
+      <li><strong>Flash the download manager if it is already open</strong>:
+        Select this to change focus to the Download Manager if it is currently
+        open. It displays the status for current and previous downloads in a
+        single window. This option only takes effect if the Download Manager
+        is already open and overrides the other settings.</li>
       <li><strong>Open the download manager</strong>: Select this to display
-        the Download Manager, which displays the status for current and
-        previous downloads. The status of all downloads is kept in a single
-        window.</li>
+        the Download Manager when starting a new download. It will be opened
+        if the window isn&apos;t currently shown.</li>
       <li><strong>Open a progress dialog</strong>: Select this to display a
         progress dialog box, which display the status for your current
         download. The status of each download is kept in a separate
         window.</li>
       <li><strong>Don&apos;t open anything</strong>: Select this if you want to
         download files invisibly. No status is given for all your
         downloads.</li>
     </ul>
   </li>
 </ul>
 
 <ul>
   <li><strong>When saving a file</strong>:
     <ul>
-      <li><strong>Prompt for download location and default to</strong>: Select
-        this if you always want to be able to choose a folder for the file to
-        be saved. Choose one of the following folders to be the default
-        location for the file:
-        <ul>
-          <li><strong>Last download folder</strong>: The default location will
-            be the folder you last downloaded a file to.</li>
-          <li><strong>Specified download folder</strong>: The default location
-            will be your Current Download Folder.</li>
-        </ul>
-      </li>
-      <li><strong>Automatically download files to specified download
-        folder</strong>: Select this if you want files to be saved to your
-        Current Download Folder without &brandShortName; prompting you for
-        the download location.</li>
+      <li><strong>Save files to</strong>: Select this if you want files to be
+        saved to the specified folder without &brandShortName; prompting you
+        for the download location.</li>
+      <li><strong>Always ask me where to save files</strong>: Select this if
+        you always want to be able to choose a folder for the file to be saved.
+        The default will be the folder you last downloaded a file to.</li>
     </ul>
   </li>
 </ul>
-    
+
 <ul>
-  <li><strong>Current Download Folder</strong>: Use the button to navigate
-    to a folder that you want to use as your specified download folder.</li>
+  <li><strong>Download history</strong>:
+    <ul>
+      <li><strong>Remove download entries</strong>: This determines when
+        a completed entry is removed from the Download Manager listing
+        (the downloaded file itself will <em>not</em> be affected):
+        <ul>
+          <li><strong>When they have completed</strong>: Select this to
+            remove an entry immediately once the download is successfully
+            completed.</li>
+          <li><strong>When quitting &brandShortName;</strong>: Select this
+            to retain all entries until closing the program, the list will
+            be empty upon restarting &brandShortName;.</li>
+          <li><strong>Never</strong>: Select this to not remove <em>any</em>
+            entry automatically, even after &brandShortName; is restarted.
+            You can remove them manually in the Download Manager.</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
 </ul>
-    
+        
 <ul>
   <li><strong>When a download completes</strong>:
     <ul>
       <li><strong>Play a sound</strong>: Select this if you want
         &brandShortName; to play a custom sound (typically in WAV format) when
         a download is completed. Use the Browse button to select the sound file
         in the file locator. To listen to the sound you&apos;ve chosen, click
         Preview.</li>
@@ -600,12 +622,10 @@
 </ul>
 
 <p>For more information about downloading files from web pages, see
   <a href= "nav_help.xhtml#plugins_and_downloads">Plugins and
   Downloads</a>.</p>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/cs_priv_prefs_popup.xhtml
+++ b/suite/chrome/common/help/cs_priv_prefs_popup.xhtml
@@ -30,108 +30,116 @@
   screen. Some popups open on top of the current browser window, thus popping
   up, while others appear underneath the browser (popunders).</p>
 
 <p>&brandShortName; allows you to control both popups and popunders through the
   <a href="#privacy_and_security_preferences_popup_windows">Popup Windows
   preferences panel</a>. Since popup blocking is turned off by default, you
   must enable it to prevent popups from appearing in the browser.</p>
 
-<p>When blocking a popup, &brandShortName; can be set up to play a sound, as
-  well as display an icon
+<p>When blocking a popup, &brandShortName; can be set up to play a sound or
+  display an icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
-  icon"/> in the status bar. You can use this icon to add a website
-  you&apos;re viewing to an exceptions list so that the site is allowed to
-  again display popups.</p>
+  icon"/> in the status bar or a notification bar at the top of the website
+  content area, or any combination of the above. You can use the icon or the
+  bar to add a website you&apos;re viewing to an exceptions list so that the
+  website is allowed to again display popups.</p>
 
-<p><strong>Blocking popups may interfere with some websites</strong>: Some web
-  sites, including some banking sites, use popups for important features. 
+<p><strong>Blocking popups may interfere with some websites</strong>: Some
+  websites, including some banking sites, use popups for important features.
   Blocking all popups disables such features. To allow specific websites to
   use popups, while blocking all others, you can add specific websites to the
-  list of allowed sites. For more information, see
+  list of allowed websites. For more information, see
   <a href="#privacy_and_security_preferences_popup_windows">Privacy &amp;
   Security Preferences - Popup Windows</a>.</p>
 
 <p><strong>Blocking popups doesn&apos;t always work</strong>: Although
   &brandShortName; blocks most popups, some websites, even when blocked, may
   use other methods to show popups.</p>
 
 <p><strong>Allowing popups from certain websites</strong>: After you&apos;ve
-  enabled popup blocking, you can still allow specific sites to display popups.
-  Browse to the website, and then from the Tools menu, choose Popup Manager,
-  and then choose Allow Popups From This Site.</p>
+  enabled popup blocking, you can still allow specific websites to display
+  popups. Browse to the website, and then from the Tools menu, choose Popup
+  Manager, and then choose Allow Popups From This Website.</p>
 
 <p>The next section describes how to control popups through preferences and
   through the popup control icon.</p>
 
 <h2 id="privacy_and_security_preferences_popup_windows">Privacy &amp; Security
   Preferences - Popup Windows</h2>
 
 <p>This section describes how to use the Popup Windows preferences panel. If
- you&apos;re not already viewing it, follow these steps:</p>
+  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 Preferences category, click Popup
     Windows. (If no subcategories are visible, double-click Privacy &amp;
     Security to expand the list.)</li>
 </ol>
 
 <ul>
   <li><strong>Block unrequested popup windows</strong>: Select this to prevent
     popups from appearing in the browser.</li>
-  <li><strong>Allowed Sites</strong>: Click this to view and edit the list of
-    web sites that you want to allow to display popups.
+  <li><strong>Allowed Websites</strong>: Click this to view and edit the list of
+    websites that you want to allow to display popups.
     <ul>
-      <li><strong>Allowed websites</strong>: The list of allowed websites
-        appears when you click <q>Allowed Sites</q>. You can add or remove
-        websites that should be allowed to show popups.</li>
-      <li><strong>Add</strong>: Click this after typing in a website that you
+      <li><strong>Allowed Websites - Popups</strong>: The list of allowed
+        websites appears when you click <q>Allowed Sites</q>. You can add or
+        remove websites that should be allowed to show popups.</li>
+      <li><strong>Allow</strong>: Click this after typing in a website that you
         want to add to the list.</li>
-      <li><strong>Remove</strong>: Click this to remove a selected website.</li>
-      <li><strong>Remove All</strong>: Click this to remove all of the websites
-        in the current list.</li>
+      <li><strong>Remove Website</strong>: Click this to remove a selected
+        website.</li>
+      <li><strong>Remove All Websites</strong>: Click this to remove all of the
+        websites in the current list.</li>
     </ul>
   </li>
 </ul>
 
 <h3>When a popup window has been blocked</h3>
 
 <ul>
   <li><strong>Play a sound</strong>: If you want a sound to play each time
-    the browser blocks a popup, select this option and type the location of the
-    sound file.
+    the browser blocks a popup, select this option and choose System beep
+    or Custom sound file. Selecting Custom sound file enables the following two
+    buttons:
     <ul>
-      <li><strong>Select</strong>: Click this to choose a sound file instead of
-        typing its location in the field.</li>
+      <li><strong>Browse</strong>: Click this to choose a sound file.</li>
       <li><strong>Preview</strong>: Click this to listen to the chosen
         sound.</li>
     </ul>
   </li>
   <li><strong>Display an icon in the browser status bar</strong>: Select this
     to display an icon
     <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
     icon"/> in the browser status bar to indicate that a popup is blocked.
 
     <p><strong>Note</strong>: After the popup control icon
       <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup
       control icon"/> appears, it remains visible until you visit another
       website.</p>
   </li>
+  <li><strong>Display a notification bar at the top of the content area</strong>:
+    Select this to display a notification bar above the website content area
+    whenever a popup is blocked. In the bar, use the Preferences button to choose
+    how to handle popups from that website.
+  </li>
 </ul>
 
-<p><strong>Using the popup control icon to add allowed websites</strong>: You
-  can use the popup control icon to quickly add a website to the list of
-  allowed websites. Click the icon
+<p><strong>Using the popup control icon or notification bar to add allowed
+  websites</strong>: You can use the popup control icon or notification bar to
+  quickly add a website to the list of allowed websites. Click the icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
   icon"/> to open the list of allowed websites. The current website is
-  already filled in. Click Add and then click OK to confirm your addition.</p>
+  already filled in. Click Allow and then click OK to confirm your addition.
+  Similarly you can use the notification bar to allow popups from the current
+  website or open the list of allowed websites through Manage Popups. Just
+  click the Preferences button at the right end of the notification bar.</p>
 
 <p><strong>Note</strong>: Blocking popups may not always work and may interfere
   with some websites. For more information about blocking popups, see
   <a href="#controlling_popups">Controlling Popups</a>.</p>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/customize_help.xhtml
+++ b/suite/chrome/common/help/customize_help.xhtml
@@ -19,29 +19,30 @@
   of your personal information on the Internet. This document does not,
   however, address all online privacy and security issues, nor does it
   represent a recommendation about what constitutes adequate privacy and
   security protection on the Internet.</div>
 
 <h1 id="customizing_mozilla">Customizing &brandShortName;</h1>
 
 <p>You can customize &brandShortName; to better suit your needs using features
-  like Sidebar, bookmarks, and Tabbed Browsing.</p>
+  like Sidebar, bookmarks, Tabbed Browsing, and Add-ons.</p>
 
 <p>This section describes the customizable aspects of &brandShortName;&apos;s
   browser component.</p>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#sidebar">Sidebar</a></li>
     <li><a href="#tabbed_browsing">Tabbed Browsing</a></li>
     <li><a href="#changing_fonts_colors_and_themes">Changing Fonts, Colors, and
       Themes</a></li>
     <li><a href="#toolbars">Toolbars</a></li>
     <li><a href="#bookmarks">Bookmarks</a></li>
+    <li><a href="#add-ons">Add-ons</a></li>
     <li><a href="#specifying_how_mozilla_starts_up">Specifying How
       &brandShortName; Starts Up</a></li>
     <li><a href="cs_nav_prefs_appearance.xhtml">Appearance
       Preferences</a></li>
     <li><a href="cs_nav_prefs_navigator.xhtml">Browser
       Preferences</a></li>
     <li><a href="cs_nav_prefs_advanced.xhtml">Advanced Preferences</a></li>
   </ul>
@@ -295,17 +296,17 @@
 
 <p><strong>Opening a New Blank Browser Tab</strong>:</p>
 
 <ul>
   <li><strong>From the File menu</strong>: Open the File menu, choose New, and
     then Browser Tab.</li>
   <li><strong>From the Tab Bar</strong>: If visible, click the <q>new
     tab</q> icon
-    <img src="chrome://global/skin/icons/tab-new.gif" alt="new tab icon"/>
+    <img src="chrome://navigator/skin/icons/tab-new.gif" alt="new tab icon"/>
     on the left side of the Tab Bar.</li>
   <li><strong>From a pop-up menu</strong>: If the Tab Bar is visible,
     right-click on it, and choose New Tab from the pop.</li>
 </ul>
 
 <p><strong>Opening a Web Page Link in a Browser Tab</strong>:</p>
 
 <ul>
@@ -338,21 +339,21 @@
 
 <h3 id="moving_tabs">Moving Tabs</h3>
 
 <p>Tabs are displayed in the order you open them, which may not always be what
   you want. To move a tab to a different location within a &brandShortName;
   window, simply drag it there using your mouse. While you are dragging the
   tab, &brandShortName; displays an indicator to show where the tab will be
   moved. Alternately, you can use
-  <a href="shortcuts-navigator.xhtml#tabbed_browsing_shortcuts">keyboard
+  <a href="shortcuts_navigator.xhtml#tabbed_browsing_shortcuts">keyboard
   shortcuts</a> to move tabs within a window if desired.</p>
 
-<p><strong>Note</strong>: The keyboard shortcuts don't work when a text box has
-  focus.</p>
+<p><strong>Note</strong>: The keyboard shortcuts don&apos;t work when a text
+  box has focus.</p>
 
 <p>[<a href="#tabbed_browsing">Return to beginning of section</a>]</p>
 
 <h3 id="bookmarking_tabs">Bookmarking Tabs</h3>
 
 <p>A bookmarked group of tabs is called a Groupmark. To bookmark the group of
   browser tabs in the current window:</p>
 
@@ -555,48 +556,37 @@
   </tr>
   <tr>
     <td style="text-align: center;"><strong>Personal Toolbar</strong></td>
   </tr>
 </table>
 
 <p>You can easily add, delete, and rearrange items in the Personal Toolbar.</p>
 
-<h4 id="turning_buttons_on_and_off">Turning Buttons On and Off</h4>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Click Browser.</li>
-  <li>Under <q>Select the buttons you want to see in the toolbars</q>,
-    choose the buttons that you want on your toolbar.</li>
-  <li>Click OK.</li>
-</ol>
-
 <h4 id="adding_personal_toolbar_bookmarks">Adding Personal Toolbar
   Bookmarks</h4>
 
 <p>You can add buttons for your favorite bookmarks, or folders containing
   groups of bookmarks. To create a new bookmark to add to the Personal
   Toolbar:</p>
   
 <ol>
   <li>Open a web page you want to bookmark.</li>
   <li>Drag the bookmark icon
-    <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif"
+    <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
     alt="image of bookmark icon"/>(located to the left of URL in the
     Location Bar) to a desired place on the Personal Toolbar. You can drag the
     icon directly to the Personal Toolbar, or to a folder on the Personal
     Toolbar. For more information, see
     <a href="#adding_bookmark_folders_to_the_personal_toolbar">Adding Bookmark
     Folders to the Personal Toolbar</a>.</li>
 </ol>
 
 <p><strong>Note</strong>: The bookmark icon
-  <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif" alt="image
+  <img src="chrome://communicator/skin/bookmarks/bookmark-item.png" alt="image
   of bookmark icon"/> may appear as another page-specific icon if you have
   checked Show Website Icons in preferences. See
   <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences -
   Appearance</a> for more information on changing this preferences.</p>
 
 <p>Each item in the Personal Toolbar folder appears as a toolbar button. You
   may need to enlarge the browser window to see them all.</p>
 
@@ -649,20 +639,16 @@
 <ol>
   <li>Open the Bookmarks menu and choose Manage Bookmarks.</li>
   <li>In your Bookmarks window, click the Personal Toolbar Folder.</li>
   <li>Select a bookmark or folder and drag it to a new location.</li>
   <li>When you are finished rearranging items, close your Bookmarks
     window.</li>
 </ol>
 
-<p><strong>Note</strong>: Standard buttons on the Personal Toolbar such as
-  Bookmarks, Search, Go, Print and Home cannot be rearranged, but they can
-  be <a href="#turning_buttons_on_and_off">turned off and on</a>.</p>
-
 <p><strong>Tip</strong>: To move a bookmark placed on the Personal Toolbar
   quickly, click and drag the bookmark to another location on the Personal
   Toolbar or to a folder.</p>
   
 <p>[<a href="#toolbars">Return to beginning of section</a>]</p>
 
 <h3 id="status_bar">Status Bar</h3>
 
@@ -677,25 +663,25 @@
   <li>Cookie notification icon
     <img src="chrome://communicator/skin/permissions/taskbar-cookie.gif"
     alt="cookie notification icon"/>: 
     Appears when a website has used a cookie in a way that requires you to be
     notified. For more information, see
     <a href="using_priv_help.xhtml#cookie_notification">Cookie
     Notification</a>.</li>
   <li>Work Offline
-    <img src="chrome://communicator/skin/icons/offline.gif"
+    <img src="chrome://communicator/skin/icons/offline.png"
     alt="work offline icon"/> or Work Online
-    <img src="chrome://communicator/skin/icons/online.gif"
+    <img src="chrome://communicator/skin/icons/online.png"
     alt="work online icon"/> icon: Click the icon to toggle working
     offline or online. Working offline prevents &brandShortName; from
     attempting to connect to the Internet, for example to load images on web
     pages or automatically check email.</li>
   <li>Lock icon (Example:
-    <img src="chrome://communicator/skin/icons/lock-insecure.gif"
+    <img src="chrome://communicator/skin/icons/lock-insecure.png"
     alt="lock icon"/>): Indicates whether the entire contents of the page
     was encrypted while it was being received by your computer. For more
     information, see
     <a href="using_certs_help.xhtml#checking_security_for_a_web_page">Checking
     Security for a Web Page</a>.</li>
 </ul>
 
 <p>[<a href="#toolbars">Return to beginning of section</a>]</p>
@@ -807,17 +793,17 @@
     </ol>
   
     <p><strong>Tip</strong>: If you have multiple browser tabs open in a
       window, you can select <q>Bookmark this groups of tabs</q> to add a
       single bookmark that will open all of the open tabs in the current
       window.</p>
   </li>
   <li>To add a bookmark to the Personal Toolbar, drag the bookmark icon
-    <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif"
+    <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
     alt="image of bookmark icon"/> next to the Location Bar to a place on
     the Personal Toolbar. You can drag a bookmark to the following places:
     <ul>
       <li>In the Bookmarks folder on the Personal Toolbar.</li>
       <li>In a bookmarks folder you&apos;ve created on the Personal
         Toolbar.</li>
       <li>To the Personal Toolbar itself, on the right side of all bookmarks
         folders.
@@ -836,26 +822,26 @@
   <tr>
     <td><strong>Personal Toolbar</strong></td>
   </tr>
 </table>
 
 <ul>
   <li>To add a bookmark to the Bookmarks tab in Sidebar, open Sidebar, select
     the Bookmarks tab, and drag the bookmark icon
-    <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif"
+    <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
     alt="image of bookmark icon"/> next to the Location Bar to a place on
     the bookmark list in the Bookmarks tab.
   </li>
 </ul>
 
 <p><strong>Notes</strong>:</p>
 <ul>
   <li>The bookmark icon
-    <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif"
+    <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
     alt="image of bookmark icon"/> may appear as another page-specific
     icon if you have checked Show Website Icons in preferences. See
     <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences -
     Appearance</a> for more information on changing this preferences.</li>
   <li>After adding a bookmark using any of the methods listed above, it can be
     accessed using the Sidebar Bookmarks tab, the Manage Bookmarks window, and
     the Bookmarks menu.</li>
 </ul>
@@ -898,18 +884,21 @@
   <li>Click to highlight the bookmark or folder that you want to remove.</li>
   <li>Press the Delete key on your keyboard, or click Delete in the Bookmarks
     window.</li>
 </ol>
 
 <p>To sort your bookmarks in the Manage Bookmarks window:</p>
 
 <ul>
-  <li>Open the View menu and select how you want the list sorted (such as Sort
-    by Name or Sort by Location).
+  <li>Select the folder you want to sort.</li>
+  <li>To sort bookmarks by Name, open the Edit menu and select Sort Folder by
+    Name.</li>
+  <li>To sort bookmarks in other ways, open the Edit menu and select Sort
+    Folder. In the dialog, choose how you want the list sorted.
 
     <p><strong>Tip</strong>: To add more columns, open the View menu, open
       <q>Show columns</q>, and select a column header in the list.</p></li>
 </ul>
 
 <h4>Designating a New Bookmark Folder</h4>
 
 <p>When you create a new bookmark, &brandShortName; normally adds it to the
@@ -941,21 +930,21 @@
 
 <p>You can also set &brandShortName; to check bookmarked websites for
   changes.</p>
 
 <ol>
   <li>Open the Bookmarks menu and choose Manage Bookmarks.</li>
   <li>In your Bookmarks window, click a bookmark.</li>
   <li>Click Properties.</li>
-  <li>In the bookmark Properties dialog box, click the Schedule tab.</li>
-  <li>Use the pull down lists to specify how frequently you want
-    &brandShortName; to check the bookmarked page for changes.</li>
-  <li>If you want to be notified when the bookmarked page changes, click the
-    Notify tab and choose a notification option.</li>
+  <li>Use the pull down lists and the textfield under <q>Check this location
+    for updates</q> to specify how often you want &brandShortName; to check the
+    bookmarked page for changes.</li>
+  <li>To be notified when the bookmarked page changes, choose from the options
+    in the <q>Notification</q> section.</li>
 </ol>
 
 <p> [<a href="#bookmarks">Return to beginning of section</a>]</p>
 
 <h3 id="searching_your_bookmarks">Searching Your Bookmarks</h3>
 
 <p>To search the bookmarks list:</p>
 
@@ -998,69 +987,377 @@
   <li>In your Bookmarks window, open the Tools menu, and choose Export.</li>
   <li>In the <q>Export Bookmarks File</q> dialog box, choose a folder.
     Your bookmarks.html file will be copied into the folder you designate.</li>
   <li>Click Save.</li>
 </ol>
 
 <p>Your &brandShortName; bookmarks are not altered by this procedure.</p>
 
-<p>You can also import bookmarks files from other sources. For example, you can
-  import bookmarks files from earlier &brandShortName; versions, other
-  browsers, or from bookmarks files that your friends send you.</p>
+<p>You can also import bookmarks from other sources. For example, you can
+  import bookmarks from earlier &brandShortName; versions, other browsers, or
+  from bookmarks files that your friends send you.</p>
 
 <p>Before you start, make sure that the bookmarks file you want to import is an
   HTML file.</p>
 
 <ol>
   <li>Open the Bookmarks menu and choose Manage Bookmarks.</li>
   <li>In your Bookmarks window, open the Tools menu and choose Import.</li>
-  <li>In the <q>Import Bookmarks File</q> dialog box, locate and select
-    the bookmarks file you want to import.</li>
-  <li>Click Open.</li>
+  <li>In the dialog that appears, choose whether you want to import bookmarks
+    from earlier versions of &brandShortName;, or from a bookmarks file on your
+    computer.</li>
+  <li>Click Continue.</li>
+  <li>If you have chosen to import bookmarks from an earlier version of
+    &brandShortName;, select the profile you want to import bookmarks from,
+    then click Continue. If you have chosen to import bookmarks from a
+    file, navigate to and select the bookmarks file you want to import, then
+    click Open.</li>
 </ol>
 
-<p>The imported bookmarks file is treated as a group of new bookmarks and added
-  to the bottom of your bookmarks list. If you have designated a new bookmark
+<p>The imported bookmarks are treated as a group of new bookmarks and added to
+  the bottom of your bookmarks list. If you have designated a new bookmark
   folder, the imported bookmarks are added to that folder.</p>
 
 <p><strong>Note</strong>: Importing a bookmarks file imports the bookmarks and
   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>
+
+<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>
+  </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
+  types:</p>
+
+<ul>
+  <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>
+  <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
+    installation, with the Install button disabled during some seconds in
+    order to avoid you accidentally click 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>
+  <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>
+</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>[<a href="#add-ons">Return to beginning of section</a>]</p>
+
+<h3 id="using_the_add-on_manager">Using the Add-on Manager</h3>
+
+<p>The Add-on 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
+  of these steps:</p>
+
+<ul>
+  <li>Open the Tools menu, then select Add-on 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>
+</ul>
+
+<div class="contentsBox">In this section:
+  <ul>
+    <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_languages_panel">The Languages panel</a></li>
+    <li><a href="#the_plugins_panel">The Plugins panel</a></li>
+  </ul>
+</div>
+
+<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
+  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>
+
+<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>
+  <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>
+</ul>
+
+<p>[<a href="#using_the_add-on_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
+  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.
+
+    <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.
+
+    <p><strong>Note</strong>: If the extension does not feature a preferences
+      panel, the Preferences button will be disabled. 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>
+</ul>
+
+<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+
+<h4 id="the_themes_panel">The Themes 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>
+
+<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.
+    
+    <p><strong>Note</strong>: Contrary to extensions, you only can use 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>
+</ul>
+
+<p>[<a href="#using_the_add-on_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>After <a href="#accessing_the_add-on_manager">accessing the Add-on
+  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>
+</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>
+
+<h4 id="the_plugins_panel">The Plugins panel</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>
+
+<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>
+</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>
+
 <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>
     <li><a href="#changing_your_home_page">Changing Your Home Page</a></li>
     <li><a href="#specifying_which_components_open_at_launch">Specifying Which
       Components Open at Launch</a></li>
   </ul>
 </div>
 
 <h3 id="specifying_a_starting_page">Specifying a Starting Page</h3>
 
 <p>You can specify the page that loads when the browser starts:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under "Display on Browser Startup" choose whether you want a
     blank page, your home page, or the last web page visited to open
-    automatically when you launch your browser.
+    automatically when you launch your browser. Alternatively you can
+    tell &brandShortName; to restore the previous session, i.e. the
+    windows and tabs you had open when you last exited &brandShortName;.
   <p><strong>Note</strong>: If you selected Home Page, type the URL in the
     Location Bar.</p></li>
 </ol>
 
 <p>[<a href="#specifying_how_mozilla_starts_up">Return to beginning of
   section</a>]</p>
 
+<h3 id="session_restore">Session Restore</h3>
+
+<p>&brandShortName; periodically saves your browsing session (open windows
+  and tabs, including form data) to disk. When you start &brandShortName; with
+  Session Restore enabled, the windows and tabs from your previous session
+  will be restored. This is especially useful if your previous browsing session
+  ended unexpectedly (e.g. your computer crashed or a website you visited forced
+  &brandShortName; to terminate). &brandShortName; will automatically restore
+  the previous session if "Restore Previous Session" under "Display on Browser
+  Startup" has been selected. If you chose to not be warned when you close a
+  browser window with multiple tabs open (see <a href="#tabbed_browsing">Tabbed
+  Browsing</a> preference panel), &brandShortName; will open a page from
+  where you can choose which windows/tabs from the previous session you want to
+  restore. The same will happen if &brandShortName; crashes repeatedly.</p>
+
+<p>[<a href="#specifying_how_mozilla_starts_up">Return to beginning of
+  section</a>]</p>
+
 <h3 id="changing_your_home_page">Changing Your Home Page</h3>
 
 <p>Your home page is the page that opens when you click the Home button in the
   Personal Toolbar. Depending on how your preferences are set, it may also be
   the page that opens automatically when you launch &brandShortName;.</p>
 
 <p>To specify your home page:</p>
 
@@ -1076,17 +1373,17 @@
         browser window your home page.</li>
       <li>Click Choose File to select a file from your computer&apos;s hard
         drive.</li>
    </ul>
  </li>
 </ol>
 
 <p><strong>Tip</strong>: To specify your home page quickly, drag the bookmark
-  icon <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif"
+  icon <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
   alt="image of bookmark icon"/> from the Location Bar to the Home Page
   button on the Personal Toolbar.</p>
 
 <p>[<a href="#specifying_how_mozilla_starts_up">Return to beginning of
   section</a>]</p>
 
 <h3 id="specifying_which_components_open_at_launch">Specifying Which Components
   Open at Launch</h3>
@@ -1100,12 +1397,10 @@
   <li>Click the Appearance category.</li>
   <li>Select the components you want opened automatically each time you start
     &brandShortName;.</li>
 </ol>
 
 <p>[<a href="#specifying_how_mozilla_starts_up">Return to beginning of
   section</a>]</p>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/developer_tools.xhtml
+++ b/suite/chrome/common/help/developer_tools.xhtml
@@ -66,12 +66,10 @@
       <li><a href="http://www.webreference.com/programming/javascript/venkman/">Debugging
         JavaScript Using Venkman</a> (webreference.com, article series)</li>
       <li><a href="http://www.hacksrus.com/~ginda/venkman/">Venkman Development
         Homepage</a></li>
     </ul>
   </li>
 </ul>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/forieusers.xhtml
+++ b/suite/chrome/common/help/forieusers.xhtml
@@ -37,38 +37,38 @@
 
 <table class="defaultTable">
   <thead>
     <tr>
       <th>Internet Explorer</th>
       <th>&brandShortName;</th>
     </tr>
   </thead>
-  <tbody>
+  <tbody class="tbody-default">
     <tr>
       <td>Internet Options</td>
       <td><a href="cs_nav_prefs_navigator.xhtml">Preferences</a></td>
     </tr>
-    <tr class="even">
+    <tr>
       <td>Temporary Internet Files</td>
       <td><a href="nav_help.xhtml#changing_cache_settings">Cache</a></td>
     </tr>
     <tr>
       <td>Favorites</td>
       <td><a href="customize_help.xhtml#bookmarks">Bookmarks</a></td>
     </tr>
-    <tr class="even">
+    <tr>
       <td>Address Bar</td>
       <td><a href="nav_help.xhtml#moving_to_another_page">Location Bar</a></td>
     </tr>
     <tr>
       <td>Refresh</td>
       <td><a href="nav_help.xhtml#stopping_and_reloading">Reload</a></td>
     </tr>
-    <tr class="even">
+    <tr>
       <td>Links Bar</td>
       <td><a href="customize_help.xhtml#personal_toolbar">Personal Toolbar</a></td>
     </tr>
     <tr>
       <td>Copy Shortcut</td>
       <td>Copy Link Location</td>
     </tr>
   </tbody>
@@ -79,36 +79,36 @@
 <p>Your IE Favorites are imported automatically. To access them, open the
   Bookmarks menu and choose Imported IE Favorites.</p>
 
 <h2 id="browser_features">Browser Features</h2>
 
 <ul>
   <li><strong><a href="nav_help.xhtml#using_tabbed_browsing">Tabbed
     Browsing</a></strong>: Instead of opening a separate browser window for
-    each site you want to visit, you can open multiple sites within the same
-    window and tab between them. You can also
+    each website you want to visit, you can open multiple websites within the
+    same window and tab between them. You can also
     <a href="cs_nav_prefs_navigator.xhtml#navigator">set a group of tabs as
     your home page</a>.</li>
   <li><strong><a href="cs_priv_prefs_popup.xhtml">Pop-up Window
     Controls</a></strong>: Lets you allow or suppress both popup and popunder
     windows.</li>
   <li><strong><a href="customize_help.xhtml#sidebar">Sidebar</a></strong>:
     Customize &brandShortName; with frequently accessed content and tools such
     as news, stock quotes, your bookmarks, browser history, and many other
     options.</li>
   <li><strong><a href="profiles_help.xhtml#managing_profiles">Profile
     Manager</a></strong>: Create different profiles, each with its own
     bookmarks, preferences, mail settings, and so on. This is useful if you
     must share &brandShortName; on the same computer with other people, or
     if you want to keep your work and personal settings separate.</li>
   <li><strong><a href="using_priv_help.xhtml">Cookie Manager</a></strong>: Lets
-    you change what &brandShortName; will do when accepting cookies through its
-    support for the <a href="using_priv_help.xhtml#privacy_settings">P3P
-    privacy standard</a>.</li>
+    you view detailed information about each cookie and remove cookies you
+    don&apos;t want to be stored on your computer. You can also control which
+    websites are allowed to store cookies on your computer.</li>
   <li><strong><a href="using_priv_help.xhtml#managing_images">Image
     Manager</a></strong>: Enables you to disable images from certain websites,
     or disable them all together. This is useful if you wish to decrease the
     amount of time it takes for websites to load.</li>
 </ul>
 
 <h2 id="other_features">Other Features</h2>
 
@@ -135,12 +135,10 @@
 
 <h2 id="keyboard_shortcuts">Keyboard Shortcuts</h2>
 
 <p>You will notice that Microsoft Internet Explorer and &brandShortName;
   share many of the same shortcut keys. For a full list of shortcut keys, see
   the List of <a href="shortcuts.xhtml">&brandShortName; Keyboard
   Shortcuts</a>.</p>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/glossary.xhtml
+++ b/suite/chrome/common/help/glossary.xhtml
@@ -18,16 +18,22 @@
   and is not meant to be relied upon as a complete or authoritative description
   of the terms defined below or of the privacy and/or security ramifications of
   the technologies described.</div>
 
 <h1 id="glossary">Glossary</h1>
 
 <dl>
 
+<dt id="add-on">add-on</dt><dd>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. See also
+  <a href="#extension">extension</a>, <a href="#language_pack">language
+  pack</a>, <a href="#plugin">plugin</a>, and <a href="#theme">theme</a>.</dd>
+
 <dt id="authentication">authentication</dt><dd>The use of a password,
   certificate, personal identification number (PIN), or other information to
   validate an identity over a computer network. See also
   <a href="#password-based_authentication">password-based authentication</a>,
   <a href="#certificate-based_authentication">certificate-based
   authentication</a>, <a href="#client_authentication">client
   authentication</a>, <a href="#server_authentication">server
   authentication</a>.</dd>
@@ -154,22 +160,22 @@
 
 <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
-  site, the site asks your browser to place one or more cookies on your hard
-  disk. Later, when you return to the site, your browser sends the site 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
+  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>
 
 <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
@@ -237,64 +243,70 @@
   See also <a href="#dual_key_pairs">dual key pairs</a>,
   <a href="#signing_certificate">signing certificate</a>.</dd>
 
 <dt id="encryption_key">encryption key</dt><dd>A private key used for
   encryption only. An encryption key and its equivalent private key, plus a
   <a href="#signing_key">signing key</a> and its equivalent public key,
   constitute a <a href="#dual_key_pairs">dual key pairs</a>.</dd>
 
+<dt id="extension">extension</dt><dd>A type of <a href="#add-on">add-on</a>
+  that changes the behavior of &brandShortName; or adds new features to
+  it.</dd>
+
+<dt id="feed">feed</dt><dd>A frequently updated source of references to web
+  pages, usually blog articles or news. Technically it is an XML document
+  available through a public well-known URL, comprising of several items inside,
+  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
   <a href="#certificate_fingerprint">certificate fingerprint</a>.</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 site that gets stored on your computer when you visit a different
-  site. Sometimes a <a href="#web_site">website</a> displays content that is
+  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="form_manager">Form Manager</dt><dd>The part of the browser that can
-  help you save the personal data you enter into online forms, such as your
-  name, address, phone, and so on. Then, when a website presents you with a
-  form, Form Manager can fill it in automatically.</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>
 
-<dt id="gopher">Gopher</dt><dd>A protocol used to search and retrieve
-  information on Internet <a href="#server">servers</a>, common before the
-  emergence of the <a href="#world_wide_web">World Wide Web</a>.</dd>
-
 <dt id="helper_application">helper application</dt><dd>Any application that is
   used to open or view a file downloaded by the browser. A
   <a href="#plugin">plugin</a> is a special kind of helper application that
   installs itself into the Plugins directory of the main browser installation
   directory and can typically be opened within the browser itself (internally).
   Microsoft Word, Adobe Photoshop, and other external applications are
   considered helper applications but not plugins, since they don&apos;t
   install themselves into the browser directory, but can be opened from the
   download dialog box.</dd>
 
 <dt id="home_page">home page</dt><dd>The page your browser is set to display
   every time you launch it or when you click the Home button. Also used to
   refer to the main page for a website, from which you can explore the rest of
-  the site.</dd>
+  the website.</dd>
 
 <dt id="html">HTML (HyperText Markup Language)</dt><dd>The document format used
   for web pages. The HTML standard defines tags, or codes, used to define the
   text layout, fonts, style, images, and other elements that make up a web
   page.</dd>
 
 <dt id="http">HTTP (HyperText Transfer Protocol)</dt><dd>The protocol used to
   transfer <a href="#web_page">web pages</a> (HyperText documents) between
@@ -360,16 +372,20 @@
 
 <dt id="key">key</dt><dd>A large number used by a
   <a href="#cryptographic_algorithm">cryptographic algorithm</a> to encrypt or
   decrypt data. A person&apos;s public key, for example, allows other people to
   encrypt messages to that person. The encrypted messages must be decrypted
   with the corresponding private key. See also
   <a href="#public-key_cryptography">public-key cryptography</a>.</dd>
 
+<dt id="language_pack">language pack</dt><dd>A type of
+  <a href="#add-on">add-on</a> that adds a new language to the user interface
+  of &brandShortName;.</dd>
+
 <dt id="ldap">LDAP (Lightweight Directory Access Protocol)</dt><dd>A standard
   protocol for accessing directory services, such as corporate address books,
   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
@@ -390,58 +406,63 @@
   access your master key when Password Manager or Form Manager reads or adds to
   your personal information. You can set or change your master password from
   the Master Passwords preferences panel. Each security device requires a
   separate master password. See also <a href="#private_key">private key</a>,
   <a href="#master_key">master key</a>.</dd>
 
 <dt id="misrepresentation">misrepresentation</dt><dd>Presentation of an entity
   as a person or organization that it is not. For example, a website might
-  pretend to be a furniture store when it is really just a site that takes
+  pretend to be a furniture store when it is really just a website that takes
   credit card payments but never sends any goods. See also
   <a href="#spoofing">spoofing</a>.</dd>
 
 <dt id="navigation_toolbar">Navigation Toolbar</dt><dd>The toolbar near the top
   of the browser window that includes the Back and Forward buttons.</dd>
 
 <dt id="nonrepudiation">nonrepudiation</dt><dd>The inability, of the sender of
   a message, to deny having sent the message. A regular hand-written signature
   provides one form of nonrepudiation. A
   <a href="#digital_signature">digital signature</a> provides another.</dd>
 
+<dt id="notification_bar">notification bar</dt><dd>A bar that appears at the
+  top of the content area to inform you about something that needs your
+  attention, e.g. when the Password Manager can save a password for you, a
+  popup has been blocked or an additional plugin is required.</dd>
+
 <dt id="object_signing">object signing</dt><dd>A technology that allows
   software developers to sign Java code, JavaScript scripts, or any kind of
   file, and that allows users to identify the signers and control access by
   signed code to local system resources.</dd>
 
 <dt id="object-signing_certificate">object-signing certificate</dt><dd>A
   certificate whose corresponding private key is used to sign objects such as
   code files. See also <a href="#object_signing">object signing</a>.</dd>
 
 <dt id="ocsp">OCSP (Online Certificate Status Protocol)</dt><dd>A set of rules
   that <a href="#certificate_manager">Certificate Manager</a> follows to
   perform an online check of a certificate&apos;s validity each time the
   certificate is used. This process involves checking the certificate against a
   list of valid certificates maintained at a specified website. Your computer
   must be online for OCSP to work.</dd>
 
-<dt id="p3p">P3P (Platform for Privacy Preferences)</dt><dd>A standard
-  published by the World Wide Web Consortium (W3C) designed to help users to
-  gain more control over the use of personal information by websites they
-  visit. For general information on the standard itself, see the online
-  document <a href="http://www.w3.org/P3P/">P3P Public Overview</a>.</dd>
+<dt id="opml">OPML (Outline Processor Markup Language)</dt><dd>An XML format
+  used to list <a href="#feed">feed</a> collections. Although broader in its
+  specification, it is mainly used nowadays to export and import feed
+  collections between different feed aggregators or readers, like
+  &brandShortName;.</dd>
 
 <dt id="password-based_authentication">password-based
   authentication</dt><dd>Confident identification by means of a name and
   password. See also <a href="#authentication">authentication</a>.</dd>
 
 <dt id="password_manager">Password Manager</dt><dd>The part of the
   browser that can help you remember some or all of your names and passwords by
   storing them on your computer&apos;s hard disk, and entering them for you
-  automatically when you visit such sites.</dd>
+  automatically when you visit such websites.</dd>
 
 <dt id="personal_toolbar">Personal Toolbar</dt><dd>The customizable toolbar
   that appears just below the location bar by default in the browser. It
   contains standard buttons such as Home, Bookmarks, and so on that you can add
   or remove. You can also add buttons for your favorite bookmarks, or folders
   containing groups of bookmarks.</dd>
 
 <dt id="phishing">Phishing</dt><dd>Phishing is a fraudulent business scheme in
@@ -515,34 +536,44 @@
   electronically or to sign and encrypt electronic data. Two keys are involved:
   a <a href="#public_key">public key</a> and a <a href="#private_key">private
   key</a>. The public key is published as part of a
   <a href="#certificate">certificate</a>, which associates that key with a
   particular identity. The corresponding private key is kept secret. Data
   encrypted with the public key can be decrypted only with the private key.
   </dd>
 
-<dt id="roaming_profile">roaming profile</dt><dd>A user profile (or parts of
-  it) stored on a remote <a href="#server">server</a> and used for sharing the
-  same settings and data across multiple computers.</dd>
-
 <dt id="root_ca">root CA</dt><dd>The
   <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="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>
 
+<dt id="secure_authentication">secure authentication</dt><dd>A type of
+  <a href="#authentication">authentication</a> which uses a
+  <a href="#secure_connection">secure connection</a> so the communication
+  between client and server is encrypted.</dd>
+
+<dt id="secure_connection">secure connection</dt><dd>A connection between a
+  client and a server which uses some type of encryption (usually,
+  <a href="#ssl">SSL</a>) to ensure it can&apos;t be intercepted by
+  third-parties. Most of the time, the server is the one providing the
+  certificate to identify itself.</dd>
+
 <dt id="security_certificate">security certificate</dt><dd>See
   <a href="#certificate">certificate</a>.</dd>
 
 <dt id="security_device">security device</dt><dd>Hardware or software that
   provides cryptographic services such as encryption and decryption and can
   store certificates and keys. A <a href="#smart_card">smart card</a> is one
   example of a security device implemented in hardware.
   <a href="#certificate_manager">Certificate Manager</a> contains its own
@@ -613,31 +644,36 @@
   security device stores the master key used by
   <a href="#password_manager">Password Manager</a> to encrypt email passwords,
   website passwords, and other sensitive information. See also
   <a href="#private_key">private key</a> and <a href="#master_password">master
   key</a>.</dd>
 
 <dt id="spoofing">spoofing</dt><dd>Pretending to be someone else. For example,
   a person can pretend to have the email address <tt>jdoe@mozilla.com</tt>, or
-  a computer can identify itself as a site called <tt>www.mozilla.com</tt> when
-  it is not. Spoofing is one form of
+  a computer can identify itself as a website called <tt>www.mozilla.com</tt>
+  when it is not. Spoofing is one form of
   <a href="#misrepresentation">misrepresentation</a>.</dd>
 
 <dt id="ssl">SSL (Secure Sockets Layer)</dt><dd>A protocol that allows mutual
   authentication between a <a href="#client">client</a> and a
   <a href="#server">server</a> for the purpose of establishing an authenticated
   and encrypted connection. SSL runs above <a href="#tcp_ip">TCP/IP</a> and
   below <a href="#http">HTTP</a>, <a href="#ldap">LDAP</a>,
   <a href="#imap">IMAP</a>, NNTP, and other high-level network protocols.
   The new Internet Engineering Task Force (IETF) standard called Transport
   Layer Security (TLS) is based on SSL. See also
   <a href="#authentication">authentication</a>,
   <a href="#encryption">encryption</a>.</dd>
 
+<dt id="starttls">STARTTLS</dt><dd>An extension to common standard TCP
+  protocols (like SMTP, POP or IMAP) so the client can tell the server to
+  use <a href="#tls">TLS</a> on the same TCP port as for non-secure
+  connections.</dd>
+
 <dt id="status_bar">Status Bar</dt><dd>The toolbar that appears at the bottom
   of any &brandShortName; window. It includes the
   <a href="#component_bar">Component Bar</a> on the left and status icons on
   the right.</dd>
 
 <dt id="subject">subject</dt><dd>The entity (such as a person, organization,
   or router) identified by a <a href="#certificate">certificate</a>. In
   particular, the subject field of a certificate contains the certified
@@ -666,21 +702,26 @@
 
 <dt id="tcp">TCP</dt><dd>See <a href="#tcp_ip">TCP/IP</a>.</dd>
 
 <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="tls">TLS</dt><dd>See <a href="#ssl">SSL
-  (Secure Sockets Layer).</a>.</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>
 
 <dt id="tooltip">tooltip</dt><dd>A small box with text that appears when
   you hover your mouse's cursor over certain items. It usually contains
   information regarding the item being hovered over.</dd>
 
@@ -731,12 +772,10 @@
   language used to convert an XML document into another XML document or into
   some other format.</dd>
 
 <dt id="xul">XUL (XML User Interface Language)</dt><dd>A XML markup language
   for creating user interfaces in applications.</dd>
 
 </dl>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/help-glossary.rdf
+++ b/suite/chrome/common/help/help-glossary.rdf
@@ -2,16 +2,17 @@
 
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:nc="http://home.netscape.com/NC-rdf#">
 
 <!--  HELP Glossary SECTION -->
   <rdf:Description about="urn:root">
     <nc:subheadings>
       <rdf:Seq>
+        <rdf:li> <rdf:Description nc:name="add-on" nc:link="glossary.xhtml#add-on"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="authentication" nc:link="glossary.xhtml#authentication"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="bookmark" nc:link="glossary.xhtml#bookmark"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="CA" nc:link="glossary.xhtml#ca"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="CA certificate" nc:link="glossary.xhtml#ca_certificate"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="cache" nc:link="glossary.xhtml#cache"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="certificate" nc:link="glossary.xhtml#certificate"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="certificate authority (CA)" nc:link="glossary.xhtml#certificate_authority"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="certificate backup password" nc:link="glossary.xhtml#certificate_backup_password"/> </rdf:li>
@@ -35,87 +36,93 @@
         <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="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="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="Form Manager" nc:link="glossary.xhtml#form_manager"/> </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="Gopher" nc:link="glossary.xhtml#gopher"/> </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>
         <rdf:li> <rdf:Description nc:name="HTTPS" nc:link="glossary.xhtml#https"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="IMAP" nc:link="glossary.xhtml#imap"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="implicit consent" nc:link="glossary.xhtml#implicit_consent"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Internet" nc:link="glossary.xhtml#internet"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="IP address" nc:link="glossary.xhtml#ip_address"/> </rdf:li>
         <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="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>
         <rdf:li> <rdf:Description nc:name="OCSP" nc:link="glossary.xhtml#ocsp"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="P3P" nc:link="glossary.xhtml#p3p"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="OPML" nc:link="glossary.xhtml#opml"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="password-based authentication" nc:link="glossary.xhtml#password-based_authentication"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Password Manager" nc:link="glossary.xhtml#password_manager"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Personal Toolbar" nc:link="glossary.xhtml#personal_toolbar"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="phishing" nc:link="glossary.xhtml#phishing"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="PKCS #11" nc:link="glossary.xhtml#pkcs_11"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="PKCS #11 module" nc:link="glossary.xhtml#pkcs_11_module"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="PKI" nc:link="glossary.xhtml#pki"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="plugin" nc:link="glossary.xhtml#plugin"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="POP" nc:link="glossary.xhtml#pop"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="private 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="roaming profile" nc:link="glossary.xhtml#roaming_profile"/> </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="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>
         <rdf:li> <rdf:Description nc:name="server authentication" nc:link="glossary.xhtml#server_authentication"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="server SSL certificate" nc:link="glossary.xhtml#server_ssl_certificate"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="signing certificate" nc:link="glossary.xhtml#signing_certificate"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="signing key" nc:link="glossary.xhtml#signing_key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="slot" nc:link="glossary.xhtml#slot"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="smart card" nc:link="glossary.xhtml#smart_card"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="SMTP" nc:link="glossary.xhtml#smtp"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="SOCKS" nc:link="glossary.xhtml#socks"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="software security device" nc:link="glossary.xhtml#software_security_device"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="spoofing" nc:link="glossary.xhtml#spoofing"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="SSL" nc:link="glossary.xhtml#ssl"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="STARTTLS" nc:link="glossary.xhtml#starttls"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Status Bar" nc:link="glossary.xhtml#status_bar"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="subject" nc:link="glossary.xhtml#subject"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="subject name" nc:link="glossary.xhtml#subject_name"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="subordinate CA" nc:link="glossary.xhtml#subordinate_ca"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="symmetric encryption" nc:link="glossary.xhtml#symmetric_encryption"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="tamper detection" nc:link="glossary.xhtml#tamper_detection"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="TCP" nc:link="glossary.xhtml#tcp"/> </rdf:li>
+        <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="web page" nc:link="glossary.xhtml#web_page"/> </rdf:li>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -9,16 +9,21 @@
          nc:name="Account Settings"
          nc:link="mail_help.xhtml#changing_the_settings_for_an_account"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="adding"
          nc:name="adding"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="add-ons"
+         nc:name="add-ons"
+         nc:link="customize_help.xhtml#add-ons"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="address_books"
          nc:name="address books"
          nc:link="mail_help.xhtml#about_address_books"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="attaching_files_to_messages"
          nc:name="attaching files to messages"
          nc:link="mail_help.xhtml#attaching_a_file_or_web_page"/>
@@ -29,16 +34,21 @@
 <rdf:Description about="#adding">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="adding:images_to_web_pages"
          nc:name="inserting images to web pages"
          nc:link="composer_help.xhtml#inserting_an_image_into_your_page"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="adding:blog_account"
+         nc:name="creating a new blog account"
+         nc:link="mail_help.xhtml#setting_up_additional_mail_and_news_accounts"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="adding:mail_account"
          nc:name="creating a new mail account"
          nc:link="mail_help.xhtml#setting_up_additional_mail_and_news_accounts"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="adding:newsgroup_account"
          nc:name="adding a new newsgroup account"
          nc:link="mail_help.xhtml#setting_up_additional_mail_and_news_accounts"/>
@@ -86,16 +96,66 @@
      <rdf:li>
        <rdf:Description ID="address_books:searching"
          nc:name="searching your address book"
          nc:link="mail_help.xhtml#searching_address_books_and_directories"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="#add-ons">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="add-ons:about"
+         nc:name="about"
+         nc:link="customize_help.xhtml#about_add-ons"/>
+     </rdf:li>
+     <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"/>
+     </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: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: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: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"
          nc:name="backing up certificates"
          nc:link="certs_help.xhtml#your_certificates"/>
      </rdf:li>
      <rdf:li>
@@ -191,17 +251,17 @@
      <rdf:li>
        <rdf:Description ID="browser:home_page"
          nc:name="home page"
          nc:link="nav_help.xhtml#viewing_your_home_page"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="browser:keyboard_shortcuts"
          nc:name="keyboard shortcuts"
-         nc:link="shortcuts-navigator.xhtml"/>
+         nc:link="shortcuts_navigator.xhtml"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="browser:opening_pages"
          nc:name="opening pages"
          nc:link="nav_help.xhtml#moving_to_another_page"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="browser:preferences"
@@ -214,16 +274,26 @@
          nc:link="nav_help.xhtml#setting_image_as_wallpaper"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="browser:start_page"
          nc:name="start page"
          nc:link="customize_help.xhtml#specifying_a_starting_page"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="browser:session_restore"
+         nc:name="session restore"
+         nc:link="customize_help.xhtml#session_restore"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="browser:crash_recovery"
+         nc:name="crash recovery"
+         nc:link="customize_help.xhtml#session_restore"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="browser:start_up_components"
          nc:name="start up components"
          nc:link="customize_help.xhtml#specifying_which_components_open_at_launch"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#c">
@@ -308,29 +378,34 @@
          nc:link="certs_prefs_help.xhtml#privacy_and_security_preferences_certificates"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Certificates:selecting_for_client_authentication"
          nc:name="Selecting for client authentication"
          nc:link="certs_prefs_help.xhtml#client_certificate_selection"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="Certificates:server"
+         nc:name="server identity"
+         nc:link="using_certs_help.xhtml#managing_certificates_that_identify_servers"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Certificates:using"
          nc:name="Using Certificates"
          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"
          nc:name="website identity"
-         nc:link="using_certs_help.xhtml#managing_certificates_that_identify_websites"/>
+         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>
    </nc:subheadings>
 </rdf:Description>
@@ -410,17 +485,17 @@
      <rdf:li>
        <rdf:Description ID="Composer:inserting_images"
          nc:name="inserting images"
          nc:link="composer_help.xhtml#inserting_an_image_into_your_page"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Composer:keyboard_shortcuts"
          nc:name="keyboard shortcuts"
-         nc:link="shortcuts-composer.xhtml"/>
+         nc:link="shortcuts_composer.xhtml"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Composer:removing_text_styles"
          nc:name="removing text styles"
          nc:link="composer_help.xhtml#removing_or_discontinuing_text_styles"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Composer:saving_pages"
@@ -479,35 +554,30 @@
      </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 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:notification_icon"
          nc:name="notification icon"
          nc:link="using_priv_help.xhtml#cookie_notification"/>
      </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:privacy_levels_for"
-         nc:name="privacy levels"
-         nc:link="using_priv_help.xhtml#setting_privacy_levels"/>
-     </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:viewing"
          nc:name="viewing cookies"
          nc:link="using_priv_help.xhtml#viewing_cookies"/>
@@ -564,17 +634,17 @@
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Download_Manager">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Download_Manager:preferences"
-         nc:name="downoad manager preferences"
+         nc:name="download manager preferences"
          nc:link="cs_nav_prefs_navigator.xhtml#downloads"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#e">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -585,16 +655,21 @@
        <rdf:Description ID="encryption"
          nc:name="encryption"
          nc:link="mail_sec_help.xhtml#signing_and_encrypting_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="JSConsole"
          nc:name="error console"
          nc:link="developer_tools.xhtml#js_console"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="extensions_panel"
+         nc:name="extensions panel"
+         nc:link="customize_help.xhtml#the_extensions_panel"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#email_addresses">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="email_addresses:address_books_and"
@@ -637,16 +712,21 @@
          nc:link="using_certs_help.xhtml#checking_security_for_a_web_page"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#f">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
+       <rdf:Description ID="feeds"
+         nc:name="Feeds"
+         nc:link="glossary.xhtml#feed"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="file_types"
          nc:name="file types"
          nc:link="nav_help.xhtml#plugins_and_downloads"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Filing_messages"
          nc:name="Filing messages"
          nc:link="mail_help.xhtml#filing_messages_in_folders"/>
@@ -665,81 +745,36 @@
        <rdf:Description ID="FIPS_mode"
          nc:name="FIPS mode"
          nc:link="using_certs_help.xhtml#enable_fips_mode"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="font_changing_in_composer"
          nc:name="Font changing in Composer"
          nc:link="composer_help.xhtml#changing_text_color_style_and_font"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="Form_Manager"
-         nc:name="Form Manager"
-         nc:link="using_priv_help.xhtml#using_the_form_manager"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="#Form_Manager">
+<rdf:Description about="#feeds">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="Form_Manager:encrypting_stored_information"
-         nc:name="encrypting stored information"
-         nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="Form_Manager:preferences"
-         nc:name="form manager preferences"
-         nc:link="using_priv_help.xhtml#forms"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="Form_Manager:settings"
-         nc:name="form manager settings"
-         nc:link="using_priv_help.xhtml#form_settings"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="Form_Manager:using"
-         nc:name="using the form manager"
-         nc:link="using_priv_help.xhtml#using_the_form_manager"/>
+       <rdf:Description ID="feeds:subscribing"
+         nc:name="subscribing to a feed"
+         nc:link="mail_help.xhtml#subscribing_to_blogs_and_news_feeds"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="forms"
-         nc:name="forms"
-         nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
-<rdf:Description about="#forms">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="forms:encrypting_stored_information"
-         nc:name="encrypting stored information"
-         nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/>
+       <rdf:Description ID="feeds:reading"
+         nc:name="Reading a feed"
+         nc:link="mail_help.xhtml#reading_blogs_and_news_feed_messages"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="forms:filling_out_automatically"
-         nc:name="filling out automatically"
-         nc:link="using_priv_help.xhtml#filling_out_forms_automatically"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="forms:preferences"
-         nc:name="form preferences"
-         nc:link="using_priv_help.xhtml#forms"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="forms:saving_data"
-         nc:name="saving data from forms"
-         nc:link="using_priv_help.xhtml#saving_form_data"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="forms:storing_data_from"
-         nc:name="storing data from forms"
-         nc:link="using_priv_help.xhtml#managing_stored_form_data"/>
+       <rdf:Description ID="feeds:exporting_importing"
+         nc:name="exporting and importing feeds"
+         nc:link="mail_help.xhtml#exporting_and_importing_feeds"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#g">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="GIF"
@@ -801,21 +836,16 @@
      <rdf:li>
        <rdf:Description ID="IMAP"
          nc:name="IMAP"
          nc:link="mail_help.xhtml#about_internet_message_access_protocol"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="import"
          nc:name="import"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="intermediate_server_CA_certificates"
-         nc:name="intermediate server CA certificates"
-         nc:link="cert_dialog_help.xhtml#web_site_certified_by_an_unknown_authority"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 
 <rdf:Description about="#images">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -879,16 +909,21 @@
          nc:link="certs_help.xhtml#your_certificates"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="import:crls"
          nc:name="import CRLs"
          nc:link="using_certs_help.xhtml#importing_crls"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="import:feeds"
+         nc:name="import feeds"
+         nc:link="mail_help.xhtml#exporting_and_importing_feeds"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="import:mail"
          nc:name="import mail or settings from other programs"
          nc:link="mail_help.xhtml#importing_mail_from_other_programs"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#j">
@@ -940,49 +975,54 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#keyboard_shortcuts">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="keyboard_shortcuts:Composer"
          nc:name="Composer keyboard shortcuts"
-         nc:link="shortcuts-composer.xhtml"/>
+         nc:link="shortcuts_composer.xhtml"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="keyboard_shortcuts:general"
          nc:name="general keyboard shortcuts"
          nc:link="shortcuts.xhtml#general_mozilla_shortcuts"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="keyboard_shortcuts:help"
          nc:name="help keyboard shortcuts"
          nc:link="shortcuts.xhtml#using_shortcuts"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="keyboard_shortcuts:Mail_and_Newsgroups"
          nc:name="Mail and Newsgroups keyboard shortcuts"
-         nc:link="shortcuts-mailnews.xhtml"/>
+         nc:link="shortcuts_mailnews.xhtml"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="keyboard_shortcuts:Navigator"
          nc:name="Browser keyboard shortcuts"
-         nc:link="shortcuts-navigator.xhtml"/>
+         nc:link="shortcuts_navigator.xhtml"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#l">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="languages"
          nc:name="languages"
          nc:link="nav_help.xhtml#using_languages_and_international_content"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="languages_panel"
+         nc:name="languages panel"
+         nc:link="customize_help.xhtml#the_languages_panel"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="LDAP"
          nc:name="LDAP"
          nc:link="mail_help.xhtml#adding_and_removing_ldap_directories"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="lock_icon"
          nc:name="lock icon"
          nc:link="using_certs_help.xhtml#checking_security_for_a_web_page"/>
@@ -1015,17 +1055,17 @@
      <rdf:li>
        <rdf:Description ID="LDAP:directory_server_settings"
          nc:name="directory server settings"
          nc:link="mail_help.xhtml#directory_server_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="LDAP:global_settings"
          nc:name="LDAP settings"
-         nc:link="mail_help.xhtml#addressing_preferences"/>
+         nc:link="mailnews_preferences.xhtml#addressing_preferences"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#m">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="mail"
@@ -1060,27 +1100,27 @@
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:adding_accounts"
          nc:name="adding accounts"
          nc:link="mail_help.xhtml#setting_up_additional_mail_and_news_accounts"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:address_autocompletion"
          nc:name="address autocompletion"
-         nc:link="mail_help.xhtml#address_autocompletion"/>
+         nc:link="mailnews_preferences.xhtml#address_autocompletion"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:addressing_messages"
          nc:name="addressing messages"
          nc:link="mail_help.xhtml#addressing_a_message"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:addressing_preferences"
          nc:name="addressing preferences"
-         nc:link="mail_help.xhtml#addressing_preferences"/>
+         nc:link="mailnews_preferences.xhtml#addressing_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:Advanced_IMAP_settings"
          nc:name="Advanced IMAP settings"
          nc:link="mail_help.xhtml#advanced_imap_server_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:attaching_files"
@@ -1090,17 +1130,17 @@
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:changing_account_settings"
          nc:name="changing account settings"
          nc:link="mail_help.xhtml#changing_the_settings_for_an_account"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:Character_Encoding"
          nc:name="Character Encoding"
-         nc:link="mail_help.xhtml#character_encoding"/>
+         nc:link="mailnews_preferences.xhtml#character_encoding"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:Compose_window"
          nc:name="Compose window"
          nc:link="mail_help.xhtml#using_the_message_composition_window"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:composing_messages"
@@ -1128,34 +1168,34 @@
          nc:link="mail_help.xhtml#creating_a_folder"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:creating_HTML_mail_messages"
          nc:name="creating HTML mail messages"
          nc:link="mail_help.xhtml#creating_html_mail_messages"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="Mail_and_Newsgroups:Disk_Space_settings"
-         nc:name="Disk Space settings"
-         nc:link="mail_help.xhtml#offline_and_disk_space"/>
+       <rdf:Description ID="Mail_and_Newsgroups:disk_space_and_storage_settings"
+         nc:name="disk space and storage settings"
+         nc:link="mail_help.xhtml#synchronization_and_storage"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:filing_messages"
          nc:name="filing messages"
          nc:link="mail_help.xhtml#filing_messages_in_folders"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:forwarding_messages"
          nc:name="forwarding messages"
          nc:link="mail_help.xhtml#forwarding_a_message"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:general_preferences"
          nc:name="general mail preferences"
-         nc:link="mail_help.xhtml#mail_and_newsgroup_preferences"/>
+         nc:link="mailnews_preferences.xhtml#mail_and_newsgroup_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:getting_new_messages"
          nc:name="getting new messages"
          nc:link="mail_help.xhtml#getting_new_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:HTML_mail_recipients"
@@ -1183,16 +1223,26 @@
          nc:link="mail_help.xhtml#choosing_how_you_view_the_mail_window"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:message_searching"
          nc:name="message searching"
          nc:link="mail_help.xhtml#searching_through_messages"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="Mail_and_Newsgroups:network_preferences"
+         nc:name="Mail and Newsgroups Network preferences"
+         nc:link="mailnews_preferences.xhtml#network_and_storage_preferences"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="Mail_and_Newsgroups:offline_synchronization_settings"
+         nc:name="offline synchronization settings"
+         nc:link="mail_help.xhtml#synchronization_and_storage"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:POP_settings"
          nc:name="POP settings"
          nc:link="mail_help.xhtml#pop_server_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:renaming_folders"
          nc:name="renaming folders"
          nc:link="mail_help.xhtml#renaming_a_folder"/>
@@ -1325,26 +1375,31 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="OSCP"
          nc:name="OSCP"
          nc:link="using_certs_help.xhtml#how_validation_works"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Offline"
          nc:name="Offline"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="OPML"
+         nc:name="OPML"
+         nc:link="glossary.xhtml#opml"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Offline">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Offline:general_preferences"
          nc:name="offline preferences"
-         nc:link="mail_help.xhtml#offline_and_disk_space_preferences"/>
+         nc:link="mailnews_preferences.xhtml#network_and_storage_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Offline:Mail_and_Newsgroups"
          nc:name="Offline Mail and News"
          nc:link="mail_help.xhtml#working_offline"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -1367,16 +1422,21 @@
          nc:link="mail_help.xhtml#phishing_detection"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="plugins"
          nc:name="plugins"
          nc:link="nav_help.xhtml#plugins_and_downloads"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="plugins_panel"
+         nc:name="plugins panel"
+         nc:link="customize_help.xhtml#the_plugins_panel"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="POP"
          nc:name="POP"
          nc:link="mail_help.xhtml#about_post_office_protocol"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="passwords"
          nc:name="Passwords"
          nc:link="passwords_help.xhtml#passwords"/>
@@ -1532,21 +1592,16 @@
          nc:link="cs_nav_prefs_navigator.xhtml#downloads"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:fonts"
          nc:name="fonts preferences"
          nc:link="cs_nav_prefs_appearance.xhtml#fonts"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="preferences:forms"
-         nc:name="form preferences"
-         nc:link="using_priv_help.xhtml#forms"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="preferences:helper_applications"
          nc:name="helper application preferences"
          nc:link="cs_nav_prefs_navigator.xhtml#helper_applications"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:history"
          nc:name="history preferences"
          nc:link="cs_nav_prefs_navigator.xhtml#history"/>
@@ -1642,43 +1697,28 @@
          nc:link="privacy_help.xhtml#what_are_cookies_and_how_do_they_work"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="privacy:IP_address"
          nc:name="IP address"
          nc:link="privacy_help.xhtml#internet_address"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="privacy:P3P_levels"
-         nc:name="P3P levels"
-         nc:link="using_priv_help.xhtml#setting_privacy_levels"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="privacy:P3P_standard_and"
-         nc:name="P3P standard"
-         nc:link="page_info_help.xhtml"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="privacy:preferences"
          nc:name="privacy preferences"
          nc:link="privsec_help.xhtml"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="privacy:protecting"
          nc:name="protecting your privacy"
          nc:link="privacy_help.xhtml#using_privacy_features"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="privacy:settings"
-         nc:name="privacy settings"
-         nc:link="using_priv_help.xhtml#privacy_settings"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="privacy:viewing_site_policy"
-         nc:name="viewing site policy"
+         nc:name="viewing website policy"
          nc:link="page_info_help.xhtml"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#profiles">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1695,21 +1735,16 @@
        <rdf:Description ID="profiles:managing"
          nc:name="managing profiles"
          nc:link="profiles_help.xhtml#managing_profiles"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="profiles:renaming"
          nc:name="renaming a profile"
          nc:link="profiles_help.xhtml#deleting_or_renaming_a_profile"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="profiles:roaming"
-         nc:name="roaming profile"
-         nc:link="profiles_help.xhtml#roaming_profiles"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#proxies">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="proxies:advanced"
@@ -1759,17 +1794,17 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#return_receipts">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="return_receipts:general_preferences"
          nc:name="return receipts preferences"
-         nc:link="mail_help.xhtml#return_receipts_preferences"/>
+         nc:link="mailnews_preferences.xhtml#return_receipts_preferences"/>
      </rdf:li><rdf:li>
        <rdf:Description ID="return_receipts:using"
          nc:name="using return receipts"
          nc:link="mail_help.xhtml#confirming_that_your_message_was_opened"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
@@ -1784,21 +1819,16 @@
          nc:name="security"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="security_devices"
          nc:name="security devices"
          nc:link="using_certs_help.xhtml#about_security_devices_and_modules"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="server_certificate_problems"
-         nc:name="server certificate problems"
-         nc:link="cert_dialog_help.xhtml#web_site_certified_by_an_unknown_authority"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="settings"
          nc:name="settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="security_modules"
          nc:name="security modules"
          nc:link="using_certs_help.xhtml#about_security_devices_and_modules"/>
      </rdf:li>
@@ -2043,16 +2073,21 @@
          nc:link="mail_help.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>
@@ -2094,17 +2129,17 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Tags">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Tags:general_preferences"
          nc:name="tag preferences"
-         nc:link="mail_help.xhtml#tags"/>
+         nc:link="mailnews_preferences.xhtml#tags"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#toolbar">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="toolbar:hiding_a_toolbar"
--- a/suite/chrome/common/help/help-win.rdf
+++ b/suite/chrome/common/help/help-win.rdf
@@ -42,26 +42,16 @@
     <rdf:Seq><rdf:li>
       <rdf:Description ID="nav-doc-default"
         nc:name="Making &brandShortName; Your Default Browser"
         nc:link="nav_help.xhtml#making_mozilla_your_default_browser"/>
     </rdf:li></rdf:Seq>
   </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="suite-toc.rdf#advanced_pref_advanced">
-  <nc:subheadings>
-    <rdf:Seq><rdf:li>
-      <rdf:Description ID="advanced_pref_system"
-        nc:name="System"
-        nc:link="cs_nav_prefs_advanced.xhtml#system"/>
-    </rdf:li></rdf:Seq>
-  </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="help-index1.rdf#browser">
   <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="browser:default"
          nc:name="default browser"
          nc:link="nav_help.xhtml#making_mozilla_your_default_browser"/>
        </rdf:li></rdf:Seq>
    </nc:subheadings>
--- a/suite/chrome/common/help/helpFileLayout.css
+++ b/suite/chrome/common/help/helpFileLayout.css
@@ -37,17 +37,17 @@
 
 body {
 	margin: 2ex;
 	font-family: sans-serif;
 	font-size: 0.75em;
 	max-width: 120ex;
 }
 
-dd { margin-left: 0px; margin-bottom: 1em; }
+dd { -moz-margin-start: 0px; margin-bottom: 1em; }
 dt { font-size: 10pt; font-weight: bold; }
 tt { font-size: 10pt; }
 
 :link:hover,
 :visited:hover { color: -moz-activehyperlinktext; }
 
 h1 { font-size: 20pt; }
 h2 { border-top: 1px solid black; font-size: 16pt; padding-top: 0.2em; }
@@ -58,17 +58,19 @@ kbd { font-family: sans-serif; }
 .defaultTable { border-collapse: collapse; border: 1px solid grey;
   width: 100%; }
 
 .defaultTable td { border: 1px solid grey; padding: 4px; }
 
 .defaultTable th { background-color: #99ccff;
   border: 1px solid grey; font-size: 10pt; padding: 4px; text-align: left; }
 
-.defaultTable tbody > tr.even { background-color: #eeeeee; }
+.tbody-default > tr:nth-child(2n) {
+  background-color: #eeeeee;
+}
 
 .boilerPlate { font-size: 7pt; }
 
 .commandColumn { width: 40%; }
 .osFirstColumn { width: 20%; }
 .osSecondColumn { width: 20%; }
 .osThirdColumn { width: 20%; }
 
--- a/suite/chrome/common/help/help_help.xhtml
+++ b/suite/chrome/common/help/help_help.xhtml
@@ -29,27 +29,33 @@
     <li><a href="#retracing_your_steps">Retracing Your Steps and Printing</a></li>
     <li><a href="#using_help_buttons">Using Help Buttons</a></li>
     <li><a href="#search_tips">Search Tips</a></li>
   </ul>
 </div>
 
 <h2 id="finding_the_topic_you_want">Finding the Topic You Want</h2>
 
-
 <ul>
   <li>Main topics are listed in the left sidebar. Click a topic to read about
-    it. To see its subtopics, double-click or click the <span class="noMac">
-    plus-sign</span><span class="mac">triangle</span> at the left.</li>
+    it. To see its subtopics, double-click or click the plus-sign/triangle to
+    the left.</li>
   <li>Type a word or phrase in the search field to display a list of related
-    topics.
-
-    <p>If your search doesn&apos;t return anything, try typing fewer words or a
-      different combination of words.</p>
+    topics.<br/>
+    If your search doesn&apos;t return anything, try typing fewer words or a
+    different combination of words.
   </li>
+  <li>To search inside a page, use the <kbd class="mac">Cmd</kbd><kbd
+    class="noMac">Ctrl</kbd>+<kbd>F</kbd> shortcut. Enter the word or phrase
+    you would like to find into the text field of the bar that will open at the
+    bottom and press <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>,
+    or use the <q>Next</q> and <q>Previous</q> buttons to find the next match in
+    the chosen direction. Use <q>Highlight all</q> to highlight your search
+    phrase within the whole page. If you want to do a case-sensitive search,
+    check the <q>Match case</q> box.</li>
 </ul>
 
 <p>To see information related to the Help topic you are reading, click
   links in the Help window just as you would in a regular web page.</p>
 
 <h2 id="retracing_your_steps">Retracing Your Steps and Printing</h2>
 
 <p>To retrace your steps in Help, click the buttons near the top left corner of
@@ -99,12 +105,10 @@
     &brandShortName;; this is not a general Internet search.</li>
   <li>Try to broaden your search&mdash;don&apos;t be too specific; terms
     could be worded differently than your search.</li>
   <li>At the same time, you should avoid being too broad with your
     search terms: a word like <q>web</q> will probably return far too
     many hits.</li>
 </ul>
 
-<p>&copyright.string;</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/mail_help.xhtml
+++ b/suite/chrome/common/help/mail_help.xhtml
@@ -4,18 +4,19 @@
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Using &brandShortName; Mail &amp; Newsgroups</title>
-<link rel="stylesheet" href="helpFileLayout.css"
-  type="text/css"/>
+<link rel="stylesheet" href="helpFileLayout.css" type="text/css"/>
+<link rel="stylesheet" href="chrome://communicator/skin/smileys.css"
+      type="text/css"/>
 </head>
 <body>
 
 <div class="boilerPlate">This document is provided for your information only.
   It may help you take certain steps to protect the privacy and security of
   your personal information on the Internet. This document does not, however,
   address all online privacy and security issues, nor does it represent a
   recommendation about what constitutes adequate privacy and security
@@ -58,22 +59,24 @@
     <li><a href="#deleting_messages">Deleting Messages</a></li>
     <li><a href="#using_address_books">Using Address Books</a></li>
     <li><a href="#organizing_your_messages">Organizing Your Messages</a></li>
     <li><a href="#controlling_junk_mail">Controlling Junk Mail</a></li>
     <li><a href="#importing_mail_from_other_programs">Importing Mail from Other
       Programs</a></li>
     <li><a href="#getting_started_with_newsgroups">Getting Started with
       Newsgroups</a></li>
+    <li><a href="#getting_started_with_blogs_and_news_feeds">Getting Started
+      with Blogs &amp; News Feeds</a></li>
     <li><a href="#working_offline">Working Offline</a></li>
     <li><a href="mail_sec_help.xhtml">Signing &amp; Encrypting
       Messages</a></li>
     <li><a href="#mail_and_newsgroups_account_settings">Mail &amp; Newsgroups
       Account Settings</a></li>
-    <li><a href="#mail_and_newsgroup_preferences">Mail &amp; Newsgroups
+    <li><a href="mailnews_preferences.xhtml">Mail &amp; Newsgroups
       Preferences</a></li>
   </ul>
 </div>
 
 <h1 id="getting_started_with_mozilla_mail_and_newsgroups">Getting Started with
   &brandShortName; Mail &amp; Newsgroups</h1>
 
 <div class="contentsBox">In this section:
@@ -85,29 +88,30 @@
     <li><a href="#changing_the_settings_for_an_account">Changing the Settings
       for an Account</a></li>
   </ul>
 </div>
 
 <h2 id="using_the_mail_account_setup_wizard">Using the Mail Account Setup
   Wizard</h2>
 
-<p>To set up a mail or newsgroup account, first open the Window menu and choose
-  Mail &amp; Newsgroups. If you haven&apos;t already set up an account, the
-  Account Wizard appears automatically, enabling you to set up an account.</p>
+<p>To set up a mail, newsgroup or blogs &amp; news feeds account, first open
+  the Window menu and choose Mail &amp; Newsgroups. If you haven&apos;t
+  already set up an account, the Account Wizard appears automatically, enabling
+  you to set up an account.</p>
 
 <p>The Account Wizard guides you through the process of creating a new account.
   If you don&apos;t know a setting, click Cancel and ask your Internet service
   provider (ISP) or help desk.</p>
 
 <p>If an account already exists, the Account Wizard doesn&apos;t appear
   automatically when the Mail window opens. Instead, after opening the Mail
   window, open the File menu and choose New, then Account. For more details,
   see <a href="#setting_up_additional_mail_and_news_accounts">Setting Up
-  Additional Mail &amp; News Accounts</a>.</p>
+  Additional Mail, News &amp; Blogs &amp; News Feeds Accounts</a>.</p>
 
 <h3 id="setting_up_mail_accounts_with_an_isp_or_email_provider">Setting Up Mail
   Accounts with an ISP or Email Provider</h3>
 
 <p>Before you set up a mail account, your ISP or email provider should give you
   the following information:</p>
 
 <ul>
@@ -122,33 +126,36 @@
   give you the following information:</p>
 
 <ul>
   <li>your email address</li>
   <li>newsgroup server name</li>
   <li>account name</li>
 </ul>
 
-<p>To set up a new mail or newsgroup account, begin from the Mail window:</p>
+<p>To set up a new mail, newsgroup or blogs &amp; news feeds account, begin
+  from the Mail window:</p>
 
 <ol>
   <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
     see the Mail &amp; Newsgroups Account Settings dialog box.</li>
   <li>Click Add Account to start the Account Wizard.
 
     <p>The information requested by the Account Wizard depends on the type of
       new account you specify in its first window. The boldface headings that
       follow correspond to the windows you&apos;ll see when you&apos;re setting
       up an ISP or email provider account.</p>
   </li>
   <li><strong>New Account Setup</strong>: Choose the type of account you want
     to set up, then click the right arrow.</li>
   <li><strong>Identity</strong>: Enter the name and email address appropriate
-    for this account, then click the right arrow.</li>
-  <li><strong>Server Information</strong>:
+    for this account, then click the right arrow. This window is not available
+    for the Blogs &amp; News Feeds account type.</li>
+  <li><strong>Server Information</strong>: This window is not available for
+    for the Blogs &amp; News Feeds account type.
     <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="#server_settings">Mail &amp; Newsgroups Account Settings -
         Server Settings</a>.</li>
       <li>Enter the name of your incoming mail 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
@@ -163,17 +170,18 @@
           explicitly listed in the account setup information provided to you.
           For example, your SMTP host may be the same as your POP or IMAP host.
           If in doubt, contact your ISP or system administrator.</p>
       </li>
       <li>Click the right arrow to continue.</li>
     </ul>
   </li>
   <li><strong>User Names</strong>: Enter the incoming and outgoing user names
-    provided by your ISP or email provider, then click the right arrow.</li>
+    provided by your ISP or email provider, then click the right arrow. This
+    window is not available for the Blogs &amp; News Feeds account type.</li>
   <li><strong>Account Name</strong>: Enter whatever name you want to use to
     refer to this account, then click the right arrow.</li>
   <li><strong>Congratulations!</strong> Verify that the information you entered
     is correct. If necessary, verify the information you entered with your ISP
     or system administrator. When you are sure that it&apos;s correct, click
     Finish to set up your account.</li>
   <li>You see your new account listed in the left side of the Mail &amp;
     Newsgroups Account Settings dialog box. Click OK to start using your new
@@ -204,29 +212,32 @@
 <p>To add a new account or change settings for an existing account, begin from
   the Mail window:</p>
 
 <ol>
   <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
     see the Mail &amp; Newsgroups Account Settings dialog box. You can perform
     these tasks:
     <ul>
-      <li><strong>Add Account</strong>: Click this button to set up a new mail
-        or news account. Be sure to type the account information exactly as it
-        is given to you. Move through the screens with the arrows, or click
-        Cancel to stop account creation.</li>
+      <li><strong>Add Account</strong>: Click this button to set up a new mail,
+        news or blogs &amp; news feeds account. Be sure to type the account
+        information exactly as it is given to you. Move through the screens
+        with the arrows, or click Cancel to stop account creation.</li>
       <li><strong>Set as Default</strong>: Select an account, then click this
         button to make the selected account appear at the top of your list of
         accounts in the Mail Window. The change takes effect the next time you
         open Mail &amp; Newsgroups.
 
         <p>The default account is the one that you want to log into and (for
           IMAP accounts only) automatically check for new messages when you
           start Mail &amp; Newsgroups. (For POP accounts, you must always click
           the Get Msg button to get new messages.)</p>
+        
+        <p><strong>Note:</strong> You can&apos;t set a blogs &amp; news feeds
+          account as default.</p>
       </li>
       <li><strong>Remove Account</strong>: Select an account, then click this
         button to remove it completely from your Mail window.</li>
       <li><strong>Outgoing Server (SMTP)</strong>: Click this (at the bottom of
         the list of accounts) to modify information about the outgoing mail
         server. See <a href="#outgoing_server">Mail &amp; Newsgroups Account
         Settings - Outgoing Server (SMTP)</a> for more information.</li>
     </ul>
@@ -245,17 +256,17 @@
 <p>To view or change information for an existing mail or newsgroup account,
   begin from the Mail window:</p>
 
 <ol>
   <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
     see the Mail &amp; Newsgroups Account Settings dialog box.</li>
   <li>Click the account name in the left-hand side of the Account Settings
     dialog box. You see information about the account, such as your email
-    address and signature file, in the right side of the dialog box.</li>
+    address and signature, in the right side of the dialog box.</li>
   <li>Click any of these items beneath the name of an account to see the
     corresponding settings:
     <ul>
       <li><strong>Server Settings</strong>: The settings available depend on
         the type of server (IMAP, POP, or newsgroup server). For more
         information, see <a href="#server_settings">Mail &amp; Newsgroups
         Account Settings - Server Settings</a>.
 
@@ -272,28 +283,30 @@
         templates. For more information, see <a href="#copies_and_folders">Mail
         &amp; Newsgroups Account Settings - Copies &amp; Folders</a>.</li>
       <li><strong>Composition &amp; Addressing</strong>: These settings allow
         you to choose your default format and quoting behavior when composing a
         message. You can also override the global directory server settings
         specified for all address books in the Preferences dialog box. For more
         information, see <a href="#addressing">Mail &amp; Newsgroups Account
         Settings - Composition &amp; Addressing</a>.</li>
-      <li><strong>Offline &amp; Disk Space (IMAP and News accounts
+      <li><strong>Synchronization &amp; Storage (IMAP and News accounts
         only)</strong>: These settings apply when you are working offline
         (disconnected from the Internet) or need to save download time and
         conserve disk space. For more information, see
-        <a href="#offline_and_disk_space_settings_imap">Offline and Disk Space
-        Settings (IMAP)</a> or
-        <a href="#offline_and_disk_space_settings_nntp">Offline and Disk Space
-        Settings (News)</a>.</li>
-      <li><strong>Disk Space (POP accounts only)</strong>: This setting
-        determines the maximum size of messages that you are willing to
-        download to your hard disk. For more information, see
-        <a href="#disk_space_settings">Disk Space Settings (POP)</a>.</li>
+        <a href="#synchronization_and_storage_settings_imap">Synchronization
+        &amp; Storage Settings (IMAP)</a> or
+        <a href="#synchronization_and_storage_settings_nntp">Synchronization
+        &amp; Storage Settings (News)</a>.</li>
+      <li><strong>Disk Space (POP and blogs &amp; news feeds accounts
+        only)</strong>: This setting helps you manage the amount of disk
+        space that downloaded messages take up on your hard disk. For more
+        information, see <a href="#disk_space_settings_pop">Disk Space Settings
+        (POP)</a> or <a href="#disk_space_settings_blog">Disk Space Settings
+        (Blogs)</a>.</li>
       <li><strong>Security</strong>: These settings determine which
         <a href="glossary.xhtml#certificate">certificates</a> are used to
         digitally sign and encrypt mail messages that you send. Digital
         signatures allow you to identify yourself reliably to others in
         mail messages that you send. Encryption helps ensure that your
         messages remain private while they are in transit over the
         Internet. For more information, see
         <a href="#security">Mail &amp; Newsgroups Account Settings -
@@ -329,16 +342,25 @@
   for the IMAP account.</p>
 
 <p>For a POP account, you must select the Inbox and click Get Msgs to retrieve
   your messages. By default, messages from your POP account are downloaded in
   full and deleted from the POP server when you retrieve them. You can
   <a href="#pop_server_settings">change your POP server settings</a> to
   retrieve just the headers and/or store a copy of messages on the server in
   addition to downloading them to your computer.</p>
+  
+<p>For news accounts, expanding the account newsgroups list will automatically
+  check for new items, as it will by just selecting one of the newsgroups.
+  While reading a newsgroup, you can force checking for new items by clicking
+  Get Msgs.</p>
+
+<p>For blogs &amp; feeds accounts, the first time you expand the account, it
+  will be checked for new items. Besides that, you can force checking for new
+  items at any time by clicking Get Msgs.</p>
 
 <p>You can also set up Mail &amp; Newsgroups to get new messages at startup and
   to check for new messages at timed intervals.</p>
 
 <table>
   <tr>
     <td colspan="2"><img src="images/task_mail.png" alt=""/></td>
   </tr>
@@ -384,18 +406,19 @@
         Msgs in the Mail window.</li>
     </ul>
   </li>
   <li>Click OK. Your settings take effect the next time you start
     &brandShortName; Mail &amp; Newsgroups.</li>
 </ol>
 
 <p>To set up &brandShortName; Mail &amp; Newsgroups to play a sound or display
-  an alert when new mail arrives, see <a href="#notifications">Mail &amp;
-  Newsgroups Preferences - Notifications</a>.</p>
+  an alert when new mail arrives, see <a
+  href="mailnews_preferences.xhtml#notifications">Mail &amp; Newsgroups
+  Preferences - Notifications</a>.</p>
 
 <p>You can always retrieve messages manually at any time. To get new messages
   for the selected account or newsgroup, do one of the following:</p>
 
 <ul>
   <li>Click Get Msgs on the Mail toolbar.</li>
   <li>Open the File menu (in the Mail window) and choose Get New Messages.</li>
 </ul>
@@ -501,23 +524,23 @@
 </table>
 
 <p><strong>Tip</strong>: The thread button automatically sorts the threads by
   the age of their parent messages. If you want to use another sort criterion
   for the threads, open the View menu and select the desired option from the
   Sort by submenu.</p>
 
 <p><strong>Tip</strong>: Select <q>Preserve threading when sorting messages</q>
-  in the <a href="#mail_and_newsgroups">Mail &amp; Newsgroups Preferences</a>
-  if you want &brandShortName; to preserve the threaded message grouping when
-  sorting messages with column header clicks. The thread button just toggles
-  between threaded and unthreaded message grouping in this mode. If <q>Preserve
-  threading when sorting messages</q> is not selected, &brandShortName;
-  automatically displays the messages unthreaded when you sort them by clicking
-  on a column header.</p>
+  in the <a href="mailnews_preferences.xhtml#mail_and_newsgroups">Mail &amp;
+  Newsgroups Preferences</a> if you want &brandShortName; to preserve the
+  threaded message grouping when sorting messages with column header clicks. The
+  thread button just toggles between threaded and unthreaded message grouping in
+  this mode. If <q>Preserve threading when sorting messages</q> is not selected,
+  &brandShortName; automatically displays the messages unthreaded when you sort
+  them by clicking on a column header.</p>
 
 <p><strong>Tip</strong>: To help you identify unread messages in a collapsed
   thread where you&apos;ve read the parent message, &brandShortName; Mail &amp;
   Newsgroups underlines the parent message.</p>
 
 <p>[<a href="#reading_messages">Return to beginning of section</a>]</p>
 
 <h2 id="saving_and_printing_messages">Saving and Printing Messages</h2>
@@ -552,41 +575,39 @@
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click Message Display. (If
     no subcategories are visible, double-click Mail &amp; Newsgroups to
     expand the list.)</li>
   <li>Uncheck <q>Block images and other content from remote sources</q>.</li>
-  <li>Click OK to have your change take affect.</li>
+  <li>Click OK to have your change take effect.</li>
 </ol>
 
 <p><strong>Note</strong>: See <q>Allow remote images in HTML mail</q> in
   <a href="#creating_a_new_address_book_card">Creating a New Address Book
   Card</a> for details of how to change which senders can show remote
   content.</p>
 
-<p>By default, JavaScript and plugins are not enabled for mail messages you
-  receive. To change these settings:</p>
+<p>By default, plugins are not enabled for mail messages you receive. To change
+  this setting:</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 Scripts &amp; Plugins. (If no
     subcategories are visible, double-click Advanced to expand the
     list.)
     <ul>
-      <li>Under <q>Enable JavaScript for</q>, check <q>Mail &amp;
-        Newsgroups</q> to enable JavaScript.</li>
       <li>Under <q>Enable Plugins for</q>, check <q>Mail &amp; Newsgroups</q>
         to enable plugins.</li>
     </ul>
   </li>
-  <li>Click OK to have your changes take affect.</li>
+  <li>Click OK to have your changes take effect.</li>
 </ol>
 
 <p>[<a href="#reading_messages">Return to beginning of section</a>]</p>
 
 <h1 id="sending_messages">Sending Messages</h1>
 
 <div class="contentsBox">In this section:
   <ul>
@@ -626,16 +647,22 @@
 
 <p><strong>Tip</strong>: Use the Mail &amp; Newsgroups Account Settings - 
   <a href="#addressing">Composition &amp; Addressing</a> dialog box to specify
   the HTML text editor to use for composing messages sent from this account.
   (You can specify a different editor for each of your accounts.) See
   <a href="#changing_the_settings_for_an_account">Changing the Settings for an
   Account</a> for more information.</p>
 
+<p><strong>Note</strong>: It is generally not possible to compose messages for
+  them to be published in blogs &amp; news feeds accounts. If you want to
+  publish posts in a blog (and you have the appropiate rights to do it), you
+  will need to use the mechanisms provided by the specific blog system. In some
+  cases, this can even include sending a mail message to a specific address.</p>
+
 <p>Composing messages in HTML format allows you to use different fonts, text
   styles (such as bold or italic) and text colors, tables, numbered or bulleted
   lists, and pictures in your messages. However, some recipients may only be
   able to read messages composed in plain text format. If you want to use the
   plain-text editor occasionally, you can hold down the Shift key while
   clicking the Compose or the Reply button to use the plain-text editor on an
   as-needed basis.</p>
 
@@ -693,22 +720,24 @@
 
 <h2 id="addressing_a_message">Addressing a Message</h2>
 
 <p>To address a mail message:</p>
 
 <ol>
   <li>Type the name in the addressing area.
 
-    <p>If you have <a href="#address_autocompletion">address autocompletion</a>
-      enabled (it&apos;s enabled by default), type the first few letters of
-      the recipient&apos;s name and wait for Mail &amp; Newsgroups to complete
-      the address. (Or you can type part of the name and immediately press
-      <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd> to have Mail
-      &amp; Newsgroups try to complete the address.)</p>
+    <p>If you have <a
+      href="mailnews_preferences.xhtml#address_autocompletion">address
+      autocompletion</a> enabled (it&apos;s enabled by default), type the first
+      few letters of the recipient&apos;s name and wait for Mail &amp;
+      Newsgroups to complete the address. (Or you can type part of the name and
+      immediately press <kbd class="mac">Return</kbd><kbd
+      class="noMac">Enter</kbd> to have Mail &amp; Newsgroups try to complete
+      the address.)</p>
   </li>
   <li>If multiple addresses are displayed, select an address and press
     <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>.
 
     <p><strong>Note</strong>: Use a comma to separate multiple addresses on the
       same line. Do not use a comma to separate first or last names. For
       example, multiple entries might be:</p>
 
@@ -799,18 +828,18 @@
   <li><strong>Quote Message</strong>: Choose this option to have the selection
     of the message text shown as quoted text.</li>
   <li><strong>Return Receipt</strong>: Choose this option to request a
     confirmation message when the recipient displays (opens) the message. Keep
     in mind that the recipient may choose not to send you a return receipt.
     This option lets you enable or disable return receipt requests on a
     per-message basis. To automatically request return receipts for all
     messages you send, use the return receipts preferences. See
-    <a href="#return_receipts_preferences">Mail &amp; Newsgroups Preferences -
-    Return Receipts</a> for more information.</li>
+    <a href="mailnews_preferences.xhtml#return_receipts_preferences">Mail &amp;
+    Newsgroups Preferences - Return Receipts</a> for more information.</li>
   <li><strong>Format</strong>: Send the message as plain text, or HTML
     (formatted), or both. If you choose <q>Auto-Detect</q>, Mail &amp;
     Newsgroups prompts you for the format to use if it&apos;s unknown whether
     the recipient&apos;s mail program can display an HTML message. The format
     you choose here overrides the send format you specified using the
     Preferences command on the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu.</li>
   <li><strong>Priority</strong>: Choose a priority to indicate whether the
@@ -826,20 +855,20 @@
 
 <p>An additional message formatting option is available from the Edit menu:</p>
 
 <ul>
   <li><strong>Rewrap</strong>: If you are composing a message using the
     plain-text editor, you can use the Rewrap command to rewrap long lines of
     quoted text to fit the Compose window. This command rewraps selected quoted
     text to the number of characters specified by the
-    <a href="#composition">Composition</a> preferences. This command is
-    primarily useful when you are replying to a message where the original
-    message is quoted in your reply, and the original message contains long
-    lines.
+    <a href="mailnews_preferences.xhtml#composition">Composition</a>
+    preferences. This command is primarily useful when you are replying to a
+    message where the original message is quoted in your reply, and the original
+    message contains long lines.
 
     <p>You use the Mail &amp; Newsgroups Account Settings command on the Edit
       menu to specify that you want to use the plain-text editor for composing
       messages. Select the Composition &amp; Addressing panel of the account
       and uncheck <q>Compose messages in HTML format</q> to use the plain-text
       editor for all messages. If you only want to use the plain-text editor
       occasionally, you can hold down the Shift key while clicking the Compose
       or the Reply button to use the plain-text editor on an as-needed
@@ -876,16 +905,20 @@
     to every outgoing message and selected to start your reply above the quote
     here, you can additionally configure where your signature is placed:
     <ul>
       <li>Select <q>below the quote (recommended)</q> to place your signature
         at the very end of the message below the quoted text.</li>
       <li>Select <q>below my reply (above the quote)</q> to place your
         signature between your reply and the quoted text.</li>
     </ul>
+
+    <p><strong>Note</strong>: If you have created a signature, you can
+      optionally <a href="#addressing">omit it</a> when replying to a
+      message.</p>
   </li>
   <li>Click OK.</li>
 </ol>
 
 <p>[<a href="#sending_messages">Return to beginning of section</a>]</p>
 
 <h2 id="forwarding_a_message">Forwarding a Message</h2>
 
@@ -902,20 +935,27 @@
 </ol>
 
 <p>To set the default for forwarding messages:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click
-    <a href="#composition">Composition</a>. (If no subcategories are visible,
-    double-click Mail &amp; Newsgroups to expand the list.)</li>
+    <a href="mailnews_preferences.xhtml#composition">Composition</a>. (If no
+    subcategories are visible, double-click Mail &amp; Newsgroups to expand the
+    list.)</li>
   <li>For forwarding messages, choose Inline (in the message body) or As
-    Attachment.</li>
+    Attachment.
+
+    <p><strong>Note</strong>: If you have created a signature and forward
+      inline, its placement depends on the respective reply setting. You can
+      optionally <a href="#addressing">omit the signature</a> when forwarding
+      a message.</p>
+  </li>
   <li>Click OK.</li>
 </ol>
 
 <p><strong>Tip</strong>: To override the default for forwarding a message,
   select the message, open the Message menu, and choose Forward As, then
   choose Inline or Attachment.</p>
 
 <p>[<a href="#sending_messages">Return to beginning of section</a>]</p>
@@ -927,44 +967,45 @@
   (opened) your message. The recipient must be using a mail program that
   supports the Message Disposition Notification (MDN) standard. Keep in mind
   that the recipient may choose not to send you a return receipt, even if
   you&apos;ve requested one. Messages you send to a newsgroup address will not
   include a return receipt request, since news servers don&apos;t support this
   feature.</p>
 
 <p>To request return receipts for all messages you send, you can use the global
-  <a href="#return_receipts_preferences">Return Receipt</a> preferences to
-  specify how to manage requests you receive for return receipts. You can
-  override these global preferences for individual accounts.</p>
+  <a href="mailnews_preferences.xhtml#return_receipts_preferences">Return
+  Receipt</a> preferences to specify how to manage requests you receive for
+  return receipts. You can override these global preferences for individual
+  accounts.</p>
 
 <p>To request a return receipt on a per-message basis:</p>
 
 <ul>
   <li>From a Mail Compose window, open the Options menu, and choose Return
     Receipt.</li>
 </ul>
 
 <p>To automatically request return receipts when sending messages from each of
   your mail accounts:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click
-    <a href="#return_receipts_preferences">Return Receipts</a>. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand the
-    list.)</li>
+    <a href="mailnews_preferences.xhtml#return_receipts_preferences">Return
+    Receipts</a>. (If no subcategories are visible, double-click Mail &amp;
+    Newsgroups to expand the list.)</li>
   <li>Select <q>When sending messages, always request a return receipt</q>.</li>
   <li>Click OK.</li>
 </ol>
 
 <p>For more information on setting return receipt preferences, see
-  <a href="#return_receipts_preferences">Mail &amp; Newsgroups Preferences -
-  Return Receipts</a>.</p>
+  <a href="mailnews_preferences.xhtml#return_receipts_preferences">Mail &amp;
+  Newsgroups Preferences - Return Receipts</a>.</p>
 
 <p>[<a href="#sending_messages">Return to beginning of section</a>]</p>
 
 <h2 id="saving_and_editing_a_message_draft">Saving and Editing a Message
   Draft</h2>
 
 <p>To save a mail message as a draft so you can complete it later:</p>
 
@@ -1141,18 +1182,19 @@
 
 <p>To choose sending-format options for mail messages, begin from the Mail
   window:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click
-    <a href="#send_format">Send Format</a>. (If no subcategories are visible,
-    double-click Mail &amp; Newsgroups to expand the list).
+    <a href="mailnews_preferences.xhtml#send_format">Send Format</a>. (If no
+    subcategories are visible, double-click Mail &amp; Newsgroups to expand the
+    list).
 
     <p><strong>Note</strong>: This preference applies only to mail messages,
       not to newsgroup messages.</p>
   </li>
   <li>Select the option you want and then click OK.</li>
 </ol>
 
 <p>If while composing a message you realize that one or more recipients may not
@@ -1487,17 +1529,18 @@
   messages are stored in the Collected Addresses as soon as you click Send.</p>
 
 <h4>LDAP Directory (if available)</h4>
 
 <p>An LDAP directory (also known as an address lookup service) stores email
   addresses of recipients who are not in your locally-stored address books.
   LDAP directories offer you access to large, centrally maintained databases
   of email addresses, which is especially useful with
-  <a href="#address_autocompletion">address autocompletion</a>.</p>
+  <a href="mailnews_preferences.xhtml#address_autocompletion">address
+  autocompletion</a>.</p>
 
 <p>Automatic address collection is enabled by default. To change automatic
   address collection settings, begin in the Mail window:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click Addressing. (If no
@@ -2244,17 +2287,17 @@
     Preferences dialog box.</li>
   <li>Under the Mail &amp; Newsgroups category, click Tags. (If no
     subcategories are visible, double-click Mail &amp; Newsgroups to expand the
     list.)</li>
   <li>Edit the tag text, or replace it with your own tag text. The tag
     can be up to 32 characters long.</li>
   <li>To change the tag color, click the color block next to that tag and
     select a new color.</li>
-  <li>Click the the Move Up and Move Down buttons to reorder the tags. Tags at
+  <li>Click the Move Up and Move Down buttons to reorder the tags. Tags at
     the top will have higher priority when coloring messages.</li>
   <li>Click OK.</li>
 </ol>
 
 <p>Your changes are immediately applied to all tagged messages in all your
   mail accounts.</p>
 
 <p><strong>Tip</strong>: To undo all customizations and restore just the
@@ -2426,48 +2469,74 @@
   the Mail window:</p>
 
 <ol>
   <li>Open the Tools menu and choose Message Filters. You see the Message
     Filters dialog box.</li>
   <li>If you have multiple mail accounts, choose the one to which you want to
     apply the filter.</li>
   <li>Click New. You use the Filter Rules dialog box to specify the types of
-    messages to act on, and the action you want the filter to perform.</li>
+    messages to act on, and the actions you want the filter to perform.</li>
   <li>Type a name for the filter.</li>
+  <li>Select when you want the filter to be applied. This setting enables you
+    to define some filters to be applied in an automatic way (when checking
+    mail), on demand (manually run), or both. <q>After classification</q> means
+    that junk and phishing controls will be run before applying the
+    filter.</li>
   <li>Select the matching option you want Mail to use: <q><em>all</em> of the
-    following</q> conditions (criteria) you choose, or <q><em>any</em> of the
-    following</q> conditions.</li>
+    following</q> conditions (criteria) you choose, <q><em>any</em> of the
+    following</q> conditions you choose, or <q><em>all messages</em></q>.</li>
   <li>Use the drop-down lists to choose the search criteria (for example,
     <q>Subject</q>, <q>Sender</q>, <q>contains</q>, <q>doesn&apos;t
     contain</q>) and then type the text or phrase you want to match.
 
     <p><strong>Tip</strong>: To search for messages that contain a header not
       listed in the first drop-down menu (for example, if you want to search
       for messages that include the header Resent-From), choose Customize and
       type the header you want to search for. &brandShortName; Mail &amp;
       Newsgroups adds your custom header to the drop-down list, so you can then
       choose it to search for matching entries. Make sure you enter the custom
       header correctly, since Mail will only find entries that exactly match
       what you type.</p>
   </li>
   <li>Click <q>+</q> to add criteria and <q>-</q> to remove them.</li>
   <li>Use the list to choose the action you want the filter to perform on the
-    messages (for example, Move to Folder).
+    messages (for example, Move Message To). Use <q>+</q> and <q>-</q> to add
+    or remove additional actions.
 
     <p><strong>Tip</strong>: To automatically tag incoming messages, choose
-      <q>Tag the message</q> from the drop-down list.</p>
+      <q>Tag Message</q> from the drop-down list.</p>
+
+    <p><strong>Tip</strong>: Message filters are applied one after another. It
+      could be that you don&apos;t want all filters to be run if one or more
+      messages match some conditions. For instance, you may want to tag all
+      messages from your boss&apos;s email address as <q>Important</q>, and
+      you may want all messages containing the word <q>Memorandum</q> in their
+      subject to be moved to a folder named <q>Pending Reads</q>, but you
+      don&apos;t want any message from your boss to be moved to another folder,
+      even if it contains <q>Memorandum</q> in the subject. So the first
+      message filter you define should match your boss&apos;s email address,
+      and would contain two actions: <q>Tag Message</q> as <q>Important</q> and
+      <q>Stop Filter Execution</q>.</p>
   </li>
-  <li>Choose a destination folder in which to store the messages, or create a
+  <li>If you have chosen <q>Move</q> or <q>Copy</q> message to a folder, then
+    select a destination folder in which to store the messages, or create a
     new folder.</li>
   <li>Click OK to confirm your settings.</li>
+  <li>To run filters on existing messages in a folder, select the folder
+    in the bottom dropdown list and click the <q>Run Now</q> button.</li>
   <li>Click OK in the Message Filters dialog box. The filter begins filtering
     incoming messages as soon as you click OK.</li>
 </ol>
 
+<p><strong>Note</strong>: You can also run message filters manually at any
+  time. In the Mail window, choose Tools, and then select Run Filters on Folder
+  to apply filters to the current folder, or Run Filters on Message to apply
+  filters to the selected message (if any).</p>
+
 <p>To manage your filters, begin from the Mail window:</p>
 
 <ol>
   <li>Open the Tools menu and choose Message Filters. You see the Message
     Filters dialog box.</li>
   <li>If you have multiple mail accounts, choose the one to which you want to
     apply the filter.</li>
   <li>Choose from the following:
@@ -2513,22 +2582,28 @@
   child&apos;s teacher into a folder called <q>School</q>, you can quickly set
   up a filter to do this.</p>
 
 <p>To create a filter for messages from a specific sender, begin from the Mail
   window:</p>
 
 <ol>
   <li>Select a message from a specific sender.</li>
-  <li>Open the Message menu, and choose Create Filter From Message. You see the
-    Filter Rules dialog box. Using the sender&apos;s email address,
-    &brandShortName; prefills the filter name, the filter matching criteria,
-    and the filter action (Move to folder).</li>
+  <li>Open the Message menu and choose Create Filter From Message. Or, in the
+    message header pane, right click the sender name and choose Create Filter
+    From.</li>
+  <li>You see the Filter Rules dialog box. Using the sender&apos;s email
+    address, &brandShortName; prefills the filter matching criteria and the
+    filter action (Move Message to). You can change or add new rules to the
+    matching criteria.</li>
   <li>Choose a destination folder in which to store the incoming messages from
-    the specified sender, or create a new folder.</li>
+    the specified sender, or create a new folder. You can also choose other
+    actions for this filter, or change the default one.</li>
+  <li>Note that, if you leave the filter name empty, &brandShortName; will
+    provide a name for it based on the first criterion.</li>
   <li>Click OK to confirm your settings. You see the
     <a href="#creating_message_filters">Message Filters</a> dialog box, where
     you can create, delete, or edit message filters.</li>
   <li>Click OK. The filter begins filtering incoming messages from the
     specified sender as soon as you click OK.</li>
 </ol>
 
 <p>[<a href="#organizing_your_messages">Return to beginning of section</a>]</p>
@@ -2699,30 +2774,32 @@ to filter unwanted mail, and how phishin
   Controls do not work, select some messages and explicitly mark them as Not
   Junk.</p>
 
 <p>[<a href="#controlling_junk_mail">Return to beginning of section</a>]</p>
 
 <h2 id="junk_controls_options">Junk Mail Controls Options</h2>
 
 <p>To fine-tune how Junk Mail Controls work, use the 
-  <a href="#global_junk_settings">global Junk Mail preference panel</a> for
-  account-independent settings and the account manager's 
-  <a href="#junk_settings">Junk Settings</a> for settings of a specific mail
-  account.</p>
+  <a href="mailnews_preferences.xhtml#junk_and_suspect_preferences">Junk &amp;
+  Suspect Mail preference panel</a> for account-independent settings and the
+  account manager's <a href="#junk_settings">Junk Settings</a> for settings of a
+  specific mail account.</p>
 
 <p>[<a href="#controlling_junk_mail">Return to beginning of section</a>]</p>
 
 <h2 id="junk_controls_and_filters">Junk Mail Controls and Filters</h2>
 
-<p>Junk Mail Controls run after mail filters and apply only to the Inbox folder
-  and its sub-folders. Use this to your advantage, for example, you can filter
-  mail you are sure not to be Junk to a special folder outside of Inbox so that
-  the messages will not be classified as Junk (especially useful if you
-  subscribe to newsletters or if you are on a moderated mailing list).</p>
+<p>Junk Mail Controls run after mail filters (unless you set the filter to run
+  after classification, where <q>classification</q> includes junk and phishing
+  scanning) and apply only to the Inbox folder and its sub-folders. Use this to
+  your advantage, for example, you can filter mail you are sure not to be Junk
+  to a special folder outside of Inbox so that the messages will not be
+  classified as Junk (especially useful if you subscribe to newsletters or if
+  you are on a moderated mailing list).</p>
 
 <p>[<a href="#controlling_junk_mail">Return to beginning of section</a>]</p>
 
 <h2 id="phishing_detection">Phishing Detection</h2>
 
 <p>Phishing is a particularly common fraudulent business scheme in which
   a party creates counterfeit websites designed to trick recipients into
   divulging personal data such as credit card numbers, account usernames,
@@ -2745,17 +2822,17 @@ to filter unwanted mail, and how phishin
 <p>&brandShortName; Mail phishing detector is enabled by default. When it
   encounters a mail which seems to be scam, it will show a warning bar in the
   message window.</p>
 
 <p>If you think that the email is a valid one, you can click on the <q>Not
   Scam</q> button, and the warning bar will disappear.</p>
 
 <p>When a user clicks on a link in an email that appears to be a phishing URL,
-  &brandShortName; will prompt the user with a dialog box before the Web site
+  &brandShortName; will prompt the user with a dialog box before the website
   is opened.</p>
 
 <p>This prompt will appear if either of the following is true: the host name of
   the actual URL is an <a href="glossary.xhtml#ip_address">IP address</a>, or
   the link text is a URL whose host name does not match the host name of the
   actual URL.</p>
 
 <p><strong>Note</strong>: Phishing detection has a higher precedence than Junk
@@ -2990,24 +3067,391 @@ to filter unwanted mail, and how phishin
 
 <p>Once you&apos;ve set up access to the new server, you can
   <a href="#subscribing_to_newsgroups">subscribe</a> to newsgroups on that
   server. In the Mail window, open the File menu, and choose Subscribe.</p>
 
 <p>[<a href="#getting_started_with_newsgroups">Return to beginning of
   section</a>]</p>
 
+<h1 id="getting_started_with_blogs_and_news_feeds">Getting
+  started with Blogs &amp; News Feeds</h1>
+
+<div class="contentsBox">In this section:
+  <ul>
+    <li><a href="#subscribing_to_blogs_and_news_feeds">Subscribing to blogs
+      &amp; news feeds</a></li>
+    <li><a href="#subscribing_to_blogs_and_news_feeds_from_browser">Subscribing
+      to blogs &amp; news feeds from a browser window</a></li>
+    <li><a href="#reading_blogs_and_news_feed_messages">Reading blogs &amp;
+      news feeds messages</a></li>
+    <li><a href="#posting_blog_messages">Posting blog messages</a></li>
+    <li><a href="#adding_comments_to_a_blog_post">Adding comments to a blog
+      post</a></li>
+    <li><a href="#exporting_and_importing_feeds">Exporting and importing
+      feeds</a></li>
+    <li><a href="#editing_a_feed">Editing a feed</a></li>
+    <li><a href="#removing_a_feed">Removing a feed</a></li>
+    <li><a href="#using_different_blogs_and_news_feeds_accounts">Using
+      different blogs &amp; news feeds accounts</a></li>
+    <li><a href="#organizing_your_feeds">Organizing your feeds</a></li>
+  </ul>
+</div>
+
+<h2 id="subscribing_to_blogs_and_news_feeds">Subscribing to blogs &amp; news
+  feeds</h2>
+
+<p>If you have set up a
+  <a href="#setting_up_additional_mail_and_news_accounts">Blogs &amp; News
+  account</a>, you can subscribe to Blogs &amp; News feeds.</p>
+
+<p>To subscribe to a feed, begin from the Mail window:</p>
+
+<ol>
+  <li id="getting_into_the_feed_subscriptions_dialog">Get into the Feed
+    Subscriptions dialog. There are several ways to do this:
+    <ul>
+      <li>In the accounts pane, click your desired Blogs &amp; News Feeds
+        account to manage, then click in the Manage Subscriptions in the right
+        pane.</li>
+      <li>In the accounts pane, click your desired Blogs &amp; News Feeds
+        account to manage, or a feed inside it, then open the File menu and
+        choose Subscribe.</li>
+      <li>In the accounts pane, <strong>right click</strong> your desired Blogs
+        &amp; News Feeds account to manage and choose Subscribe...</li>
+      <li>Open the Edit menu and select the Mail &amp; Newsgroups Account
+        Settings option. In the Mail &amp; Newsgroups Account Settings dialog,
+        click on a Blogs &amp; News Feeds account main section, and then
+        click the Manage Subscriptions... button.</li>
+    </ul>
+  </li>
+  <li>Once in the Feed Subscriptions dialog, click the Add button. The Feed
+    properties dialog will appear.</li>
+  <li>Type (or copy and paste) the feed URL into the Feed URL field.</li>
+  <li>Click <q>Store articles in</q> dropdown list to choose the item list
+    where you want the articles to be stored. This allows you to merge
+    multiple feeds in one list item.</li>
+  <li>Set <q>Show the article summary instead of loading the web page</q> to
+    display a brief summary that blog feeds usually include for each article.
+    
+    <p><strong>Tip:</strong> Showing the article summary reduces the bandwidth
+      traffic and is faster, since the summary is already downloaded when the
+      feed is checked for new items. However, if you usually are interested in
+      the full article, you will save time by unchecking this option.</p>
+  </li>
+  <li>Click OK to confirm the feed addition.</li>
+</ol>
+
+<p>[<a href="#getting_started_with_blogs_and_news_feeds">Return to beginning of
+  section</a>]</p>
+
+<h2 id="subscribing_to_blogs_and_news_feeds_from_browser">Subscribing to blogs
+  &amp; news feeds from a browser window</h2>
+
+<p>While browsing the web using &brandShortName;, you may find the Feed
+  discovery icon (<img src="chrome://communicator/skin/icons/feedIcon.png"
+  style="width: 16px; height: 16px;" />) while visiting a web page. You
+  can click on it to see a list of available feeds and choose one to get it
+  added to your first Blogs &amp; News Feeds account.</p>
+
+<p>[<a href="#getting_started_with_blogs_and_news_feeds">Return to beginning of
+  section</a>]</p>
+
+<h2 id="reading_blogs_and_news_feed_messages">Reading blogs &amp; news feeds
+  messages</h2>
+
+<p>When you open your Blogs &amp; News account, you see the list of feeds to
+  which you subscribed. &brandShortName; checks and downloads every feed for
+  new messages.</p>
+
+<p>To read blogs &amp; news messages, begin from the Mail window:</p>
+
+<ol>
+  <li>Double-click a blogs &amp; news account to see its feeds. (If there are
+    no feeds, you may need to subscribe to one.)</li>
+  <li>Click a feed name to see its messages.</li>
+  <li>Click a message to read it. The header will show the original URL of the
+    article, which you can click to open a browser window with the
+    corresponding webpage.</li>
+</ol>
+
+<p>Depending on your settings for the Blogs &amp; News account and each
+  individual feed, the message will be shown in its summarized view or the
+  full view. You can change it by choosing the menu option View, and then Feed
+  Message Body As. You can then select one of these options:</p>
+
+<ul>
+  <li><strong>Web Page</strong>: Select this to show the full web page of this
+    message.</li>
+  <li><strong>Summary</strong>: Select this to show the summarized, short
+    version of this message.</li>
+  <li><strong>Default format</strong>: Select this to show the article in its
+    default format, as specified in the feed options or, otherwise, the Blogs
+    &amp; News account.</li>
+</ul>
+
+<p>[<a href="#getting_started_with_blogs_and_news_feeds">Return to beginning of
+  section</a>]</p>
+
+<h2 id="posting_blog_messages">Posting blog messages</h2>
+
+<p>To post a blog message, you need an account in the corresponding blog. Also,
+  there is no standardized way to post blog messages, so you won&apos;t
+  normally be able to post messages from &brandShortName; Mail component.
+  Instead, you will need to open a browser window, log in to your blog account
+  and use the web interface.</p>
+ 
+<p>Some blog systems, however, allow posting blog messages by sending an email
+  message to a specific address. You will need to find out if your blog service
+  implements this feature, and the correct email address to use.</p>
+
+<p>[<a href="#getting_started_with_blogs_and_news_feeds">Return to beginning of
+  section</a>]</p>
+
+<h2 id="adding_comments_to_a_blog_post">Adding comments to a blog post</h2>
+
+<p>Since there is no standardized way to add comments to a blog post, you will
+  usually need to open a browser window and use the web interface.</p>
+ 
+<p>Some blog systems, however, allow adding comments by sending an email
+  message to a specific address. You will need to find out if the blog service
+  implements this feature, and the correct email address to use.</p>
+
+<p>[<a href="#getting_started_with_blogs_and_news_feeds">Return to beginning of
+  section</a>]</p>
+
+<h2 id="exporting_and_importing_feeds">Exporting and importing feeds</h2>
+
+<p>If you have set up a
+  <a href="#setting_up_additional_mail_and_news_accounts">Blogs &amp; News
+  account</a>, you can export or import Blogs &amp; News feed collections using
+  the OPML format (Outline Processor Markup Language).</p>
+
+<p>To export the feeds in your selected blogs &amp; news account, begin from
+  the Mail window:</p>
+
+<ol>
+  <li>In the accounts pane, click your desired Blogs &amp; News account to
+    manage, or a feed inside it.</li>
+  <li>Open the File menu and choose Subscribe (or use any other of the
+    <a href="#getting_into_the_feed_subscriptions_dialog">available methods</a>.
+    to access to the Feed Subscriptions dialog box).</li>
+  <li>In the Feed Subscriptions dialog, click the Export button. The Export
+    feeds as an OPML file dialog will appear.</li>
+  <li>Select the directory and filename to save the OPML file, and click
+    Save.</li>
+</ol>
+
+<p>To import the feeds in your selected blogs &amp; news account, begin from
+  the Mail window:</p>
+
+<ol>
+  <li>In the accounts pane, click your desired Blogs &amp; News account to
+    manage, or a feed inside it.</li>
+  <li>Open the File menu and choose Subscribe (or use any other of the
+    <a href="#getting_into_the_feed_subscriptions_dialog">available methods</a>.
+    to access to the Feed Subscriptions dialog box).</li>
+  <li>In the Feed Subscriptions dialog, click the Import button. The Select
+    OPML file to import dialog will appear.</li>
+  <li>Select the directory and filename to load the OPML file, and click
+    Save.</li>
+  <li>All the feeds defined in the OPML file will be added to your blogs &amp;
+    feeds account.</li>
+</ol>
+
+<p>[<a href="#getting_started_with_blogs_and_news_feeds">Return to beginning of
+  section</a>]</p>
+
+<h2 id="editing_a_feed">Editing a feed</h2>
+
+<p>If you want to change the properties of one of the feeds in your blogs &amp;
+  news account, you can edit it.</p>
+
+<p>To edit a feed in your selected blogs &amp; news account, begin from the
+  Mail window:</p>
+
+<ol>
+  <li>In the accounts pane, click your desired Blogs &amp; News account to
+    manage, or a feed inside it.</li>
+  <li>Open the File menu and choose Subscribe (or use any other of the
+    <a href="#getting_into_the_feed_subscriptions_dialog">available methods</a>.
+    to access to the Feed Subscriptions dialog box).</li>
+  <li>In the Feed Subscriptions dialog, click on a feed in the feed list. You
+    may need to expand the folders in the feed list to see each individual
+    feed.</li>
+  <li>Click the Edit button. The Feed properties dialog will appear.</li>
+  <li>You can change where you want the articles to be stored clicking the
+    <q>Store articles in</q> dropdown list.</li>
+  <li>You may mark <q>Show the article summary instead of loading the web
+    page</q> to display a brief summary that blog feeds usually include for
+    each article.
+    
+    <p><strong>Tip:</strong> Showing the article summary reduces the bandwidth
+      traffic and is faster, since the summary is already downloaded when the
+      feed is checked for new items. However, if you usually are interested in
+      the full article, you will save time by unchecking this option.</p>
+  </li>
+  <li>Click OK to confirm the changes.</li>
+</ol>
+
+<p>[<a href="#getting_started_with_blogs_and_news_feeds">Return to beginning of
+  section</a>]</p>
+
+<h2 id="removing_a_feed">Removing a feed</h2>
+
+<p>If you no longer want to follow one of the feeds in your blogs &amp; news
+  account, you can remove it.</p>
+
+<p>To remove a feed in your selected blogs &amp; news account, begin from the
+  Mail window:</p>
+
+<ol>
+  <li>In the accounts pane, click your desired Blogs &amp; News account to
+    manage, or a feed inside it.</li>
+  <li>Open the File menu and choose Subscribe (or use any other of the
+    <a href="#getting_into_the_feed_subscriptions_dialog">available methods</a>.
+    to access to the Feed Subscriptions dialog box).</li>
+  <li>In the Feed Subscriptions dialog, click on a feed in the feed list. You
+    may need to expand the folders in the feed list to see each individual
+    feed.</li>
+  <li>Click the Remove button. You will be asked to confirm the deletion of the
+    feed.</li>
+</ol>
+
+<p><strong>Note:</strong> don&apos;t confuse a feed with a folder in a Blogs
+  &amp; News account. Removing a feed doesn&apos;t delete the folder in which
+  the feed articles are stored, and thus, such articles will stay in the folder
+  until you delete either the whole folder or the articles themselves. To get
+  a better understanding, see <a href="#organizing_your_feeds">Organizing your
+  feeds</a> late