Rename firefox* preference files to palemoon* preference files

10 files changed, 9 insertions, 9 deletions

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 52e85d1c0..580fcb164 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -50,7 +50,7 @@ libs::
 	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
-GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, firefox.js)
+GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, palemoon.js)
 
 endif
 
diff --git a/browser/app/moz.build b/browser/app/moz.build
index 8ab6299e2..929139a6a 100644
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -13,7 +13,7 @@ else:
     GoannaProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
 
 JS_PREFERENCE_FILES += [
-    'profile/firefox.js',
+    'profile/palemoon.js',
 ]
 
 if CONFIG['LIBXUL_SDK']:
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/palemoon.js
index d5f305496..e42d430f8 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/palemoon.js
@@ -86,7 +86,7 @@ pref("app.update.timerMinimumDelay", 120);
 // App-specific update preferences
 
 // The interval to check for updates (app.update.interval) is defined in
-// firefox-branding.js
+// palemoon-branding.js
 
 // Alternative windowtype for an application update user interface window. When
 // a window with this windowtype is open the application update service won't
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/palemoon-branding.js
index 80bd9a797..80bd9a797 100644
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/palemoon-branding.js
diff --git a/browser/branding/shared/branding.mozbuild b/browser/branding/shared/branding.mozbuild
index 7c0c2a30c..e4f5e7414 100644
--- a/browser/branding/shared/branding.mozbuild
+++ b/browser/branding/shared/branding.mozbuild
@@ -10,7 +10,7 @@ DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
 
 JS_PREFERENCE_FILES += [
-    'pref/firefox-branding.js',
+    'pref/palemoon-branding.js',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff --git a/browser/branding/unofficial/pref/firefox-branding.js b/browser/branding/unofficial/pref/palemoon-branding.js
index ae700635b..ae700635b 100644
--- a/browser/branding/unofficial/pref/firefox-branding.js
+++ b/browser/branding/unofficial/pref/palemoon-branding.js
diff --git a/browser/branding/unstable/pref/firefox-branding.js b/browser/branding/unstable/pref/palemoon-branding.js
index 4bef704de..4bef704de 100644
--- a/browser/branding/unstable/pref/firefox-branding.js
+++ b/browser/branding/unstable/pref/palemoon-branding.js
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index a64d62aa5..0d89db68d 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -52,7 +52,7 @@
 @RESPATH@/browser/defaults/profile/mimeTypes.rdf
 @RESPATH@/dictionaries/*
 @RESPATH@/hyphenation/*
-@RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
+@RESPATH@/browser/@PREF_DIR@/palemoon-l10n.js
 @RESPATH@/browser/searchplugins/*
 #ifdef XP_WIN32
 @RESPATH@/uninstall/helper.exe
@@ -685,8 +685,8 @@
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
-@RESPATH@/browser/@PREF_DIR@/firefox.js
-@RESPATH@/browser/@PREF_DIR@/firefox-branding.js
+@RESPATH@/browser/@PREF_DIR@/palemoon.js
+@RESPATH@/browser/@PREF_DIR@/palemoon-branding.js
 @RESPATH@/greprefs.js
 @RESPATH@/defaults/autoconfig/platform.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 29686ca88..6ba98d872 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -37,7 +37,7 @@ RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@palemoon.org
 
-L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,firefox-l10n.js)
+L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,palemoon-l10n.js)
 L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR)
 L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warnings
 PP_TARGETS += L10N_PREF_JS_EXPORTS
@@ -156,7 +156,7 @@ clobber-zip:
 	  $(STAGEDIST)/chrome/$(AB_CD).manifest \
 	  $(STAGEDIST)/webapprt/chrome/$(AB_CD).jar \
 	  $(STAGEDIST)/webapprt/chrome/$(AB_CD).manifest \
-	  $(STAGEDIST)/$(PREF_DIR)/firefox-l10n.js
+	  $(STAGEDIST)/$(PREF_DIR)/palemoon-l10n.js
 	$(RM) -rf  $(STAGEDIST)/searchplugins \
 	  $(STAGEDIST)/dictionaries \
 	  $(STAGEDIST)/hyphenation \
diff --git a/browser/locales/en-US/firefox-l10n.js b/browser/locales/en-US/palemoon-l10n.js
index 642ad6534..642ad6534 100644
--- a/browser/locales/en-US/firefox-l10n.js
+++ b/browser/locales/en-US/palemoon-l10n.js