12.0: sync suite with en-US rev9906:79790980748a SEAMONKEY_2_10b1_BUILD1 SEAMONKEY_2_10b1_BUILD2 SEAMONKEY_2_10b1_RELEASE SEAMONKEY_2_9b1_BUILD1 SEAMONKEY_2_9b1_RELEASE SEAMONKEY_2_9b2_BUILD1 SEAMONKEY_2_9b2_RELEASE SEAMONKEY_2_9b3_BUILD1 SEAMONKEY_2_9b3_BUILD2 SEAMONKEY_2_9b3_RELEASE SEAMONKEY_2_9b4_BUILD1 SEAMONKEY_2_9b4_RELEASE
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Fri, 02 Mar 2012 21:02:57 +0900
changeset 560 794c6ad68fd0fd09c4c5707e0a1abbdf8e350718
parent 559 09cdc2c4cc2735475090006ca91a4e15e14a0669
child 561 29b6dfed3379e73c99771b827f8f5b540891bb5b
child 574 f026060d941dfc4c2f7ca9c398a5318f7781c13f
child 578 a1502849cfc4c5c12ef8112a35f181ac48f34a03
child 588 ac16df2cc92de7a5fd63f06eb9e56d01b6ba26f7
child 622 658563d62f363058dce2ab2558b165672dcc389a
child 631 7ce80bac564ff7ac31b1495c7a8c1ac530f8850d
push id192
push useraxel@mozilla.com
push dateTue, 13 Mar 2012 21:36:18 +0000
bugs12
12.0: sync suite with en-US rev9906:79790980748a
suite/chrome/browser/navigator.dtd
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/mailnews_preferences.xhtml
suite/chrome/common/help/mailnews_using_mail.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/pref/pref-languages.dtd
suite/chrome/common/pref/pref-scripts.dtd
suite/chrome/common/pref/pref-spelling.dtd
suite/chrome/common/pref/pref-sync.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/sync/syncQuota.properties
suite/chrome/common/sync/syncSetup.dtd
suite/chrome/mailnews/mailOverlay.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/msgHdrViewPopup.dtd
suite/chrome/mailnews/newsblog/newsblog.properties
suite/chrome/mailnews/pref/AccountWizard.dtd
suite/chrome/mailnews/pref/pref-composing_messages.dtd
suite/chrome/mailnews/smime/am-smime.properties
--- a/suite/chrome/browser/navigator.dtd
+++ b/suite/chrome/browser/navigator.dtd
@@ -11,30 +11,30 @@
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 
 <!ENTITY editPageCmd.label "ページを編集">
 <!ENTITY editPageCmd.accesskey "E">
 <!ENTITY editPageCmd.commandkey "e">
 
 <!ENTITY navbarCmd.label "ナビゲーションツールバー">
 <!ENTITY navbarCmd.accesskey "N">
-<!ENTITY personalbarCmd.label "パーソナルツールバー">
-<!ENTITY personalbarCmd.accesskey "P">
+<!ENTITY bookmarksToolbarCmd.label     "ブックマークツールバー">
+<!ENTITY bookmarksToolbarCmd.accesskey "m">
 
 <!ENTITY closeWindow.label "ウィンドウを閉じる">
 <!ENTITY closeWindow.accesskey "W">
 
 <!ENTITY minimizeButton.tooltip       "最小化">
 <!ENTITY restoreButton.tooltip        "元のサイズに戻す">
 
 <!ENTITY feedsMenu.label "このページを購読する">
 <!ENTITY feedsMenu.accesskey "S">
 
 <!ENTITY menuBar.tooltip                  "メニューバー">
-<!ENTITY personalToolbar.tooltip          "パーソナルツールバー">
+<!ENTITY bookmarksToolbar.tooltip         "ブックマークツールバー">
 <!ENTITY navigationToolbar.tooltip        "ナビゲーションツールバー">
 
 <!-- Toolbar items --> 
 <!ENTITY backButton.label             "戻る">
 <!ENTITY backButton.tooltip           "前のページへ戻る">
 <!ENTITY forwardButton.label          "進む">
 <!ENTITY forwardButton.tooltip        "次のページへ進む">
 <!ENTITY reloadButton.label           "再読み込み">
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -100,19 +100,20 @@
         animated, such as in image rollovers (images that change when the mouse
         cursor is placed over them).</li>
       <li><strong>Disable or replace context menus</strong>: Allows right-click
         menus<span class="mac"> or, if you&apos;re using a one-button mouse,
         <kbd>Ctrl</kbd>-click menus</span> to be replaced or disabled by
         webpages.</li>
     </ul>
   </li>
