Bug 1140720 - Port Bug 756022: Unify pref font choices for various Latin script-using languages. r=mkmelin, a=rkent
authoraleth <aleth@instantbird.org>
Wed, 18 Mar 2015 01:29:56 +0100
changeset 25810 db9997946ebd2313ab29b2db01e778e7a306cafe
parent 25809 baeed39cdc3c718ecd4c48015354e6aba77398dd
child 25811 1b465328e1a39b17d87cf215accc3662af5c25cc
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, rkent
bugs1140720, 756022
Bug 1140720 - Port Bug 756022: Unify pref font choices for various Latin script-using languages. r=mkmelin, a=rkent
im/app/profile/all-instantbird.js
mail/app/profile/all-thunderbird.js
mail/base/modules/mailMigrator.js
mail/components/preferences/fonts.xul
mail/locales/en-US/chrome/messenger/preferences/fonts.dtd
mailnews/intl/charsetData.properties
--- a/im/app/profile/all-instantbird.js
+++ b/im/app/profile/all-instantbird.js
@@ -76,27 +76,24 @@ pref("messenger.options.playSounds.alert
 // enabled then the more specific prefs are checked as well.
 pref("messenger.options.playSounds.blist", false);
 // Specifies whether sounds should be played on login/logout events.
 pref("messenger.options.playSounds.login", true);
 pref("messenger.options.playSounds.logout", true);
 
 pref("font.default.x-western", "sans-serif");
 pref("font.default.x-unicode", "sans-serif");
-pref("font.default.x-central-euro", "sans-serif");
 pref("font.default.x-cyrillic", "sans-serif");
 #ifdef XP_MACOSX
 pref("font.name.sans-serif.x-unicode", "Lucida Grande");
 pref("font.name.sans-serif.x-western", "Lucida Grande");
-pref("font.name.sans-serif.x-central-euro", "Lucida Grande");
 pref("font.name.sans-serif.x-cyrillic", "Lucida Grande");
 #endif
 pref("font.size.variable.x-western", 13);
 pref("font.size.variable.x-unicode", 13);
-pref("font.size.variable.x-central-euro", 13);
 pref("font.size.variable.x-cyrillic", 13);
 
 pref("messenger.proxies", "");
 pref("messenger.globalProxy", "none");
 pref("messenger.warnOnQuit", true);
 
 #ifdef XP_WIN
 pref("browser.preferences.instantApply", false);
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -557,71 +557,47 @@ pref("mailnews.migration.header_addons_u
 
 // Serif fonts look dated.  Switching those language families to sans-serif
 // where we think it makes sense.  Worth investigating for other font families
 // as well, viz bug 520824.  See all.js for the rest of the font families
 // preferences.
 pref("font.default", "sans-serif");
 pref("font.default.x-unicode", "sans-serif");
 pref("font.default.x-western", "sans-serif");
-pref("font.default.x-central-euro", "sans-serif");
 pref("font.default.x-cyrillic", "sans-serif");
-pref("font.default.x-baltic", "sans-serif");
 pref("font.default.el", "sans-serif");
-pref("font.default.tr", "sans-serif");
 
 #ifdef XP_MACOSX
 pref("font.name.sans-serif.x-unicode", "Lucida Grande");
 pref("font.name.monospace.x-unicode", "Menlo");
 pref("font.name-list.sans-serif.x-unicode", "Lucida Grande");
 pref("font.name-list.monospace.x-unicode", "Menlo, Monaco");
 pref("font.size.variable.x-unicode", 15);
 pref("font.size.fixed.x-unicode", 12);
 
 pref("font.name.sans-serif.x-western", "Lucida Grande");
 pref("font.name.monospace.x-western", "Menlo");
 pref("font.name-list.sans-serif.x-western", "Lucida Grande");
 pref("font.name-list.monospace.x-western", "Menlo, Monaco");
 pref("font.size.variable.x-western", 15);
 pref("font.size.fixed.x-western", 12);
 
-pref("font.name.sans-serif.x-central-euro", "Lucida Grande");
-pref("font.name.monospace.x-central-euro", "Menlo");
-pref("font.name-list.sans-serif.x-central-euro", "Lucida Grande");
-pref("font.name-list.monospace.x-central-euro", "Menlo, Monaco");
-pref("font.size.variable.x-central-euro", 15);
-pref("font.size.fixed.x-central-euro", 12);
-
 pref("font.name.sans-serif.x-cyrillic", "Lucida Grande");
 pref("font.name.monospace.x-cyrillic", "Menlo");
 pref("font.name-list.sans-serif.x-cyrillic", "Lucida Grande");
 pref("font.name-list.monospace.x-cyrillic", "Menlo, Monaco");
 pref("font.size.variable.x-cyrillic", 15);
 pref("font.size.fixed.x-cyrillic", 12);
 
-pref("font.name.sans-serif.x-baltic", "Lucida Grande");
-pref("font.name.monospace.x-baltic", "Menlo");
-pref("font.name-list.sans-serif.x-baltic", "Lucida Grande");
-pref("font.name-list.monospace.x-baltic", "Menlo, Monaco");
-pref("font.size.variable.x-baltic", 15);
-pref("font.size.fixed.x-baltic", 12);
-
 pref("font.name.sans-serif.el", "Lucida Grande");
 pref("font.name.monospace.el", "Menlo");
 pref("font.name-list.sans-serif.el", "Lucida Grande");
 pref("font.name-list.monospace.el", "Menlo, Monaco");
 pref("font.size.variable.el", 15);
 pref("font.size.fixed.el", 12);
-
-pref("font.name.sans-serif.tr", "Lucida Grande");
-pref("font.name.monospace.tr", "Menlo");
-pref("font.name-list.sans-serif.tr", "Lucida Grande");
-pref("font.name-list.monospace.tr", "Menlo, Monaco");
-pref("font.size.variable.tr", 15);
-pref("font.size.fixed.tr", 12);
 #endif
 
 // Since different versions of Windows need different settings, we'll handle
 // this in mailMigrator.js.
 
 // Linux, in other words.  Other OSes may wish to override.
 #ifdef UNIX_BUT_NOT_MAC
 // The font.name-list fallback is defined in case font.name isn't
@@ -630,35 +606,23 @@ pref("font.size.fixed.tr", 12);
 pref("font.name-list.serif.x-unicode", "serif");
 pref("font.name-list.sans-serif.x-unicode", "sans-serif");
 pref("font.name-list.monospace.x-unicode", "monospace");
 
 pref("font.name-list.serif.x-western", "serif");
 pref("font.name-list.sans-serif.x-western", "sans-serif");
 pref("font.name-list.monospace.x-western", "monospace");
 
-pref("font.name-list.serif.x-central-euro", "serif");
-pref("font.name-list.sans-serif.x-central-euro", "sans-serif");
-pref("font.name-list.monospace.x-central-euro", "monospace");
-
 pref("font.name-list.serif.x-cyrillic", "serif");
 pref("font.name-list.sans-serif.x-cyrillic", "sans-serif");
 pref("font.name-list.monospace.x-cyrillic", "monospace");
 
-pref("font.name-list.serif.x-baltic", "serif");
-pref("font.name-list.sans-serif.x-baltic", "sans-serif");
-pref("font.name-list.monospace.x-baltic", "monospace");
-
 pref("font.name-list.serif.el", "serif");
 pref("font.name-list.sans-serif.el", "sans-serif");
 pref("font.name-list.monospace.el", "monospace");
-
-pref("font.name-list.serif.tr", "serif");
-pref("font.name-list.sans-serif.tr", "sans-serif");
-pref("font.name-list.monospace.tr", "monospace");
 #endif
 
 pref("mail.font.windows.version", 0);
 
 // What level of warning should we send to the error console?
 pref("mail.wizard.logging.console", "None");
 // What level of warning should we send to stdout via dump?
 pref("mail.wizard.logging.dump", "None");
--- a/mail/base/modules/mailMigrator.js
+++ b/mail/base/modules/mailMigrator.js
@@ -76,17 +76,17 @@ var MailMigrator = {
             fixedSize: 14,
           };
           // Encodings to switch to the new fonts.
           let encodings = [];
           // (Thunderbird 3.1)
           if (fontPrefVersion < 1)
             encodings.push("x-unicode", "x-western");
           // (Thunderbird 3.2)
-          encodings.push("x-central-euro", "x-cyrillic", "x-baltic", "el", "tr");
+          encodings.push("x-cyrillic", "el");
 
           this._switchDefaultFonts(fonts, encodings);
 
           Services.prefs.setIntPref("mail.font.windows.version", 2);
         }
       }
     }
   },
