36.0: sync toolkit with en-US rev234288:993c07956f3d
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Sat, 03 Jan 2015 19:30:46 +0900
changeset 1645 f9f779bb34d04b32c8e2adeeccd5a3b94010e141
parent 1644 c9a0d618401efdd23d0b6ed596618288dcd53f30
child 1646 b01504fc253086784a71d2a752bf3a4ada52467d
push id843
push useraxel@mozilla.com
push dateMon, 12 Jan 2015 20:23:47 +0000
bugs36
36.0: sync toolkit with en-US rev234288:993c07956f3d
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/aboutTelemetry.properties
toolkit/chrome/global/charsetMenu.dtd
toolkit/chrome/global/charsetMenu.properties
toolkit/chrome/passwordmgr/passwordManager.dtd
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -84,8 +84,10 @@ variant of aboutSupport.showDir.label. -
 
 <!ENTITY aboutSupport.libraryVersionsTitle	"ライブラリのバージョン">
 
 <!ENTITY aboutSupport.installationHistoryTitle	"インストール履歴">
 <!ENTITY aboutSupport.updateHistoryTitle	"更新履歴">
 
 <!ENTITY aboutSupport.copyTextToClipboard.label		"テキストをクリップボードにコピー">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label	"生データをクリップボードにコピー">
