28.0: sync toolkit, security with en-US rev169143:cdd93e24e3b3
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Tue, 14 Jan 2014 20:41:57 +0900
changeset 1294 4ee72cb9352e8bd8db949e98c5132ee3c6b5d713
parent 1293 a64a7549b7d2dc5dfb0a1540de16752ced93e817
child 1295 f68c02b308e5bd0c3d1247f51052b68f97b8b58f
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs28
28.0: sync toolkit, security with en-US rev169143:cdd93e24e3b3
browser/chrome/browser/devtools/styleinspector.properties
security/manager/chrome/pipnss/pipnss.properties
toolkit/chrome/global-platform/mac/intl.properties
toolkit/chrome/global-platform/unix/intl.properties
toolkit/chrome/global-platform/win/intl.properties
toolkit/chrome/global/aboutTelemetry.properties
toolkit/chrome/global/devtools/styleinspector.properties
toolkit/chrome/global/intl.properties
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -337,17 +337,16 @@ CertInfoIssuedFor		= 発行対象:
 CertInfoIssuedBy		= 発行者:
 CertInfoValid			= 有効期間:
 CertInfoFrom			= 
 CertInfoTo			= から
 CertInfoPurposes		= 用途
 CertInfoEmail			= メール
 CertInfoStoredIn		= 保存先:
 P12DefaultNickname		= インポートされた証明書
-NSSInitProblemX			= セキュリティコンポーネントを初期化できませんでした。多くの場合この原因はこのプログラムのプロファイルフォルダの問題です。プロファイルフォルダへの読み書き権限があるか、ディスクの空き容量が少なくなっていないか確認してください。このままセッションを継続するとセキュリティ機能が異常動作する可能性があるため、このプログラムを一度終了して問題を解消することをお勧めします。
 VerifyExpired			= <期限切れです>
 VerifyRevoked			= <失効しています>
 VerifyNotTrusted		= <信頼していません>
 VerifyIssuerNotTrusted		= <発行者を信頼していません>
 VerifyIssuerUnknown		= <発行者が不明です>
 VerifyInvalidCA			= <認証局が不正です>
 VerifyDisabledAlgorithm		= <署名アルゴリズムが安全ではありません>
 VerifyUnknown			= <不明>
--- a/toolkit/chrome/global-platform/mac/intl.properties
+++ b/toolkit/chrome/global-platform/mac/intl.properties
@@ -1,9 +1,7 @@
 # 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/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default	= Shift_JIS
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
--- a/toolkit/chrome/global-platform/unix/intl.properties
+++ b/toolkit/chrome/global-platform/unix/intl.properties
@@ -1,9 +1,7 @@
 # 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/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default	= Shift_JIS
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=...
--- a/toolkit/chrome/global-platform/win/intl.properties
+++ b/toolkit/chrome/global-platform/win/intl.properties
@@ -1,9 +1,7 @@
 # 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/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default	= Shift_JIS
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=...
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -33,16 +33,18 @@ memoryMapTitle		= メモリマップ:
 errorFetchingSymbols	= シンボルの読み込み中にエラーが発生しました。インターネット接続を確認して、再度試してください。
 
 histogramSamples	= サンプル
 
 histogramAverage	= 平均
 
 histogramSum		= 合計
 
+histogramCopy		= コピー
+
 disableTelemetry	= Telemetry を無効にする
 
 enableTelemetry		= Telemetry を有効にする
 
 keysHeader		= 名前
 
 valuesHeader		= 値
 
rename from browser/chrome/browser/devtools/styleinspector.properties
rename to toolkit/chrome/global/devtools/styleinspector.properties
--- a/toolkit/chrome/global/intl.properties
+++ b/toolkit/chrome/global/intl.properties
@@ -35,28 +35,27 @@ intl.accept_languages			= ja, en-us, en
 # LOCALIZATION NOTE (font.language.group):
 # This preference controls the initial setting of the language drop-down menu
 # in the Content > Fonts & Colors > Advanced preference panel.
 #
 # Set it to the value of one of the menuitems in the "selectLangs" menulist in
 # http://mxr.mozilla.org/mozilla/source/browser/components/preferences/fonts.xul
 font.language.group			= ja
 
-# LOCALIZATION NOTE (intl.charset.detector, intl.charset.default, intl.charsetmenu.browser.static, intl.charsetmenu.mailedit):
+# LOCALIZATION NOTE (intl.charset.detector, intl.charsetmenu.browser.static, intl.charsetmenu.mailedit):
 # For the list of canonical charset values, refer to:
 # http://mxr.mozilla.org/mozilla-central/source/intl/locale/src/charsetalias.properties
 #
 # If you are modifying the charset preferences for your locale, be sure to use
 # the values from that list, not the keys. Note that these values are
 # case-sensitive and must be reproduced exactly as listed.
 #
 # Note also that the list of charsets in 'intl.charsetmenu.browser.static'
 # must always include "UTF-8".
 intl.charset.detector			= ja_parallel_state_machine
-intl.charset.default			= Shift_JIS
 intl.charsetmenu.browser.static		= Shift_JIS, EUC-JP, ISO-2022-JP, ISO-8859-1, UTF-8
 intl.charsetmenu.mailedit		= ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
 
 # LOCALIZATION NOTE (pluralRule): Pick the appropriate plural rule for your
 # language. This will determine how many plural forms of a word you will need
 # to provide and in what order.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 pluralRule				= 0