diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/thumbnails/BackgroundPageThumbs.jsm | 7 | ||||
| -rw-r--r-- | toolkit/content/aboutRights.xhtml | 4 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 2 | ||||
| -rw-r--r-- | toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm index fded51cea..bd52e77e9 100644 --- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm +++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm @@ -468,7 +468,12 @@ Capture.prototype = { }; if (!data) { - done(); + // If this background attempt failed, cause a dummy file to be saved, so + // that gets loaded instead of attempting again (and again). + // XXX: Perhaps we can create a placeholder image to use instead of "null" + // here, so it has something to show to the user? + PageThumbs._store(this.url, this.url, null, true) + .then(done, done); return; } diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml index 0d42e6fad..cdd94e13c 100644 --- a/toolkit/content/aboutRights.xhtml +++ b/toolkit/content/aboutRights.xhtml @@ -32,9 +32,9 @@ <!-- Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded. - Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace) - Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace) --> - <li>&rights.intro-point2-a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li> + <li>&rights.intro-point2-a;<a href="http://www.palemoon.org/branding.shtml">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li> <li>&rights.intro-point2.5;</li> - <li>&rights2.intro-point3a;<a href="https://www.mozilla.org/legal/privacy/firefox.html">&rights2.intro-point3b;</a>&rights.intro-point3c;</li> + <li>&rights2.intro-point3a;<a href="http://www.palemoon.org/privacy.shtml">&rights2.intro-point3b;</a>&rights.intro-point3c;</li> <li>&rights2.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li> <li>&rights.intro-point5;</li> </ul> diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 0c0f9494a..e1d432cb3 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -12,7 +12,7 @@ toolkit.jar: content/global/about.xhtml content/global/aboutAbout.js content/global/aboutAbout.xhtml -#ifdef MC_OFFICIAL +#ifdef MOZ_OFFICIAL_BRANDING * content/global/aboutRights.xhtml #else * content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties index 9d976e0e3..370198f56 100644 --- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties +++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties @@ -169,7 +169,7 @@ cmd.purchaseAddon.accesskey=u eulaHeader=%S requires that you accept the following End User License Agreement before installation can proceed: type.extension.name=Extensions -type.theme.name=Appearance +type.theme.name=Themes type.locale.name=Languages type.plugin.name=Plugins type.dictionary.name=Dictionaries |