46.0: sync mail with en-US rev21472:65b564db348b
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Sun, 21 Feb 2016 07:50:33 +0900
changeset 2035 80d9d9de718ae6a922431c46521d3124b639c903
parent 2034 4fa0c95d172b5ae46fac8f8c477682613a25978b
child 2036 fcb585e9d724b2abf58b3633e3568dc6a140d6e8
push id1104
push useraxel@mozilla.com
push dateMon, 07 Mar 2016 14:30:53 +0000
bugs46
46.0: sync mail with en-US rev21472:65b564db348b
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/am-smime.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/preferences/advanced.dtd
--- a/mail/chrome/messenger/am-server-top.dtd
+++ b/mail/chrome/messenger/am-server-top.dtd
@@ -19,17 +19,17 @@
         For example, in Japanese cases:
                 biffStart.label "every"
                 biffEnd.label   "minutes for new messages Check"
 -->
 <!ENTITY biffStart.label		"新着メッセージがないか">
 <!ENTITY biffStart.accesskey		"y">
 <!ENTITY biffEnd.label			"分ごとに確認する">
 <!ENTITY useIdleNotifications.label	"新着メッセージが届いた時のサーバ通知を許可する">
-<!ENTITY useIdleNotifications.accesskey	"A">
+<!ENTITY useIdleNotifications.accesskey	"w">
 <!ENTITY connectionSecurity.label	"接続の保護:">
 <!ENTITY connectionSecurity.accesskey	"u">
 <!ENTITY connectionSecurityType-0.label	"なし">
 <!ENTITY connectionSecurityType-1.label	"STARTTLS (可能な場合)">
 <!ENTITY connectionSecurityType-2.label	"STARTTLS">
 <!ENTITY connectionSecurityType-3.label	"SSL/TLS">
 <!ENTITY authMethod.label		"認証方式:">
 <!ENTITY authMethod.accesskey		"i">
--- a/mail/chrome/messenger/am-smime.dtd
+++ b/mail/chrome/messenger/am-smime.dtd
@@ -21,12 +21,12 @@
 <!ENTITY encryption.certificate_clear.button	"消去">
 <!ENTITY encryption.certificate_clear.accesskey	"e">
 <!ENTITY signingGroupTitle.label	"デジタル署名">
 <!ENTITY signMessage.label		"メッセージにデジタル署名する (既定の動作)">
 <!ENTITY signMessage.accesskey		"D">
 <!ENTITY signingCert.message		"メッセージのデジタル署名に使用する証明書:">
 
 <!ENTITY certificates.label		"証明書">
-<!ENTITY manageCerts.label		"証明書を表示">
-<!ENTITY manageCerts.accesskey		"V">
+<!ENTITY manageCerts2.label		"証明書を管理">
+<!ENTITY manageCerts2.accesskey		"M">
 <!ENTITY manageDevices.label		"セキュリティデバイス">
 <!ENTITY manageDevices.accesskey	"y">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -268,27 +268,16 @@ mailnews.send_default_charset	=ISO-2022-
 mailnews.view_default_charset	=ISO-2022-JP
 
 # whether to generate display names in last first order
 # LOCALIZATION NOTE(mail.addr_book.displayName.lastnamefirst):
 # the only valid values are: true OR false (choose from the untranslated English words)
 ## (^^; ja では true にする。(en-US: false)
 mail.addr_book.displayName.lastnamefirst	=true
 
-# the format for "mail.addr_book.quicksearchquery.format" is:
-# @V == the escaped value typed in the quick search bar in the addressbook
-#
-# note, changing this might require a change to SearchNameOrEmail.label
-# in messenger.dtd
-#
-# LOCALIZATION NOTE - please add phonetic names as below when "mail.addr_book.show_phonetic_fields" is true
-# "?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V)(PhoneticFirstName,c,@V)(PhoneticLastName,c,@V))"
-#
-mail.addr_book.quicksearchquery.format	=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V)(PhoneticFirstName,c,@V)(PhoneticLastName,c,@V))
-
 # whether to also show phonetic fields in the addressbook
 # LOCALIZATION NOTE(mail.addr_book.show_phonetic_fields):
 # the only valid values are: true OR false (choose from the untranslated English words)
 ## (^^; ja では true にする。(en-US: false)
 mail.addr_book.show_phonetic_fields	=true
 
 # valid format options are:
 # 1: yyyy/mm/dd
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -98,12 +98,12 @@
 <!ENTITY certSelection.description		"サーバが個人証明書を要求したとき:">
 <!ENTITY certs.auto				"自動的に選択する">
 <!ENTITY certs.auto.accesskey			"S">
 <!ENTITY certs.ask				"毎回自分で選択する">
 <!ENTITY certs.ask.accesskey			"A">
 <!ENTITY enableOCSP.label			"OCSP レスポンダサーバに問い合わせて証明書の現在の正当性を確認する">
 <!ENTITY enableOCSP.accesskey			"Q">
 
-<!ENTITY viewCertificates.label			"証明書を表示">
-<!ENTITY viewCertificates.accesskey		"C">
+<!ENTITY manageCertificates.label		"証明書を管理">
+<!ENTITY manageCertificates.accesskey		"M">
 <!ENTITY viewSecurityDevices.label		"セキュリティデバイス">
 <!ENTITY viewSecurityDevices.accesskey		"D">