14.0: sync suite with en-US rev10904:648090f7ec78
authorYouhei Tooyama
Tue, 05 Jun 2012 08:17:50 +0900
changeset 709 218176a122fdc327e7287a665c6c75d704615f32
parent 650 75d86219d5474cc6c93e080d8e5c333ca814ea77
child 710 e671d31c1effecac9d6cb0eaf29da7f955977f9e
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
14.0: sync suite with en-US rev10904:648090f7ec78
--- a/suite/chrome/browser/navigator.properties
+++ b/suite/chrome/browser/navigator.properties
@@ -25,17 +25,17 @@ tabs.closeTab.accesskey=C
 tabs.recentlyClosed.format=%1$S %2$S
 windows.recentlyClosed.format=%1$S %2$S
-tabs.closeWarning=%S 枚のタブが開かれたままになっていますが、ウィンドウを閉じてもいいですか?
+tabs.closeWarning=%S 個のタブが開かれたままになっていますが、ウィンドウを閉じてもいいですか?
 # urlbarBindings.xml
 # LOCALIZATION NOTE: This is for the location bar drop-down string:
--- a/suite/chrome/common/dataman/dataman.dtd
+++ b/suite/chrome/common/dataman/dataman.dtd
@@ -92,16 +92,17 @@
 <!ENTITY cookies.blockOnRemove.label "このリストから削除した Web サイトの Cookie はブロックする">
 <!ENTITY cookies.blockOnRemove.accesskey "W">
 <!-- permissions -->
 <!ENTITY perm.UseDefault "標準設定を使用する">
 <!ENTITY perm.AskAlways "毎回確認する">
 <!ENTITY perm.NeverSave "保存しない">
 <!ENTITY perm.Allow "許可">
+<!ENTITY perm.AllowSameDomain "同じドメインのみ許可">
 <!ENTITY perm.AllowSession "セッション中のみ許可">
 <!ENTITY perm.Block "ブロック">
 <!ENTITY perm.host.placeholder "ホスト名を入力してください">
 <!ENTITY perm.button.add.label "追加">
 <!ENTITY perm.button.add.accesskey "A">
 <!-- preferences -->
--- a/suite/chrome/common/dataman/dataman.properties
+++ b/suite/chrome/common/dataman/dataman.properties
@@ -49,18 +49,22 @@ cookies.deleteSelectedTitle=選択した Cookie の削除
 # permissions
 perm.allowXULXBL.label=XUL/XBL マークアップの使用
 perm.cookie.label=Cookie データの保存
 # passwords
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -46,23 +46,30 @@
   you&apos;re not already viewing it, follow these steps:</p>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Click the Advanced category.</li>
-<p class="unix">The main Advanced preferences panel allows you to:</p>
+<p>The main Advanced preferences panel allows you to:</p>
-  <li class="unix"><strong>Use Preferences from System</strong>: Select
-    this to use the already set system preferences, overriding 
-    &brandShortName;&apos; ones.
-  </li>
+  <li class="unix"><strong>Use Preferences from System</strong>: Select this to
+    use the already set system preferences, overriding &brandShortName;&apos;.</li>
+  <li class="win"><strong>Check default application settings on startup</strong>:
+    Select this to have &brandShortName; check whether it is the default
+    application for tasks like browsing and mail. If &brandShortName; detects
+    on startup that it is not the default application for any of these tasks,
+    a dialog will appear that allows you to choose which tasks &brandShortName;
+    should handle by default.</li>
+  <li><strong>Submit crash reports</strong>: Select this to enable the Mozilla
+    Crash Reporter. If &brandShortName; crashes, you will be asked in each case
+    whether to report the issue.</li>
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 <h2 id="scripts_and_plugins">Advanced Preferences - Scripts &amp;
 <p>This section describes how to use the Scripts &amp; Plugins preferences
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -88,35 +88,51 @@
   <li class="win"><strong>Default Browser</strong>: Allows you to set
     &brandShortName; as the default browser or shows you that it is.
       <li><strong>Set Default Browser</strong>: Unless it is greyed out, click
         this to set &brandShortName; as your default browser.</li>
