Bug 1008843 - React to the removal of T.61-8bit by removing it from comm-central too. r=jcranmer, a=mkmelin
--- a/mailnews/intl/charsetData.properties
+++ b/mailnews/intl/charsetData.properties
@@ -18,20 +18,18 @@
## charset_name.LangGroup =
##
## charset_name.isMultibyte = multi byte charsets
x-mac-arabic.isInternal = true
x-mac-farsi.isInternal = true
x-mac-hebrew.isInternal = true
x-imap4-modified-utf7.isInternal = true
-t.61-8bit.isInternal = true
replacement.isInternal = true
-t.61-8bit.notForOutgoing = true
utf-7.notForOutgoing = true
x-imap4-modified-utf7.notForOutgoing = true
ibm1125.notForOutgoing = true
ibm1131.notForOutgoing = true
iso-8859-8.notForOutgoing = true
replacement.notForOutgoing = true
# XXX : there are some entries only necessary for Gtk/Xlib builds
@@ -85,17 +83,16 @@ iso-8859-6.LangGroup = ar
iso-8859-7.LangGroup = el
iso-8859-8.LangGroup = he
iso-8859-8-i.LangGroup = he
jis_0208-1983.LangGroup = ja
koi8-r.LangGroup = x-cyrillic
koi8-u.LangGroup = x-cyrillic
shift_jis.LangGroup = ja
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
windows-1250.LangGroup = x-central-euro
--- 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
-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
x-mac-icelandic=x-mac-icelandic
@@ -82,21 +81,16 @@ zh_cn.euc=GB2312
gb_2312=GB2312
# Aliases for windows-874
tis620=windows-874
# Aliases for IBM866
cp-866=IBM866
-# Aliases for T.61-8bit
-t.61=T.61-8bit
-iso-ir-103=T.61-8bit
-csiso103t618bit=T.61-8bit
-
# Aliases for UTF-7
x-unicode-2-0-utf-7=UTF-7
unicode-2-0-utf-7=UTF-7
unicode-1-1-utf-7=UTF-7
csunicode11utf7=UTF-7
# Aliases for ISO-10646-UCS-2
csunicode=UTF-16BE