27.0: sync suite with en-US rev14966:c7741a11faf3 and some corrections for common/pref SEAMONKEY_2_24b1_BUILD1
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Thu, 05 Dec 2013 21:13:15 +0900
changeset 1263 74b510de4e8d6a86a026f03f8b48e4a608d795f4
parent 1262 2d9fb5d51b2e7e4ad29ab3cd71f9a5074b561085
child 1264 ffbcef3725954a24b725a2feeadb3cb1bfb88aac
child 1281 f9f6fcdb65962bd963bcf5392bbf6e3c935096f1
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs27
27.0: sync suite with en-US rev14966:c7741a11faf3 and some corrections for common/pref
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/help/using_certs_help.xhtml
suite/chrome/common/pref/pref-images.dtd
suite/chrome/common/pref/pref-masterpass.dtd
suite/chrome/common/pref/pref-privatedata.dtd
suite/chrome/common/pref/pref-security.dtd
suite/chrome/common/pref/pref-smartupdate.dtd
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/pref/pref-character_encoding.dtd
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -218,21 +218,24 @@
         <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>:
+  <li><strong>Character Encoding for Legacy Content</strong>:
     <ul>
-      <li><strong>Default Character Encoding</strong>: Use the drop-down list
-        to select the character encoding you want for displaying web
-        pages.</li>
+      <li><strong>Fallback Character Encoding</strong>: Web pages are supposed
+        to declare the character encoding in which they are to be displayed,
+        but legacy content may not do so. Use the drop-down list to select the
+        default character encoding to be used for such web pages. This setting
+        does not affect any web pages which properly declare their encoding.
+      </li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="helper_applications">Browser Preferences - Helper Applications</h2>
 
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -2031,16 +2031,26 @@
        <rdf:Description ID="SSL:preferences"
          nc:name="SSL preferences"
          nc:link="ssl_help.xhtml#privacy_and_security_preferences_ssl"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="SSL:protocols"
          nc:name="SSL protocols"
          nc:link="ssl_help.xhtml#ssl_protocol_versions"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="SSL:warnings"
+         nc:name="SSL warnings"
+         nc:link="ssl_help.xhtml#ssl_warnings"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="SSL:mixed_content"
+         nc:name="mixed content"
+         nc:link="ssl_help.xhtml#mixed_content"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#t">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Tab_Key_Navigation"
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -664,44 +664,49 @@
     <span class="noMac">Edit</span> menu and choose Preferences. You see the
     Preferences dialog box.</li>
   <li>Under the Mail &amp; Newsgroups category, click Character Encoding. (If
     no subcategories are visible, double-click Mail &amp; Newsgroups to expand
     the list.)</li>
 </ol>
 
 <ul>
-  <li><strong>Default Character Encoding</strong>: Click this drop-down list to
-    select the character encoding you want Mail &amp; Newsgroups to use as the
-    default for incoming mail and newsgroup messages. This is recommended if
-    it&apos;s likely you might receive messages in which the character encoding
-    (MIME charset) is not indicated, such as when reading messages in
-    international newsgroups.</li>
-  <li><strong>Always use this default character encoding when messages are
-    displayed</strong>: Select this to apply the default character encoding to
-    all messages.
+  <li><strong>Fallback Character Encoding</strong>: Click this drop-down list
+    to select the character encoding you want Mail &amp; Newsgroups to use as
+    the fallback for incoming mail and newsgroup messages. Senders are supposed
+    to declare the character encoding in which they are to be displayed, but
+    legacy content (e.g., from mailing lists or in international newsgroups)
+    may not do so. This encoding is used for such messages you&apos;ve received
+    in which the character encoding (MIME charset) is not specified.
+
+    <p><strong>Note</strong>: Individual folders may override this setting in
+      the General Information tab of the Folder Properties. This dialog can be
+      accessed from the Edit menu of a Mail &amp; Newsgroup window when a
+      folder is selected.</p>
 
     <p><strong>Tip</strong>: You can later view or change the character
