37.0: sync suite with en-US rev19423:8f81d26fca7d
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Mon, 02 Mar 2015 00:08:14 +0900
changeset 1683 8e9b65d1ed4eae278540d8fb46cffc6830fba47b
parent 1682 4401bcf30b899133111e28ddc66f66234950039f
child 1704 2a06e4a542e8649a8725ff563e8bc616862b103e
push id869
push userh.rayflood@gmail.com
push dateSun, 01 Mar 2015 15:08:28 +0000
bugs37
37.0: sync suite with en-US rev19423:8f81d26fca7d
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/privacy_help.xhtml
suite/chrome/common/help/privsec_help.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/history/places.properties
suite/chrome/common/notification.properties
suite/chrome/common/places/places.properties
suite/chrome/common/pref/pref-colors.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/charsetTitles.properties
suite/chrome/mailnews/compose/composeMsgs.properties
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -220,42 +220,49 @@
 <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 Colors. (If no subcategories are
     visible, double-click Appearance to expand the list.)</li>
 </ol>
 
 <p>The Colors preferences panel allows you to set the background and text
-  colors on web pages:</p>
+  colors on web pages, mail/news messages, and feeds:</p>
 
 <ul>
   <li><strong>Text and Background</strong>: Click the colored blocks to select
-    a color for displaying text and backgrounds on web pages.
+    a color for displaying text and backgrounds on web pages and messages.
     <ul>
-      <li><strong>Use system colors</strong>: Select this to use your system
-        color settings.</li>
+      <li><strong>Use system colors</strong>: Select this to use the colors
+        defined by your system settings (usually the desktop theme) rather
+        than choosing the colors yourself.</li>
     </ul>
   </li>
   <li><strong>Link Colors</strong>: Click the colored blocks to select a color
-    for displaying unvisited, active, and visited links on web pages.
+    for displaying unvisited, active, and visited links on web pages and
+    messages.
     <ul>
       <li><strong>Underline links</strong>: Select this to display underlined
-        links on web pages.</li>
+        links on web pages and messages.</li>
     </ul>
   </li>
   <li><strong>When a web page provides its own colors and
     backgrounds</strong>:
     <ul>
       <li><strong>Always use the colors and background specified by the web
-        page</strong>: Allows the web page to choose displayed colors and
-        backgrounds.</li>
+        page</strong>: Allows web pages and messages to choose displayed
+        colors and backgrounds. Your own colors will be used if no colors
+        are defined by the content itself.</li>
       <li><strong>Use my chosen colors, ignoring the colors and background
-        image specified</strong>: Allow you to choose displayed colors,
-        ignoring the web page colors and background image.</li>
+        image specified</strong>: All content uses your own display colors,
+        ignoring the web page or message colors and any background image.</li>
+      <li><strong>Only ignore the page colors when using a High Contrast
+        theme</strong>: Allows web pages and messages to choose displayed
+        colors and backgrounds, <em>unless</em> an accessibility desktop theme
+        is used, in which case your own colors will be used.</li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="spelling">Appearance Preferences - Spelling</h2>
 
--- a/suite/chrome/common/help/privacy_help.xhtml
+++ b/suite/chrome/common/help/privacy_help.xhtml
@@ -233,20 +233,25 @@
 <h3>What Can I Do to Prevent User Tracking?</h3>
 
 <p>In general, there is no complete protection against unwanted tracking of
   one&apos;s browsing activities. However, there are a couple of ways to make
   it harder to get tracked:</p>
 
 <ul>
   <li><a href="privsec_help.xhtml#privacy_and_security">Do Not Track</a>:
-    This is a method that allows users to explicitly opt out of (or consent
-    to) their browsing behavior being tracked. &brandShortName; supports
-    sending <q>Do Not Track</q> requests to websites, but they are not
+    This is a method that allows users to explicitly opt out of their
+    browsing behavior being tracked. &brandShortName; supports sending
+    <q>Do Not Track</q> requests to websites, but they are <em>not</em>
     obligated to honor such requests.</li>
+  <li><a href="privsec_help.xhtml#privacy_and_security">Site blocking</a>:
+    &brandShortName; can block content that has been identified as serving
+    the purpose of user tracking based on a list downloaded periodically
+    from a server. In this way, connections to such <em>known</em> tracking
+    sites can be prevented upfront.</li>
   <!-- NOTE: link "Data Manager" below once bug 599097 has been fixed -->
   <li><a href="using_priv_help.xhtml#cookies">Cookies</a>: The power of
     tracking cookies is their persistence across sessions. Thus, when you
     restart &brandShortName;, the identifying cookie will still be sent to
     the website performing the analytics. One measure against third-party
     tracking is to prohibit third-party cookies altogether; another option is
     the restriction of cookies to the current session only. Some websites may
     no longer function correctly, but you can add exceptions to such sites in
