77.0+: sync mail, calendar, chat, suite with en-US rev12994:0aba1f3e8c3b (2020-05-14)
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Sun, 17 May 2020 23:01:49 +0900
changeset 1576 5271e4ed50b902d090cb78121c157412fed9f752
parent 1575 5c960ad3299d2fb779b510ec57a658c12f10395a
child 1577 c90cac5f61509d958da2107dd3de9fdfb2edadfb
push id500
push userchimantaea_mirabilis@yahoo.co.jp
push dateSun, 17 May 2020 14:02:13 +0000
bugs77
77.0+: sync mail, calendar, chat, suite with en-US rev12994:0aba1f3e8c3b (2020-05-14)
calendar/calendar/calendar-ics-file-dialog.ftl
calendar/chrome/calendar/timezones.properties
calendar/chrome/lightning/lightning.properties
chat/imtooltip.properties
mail/chrome/messenger/messenger.dtd
mail/messenger/messengercompose/messengercompose.ftl
mail/messenger/preferences/preferences.ftl
suite/branding/seamonkey/brand.properties
suite/chrome/common/help/certs_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/glossary.xhtml
suite/chrome/common/help/help-glossary.rdf
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/welcome_help.xhtml
suite/chrome/common/pref/pref-appearance.dtd
suite/chrome/common/pref/pref-http.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
new file mode 100644
--- /dev/null
+++ b/calendar/calendar/calendar-ics-file-dialog.ftl
@@ -0,0 +1,16 @@
+# 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/.
+
+calendar-ics-file-window =
+  .title = カレンダーの予定を読み込む
+
+calendar-ics-file-dialog =
+  .buttonlabelaccept = 読み込む
+
+calendar-ics-file-accept-button-ok-label = OK
+
+# $fileName (string) - The name of the file.
+calendar-ics-file-dialog-message = "{ $fileName }" ファイルを読み込みますか?
+calendar-ics-file-import-success = 読み込みが完了しました。
+calendar-ics-file-import-error = エラーが発生したため読み込みに失敗しました。
--- a/calendar/chrome/calendar/timezones.properties
+++ b/calendar/chrome/calendar/timezones.properties
@@ -478,8 +478,11 @@ pref.timezone.Europe.Kirov=ヨーロッパ/キーロフ (Kirov)
 pref.timezone.Europe.Saratov=ヨーロッパ/サラトフ (Saratov)
 pref.timezone.Asia.Atyrau=アジア/アティラウ (Atyrau)
 
 #added with 2.2017b
 pref.timezone.America.Punta_Arenas=アメリカ/プンタアレーナス (Punta Arenas)
 
 #added with 2.2018i
 pref.timezone.Asia.Qostanay=アジア/コスタナイ (Qostanay)
+
+#added with 2.2020a
+pref.timezone.America.Nuuk=アメリカ/ヌーク (Nuuk)
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -136,16 +136,17 @@ imipBarProcessedNeedsAction=メッセージにまだ返答していない予定が含まれています。
 imipBarProcessedMultipleNeedsAction=メッセージにまだ返答していない複数の予定が含まれています。
 imipBarProcessedSeriesNeedsAction=メッセージにまだ返答していない一連の予定が含まれています。
 imipBarReplyText=メッセージに参加依頼への返信が含まれています。
 imipBarReplyToNotExistingItem=メッセージにカレンダーにない予定を参照する返信が含まれています。
 # LOCALIZATION_NOTE(imipBarReplyToRecentlyRemovedItem):
 # %1$S - datetime of deletion
 imipBarReplyToRecentlyRemovedItem=メッセージに %1$S にカレンダーから削除された予定を参照する返信が含まれています。
 imipBarUnsupportedText=メッセージにこのバージョンの Lightning では処理できない予定が含まれています。