-  <li><strong>Home Page</strong>: In the field, type the web page you want as
+  <li><strong>When restoring sessions and windows</strong>: Choose how many
+    (if any) browser tabs should be restored at a time upon startup.
+    <ul>
+      <li><strong>Restore all tabs immediately</strong>: All the tabs you had
+        open the last time will be restored and loaded at once. This can affect
+        startup performance negatively if a large amount of tabs needs to be
+        restored in parallel.</li>
+      <li><strong>Restore [__] tab(s) at a time</strong>: If you choose this,
+        only the specified amount of tabs will be restored at a time. If you
+        had more tabs open than specified here, any extra tabs will only be
+        loaded once the loading of one of the other tabs has finished.</li>
+      <li><strong>Only restore tabs when I need them</strong>: This disables
+        automatic restoring of tabs, i.e. tabs will only be loaded if you
+        switch to or reload them.</li>
+    </ul>
+  </li>
+  <li>Home button preferences: In the field, type the web page you want as
     your home page or do one of the following:
+      <li><strong>Choose File</strong>: Click this to locate a file on disk
+        that you want to load as your home page.</li>
       <li><strong>Use Current Page</strong>: Click this to use the web page
         currently displayed in the browser as your home page.</li>
       <li><strong>Use Current Group</strong>: If you have two or more browser
         tabs open, click this to set them as your Home Page Group (a group of
         tabs that are opened as your home page). After clicking this button,
         the message <q>Home Page Group is Set</q> appears in the location
         <p><strong>Caution</strong>: If you edit the field after clicking Use
           Current Group, your Home Page Group will be lost.</p>
       <li><strong>Restore Default</strong>: Click this to revert to the
         default home page.</li>
-      <li><strong>Choose File</strong>: Click this to locate a file on disk
-        that you want to load as your home page.</li>
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 <h2 id="history">Browser Preferences - History</h2>
@@ -334,16 +350,23 @@
             matching visited web addresses.
             <span class="unix"><strong>Note</strong>: If you have turned off
             <q>Autocomplete from your browsing history as you type</q>
             matching results from locations on your hard drive will still be
             shown in the drop-down list.</span></li>
+  <li><strong>Formatting</strong>:
+    <ul>
+      <li><strong>Highlight the effective domain for websites and FTP
+        servers</strong>: Grays out all of the URL except for the effective
+        domain, so that it is clear which site you are visiting.</li>
+    </ul>
+  </li>
   <li><strong>Internet Search Engine</strong>:
       <li><strong>Show default search engine</strong>: Shows a drop-down list item,
         allowing you to search with the default search engine for words you
   <li><strong>Unknown Locations</strong>
@@ -355,20 +378,17 @@
         detailed information about this feature, see the online document
         <a href="http://www.mozilla.org/docs/end-user/domain-guessing.html">
         Domain Guessing</a>.</li>
       <li><strong>Perform a web search when entered text is not a web
         location</strong>: Select this to let &brandShortName; automatically
         search the web for text entered in the Location Bar. If the text
         you&apos;ve typed is not a web location, &brandShortName; will do a web
         search when you press <kbd class="noMac">Enter</kbd>
-        <kbd class="mac">Return</kbd> in the Location Bar.
-        <strong>Note</strong>: The search engine used can not be
-        changed by the <a href="#internet_search">Internet Search
-        Preferences</a>.</li>
+        <kbd class="mac">Return</kbd> in the Location Bar.</li>
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 <h2 id="internet_search">Browser Preferences - Internet Search</h2>
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -280,16 +280,34 @@
     you are currently composing automatically at the given interval. After a
     computer crash or program failure you can find the latest saved version of
     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>Select reply header type</strong>:
+    Select the type of reply header you wish to use. There are four choices
+    available:
+    <ol>
+      <li>No Reply Header</li>
+      <li>[Author] wrote:<br/>
+        This setting is based on the mailnews.reply_header_authorwrote 
+        preference.</li>
+      <li>On [date], [author] wrote:<br/>
+        This setting is based on a combination of the mailnews.reply_header_ondate, 
+        mailnews.reply_header_separator and mailnews.reply_header_authorwrote 
+        preferences.</li>
+      <li>[Author] wrote, On [date]:<br/>
+        This setting is based on a combination of the 
+        mailnews.reply_header_authorwrote, mailnews.reply_header_separator and 
+        mailnews.reply_header_ondate preferences.</li>
+    </ol>
+  </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>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>
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -42,35 +42,35 @@
 <h3 id="ssl_protocol_versions">SSL Protocol Versions</h3>
 <p>The Secure Sockets Layer (SSL) protocol defines rules governing mutual
   authentication between a web site 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
-<p>You should normally leave these three checkboxes selected to ensure that
-  both older and newer web servers can work with the browser:</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>
-  <li><strong>Enable SSL version 3</strong>: Allows newer web servers to work
-    with the browser.</li>
-  <li><strong>Enable TLS</strong>: Allows web servers that support TLS to take
-    advantage of it.</li>
+  <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>
 <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>When the Enable TLS option in the SSL preferences panel is selected, the
+<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.</p>
+  browser will fall back to using SSL 3.0 (if enabled).</p>
 <h3 id="ssl_warnings">SSL Warnings</h3>
 <p>It&apos;s easy to tell when the web site 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/help/welcome_help.xhtml
+++ b/suite/chrome/common/help/welcome_help.xhtml
@@ -39,26 +39,26 @@
       <p>The oldest community website around, providing news flashes, polls, and
         Web forums.</p>
   <tr valign="top">
-      <p><strong><a href="http://www.mozilla.org/start/1.5/troubleshooting/">Troubleshooting</a></strong></p>
+      <p><strong><a href="http://www.seamonkey-project.org/doc/troubleshooting">Troubleshooting</a></strong></p>
       <p>Answers to some of the most frequently encountered problems.</p>
   <tr valign="top">
-      <p><strong><a href="http://plugindoc.mozdev.org/">PluginDoc</a></strong></p>
+      <p><strong><a href="http://www.mozilla.org/plugincheck/">Plugin Check</a></strong></p>
       <p>Up-to-date information on &brandShortName; plugins.</p>
   <tr valign="top">
     <td colspan="2"><h2>Peer Support</h2></td>
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -18,16 +18,27 @@ blockedpluginsMessage.searchButton.acces
 crashedpluginsMessage.title=%S プラグインがクラッシュしました。
 popupWarning=%S は、このサイトが開くポップアップをブロックしました。
 popupWarningMultiple=%S は、このサイトが開くポップアップ (%S 件) をブロックしました。
 xpinstallPromptWarning=%S はサイト "%S" からのソフトウェアのインストールをブロックしました。
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -110,22 +110,16 @@
 <!ENTITY sendButton.tooltip "このメッセージを今すぐ送信します">
 <!ENTITY sendlaterButton.tooltip "このメッセージを後で送信します">
 <!ENTITY addressButton.tooltip "アドレス帳から宛先を選択します">
 <!ENTITY attachButton.tooltip "このメッセージにファイルを添付します">
 <!ENTITY saveButton.tooltip "このメッセージを保存します">
 <!ENTITY stopButton.tooltip "送受信を中止します">
 <!-- context menu items -->
-<!ENTITY spellCheckNoSuggestions.label "(候補が見つかりません)">
-<!ENTITY spellCheckIgnoreWord.label "単語を無視">
-<!ENTITY spellCheckIgnoreWord.accesskey "I">
-<!ENTITY spellCheckAddToDictionary.label "辞書に追加">
-<!ENTITY spellCheckAddToDictionary.accesskey "n">
 <!ENTITY openAttachment.label "開く">
 <!ENTITY openAttachment.accesskey "O">
 <!ENTITY renameAttachment.label "名前変更...">
 <!ENTITY renameAttachment.accesskey "R">
 <!ENTITY deleteAttachment.accesskey "D">
 <!ENTITY selectAllAttachments.accesskey "A">
 <!ENTITY attachFile.label "ファイルを添付...">
 <!ENTITY attachFile.accesskey "F">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -308,16 +308,17 @@ mailnews.search_date_leading_zeros=true
 nocachedbodybody=このメッセージの本文はオフライン作業用にサーバからダウンロードされていません。メッセージを読むには [ファイル] メニューを開いて [オフライン] を選択し、[オンライン作業] のチェックを外してオンラインにしてください。オフラインで使用するフォルダとメッセージは [ツール] メニューから [アカウント設定] を開き、[オフラインとディスク領域] で設定できます。
 # accountCentral
 # LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
 acctCentralTitleFormat=%1$S %2$S - %3$S
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 # mailWindowOverlay.js
 confirmUnsubscribeText=本当に %S を購読解除しますか?
