32.0: sync dom, security with en-US rev200798:f40e767ea283
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Fri, 11 Jul 2014 09:44:57 +0900
changeset 1448 33b439a29d35102e522bb41f3b671da39aef651b
parent 1447 b1dabcb645f7a410424b2620c7e98e3e941c6bc2
child 1449 18c987c7fdd244587fa7af207ddc0f8718103997
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs32
32.0: sync dom, security with en-US rev200798:f40e767ea283
dom/chrome/charsetTitles.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/netError.dtd
dom/chrome/security/csp.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pippki/certManager.dtd
deleted file mode 100644
--- a/dom/chrome/charsetTitles.properties
+++ /dev/null
@@ -1,105 +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/.
-
-## 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-9.title	= トルコ語 (ISO-8859-9)
-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)
-iso-8859-16.title	= ルーマニア語 (ISO-8859-16)
-windows-1250.title	= 中欧 (Windows-1250)
-windows-1252.title	= 西欧 (Windows-1252)
-windows-1254.title	= トルコ語 (Windows-1254)
-windows-1257.title	= バルト語 (Windows-1257)
-macintosh.title		= 西欧 (MacRoman)
-x-mac-ce.title		= 中欧 (MacCE)
-x-mac-turkish.title	= トルコ語 (MacTurkish)
-x-mac-croatian.title	= クロアチア語 (MacCroatian)
-x-mac-romanian.title	= ルーマニア語 (MacRomanian)
-x-mac-icelandic.title	= アイスランド語 (MacIcelandic)
-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)
-x-euc-tw.title		= 繁体字中国語 (EUC-TW)
-gb2312.title		= 簡体字中国語 (GB2312)
-hz-gb-2312.title	= 簡体字中国語 (HZ)
-gbk.title		= 簡体字中国語 (GBK)
-iso-2022-cn.title	= 簡体字中国語 (ISO-2022-CN)
-euc-kr.title		= 韓国語 (EUC-KR)
-x-johab.title		= 韓国語 (JOHAB)
-iso-2022-kr.title	= 韓国語 (ISO-2022-KR)
-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)
-iso-ir-111.title	= キリル文字 (ISO-IR-111)
-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)
-tis-620.title		= タイ語 (TIS-620)
-iso-8859-11.title	= タイ語 (ISO-8859-11)
-windows-874.title	= タイ語 (Windows-874)
-ibm874.title		= タイ語 (IBM-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)
-ibm850.title		= 西欧 (IBM-850)
-ibm852.title		= 中欧 (IBM-852)
-ibm855.title		= キリル文字 (IBM-855)
-ibm857.title		= トルコ語 (IBM-857)
-ibm862.title		= ヘブライ語 (IBM-862)
-gb18030.title		= 簡体字中国語 (GB18030)
-x-mac-arabic.title	= アラビア語 (MacArabic)
-x-mac-farsi.title	= ペルシア語 (MacFarsi)
-x-mac-hebrew.title	= ヘブライ語 (MacHebrew)
-x-mac-devanagari.title	= ヒンディー語 (MacDevanagari)
-x-mac-gujarati.title	= グジャラート語 (MacGujarati)
-x-mac-gurmukhi.title	= グルムキー文字 (MacGurmukhi)
-
-
-chardet.off.title				= (解除)
-chardet.universal_charset_detector.title	= 全言語
-# (^^; 各地域別言語は chardet.* の * 部を引数として指定 http://lxr.mozilla.org/aviarybranch/source/intl/chardet/tests/DetectCharset.cpp#53
-chardet.ja_parallel_state_machine.title		= 日本語
-chardet.ko_parallel_state_machine.title		= 韓国語
-chardet.zhtw_parallel_state_machine.title	= 繁体字中国語
-chardet.zhcn_parallel_state_machine.title	= 簡体字中国語
-chardet.zh_parallel_state_machine.title		= 中国語
-chardet.cjk_parallel_state_machine.title	= 東アジア
-chardet.ruprob.title				= ロシア語
-chardet.ukprob.title				= ウクライナ
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -29,20 +29,28 @@ FormValidationCheckboxMissing	= チェックボックスにチェックを入れてください。
 FormValidationRadioMissing	= いずれかのオプションを選択してください。
 FormValidationFileMissing	= ファイルを選択してください。
 FormValidationSelectMissing	= リストから項目を選択してください。
 FormValidationInvalidEmail	= メールアドレスが正しくありません。
 FormValidationInvalidURL	= URL が正しくありません。
 FormValidationPatternMismatch	= 入力された値がフィールドに指定された書式と異なります。
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle = 入力された値がフィールドに指定された書式と異なります: %S
-# LOCALIZATION NOTE (FormValidationRangeOverflow): %S can be a number, a date or a time.
-FormValidationRangeOverflow	= %S 以下の値を選択してください。
-# LOCALIZATION NOTE (FormValidationRangeUnderflow): %S can be a number, a date or a time.
-FormValidationRangeUnderflow	= %S 以上の値を選択してください。
+# LOCALIZATION NOTE (FormValidationNumberRangeOverflow): %S is a number.
+FormValidationNumberRangeOverflow	= %S 以下の値を選択してください。
+# LOCALIZATION NOTE (FormValidationDateRangeOverflow): %S is a date.
+FormValidationDateRangeOverflow		= %S 以前の日付を選択してください。
+# LOCALIZATION NOTE (FormValidationTimeRangeOverflow): %S is a time.
+FormValidationTimeRangeOverflow		= %S 以前の時刻を選択してください。
+# LOCALIZATION NOTE (FormValidationNumberRangeUnderflow): %S is a number.
+FormValidationNumberRangeUnderflow	= %S 以上の値を選択してください。
+# LOCALIZATION NOTE (FormValidationDateRangeUnderflow): %S is a date.
+FormValidationDateRangeUnderflow	= %S 以後の日付を選択してください。
+# LOCALIZATION NOTE (FormValidationTimeRangeUnderflow): %S is a time.
+FormValidationTimeRangeUnderflow	= %S 以後の時刻を選択してください。
 # LOCALIZATION NOTE (FormValidationStepMismatch): both %S can be a number, a date or a time.
 FormValidationStepMismatch	= 正しい値を選択してください。最も近い正しい値は %1$S と %2$S です。
 # LOCALIZATION NOTE (FormValidationStepMismatchOneValue): %S can be a number, a date or a time. This is called instead of FormValidationStepMismatch when the second value is the same as the first.
 FormValidationStepMismatchOneValue	= 正しい値を選択してください。最も近い正しい値は %S です。
 FormValidationBadInputNumber	= 数値を入力してください。
 # (^m^) 以下、Bug 661327 参照
 GetAttributeNodeWarning		= getAttributeNode() の使用は推奨されません。代わりに getAttribute() メソッドを使用してください。
 SetAttributeNodeWarning		= setAttributeNode() の使用は推奨されません。代わりに setAttribute() メソッドを使用してください。
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -80,54 +80,55 @@ errMissingSpaceBeforeDoctypeName= 文書型名の前に空白がありません。
 errHyphenHyphenBang			= コメント中に "--!" が見つかりました。
 errNcrZero					= ゼロに展開される文字参照が見つかりました。
 errNoSpaceBetweenDoctypeSystemKeywordAndQuote= 文書型宣言の "SYSTEM" キーワードと引用符の間に空白がありません。
 errNoSpaceBetweenPublicAndSystemIds= 文書型宣言の公開識別子とシステム識別子の間に空白がありません。
 errNoSpaceBetweenDoctypePublicKeywordAndQuote= 文書型宣言の "PUBLIC" キーワードと引用符の間に空白がありません。
 
 ## (^^; 以下未訳
 # Tree builder errors