+imipBarUnsupportedText2=このメッセージにこのバージョンの %1$S では処理できない予定が含まれています。
 imipBarProcessingFailed=メッセージの処理に失敗しました。状態: %1$S
 imipBarCalendarDeactivated=メッセージに予定の情報が含まれています。この予定を扱うにはカレンダーを有効にしてください。
 imipBarNotWritable=カレンダーに書き込みできないため参加依頼を処理できません。カレンダーの情報を確認してください。
 imipSendMail.title=メール通知
 imipSendMail.text=通知を今すぐメールで送信しますか?
 imipNoIdentity=なし
 imipNoCalendarAvailable=利用できる書き込み可能なカレンダーはありません。
 
--- a/chat/imtooltip.properties
+++ b/chat/imtooltip.properties
@@ -1,7 +1,10 @@
 # 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/.
 
 buddy.username=ユーザー名
 buddy.account=アカウント
 contact.tags=タグ
+
+otr.tag=OTR 状態
+message.status=メッセージが暗号化されています
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -730,16 +730,18 @@
 <!ENTITY totalColumn.label		"合計">
 <!ENTITY readColumn.label		"既読">
 <!ENTITY receivedColumn.label		"受信日時">
 <!ENTITY starredColumn.label		"スター">
 <!ENTITY locationColumn.label		"フォルダー">
 <!ENTITY idColumn.label			"受信順">
 <!ENTITY attachmentColumn.label		"添付">
 
+<!ENTITY deleteColumn.label		"削除">
+
 <!-- Thread Pane Tooltips -->
 <!ENTITY columnChooser2.tooltip		"表示する列を選択します">
 <!ENTITY selectColumn.tooltip		"すべてのメッセージを選択または解除します">
 <!ENTITY threadColumn2.tooltip		"メッセージをスレッド形式で表示します">
 <!ENTITY fromColumn2.tooltip		"差出人で並べ替えます">
 <!ENTITY recipientColumn2.tooltip	"受信者で並べ替えます">
 <!ENTITY correspondentColumn2.tooltip	"通信相手で並べ替えます">
 <!ENTITY subjectColumn2.tooltip		"件名で並べ替えます">
@@ -754,16 +756,18 @@
 <!ENTITY totalColumn2.tooltip		"スレッドの合計メッセージ数">
 <!ENTITY readColumn2.tooltip		"既読かどうかで並べ替えます">
 <!ENTITY receivedColumn2.tooltip	"受信日時で並べ替えます">
 <!ENTITY starredColumn2.tooltip		"スターの有無で並べ替えます">
 <!ENTITY locationColumn2.tooltip	"フォルダーで並べ替えます">
 <!ENTITY idColumn2.tooltip		"受信順で並べ替えます">
 <!ENTITY attachmentColumn2.tooltip	"添付の有無で並べ替えます">
 
+<!ENTITY deleteColumn.tooltip		"メッセージを削除します">
+
 <!-- Thread Pane Context Menu -->
 <!ENTITY contextNewMsgFromTemplate.label	"テンプレートから新規メッセージを作成">
 <!ENTITY contextOpenNewWindow.label		"新規ウインドウでメッセージを開く">
 <!ENTITY contextOpenNewWindow.accesskey		"W">
 <!-- The contextOpenNewTab.accesskey ("T") potentially conflicts with
      cutCmd.accessKey which is defined in textcontext.dtd from toolkit. Right
      now, both menu items can't be visible at the same time, but should someone
      enable copy/paste of message, this key would probably need to be changed. -->
--- a/mail/messenger/messengercompose/messengercompose.ftl
+++ b/mail/messenger/messengercompose/messengercompose.ftl
@@ -9,23 +9,38 @@ remove-address-row-type = { $type } フィールドを削除
 
 #   $type (String) - the type of the addressing row
 #   $count (Number) - the number of address pills currently present in the addressing row
 address-input-type = { $count ->
     [0]     { $type } 入力フィールドは空です
     *[other] { $type } 入力フィールドにアドレスが { $count } 件あります
 }
 
