Bug 1069907 - React to the removal of ISO-IR-111 (by removal from comm-central too). r=jcranmer
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sat, 22 Nov 2014 14:54:07 +0200
changeset 21338 9fe17fae3b5981b357a84e00ff8f0a4f1ac1d9e9
parent 21337 a9651712f4e75965f3d7350a3febc1d07d1c8330
child 21339 0e8892a07e5567f60717279c86624dbc5912d5c4
push id1274
push usermbanner@mozilla.com
push dateMon, 12 Jan 2015 19:54:49 +0000
treeherdercomm-beta@baea280adc1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs1069907
Bug 1069907 - React to the removal of ISO-IR-111 (by removal from comm-central too). r=jcranmer
mail/locales/en-US/chrome/messenger/charsetTitles.properties
mailnews/intl/charsetData.properties
mailnews/intl/charsetalias.properties
suite/locales/en-US/chrome/mailnews/charsetTitles.properties
--- a/mail/locales/en-US/chrome/messenger/charsetTitles.properties
+++ b/mail/locales/en-US/chrome/messenger/charsetTitles.properties
@@ -41,17 +41,16 @@ gbk.title = Chinese Simplified (GBK)
 euc-kr.title = Korean (EUC-KR)
 x-johab.title = Korean (JOHAB)
 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 = Cyrillic (ISO-8859-5)
-iso-ir-111.title = Cyrillic (ISO-IR-111)
 windows-1251.title = Cyrillic (Windows-1251)
 x-mac-cyrillic.title = Cyrillic (MacCyrillic)
 x-mac-ukrainian.title = Cyrillic/Ukrainian (MacUkrainian)
 koi8-r.title = Cyrillic (KOI8-R)
 koi8-u.title = Cyrillic/Ukrainian (KOI8-U)
 iso-8859-7.title = Greek (ISO-8859-7)
 windows-1253.title = Greek (Windows-1253)
 x-mac-greek.title = Greek (MacGreek)
--- a/mailnews/intl/charsetData.properties
+++ b/mailnews/intl/charsetData.properties
@@ -92,17 +92,16 @@ iso-8859-6-e.LangGroup             = ar
 iso-8859-6-i.LangGroup             = ar
 iso-8859-7.LangGroup               = el
 iso-8859-8.LangGroup               = he
 iso-8859-8-e.LangGroup             = he
 iso-8859-8-i.LangGroup             = he
 jis_0208-1983.LangGroup            = ja
 koi8-r.LangGroup                   = x-cyrillic
 koi8-u.LangGroup                   = x-cyrillic
-iso-ir-111.LangGroup               = x-cyrillic
 shift_jis.LangGroup                = ja
 windows-874.LangGroup              = th
 us-ascii.LangGroup                 = x-western
 t.61-8bit.LangGroup                = x-western
 utf-8.LangGroup                    = x-unicode
 utf-16.LangGroup                   = x-unicode
 utf-16be.LangGroup                 = x-unicode
 utf-16le.LangGroup                 = x-unicode
--- a/mailnews/intl/charsetalias.properties
+++ b/mailnews/intl/charsetalias.properties
@@ -16,17 +16,16 @@
 ascii=us-ascii
 us-ascii=us-ascii
 ansi_x3.4-1968=us-ascii
 646=us-ascii
 iso-8859-1=ISO-8859-1
 iso-8859-6-i=ISO-8859-6-I
 iso-8859-6-e=ISO-8859-6-E
 iso-8859-8-e=ISO-8859-8-E
-iso-ir-111=ISO-IR-111
 utf-16=UTF-16
 utf-7=UTF-7
 gb2312=GB2312
 viscii=VISCII
 t.61-8bit=T.61-8bit
 hz-gb-2312=HZ-GB-2312
 
 # Netscape private ...
@@ -124,20 +123,16 @@ csunicode=UTF-16BE
 csunicode11=UTF-16BE
 iso-10646-ucs-basic=UTF-16BE
 csunicodeascii=UTF-16BE
 iso-10646-unicode-latin1=UTF-16BE
 csunicodelatin1=UTF-16BE
 iso-10646=UTF-16BE
 iso-10646-j-1=UTF-16BE
 
-# Aliases for ISO-IR-111
-ecma-cyrillic=ISO-IR-111
-csiso111ecmacyrillic=ISO-IR-111
-
 # Aliases for VISCII
 csviscii=VISCII
 
 # Following names appears in unix nl_langinfo(CODESET)
 # They can be compiled as platform specific if necessary
 # DONT put things here if it does not look generic enough (like hp15CN)
 iso88591=ISO-8859-1
 iso885912=ISO-8859-12
--- a/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
+++ b/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
@@ -41,17 +41,16 @@ gbk.title = Chinese Simplified (GBK)
 euc-kr.title = Korean (EUC-KR)
 x-johab.title = Korean (JOHAB)
 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 = Cyrillic (ISO-8859-5)
-iso-ir-111.title = Cyrillic (ISO-IR-111)
 windows-1251.title = Cyrillic (Windows-1251)
 x-mac-cyrillic.title = Cyrillic (MacCyrillic)
 x-mac-ukrainian.title = Cyrillic/Ukrainian (MacUkrainian)
 koi8-r.title = Cyrillic (KOI8-R)
 koi8-u.title = Cyrillic/Ukrainian (KOI8-U)
 iso-8859-7.title = Greek (ISO-8859-7)
 windows-1253.title = Greek (Windows-1253)
 x-mac-greek.title = Greek (MacGreek)