-errStrayStartTag2			= Stray start tag "%1$S".
-errStrayEndTag				= Stray end tag "%1$S".
-errUnclosedElements			= End tag "%1$S" seen, but there were open elements.
-errUnclosedElementsImplied	= End tag "%1$S" implied, but there were open elements.
-errUnclosedElementsCell		= A table cell was implicitly closed, but there were open elements.
-errStrayDoctype				= Stray doctype.
-errAlmostStandardsDoctype	= Almost standards mode doctype. Expected "<!DOCTYPE html>".
-errQuirkyDoctype			= Quirky doctype. Expected "<!DOCTYPE html>".
-errNonSpaceInTrailer		= Non-space character in page trailer.
-errNonSpaceAfterFrameset	= Non-space after "frameset".
-errNonSpaceInFrameset		= Non-space in "frameset".
-errNonSpaceAfterBody		= Non-space character after body.
-errNonSpaceInColgroupInFragment= Non-space in "colgroup" when parsing fragment.
-errNonSpaceInNoscriptInHead	= Non-space character inside "noscript" inside "head".
-errFooBetweenHeadAndBody	= "%1$S" element between "head" and "body".
-errStartTagWithoutDoctype	= Start tag seen without seeing a doctype first. Expected "<!DOCTYPE html>".
-errNoSelectInTableScope		= No "select" in table scope.
-errStartSelectWhereEndSelectExpected= "select" start tag where end tag expected.
-errStartTagWithSelectOpen	= "%1$S" start tag with "select" open.
-errBadStartTagInHead2		= Bad start tag "%1$S" in "head".
-errImage					= Saw a start tag "image".
-errIsindex					= "isindex" seen.
-errFooSeenWhenFooOpen		= An "%1$S" start tag seen but an element of the same type was already open.
-errHeadingWhenHeadingOpen	= Heading cannot be a child of another heading.
-errFramesetStart			= "frameset" start tag seen.
-errNoCellToClose			= No cell to close.
-errStartTagInTable			= Start tag "%1$S" seen in "table".
-errFormWhenFormOpen			= Saw a "form" start tag, but there was already an active "form" element. Nested forms are not allowed. Ignoring the tag.
-errTableSeenWhileTableOpen	= Start tag for "table" seen but the previous "table" is still open.
-errStartTagInTableBody		= "%1$S" start tag in table body.
-errEndTagSeenWithoutDoctype	= End tag seen without seeing a doctype first. Expected "<!DOCTYPE html>".
-errEndTagAfterBody			= Saw an end tag after "body" had been closed.
-errEndTagSeenWithSelectOpen	= "%1$S" end tag with "select" open.
-errGarbageInColgroup		= Garbage in "colgroup" fragment.
-errEndTagBr					= End tag "br".
-errNoElementToCloseButEndTagSeen= No "%1$S" element in scope but a "%1$S" end tag seen.
-errHtmlStartTagInForeignContext= HTML start tag "%1$S" in a foreign namespace context.
-errTableClosedWhileCaptionOpen= "table" closed but "caption" was still open.
-errNoTableRowToClose		= No table row to close.
-errNonSpaceInTable			= Misplaced non-space characters inside a table.
-errUnclosedChildrenInRuby	= Unclosed children in "ruby".
-errStartTagSeenWithoutRuby	= Start tag "%1$S" seen without a "ruby" element being open.
-errSelfClosing				= Self-closing syntax ("/>") used on a non-void HTML element. Ignoring the slash and treating as a start tag.
-errNoCheckUnclosedElementsOnStack= Unclosed elements on stack.
-errEndTagDidNotMatchCurrentOpenElement= End tag "%1$S" did not match the name of the current open element ("%2$S").
-errEndTagViolatesNestingRules= End tag "%1$S" violates nesting rules.
+errStrayStartTag2		=Stray start tag "%1$S".
+errStrayEndTag			=Stray end tag "%1$S".
+errUnclosedElements		=End tag "%1$S" seen, but there were open elements.
+errUnclosedElementsImplied	=End tag "%1$S" implied, but there were open elements.
+errUnclosedElementsCell		=A table cell was implicitly closed, but there were open elements.
+errStrayDoctype			=Stray doctype.
+errAlmostStandardsDoctype	=Almost standards mode doctype. Expected "<!DOCTYPE html>".
+errQuirkyDoctype		=Quirky doctype. Expected "<!DOCTYPE html>".
+errNonSpaceInTrailer		=Non-space character in page trailer.
+errNonSpaceAfterFrameset	=Non-space after "frameset".
+errNonSpaceInFrameset		=Non-space in "frameset".
+errNonSpaceAfterBody		=Non-space character after body.
+errNonSpaceInColgroupInFragment	=Non-space in "colgroup" when parsing fragment.
+errNonSpaceInNoscriptInHead	=Non-space character inside "noscript" inside "head".
+errFooBetweenHeadAndBody	="%1$S" element between "head" and "body".
+errStartTagWithoutDoctype	=Start tag seen without seeing a doctype first. Expected "<!DOCTYPE html>".
+errNoSelectInTableScope		=No "select" in table scope.
+errStartSelectWhereEndSelectExpected	="select" start tag where end tag expected.
+errStartTagWithSelectOpen	="%1$S" start tag with "select" open.
+errBadStartTagInHead2		=Bad start tag "%1$S" in "head".
+errImage			=Saw a start tag "image".
+errIsindex			="isindex" seen.
+errFooSeenWhenFooOpen		=An "%1$S" start tag seen but an element of the same type was already open.
+errHeadingWhenHeadingOpen	=Heading cannot be a child of another heading.
+errFramesetStart		="frameset" start tag seen.
+errNoCellToClose		=No cell to close.
+errStartTagInTable		=Start tag "%1$S" seen in "table".
+errFormWhenFormOpen		=Saw a "form" start tag, but there was already an active "form" element. Nested forms are not allowed. Ignoring the tag.
+errTableSeenWhileTableOpen	=Start tag for "table" seen but the previous "table" is still open.
+errStartTagInTableBody		="%1$S" start tag in table body.
+errEndTagSeenWithoutDoctype	=End tag seen without seeing a doctype first. Expected "<!DOCTYPE html>".
+errEndTagAfterBody		=Saw an end tag after "body" had been closed.
+errEndTagSeenWithSelectOpen	="%1$S" end tag with "select" open.
+errGarbageInColgroup		=Garbage in "colgroup" fragment.
+errEndTagBr			=End tag "br".
+errNoElementToCloseButEndTagSeen=No "%1$S" element in scope but a "%1$S" end tag seen.
+errHtmlStartTagInForeignContext	=HTML start tag "%1$S" in a foreign namespace context.
+errTableClosedWhileCaptionOpen	="table" closed but "caption" was still open.
+errNoTableRowToClose		=No table row to close.
+errNonSpaceInTable		=Misplaced non-space characters inside a table.
+errUnclosedChildrenInRuby	=Unclosed children in "ruby".
+errStartTagSeenWithoutRuby	=Start tag "%1$S" seen without a "ruby" element being open.
+errSelfClosing			=Self-closing syntax ("/>") used on a non-void HTML element. Ignoring the slash and treating as a start tag.
+errNoCheckUnclosedElementsOnStack	=Unclosed elements on stack.
+errEndTagDidNotMatchCurrentOpenElement	=End tag "%1$S" did not match the name of the current open element ("%2$S").
+errEndTagViolatesNestingRules	=End tag "%1$S" violates nesting rules.
+errEndWithUnclosedElements	=End tag for "%1$S" seen, but there were unclosed elements.
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -58,17 +58,17 @@
 
 <!ENTITY redirectLoop.title		"自動転送がループしています">
 <!ENTITY redirectLoop.longDesc		"<p>リクエストされたリソースの取得を中止しました。このサイトではリクエストの自動転送がループしています。</p><ul><li>このサイトで要求されている Cookie を無効化またはブロックしていないか確認してください。</li><li><em>注意</em>: サイトによる Cookie の使用を許可しても解決しない場合、これはご利用のコンピュータではなくサーバの設定に問題があると思われます。</li></ul>">
 
 <!ENTITY unknownSocketType.title	"サーバの応答が不正です">
 <!ENTITY unknownSocketType.longDesc	"<p>ネットワークリクエストに対するサイトの応答が正しくなかったため、接続を中断しました。</p>">
 
 <!ENTITY nssFailure2.title		"安全な接続ができませんでした">