+#   $type (String) - the type of the addressing row
+#   $count (Number) - the number of address pills currently present in the addressing row
+address-input-type-aria-label = { $count ->
+    [0]     { $type }
+    [one]   { $type } のアドレス 1 件、フォーカスするには左矢印キーを押してください。
+    *[other] { $type } のアドレス { $count } 件、フォーカスするには左矢印キーを押してください。
+}
+
+#   $email (String) - the email address
+#   $count (Number) - the number of address pills currently present in the addressing row
+pill-aria-label = { $count ->
+    [one]   { $email }: 編集は Enter キー、削除は Delete キーを押してください。
+    *[other] { $email }, 1 / { $count }: 編集は Enter キー、削除は Delete キーを押してください。
+}
+
 pill-action-edit =
     .label = アドレスを編集
     .accesskey = e
 
 pill-action-move-to =
     .label = To へ移動
-    .accesskey = t
+    .accesskey = T
 
 pill-action-move-cc =
     .label = Cc へ移動
-    .accesskey = c
+    .accesskey = C
 
 pill-action-move-bcc =
     .label = Bcc へ移動
-    .accesskey = b
+    .accesskey = B
--- a/mail/messenger/preferences/preferences.ftl
+++ b/mail/messenger/preferences/preferences.ftl
@@ -90,15 +90,18 @@ update-in-progress-ok-button = 破棄(&D)
 update-in-progress-cancel-button = 続行(&C)
 
 ## OS Authentication dialog
 
 # This message can be seen by trying to add a Master Password.
 master-password-os-auth-dialog-message = マスターパスワードを作成するため、あなたのアカウントを検証します。
 
 # This message can be seen by trying to add a Master Password.
+master-password-os-auth-dialog-message-win = マスターパスワードを作成するには、Windows のログイン資格情報を入力してください。これはアカウントのセキュリティ保護に役立ちます。
+
+# This message can be seen by trying to add a Master Password.
 # The macOS strings are preceded by the operating system with "Thunderbird is trying to "
 # and includes subtitle of "Enter password for the user "xxx" to allow this." These
 # notes are only valid for English. Please test in your locale.
 master-password-os-auth-dialog-message-macosx = マスターパスワードを作成
 
 # Don't change this label.
 master-password-os-auth-dialog-caption = { -brand-full-name }
--- a/suite/branding/seamonkey/brand.properties
+++ b/suite/branding/seamonkey/brand.properties
@@ -3,9 +3,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 brandFullName=SeaMonkey
 brandShortName=SeaMonkey
 brandShorterName=SeaMonkey
 vendorShortName=SeaMonkey e.V.
 sidebarName=サイドバー
 app.releaseNotesURL=https://www.seamonkey-project.org/releases/seamonkey%VERSION%/
+app.troubleshootingURL=https://www.seamonkey-project.org/releases/seamonkey%VERSION%/#troubleshooting
 app.vendorURL=https://www.seamonkey-project.org/
--- a/suite/chrome/common/help/certs_help.xhtml
+++ b/suite/chrome/common/help/certs_help.xhtml
@@ -232,17 +232,17 @@
     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 or Distrust</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>
+  all trusted, you need to edit the root CA certificate 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 issuer.</p>
 
@@ -337,21 +337,17 @@
 
 <p>When you select a module or device, information about the selected item
   appears in the middle of the window, and some of the buttons on the right
   side of the window become available. In general, you perform an action on
   a module or device by selecting its name and clicking the appropriate
   button:</p>
 
 <ul>
-  <li><strong>Log In</strong>: Log into the selected security device. After you
-    have logged in to the device, the frequency with which you will be asked to
-    enter the master password for the device depends on the
-    <a href="passwords_help.xhtml#master_password_timeout">Master Password
-    Timeout</a> settings.</li>
+  <li><strong>Log In</strong>: Log into the selected security device.</li>
   <li><strong>Log Out</strong>: Log out of the selected security device. After
     you have logged out of the device, the device and the certificates it
     contains will not be available until you log in again.</li>
   <li><strong>Change Password</strong>: Change the master password for the
     selected security device.</li>
   <li><strong>Load</strong>: Displays a dialog box that allows you to specify
     the name and location of a new PKCS #11 module. Before adding a new module,
     you should first install the module software on your computer and if
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -493,28 +493,31 @@
         use of HTTP connections, better support for client-side caching, and
         more refined control over cache expiration and replacement policies.</li>
     </ul>
   </li>
   <li><strong>User Agent String</strong>:
     The identifier sent by &brandShortName; to all websites is used for
     statistics about website usage but also sometimes to expose certain features
     only to known browsers (a practice known as "sniffing"). Consequently,