--- a/mail/components/preferences/fonts.xul
+++ b/mail/components/preferences/fonts.xul
@@ -26,17 +26,16 @@
             class="largeDialogContainer">
 
     <preferences id="fontPreferences">
       <preference id="font.language.group"  name="font.language.group"  type="wstring"/>
       <preference id="mail.fixed_width_messages" name="mail.fixed_width_messages" type="bool"/>
       <preference id="browser.display.use_document_fonts"
                   name="browser.display.use_document_fonts"
                   type="int"/>
-      <preference id="intl.charset.default" name="intl.charset.default" type="wstring"/>
       <preference id="mailnews.send_default_charset" name="mailnews.send_default_charset" type="wstring"/>
       <preference id="mailnews.view_default_charset" name="mailnews.view_default_charset" type="wstring"/>
       <preference id="mailnews.reply_in_default_charset" name="mailnews.reply_in_default_charset" type="bool"/>
     </preferences>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
     <script type="application/javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
     <script type="application/javascript" src="chrome://messenger/content/preferences/fonts.js"/>
@@ -45,43 +44,44 @@
       <caption>
         <hbox align="center">
           <label value="&language.label;" accesskey="&language.accesskey;"
                  control="selectLangs"/>
         </hbox>
         <menulist id="selectLangs" onsyncfrompreference="return gFontsDialog.readFontLanguageGroup();"
                   preference="font.language.group">
           <menupopup>