-<!ENTITY nssFailure2.longDesc		"<p>受信したデータの真正性を検証できなかったため、このページは表示できませんでした。</p><ul><li>この問題については Web サイトの管理者に問い合わせてください。</li></ul>">
+<!ENTITY nssFailure2.longDesc2		"<p>受信したデータの真正性を検証できなかったため、このページは表示できません。</p><ul><li>この問題については Web サイトの管理者に問い合わせてください。</li></ul>">
 
 <!ENTITY nssBadCert.title		"安全な接続ができませんでした">
 <!ENTITY nssBadCert.longDesc2		"<ul>
 <li>サーバの設定に問題があるか、誰かが正規のサーバになりすましている可能性があります。</li>
 <li>以前は正常に接続できていた場合、この問題は恐らく一時的なものですので、後で再度試してみてください。</li>
 </ul>
 ">
 
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -6,16 +6,23 @@
 # CSP Warnings:
 # LOCALIZATION NOTE (CSPViolation):
 # %1$S is the reason why the resource has not been loaded.
 CSPViolation			= The page's settings blocked the loading of a resource: %1$S
 # LOCALIZATION NOTE (CSPViolationWithURI):
 # %1$S is the directive that has been violated.
 # %2$S is the URI of the resource which violated the directive.
 CSPViolationWithURI		= The page's settings blocked the loading of a resource at %2$S ("%1$S").
