summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/branding/Makefile.in2
-rw-r--r--src/branding/firefox-branding.js1
-rw-r--r--src/branding/locales/en-US/brand.dtd1
-rw-r--r--src/branding/locales/en-US/brand.ftl2
-rw-r--r--src/branding/locales/en-US/brand.properties2
5 files changed, 5 insertions, 3 deletions
diff --git a/src/branding/Makefile.in b/src/branding/Makefile.in
index b395c62..deed5a6 100644
--- a/src/branding/Makefile.in
+++ b/src/branding/Makefile.in
@@ -20,7 +20,7 @@ GARBAGE += $(BROWSER_APP_FILES)
export:: $(BROWSER_APP_FILES)
$(NSINSTALL) -D $(DIST)/branding
- cp $(BROWSER_APP_FILES) $(DIST)/branding/
+ cp $^ $(DIST)/branding/
GARBAGE += iceweasel.png
diff --git a/src/branding/firefox-branding.js b/src/branding/firefox-branding.js
index 17cf43e..e92356e 100644
--- a/src/branding/firefox-branding.js
+++ b/src/branding/firefox-branding.js
@@ -1,4 +1,3 @@
-lockPref("browser.startup.homepage_override.mstone", "ignore");
pref("browser.aboutHomeSnippets.updateUrl", "data:text/html,");
pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
diff --git a/src/branding/locales/en-US/brand.dtd b/src/branding/locales/en-US/brand.dtd
index 50c20d6..c83e6d0 100644
--- a/src/branding/locales/en-US/brand.dtd
+++ b/src/branding/locales/en-US/brand.dtd
@@ -3,4 +3,3 @@
<!ENTITY brandFullName "Iceweasel">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY trademarkInfo.part1 " ">
-<!ENTITY trademarkInfo.part2 " ">
diff --git a/src/branding/locales/en-US/brand.ftl b/src/branding/locales/en-US/brand.ftl
new file mode 100644
index 0000000..ca180e0
--- /dev/null
+++ b/src/branding/locales/en-US/brand.ftl
@@ -0,0 +1,2 @@
+-brand-short-name = Iceweasel
+-vendor-short-name = Mozilla
diff --git a/src/branding/locales/en-US/brand.properties b/src/branding/locales/en-US/brand.properties
index b69ae8d..ea073d6 100644
--- a/src/branding/locales/en-US/brand.properties
+++ b/src/branding/locales/en-US/brand.properties
@@ -2,3 +2,5 @@ brandShorterName=Iceweasel
brandShortName=Iceweasel
brandFullName=Iceweasel
vendorShortName=Mozilla
+
+syncBrandShortName=Sync