*** empty log message ***

intl/uconv/src/nsCharsetMenu.cpp

@@ -854,12 +854,12 @@ nsresult nsCharsetMenu::AddFromPrefsToMenu(
 {
   nsresult res = NS_OK;
 
-  char * value = NULL;
-  res = aPref->CopyCharPref(aKey, &value);
+  PRUnichar * value = NULL;
+  res = aPref->GetLocalizedUnicharPref(aKey, &value);
   if (NS_FAILED(res)) return res;
 
   if (value != NULL) {
-    res = AddFromStringToMenu(value, aRDFServ, aCCMan, aArray, aContainer, 
+    res = AddFromStringToMenu(NS_ConvertUCS2toUTF8(value), aRDFServ, aCCMan, aArray, aContainer, 
       aDecs, aIDPrefix);
     nsMemory::Free(value);
   }

modules/libpref/src/init/all.js

@@ -304,8 +304,8 @@ pref("intl.accept_languages",               "chrome://navigator/locale/navigator
 pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
 pref("intl.collationKeyAsCodePoint",        false);
 
-pref("intl.charsetmenu.browser.static",    "iso-8859-1");
-pref("intl.charsetmenu.mailedit",          "iso-8859-1, iso-8859-15, armscii-8, iso-8859-4, iso-8859-14, iso-8859-2, gb2312, big5, koi8-r, windows-1251, koi8-u, iso-8859-7, iso-2022-jp, euc-kr, iso-8859-10, iso-8859-3, tis-620, iso-8859-9, utf-8, viscii");
+pref("intl.charsetmenu.browser.static",     "chrome://navigator/locale/navigator.properties");
+pref("intl.charsetmenu.mailedit",           "chrome://navigator/locale/navigator.properties");
 pref("intl.charsetmenu.cache",             "");
 pref("intl.charset.detector",              "");
 

xpfe/components/prefwindow/resources/content/pref-charset.js

@@ -43,7 +43,7 @@ function Init()
       }
 
       dump("*** " + pref_string_title +  " \n");
-      pref_string_content = prefInt.CopyCharPref(pref_string_title);
+      pref_string_content = prefInt.getLocalizedUnicharPref(pref_string_title);
       
       AddRemoveLatin1('add');
 			dump("*** Charset PrefString: " + pref_string_content + "\n");