--- a/suite/chrome/mailnews/newsblog/am-newsblog.dtd
+++ b/suite/chrome/mailnews/newsblog/am-newsblog.dtd
@@ -1,10 +1,8 @@
-<!ENTITY accountTitle.label "フィードアカウントの設定">
 <!ENTITY biffStart.label "新着記事を">
 <!ENTITY biffStart.accesskey "k">
 <!ENTITY biffEnd.label "分ごとに確認する">
 <!ENTITY loginAtStartup.label "起動時に新着記事がないか確認する">
 <!ENTITY loginAtStartup.accesskey "C">
 <!ENTITY useQuickMode.label "標準では Web ページを読み込まずに記事の要約を表示する">
--- a/suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
+++ b/suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
@@ -10,16 +10,17 @@
 <!ENTITY feedLocation.placeholder    "追加するフィードの正しい URL を入力してください">
 <!ENTITY feedFolder.label            "記事の保存先:">
 <!ENTITY feedFolder.accesskey        "S">
 <!ENTITY quickMode.label             "Web ページを読み込まずに記事の要約を表示する">
 <!ENTITY quickMode.accesskey         "h">
+<!ENTITY locationValidate.label		"フィードの検証">
 <!ENTITY validateText.label          "フィードが有効か確認して正しい URL を取得します。">
 <!ENTITY button.addFeed.label        "追加">
 <!ENTITY button.addFeed.accesskey    "A">
 <!ENTITY button.editFeed.label       "更新">
 <!ENTITY button.editFeed.accesskey   "U">
 <!ENTITY button.removeFeed.label     "削除">
 <!ENTITY button.removeFeed.accesskey "R">
--- a/suite/chrome/mailnews/newsblog/newsblog.properties
+++ b/suite/chrome/mailnews/newsblog/newsblog.properties
@@ -3,19 +3,21 @@
 subscribe-feedNotValid=フィードの URL が正しくありません。
 subscribe-networkError=フィードの URL が見つかりませんでした。フィード名を確認して再度試してください。
 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
 ## LOCALIZATION NOTE(subscribe-OPMLImportInvalidFile): %S is the name of the OPML file the user tried to import.
--- a/suite/chrome/mailnews/pref/am-server-top.dtd
+++ b/suite/chrome/mailnews/pref/am-server-top.dtd
@@ -1,10 +1,11 @@
 <!-- extracted from am-server-top.xul -->
+<!ENTITY messageStorage.label "メッセージの保存">
 <!ENTITY securitySettings.label "セキュリティ設定">
 <!ENTITY serverSettings.label "サーバ設定">
 <!ENTITY serverType.label "サーバの種類:">
 <!ENTITY serverName.label "サーバ名:">
 <!ENTITY serverName.accesskey "S">
 <!ENTITY userName.label "ユーザ名:">
 <!ENTITY userName.accesskey "N">
 <!ENTITY port.label "ポート:">
@@ -58,21 +59,24 @@
 <!ENTITY maxMessagesStart.label "ダウンロードするメッセージ数が">
 <!ENTITY maxMessagesStart.accesskey "m">
 <!-- LOCALIZATION NOTE (maxMessagesEnd.label) : see note for maxMessagesStart.label -->
 <!ENTITY maxMessagesEnd.label "以上になる場合は確認する">
 <!ENTITY alwaysAuthenticate.label "サーバへ接続するときは必ず認証を要求する">
 <!ENTITY alwaysAuthenticate.accesskey "w">
 <!ENTITY newsrcFilePath.label "newsrc ファイル:">