-    unchecking any of these boxes may result in websites or remote calendar
-    services not working properly.
+    changing this option may result in websites not working properly.
+    &brandShortName; can:
     <ul>
-      <li><strong>Advertise Firefox compatibility</strong>: If this is enabled,
-        &brandShortName; will identify itself as both &brandShortName; and also
-        compatible with Firefox. This allows websites that check for certain
-        browsers rather than certain functionality to work with &brandShortName;.</li>
-      <li><strong>Advertise Lightning installation</strong>: This option is
-        only available when the Lightning calendar extension is installed and
-        activated. If this is enabled, &brandShortName; will add information on
-        Lightning being installed and which version, thus calendaring websites
-        and/or remote calendar services can customize their communication.</li>
+      <li><strong>Identify as Firefox</strong>: Do not mention &brandShortName;,
+        send a Firefox identifier instead. This might be needed for websites
+        which refuse to work when &brandShortName; is mentioned in the
+        identifier.</li>
+      <li><strong>Identify as &brandShortName;</strong>: &brandShortName; will
+        identify itself as &brandShortName;, without mentioning Firefox.</li>
+      <li><strong>Identify as &brandShortName; and advertise Firefox
+        compatibility</strong>: &brandShortName; will identify itself as both
+        &brandShortName; and also compatible with Firefox. This allows websites
+        that check for certain browsers rather than certain functionality to
+        work with &brandShortName;, while still appearing as &brandShortName; in
+        website statistics.</li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="software_installation">Advanced Preferences - Software
   Installation</h2>
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -67,16 +67,22 @@
       <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
     is placed over parts of the &brandShortName; user interface and some
     websites.</li>
+  <li><strong>Hide Toolbar Grippies</strong>: <span class="mac">This option is
+    not available on macOS.</span><span class="noMac">Check this if you want to
+    hide the <a href="glossary.xhtml#grippy">menubar and toolbar grippies</a>
+    preventing accidental collapses of menubars and toolbars.
+    </span>
+  </li>
   <li><strong>User Interface Language</strong>: This setting allows you to
     change the language used in the user interface of &brandShortName;.
     Additional languages can be installed from the &brandShortName; home page.
   </li>
   <li><strong>Date and Time Formatting</strong>: There are usually differences
     how settings like date and time are formatted, depending on the region
     (locale). Select how &brandShortName; displays such values:
     <ul>
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -140,17 +140,17 @@
 
 <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>
+    <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 the history settings
   for the browser.</p>
 
 <ul>
@@ -423,38 +423,34 @@
 <p>The Internet Search preferences panel allows you to configure how you search
   using &brandShortName;:</p>
 
 <ul>
   <li><strong>Default Search Engine</strong>:
     <ul>
       <li><strong>Search using</strong>: Use the drop-down list to select the
         search engine you want use for web searching.</li>
+      <li><strong>Manage Search Engines</strong>: Click this to open a dialog
+        where you can manage the search engines list. In this dialog you can
+        also select <strong>Show search suggestions</strong> to have
+        &brandShortName; show suggestions from the search engine as you type a
+        search string in the Sidebar search tab or in the Search Bar.</li>
     </ul>
   </li>
   <li><strong>Search Results</strong>:
     <ul>
-      <li><strong>Open the Search tab in the Sidebar when search results are
-        available</strong>: Select this to have &brandShortName; open the
-        Sidebar and show your search results.</li>
-      <li><strong>Open tab instead of window for a context menu web
+      <li><strong>Open new tabs for sidebar search results</strong>: Select this
+        to have &brandShortName; show your search results in a new tab rather
+        than in the current one when you search using the sidebar.</li>
+      <li><strong>Open a tab instead of a window for a context menu web
         search</strong>: Select this to have &brandShortName; show your search
         results in a new tab rather than a new window when you search on
         selected words in a web page.</li>
     </ul>
   </li>