--- a/suite/chrome/common/help/privsec_help.xhtml
+++ b/suite/chrome/common/help/privsec_help.xhtml
@@ -58,36 +58,46 @@
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Click the Privacy &amp; Security category.</li>
 </ol>
 
 <h3>User Tracking</h3>
 
 <p>These settings allow you to communicate your tracking preferences to
-  websites. <a href="glossary.xhtml#user_tracking">User tracking</a> refers
+  websites and to actively block tracking requests from known tracking
+  sites. <a href="glossary.xhtml#user_tracking">User tracking</a> refers
   to websites (including advertisers, analytics providers, and social sites)
   collecting and analyzing comprehensive data on your web browsing patterns,
   thus affecting your privacy. For more information on this topic, see
-  <a href="privacy_help.xhtml#why_and_how_are_websites_tracking_me">Why and How
-  Are Websites Tracking Me?</a> The <a href="glossary.xhtml#do_not_track">Do
-  Not Track</a> technology allows you to tell a website whether or not you
-  agree to tracking. The following options are available in this section:</p>
+  <a href="privacy_help.xhtml#why_and_how_are_websites_tracking_me">Why and
+  How Are Websites Tracking Me?</a> The following options are available in
+  this section:</p>
 
 <ul>
-  <li><strong>Tell websites about my tracking preference</strong>: Check this
-    to instruct &brandShortName; to inform every website you explicitly visit
-    (along with any providers of third-party content embedded in its pages)
-    whether or not you want your browsing behavior being tracked:
+  <li><strong>Tell websites that I do not want to be tracked</strong>: Check
+    this to instruct &brandShortName; to inform every website you explicitly
+    visit (along with any providers of third-party content embedded in its
+    pages) that you don&apos;t want your browsing behavior being tracked.
+    If checked, a <a href="glossary.xhtml#do_not_track">Do Not Track</a>
+    request is sent to each website visited.</li>
+  <li><strong>Prevent tracking activities by known sites</strong>: Check
+    this to instruct &brandShortName; to actively block connections to 
+    websites which are known to provide tracking services. You may not see
+    any content coming from these sites in the web page visited.</li>
+  <li><strong>Warn me when known tracking activities were detected</strong>:
+    Check this to be presented with a notification bar when content was blocked
+    which can be used for tracking. This bar contains the following buttons:
     <ul>
-      <li><strong>I do not want to be tracked</strong>: Select this option
-        to send a Do Not Track request to each website visited.</li>
-      <li><strong>I consent to being tracked</strong>: Select this option
-        to explicitly tell each website visited that you agree with your
-        browsing behavior being tracked.</li>
+      <li><strong>Keep Blocking</strong>: Dismiss the notification bar without
+        loading the content from an identified tracking site.</li>
+      <li><strong>Unblock</strong>: Allow such content to be loaded now and
+        automatically when this page is visited again in the future.</li>
+      <li><strong>Preferences</strong>: Open the Privacy &amp; Security
+        preference panel.</li>
     </ul>
   </li>
 </ul>
 
 <p><strong>Notes</strong>:</p>
 
 <ul>
   <li>Honoring a Do Not Track request is voluntary, thus individual websites
@@ -97,16 +107,25 @@
   <li>Requesting Do Not Track from a website should not affect your ability
     to use the website properly (e.g., when using a
     <a href="glossary.xhtml#web_application">web application</a> or when
     putting items into a cart while shopping).</li>
   <li>Note that Do Not Track does not <em>prevent</em> advertisements from
     being presented to you while browsing. Since the website is not allowed to
     gather and utilize information about you, the content of the advertisements
     will be less specific if you have the Do Not Track option selected.</li>