+
+<!ENTITY aboutSupport.sandboxTitle		"サンドボックス">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -77,8 +77,12 @@ adapterDrivers2		= アダプタドライバ (GPU #2)
 adapterRAM2		= アダプタ RAM (GPU #2)
 driverVersion2		= ドライバのバージョン (GPU #2)
 driverDate2		= ドライバの日付 (GPU #2)
 isGPU2Active		= GPU #2 の使用
 webglRenderer		= WebGL レンダラ
 
 minLibVersions		= 想定される最低バージョン
 loadedLibVersions	= 使用中のバージョン
+
+hasSeccompBPF		= Seccomp-BPF (システムコールフィルタリング)
+canSandboxContent	= コンテンツプロセスサンドボックス
+canSandboxMedia		= メディアプラグインサンドボックス
--- a/toolkit/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/chrome/global/aboutTelemetry.dtd
@@ -7,30 +7,38 @@
 <!ENTITY aboutTelemetry.telemetryEnabled "
   Telemetry は<span>有効</span>です。
 ">
 
 <!ENTITY aboutTelemetry.telemetryDisabled "
   Telemetry は<span>無効</span>です。
 ">
 
+<!ENTITY aboutTelemetry.generalDataSection "
+  一般的なデータ
+">
+
 <!ENTITY aboutTelemetry.slowSqlSection "
   動作の遅い SQL ステートメント
 ">
 
 <!ENTITY aboutTelemetry.chromeHangsSection "
   ブラウザの動作停止
 ">
 
+<!ENTITY aboutTelemetry.threadHangStatsSection "
+  スレッドの停止
+">
+
 <!ENTITY aboutTelemetry.histogramsSection "
   ヒストグラム
 ">
 
-<!ENTITY aboutTelemetry.threadHangStatsSection "
-  スレッドの停止
+<!ENTITY aboutTelemetry.keyedHistogramsSection "
+  主要なヒストグラム
 ">
 
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "
   統計情報
 ">
 
 <!ENTITY aboutTelemetry.addonDetailsSection "
   アドオンの詳細
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -2,16 +2,20 @@
 # 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/.
 
 # Note to translators:
 # - %1$S will be replaced by brandFullName
 # - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
 pageSubtitle		= このページは、Telemetry によって収集されたパフォーマンスとハードウェア、使用状況、カスタマイズについての情報を表示します。この情報は、%2$S の改善のため %1$S に送信されます。
 
+generalDataHeadingName = 名前
+
+generalDataHeadingValue = 値
+
 slowSqlMain		= メインスレッド上の動作の遅い SQL ステートメント
 
 slowSqlOther		= ヘルパースレッド上の動作の遅い SQL ステートメント
 
 slowSqlHits		= ヒット数
 
 slowSqlAverage		= 平均タイム (ms)
 
--- a/toolkit/chrome/global/charsetMenu.dtd
+++ b/toolkit/chrome/global/charsetMenu.dtd
@@ -1,20 +1,6 @@
 <!-- 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 charsetMenu.label		"文字エンコーディング">
-<!ENTITY charsetMenu.accesskey		"C">
-
-
-<!-- The strings below are unused on m-c. They will be removed post-Australis -->
-<!ENTITY charsetMenuAutodet.label	"自動判別">
-<!ENTITY charsetMenuAutodet.accesskey	"D"><!-- A reserved for Arabic -->
-
-<!ENTITY charsetMenuAutodet.off.label		"(解除)">
-<!ENTITY charsetMenuAutodet.off.accesskey	"o">
-<!ENTITY charsetMenuAutodet.ja.label		"日本語">
-<!ENTITY charsetMenuAutodet.ja.accesskey	"J">
-<!ENTITY charsetMenuAutodet.ru.label		"ロシア語">
-<!ENTITY charsetMenuAutodet.ru.accesskey	"R">
-<!ENTITY charsetMenuAutodet.uk.label		"ウクライナ語">
-<!ENTITY charsetMenuAutodet.uk.accesskey	"U">
+<!ENTITY charsetMenu.label             "文字エンコーディング">
+<!ENTITY charsetMenu.accesskey         "C">
--- a/toolkit/chrome/global/charsetMenu.properties
+++ b/toolkit/chrome/global/charsetMenu.properties
@@ -4,19 +4,16 @@
 
 # LOCALIZATION NOTE: The property keys ending with ".key" are for access keys.
 # Localizations may add or delete properties where the property key ends with
 # ".key" as appropriate for the localization. The code that uses this data can
 # deal with the absence of an access key for an item.
 #
 # For gbk, gbk.bis and gbk.bis.key are used to trigger string changes in
 # localizations.
-# 
-# Make sure the keys defined here don't collide with
-# charsetMenuAutodet.accesskey in charsetMenu.dtd.
 #
 # In the en-US version of this file, access keys are given to the following:
 # * UTF-8
 # * All encodings that are the fallback encoding for some locale in Firefox
 # * All encodings that are the fallback encoding for some locale in IE
 # * All Japanese encodings
 #
 # For the items whose property key does not end in ".key" and whose value
--- a/toolkit/chrome/passwordmgr/passwordManager.dtd
+++ b/toolkit/chrome/passwordmgr/passwordManager.dtd
@@ -1,34 +1,36 @@
 <!-- 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 savedPasswords.title		"保存されているパスワード">
-<!ENTITY savedPasswordsExceptions.title	"パスワードを保存しないサイト">
-<!ENTITY closebutton.label		"閉じる">
-<!ENTITY closebutton.accesskey		"C">
+<!ENTITY      savedPasswords.title            "保存されているパスワード">
+<!ENTITY      savedPasswordsExceptions.title  "パスワードを保存しないサイト">
+<!ENTITY      closebutton.label               "閉じる">
+<!ENTITY      closebutton.accesskey           "C">
 
-<!ENTITY loginsSpielExceptions.label	"下記のサイトのログイン情報は保存されません:">
+<!ENTITY      loginsSpielExceptions.label     "下記のサイトのログイン情報は保存されません:">
 
-<!ENTITY treehead.site.label			"サイト">
-<!ENTITY treehead.username.label		"ユーザ名">
-<!ENTITY treehead.password.label		"パスワード">
-<!ENTITY treehead.timeCreated.label		"初回使用日">
-<!ENTITY treehead.timeLastUsed.label		"最終使用日">
-<!ENTITY treehead.timePasswordChanged.label	"変更日">
-<!ENTITY treehead.timesUsed.label		"使用回数">
+<!ENTITY      treehead.site.label             "サイト">
+<!ENTITY      treehead.username.label         "ユーザ名">
+<!ENTITY      treehead.password.label         "パスワード">
+<!ENTITY      treehead.timeCreated.label         "初回使用日">
+<!ENTITY      treehead.timeLastUsed.label        "最終使用日">
+<!ENTITY      treehead.timePasswordChanged.label "変更日">
+<!ENTITY      treehead.timesUsed.label           "使用回数">
 
-<!ENTITY remove.label			"削除">
-<!ENTITY remove.accesskey		"R">
-<!ENTITY removeall.label		"すべて削除">
-<!ENTITY removeall.accesskey		"A">
+<!ENTITY      remove.label                    "削除">
+<!ENTITY      remove.accesskey                "R">
+<!ENTITY      removeall.label                 "すべて削除">
+<!ENTITY      removeall.accesskey             "A">
 
-<!ENTITY filter.label			"検索:">
-<!ENTITY filter.accesskey		"S">
+<!ENTITY      filter.label                    "検索:">
+<!ENTITY      filter.accesskey                "S">
 
-<!ENTITY windowClose.key		"w">
-<!ENTITY focusSearch1.key		"f">
-<!ENTITY focusSearch2.key		"k">
+<!ENTITY      windowClose.key                 "w">
+<!ENTITY      focusSearch1.key                "f">
+<!ENTITY      focusSearch2.key                "k">
 
-<!ENTITY copyPasswordCmd.label		"パスワードをコピー">
-<!ENTITY copyPasswordCmd.accesskey	"C">
-<!ENTITY copyUsernameCmd.label		"ユーザ名をコピー">
+<!ENTITY      copyPasswordCmd.label           "パスワードをコピー">
+<!ENTITY      copyPasswordCmd.accesskey       "C">
+
+<!ENTITY      copyUsernameCmd.label           "ユーザ名をコピー">
+<!ENTITY      copyUsernameCmd.accesskey       "U">