45.0: sync security, toolkit with en-US rev298132:b07f254acc0f
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Sat, 09 Jan 2016 18:11:51 +0900
changeset 1979 d26cf4d10e7e2103860155622f347e34f9142d82
parent 1978 c3b00ff3f471773902ff05ce5c19f984d27df541
child 1980 accce66e1d377c279671db248660ae1e6808b1bc
push id1073
push useraxel@mozilla.com
push dateMon, 25 Jan 2016 12:40:21 +0000
bugs45
45.0: sync security, toolkit with en-US rev298132:b07f254acc0f
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pipnss/pipnss.properties
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/aboutTelemetry.properties
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -315,8 +315,9 @@ MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=T
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=The server uses a certificate with a basic constraints extension identifying it as a certificate authority. For a properly-issued certificate, this should not be the case.
 MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=The server presented a certificate with a key size that is too small to establish a secure connection.
 MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=An X.509 version 1 certificate that is not a trust anchor was used to issue the server's certificate. X.509 version 1 certificates are deprecated and should not be used to sign other certificates.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=The server presented a certificate that is not yet valid.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=A certificate that is not yet valid was used to issue the server's certificate.
 MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH=The signature algorithm in the signature field of the certificate does not match the algorithm in its signatureAlgorithm field.
 MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING=The OCSP response does not include a status for the certificate being verified.
 MOZILLA_PKIX_ERROR_VALIDITY_TOO_LONG=The server presented a certificate that is valid for too long.
+MOZILLA_PKIX_ERROR_REQUIRED_TLS_FEATURE_MISSING=A required TLS feature is missing.
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -291,17 +291,18 @@ certErrorMismatchSinglePlain		=この証明書は %S にだけ有効なものです。
 certErrorMismatchMultiple		=この証明書は次のドメイン名にだけ有効なものです:
 certErrorMismatchNoNames		=この証明書が有効となるドメイン名が指定されていません。
 
 # LOCALIZATION NOTE (certErrorExpiredNow): Do not translate %1$S (date+time of expired certificate) or %2$S (current date+time)
 certErrorExpiredNow			=この証明書の有効期限は %1$S に切れています。現在時刻は %2$S です。
 # LOCALIZATION NOTE (certErrorNotYetValidNow): Do not translate %1$S (date+time certificate will become valid) or %2$S (current date+time)
 certErrorNotYetValidNow			=この証明書は %1$S まで有効になりません。現在時刻は %2$S です。
 
-certErrorCodePrefix			=(エラーコード: %S)
+# LOCALIZATION NOTE (certErrorCodePrefix2): Do not translate <a id="errorCode" title="%1$S">%1$S</a>
+certErrorCodePrefix2		=エラーコード: <a id="errorCode" title="%1$S">%1$S</a>
 
 CertInfoIssuedFor		=発行対象:
 CertInfoIssuedBy		=発行者:
 CertInfoValid			=有効期間:
 CertInfoFrom			=
 CertInfoTo			=から
 CertInfoPurposes		=用途
 CertInfoEmail			=メール
--- a/toolkit/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/chrome/global/aboutTelemetry.dtd
@@ -47,16 +47,20 @@ Ping の選択:
 <!ENTITY aboutTelemetry.showNewerPing "
 &lt;&lt; 新しい Ping
 ">
 
 <!ENTITY aboutTelemetry.showOlderPing "
 古い Ping &gt;&gt;
 ">
 
+<!ENTITY aboutTelemetry.rawPingData "
+Ping の生データ ...
+">
+
 <!ENTITY aboutTelemetry.archiveWeekHeader "

 ">
 
 <!ENTITY aboutTelemetry.archivePingHeader "
 Ping
 ">
 
@@ -99,18 +103,18 @@ Ping
 <!ENTITY aboutTelemetry.addonDetailsSection "
   アドオンの詳細
 ">
 
 <!ENTITY aboutTelemetry.lateWritesSection "
   遅延書き込み
 ">
 
-<!ENTITY aboutTelemetry.systemInfoSection "
-  システム情報
+<!ENTITY aboutTelemetry.sessionInfoSection "
+  セッション情報
 ">
 
 <!ENTITY aboutTelemetry.addonHistogramsSection "
   アドオンから収集されたヒストグラム
 ">
 
 <!ENTITY aboutTelemetry.toggle "
   クリックしてセクションを開閉
@@ -129,9 +133,13 @@ Ping
 ">
 
 <!ENTITY aboutTelemetry.hideSymbols "
   生データを表示する
 ">
 
 <!ENTITY aboutTelemetry.filterText "
   フィルタ (文字列または /正規表現/)
-">
\ No newline at end of file
+">
+
+<!ENTITY aboutTelemetry.payloadChoiceHeader "
+  ペイロード
+">
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -64,8 +64,14 @@ valuesHeader		=値
 
 addonTableID		=アドオン ID
 
 addonTableDetails	=詳細
 
 # Note to translators:
 # - The %1$S will be replaced with the name of an Add-on Provider (e.g. "XPI", "Plugin")
 addonProvider		=%1$S プロバイダ
+
+parentPayload		=親ペイロード
+
+# Note to translators:
+# - The %1$S will be replaced with the number of the child payload (e.g. "1", "2")
+childPayloadN		=子ペイロード %1$S