-  <li><strong>Enable Plugins for</strong>: Check this checkbox to control how
+  <li><strong>Enable Plugins for</strong>: Use these checkboxes to control how
     plugins are used:
     <ul>
+      <li><strong>Suite</strong>: Globally enables or disables plugins.</li>
       <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>
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -27,16 +27,17 @@
 </ol>
 
 <div class="contentsBox">In this section: 
   <ul>
     <li><a href="#appearance">Appearance</a></li>
     <li><a href="#content">Content</a></li>
     <li><a href="#fonts">Fonts</a></li>
     <li><a href="#colors">Colors</a></li>
+    <li><a href="#spelling">Spelling</a></li>
   </ul>
 </div>
 
 <h2 id="appearance">Appearance Preferences - Appearance</h2>
 
 <p>This section describes how to use the Appearance preferences panels. If
   you&apos;re not already viewing one of these panels, follow these steps:</p>
 
@@ -247,10 +248,49 @@
         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>
 
+<h2 id="spelling">Appearance Preferences - Spelling</h2>
+
+<p>This section describes how to use the Spelling 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 Appearance category, click Spelling. (If no subcategories are
+    visible, double-click Appearance to expand the list.)</li>
+</ol>
+
+<p>The Spelling preferences panel allows you to determine how spelling is
+  handled throughout &brandShortName;:</p>
+
+<ul>
+  <li><strong>General</strong>:
+    <ul>
+      <li><strong>Language</strong>: Use the drop-down list to select the language
+        you want to use to check the spelling in your messages or to download more
+        dictionaries.</li>
+      <li><strong>When typing, check my spelling</strong>: Use the drop-down
+        list to select if and how your typing is spell checked.</li>
+    </ul>
+  </li>
+    <li><strong>Mail &amp; Newsgroups</strong>:
+    <ul>
+      <li><strong>Check spelling before sending</strong>: Select this option to
+        have Mail &amp; Newsgroups always check the spelling of your message before
+        you send it.</li>
+      <li><strong>Check spelling as you type</strong>: Select this option to have
+        Mail &amp; Newsgroups always check the spelling of your message as you type
+        it.</li>
+    </ul>
+  </li>
+</ul>
+
+<p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
+
 </body>
 </html>
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -177,18 +177,17 @@
 <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 Languages. (If no subcategories are
     visible, double-click Browser to expand the list.)</li>
 </ol>
 
 <p>The Languages preferences panel allows you to choose the languages and
-  character encoding for displaying web pages and choose if and how your typing
-  is spell checked:</p>
+  character encoding for displaying web pages:</p>
 
 <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
@@ -206,22 +205,16 @@
   </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
         pages.</li>
     </ul>
   </li>
-  <li><strong>Spelling</strong>:
-    <ul>
-      <li><strong>When typing check my spelling</strong>: Use the drop-down
-        list to select if and how your typing is spell checked.</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>
 
 <p>This section describes how to use the Helper Applications preferences panel.
   If you&apos;re not already viewing it, follow these steps:</p>
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -282,25 +282,16 @@
     the message in your Drafts folder.</li>
   <li><strong>Confirm when using keyboard shortcut to send message</strong>:
     Check this option if want to be asked if you&apos;re sure to be ready to
     send the message when you&apos;re pressing Ctrl+Return in message editor.
     This may help you avoid accidentally sending the message if you enter the
     keyboard shortcut by mistake when composing a message.</li>
   <li><strong>Wrap plain text messages at [__] characters</strong>: Enter a
     number to set the right margin for text in the message area.</li>
-  <li><strong>Check spelling before sending</strong>: Select this option to
-    have Mail &amp; Newsgroups always check the spelling of your message before
-    you send it.</li>
-  <li><strong>Check spelling as you type</strong>: Select this option to have
-    Mail &amp; Newsgroups always check the spelling of your message as you type
-    it.</li>
-  <li><strong>Language</strong>: Use the drop-down list to select the language
-    you want to use to check the spelling in your messages or to download more
-    dictionaries.</li>
   <li><strong>Defaults for HTML Messages</strong>: Here you can define what the
     defaults are for font, size, text and background color if you choose to
     send mails in HTML format.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
--- a/suite/chrome/common/help/mailnews_using_mail.xhtml
+++ b/suite/chrome/common/help/mailnews_using_mail.xhtml
@@ -513,20 +513,16 @@
 
 <ul>
   <li><strong>Select Addresses</strong>: The Select Addresses option lets you
     choose the recipient&apos;s email address from your Address Books or a
     remote directory. To look up an address in an address book or directory,
     enter the first few letters of the recipient&apos;s first or last name to
     start the search. Select an address and then click To:, Cc:, or Bcc: to
     address your message.</li>