+  <li>Tracking prevention actively blocks content known to be used for tracking
+    in a web page. Thus, the page may appear incomplete. Such sites are
+    identified by periodically downloading a list of known tracking sites
+    which are to be blocked if enabled. Tracking sites <em>not</em> on that
+    list will still be connected to until they are listed.</li>
+  <li>The selection of <q>Unblock</q> in the notification bar for a specific
+    site can be revoked in the Permissions tab of the Data Manager. When in
+    a <a href="using_priv_help.xhtml#browsing_in_a_private_window">private
+    window</a>, these options aren&apos;t present in the notification bar.</li>
 </ul>
 
 <h3 id="safe_browsing">Safe Browsing</h3>
 
 <p>Some websites contain potentially dangerous content and may have been
   reported as malicious. The preferences located in the lower section of the
   <a href="#privacy_and_security">Privacy &amp; Security panel</a> allow you
   to select which types of reported websites will be blocked. If enabled,
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -178,16 +178,20 @@
     notification bar will contain two additional buttons:
     <ul>
       <li><strong>Keep Blocking</strong>: Dismiss the notification bar without
         loading the potentially insecure content.</li>
       <li><strong>Unblock</strong>:
         Load the potentially insecure content <em>once</em> but not
         automatically when this page is visited again in the future.</li>
     </ul>
+    <strong>Note</strong>: The selection of <q>Unblock</q> for a specific site
+    can be revoked in the Permissions tab of the Data Manager. When in a
+    <a href="using_priv_help.xhtml#browsing_in_a_private_window">private
+    window</a>, these options aren&apos;t available in the notification bar.
   </li>
   <li><strong>Warn me when encrypted pages contain other types of mixed
     content</strong>: Check this to instruct &brandShortName; to present a
     notification bar when mixed <em>passive</em> content was loaded or blocked.
     The notification bar contains a button to open this preference panel.</li>
   <li><strong>Don&apos;t load other types of mixed content on encrypted
     pages</strong>: Check this to prevent mixed passive content from being
     loaded at all but to be blocked. If also the <q>Warn me</q> option is
deleted file mode 100644
--- a/suite/chrome/common/history/places.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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/.
-
-delete.hostname.true=次のホストの履歴をすべて削除: %S
-delete.hostname.false=次のサイトの履歴をすべて削除: %S
-delete.hostname.accesskey=s
-delete.domain.true=次のドメインの履歴をすべて削除: *.%S
-delete.domain.false=ドメインの履歴をすべて削除
-delete.domain.accesskey=H
-
-load-js-data-url-error=セキュリティ上の理由により、javascript: または data: URL は [履歴] ウィンドウや Sidebar の履歴から読み込めません。
-noTitle=(無題)
-
-tabs.openWarningTitle=同時に複数のタブを開く確認
-tabs.openWarningMultipleBranded=同時に複数 (%S) のタブを開こうとしています。ページの読み込み中は %S の動作が遅くなることがあります。本当に開いてもよろしいですか?
-tabs.openButtonMultiple=タブで開く
-tabs.openWarningPromptMeBranded=同時に複数のタブを開いて %S の動作が遅くなるときは確認する
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -11,16 +11,18 @@ outdatedpluginsMessage.button.accesskey	
 # later thought that this word felt too aggressive and we now use "requests".
 # Localizers can use use a word corresponding to "requests" or "requires"
 # or both, depending on what matches the language best.
 carbonfailurepluginsMessage.title		= このページは 32 ビットモードで実行できるプラグインが必要です。
 carbonfailurepluginsMessage.button.label	= 32 ビットモードで再起動
 carbonfailurepluginsMessage.button.accesskey	= R
 
 missingpluginsMessage.title			= このページを完全に表示するには、プラグインを追加する必要があります。
+missingpluginsMessage.button.label		= 設定
+missingpluginsMessage.button.accesskey		= P
 
 blockedpluginsMessage.title			= このページが要求したプラグインは、安全上の理由からブロックされました。
 blockedpluginsMessage.infoButton.label		= 詳細...
 blockedpluginsMessage.infoButton.accesskey	= D
 
 crashedpluginsMessage.title			= %S プラグインがクラッシュしました。
 crashedpluginsMessage.reloadButton.label	= ページを再読み込み
 crashedpluginsMessage.reloadButton.accesskey	= R
--- a/suite/chrome/common/places/places.properties
+++ b/suite/chrome/common/places/places.properties
@@ -1,24 +1,31 @@
 # 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/.
 
+delete.hostname.true=次のホストの履歴をすべて削除: %S
+delete.hostname.false=次のサイトの履歴をすべて削除: %S
+delete.hostname.accesskey=s
+delete.domain.true=次のドメインの履歴をすべて削除: *.%S
+delete.domain.false=ドメインの履歴をすべて削除
+delete.domain.accesskey=H
+
 load-js-data-url-error=セキュリティ上の理由により、履歴ウィンドウやサイドバーの履歴から javascript: または data: URL を読み込むことはできません。
 noTitle=(無題)
 
 bookmarksMenuEmptyFolder=(なし)
 
 bookmarksBackupTitle=ブックマークのバックアップファイル名
 
 bookmarksRestoreAlertTitle=ブックマークの復元
 bookmarksRestoreAlert=現在のブックマークはすべてバックアップで置き換えられます。本当に復元しますか?
 bookmarksRestoreTitle=復元するブックマークファイルの選択
 bookmarksRestoreFilterName=JSON
