Backed out 6 changesets (bug 1543077) for causing bc failures at docshell/test/browser/browser_bug1543077.js
authorMihai Alexandru Michis <malexandru@mozilla.com>
Mon, 27 May 2019 12:00:21 +0300
changeset 11566 e20f6468468cfa53fb863d97a0862eea6662ce78
parent 11565 1e214759d3fe780737ba4b99dc251928d8d4211c
child 11567 1b6ecb0a117487f4adf89841ec03406e1b7b2877
child 11571 58d326279d7612a8234631544325b887b1f66776
push id143
push userflodolo@mozilla.com
push dateThu, 30 May 2019 06:01:38 +0000
bugs1543077
Backed out 6 changesets (bug 1543077) for causing bc failures at docshell/test/browser/browser_bug1543077.js Backed out changeset f593045cc48f (bug 1543077) Backed out changeset 25449ba8aceb (bug 1543077) Backed out changeset ccc438262e29 (bug 1543077) Backed out changeset 4573c25b1ce0 (bug 1543077) Backed out changeset 1cbaafb9373a (bug 1543077) Backed out changeset 1a0e7ced8e47 (bug 1543077) X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: a293e80437afd33f0187f5bbe730de5a30ec8deb X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 4e75132ecb51125eb96f6439c59cbeb0ade93566 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: df853c362664989e025d1206b59c37c435186a91
toolkit/chrome/global/charsetMenu.properties
--- a/toolkit/chrome/global/charsetMenu.properties
+++ b/toolkit/chrome/global/charsetMenu.properties
@@ -109,18 +109,25 @@ Shift_JIS.key    = J
 Shift_JIS        = Japanese (Shift_JIS)
 EUC-JP.key       =   p
 EUC-JP           = Japanese (EUC-JP)
 ISO-2022-JP.key  =     n
 ISO-2022-JP      = Japanese (ISO-2022-JP)
 
 # UI string in anticipation of bug 1543077; deliberately not in use yet
 
-# Japanese (NOT AN ENCODING NAME)
+# LOCALIZATION NOTE (Japanese.key): If taken into use, this string will appear
+# instead of the string for Shift_JIS.key, so the use of the same
+# accelerator is deliberate.
 Japanese.key     = J
+# LOCALIZATION NOTE (Japanese): If taken into use, this string will appear
+# as a single item in place of the strings for the three items Shift_JIS,
+# EUC-JP, and ISO-2022-JP, so this string does not need to make sense together
+# with those strings and should be translated the way those were
+# but omitting the part in parentheses.
 Japanese         = Japanese
 
 # Korean
 EUC-KR.key       = K
 EUC-KR           = Korean
 
 # Thai
 windows-874.key  =    i