-  <li><strong>Check Spelling</strong>: Checks the spelling of the message text
-    before you send it. You can also click Spell.</li>
-  <li><strong>Spellcheck As You Type</strong>: Choose this option to have the
-    spelling of the message text checked as you type.</li>
   <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
@@ -541,21 +537,24 @@
     <span class="noMac">Edit</span> menu.</li>
   <li><strong>Priority</strong>: Choose a priority to indicate whether the
     message has lowest, low, normal, high, or highest priority.</li>
   <li><strong>Character Encoding</strong>: Choose a character encoding used for
     this message.</li>
   <li><strong>Send a Copy To</strong>: Choose this if you want to file an
     additional copy of the sent message in a different folder than your default
     Sent folder. Then select the folder you want.</li>
-  <li><strong>Security</strong>: Choose this to change the default security
-    options for this message.</li>
+  <li><strong>Encrypt This Message</strong>: Choose this to have &brandShortName;
+    encrypt this message (without changing the default).</li>
+  <li><strong>Digitally Sign This Message</strong>: Choose this to have
+    &brandShortName; digitally sign this message (without changing the
+    default).</li>
 </ul>
 
-<p>An additional message formatting option is available from the Edit menu:</p>
+<p>Additionally, the following options are 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="mailnews_preferences.xhtml#composition">Composition</a>
     preferences. This command is primarily useful when you are replying to a
@@ -566,16 +565,20 @@
       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
       basis.</p>
   </li>
+  <li><strong>Check Spelling</strong>: Checks the spelling of the message text
+    before you send it. You can also click Spell.</li>
+  <li><strong>Spellcheck As You Type</strong>: Choose this option to have the
+    spelling of the message text checked as you type.</li>
 </ul>
 
 <p>[<a href="#sending_messages">Return to beginning of section</a>]</p>
 
 <h2 id="replying_to_a_message">Replying to a Message</h2>
 
 <p>To reply to a mail message:</p>
 
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -775,16 +775,17 @@
   </rdf:Description>
 
 <rdf:Description about="#appearance_pref">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="appearance_pref_content" nc:name="Content" nc:link="cs_nav_prefs_appearance.xhtml#content"/> </rdf:li>
         <rdf:li> <rdf:Description ID="appearance_pref_fonts" nc:name="Fonts" nc:link="cs_nav_prefs_appearance.xhtml#fonts"/> </rdf:li>
         <rdf:li> <rdf:Description ID="appearance_pref_colors" nc:name="Colors" nc:link="cs_nav_prefs_appearance.xhtml#colors"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="appearance_pref_spelling" nc:name="Spelling" nc:link="cs_nav_prefs_appearance.xhtml#spelling"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#navigator_pref_navigator">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="navigator_pref_history" nc:name="History" nc:link="cs_nav_prefs_navigator.xhtml#history"/> </rdf:li>
--- a/suite/chrome/common/pref/pref-languages.dtd
+++ b/suite/chrome/common/pref/pref-languages.dtd
@@ -19,15 +19,8 @@
 <!ENTITY languages.customize.DefaultCharset.accesskey   "C">
 
 <!-- LOCALIZATION NOTE  Character Encoding Preferences Dialog: Do NOT localize the terms "en-bz, ar-jo"  -->
 <!ENTITY languages.customize.others.examples            "例: en-bz, ar-jo">
 <!ENTITY languages.customize.moveUp.label               "上へ">
 <!ENTITY languages.customize.moveUp.accesskey           "U">
 <!ENTITY languages.customize.moveDown.label             "下へ">
 <!ENTITY languages.customize.moveDown.accesskey         "D">
-
-<!ENTITY spelling.label                                 "スペルチェック">
-<!ENTITY checkSpelling.label                            "次の場所への入力時にスペルチェックを行う:">
-<!ENTITY checkSpelling.accesskey                        "W">
-<!ENTITY dontCheckSpelling.label                        "スペルチェックしない">
-<!ENTITY multilineCheckSpelling.label                   "複数行のテキストボックスのみ">
-<!ENTITY alwaysCheckSpelling.label                      "すべてのテキストボックス">
--- a/suite/chrome/common/pref/pref-scripts.dtd
+++ b/suite/chrome/common/pref/pref-scripts.dtd
@@ -13,12 +13,14 @@
 <!ENTITY allowWindowMoveResize.label     "ウィンドウの移動または大きさを変更する">
 <!ENTITY allowWindowFlip.label           "ウィンドウのフォーカス (前面か背面か) を切り換える">
 <!ENTITY allowWindowStatusChange.label   "ステータスバーのテキストを変更する">
 <!ENTITY allowWindowImageSrcChange.label "画像を変更する">
 <!ENTITY allowContextmenuDisable.label   "コンテキストメニューを無効化または変更する">
 <!ENTITY allowHideStatusBar.label        "ステータスバーを隠す">
 
 <!ENTITY enablePlugin.label              "プラグインを有効にする:">
