23.0: sync suite with en-US rev13937:1eda7c30ee58 SEAMONKEY_2_20b1_BUILD1 SEAMONKEY_2_20b1_RELEASE SEAMONKEY_2_20b2_BUILD1 SEAMONKEY_2_20b2_RELEASE SEAMONKEY_2_20b3_BUILD1 SEAMONKEY_2_20b3_RELEASE
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Thu, 20 Jun 2013 01:43:14 +0900
changeset 1094 48fea34fa5abb690e9e55b25b87d79ce88da255a
parent 1093 519747a6da9655551ae984def5050d23f5e1dff2
child 1095 2b1a9095ba3a7ed7f21fe8f66c554d9196389020
child 1106 a03c1faee04fb90cae5eba1bbc0587ceeeab949b
child 1114 dc3af4d245bb52ae41d73c7b9aa3c51876ce898b
child 1122 8b31933c902ff337c235917d2c5e83e18516149d
push id515
push useraxel@mozilla.com
push dateMon, 24 Jun 2013 19:12:47 +0000
bugs23
23.0: sync suite with en-US rev13937:1eda7c30ee58
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/pref/pref-notifications.dtd
suite/chrome/mailnews/pref/pref-viewing_messages.dtd
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -197,66 +197,102 @@
   <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 Notifications. (If no
     subcategories are visible, double-click Mail &amp; Newsgroups to expand
     the list.)</li>
 </ol>
 
 <ul>
-  <li class="win"><strong>Show an alert</strong>: Select this if you want 
-    &brandShortName; Mail &amp; Newsgroups to display a sliding alert above 
-    your system tray in the lower right corner of your screen when new 
-    messages arrive. The sliding alert only appears once when new messages
-    arrive, and won&apos;t appear again until you bring the Mail &amp;
-    Newsgroups window to the front.
+  <li><strong>Show an alert for [__] seconds</strong>: Select this if you want 
+    &brandShortName; Mail &amp; Newsgroups to display an alert on your desktop
+    when new messages arrive. This alert is usually located above your system
+    tray in the lower right corner of your screen. The alert only appears once
+    when new messages arrive, stays for the specified amount of time, and
+    won&apos;t appear again until you have visited one of your folders with new
+    mail, read one of the new messages, or checked for new messages manually.
     <table>
       <tr>
         <td colspan="2"><img src="images/mail_newmail_alert.png" alt=""/></td>
       </tr>
       <tr>
         <td style="width: 20px;"></td>
-        <td><strong>Sliding new mail alert</strong></td>
+        <td><strong>New mail desktop alert</strong></td>
       </tr>
     </table>
-
-    <p>When the alert appears, clicking the link displayed in the alert will
-      take you to the first folder that has new mail.
+    The following options determine which message-specific items are shown in
+    the alert for each new message:
+    <ul>
+      <li><strong>Show a preview of the message text</strong>: Check this to
+        show the first few words of the message received in the alert.</li>
+      <li><strong>Show the subject</strong>: Check this to show the subject
+        line of the message in the alert.</li>
+      <li><strong>Show the sender</strong>: Check this to show the sender&apos;s
+        name or email address in the alert.</li>
+    </ul>
+    <p>When the alert appears, clicking an entry for a message will take you
+      to the respective folder and opens that message. You can close the alert
+      using the <strong>x</strong> button.
     </p>
 
     <p>The new message alert will continue to work even after you close the
-      Mail window (as long as another &brandShortName; application is running).
+      Mail window (as long as another &brandShortName; window is open).
     </p>
   </li>
 
   <li class="win"><strong>Show a tray icon</strong>: Select this if you want
     &brandShortName; Mail &amp; Newsgroups to display an icon in your system
     tray (which is usually found in the lower right corner of your screen) when
     new messages arrive. This icon will stay in the system tray until you have
-    visited one of your folders with new mail or checked for new messages
-    manually.
+    visited one of your folders with new mail, read one of the new messages,
+    or checked for new messages manually.
     <p style="text-indent: 20px"><img src="images/mail_newmail_trayicon.png"
       alt=""/>&nbsp;&nbsp;<strong>New mail tray icon</strong></p>
     <p>When the icon appears, double-clicking it will open the &brandShortName;
       Mail &amp; Newsgroups main window.</p>