-            <menuitem value="x-unicode" label="&font.langGroup.unicode1;"/>
-            <menuitem value="x-western" label="&font.langGroup.latin1;"/>
-            <menuitem value="x-central-euro" label="&font.langGroup.latin2;"/>
-            <menuitem value="ja" label="&font.langGroup.japanese;"/>
-            <menuitem value="zh-TW" label="&font.langGroup.trad-chinese;"/>
-            <menuitem value="zh-CN" label="&font.langGroup.simpl-chinese;"/>
-            <menuitem value="zh-HK" label="&font.langGroup.trad-chinese-hk;"/>
-            <menuitem value="ko" label="&font.langGroup.korean;"/>
-            <menuitem value="x-cyrillic" label="&font.langGroup.cyrillic;"/>
-            <menuitem value="x-baltic" label="&font.langGroup.baltic;"/>
-            <menuitem value="el" label="&font.langGroup.el;"/>
-            <menuitem value="tr" label="&font.langGroup.turkish;"/>
-            <menuitem value="th" label="&font.langGroup.thai;"/>
-            <menuitem value="he" label="&font.langGroup.hebrew;"/>
-            <menuitem value="ar" label="&font.langGroup.arabic;"/>
-            <menuitem value="x-devanagari" label="&font.langGroup.devanagari;"/>
-            <menuitem value="x-tamil" label="&font.langGroup.tamil;"/>
-            <menuitem value="x-armn" label="&font.langGroup.armenian;"/>
-            <menuitem value="x-beng" label="&font.langGroup.bengali;"/>
-            <menuitem value="x-ethi" label="&font.langGroup.ethiopic;"/>
-            <menuitem value="x-geor" label="&font.langGroup.georgian;"/>
-            <menuitem value="x-gujr" label="&font.langGroup.gujarati;"/>
-            <menuitem value="x-guru" label="&font.langGroup.gurmukhi;"/>
-            <menuitem value="x-khmr" label="&font.langGroup.khmer;"/>
-            <menuitem value="x-mlym" label="&font.langGroup.malayalam;"/>
-            <menuitem value="x-cans" label="&font.langGroup.canadian;"/>
-            <menuitem value="x-user-def" label="&font.langGroup.user-def;"/>
+            <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="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;"/>
+            <menuitem value="x-gujr"          label="&font.langGroup.gujarati;"/>
+            <menuitem value="x-guru"          label="&font.langGroup.gurmukhi;"/>
+            <menuitem value="he"              label="&font.langGroup.hebrew;"/>
+            <menuitem value="ja"              label="&font.langGroup.japanese;"/>
+            <menuitem value="x-knda"          label="&font.langGroup.kannada;"/>
+            <menuitem value="x-khmr"          label="&font.langGroup.khmer;"/>
+            <menuitem value="ko"              label="&font.langGroup.korean;"/>
+            <menuitem value="x-western"       label="&font.langGroup.latin;"/>
+            <menuitem value="x-mlym"          label="&font.langGroup.malayalam;"/>
+            <menuitem value="x-orya"          label="&font.langGroup.oriya;"/>
+            <menuitem value="x-sinh"          label="&font.langGroup.sinhala;"/>
+            <menuitem value="x-tamil"         label="&font.langGroup.tamil;"/>
+            <menuitem value="x-telu"          label="&font.langGroup.telugu;"/>
+            <menuitem value="th"              label="&font.langGroup.thai;"/>
+            <menuitem value="x-tibt"          label="&font.langGroup.tibetan;"/>
+            <menuitem value="x-cans"          label="&font.langGroup.canadian;"/>
+            <menuitem value="x-unicode"       label="&font.langGroup.other;"/>
           </menupopup>
         </menulist>
       </caption>
 
       <separator class="thin"/>
 
       <grid>
         <columns>