+<!ENTITY enablePluginForSuite.label      "Suite">
+<!ENTITY enablePluginForSuite.accesskey  "u">
 
 <!ENTITY whenPluginsRequired.label       "プラグインの読み込みを要求されたとき">
 <!ENTITY displayNotification.label       "コンテンツ領域の上部に通知バーを表示する">
-<!ENTITY displayNotification.accesskey   "N">
\ No newline at end of file
+<!ENTITY displayNotification.accesskey   "N">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-spelling.dtd
@@ -0,0 +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/.  -->
+   
+<!ENTITY prefSpelling.title                   "スペルチェック">
+<!ENTITY generalSpelling.label                "全般">
+<!ENTITY checkSpellingWhenTyping.label        "次の場所への入力時にスペルチェックを行う:">
+<!ENTITY checkSpellingWhenTyping.accesskey    "W">
+<!ENTITY dontCheckSpelling.label              "スペルチェックしない">
+<!ENTITY multilineCheckSpelling.label         "複数行のテキストボックスのみ">
+<!ENTITY alwaysCheckSpelling.label            "すべてのテキストボックス">
+<!ENTITY spellForMailAndNews.label            "メールとニュースグループ">
+<!ENTITY checkSpellingBeforeSend.label        "メッセージ送信前にスペルチェックを行う">
+<!ENTITY checkSpellingBeforeSend.accesskey    "C">
+<!ENTITY spellCheckInline.label               "自動的にスペルチェックを行う">
+<!ENTITY spellCheckInline.accesskey           "e">
+<!ENTITY languagePopup.label                  "言語:">
+<!ENTITY languagePopup.accessKey              "L">
+<!ENTITY moreDictionaries.label               "他の辞書をダウンロード...">
+<!ENTITY noSpellCheckAvailable.label          "辞書がありません。">
--- a/suite/chrome/common/pref/pref-sync.dtd
+++ b/suite/chrome/common/pref/pref-sync.dtd
@@ -10,17 +10,17 @@
 <!-- Login error feedback -->
 <!ENTITY updatePass.label             "更新">
 <!ENTITY updatePass.accesskey         "U">
 <!ENTITY resetPass.label              "リセット">
 <!ENTITY resetPass.accesskey          "R">
 
 <!-- Manage Account -->
 <!ENTITY manageAccount.label          "アカウントを管理">
-<!ENTITY manageAccount.accesskey      "A">
+<!ENTITY manageAccount.accesskey      "M">
 <!ENTITY viewQuota.label              "サーバ使用量を表示">
 <!ENTITY viewQuota.accesskey          "V">
 <!ENTITY changePassword.label         "パスワードを変更">
 <!ENTITY changePassword.accesskey     "C">
 <!ENTITY myRecoveryKey.label          "自分のリカバリキー">
 <!ENTITY myRecoveryKey.accesskey      "M">
 <!ENTITY resetSync.label              "Sync をリセット">
 <!ENTITY resetSync.accesskey          "R">
@@ -29,16 +29,18 @@
 <!ENTITY addDevice.label              "デバイスを追加">
 <!ENTITY addDevice.accesskey          "A">
 
 <!-- Sync Settings -->
 <!ENTITY syncComputerName.label       "デバイス名:">
 <!ENTITY syncComputerName.accesskey   "N">
 
 <!ENTITY syncMy2.label              "同期するデータ:">
+<!ENTITY engine.addons.label        "アドオン">
+<!ENTITY engine.addons.accesskey    "A">
 <!ENTITY engine.bookmarks.label     "ブックマーク">
 <!ENTITY engine.bookmarks.accesskey "B">
 <!ENTITY engine.tabs.label          "タブ">
 <!ENTITY engine.tabs.accesskey      "T">
 <!ENTITY engine.history.label       "履歴">
 <!ENTITY engine.history.accesskey   "r">
 <!ENTITY engine.passwords.label     "パスワード">
 <!ENTITY engine.passwords.accesskey "w">
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -31,10 +31,11 @@
 <!ENTITY httpnetworking.label "HTTP ネットワーク">
 <!ENTITY smart.label "ソフトウェアのインストール">
 <!ENTITY download.label "ダウンロード">
 <!ENTITY keynav.label "キーボードナビゲーション">
 <!ENTITY search.label "インターネット検索">
 <!ENTITY policies.label "セキュリティポリシー">
 <!ENTITY mousewheel.label "マウスホイール">
 <!ENTITY scriptsAndWindows.label "スクリプトとプラグイン">