-      encoding for a specific folder. In the Mail window, select a folder from
-      the list of Mail folders. Open the View menu, and choose Character
-      Encoding.</p>
+      encoding for a specific message. Select a folder, then the message to
+      display. Open the View menu, and choose Character Encoding.</p>
   </li>
   <li><strong>For messages that contain 8-bit characters, use &apos;quoted
     printable&apos; MIME encoding</strong>: Choose to have Mail &amp;
     Newsgroups use <q>quoted printable</q> MIME encoding when sending regular
     messages that use an 8-bit character encoding (for example, Latin
-    ISO-8859-3).</li>
+    ISO-8859-3). This is usually only necessary when communicating via a legacy
+    server that doesn&apos;t process 8-bit encoding correctly.</li>
   <li><strong>Default Character Encoding</strong>: Select the character
     encoding you want Mail &amp; Newsgroups to use as the default for outgoing
-    mail and newsgroup messages. Note that this character encoding is
+    mail and newsgroup messages.</li>
+  <li><strong>When possible, use this default character encoding in
+    replies.</strong>: By default, the selected character encoding is
     <strong>not</strong> used when replying to a message. Instead, the
-    character encoding of the message being replied to is used by default.
-    Choose <strong>Always use this default character encoding in
-    replies</strong> to use the default character encoding for outgoing
-    messages even when replying.</li>
+    character encoding of the message being replied to is used. Choose this
+    option to use the default character encoding for outgoing messages even
+    when replying, as long as the quoted characters can be represented in the
+    selected encoding.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
 <h2 id="network_and_storage_preferences">Mail &amp; Newsgroups Preferences -
   Network &amp; Storage</h2>
 
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -85,56 +85,142 @@
     without violating these rules. Uncheck the outermost boxes to regain
     access to an enclosed intermediate version.</li>
 </ul>
 
 <h3 id="ssl_warnings">SSL Warnings</h3>
 
 <p>It&apos;s easy to tell when the website you are viewing is using an encrypted
   connection. If the connection is encrypted, the lock icon in the lower-right
-  corner of the browser window is locked. If the connection is not encrypted,
-  the lock icon is unlocked.</p>
+  corner of the browser window is locked
+  (<img src="chrome://communicator/skin/icons/lock-secure.png"/>). If the
+  connection is not encrypted, the lock icon is unlocked
+  (<img src="chrome://communicator/skin/icons/lock-insecure.png"/>). Encrypted
+  pages which contain some unencrypted items (mixed content) are shown with a
+  broken-lock icon
+  (<img src="chrome://communicator/skin/icons/lock-broken.png"/>).</p>
 
 <p>If you want additional warnings, you can select one or more of the warning
-  checkboxes in the SSL preferences panel. Some people find these warnings
-  annoying.</p>
+  checkboxes in the SSL preferences panel. Unless stated otherwise, a
+  notification bar will be presented at the top of the page triggering the
+  alert, with an option to enter this panel to change the option if the alert
+  is considered annoying.</p>
 
 <p>To activate any of these warnings, select the corresponding checkbox:</p>
 
 <ul>
   <li><strong>Loading a page that supports encryption</strong>: Select this
     warning if you want to be reminded whenever you are loading a page that
     supports encryption.</li>
   <li><strong>Leaving a page that supports encryption</strong>: Select this
     warning if you want to be reminded whenever you are leaving a page that
     supports encryption for one that does not.</li>
   <li><strong>Sending form data from an unencrypted page to an unencrypted