-  <li><strong>Sidebar Search Tab Preference</strong>:
-    <ul>
-      <li><strong>Basic</strong>: Choose this to use one search engine when
-        searching in &brandShortName;.</li>
-      <li><strong>Advanced</strong>: <strong></strong>Choose this to select one
-        or more search engines from a list when searching in
-        &brandShortName;.</li>
-    </ul>
-  </li>
 </ul>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="tabbed_browsing">Browser Preferences - Tabbed Browsing</h2>
 
 <p>This section describes how to use the Tabbed Browsing preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
--- a/suite/chrome/common/help/glossary.xhtml
+++ b/suite/chrome/common/help/glossary.xhtml
@@ -320,16 +320,21 @@
 
 <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="geolocation_service">geolocation service</dt><dd>A web service for
   <a href="#location_aware_browsing">location aware browsing</a>.</dd>
 
+<dt id="grippy">grippy</dt><dd>A small box element to the left of menubars and
+  toolbars. The grippy allows the user to quickly collapse menubars and
+  toolbars. <span class="mac">Grippies are not available on macOS.</span>
+  </dd>
+
 <dt id="gssapi">GSSAPI (Generic Security Services Application Program
   Interface)</dt><dd>See <a href="#kerberos">Kerberos</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).
--- a/suite/chrome/common/help/help-glossary.rdf
+++ b/suite/chrome/common/help/help-glossary.rdf
@@ -53,16 +53,17 @@
         <rdf:li> <rdf:Description nc:name="feed" nc:link="glossary.xhtml#feed"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="fingerprint (certificate)" nc:link="glossary.xhtml#fingerprint"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="fingerprinting (browser)" nc:link="glossary.xhtml#fingerprinting"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FIPS PUBS 140-1" nc:link="glossary.xhtml#fips_pubs_140-1"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="foreign cookie" nc:link="glossary.xhtml#foreign_cookie"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="frame" nc:link="glossary.xhtml#frame"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FTP" nc:link="glossary.xhtml#ftp"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="geolocation service" nc:link="glossary.xhtml#geolocation_service"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="grippy" nc:link="glossary.xhtml#grippy"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="GSSAPI" nc:link="glossary.xhtml#gssapi"/> </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>
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -502,22 +502,27 @@
 <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 Internet Search. (If no subcategories
     are visible, double-click the Browser to expand the list.)</li>
   <li>Under Default Search Engine, choose a search engine you want to use for
     web searching.</li>
-  <li>Under Search Results, select <q>Open the Search tab in the Sidebar
-    when a search is invoked</q> if you want the Sidebar search tab to open
-    when you perform a search.</li>
+  <li>Click Manage Search Engines to open the <q>Manage Search Engine List</q>
+    dialog, where you can select <q>Show search suggestions</q> if you want
+    &brandShortName; to show suggestions from the search engine as you type a
+    search string in the Sidebar search tab or in the Search Bar. Then click OK
+    to save any changes and close this dialog.</li>
   <li>Under Search Results, select <q>Open new tabs for sidebar search
     results</q> if you want to see the results from Sidebar searches to open in
     a new tab instead of the current tab.</li>
+  <li>Under Search Results, select <q>Open a tab instead of a window for a
+    context menu web search</q> if you want search results to open in a new tab
+    instead of a new window when you search for selected words.</li>
 </ol>
 
 <p>[<a href="#searching_the_web">Return to beginning of section</a>]</p>
 
 <h2 id="searching_within_a_page">Searching Within a Page</h2>
 
 <p>To find text within the page you are currently viewing in the browser:</p>
 
--- a/suite/chrome/common/help/welcome_help.xhtml
+++ b/suite/chrome/common/help/welcome_help.xhtml
@@ -43,17 +43,17 @@
 
       <p>The oldest community website around, providing news flashes, polls, and
         Web forums.</p>
     </td>
   </tr>
 
   <tr valign="top">
     <td>