+<!ENTITY spellingPane.label  "スペルチェック">
 
 <!ENTITY focusSearch.key "f">
--- a/suite/chrome/common/sync/syncQuota.properties
+++ b/suite/chrome/common/sync/syncQuota.properties
@@ -1,8 +1,9 @@
+collection.addons.label    = アドオン
 collection.bookmarks.label = ブックマーク
 collection.history.label   = 履歴
 collection.passwords.label = パスワード
 collection.prefs.label     = 個人設定
 collection.tabs.label      = タブ
 
 # LOCALIZATION NOTE (quota.usageNoQuota.label): %1$S and %2$S are numeric value
 # and unit (as defined in the download manager) of the amount of space occupied
--- a/suite/chrome/common/sync/syncSetup.dtd
+++ b/suite/chrome/common/sync/syncSetup.dtd
@@ -77,16 +77,18 @@
 <!ENTITY resetSyncKey.label           "他の Sync デバイスをなくした場合。">
 
 <!-- Sync Options -->
 <!ENTITY setup.optionsPage.title      "同期オプション">
 <!ENTITY syncComputerName.label       "デバイス名:">
 <!ENTITY syncComputerName.accesskey   "C">
 
 <!ENTITY syncMy.label               "同期するデータ">
+<!ENTITY engine.addons.label        "アドオン">
+<!ENTITY engine.addons.accesskey    "A">
 <!ENTITY engine.bookmarks.label     "ブックマーク">
 <!ENTITY engine.bookmarks.accesskey "B">
 <!ENTITY engine.tabs.label          "タブ">
 <!ENTITY engine.tabs.accesskey      "T">
 <!ENTITY engine.history.label       "履歴">
 <!ENTITY engine.history.accesskey   "r">
 <!ENTITY engine.passwords.label     "パスワード">
 <!ENTITY engine.passwords.accesskey "P">
--- a/suite/chrome/mailnews/mailOverlay.dtd
+++ b/suite/chrome/mailnews/mailOverlay.dtd
@@ -1,7 +1,10 @@
 
 <!ENTITY  newMessageCmd.key               "M">
 <!ENTITY  newMessageCmd.label             "メッセージ">
 <!ENTITY  newMessageCmd.accesskey         "m">
  
 <!ENTITY  newContactCmd.label             "連絡先...">
 <!ENTITY  newContactCmd.accesskey         "C">
+
+<!ENTITY printButton.label                "印刷">
+<!ENTITY printButton.tooltip              "メッセージを印刷します">
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -264,16 +264,20 @@
 <!ENTITY stopCmd.label                          "中止">
 <!ENTITY stopCmd.accesskey                      "S">
 <!ENTITY pageSourceCmd.label                    "メッセージのソース">
 <!ENTITY pageSourceCmd.accesskey                "o">
 <!ENTITY pageSourceCmd.key                      "u">
 
 <!ENTITY findCmd.label                          "このメッセージを検索...">
 
+<!-- LOCALIZATION NOTE (quickFilterBar.show.key2):
+     This is the key used to show the Lightning quick filter bar. -->
+<!ENTITY quickFilterBar.show.key2               "K">
+
 <!-- Go Menu -->
 
 <!ENTITY goMenu.label                           "移動">
 <!ENTITY goMenu.accesskey                       "G">
 <!ENTITY nextMenu.label                         "次へ">
 <!ENTITY nextMenu.accesskey                     "N">
 <!ENTITY nextMsgCmd.label                       "メッセージ">
 <!ENTITY nextMsgCmd.accesskey                   "M">
@@ -440,17 +444,16 @@
 <!ENTITY forwardButton.label                 "転送">
 <!ENTITY fileButton.label                    "移動">
 <!ENTITY nextButton.label                    "次へ">
 <!ENTITY goBackButton.label                  "戻る">
 <!ENTITY goForwardButton.label               "進む">
 <!ENTITY deleteButton.label                  "削除">
 <!ENTITY undeleteButton.label                "削除を元に戻す">
 <!ENTITY markButton.label                    "マーク">
-<!ENTITY printButton.label                   "印刷">
 <!ENTITY stopButton.label                    "中止">
 <!ENTITY junkButton.label                    "迷惑メール">
 <!ENTITY notJunkButton.label                 "非迷惑メール">
 <!ENTITY searchButton.title                  "詳細検索">
 
 <!-- Tooltips -->
 <!ENTITY menuBar.tooltip                    "メニューバー">
 <!ENTITY mailToolbar.tooltip                "メールツールバー">