-<!ENTITY localPath.label		"メッセージの保存先:"><!-- en-US: Local directory -->
+<!ENTITY newsrcPicker.label "newsrc ファイルを選択してください">
 <!ENTITY abbreviate.label "ニュースグループ名の表示形式:">
 <!ENTITY abbreviateOn.label "Full names (For example, 'netscape.public.mozilla.mail-news')">
 <!ENTITY abbreviateOff.label "完全名 (例: netscape.public.mozilla.mail-news)">
 <!ENTITY advancedButton.label "詳細...">
 <!ENTITY serverDefaultCharset.label "既定の文字エンコーディング:">
 <!ENTITY advancedButton.accesskey "v">
+<!ENTITY localPath.label "メッセージの保存先:"><!-- en-US: Local directory -->
 <!ENTITY localFolderPicker.label "メッセージデータの保存先を選択してください">
 <!ENTITY browseFolder.label "参照...">
 <!ENTITY browseFolder.accesskey "B">
-<!ENTITY newsrcPicker.label "newsrc ファイルを選択してください">
 <!ENTITY browseNewsrc.label "参照...">
 <!ENTITY browseNewsrc.accesskey "e">
+<!ENTITY accountTitle.label "アカウント設定">
+<!ENTITY accountSettingsDesc.label "これは特殊なアカウントであり、特定の差出人情報はありません。">
--- a/suite/chrome/mailnews/pref/am-serverwithnoidentities.dtd
+++ b/suite/chrome/mailnews/pref/am-serverwithnoidentities.dtd
@@ -1,11 +1,2 @@
-<!ENTITY accountTitle.label "アカウントの設定">
-<!ENTITY accountSettingsDesc.label "これは特殊なアカウントであり、特定の差出人情報はありません。">
 <!ENTITY accountName.label "アカウント名:">
 <!ENTITY accountName.accesskey "N">
-<!ENTITY messageStorage.label "メッセージの保存">
-<!ENTITY emptyTrashOnExit.label "終了時にごみ箱を空にする">
-<!ENTITY emptyTrashOnExit.accesskey "x">
-<!ENTITY localPath.label "メッセージの保存先:">
-<!ENTITY localFolderPicker.label "メッセージデータの保存先を選択してください">
-<!ENTITY browseFolder.label "参照...">
-<!ENTITY browseFolder.accesskey "B">
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -39,18 +39,24 @@
 # The following are used by the Account Wizard
 enterValidEmail= 正しいメールアドレスを入力してください。
 accountExists= ユーザ名とサーバ名が同じメールアカウントまたはニュースグループのアカウントがすでに存在します。[戻る] をクリックして別のサーバ名を入力するか、[キャンセル] をクリックしてください。
 modifiedAccountExists= このユーザ名とサーバ名のアカウントがすでに存在します。別のユーザ名またはサーバ名を入力してください。
 userNameChanged= ユーザ名を変更しました。このアカウントに関連付けられたメールアドレスやユーザ名も更新する必要があります。
 serverNameChanged= サーバ名を変更しました。既存のフィルタに使用されているフォルダが新しいサーバにもあるか確認してください。
+# LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
+junkSettingsBroken = アカウント "%1$S" の迷惑メール設定に問題があります。アカウント設定を保存する前にこれらの設定を見直してください。
+# LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
+localDirectoryChanged= ローカルディレクトリ設定の変更を適用するため、%1$S を今すぐ再起動する必要があります。
+localDirectoryRestart= 再起動
+serverNameEmpty= サーバ名またはユーザ名を空にすることはできません。
 # if the user chooses to cancel the wizard when no accounts are there throw a message
-# LOCALIZATION NOTE (cancelWizard) 
+# LOCALIZATION NOTE (cancelWizard)
 # do not localize "\n\n"
 cancelWizard= アカウントウィザードを終了してもよろしいですか?\n\n入力した情報はすべて失われ、アカウントは作成されません。
 accountWizard= アカウントウィザード
 WizardExit= 終了
 WizardContinue= キャンセル
 # when the wizard already has a domain (Should we say something different?)
 enterValidServerName= 正しいサーバ名を入力してください。
 failedRemoveAccount= アカウントを削除できませんでした。