+    <p><strong>Note</strong>: On Windows 7 and above, the Notification Area
+      Icons settings for &brandShortName; must read <q>Show icon and
+      notifications</q> for the icon to stay visible. Otherwise, it may be
+      hidden after a short period of time.</p>
+    <ul>
+      <li><strong>Show a balloon alert</strong>: As an alternative to the
+        desktop alert described above, you can use the operating system&apos;s
+        balloon notification. When new mail arrives, this will show the icon
+        along with a balloon indicating the number of new messages available
+        for the account.
+        <p style="text-indent: 20px"><img src="images/mail_newmail_balloon.png"
+          alt=""/><strong>Balloon&nbsp;alert</strong></p>
+        <p>When the balloon appears, clicking into it will open the Main &amp;
+          Newsgroup main window. The duration of the balloon alert depends on
+          the respective setting in your operating system. You can close the
+          balloon using the <strong>x</strong> button.</p>
+
+        <p>The new message alert will continue to work even after you close the
+          Mail window (as long as another &brandShortName; window is open).</p>
+
+        <p><strong>Note</strong>: <q>Show an alert for [__] seconds</q> and
+          <q>Show a balloon alert</q> cannot be selected at the same time.
+          Checking one option will uncheck the other.</p>
+      </li>
+    </ul>
   </li>
 
   <li class="mac"><strong>Animate the Dock icon</strong>: Select this if you
     want Mail &amp; Newsgroups to bounce the &brandShortName; Dock icon when
     new messages arrive.</li>
   <li><strong>Play a sound</strong>: Select this if you want &brandShortName; 
     Mail &amp; Newsgroups to play a sound when new messages arrive. You can
     choose between the default system sound and a custom sound in WAV format.
     If you choose the latter, use the Browse button to select the sound file in
     the file locator. Click on the Play button to listen to the chosen sound
     file.
 
     <p>Once &brandShortName; Mail has been started, the new messages sound will
       continue to work even after you close the Mail window (as long as another
-      &brandShortName; application is running).</p>
+      &brandShortName; window is open).</p>
   </li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
 <h2 id="composition">Mail &amp; Newsgroups Preferences - Composition</h2>
 
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -40,41 +40,55 @@
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Privacy &amp; Security category, click SSL. (If no
     subcategories are visible, double-click Privacy &amp; Security to expand
     the list.)</li>
 </ol>
 
 <h3 id="ssl_protocol_versions">SSL Protocol Versions</h3>
 
-<p>The Secure Sockets Layer (SSL) protocol defines rules governing mutual
-  authentication between a website and browser software and the encryption of
-  information that flows between them. The Transport Layer Security (TLS)
-  protocol is an IETF standard based on SSL. TLS 1.0 can be thought of as SSL
-  3.1.</p>
+<p>The <a href="glossary.xhtml#ssl">Secure Sockets Layer (SSL)</a> protocol
+  defines rules governing mutual authentication between a website and browser
+  software and the encryption of information that flows between them. It is
+  also used for secure communication in various other protocols, e.g., for
+  protection of sensitive information exchanged with email, calendar, or
+  directory servers. The newer Transport Layer Security (TLS) protocol is an
+  IETF standard based on SSL but with its own version numbering. TLS 1.0 can
+  be thought of as SSL 3.1, and TLS 1.1 is in turn an update to TLS 1.0. Newer
+  protocols are preferred over older ones as they provide better security and
+  more features. Older protocols are supported to ensure compatibility.</p>
 
-<p>You should normally leave all of the following checkboxes selected to ensure
-  that both older and newer web servers can work with the browser:</p>
+<p>By default, &brandShortName; will select the most secure version which is
+  widely supported to connect to the server. If that attempt doesn&apos;t
+  succeed, it will try to connect with the next older version, etc., to the
+  extent allowed by the settings in this panel. The connection will fail if no
+  protocol supported by both sides is found. You can exclude older versions
+  explicitly or allow newer versions which may not be widely supported yet
+  with the following options:</p>
 
 <ul>
-  <li><strong>Enable SSL 3.0</strong>: Allows web servers that support SSL 3.0
-    to work with the browser.</li>
-  <li><strong>Enable TLS 1.0</strong>: Allows newer web servers that support TLS
-    to take advantage of it.</li>
+  <li><strong>Enable</strong>: Check the <strong>SSL 3.0</strong>, <strong>TLS
+    1.0</strong>, and/or <strong>TLS 1.1</strong> boxes to indicate which
+    protocol versions can be used for a secure connection to a server.</li>
 </ul>
 