-    page</strong>: Select this warning if you want to be reminded whenever you
-    are submitting data over an unencrypted connection. If you send unencrypted
-    information over the Internet, it can easily be intercepted by other
-    people.</li>
+    page</strong>: Select this warning if you want to be alerted whenever you
+    are submitting data over an unencrypted connection. When this option is
+    selected, a dialog box will be presented to the user <em>before</em> the
+    page is actually opened, which allows the loading of the page to be
+    canceled before any potentially sensitive information is sent over an
+    unencrypted connection that can easily be intercepted by others.
+
+    <p><strong>Note</strong>: Submitting a form from an encrypted to an
+      unencrypted page will always prompt a dialog prior to opening the page,
+      regardless of this setting.</p>
+  </li>
   <li><strong>Viewing a page with an encrypted/unencrypted mix</strong>:
     Select this warning if you want to be alerted whenever you are viewing a
-    page that includes any information that&apos;s not encrypted.</li>
+    page that includes any information that&apos;s not encrypted.
+
+    <p><strong>Note</strong>: See the options in the Mixed Content section
+      below for blocking of such content and for more differentiated control
+      of the warnings.</p>
+  </li>
+</ul>
+
+<h3 id="mixed_content">Mixed Content</h3>
+
+<p>In general, there are two major issues related to transmitting sensitive
+  information over an unencrypted connection: One is the danger of someone
+  eavesdropping on the line, thus listening to the content transmitted; the
+  other of someone intercepting requests for the desired page and replacing
+  the legitimate content of that page with own (potentially malicious)
+  content. While so-called <q>Man In The Middle</q> attacks can usually be
+  detected in encrypted connections (e.g., by a certificate mismatch or an
+  invalid certificate presented by the interceptor), no such verification
+  exists for unencrypted connections.</p>
+
+<p>The term <q>Mixed Content</q> refers to a web page which itself is
+  encrypted, but which includes content on the same or a different server
+  which is <em>not</em> encrypted. Consequently, this part of the page is
+  still subject to the vulnerabilities of an unencrypted line. While there
+  are legitimate uses of that concept (such as including a company logo from
+  a different insecure website into an otherwise secure page), such designs
+  should be avoided.</p>
+
+<p>There are two general types of mixed content:</p>
+
+<ul>
+  <li><strong>Mixed Active Content</strong> (or Mixed Script Content): This
+    is content which has the potential to hide or modify parts of a web page,
+    or to actively leak content from the secure part of the page to its
+    insecure part. Examples include scripts (JavaScript), style sheets (CSS),
+    or the embedding of entire web pages into the main web page (iframes).</li>
+  <li><strong>Mixed Passive Content</strong> (or Mixed Display Content):
+    This type of content does <em>not</em> have the potential to alter or
+    monitor the web page as such. Examples include images and audio or video
+    streams. It is however possible that sensitive information is passed as
+    an encoding of the content&apos;s location (URL), as cookies, or returned
+    with the content itself (e.g., as text included in an image). Thus, passive
+    content isn&apos;t entirely harmless either.</li>
+</ul>
+
+<p>The following options allow you to be warned about and/or to block both
+  mixed active and mixed passive content:</p>
+
+<ul>
+  <li><strong>Warn me when encrypted pages contain insecure content</strong>:
+    Check this to instruct &brandShortName; to present a notification bar when
+    mixed <em>active</em> content was loaded or blocked. The notification bar
+    contains a button to open this preference panel.</li>
+  <li><strong>Don&apos;t load insecure content on encrypted pages</strong>:
+    Check this to prevent mixed active content from being loaded at all but
+    to be blocked. If also the <q>Warn me</q> option is checked, the
+    notification bar will contain two additional buttons:
+    <ul>
+      <li><strong>Keep Blocking</strong>: Dismiss the notification bar without
+        loading the potentially insecure content.</li>
+      <li><strong>Unblock</strong>:
+        Load the potentially insecure content <em>once</em> but not
+        automatically when this page is visited again in the future.</li>
+    </ul>
+  </li>
+  <li><strong>Warn me when encrypted pages contain other types of mixed
+    content</strong>: Check this to instruct &brandShortName; to present a
+    notification bar when mixed <em>passive</em> content was loaded or blocked.
+    The notification bar contains a button to open this preference panel.</li>
+  <li><strong>Don&apos;t load other types of mixed content on encrypted
+    pages</strong>: Check this to prevent mixed passive content from being
+    loaded at all but to be blocked. If also the <q>Warn me</q> option is
+    checked, a notification is presented that such content was blocked.</li>
 </ul>
 
 <p>For short definitions, click
   <a href="glossary.xhtml#authentication">authentication</a>,
   <a href="glossary.xhtml#encryption">encryption</a>, or
   <a href="glossary.xhtml#certificate">certificate</a>.</p>
 
 <p>For more information about ciphers and encryption, see the following online
   documents:</p>
 
 <ul>
   <li>