@@ -464,17 +467,16 @@
 <!ENTITY forwardButton.tooltip              "メッセージを転送します">
 <!ENTITY fileButton.tooltip                 "メッセージを別のフォルダに移します">
 <!ENTITY nextButton.tooltip                 "次の未読メッセージに移動します">
 <!ENTITY goBackButton.tooltip               "メッセージ表示履歴を前に戻ります"><!-- 一つ前以外も -->
 <!ENTITY goForwardButton.tooltip            "メッセージ表示履歴を次に進みます"><!-- 一つ次以外も -->
 <!ENTITY deleteButton.tooltip               "メッセージまたはフォルダを削除します">
 <!ENTITY undeleteButton.tooltip             "メッセージの削除を元に戻します">
 <!ENTITY markButton.tooltip                 "メッセージにマークを付けます">
-<!ENTITY printButton.tooltip                "メッセージを印刷します">
 <!ENTITY stopButton.tooltip                 "送受信処理を中止します">
 <!ENTITY throbber.tooltip                   "&vendorShortName; のホームページに移動します">
 <!ENTITY junkButton.tooltip                 "メッセージに迷惑マークを付けます">
 <!ENTITY notJunkButton.tooltip              "メッセージの迷惑マークを外します">
 
 <!-- Statusbar -->
 <!ENTITY  statusText.label                  "完了">
 
--- a/suite/chrome/mailnews/msgHdrViewPopup.dtd
+++ b/suite/chrome/mailnews/msgHdrViewPopup.dtd
@@ -39,16 +39,20 @@
 <!ENTITY AddToAddressBook.label            "アドレス帳に追加...">
 <!ENTITY AddToAddressBook.accesskey        "B">
 <!ENTITY SendMailTo.label                  "メッセージを作成...">
 <!ENTITY SendMailTo.accesskey              "s">
 <!ENTITY CopyEmailAddress.label            "メールアドレスをコピー">
 <!ENTITY CopyEmailAddress.accesskey        "C">
 <!ENTITY CreateFilterFrom.label            "フィルタを作成...">
 <!ENTITY CreateFilterFrom.accesskey        "F">
+<!ENTITY openInBrowser.label               "ブラウザで開く">
+<!ENTITY openInBrowser.accesskey           "O">
+<!ENTITY bookmarkLinkCmd.label             "リンクをブックマークに追加...">
+<!ENTITY bookmarkLinkCmd.accesskey         "B">
 <!ENTITY copyLinkCmd.label                 "リンクの URL をコピー">
 <!ENTITY copyLinkCmd.accesskey             "C">
 <!ENTITY CopyMessageId.label               "メッセージ ID をコピー">
 <!ENTITY CopyMessageId.accesskey           "C">
 <!ENTITY OpenMessageForMsgId.label         "次の ID のメッセージを開く">
 <!ENTITY OpenMessageForMsgId.accesskey     "O">
 <!ENTITY OpenBrowserWithMsgId.label        "次のメッセージ ID をブラウザで開く">
 <!ENTITY OpenBrowserWithMsgId.accesskey    "B">
--- a/suite/chrome/mailnews/newsblog/newsblog.properties
+++ b/suite/chrome/mailnews/newsblog/newsblog.properties
@@ -8,18 +8,24 @@ subscribe-feedAlreadySubscribed=このフィードはすでに購読しています。
 subscribe-errorOpeningFile=ファイルを開けませんでした。
 
 subscribe-OPMLImportTitle=インポートする OPML ファイルの選択
 subscribe-OPMLExportTitle=フィードリストを OPML ファイルとしてエクスポート
 ## LOCALIZATION NOTE(subscribe-OPMLExportFileDialogTitle): %S is the brandShortName
 subscribe-OPMLExportFileDialogTitle=%S OPML のエクスポート
 ## LOCALIZATION NOTE(subscribe-OPMLExportDefaultFileName): %S is the brandShortName
 subscribe-OPMLExportDefaultFileName=My%SFeeds.opml
