Moving charsetTitles.properties from Res to Chrome.

intl/uconv/src/Makefile.in

@@ -54,11 +54,14 @@ CPPSRCS		= \
 
 EXPORT_RESOURCE	= \
 		$(srcdir)/charsetalias.properties \
-		$(srcdir)/charsetTitles.properties \
 		$(srcdir)/charsetData.properties \
         	$(srcdir)/acceptlanguage.properties \
 		$(NULL)
 
+EXPORT_LOCALE	= \
+		$(srcdir)/charsetTitles.properties \
+		$(NULL)
+
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS			+= nsOS2Charset.cpp
 EXPORT_RESOURCE		+= $(srcdir)/os2charset.properties
@@ -93,4 +96,4 @@ endif
 
 install::
 	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
-
+	$(INSTALL) $(EXPORT_LOCALE) $(DIST)/bin/chrome/global/locale

intl/uconv/src/makefile.win

@@ -96,7 +96,7 @@ install:: $(DLL)
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
 	$(MAKE_INSTALL) .\charsetalias.properties $(DIST)\bin\res
 	$(MAKE_INSTALL) .\wincharset.properties $(DIST)\bin\res
-	$(MAKE_INSTALL) charsetTitles.properties $(DIST)\bin\res
+	$(MAKE_INSTALL) charsetTitles.properties $(DIST)\bin\chrome\global\locale
 	$(MAKE_INSTALL) charsetData.properties $(DIST)\bin\res
     $(MAKE_INSTALL) .\acceptlanguage.properties $(DIST)\bin\res
 
@@ -105,7 +105,7 @@ clobber::
 	rm -f $(DIST)\lib\$(DLLNAME).lib
 	rm -f $(DIST)\bin\res\charsetalias.properties
 	rm -f $(DIST)\bin\res\wincharset.properties
-	rm -f $(DIST)\bin\res\charsetTitles.properties
+	rm -f $(DIST)\bin\chrome\global\locale\charsetTitles.properties
 	rm -f $(DIST)\bin\res\charsetData.properties
     rm -f $(DIST)\bin\res\acceptlanguage.properties
     

intl/uconv/src/nsCharsetConverterManager.cpp

@@ -218,7 +218,7 @@ nsresult nsCharsetConverterManager::RegisterConverterTitles(
   res = aRegistry->AddSubtree(nsIRegistry::Common, p, &key);
   nsAllocator::Free(p);
   if (NS_FAILED(res)) return res;
-  res = aRegistry->SetStringUTF8(key, "name", "resource:/res/charsetTitles.properties");
+  res = aRegistry->SetStringUTF8(key, "name", "chrome://global/locale/charsetTitles.properties");
   if (NS_FAILED(res)) return res;
 
   return NS_OK;