-      <p><strong><a href="http://www.seamonkey-project.org/doc/troubleshooting">Troubleshooting</a></strong></p>
+      <p><strong><a href="x-moz-url-link:app.troubleshootingURL">Troubleshooting</a></strong></p>
 
       <p>Answers to some of the most frequently encountered problems.</p>
     </td>
     <td>&nbsp;</td>
   </tr>
 
   <tr valign="top">
     <td>
@@ -80,17 +80,17 @@
         Newsgroups</a></strong></p>
 
       <p>User newsgroups hosted by mozilla.org.</p>
     </td>
   </tr>
 
   <tr valign="top">
     <td>
-      <p><strong><a href="irc://moznet/seamonkey/">Realtime Chat</a></strong></p>
+      <p><strong><a href="irc://freenode/SeaMonkey">Realtime Chat</a></strong></p>
       <p>Chat with &brandShortName; users via IRC.</p>
     </td>
     <td></td>
   </tr>
 </table>
 
 </body>
 </html>
--- a/suite/chrome/common/pref/pref-appearance.dtd
+++ b/suite/chrome/common/pref/pref-appearance.dtd
@@ -16,16 +16,19 @@
 <!ENTITY picsNtextRadio.accesskey               "P">
 <!ENTITY picsOnlyRadio.label                    "絵のみ">
 <!ENTITY picsOnlyRadio.accesskey                "o">
 <!ENTITY textonlyRadio.label                    "文字のみ">
 <!ENTITY textonlyRadio.accesskey                "x">
 <!ENTITY showHideTooltips.label                 "ツールチップを表示する">
 <!ENTITY showHideTooltips.accesskey             "T">
 
+<!ENTITY showHideGrippies.label                 "ツールバーのグリッピーを隠す">
+<!ENTITY showHideGrippies.accesskey             "G">
+
 <!ENTITY pref.locales.title                     "メニューなどの表示に使用する言語">
 <!ENTITY selectLocale.label                     "ダイアログボックス、メニュー、ツールバー、ボタンに使用する言語を選択してください:">
 
 <!--LOCALIZATION NOTE (dateTimeFormatting.label): labels/accesskeys for
      radiobuttons are set dynamically from prefutilities.properties
 -->
 <!ENTITY dateTimeFormatting.label               "日付と時刻の書式">
 
--- a/suite/chrome/common/pref/pref-http.dtd
+++ b/suite/chrome/common/pref/pref-http.dtd
@@ -10,13 +10,20 @@
 <!ENTITY prefEnableHTTP10.label              "HTTP 1.0 を使用する">
 <!ENTITY prefEnableHTTP10.accesskey          "U">
 <!ENTITY prefEnableHTTP10Proxy.accesskey     "S">
 <!ENTITY prefEnableHTTP11.label              "HTTP 1.1 を使用する">
 <!ENTITY prefEnableHTTP11.accesskey          "E">
 <!ENTITY prefEnableHTTP11Proxy.accesskey     "T">
 <!ENTITY prefPara                            "これらのオプションで HTTP 接続のパフォーマンスや互換性を向上させることができます。いくつかのプロキシーサーバーは、例えば HTTP/1.0 を必要とすることが知られています (詳細はリリースノートを参照してください)。">
 <!ENTITY prefUseragent.label                 "ユーザーエージェント文字列の設定">
-<!ENTITY prefFirefoxCompat.label             "ユーザーエージェントに Firefox 互換ブラウザーであることを追記する"><!--Advertise Firefox compatibility-->
+<!ENTITY prefFirefoxCompat.label             "Firefox 互換を表明する"><!--Advertise Firefox compatibility-->
 <!ENTITY prefFirefoxCompat.accesskey         "F">
-<!ENTITY prefLightningShow.label             "Lightning のインストールを宣伝する">
+<!ENTITY prefLightningShow.label             "Lightning のインストールを表明する">
 <!ENTITY prefLightningShow.accesskey         "L">
 <!ENTITY prefCompatWarning                   "警告: この設定を無効にするとウェブサイトやサービスが正しく動作しなくなる可能性があります。">