@@ -107,17 +107,17 @@
                 <menuitem value="serif" label="&useDefaultFontSerif.label;"/>
                 <menuitem value="sans-serif"
                           label="&useDefaultFontSansSerif.label;"/>
               </menupopup>
             </menulist>
 
             <hbox align="center" pack="end">
               <label value="&size.label;"
-                     accesskey="&proportionalSize.accesskey;"
+                     accesskey="&sizeProportional.accesskey;"
                      control="sizeVar"/>
             </hbox>
 
             <menulist id="sizeVar" class="small-margin">
               <menupopup>
                 <menuitem value="9" label="9"/>
                 <menuitem value="10" label="10"/>
                 <menuitem value="11" label="11"/>
@@ -167,17 +167,17 @@
           <row align="center">
             <hbox align="center" pack="end">
               <label accesskey="&monospace.accesskey;"
                      control="monospace">&monospace.label;</label>
             </hbox>
             <menulist id="monospace" flex="1" style="width: 0px;" crop="right"
                       onsyncfrompreference="return gFontsDialog.readFontSelection(document.getElementById('monospace'));"/>
             <hbox align="center" pack="end">
-              <label accesskey="&sizeMono.accesskey;"
+              <label accesskey="&sizeMonospace.accesskey;"
                      control="sizeMono">&size.label;</label>
             </hbox>
             <menulist id="sizeMono" class="small-margin">
               <menupopup>
                 <menuitem value="9" label="9"/>
                 <menuitem value="10" label="10"/>
                 <menuitem value="11" label="11"/>
                 <menuitem value="12" label="12"/>
@@ -226,16 +226,28 @@
               <menuitem value="14" label="14"/>
               <menuitem value="15" label="15"/>
               <menuitem value="16" label="16"/>
               <menuitem value="17" label="17"/>
               <menuitem value="18" label="18"/>
               <menuitem value="20" label="20"/>
               <menuitem value="22" label="22"/>
               <menuitem value="24" label="24"/>
+              <menuitem value="26" label="26"/>
+              <menuitem value="28" label="28"/>
+              <menuitem value="30" label="30"/>
+              <menuitem value="32" label="32"/>
+              <menuitem value="34" label="34"/>
+              <menuitem value="36" label="36"/>
+              <menuitem value="40" label="40"/>
+              <menuitem value="44" label="44"/>
+              <menuitem value="48" label="48"/>
+              <menuitem value="56" label="56"/>
+              <menuitem value="64" label="64"/>
+              <menuitem value="72" label="72"/>
             </menupopup>
           </menulist>
         </hbox>
       </hbox>
     </groupbox>
 
     <groupbox>
       <caption label="&fontControl.label;"/>