+# LOCALIZATION NOTE (CSPROViolation):
+# %1$S is the reason why the resource has not been loaded.
+CSPROViolation = A violation occurred for a report-only CSP policy ("%1$S"). The behavior was allowed, and a CSP report was sent.
+# LOCALIZATION NOTE (CSPROViolationWithURI):
+# %1$S is the directive that has been violated.
+# %2$S is the URI of the resource which violated the directive.
+CSPROViolationWithURI = The page's settings observed the loading of a resource at %2$S ("%1$S"). A CSP report is being sent.
 # LOCALIZATION NOTE (triedToSendReport):
 # %1$S is the URI we attempted to send a report to.
 triedToSendReport		= Tried to send report to invalid URI: "%1$S"
 # LOCALIZATION NOTE (errorWas):
 # %1$S is the error resulting from attempting to send the report
 errorWas			= error was: "%1$S"
 # LOCALIZATION NOTE (couldNotParseReportURI):
 # %1$S is the report URI that could not be parsed
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -99,27 +99,16 @@ CertDumpParams				= Algorithm Parameters
 CertDumpRSAEncr				= PKCS #1 RSA Encryption
 CertDumpRSAPSSSignature			= PKCS #1 RSASSA-PSS Signature
 CertDumpRSATemplate			= Modulus (%S bits):\n%S\nExponent (%S bits):\n%S
 CertDumpECTemplate			= Key size: %S bits\nBase point order length: %S bits\nPublic value:\n%S
 CertDumpIssuerUniqueID			= Issuer Unique ID
 CertDumpSubjPubKey			= Subject's Public Key
 CertDumpSubjectUniqueID			= Subject Unique ID
 CertDumpExtensions			= Extensions