-bookmarksRestoreFilterExtension=*.json
+bookmarksRestoreFilterExtension=*.json;*.jsonlz4
 
 bookmarksRestoreFormatError=サポートされていないファイル形式です。
 bookmarksRestoreParseError=バックアップファイルを処理できませんでした。
 
 bookmarksLivemarkLoading=ライブブックマークを読み込んでいます...
 bookmarksLivemarkFailed=ライブブックマークのフィードを読み込めませんでした。
 
 menuOpenLivemarkOrigin.label="%S" を開く
--- a/suite/chrome/common/pref/pref-colors.dtd
+++ b/suite/chrome/common/pref/pref-colors.dtd
@@ -26,8 +26,10 @@
 <!-- LOCALIZATION NOTE (someProvColors): This is the start of a sentence and will be followed by the following radio buttons. -->
 <!ENTITY someProvColors                    "Web ページが独自の配色と背景を提供する場合">
 <!-- LOCALIZATION NOTE (alwaysUseDocColors.label): This is option one, and it appends to 'someProvColors' above. -->
 <!ENTITY alwaysUseDocumentColors.label     "常に Web ページで指定された配色と背景色を使用する">
 <!ENTITY alwaysUseDocumentColors.accesskey "A">
 <!-- LOCALIZATION NOTE (ignoreDocColors.label): This is option two, and it appends to 'someProvColors' above.  -->
 <!ENTITY useMyColors.label                 "Web ページで指定された配色と背景画像を無視して、自分で選択した配色を使用する">
 <!ENTITY useMyColors.accesskey             "m">
+<!ENTITY automaticColors.label             "高コントラストテーマ使用時のみ、Web ページで指定された配色を無視する">
+<!ENTITY automaticColors.accesskey         "O">
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -20,16 +20,18 @@
 
 <!ENTITY contextDesc.label		"フィルタを適用するタイミング:">
 <!ENTITY contextIncomingMail.label	"新着メール受信時:">
 <!ENTITY contextIncomingMail.accesskey	"G">
 <!ENTITY contextManual.label		"手動で実行する">
 <!ENTITY contextManual.accesskey	"R">
 <!ENTITY contextBeforeCls.label		"迷惑メール分類前に実行">
 <!ENTITY contextAfterCls.label		"迷惑メール分類後に実行">
+<!ENTITY contextOutgoing.label		"メール送信後">
+<!ENTITY contextOutgoing.accesskey	"S">
 
 <!ENTITY filterActionDesc.label		"以下の動作を実行する:">
 <!ENTITY filterActionDesc.accesskey	"P">
 
 <!ENTITY filterActionOrderWarning.label	"補足: フィルタ動作は異なる順で実行されます。">
 <!ENTITY filterActionOrder.label	"実行順を見る">
 
 <!-- New Style Filter Rule Actions -->
--- a/suite/chrome/mailnews/charsetTitles.properties
+++ b/suite/chrome/mailnews/charsetTitles.properties
@@ -5,17 +5,16 @@
 ## Rule of this file:
 ## 1. key should always be in lower case ascii so we can do case insensitive
 ##    comparison in the code faster.
 
 ## Format of this file:
 ## charset_name.title = a_title  -  specifies the human readable title for 
 ## this charset
 
-us-ascii.title		= 英語 (US-ASCII)
 iso-8859-1.title	= 西欧 (ISO-8859-1)
 iso-8859-2.title	= 中欧 (ISO-8859-2)
 iso-8859-3.title	= 南欧 (ISO-8859-3)
 iso-8859-4.title	= バルト語 (ISO-8859-4)
 iso-8859-10.title	= 北欧 (ISO-8859-10)
 iso-8859-13.title	= バルト語 (ISO-8859-13)
 iso-8859-14.title	= ケルト語 (ISO-8859-14)
 iso-8859-15.title	= 西欧 (ISO-8859-15)
