Bug 1072202 - React to the removal of VISCII, x-viet-tcvn5712 and x-viet-vps (remove traces of it from comm-central too). r=jcranmer, a=mkmelin
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sat, 20 Dec 2014 14:28:24 +0200
changeset 21512 ca06ad20ef59e59873df7de1246a11034dc7a884
parent 21511 23f73d2b85a684ced75e06e906302569ed74bd16
child 21513 27fc1f61d61a192d299998fbd2e7bc93dc803bd7
push id1305
push usermbanner@mozilla.com
push dateMon, 23 Feb 2015 19:48:12 +0000
treeherdercomm-beta@3ae4f13858fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, mkmelin
bugs1072202
Bug 1072202 - React to the removal of VISCII, x-viet-tcvn5712 and x-viet-vps (remove traces of it from comm-central too). r=jcranmer, a=mkmelin
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
@@ -48,19 +48,16 @@ windows-1251.title = Cyrillic (Windows-1
 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)
 windows-1258.title = Vietnamese (Windows-1258)
-x-viet-tcvn5712.title = Vietnamese (TCVN)
-viscii.title = Vietnamese (VISCII)
-x-viet-vps.title = Vietnamese (VPS)
 windows-874.title = Thai (Windows-874)
 iso-8859-6.title = Arabic (ISO-8859-6)
 iso-8859-8.title = Hebrew Visual (ISO-8859-8)
 iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
 windows-1255.title = Hebrew (Windows-1255)
 windows-1256.title = Arabic (Windows-1256)
 x-user-defined.title = User Defined
 ibm866.title = Cyrillic/Russian (CP-866)
--- a/mailnews/intl/charsetData.properties
+++ b/mailnews/intl/charsetData.properties
@@ -93,19 +93,16 @@ windows-874.LangGroup              = th
 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
 utf-7.LangGroup                    = x-unicode
 x-imap4-modified-utf7.LangGroup    = x-unicode
 replacement.LangGroup              = x-unicode
-viscii.LangGroup                   = x-western
-x-viet-tcvn5712.LangGroup          = x-western
-x-viet-vps.LangGroup               = x-western
 windows-1250.LangGroup             = x-central-euro
 windows-1251.LangGroup             = x-cyrillic
 windows-1252.LangGroup             = x-western
 windows-1253.LangGroup             = el
 windows-1254.LangGroup             = tr
 windows-1255.LangGroup             = he
 windows-1256.LangGroup             = ar
 windows-1257.LangGroup             = x-baltic
--- a/mailnews/intl/charsetalias.properties
+++ b/mailnews/intl/charsetalias.properties
@@ -13,17 +13,16 @@
 # labelsencodings.properties. Besides aliases it contains labels for charsets
 # that are not part of the HTML5 world, but still are supported for e-mail.
 
 646=windows-1252
 iso-8859-1=ISO-8859-1
 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 ...
 x-imap4-modified-utf7=x-imap4-modified-utf7
 x-mac-ce=x-mac-ce
 x-mac-turkish=x-mac-turkish
 x-mac-greek=x-mac-greek
@@ -31,18 +30,16 @@ x-mac-icelandic=x-mac-icelandic
 x-mac-croatian=x-mac-croatian
 x-mac-romanian=x-mac-romanian
 x-mac-hebrew=x-mac-hebrew
 x-mac-arabic=x-mac-arabic
 x-mac-farsi=x-mac-farsi
 x-mac-devanagari=x-mac-devanagari
 x-mac-gujarati=x-mac-gujarati
 x-mac-gurmukhi=x-mac-gurmukhi
-x-viet-tcvn5712=x-viet-tcvn5712
-x-viet-vps=x-viet-vps
 iso-10646-ucs-2=UTF-16BE
 x-iso-10646-ucs-2-be=UTF-16BE
 x-iso-10646-ucs-2-le=UTF-16LE
 
 # Aliases for ISO-8859-1
 latin1=ISO-8859-1
 iso_8859-1=ISO-8859-1
 iso8859-1=ISO-8859-1
@@ -106,19 +103,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 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
 windows-936=gbk
 ansi-1251=windows-1251
 
--- a/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
+++ b/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
@@ -48,19 +48,16 @@ windows-1251.title = Cyrillic (Windows-1
 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)
 windows-1258.title = Vietnamese (Windows-1258)
-x-viet-tcvn5712.title = Vietnamese (TCVN)
-viscii.title = Vietnamese (VISCII)
-x-viet-vps.title = Vietnamese (VPS)
 windows-874.title = Thai (Windows-874)
 iso-8859-6.title = Arabic (ISO-8859-6)
 iso-8859-8.title = Hebrew Visual (ISO-8859-8)
 iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
 windows-1255.title = Hebrew (Windows-1255)
 windows-1256.title = Arabic (Windows-1256)
 x-user-defined.title = User Defined
 ibm866.title = Cyrillic/Russian (CP-866)