-CertDumpCertType			= Netscape Certficate Type
-CertDumpNSCertExtBaseUrl		= Netscape Certificate Extension Base URL
-CertDumpNSCertExtRevocationUrl		= Netscape Certificate Revocation URL
-CertDumpNSCertExtCARevocationUrl	= Netscape Certificate Authority Revocation URL
-CertDumpNSCertExtCertRenewalUrl		= Netscape Certificate Renewal URL
-CertDumpNSCertExtCAPolicyUrl		= Netscape Certificate Authority Policy URL
-CertDumpNSCertExtSslServerName		= Netscape Certificate SSL Server Name
-CertDumpNSCertExtComment		= Netscape Certificate Comment
-CertDumpNSCertExtLostPasswordUrl	= Netscape Lost Password URL
-CertDumpNSCertExtCertRenewalTime	= NetscapeCertificate Renewal Time
-CertDumpNetscapeAolScreenname		= AOL Screenname
 CertDumpSubjectDirectoryAttr		= Certificate Subject Directory Attributes
 CertDumpSubjectKeyID			= Certificate Subject Key ID
 CertDumpKeyUsage			= Certificate Key Usage
 CertDumpSubjectAltName			= Certificate Subject Alt Name
 CertDumpIssuerAltName			= Certificate Issuer Alt Name
 CertDumpBasicConstraints		= Certificate Basic Constraints
 CertDumpNameConstraints			= Certificate Name Constraints
 CertDumpCrlDistPoints			= CRL Distribution Points