-## LOCALIZATION NOTE(subscribe-errorInvalidOPMLFile): %S is the name of the OPML file the user tried to import.
-subscribe-errorInvalidOPMLFile=%S が有効な OPML ファイルでないか、ファイルのインポート中にエラーが発生しました。
+## LOCALIZATION NOTE(subscribe-OPMLImportInvalidFile): %S is the name of the OPML file the user tried to import.
+subscribe-OPMLImportInvalidFile=%S ファイルは正しい OPML ファイルではありません。
+## LOCALIZATION NOTE(subscribe-OPMLImportNewFeeds): %S is the count of new imported entries.
+subscribe-OPMLImportNewFeeds=%S 個の新しいフィードをインポートしました。
+## LOCALIZATION NOTE(subscribe-OPMLImportTotalFeeds):
+## - The first %S is the the count of new imported entries,
+## - The second %S is total number of elements found in the file
+subscribe-OPMLImportTotalFeeds=まだ購読していない %1$S 個の新しいフィードをインポートしました (その他 %2$S 個のエントリは購読済みです)。
 
 subscribe-OPMLExportOPMLFilesFilterText=OPML ファイル
 
 subscribe-confirmFeedDeletionTitle=フィードの削除
 ## LOCALIZATION NOTE(subscribe-confirmFeedDeletion): %S is the name of the feed the user wants to unsubscribe from.
 subscribe-confirmFeedDeletion=次のフィードの購読を解除してもよろしいですか? \n %S
 
 ## LOCALIZATION NOTE(subscribe-gettingFeedItems):
--- a/suite/chrome/mailnews/pref/AccountWizard.dtd
+++ b/suite/chrome/mailnews/pref/AccountWizard.dtd
@@ -56,46 +56,50 @@
 <!ENTITY popType.accesskey "P">
 <!ENTITY portNum.label "ポート番号:">
 <!ENTITY portNum.accesskey "o">
 <!ENTITY defaultPortLabel.label "既定のポート番号:">
 <!ENTITY defaultPortValue.label "">
 <!ENTITY leaveMsgsOnSrvr.label "サーバ上にメッセージを残す">
 <!ENTITY leaveMsgsOnSrvr.accesskey "L">
 
-<!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix2) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix2 as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp1.suffix2, if required grammatically.
+<!-- LOCALIZATION NOTE (modifyOutgoing.suffix) : This string will be appended after each of
+     haveSmtp1.suffix3, haveSmtp2.suffix3, haveSmtp3.suffix3 .
+-->
+<!ENTITY modifyOutgoing.suffix "メール送信サーバの設定は [メールとニュースグループのアカウント設定] で変更できます。">
+<!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix3) : Do not translate "SMTP" and "&quot;" in
+     these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix3 as a single sentence, inserting
+     text after the "&quot;" entity in haveSmtp1.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp1.prefix "他のアカウントで設定済みのメール送信 (SMTP) サーバ &quot;">
-<!ENTITY haveSmtp1.suffix2 "&quot; を使用します。メール送信サーバの設定は [編集] メニューの [メールとニュースグループのアカウント設定] で変更できます。">
+<!ENTITY haveSmtp1.suffix3 "&quot; を使用します。">
 
 <!-- Entities for Login page -->
 
 <!ENTITY loginTitle.label "ユーザ名">
 <!ENTITY usernameDesc.label "プロバイダに指定された受信サーバのユーザ名を入力してください">
 <!-- LOCALIZATION NOTE (usernameExample.label) : do not translate "&quot;jsmith&quot;" in below line -->
 <!ENTITY usernameExample.label "(例: &quot;jsmith&quot;).">
 <!ENTITY usernameLabel.label "受信サーバのユーザ名:">
 <!ENTITY usernameLabel.accesskey "I">
 <!ENTITY usernameSmtpDesc.label "プロバイダに指定された送信サーバのユーザ名を入力してください。(多くの場合これは受信サーバのユーザ名と同じです)">
 <!ENTITY usernameSmtpLabel.label "送信サーバのユーザ名:">
 <!ENTITY usernameSmtpLabel.accesskey "O">
-<!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix2) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix2 as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp2.suffix2, if required grammatically.
+<!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix3) : Do not translate "SMTP" and "&quot;" in
+     these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix3 as a single sentence, inserting
+     text after the "&quot;" entity in haveSmtp2.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp2.prefix "メール送信 (SMTP) サーバのユーザ名には、&quot;">
-<!ENTITY haveSmtp2.suffix2 "&quot; が使用されます。メール送信サーバの設定は [編集] メニューの [メールとニュースグループのアカウント設定] で変更できます。">
-<!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix2) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix2 as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp3.suffix2, if required grammatically.
+<!ENTITY haveSmtp2.suffix3 "&quot; が使用されます。">
+<!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix3) : Do not translate "SMTP" and "&quot;" in
+     these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix3 as a single sentence, inserting
+     text after the "&quot;" entity in haveSmtp3.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp3.prefix "送信 (SMTP) サーバ &quot;">
-<!ENTITY haveSmtp3.suffix2 "&quot; が受信サーバと同一であるため、送信サーバへのアクセスにも受信サーバのユーザ名を使用します。送信サーバの設定は [編集] メニューの [メールとニュースグループのアカウント設定] で変更できます。">
+<!ENTITY haveSmtp3.suffix3 "&quot; が受信サーバと同一であるため、送信サーバへのアクセスにも受信サーバのユーザ名を使用します。">
 
 <!-- Entities for Account name page -->
 
 <!ENTITY accnameTitle.label "アカウント名">
 <!-- LOCALIZATION NOTE (accnameDesc.label) : do not translate any "&quot;" in below line -->
 <!ENTITY accnameDesc.label "このアカウントに分かりやすい名前を付けてください (例: &quot;仕事用&quot;, &quot;プライベート&quot; または &quot;ニュースアカウント&quot;)。">
 <!ENTITY accnameLabel.label "アカウント名:">
 <!ENTITY accnameLabel.accesskey "A">