-    <a href="http://developer.mozilla.org/en/Introduction_to_Public-Key_Cryptography">Introduction
+    <a href="https://developer.mozilla.org/en-US/docs/Introduction_to_Public-Key_Cryptography">Introduction
     to Public-Key Cryptography</a></li>
   <li>
-    <a href="http://developer.mozilla.org/en/Introduction_to_SSL">Introduction
+    <a href="https://developer.mozilla.org/en-US/docs/Introduction_to_SSL">Introduction
     to SSL</a></li>
   <li>
-    <a href="http://www.mozilla.org/projects/security/pki/nss/nss-3.11/nss-3.11-algorithms.html">Encryption
-    Technologies Available in NSS 3.11</a>.</li>
+    <a href="https://developer.mozilla.org/en-US/docs/NSS">Technologies
+      Available in the Network Security Services (NSS)</a>.</li>
 </ul>
 
 </body>
 </html>
--- a/suite/chrome/common/help/using_certs_help.xhtml
+++ b/suite/chrome/common/help/using_certs_help.xhtml
@@ -129,19 +129,20 @@
     verified. (For information on certificate verification, see
     <a href="#controlling_validation">Controlling Validation</a>.)</li>
   <li>The bottom half describes whether the contents of the page you are
     viewing is protected by encryption while in transit over the network.</li>
 </ul>
 
 <p><strong>Important</strong>: The lock icon describes only the encryption
   status of the page while it was being received by your computer. To be
-  notified before you send or receive information without encryption, select
-  the appropriate SSL warning options. See <a href="ssl_help.xhtml">Privacy
-  &amp; Security Preferences - SSL</a> for details.</p>
+  notified when you send or receive information without encryption, or to
+  block potentially harmful mixed content, select the appropriate SSL warning
+  and mixed content options. See <a href="ssl_help.xhtml">Privacy &amp;
+  Security Preferences - SSL</a> for details.</p>
 
 <p>[<a href="#using_certificates">Return to beginning of section</a>]</p>
 
 <h1 id="managing_certificates">Managing Certificates</h1>
 
 <p>You can use the Certificate Manager to manage the certificates you have
   available. Certificates may be stored on your computer&apos;s hard disk or on
   <a href="glossary.xhtml#smart_card">smart cards</a> or other security devices
--- a/suite/chrome/common/pref/pref-images.dtd
+++ b/suite/chrome/common/pref/pref-images.dtd
@@ -5,17 +5,17 @@
 <!ENTITY pref.images.title              "画像">
 
 <!ENTITY imageBlocking.label            "画像表示の許可ポリシー">
 
 <!--LOCALIZATION NOTE (onStartLegend.label): Don't translate "&brandShortName;".
     Place "&brandShortName;" in the phrase where the name of the application should
 	 appear
 -->