@@ -127,18 +116,16 @@ CertDumpCertPolicies			= Certificate Pol
 CertDumpPolicyMappings			= Certificate Policy Mappings
 CertDumpPolicyConstraints		= Certificate Policy Constraints
 CertDumpAuthKeyID			= Certificate Authority Key Identifier
 CertDumpExtKeyUsage			= Extended Key Usage
 CertDumpAuthInfoAccess			= Authority Information Access
 CertDumpAnsiX9DsaSignature		= ANSI X9.57 DSA Signature
 CertDumpAnsiX9DsaSignatureWithSha1	= ANSI X9.57 DSA Signature with SHA1 Digest
 CertDumpAnsiX962ECDsaSignatureWithSha1	= ANSI X9.62 ECDSA Signature with SHA1
-CertDumpCertTypeEmail			= Email
-CertDumpEmailCA				= Email Certificate Authority
 CertDumpKUSign				= Signing
 CertDumpKUNonRep			= Non-repudiation
 CertDumpKUEnc				= Key Encipherment
 CertDumpKUDEnc				= Data Encipherment
 CertDumpKUKA				= Key Agreement
 CertDumpKUCertSign			= Certificate Signer
 CertDumpKUCRLSigner			= CRL Signer
 CertDumpCritical			= Critical
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.dtd
@@ -29,18 +29,18 @@
 <!ENTITY certmgr.issuerinfo.label             "発行者">
 <!ENTITY certmgr.periodofvalidity.label       "証明書の有効期間">
 <!ENTITY certmgr.fingerprints.label           "証明書のフィンガープリント">
 <!ENTITY certmgr.certdetail.title             "証明書の詳細">
 <!ENTITY certmgr.certdetail.cn                "一般名称 (CN)">
 <!ENTITY certmgr.certdetail.o                 "組織 (O)">
 <!ENTITY certmgr.certdetail.ou                "部門 (OU)">
 <!ENTITY certmgr.certdetail.serialnumber      "シリアル番号">
+<!ENTITY certmgr.certdetail.sha256fingerprint "SHA-256 フィンガープリント">
 <!ENTITY certmgr.certdetail.sha1fingerprint   "SHA1 フィンガープリント">
-<!ENTITY certmgr.certdetail.md5fingerprint    "MD5 フィンガープリント">
 
 <!ENTITY certmgr.editcert.title               "証明書の設定">
 <!ENTITY certmgr.editcacert.title             "認証局証明書に対する信頼性の設定">
 <!ENTITY certmgr.editcert.edittrust           "証明書の信頼性を設定してください:">
 <!ENTITY certmgr.editcert.trustssl            "この証明書を Web サイトの識別に使用する">
 <!ENTITY certmgr.editcert.trustemail          "この証明書をメールユーザの識別に使用する">
 <!ENTITY certmgr.editcert.trustobjsign        "この証明書をソフトウェア製作者の識別に使用する">
 <!ENTITY certmgr.editemailcert.title          "メール証明書の信頼性の設定">