--- a/suite/chrome/mailnews/pref/pref-composing_messages.dtd
+++ b/suite/chrome/mailnews/pref/pref-composing_messages.dtd
@@ -53,25 +53,16 @@
 <!ENTITY autoSave.label                       "メッセージを"><!--Automatically save the message every-->
 <!ENTITY autoSave.accesskey                   "u">
 <!ENTITY autoSaveEnd.label                    "分ごとに下書きとして自動保存する"><!--minutes-->
 <!-- LOCALIZATION NOTE (wrapOutMsg.label): This will concatenate with "xxx characters", using a number and (char.label). -->
 <!ENTITY wrapOutMsg.label                     "通常のテキストメッセージを"><!--Wrap plain text messages at-->
 <!ENTITY wrapOutMsg.accesskey                 "W">
 <!ENTITY char.label                           "文字で改行する"><!--characters-->
 
-<!ENTITY spellingHeader.label                 "スペルチェック">
-<!ENTITY spellCheck.label                     "メッセージ送信前にスペルチェックを行う">
-<!ENTITY spellCheck.accesskey                 "C">
-<!ENTITY spellCheckInline.label               "自動的にスペルチェックを行う">
-<!ENTITY spellCheckInline.accesskey           "e">
-<!ENTITY languagePopup.label                  "言語:">
-<!ENTITY languagePopup.accessKey              "g">
-<!ENTITY moreDictionaries.label               "他の辞書をダウンロード...">
-
 <!ENTITY defaultMessagesHeader.label          "HTML メッセージの既定の設定">
 <!ENTITY font.label                           "フォント:">
 <!ENTITY font.accesskey                       "F">
 <!ENTITY size.label                           "文字サイズ:">
 <!ENTITY size.accesskey                       "S">
 <!ENTITY fontColor.label                      "テキスト:">
 <!ENTITY fontColor.accesskey                  "T">
 <!ENTITY bgColor.label                        "背景色:">
--- a/suite/chrome/mailnews/smime/am-smime.properties
+++ b/suite/chrome/mailnews/smime/am-smime.properties
@@ -14,11 +14,15 @@ NoEncryptionCert=証明書マネージャは他の人があなたに暗号化したメールを送信する際に使用する有効な証明書を見つけられませんでした。
 encryption_needCertWantSame=他の人があなたに暗号化したメールを送信する際に使用する証明書も指定してください。あなたへのメッセージの暗号化と復号にも同じ証明書を使用しますか?
 encryption_wantSame=あなたへのメッセージの暗号化と復号にも同じ証明書を使用しますか?
 encryption_needCertWantToSelect	=他の人があなたに暗号化したメールを送信する際に使用する証明書も指定してください。暗号化証明書を今すぐ設定しますか?
 signing_needCertWantSame=メッセージにデジタル署名する証明書も指定してください。メッセージにデジタル署名する際にも同じ証明書を使用しますか?
 signing_wantSame=メッセージにデジタル署名する際にも同じ証明書を使用しますか?
 signing_needCertWantToSelect=メッセージにデジタル署名する証明書も指定してください。署名証明書を今すぐ設定しますか?
 
 ## Strings used by nsMsgComposeSecure
-mime_multipartSignedBlurb=これは暗号で署名された MIME 形式のメッセージです。
-mime_smimeEncryptedContentDesc=S/MIME 暗号化メッセージ
-mime_smimeSignatureContentDesc=S/MIME 暗号署名
+# (^m^) メッセージ本文に使われるので、安全のため英語のままにする (Bug 507804)
+#mime_multipartSignedBlurb=これは暗号で署名された MIME 形式のメッセージです。
+#mime_smimeEncryptedContentDesc=S/MIME 暗号化メッセージ
+#mime_smimeSignatureContentDesc=S/MIME 暗号署名
+mime_multipartSignedBlurb=This is a cryptographically signed message in MIME format.
+mime_smimeEncryptedContentDesc=S/MIME Encrypted Message
+mime_smimeSignatureContentDesc=S/MIME Cryptographic Signature