@@ -34,43 +33,35 @@ iso-2022-jp.title	= 日本語 (ISO-2022-JP)
 shift_jis.title		= 日本語 (Shift_JIS)
 euc-jp.title		= 日本語 (EUC-JP)
 big5.title		= 繁体字中国語 (Big5)
 big5-hkscs.title	= 繁体字中国語 (Big5-HKSCS)
 gb2312.title		= 簡体字中国語 (GB2312)
 hz-gb-2312.title	= 簡体字中国語 (HZ)
 gbk.title		= 簡体字中国語 (GBK)
 euc-kr.title		= 韓国語 (EUC-KR)
-x-johab.title		= 韓国語 (JOHAB)
 utf-7.title		= Unicode (UTF-7)
 utf-8.title		= Unicode (UTF-8)
 utf-16.title		= Unicode (UTF-16)
 utf-16le.title		= Unicode (UTF-16LE)
 utf-16be.title		= Unicode (UTF-16BE)
 iso-8859-5.title	= キリル文字 (ISO-8859-5)
 windows-1251.title	= キリル文字 (Windows-1251)
 x-mac-cyrillic.title	= キリル文字 (MacCyrillic)
 x-mac-ukrainian.title	= キリル文字/ウクライナ語 (MacUkrainian)
 koi8-r.title		= キリル文字 (KOI8-R)
 koi8-u.title		= キリル文字/ウクライナ語 (KOI8-U)
 iso-8859-7.title	= ギリシャ語 (ISO-8859-7)
 windows-1253.title	= ギリシャ語 (Windows-1253)
 x-mac-greek.title	= ギリシャ語 (MacGreek)
 windows-1258.title	= ベトナム語 (Windows-1258)
-x-viet-tcvn5712.title	= ベトナム語 (TCVN)
-viscii.title		= ベトナム語 (VISCII)
-x-viet-vps.title	= ベトナム語 (VPS)
 windows-874.title	= タイ語 (Windows-874)
-armscii-8.title		= アルメニア語 (ARMSCII-8)
 iso-8859-6.title	= アラビア語 (ISO-8859-6)
-iso-8859-6-i.title	= アラビア語 (ISO-8859-6-I)
-iso-8859-6-e.title	= アラビア語 (ISO-8859-6-E)
 iso-8859-8.title	= ヘブライ語 (ISO-8859-8)
 iso-8859-8-i.title	= ヘブライ語 (ISO-8859-8-I)
-iso-8859-8-e.title	= ヘブライ語 (ISO-8859-8-E)
 windows-1255.title	= ヘブライ語 (Windows-1255)
 windows-1256.title	= アラビア語 (Windows-1256)
 x-user-defined.title	= ユーザ定義
 ibm866.title		= キリル文字/ロシア語 (CP-866)
 gb18030.title		= 簡体字中国語 (GB18030)
 x-mac-arabic.title	= アラビア語 (MacArabic)
 x-mac-farsi.title	= ペルシア語 (MacFarsi)
 x-mac-hebrew.title	= ヘブライ語 (MacHebrew)
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -245,16 +245,19 @@ assemblingMailInformation	=メール情報を構築しています...
 gatheringAttachment		=%S を添付しています...
 creatingMailMessage		=メールメッセージを作成しています...
 
 ## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
 copyMessageStart		=%S フォルダへメッセージをコピーしています...
 copyMessageComplete		=コピーが完了しました。
 copyMessageFailed		=コピーできませんでした。
 
+filterMessageComplete		=フィルタを適用しました。
+filterMessageFailed		=フィルタを適用できませんでした。
+
 ## LOCALIZATION NOTE (largeMessageSendWarning):
 ## %S is the message size in user-friendly notation. Do not translate.
 largeMessageSendWarning		=警告! メールサーバで許可された上限サイズに近い %S のメッセージを送信しようとしています。本当に送信してもよろしいですか?
 
 sendingMessage			=メッセージを送信しています...
 sendMessageErrorTitle		=メッセージの送信エラー
 postingMessage			=メッセージを投稿しています...
 
@@ -295,8 +298,10 @@ smtpEnterPasswordPrompt		= %S のパスワードを入力してください:
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername	= %1$S の %2$S のパスワードを入力してください:
 smtpEnterPasswordPromptTitle	= SMTP サーバのパスワードが必要です。
 
 ## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
 ## will be replaced with the name of the folder the message is being saved to.
 errorSavingMsg			= メッセージの %S フォルダへの保存時にエラーが発生しました。再実行しますか?
+
+errorFilteringMsg		=メッセージの送信と保存は完了しましたが、メッセージフィルタの適用時にエラーが発生しました。