--- a/mail/locales/en-US/chrome/messenger/preferences/fonts.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/fonts.dtd
@@ -3,57 +3,59 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  fontsAndEncodingsDialog.title           "Fonts &amp; Encodings">
 
 <!ENTITY  language.label                          "Fonts for:">
 <!ENTITY  language.accesskey                      "t">
 
 <!ENTITY  size.label                              "Size:">
-<!ENTITY  proportionalSize.accesskey              "e">
-<!ENTITY  sizeMono.accesskey                      "i">
+<!ENTITY  sizeProportional.accesskey              "e">
+<!ENTITY  sizeMonospace.accesskey                 "i">
 
 <!ENTITY  proportional.label                      "Proportional:">
 <!ENTITY  proportional.accesskey                  "P">
 
 <!ENTITY  serif.label                             "Serif:">
-<!ENTITY  serif.accesskey                         "s">
+<!ENTITY  serif.accesskey                         "S">
 <!ENTITY  sans-serif.label                        "Sans-serif:">
 <!ENTITY  sans-serif.accesskey                    "n">
 <!ENTITY  monospace.label                         "Monospace:">
-<!ENTITY  monospace.accesskey                     "m">
+<!ENTITY  monospace.accesskey                     "M">
 
-<!ENTITY  font.langGroup.latin1                   "Western">
-<!ENTITY  font.langGroup.latin2                   "Central European">
+<!-- LOCALIZATION NOTE (font.langGroup.latin) :
+     Translate "Latin" as the name of Latin (Roman) script, not as the name of the Latin language. -->
+<!ENTITY  font.langGroup.latin                    "Latin">
 <!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.baltic                   "Baltic">
 <!ENTITY  font.langGroup.el                       "Greek">
-<!ENTITY  font.langGroup.turkish                  "Turkish">
-<!ENTITY  font.langGroup.unicode1                 "Unicode">
-<!ENTITY  font.langGroup.user-def                 "User Defined">
+<!ENTITY  font.langGroup.other                    "Other Writing Systems">
 <!ENTITY  font.langGroup.thai                     "Thai">
 <!ENTITY  font.langGroup.hebrew                   "Hebrew">
 <!ENTITY  font.langGroup.arabic                   "Arabic">
 <!ENTITY  font.langGroup.devanagari               "Devanagari">
 <!ENTITY  font.langGroup.tamil                    "Tamil">
 <!ENTITY  font.langGroup.armenian                 "Armenian">
 <!ENTITY  font.langGroup.bengali                  "Bengali">
 <!ENTITY  font.langGroup.canadian                 "Unified Canadian Syllabary">
 <!ENTITY  font.langGroup.ethiopic                 "Ethiopic">
 <!ENTITY  font.langGroup.georgian                 "Georgian">
 <!ENTITY  font.langGroup.gujarati                 "Gujarati">
 <!ENTITY  font.langGroup.gurmukhi                 "Gurmukhi">
 <!ENTITY  font.langGroup.khmer                    "Khmer">
 <!ENTITY  font.langGroup.malayalam                "Malayalam">
-
+<!ENTITY  font.langGroup.oriya                    "Oriya">
+<!ENTITY  font.langGroup.telugu                   "Telugu">
+<!ENTITY  font.langGroup.kannada                  "Kannada">
+<!ENTITY  font.langGroup.sinhala                  "Sinhala">
+<!ENTITY  font.langGroup.tibetan                  "Tibetan">
 <!-- Minimum font size -->
 <!ENTITY minSize.label                            "Minimum font size:">
 <!ENTITY minSize.accesskey                        "z">
 <!ENTITY minSize.none                             "None">
 
 <!-- default font type -->
 <!ENTITY  useDefaultFontSerif.label               "Serif">
 <!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
--- a/mailnews/intl/charsetData.properties
+++ b/mailnews/intl/charsetData.properties
@@ -21,26 +21,26 @@ x-mac-farsi.isInternal                  
 x-mac-hebrew.isInternal                 = true
 x-imap4-modified-utf7.isInternal        = true
 replacement.isInternal                  = true
 
 # XXX : todo: move to something based on BCP 47 (RFC 5646);
 # these should primarily specify script (and sometimes region),
 # but NOT language.
 # See also https://bugzilla.mozilla.org/show_bug.cgi?id=756022