-<p><strong>Important note regarding TLS</strong>: Some servers that do not
-  implement SSL correctly cannot negotiate the SSL handshake with client
-  software (such as the browser) that supports TLS. Such servers are known as
-  <q>TLS intolerant</q>.</p>
+<p><strong>Notes</strong>:</p>
 
-<p>When the Enable TLS 1.0 option in the SSL preferences panel is selected, the
-  browser attempts to use the TLS protocol when making secure connections with
-  a server. If that connection fails because the server is TLS intolerant, the
-  browser will fall back to using SSL 3.0 (if enabled).</p>
+<ul>
+  <li>At least one protocol version must be selected, thus it is not possible
+    to uncheck the last remaining box.</li>
+  <li>Also, the selection must be contiguous. It is not possible to select both
+    SSL 3.0 and TLS 1.1 but to exclude the intermediate TLS 1.0 version.</li>
+  <li>You can extend the range by multiple versions. For example, if only SSL
+    3.0 is currently checked and you select TLS 1.1, the TLS 1.0 version is
+    automatically selected as well.</li>
+  <li>Checkboxes may appear checked but grayed out if you cannot uncheck them
+    without violating these rules. Uncheck the outermost boxes to regain
+    access to an enclosed intermediate version.</li>
+</ul>
 
 <h3 id="ssl_warnings">SSL Warnings</h3>
 
 <p>It&apos;s easy to tell when the website you are viewing is using an encrypted
   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>
 
--- a/suite/chrome/common/pref/pref-ssl.dtd
+++ b/suite/chrome/common/pref/pref-ssl.dtd
@@ -3,20 +3,24 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  SSLProtocolVersions.caption       "SSL プロトコルのバージョン">
 <!ENTITY  SSLWarnings.caption               "SSL の警告">
 <!ENTITY  SSLMixedContent.caption           "SSL 混在コンテンツ">
 <!ENTITY  SSLClientAuthMethod.caption       "クライアント証明書の選択">
 
 <!ENTITY pref.ssl.title                     "Secure Sockets Layer (SSL)">
-<!ENTITY enable.ssl30.label                 "SSL 3.0 を有効にする">
-<!ENTITY enable.ssl30.accesskey             "3">
-<!ENTITY enable.tls10.label                 "TLS 1.0 を有効にする">
-<!ENTITY enable.tls10.accesskey             "T">
+<!ENTITY limit.description                  "安全な接続に使用する暗号化プロトコルを制限できます。単一のバージョンまたは連続するバージョンの範囲を選択してください。">
+<!ENTITY limit.enable.label                 "有効:">
+<!ENTITY limit.ssl30.label                  "SSL 3.0">
+<!ENTITY limit.ssl30.accesskey              "3">
+<!ENTITY limit.tls10.label                  "TLS 1.0">
+<!ENTITY limit.tls10.accesskey              "T">
+<!ENTITY limit.tls11.label                  "TLS 1.1">
+<!ENTITY limit.tls11.accesskey              "1">
 
 <!ENTITY warn.description                   "&brandShortName; はあなたが見ている Web ページのセキュリティ状態を警告することができます。警告もしくは事前に許可を求めるダイアログを表示させたいケースを、&brandShortName; に設定します:">
 <!ENTITY warn.enteringsecure                "暗号化されたページを読み込むとき">
 <!ENTITY warn.enteringsecure.accesskey      "L">
 <!ENTITY warn.insecurepost                  "暗号化されていないページから暗号化されていないページへデータを送信するとき">
 <!ENTITY warn.insecurepost.accesskey        "S">
 <!ENTITY warn.leavingsecure                 "暗号化されたページから離れるとき">
 <!ENTITY warn.leavingsecure.accesskey       "a">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -9,17 +9,19 @@ removeAccount			= アカウントの削除...
 removeFolder			= フォルダの削除
 newFolderMenuItem		= フォルダ...
 newSubfolderMenuItem		= サブフォルダ...
 newFolder			= 新しいフォルダ...
 newSubfolder			= 新しいサブフォルダ...
 folderProperties		= フォルダのプロパティ
 getMessages			= メッセージを受信
 getMessagesFor			= このアカウントのメッセージを受信