-<!ENTITY imageDetails                   "&brandShortName; の画像の取り扱い方法を指定する">
+<!ENTITY imageDetails                   "&brandShortName; の画像の取り扱い方法を指定します。">
 
 <!ENTITY loadAllImagesRadio.label       "すべての画像を読み込む">
 <!ENTITY loadAllImagesRadio.accesskey   "L">
 <!ENTITY loadOrgImagesRadio.label       "元のサーバから送られる画像だけを読み込む">
 <!ENTITY loadOrgImagesRadio.accesskey   "n">
 <!ENTITY loadNoImagesRadio.label        "すべての画像を読み込まない">
 <!ENTITY loadNoImagesRadio.accesskey    "D">
 <!ENTITY viewPermissions.label          "可否設定の管理">
--- a/suite/chrome/common/pref/pref-masterpass.dtd
+++ b/suite/chrome/common/pref/pref-masterpass.dtd
@@ -1,24 +1,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  pref.masterpass.title                  "マスターパスワード">
 <!ENTITY  managepassword.caption                 "マスターパスワードの期限">
-<!ENTITY  managepassword.text                    "&brandShortName; がマスターパスワードを確認する場合:">
-<!ENTITY  managepassword.askfirsttime            "必要になった初回に">
+<!ENTITY  managepassword.text                    "以下の場合に &brandShortName; がマスターパスワードを尋ねます:">
+<!ENTITY  managepassword.askfirsttime            "必要なときの初回">
 <!ENTITY  managepassword.askfirsttime.accesskey  "T">
-<!ENTITY  managepassword.askeverytime            "必要になったとき常に">
+<!ENTITY  managepassword.askeverytime            "必要なとき常に">
 <!ENTITY  managepassword.askeverytime.accesskey  "E">
-<!ENTITY  managepassword.asktimeout              "使われなくなった">
+<!ENTITY  managepassword.asktimeout              "前回の使用から">
 <!ENTITY  managepassword.asktimeout.accesskey    "n">
-<!ENTITY  managepassword.timeout.unit            "分後">
+<!ENTITY  managepassword.timeout.unit            "分後またはそれ以降">
 
 <!ENTITY  changepassword.caption                 "マスターパスワードの変更">
-<!ENTITY  changepassword.text                    "マスターパスワードは、Web パスワードや証明書のような機密情報を保護します。">
+<!ENTITY  changepassword.text                    "マスターパスワードは Web パスワードや証明書などの機密情報を保護します。">
 <!ENTITY  changepassword.button                  "パスワードの変更...">
 <!ENTITY  changepassword.accesskey               "C">
 
 <!ENTITY  resetpassword.caption                  "マスターパスワードのリセット">
-<!ENTITY  resetpassword.text                     "マスターパスワードをリセットした場合、保存されているすべての Web とメールのパスワード、フォームデータ、個人証明書、秘密鍵は失われます。">
-<!ENTITY  resetpassword.button                   "パスワードのリセット">
+<!ENTITY  resetpassword.text                     "マスターパスワードをリセットした場合、保存されているすべての Web とメールのパスワード、フォームデータ、個人証明書、秘密鍵が失われます。">
+<!ENTITY  resetpassword.button                   "パスワードをリセット">
 <!ENTITY  resetpassword.accesskey                "R">
--- a/suite/chrome/common/pref/pref-privatedata.dtd
+++ b/suite/chrome/common/pref/pref-privatedata.dtd
@@ -3,17 +3,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!--LOCALIZATION NOTE : FILE 'Private Data' prefs settings
     These entities go on top of the sanitize.dtd definitions
 -->
 <!ENTITY pref.privatedata.title           "プライバシー情報">
 
 
-<!ENTITY clearPrivateData.label           "プライバシー情報を消去">
+<!ENTITY clearPrivateData.label           "プライバシー情報の消去">
 
 <!ENTITY alwaysClear.label                "&brandShortName; の終了時にプライバシー情報を消去する">
 <!ENTITY alwaysClear.accesskey            "w">
 
 <!ENTITY askBeforeClear.label             "消去する前に確認ダイアログを表示する">
 <!ENTITY askBeforeClear.accesskey         "k">
 
 <!ENTITY clearDataSettings.label          "次のプライバシー情報を消去する:">
