--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -43,17 +43,16 @@
           <label accesskey="&language.accesskey;" control="selectLangs">&language.label;</label>
         </hbox>
         <menulist id="selectLangs" preference="font.language.group"
                   onsyncfrompreference="return gFontsDialog.readFontLanguageGroup();">
           <menupopup>
             <menuitem value="ar"              label="&font.langGroup.arabic;"/>
             <menuitem value="x-armn"          label="&font.langGroup.armenian;"/>
             <menuitem value="x-beng"          label="&font.langGroup.bengali;"/>
-            <menuitem value="x-central-euro"  label="&font.langGroup.latin2;"/>
             <menuitem value="zh-CN"           label="&font.langGroup.simpl-chinese;"/>
             <menuitem value="zh-HK"           label="&font.langGroup.trad-chinese-hk;"/>
             <menuitem value="zh-TW"           label="&font.langGroup.trad-chinese;"/>
             <menuitem value="x-cyrillic"      label="&font.langGroup.cyrillic;"/>
             <menuitem value="x-devanagari"    label="&font.langGroup.devanagari;"/>
             <menuitem value="x-ethi"          label="&font.langGroup.ethiopic;"/>
             <menuitem value="x-geor"          label="&font.langGroup.georgian;"/>
             <menuitem value="el"              label="&font.langGroup.el;"/>

--- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
@@ -17,17 +17,16 @@
 <!ENTITY  serif.label                             "Serif:">
 <!ENTITY  serif.accesskey                         "S">
 <!ENTITY  sans-serif.label                        "Sans-serif:">
 <!ENTITY  sans-serif.accesskey                    "n">
 <!ENTITY  monospace.label                         "Monospace:">
 <!ENTITY  monospace.accesskey                     "M">
 
 <!ENTITY  font.langGroup.latin1                   "Western">