-getNextNMessages		= 次の %S 本の記事を受信する
+# LOCALIZATION NOTE (getNextNewsMessages): Semi-colon list of plural forms.
+# #1 is the number of news messages to get.
+getNextNewsMessages		= 次の #1 本の記事を受信する
 advanceNextPrompt		= %S 内の次の未読メッセージを開きますか?
 titleNewsPreHost		= :
 titleMailPreHost		= :
 replyToSender			= 送信者に返信
 reply				= 返信
 EMLFiles			= メールファイル
 OpenEMLFiles			= メッセージを開く
 # LOCALIZATION NOTE(defaultSaveMessageAsFileName): Do not translate ".eml"
@@ -346,19 +348,21 @@ confirmSavedSearchDeleteButton	= 検索フォルダを削除(&D)
 # Place the word "%S" in your translation where the email address
 # or the username should appear
 passwordPrompt			= %2$S 上の %1$S のパスワードを入力してください:
 
 ## @name ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
 passwordTitle			= メールサーバのパスワードが必要です
 
-# for checking if the user really wants to open lots of messages
+# for checking if the user really wants to open lots of messages in separate windows.
 openWindowWarningTitle		= 確認
-openWindowWarningText		= %S のメッセージを開くには時間がかかります。本当に開きますか?
+# LOCALIZATION NOTE (openWindowWarningConfirmation): Semi-colon list of plural forms.
+# #1 is the number of messages the user is attempting to open.
+openWindowWarningConfirmation	= #1 件のメッセージを開くには時間がかかります。本当に開きますか?
 
 # for warning the user that a tag he's trying to create already exists
 tagExists			= この名前のタグはすでに存在します。
 
 # for checking if the user really wants to delete the adaptive filter training set
 confirmResetJunkTrainingTitle	= 確認
 confirmResetJunkTrainingText	= 本当に迷惑メールフィルタの学習データをリセットしてもよろしいですか?
 
@@ -413,20 +417,21 @@ tabs.closeWarning		= このメッセンジャーウィンドウには %S 個のタブが開いています。このウィンドウ内のタブをすべて閉じてもよろしいですか?
 tabs.closeButton		= すべてのタブを閉じる
 tabs.closeWarningPromptMe	= 同時に複数のメッセンジャータブを閉じるときは確認する
 
 # Messenger bootstrapping messages
 fileNotFoundTitle		= ファイルが見つかりません
 #LOCALIZATION NOTE(fileNotFoundMsg): %S is the filename
 fileNotFoundMsg			= %S ファイルが見つかりません。
 
-applyToCollapsedMsgsTitle	= 折りたたまれたスレッド削除の確認
-applyToCollapsedMsgs		= 警告 - このスレッドのメッセージをすべて削除します。
-applyToCollapsedAlwaysAskCheckbox	= 折りたたまれたスレッドを削除する前に常に確認する
-applyNowButton			= 削除する
+confirmMsgDelete.title		= 削除の確認
+confirmMsgDelete.collapsed.desc	= 折りたたまれたスレッドのメッセージをすべて削除します。本当に削除してもよろしいですか?
+confirmMsgDelete.shiftDel.desc	= メッセージのコピーをごみ箱に残さずに削除します。本当に削除してもよろしいですか?
+confirmMsgDelete.dontAsk.label	= 次回からは確認しない
+confirmMsgDelete.delete.label	= 削除
 
 mailServerLoginFailedTitle			= ログイン失敗
 # LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
 # translation where you wish to display the hostname of the server to which
 # login failed.
 mailServerLoginFailed				= サーバ %S へのログインに失敗しました。
 mailServerLoginFailedRetryButton		= 再試行(&R)
 mailServerLoginFailedEnterNewPasswordButton	= 新しいパスワードを入力(&E)
--- a/suite/chrome/mailnews/pref/pref-notifications.dtd
+++ b/suite/chrome/mailnews/pref/pref-notifications.dtd
@@ -1,23 +1,43 @@
 <!-- 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.notifications.title         "通知">
 <!ENTITY notifications.caption            "通知">
 <!ENTITY newMessagesArrive.label          "新着メッセージが届いたとき:">
