Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

5 files changed, 48 insertions, 0 deletions

diff --git a/application/basilisk/branding/unofficial/locales/browserconfig.properties b/application/basilisk/branding/unofficial/locales/browserconfig.properties
new file mode 100644
index 000000000..06cefece3
--- /dev/null
+++ b/application/basilisk/branding/unofficial/locales/browserconfig.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Do NOT localize or otherwise change these values
+browser.startup.homepage=about:home
diff --git a/application/basilisk/branding/unofficial/locales/en-US/brand.dtd b/application/basilisk/branding/unofficial/locales/en-US/brand.dtd
new file mode 100644
index 000000000..17c243606
--- /dev/null
+++ b/application/basilisk/branding/unofficial/locales/en-US/brand.dtd
@@ -0,0 +1,10 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY  brandShorterName      "Serpent">
+<!ENTITY  brandShortName        "Serpent">
+<!ENTITY  brandFullName         "Serpent">
+<!ENTITY  vendorShortName       "Moonchild">
+<!ENTITY  vendorFullName        "Moonchild Productions">
+<!ENTITY  trademarkInfo.part1   " ">
diff --git a/application/basilisk/branding/unofficial/locales/en-US/brand.properties b/application/basilisk/branding/unofficial/locales/en-US/brand.properties
new file mode 100644
index 000000000..80349f0e3
--- /dev/null
+++ b/application/basilisk/branding/unofficial/locales/en-US/brand.properties
@@ -0,0 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShorterName=Serpent
+brandShortName=Serpent
+brandFullName=Serpent
+vendorShortName=Moonchild
+vendorFullName=Moonchild Productions
+
+syncBrandShortName=Sync
diff --git a/application/basilisk/branding/unofficial/locales/jar.mn b/application/basilisk/branding/unofficial/locales/jar.mn
new file mode 100644
index 000000000..8515d5cc0
--- /dev/null
+++ b/application/basilisk/branding/unofficial/locales/jar.mn
@@ -0,0 +1,12 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Unofficial branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+  locale/branding/brand.properties (en-US/brand.properties)
+  locale/branding/browserconfig.properties
diff --git a/application/basilisk/branding/unofficial/locales/moz.build b/application/basilisk/branding/unofficial/locales/moz.build
new file mode 100644
index 000000000..8bad13124
--- /dev/null
+++ b/application/basilisk/branding/unofficial/locales/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
+
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file