+<!ENTITY prefFirefoxStrict.label             "Firefox のユーザーエージェント">
+<!ENTITY prefFirefoxStrict.accesskey         "I">
+<!ENTITY prefFirefoxNone.label               "SeaMonkey のユーザーエージェント">
+<!ENTITY prefFirefoxNone.accesskey           "M">
+<!ENTITY prefFirefoxCompat2.label            "SeaMonkey のユーザーエージェントで Firefox 互換">
+<!ENTITY prefFirefoxCompat2.accesskey        "F">
+<!ENTITY prefCompatWarning2.desc             "警告: この設定を変更するとウェブサイトやサービスが正しく動作しなくなる可能性があります。">
--- a/suite/chrome/common/utilityOverlay.dtd
+++ b/suite/chrome/common/utilityOverlay.dtd
@@ -198,9 +198,12 @@
 
 <!-- Popup Blocked notification menu -->
 <!ENTITY allowPopups.accesskey		"p">
 <!ENTITY showPopupManager.label		"ポップアップの管理">
 <!ENTITY showPopupManager.accesskey	"M">
 <!ENTITY dontShowMessage.label		"ポップアップをブロックしたときにこのメッセージを表示しない">
 <!ENTITY dontShowMessage.accesskey	"D">
 
+<!ENTITY throbber.title			"Throbber">
+<!ENTITY throbber.tooltip2		"&brandShortName; のホームページへ移動します">
+
 <!ENTITY syncToolbarButton.label	"Sync">
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -499,16 +499,18 @@
 <!ENTITY contextPrint.label                       "プリント...">
 <!ENTITY contextPrint.accesskey                   "P">
 <!ENTITY contextPrintPreview.label                "プリント プレビュー">
 <!ENTITY contextPrintPreview.accesskey            "v">
 
 <!-- Folder Pane Context Menu -->
 <!ENTITY folderContextGetMessages.label            "メッセージを取得する">
 <!ENTITY folderContextGetMessages.accesskey        "G">
+<!ENTITY folderContextMarkAllFoldersRead.label     "すべてのフォルダーを既読にする">
+<!ENTITY folderContextMarkAllFoldersRead.accesskey "M">
 <!ENTITY folderContextOpenNewWindow.label          "新規メールウインドウで開く">
 <!ENTITY folderContextOpenNewWindow.accesskey      "W">
 <!ENTITY folderContextOpenNewTab.label             "新規タブで開く">
 <!ENTITY folderContextOpenNewTab.accesskey         "T">
 <!ENTITY folderContextRename.label                 "名前の変更">
 <!ENTITY folderContextRename.accesskey             "R">
 <!ENTITY folderContextRemove.label                 "削除">
 <!ENTITY folderContextRemove.accesskey             "D">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -473,16 +473,19 @@ mailServerLoginFailedTitle		=ログイン失敗
 # "%S" is the account name.
 mailServerLoginFailedTitleWithAccount	=アカウント "%S" へのログインに失敗しました。
 # LOCALIZATION NOTE (mailServerLoginFailed2):
 # %1$S is the host name of the server, %2$S is the user name.
 mailServerLoginFailed2			=ユーザー名 %2$S でサーバー %1$S へのログインに失敗しました。
 mailServerLoginFailedRetryButton	=再試行(&R)
 mailServerLoginFailedEnterNewPasswordButton	=新規パスワードを入力(&E)
 
+confirmMarkAllFoldersReadTitle		=すべてのフォルダーを既読にする
+confirmMarkAllFoldersReadMessage	=本当にこのアカウントのすべてのフォルダーに含まれるメッセージを既読にしますか?
+
 # LOCALIZATION NOTE (junkBarMessage): %S is the brandname
 junkBarMessage				=%1$0.Sこのメールは迷惑メールの可能性があります。
 junkBarButton				=迷惑メールではありません
 junkBarButtonKey			=N
 junkBarInfoButton			=?
 junkBarInfoButtonKey			=?
 # LOCALIZATION NOTE (remoteContentBarMessage): %S is the brandname
 remoteContentBarMessage			=%1$0.Sプライバシー保護のため、このメッセージ内のリモートコンテンツをブロックしました。