-# e.g. x-western      -> *-Latn-155 (Western Europe)
-#      x-central-euro -> *-Latn-151 (Eastern Europe)
-#      x-baltic       -> *-Latn-154 (Northern Europe)
+# e.g. x-western      -> *-Latn-155 (Western Europe),
+#                        *-Latn-151 (Eastern Europe),
+#                        *-Latn-154 (Northern Europe),
+#                        *-Latn-TR
 #      x-cyrillic     -> *-Cyrl
 #      zh-TW          -> *-Hant-TW
 #      zh-HK          -> *-Hant-HK
 #      zh-CN          -> *-Hans
 #      ja             -> *-Jpan
 #      ko             -> *-Hang
-#      tr             -> *-Latn-TR
 #      he             -> *-Hebr
 #      ar             -> *-Arab
 # etc
 
 big5.LangGroup                     = zh-TW
 x-x-big5.LangGroup                 = zh-TW
 big5-hkscs.LangGroup               = zh-HK
 euc-jp.LangGroup                   = ja
@@ -54,21 +54,21 @@ hz-gb-2312.LangGroup               = zh-
 ibm866.LangGroup                   = x-cyrillic
 ibm1125.LangGroup                  = x-cyrillic
 ibm1131.LangGroup                  = x-cyrillic
 iso-2022-jp.LangGroup              = ja
 iso-8859-1.LangGroup               = x-western
 iso-8859-10.LangGroup              = x-western
 iso-8859-14.LangGroup              = x-western
 iso-8859-15.LangGroup              = x-western
-iso-8859-2.LangGroup               = x-central-euro
-iso-8859-16.LangGroup              = x-central-euro
+iso-8859-2.LangGroup               = x-western
+iso-8859-16.LangGroup              = x-western
 iso-8859-3.LangGroup               = x-western
-iso-8859-4.LangGroup               = x-baltic
-iso-8859-13.LangGroup              = x-baltic
+iso-8859-4.LangGroup               = x-western
+iso-8859-13.LangGroup              = x-western
 iso-8859-5.LangGroup               = x-cyrillic
 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
@@ -76,40 +76,40 @@ shift_jis.LangGroup                = ja
 windows-874.LangGroup              = th
 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
+windows-1250.LangGroup             = x-western
 windows-1251.LangGroup             = x-cyrillic
 windows-1252.LangGroup             = x-western
 windows-1253.LangGroup             = el
-windows-1254.LangGroup             = tr
+windows-1254.LangGroup             = x-western
 windows-1255.LangGroup             = he
 windows-1256.LangGroup             = ar
-windows-1257.LangGroup             = x-baltic
+windows-1257.LangGroup             = x-western
 windows-1258.LangGroup             = x-western
 gbk.LangGroup                      = zh-CN
 gb_2312-80.LangGroup               = zh-CN
-x-mac-ce.LangGroup                 = x-central-euro
-x-mac-croatian.LangGroup           = x-central-euro
+x-mac-ce.LangGroup                 = x-western
+x-mac-croatian.LangGroup           = x-western
 x-mac-cyrillic.LangGroup           = x-cyrillic
 x-mac-devanagari.LangGroup         = x-devanagari
 x-mac-farsi.LangGroup              = ar
 x-mac-greek.LangGroup              = el
 x-mac-gujarati.LangGroup           = x-gujr
 x-mac-gurmukhi.LangGroup           = x-guru
 x-mac-icelandic.LangGroup          = x-western
 macintosh.LangGroup                = x-western
-x-mac-turkish.LangGroup            = tr
+x-mac-turkish.LangGroup            = x-western
 x-mac-ukrainian.LangGroup          = x-cyrillic
-x-mac-romanian.LangGroup           = x-central-euro
+x-mac-romanian.LangGroup           = x-western
 x-user-defined.LangGroup           = x-unicode
 ks_c_5601-1987.LangGroup           = ko
 x-mac-hebrew.LangGroup             = he
 x-mac-arabic.LangGroup             = ar
 
 iso-2022-jp.isMultibyte     = true
 shift_jis.isMultibyte       = true
 euc-jp.isMultibyte          = true