-<!ENTITY  font.langGroup.latin2                   "Central European">
 <!ENTITY  font.langGroup.japanese                 "Japanese">
 <!ENTITY  font.langGroup.trad-chinese             "Traditional Chinese (Taiwan)">
 <!ENTITY  font.langGroup.simpl-chinese            "Simplified Chinese">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Traditional Chinese (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Korean">
 <!ENTITY  font.langGroup.cyrillic                 "Cyrillic">
 <!ENTITY  font.langGroup.el                       "Greek">
 <!ENTITY  font.langGroup.turkish                  "Turkish">

--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -2038,17 +2038,16 @@ GK_ATOM(x_knda, "x-knda")
 GK_ATOM(x_mlym, "x-mlym")
 GK_ATOM(x_orya, "x-orya")
 GK_ATOM(x_sinh, "x-sinh")
 GK_ATOM(x_telu, "x-telu")
 GK_ATOM(x_tibt, "x-tibt")
 
 // used in gfxGDIFontList.h
 GK_ATOM(ko_xxx, "ko-xxx")
-GK_ATOM(x_central_euro, "x-central-euro")
 GK_ATOM(x_symbol, "x-symbol")
 
 // additional languages that have special case transformations
 GK_ATOM(az, "az")
 GK_ATOM(ba, "ba")
 GK_ATOM(crh, "crh")
 GK_ATOM(el, "el")
 GK_ATOM(ga_ie, "ga-ie")

--- a/dom/encoding/encodingsgroups.properties
+++ b/dom/encoding/encodingsgroups.properties
@@ -19,22 +19,22 @@ ISO-8859-5=x-cyrillic
 ISO-8859-6=ar
 ISO-8859-7=el
 ISO-8859-8=he
 ISO-8859-8-I=he
 ISO-8859-10=x-western
 ISO-8859-13=x-western
 ISO-8859-14=x-western
 ISO-8859-15=x-western
-ISO-8859-16=x-central-euro
-ISO-8859-2=x-central-euro
+ISO-8859-16=x-western
+ISO-8859-2=x-western
 KOI8-R=x-cyrillic
 KOI8-U=x-cyrillic
 Shift_JIS=ja
-windows-1250=x-central-euro
+windows-1250=x-western
 windows-1251=x-cyrillic
 windows-1252=x-western
 windows-1253=el
 windows-1254=tr
 windows-1255=he
 windows-1256=ar
 windows-1257=x-western
 windows-1258=x-western

--- a/gfx/thebes/gfxFontconfigUtils.cpp
+++ b/gfx/thebes/gfxFontconfigUtils.cpp
@@ -375,17 +375,16 @@ gfxFontconfigUtils::GetFontList(nsIAtom 
 
 struct MozLangGroupData {
     nsIAtom* const& mozLangGroup;
     const char *defaultLang;
 };
 
 const MozLangGroupData MozLangGroups[] = {
     { nsGkAtoms::x_western,      "en" },
-    { nsGkAtoms::x_central_euro, "pl" },
     { nsGkAtoms::x_cyrillic,     "ru" },
     { nsGkAtoms::x_devanagari,   "hi" },
     { nsGkAtoms::x_tamil,        "ta" },
     { nsGkAtoms::x_armn,         "hy" },
     { nsGkAtoms::x_beng,         "bn" },
     { nsGkAtoms::x_cans,         "iu" },
     { nsGkAtoms::x_ethi,         "am" },
     { nsGkAtoms::x_geor,         "ka" },

--- a/gfx/thebes/gfxGDIFontList.h
+++ b/gfx/thebes/gfxGDIFontList.h
@@ -210,18 +210,16 @@ public:
         } else if (aLangGroup == nsGkAtoms::he) {
             bit = HEBREW_CHARSET;
         } else if (aLangGroup == nsGkAtoms::ar) {
             bit = ARABIC_CHARSET;
         } else if (aLangGroup == nsGkAtoms::x_cyrillic) {
             bit = RUSSIAN_CHARSET;
         } else if (aLangGroup == nsGkAtoms::th) {
             bit = THAI_CHARSET;
-        } else if (aLangGroup == nsGkAtoms::x_central_euro) {
-            bit = EASTEUROPE_CHARSET;
         } else if (aLangGroup == nsGkAtoms::x_symbol) {
             bit = SYMBOL_CHARSET;
         }
 
         if (bit != -1) {
             return mCharset.test(bit);
         }
 

--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -223,17 +223,16 @@ MemoryPressureObserver::Observe(nsISuppo
     gfxPlatform::GetPlatform()->PurgeSkiaCache();
     return NS_OK;
 }
 
 // this needs to match the list of pref font.default.xx entries listed in all.js!
 // the order *must* match the order in eFontPrefLang
 static const char *gPrefLangNames[] = {
     "x-western",
-    "x-central-euro",
     "ja",
     "zh-TW",
     "zh-CN",
     "zh-HK",
     "ko",
     "x-cyrillic",
     "el",
     "tr",

--- a/gfx/thebes/gfxPlatform.h
+++ b/gfx/thebes/gfxPlatform.h
@@ -69,48 +69,47 @@ BackendTypeBit(BackendType b)
 extern cairo_user_data_key_t kDrawTarget;
 
 // pref lang id's for font prefs
 // !!! needs to match the list of pref font.default.xx entries listed in all.js !!!
 // !!! don't use as bit mask, this may grow larger !!!
 
 enum eFontPrefLang {
     eFontPrefLang_Western     =  0,
-    eFontPrefLang_CentEuro    =  1,
-    eFontPrefLang_Japanese    =  2,
-    eFontPrefLang_ChineseTW   =  3,
-    eFontPrefLang_ChineseCN   =  4,
-    eFontPrefLang_ChineseHK   =  5,
-    eFontPrefLang_Korean      =  6,
-    eFontPrefLang_Cyrillic    =  7,
-    eFontPrefLang_Greek       =  8,
-    eFontPrefLang_Turkish     =  9,
-    eFontPrefLang_Thai        = 10,
-    eFontPrefLang_Hebrew      = 11,
-    eFontPrefLang_Arabic      = 12,
-    eFontPrefLang_Devanagari  = 13,
-    eFontPrefLang_Tamil       = 14,
-    eFontPrefLang_Armenian    = 15,
-    eFontPrefLang_Bengali     = 16,
-    eFontPrefLang_Canadian    = 17,
-    eFontPrefLang_Ethiopic    = 18,
-    eFontPrefLang_Georgian    = 19,
-    eFontPrefLang_Gujarati    = 20,
-    eFontPrefLang_Gurmukhi    = 21,
-    eFontPrefLang_Khmer       = 22,
-    eFontPrefLang_Malayalam   = 23,
-    eFontPrefLang_Oriya       = 24,
-    eFontPrefLang_Telugu      = 25,
-    eFontPrefLang_Kannada     = 26,
-    eFontPrefLang_Sinhala     = 27,
-    eFontPrefLang_Tibetan     = 28,
+    eFontPrefLang_Japanese    =  1,
+    eFontPrefLang_ChineseTW   =  2,
+    eFontPrefLang_ChineseCN   =  3,
+    eFontPrefLang_ChineseHK   =  4,
+    eFontPrefLang_Korean      =  5,
+    eFontPrefLang_Cyrillic    =  6,
+    eFontPrefLang_Greek       =  7,
+    eFontPrefLang_Turkish     =  8,
+    eFontPrefLang_Thai        =  9,
+    eFontPrefLang_Hebrew      = 10,
+    eFontPrefLang_Arabic      = 11,
+    eFontPrefLang_Devanagari  = 12,
+    eFontPrefLang_Tamil       = 13,
+    eFontPrefLang_Armenian    = 14,
+    eFontPrefLang_Bengali     = 15,
+    eFontPrefLang_Canadian    = 16,
+    eFontPrefLang_Ethiopic    = 17,
+    eFontPrefLang_Georgian    = 18,
+    eFontPrefLang_Gujarati    = 19,
+    eFontPrefLang_Gurmukhi    = 20,
+    eFontPrefLang_Khmer       = 21,
+    eFontPrefLang_Malayalam   = 22,
+    eFontPrefLang_Oriya       = 23,
+    eFontPrefLang_Telugu      = 24,
+    eFontPrefLang_Kannada     = 25,
+    eFontPrefLang_Sinhala     = 26,
+    eFontPrefLang_Tibetan     = 27,
 
-    eFontPrefLang_Others      = 29, // x-unicode
+    eFontPrefLang_Others      = 28, // x-unicode
 
-    eFontPrefLang_CJKSet      = 30  // special code for CJK set
+    eFontPrefLang_CJKSet      = 29  // special code for CJK set
 };
 
 enum eCMSMode {
     eCMSMode_Off          = 0,     // No color management
     eCMSMode_All          = 1,     // Color manage everything
     eCMSMode_TaggedOnly   = 2,     // Color manage tagged Images Only
     eCMSMode_AllCount     = 3
 };

--- a/gfx/thebes/nsUnicodeRange.cpp
+++ b/gfx/thebes/nsUnicodeRange.cpp
@@ -37,17 +37,17 @@ static nsIAtom **gUnicodeRangeToLangGrou
   &nsGkAtoms::x_telu,
   &nsGkAtoms::x_knda,
   &nsGkAtoms::x_sinh,
   &nsGkAtoms::x_tibt
 };
 
 /**********************************************************************
  * Unicode subranges as defined in unicode 3.0
- * x-western, x-central-euro, tr  -> latin 
+ * x-western, tr  -> latin 
  *  0000 - 036f 
  *  1e00 - 1eff
  *  2000 - 206f  (general punctuation)
  *  20a0 - 20cf  (currency symbols)
  *  2100 - 214f  (letterlike symbols)
  *  2150 - 218f  (Number Forms)
  * el         -> greek
  *  0370 - 03ff

--- a/intl/locale/langGroups.properties
+++ b/intl/locale/langGroups.properties
@@ -23,31 +23,31 @@ am=x-ethi
 ar=ar
 as=x-beng
 ay=x-western
 be=x-cyrillic
 bg=x-cyrillic
 bn=x-beng
 bo=x-tibt
 br=x-western
-bs=x-central-euro
+bs=x-western
 ca=x-western
-ce=x-central-euro
+ce=x-western
 ch=x-western
 co=x-western
 cr=x-cans
-cs=x-central-euro
-csb=x-central-euro
+cs=x-western
+csb=x-western
 #cu=x-cyrillic
 cv=x-cyrillic
 # XXX Latin Ext. A is also used for cy.
 cy=x-western
 da=x-western
 de=x-western
-dsb=x-central-euro
+dsb=x-western
 #dv=Thaanna
 dz=x-tibt
 #ee=x-western(?) (Ewe uses characters outside Latin-1 as well)
 el=el
 en=x-western
 # Esperanto: Latin-3
 eo=x-western
 es=x-western
@@ -69,20 +69,20 @@ gl=x-western
 gn=x-western
 #ha=x-western : Latin and Ajami scripts
 gu=x-gujr
 gv=x-western
 haw=x-western
 he=he
 hi=x-devanagari
 hil=x-western
-hr=x-central-euro
-hsb=x-central-euro
+hr=x-western
+hsb=x-western
 ht=x-western
-hu=x-central-euro
+hu=x-western
 hy=x-armn
 ia=x-western
 id=x-western
 ie=x-western
 is=x-western
 it=x-western
 iu=x-cans
 ja=ja
@@ -121,47 +121,46 @@ na=x-western
 nb=x-western
 nd=x-western
 ne=x-devanagari
 nl=x-western
 nn=x-western
 no=x-western
 nr=x-western
 nso=x-western
-# XXX : x-central-euro may be better
 nv=x-western
 ny=x-western
 oc=x-western
 oj=x-cans
 om=x-western
 or=x-orya
 os=x-cyrillic
 #pa: Punjabi is usually written in Gurmukhi script in India and Arabic script
 #    in Pakistan. We make pa default to Gurmukhi based on comments in bug 248690
 pa-in=x-guru
 pa-pk=ar
 pa=x-guru
-pl=x-central-euro
+pl=x-western
 ps=ar
 pt=x-western
 qu=x-western
 rm=x-western
 rn=x-western
-ro=x-central-euro
+ro=x-western
 ru=x-cyrillic
 rw=x-western
 sa=x-devanagari
 sc=x-western
 sd=ar
 # African language (but related with French)
 sg=x-western
-sh=x-central-euro
+sh=x-western
 si=x-sinh
-sk=x-central-euro
-sl=x-central-euro
+sk=x-western
+sl=x-western
 sm=x-western
 so=x-western
 son=x-western
 sq=x-western
 sr=x-cyrillic
 ss=x-western
 st=x-western
 sv=x-western
@@ -203,17 +202,16 @@ zh-hk=zh-HK
 zh=zh-CN
 zh-min-nan=x-western
 zu=x-western
 #
 #==============================
 #
 # mapping mozilla's internal x-* to themselves (see bug 256257)
 x-western=x-western
-x-central-euro=x-central-euro
 x-cyrillic=x-cyrillic
 # el
 # tr
 # he
 # ar
 # th
 # ja
 # zh-CN

--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -2235,21 +2235,16 @@ pref("font.minimum-size.th", 0);
 pref("font.size.variable.th", 16);
 pref("font.size.fixed.th", 13);
 
 pref("font.default.tr", "serif");
 pref("font.minimum-size.tr", 0);
 pref("font.size.variable.tr", 16);
 pref("font.size.fixed.tr", 13);
 
-pref("font.default.x-central-euro", "serif");
-pref("font.minimum-size.x-central-euro", 0);
-pref("font.size.variable.x-central-euro", 16);
-pref("font.size.fixed.x-central-euro", 13);
-
 pref("font.default.x-cyrillic", "serif");
 pref("font.minimum-size.x-cyrillic", 0);
 pref("font.size.variable.x-cyrillic", 16);
 pref("font.size.fixed.x-cyrillic", 13);
 
 pref("font.default.x-devanagari", "serif");
 pref("font.minimum-size.x-devanagari", 0);
 pref("font.size.variable.x-devanagari", 16);
@@ -2526,21 +2521,16 @@ pref("font.name.sans-serif.th", "Tahoma"
 pref("font.name.monospace.th", "Tahoma");
 pref("font.name.cursive.th", "Tahoma");
 
 pref("font.name.serif.tr", "Times New Roman");
 pref("font.name.sans-serif.tr", "Arial");
 pref("font.name.monospace.tr", "Courier New");
 pref("font.name.cursive.tr", "Comic Sans MS");
 
-pref("font.name.serif.x-central-euro", "Times New Roman");
-pref("font.name.sans-serif.x-central-euro", "Arial");
-pref("font.name.monospace.x-central-euro", "Courier New");
-pref("font.name.cursive.x-central-euro", "Comic Sans MS");
-
 pref("font.name.serif.x-cyrillic", "Times New Roman");
 pref("font.name.sans-serif.x-cyrillic", "Arial");
 pref("font.name.monospace.x-cyrillic", "Courier New");
 pref("font.name.cursive.x-cyrillic", "Comic Sans MS");
 
 pref("font.name.serif.x-unicode", "Times New Roman");
 pref("font.name.sans-serif.x-unicode", "Arial");
 pref("font.name.monospace.x-unicode", "Courier New");
@@ -2920,27 +2910,16 @@ pref("font.name-list.monospace.x-beng", 
 
 pref("font.name.serif.x-cans", "Euphemia UCAS");
 pref("font.name.sans-serif.x-cans", "Euphemia UCAS");
 pref("font.name.monospace.x-cans", "Euphemia UCAS");
 pref("font.name-list.serif.x-cans", "Euphemia UCAS");
 pref("font.name-list.sans-serif.x-cans", "Euphemia UCAS");
 pref("font.name-list.monospace.x-cans", "Euphemia UCAS");
 
-pref("font.name.serif.x-central-euro", "Times");
-pref("font.name.sans-serif.x-central-euro", "Helvetica");
-pref("font.name.monospace.x-central-euro", "Courier");
-pref("font.name.cursive.x-central-euro", "Apple Chancery");
-pref("font.name.fantasy.x-central-euro", "Papyrus");
-pref("font.name-list.serif.x-central-euro", "Times");
-pref("font.name-list.sans-serif.x-central-euro", "Helvetica");
-pref("font.name-list.monospace.x-central-euro", "Courier");
-pref("font.name-list.cursive.x-central-euro", "Apple Chancery");
-pref("font.name-list.fantasy.x-central-euro", "Papyrus");
-
 pref("font.name.serif.x-cyrillic", "Times");
 pref("font.name.sans-serif.x-cyrillic", "Helvetica");
 pref("font.name.monospace.x-cyrillic", "Monaco");
 pref("font.name.cursive.x-cyrillic", "Geneva");
 pref("font.name.fantasy.x-cyrillic", "Charcoal CY");
 pref("font.name-list.serif.x-cyrillic", "Times,Times New Roman");
 pref("font.name-list.sans-serif.x-cyrillic", "Helvetica,Arial");
 pref("font.name-list.monospace.x-cyrillic", "Monaco,Courier New");
@@ -3243,20 +3222,16 @@ pref("font.name.serif.th", "Charis SIL C
 pref("font.name.sans-serif.th", "Fira Sans");
 pref("font.name.monospace.th", "Fira Mono");
 pref("font.name-list.sans-serif.th", "Fira Sans, Noto Sans Thai, Droid Sans Thai");
 
 pref("font.name.serif.tr", "Charis SIL Compact");
 pref("font.name.sans-serif.tr", "Fira Sans");
 pref("font.name.monospace.tr", "Fira Mono");
 
-pref("font.name.serif.x-central-euro", "Charis SIL Compact");
-pref("font.name.sans-serif.x-central-euro", "Fira Sans");
-pref("font.name.monospace.x-central-euro", "Fira Mono");
-
 pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
 pref("font.name.sans-serif.x-cyrillic", "Fira Sans");
 pref("font.name.monospace.x-cyrillic", "Fira Mono");
 
 pref("font.name.serif.x-unicode", "Charis SIL Compact");
 pref("font.name.sans-serif.x-unicode", "Fira Sans");
 pref("font.name.monospace.x-unicode", "Fira Mono");
 
@@ -3313,22 +3288,16 @@ pref("font.name-list.serif.th", "Droid S
 pref("font.name-list.sans-serif.th", "Droid Sans Thai, Clear Sans, Droid Sans");
 
 pref("font.name.serif.tr", "Charis SIL Compact");
 pref("font.name.sans-serif.tr", "Clear Sans");
 pref("font.name.monospace.tr", "Droid Sans Mono");
 pref("font.name-list.serif.tr", "Droid Serif");
 pref("font.name-list.sans-serif.tr", "Clear Sans, Roboto, Droid Sans");
 
-pref("font.name.serif.x-central-euro", "Charis SIL Compact");
-pref("font.name.sans-serif.x-central-euro", "Clear Sans");
-pref("font.name.monospace.x-central-euro", "Droid Sans Mono");
-pref("font.name-list.serif.x-central-euro", "Droid Serif");
-pref("font.name-list.sans-serif.x-central-euro", "Clear Sans, Roboto, Droid Sans");
-
 pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
 pref("font.name.sans-serif.x-cyrillic", "Clear Sans");
 pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
 pref("font.name-list.serif.x-cyrillic", "Droid Serif");
 pref("font.name-list.sans-serif.x-cyrillic", "Clear Sans, Roboto, Droid Sans");
 
 pref("font.name.serif.x-unicode", "Charis SIL Compact");
 pref("font.name.sans-serif.x-unicode", "Clear Sans");
@@ -3374,19 +3343,16 @@ pref("font.size.fixed.el", 12);
 
 pref("font.size.fixed.he", 12);
 
 pref("font.minimum-size.th", 13);
 
 pref("font.default.tr", "sans-serif");
 pref("font.size.fixed.tr", 12);
 
-pref("font.default.x-central-euro", "sans-serif");
-pref("font.size.fixed.x-central-euro", 12);
-
 pref("font.default.x-cyrillic", "sans-serif");
 pref("font.size.fixed.x-cyrillic", 12);
 
 pref("font.default.x-unicode", "sans-serif");
 pref("font.size.fixed.x-unicode", 12);
 
 pref("font.default.x-western", "sans-serif");
 pref("font.size.fixed.x-western", 12);
@@ -3490,21 +3456,16 @@ pref("font.name.sans-serif.th", "sans-se
 pref("font.minimum-size.th", 13);
 pref("font.name.monospace.th", "monospace");
 
 pref("font.name.serif.tr", "serif");
 pref("font.name.sans-serif.tr", "sans-serif");
 pref("font.name.monospace.tr", "monospace");
 pref("font.size.fixed.tr", 12);
 
-pref("font.name.serif.x-central-euro", "serif");
-pref("font.name.sans-serif.x-central-euro", "sans-serif");
-pref("font.name.monospace.x-central-euro", "monospace");
-pref("font.size.fixed.x-central-euro", 12);
-
 pref("font.name.serif.x-cyrillic", "serif");
 pref("font.name.sans-serif.x-cyrillic", "sans-serif");
 pref("font.name.monospace.x-cyrillic", "monospace");
 pref("font.size.fixed.x-cyrillic", 12);
 
 pref("font.name.serif.x-unicode", "serif");
 pref("font.name.sans-serif.x-unicode", "sans-serif");
 pref("font.name.monospace.x-unicode", "monospace");