summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-07-08 22:14:59 +0200
committerGitHub <noreply@github.com>2018-07-08 22:14:59 +0200
commitaccd3f8c073f221ec0c7cde3c15007f2c9a13843 (patch)
tree795c699a90f66db177cec57874f9aad10bc0adf6
parentcf06d0d055d658c13bfd488654694a6f8067c30a (diff)
parent85b31d3ea83ab63716837e7895062fc7af50a111 (diff)
downloadUXP-accd3f8c073f221ec0c7cde3c15007f2c9a13843.tar
UXP-accd3f8c073f221ec0c7cde3c15007f2c9a13843.tar.gz
UXP-accd3f8c073f221ec0c7cde3c15007f2c9a13843.tar.lz
UXP-accd3f8c073f221ec0c7cde3c15007f2c9a13843.tar.xz
UXP-accd3f8c073f221ec0c7cde3c15007f2c9a13843.zip
Merge pull request #612 from janekptacijarabaci/firefox_name_1
Rename some remaining strings "firefox[-branding].js" to "basilisk[-branding].js" (or [application name].js)
-rw-r--r--.eslintignore2
-rw-r--r--services/sync/services-sync.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/.eslintignore b/.eslintignore
index 0588cbb7c..6abbfe529 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -57,7 +57,7 @@ b2g/locales/en-US/b2g-l10n.js
# browser/ exclusions
browser/app/**
-browser/branding/**/firefox-branding.js
+browser/branding/**/basilisk-branding.js
browser/base/content/browser-social.js
browser/base/content/nsContextMenu.js
browser/base/content/sanitizeDialog.js
diff --git a/services/sync/services-sync.js b/services/sync/services-sync.js
index ebac4412b..9473d9a9d 100644
--- a/services/sync/services-sync.js
+++ b/services/sync/services-sync.js
@@ -81,7 +81,7 @@ pref("services.sync.fxa.privacyURL", "https://accounts.firefox.com/legal/privacy
pref("services.sync.telemetry.submissionInterval", 43200); // 12 hours in seconds
pref("services.sync.telemetry.maxPayloadCount", 500);
-// Note that services.sync.validation.enabled is located in browser/app/profile/firefox.js
+// Note that services.sync.validation.enabled is located in application/[application name]/app/profile/[application name].js
// We consider validation this frequently. After considering validation, even
// if we don't end up validating, we won't try again unless this much time has passed.