+
+<!-- LOCALIZATION NOTE: (showAlertFor.label, showAlertTimeEnd.label)
+     showAlertFor.label is associated with the checkbox to show the alert,
+     leading into a numerical field to enter a time in seconds, followed by
+     showAlertTimeEnd.label which in en-US is the unit of the value -->
+
+<!ENTITY showAlertFor.label               "警告を">
+<!ENTITY showAlertFor.accesskey           "S">
+<!ENTITY showAlertTimeEnd.label           "秒間表示する">
+<!ENTITY showAlertTimeEnd.accesskey       "d">
+
+<!ENTITY showAlertPreviewText.label       "メッセージテキストのプレビューを表示する">
+<!ENTITY showAlertPreviewText.accesskey   "v">
+<!ENTITY showAlertSubject.label           "件名を表示する">
+<!ENTITY showAlertSubject.accesskey       "u">
+<!ENTITY showAlertSender.label            "送信者を表示する">
+<!ENTITY showAlertSender.accesskey        "n">
+
+<!ENTITY showTrayIcon.label               "システムトレイにアイコンを表示する">
+<!ENTITY showTrayIcon.accesskey           "t">
+<!ENTITY showBalloon.label                "バルーンを表示する">
+<!ENTITY showBalloon.accesskey            "o">
+<!ENTITY bounceSystemDockIcon.label       "Dock アイコンをバウンドさせる">
+<!ENTITY bounceSystemDockIcon.accesskey   "A">
+
+
 <!ENTITY playSound.label                  "サウンドを鳴らす">
 <!ENTITY playSound.accesskey              "P">
-<!ENTITY showAnimatedAlert.label          "警告を表示する">
-<!ENTITY showAnimatedAlert.accesskey      "S">
-<!ENTITY showTrayIcon.label               "システムトレイにアイコンを表示する">
-<!ENTITY showTrayIcon.accesskey           "t">
-<!ENTITY bounceSystemDockIcon.label       "Dock アイコンをバウンドさせる">
-<!ENTITY bounceSystemDockIcon.accesskey   "A">
 <!ENTITY playButton.label                 "再生">
 <!ENTITY playButton.accesskey             "l">
 <!ENTITY systemsound.label                "システムの新着メール音">
 <!ENTITY systemsound.accesskey            "M">
 <!ENTITY customsound.label                "サウンドファイルを指定する">
 <!ENTITY customsound.accesskey            "C">
 <!ENTITY browse.label                     "参照...">
 <!ENTITY browse.accesskey                 "B">
--- a/suite/chrome/mailnews/pref/pref-viewing_messages.dtd
+++ b/suite/chrome/mailnews/pref/pref-viewing_messages.dtd
@@ -22,24 +22,22 @@
 <!ENTITY wrapInMsg.label                  "ウィンドウ幅に合わせてテキストを改行する">
 <!ENTITY wrapInMsg.accesskey              "W">
 <!-- LOCALIZATION NOTE : (convertEmoticons.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
 <!ENTITY convertEmoticons.label           "顔文字を画像で表示する">
 <!ENTITY convertEmoticons.accesskey       "D">
 <!ENTITY generalMessageDisplay.caption    "一般">
 <!ENTITY autoMarkAsRead.label             "メッセージを自動的に既読にする">
 <!ENTITY autoMarkAsRead.accesskey         "A">
-<!ENTITY markAsReadNoDelay.label          "メッセージを表示してすぐ">
-<!ENTITY markAsReadNoDelay.accesskey      "m">
-<!-- LOCALIZATION NOTE (markAsReadDelay.label): This will concatenate to
-     "After displaying for [___] seconds",
-     using (markAsReadDelay.label) and a number (secondsLabel.label). -->
-<!ENTITY markAsReadDelay.label            "メッセージを">
-<!ENTITY markAsReadDelay.accesskey        "t">
-<!ENTITY secondsLabel.label               "秒間以上表示した後">
+<!-- LOCALIZATION NOTE (markAsReadAfter.label): This will concatenate to
+     "Only after displaying for [___] seconds",
+     using (markAsReadAfter.label) and a number (secondsLabel.label). -->
+<!ENTITY markAsReadAfter.label            "メッセージを表示してから">
+<!ENTITY markAsReadAfter.accesskey        "t">
+<!ENTITY secondsLabel.label               "秒後">
 
 <!ENTITY openingMessages.label            "メッセージを次の場所に開く:">
 <!ENTITY newWindowRadio.label             "新しいメッセージウィンドウ">
 <!ENTITY newWindowRadio.accesskey         "n">
 <!ENTITY existingWindowRadio.label        "既存のメッセージウィンドウ">
 <!ENTITY existingWindowRadio.accesskey    "e">
 <!ENTITY disableContent.label             "メッセージに含まれる画像などのリモートコンテンツを読み込まない">
 <!ENTITY disableContent.accesskey         "B">