--- a/suite/chrome/common/pref/pref-security.dtd
+++ b/suite/chrome/common/pref/pref-security.dtd
@@ -23,10 +23,10 @@
   meaning "reported" (and not something like "known").
 -->
 <!ENTITY safeBrowsing.label               "セーフブラウジング">
 <!ENTITY safeBrowsingIntro.label          "&brandShortName; は悪意のあるコンテンツとして報告されているサイトをブロックできます。">
 
 <!ENTITY blockAttackSites.label           "攻撃サイトとして報告されているサイトをブロックする (マルウェアやウイルスなど)">
 <!ENTITY blockAttackSites.accesskey       "B">
 
-<!ENTITY blockWebForgeries.label          "偽装サイトとして報告されているサイトをブロックする (フィッシングサイト)">
+<!ENTITY blockWebForgeries.label          "偽装サイトとして報告されているサイトをブロックする (偽装サイト)">
 <!ENTITY blockWebForgeries.accesskey      "P">
--- a/suite/chrome/common/pref/pref-smartupdate.dtd
+++ b/suite/chrome/common/pref/pref-smartupdate.dtd
@@ -1,19 +1,19 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!--LOCALIZATION NOTE : FILE UI for Software Updates prefs -->
 <!ENTITY pref.smartUpdate.title               "ソフトウェアのインストール">
 <!ENTITY addOnsTitle.label                    "アドオン">
-<!ENTITY addOnsAllow.label                    "この Web サイトからアドオンのインストールと更新を許可する">
+<!ENTITY addOnsAllow.label                    "Web サイトからアドオンのインストールと更新を許可する">
 <!ENTITY addOnsAllow.accesskey                "b">
 <!ENTITY allowedSitesLink.label               "許可された Web サイト">
