diff --git a/mozilla/modules/libpref/src/nsPrefBranch.cpp b/mozilla/modules/libpref/src/nsPrefBranch.cpp
index 965ffc66025..4d14775f348 100644
--- a/mozilla/modules/libpref/src/nsPrefBranch.cpp
+++ b/mozilla/modules/libpref/src/nsPrefBranch.cpp
@@ -623,7 +623,7 @@ nsresult nsPrefBranch::GetDefaultFromPropertiesFile(const char *aPrefName, PRUni
     return rv;
 
   nsCOMPtr<nsIStringBundle> bundle;
-  rv = bundleService->CreateBundle(propertyFileURL, nsnull,
+  rv = bundleService->CreateBundle(propertyFileURL,
                                    getter_AddRefs(bundle));
   if (NS_FAILED(rv))
     return rv;
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index e25aa2bdda8..8e864f33d5a 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -68,7 +68,6 @@
 #include "nsIWindowWatcher.h"
 #include "nsHashtable.h"
 
-#include "nsILocale.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptGlobalObjectOwner.h"
 #include "nsIPrincipal.h"
@@ -215,7 +214,6 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
   nsCOMPtr<nsIStringBundle> regionalBundle;
   nsCOMPtr<nsIURI> uri;
   char *spec = nsnull;
-  nsILocale* locale = nsnull;
   PRBool displayDialogPrefValue = PR_FALSE, checkboxState = PR_FALSE;
 
   if (!prefs || !prompt || !io || !strings) {
@@ -233,11 +231,11 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
   
   // Taken from mozilla\extensions\wallet\src\wallet.cpp
   // WalletLocalize().
-  rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
+  rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, getter_AddRefs(bundle));
   if (NS_FAILED(rv)) {
     return;
   }
-  rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale, 
+  rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, 
                              getter_AddRefs(regionalBundle));
   if (NS_FAILED(rv)) {
     return;
@@ -3301,7 +3299,6 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
     if (nsnull == pluginTag->mLibrary)		// if we haven't done this yet
     {
       nsFileSpec file(pluginTag->mFileName);
-
       nsPluginFile pluginFile(file);
       PRLibrary* pluginLibrary = NULL;
 
@@ -4478,7 +4475,6 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
   nsCOMPtr<nsIStringBundle> bundle;
   nsCOMPtr<nsIURI> uri;
   char *spec = nsnull;
-  nsILocale* locale = nsnull;
 
   PRInt32 buttonPressed;
   PRBool checkboxState = PR_FALSE;
@@ -4494,7 +4490,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
     return rv;
   }
 
-  rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
+  rv = strings->CreateBundle(spec, getter_AddRefs(bundle));
   nsCRT::free(spec);
   if (NS_FAILED(rv))
     return rv;
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index e25aa2bdda8..8e864f33d5a 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -68,7 +68,6 @@
 #include "nsIWindowWatcher.h"
 #include "nsHashtable.h"
 
-#include "nsILocale.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptGlobalObjectOwner.h"
 #include "nsIPrincipal.h"
@@ -215,7 +214,6 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
   nsCOMPtr<nsIStringBundle> regionalBundle;
   nsCOMPtr<nsIURI> uri;
   char *spec = nsnull;
-  nsILocale* locale = nsnull;
   PRBool displayDialogPrefValue = PR_FALSE, checkboxState = PR_FALSE;
 
   if (!prefs || !prompt || !io || !strings) {
@@ -233,11 +231,11 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
   
   // Taken from mozilla\extensions\wallet\src\wallet.cpp
   // WalletLocalize().
-  rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
+  rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, getter_AddRefs(bundle));
   if (NS_FAILED(rv)) {
     return;
   }
-  rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale, 
+  rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, 
                              getter_AddRefs(regionalBundle));
   if (NS_FAILED(rv)) {
     return;
@@ -3301,7 +3299,6 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
     if (nsnull == pluginTag->mLibrary)		// if we haven't done this yet
     {
       nsFileSpec file(pluginTag->mFileName);
-
       nsPluginFile pluginFile(file);
       PRLibrary* pluginLibrary = NULL;
 
@@ -4478,7 +4475,6 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
   nsCOMPtr<nsIStringBundle> bundle;
   nsCOMPtr<nsIURI> uri;
   char *spec = nsnull;
-  nsILocale* locale = nsnull;
 
   PRInt32 buttonPressed;
   PRBool checkboxState = PR_FALSE;
@@ -4494,7 +4490,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
     return rv;
   }
 
-  rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
+  rv = strings->CreateBundle(spec, getter_AddRefs(bundle));
   nsCRT::free(spec);
   if (NS_FAILED(rv))
     return rv;
diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp
index d7809dfc99c..a6eac3bba0f 100644
--- a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp
+++ b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp
@@ -2056,7 +2056,7 @@ nsPrefMigration::DetermineOldPath(nsIFileSpec *profilePath, const char *oldPathN
 	if (NS_FAILED(rv)) return rv;
 
     nsCOMPtr<nsIStringBundle> bundle;
-    rv = bundleService->CreateBundle(MIGRATION_PROPERTIES_URL, nsnull, getter_AddRefs(bundle));
+    rv = bundleService->CreateBundle(MIGRATION_PROPERTIES_URL, getter_AddRefs(bundle));
 	if (NS_FAILED(rv)) return rv;
 
 	nsXPIDLString localizedDirName;