-<!ENTITY autoAddOnsUpdates.label              "更新を自動で確認">
+<!ENTITY autoAddOnsUpdates.label              "更新を自動で確認する">
 <!ENTITY autoAddOnsUpdates.accesskey          "o">
 <!ENTITY daily.label                          "毎日">
 <!ENTITY addOnsDaily.accesskey                "d">
 <!ENTITY weekly.label                         "毎週">
 <!ENTITY addOnsWeekly.accesskey               "k">
 <!ENTITY addOnsModeAutomatic.label            "自動で更新をダウンロードしてインストールする">
 <!ENTITY addOnsModeAutomatic.accesskey        "m">
 <!ENTITY enablePersonalized.label             "推奨するアドオン"><!--en-US "Personalize add-on recommendations" (^^;-->
@@ -25,9 +25,9 @@
 <!ENTITY autoAppUpdates.accesskey             "t">
 <!ENTITY appDaily.accesskey                   "a">
 <!ENTITY appWeekly.accesskey                  "e">
 <!ENTITY appModeAutomatic.label               "自動で更新をダウンロードしてインストールする">
 <!ENTITY appModeAutomatic.accesskey           "u">
 <!ENTITY appModeAutoAddonWarn.label           "アドオンが無効化される場合は警告する">
 <!ENTITY appModeAutoAddonWarn.accesskey       "n">
 <!ENTITY updateHistoryButton.label            "更新履歴を表示...">
-<!ENTITY updateHistoryButton.accesskey        "S">
\ No newline at end of file
+<!ENTITY updateHistoryButton.accesskey        "S">
--- a/suite/chrome/common/pref/pref-ssl.dtd
+++ b/suite/chrome/common/pref/pref-ssl.dtd
@@ -14,17 +14,17 @@
 <!ENTITY limit.ssl30.accesskey              "3">
 <!ENTITY limit.tls10.label                  "TLS 1.0">
 <!ENTITY limit.tls10.accesskey              "T">
 <!ENTITY limit.tls11.label                  "TLS 1.1">
 <!ENTITY limit.tls11.accesskey              "1">
 <!ENTITY limit.tls12.label                  "TLS 1.2">
 <!ENTITY limit.tls12.accesskey              "2">
 
-<!ENTITY warn.description                   "&brandShortName; はあなたが見ている Web ページのセキュリティ状態を警告することができます。警告もしくは事前に許可を求めるダイアログを表示させたいケースを、&brandShortName; に設定します:">
+<!ENTITY warn.description2                  "&brandShortName; は閲覧中の Web ページのセキュリティ状態を警告できます。以下の設定時に警告ダイアログを表示します:">
 <!ENTITY warn.enteringsecure                "暗号化されたページを読み込むとき">
 <!ENTITY warn.enteringsecure.accesskey      "L">
 <!ENTITY warn.insecurepost                  "暗号化されていないページから暗号化されていないページへデータを送信するとき">
 <!ENTITY warn.insecurepost.accesskey        "S">
 <!ENTITY warn.leavingsecure                 "暗号化されたページから離れるとき">
 <!ENTITY warn.leavingsecure.accesskey       "a">
 <!ENTITY warn.viewmixed                     "暗号化されたページと暗号化されていないページが混在するとき">
 <!ENTITY warn.viewmixed.accesskey           "V">
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -1,19 +1,19 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY folderProps.windowtitle.label           "プロパティ">
 
 <!ENTITY generalInfo.label                       "一般情報">
-<!ENTITY folderCharsetTab.label                  "既定の文字エンコーディング:">
-<!ENTITY folderCharsetTab.accesskey              "E">
-<!ENTITY folderCharsetOverride.label             "この設定をフォルダ内のすべてのメッセージに適用する (各メッセージの文字エンコーディング指定や自動判別結果を無視する)">
-<!ENTITY folderCharsetOverride.accesskey         "A">
+<!ENTITY folderCharsetFallback.label             "フォールバック文字エンコーディング:">
+<!ENTITY folderCharsetFallback.accesskey         "E">
+<!ENTITY folderCharsetEnforce.label              "この設定をフォルダ内のすべてのメッセージに適用する (各メッセージの文字エンコーディング指定や自動判別結果を無視する)">
+<!ENTITY folderCharsetEnforce.accesskey          "A">
 <!ENTITY folderRebuildSummaryFileTip2.label      "要約ファイルの索引を再構築します">
 <!ENTITY folderRebuildSummaryFile2.label         "フォルダを修復">
 <!ENTITY folderRebuildSummaryFile2.accesskey     "R">
 <!ENTITY folderRebuildSummaryFile.explanation    "フォルダの索引ファイル (.msf) が損傷し、削除したはずのメッセージが表示されてしまうことがあります。このような問題が起こったときはフォルダを修復してください。">
 <!ENTITY folderIncludeInGlobalSearch.label       "このフォルダのメッセージをグローバル検索の対象に含める">
 <!ENTITY folderIncludeInGlobalSearch.accesskey   "G">
 
 <!ENTITY retention.label                         "保管ポリシー">
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -1,16 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 # The following are used by the imap code to display progress/status/error messages
 #
 
+#LOCALIZATION NOTE(imapAlertDialogTile): Do not translate the word "%S"
+# below. Place the word %S where the account name should appear.
+imapAlertDialogTitle		=%S アカウントの通知
+
 # Status - opening folder
 imapStatusSelectingMailbox	=%S フォルダを開いています...
 
 # Status - create folder
 imapStatusCreatingMailbox	=フォルダを作成しています...
 
 # Status - deleting a folder
 # LOCALIZATION NOTE (imapStatusDeletingMailbox): The "%S" below should not be translated.
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -1,12 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#LOCALIZATION NOTE(statusMessage): Do not translate the words
+# $1S and $2S below. Place the word $1S where account name should appear and $2S
+# where the status message should appear.
+statusMessage			= %1$S: %2$S
+
 # The following are used by the messenger application
 renameFolder			= フォルダの名前変更...
 compactFolder			= このフォルダを最適化
 removeAccount			= アカウントの削除...
 removeFolder			= フォルダの削除
 newFolderMenuItem		= フォルダ...
 newSubfolderMenuItem		= サブフォルダ...
 newFolder			= 新しいフォルダ...
@@ -432,27 +437,27 @@ mailServerLoginFailedTitle			= ログイン失敗
 # LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
 # translation where you wish to display the hostname of the server to which
 # login failed.
 mailServerLoginFailed				= サーバ %S へのログインに失敗しました。
 mailServerLoginFailedRetryButton		= 再試行(&R)
 mailServerLoginFailedEnterNewPasswordButton	= 新しいパスワードを入力(&E)
 
 # LOCALIZATION NOTE (junkBarMessage): %S is the brandname
-junkBarMessage					= このメールは迷惑メールの可能性があります。
+junkBarMessage					= %1$0.Sこのメールは迷惑メールの可能性があります。
 junkBarButton					= 迷惑メールではありません
 junkBarButtonKey				= N
 junkBarInfoButton				= ?
 junkBarInfoButtonKey				= ?
 # LOCALIZATION NOTE (remoteContentBarMessage): %S is the brandname
-remoteContentBarMessage				= プライバシー保護のため、このメッセージ内のリモートコンテンツをブロックしました。
+remoteContentBarMessage				= %1$0.Sプライバシー保護のため、このメッセージ内のリモートコンテンツをブロックしました。
 remoteContentBarButton				= リモートコンテンツを表示
 remoteContentBarButtonKey			= S
 # LOCALIZATION NOTE (phishingBarMessage): %S is the brandname
-phishingBarMessage				= このメールは詐欺メールの可能性があります。
+phishingBarMessage				= %1$0.Sこのメールは詐欺メールの可能性があります。
 phishingBarIgnoreButton				= 警告を無視
 phishingBarIgnoreButtonKey			= I
 mdnBarMessage					= このメッセージの送信者が開封確認の通知を求めています。送信者に通知しますか?
 mdnBarIgnoreButton				= 要求を無視
 mdnBarIgnoreButtonKey				= I
 mdnBarSendReqButton				= 開封確認を送付する
 mdnBarSendReqButtonKey				= S
 draftMessageMsg					= このメッセージは下書きです
--- a/suite/chrome/mailnews/pref/pref-character_encoding.dtd
+++ b/suite/chrome/mailnews/pref/pref-character_encoding.dtd
@@ -1,16 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY pref.character.encoding.title   "文字エンコーディング">
 <!ENTITY messageDisplay.caption          "メッセージの表示">
-<!ENTITY viewDefaultCharset.label        "既定の文字エンコーディング:">
-<!ENTITY viewDefaultCharset.accesskey    "D">
+<!ENTITY viewFallbackCharset.label       "フォールバック文字エンコーディング:">
+<!ENTITY viewFallbackCharset.accesskey   "E">
+<!ENTITY viewFallbackCharset.desc        "(文字エンコーディングを宣言していないコンテンツに使用されます。)">
 
 <!ENTITY composingMessages.caption       "メッセージの編集">
 <!ENTITY useMIME.label                   "8 ビット文字を含むメッセージに 'Quoted-Pritable' MIME エンコードを使用する。この項目のチェックを外した場合、メッセージはそのまま送信されます。">
 <!ENTITY useMIME.accesskey               "F">
 <!ENTITY sendDefaultCharset.label        "既定の文字エンコーディング:">
 <!ENTITY sendDefaultCharset.accesskey    "C">
 <!ENTITY replyInDefaultCharset2.label    "可能であれば、返信メッセージに既定の文字エンコーディングを使用する (この項目のチェックを外した場合、新しいメッセージの作成時のみ既定の文字エンコーディングを使用します)。">
 <!ENTITY replyInDefaultCharset2.accesskey "W">