Bug 1394462 - Update dnsNotFound error copy and illustration. r=nhnt11
MozReview-Commit-ID: KFp3JhkCDJJ
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -157,28 +157,33 @@
if (cssClass == "badStsCert") {
document.getElementById("badStsCertExplanation").removeAttribute("hidden");
}
}
function initPage() {
var err = getErrorCode();
// List of error pages with an illustration.
- let illustratedErrors = ["malformedURI"];
+ let illustratedErrors = ["malformedURI", "dnsNotFound"];
if (illustratedErrors.includes(err)) {
document.body.classList.add("illustrated", err);
}
gIsCertError = (err == "nssBadCert");
// Only worry about captive portals if this is a cert error.
let showCaptivePortalUI = isCaptive() && gIsCertError;
if (showCaptivePortalUI) {
err = "captivePortal";
}
+ let pageTitle = document.getElementById("ept_" + err);
+ if (pageTitle) {
+ document.title = pageTitle.textContent;
+ }
+
// if it's an unknown error or there's no title or description
// defined, get the generic message
var errTitle = document.getElementById("et_" + err);
var errDesc = document.getElementById("ed_" + err);
if (!errTitle || !errDesc) {
errTitle = document.getElementById("et_generic");
errDesc = document.getElementById("ed_generic");
}
@@ -311,18 +316,16 @@
}
}
addDomainErrorLinks();
}
function initPageCaptivePortal() {
document.body.className = "captiveportal";
- document.title = document.getElementById("captivePortalPageTitle").textContent;
-
document.getElementById("openPortalLoginPageButton")
.addEventListener("click", () => {
let event = new CustomEvent("AboutNetErrorOpenCaptivePortal", {bubbles: true});
document.dispatchEvent(event);
});
addAutofocus("openPortalLoginPageButton");
setupAdvancedButton();
@@ -333,17 +336,16 @@
// that we can pick up and attempt to reload the original page.
window.addEventListener("AboutNetErrorCaptivePortalFreed", () => {
document.location.reload();
});
}
function initPageCertError() {
document.body.className = "certerror";
- document.title = document.getElementById("certErrorPageTitle").textContent;
for (let host of document.querySelectorAll(".hostname")) {
host.textContent = document.location.hostname;
}
addAutofocus("returnButton");
setupAdvancedButton();
document.getElementById("learnMoreContainer").style.display = "block";
@@ -511,26 +513,28 @@
anchorEl.setAttribute("title", text);
anchorEl.appendChild(document.createTextNode(text));
el.appendChild(anchorEl);
}
]]></script>
</head>
<body dir="&locale.dir;">
- <!-- Contains an alternate page title set on page init for cert errors. -->
- <div id="certErrorPageTitle" style="display: none;">&certerror.pagetitle1;</div>
- <div id="captivePortalPageTitle" style="display: none;">&captivePortal.title;</div>
-
<!-- ERROR ITEM CONTAINER (removed during loading to avoid bug 39098) -->
<div id="errorContainer">
+ <div id="errorPageTitlesContainer">
+ <span id="ept_nssBadCert">&certerror.pagetitle1;</span>
+ <span id="ept_captivePortal">&captivePortal.title;</span>
+ <span id="ept_dnsNotFound">&dnsNotFound.pageTitle;</span>
+ <span id="ept_malformedURI">&malformedURI.pageTitle;</span>
+ </div>
<div id="errorTitlesContainer">
<h1 id="et_generic">&generic.title;</h1>
<h1 id="et_captivePortal">&captivePortal.title;</h1>
- <h1 id="et_dnsNotFound">&dnsNotFound.title;</h1>
+ <h1 id="et_dnsNotFound">&dnsNotFound.title1;</h1>
<h1 id="et_fileNotFound">&fileNotFound.title;</h1>
<h1 id="et_fileAccessDenied">&fileAccessDenied.title;</h1>
<h1 id="et_malformedURI">&malformedURI.title1;</h1>
<h1 id="et_unknownProtocolFound">&unknownProtocolFound.title;</h1>
<h1 id="et_connectionFailure">&connectionFailure.title;</h1>
<h1 id="et_netTimeout">&netTimeout.title;</h1>
<h1 id="et_redirectLoop">&redirectLoop.title;</h1>
<h1 id="et_unknownSocketType">&unknownSocketType.title;</h1>
@@ -549,17 +553,17 @@
<h1 id="et_remoteXUL">&remoteXUL.title;</h1>
<h1 id="et_corruptedContentErrorv2">&corruptedContentErrorv2.title;</h1>
<h1 id="et_sslv3Used">&sslv3Used.title;</h1>
<h1 id="et_inadequateSecurityError">&inadequateSecurityError.title;</h1>
</div>
<div id="errorDescriptionsContainer">
<div id="ed_generic">&generic.longDesc;</div>
<div id="ed_captivePortal">&captivePortal.longDesc2;</div>
- <div id="ed_dnsNotFound">&dnsNotFound.longDesc;</div>
+ <div id="ed_dnsNotFound">&dnsNotFound.longDesc1;</div>
<div id="ed_fileNotFound">&fileNotFound.longDesc;</div>
<div id="ed_fileAccessDenied">&fileAccessDenied.longDesc;</div>
<div id="ed_malformedURI"></div>
<div id="ed_unknownProtocolFound">&unknownProtocolFound.longDesc;</div>
<div id="ed_connectionFailure">&connectionFailure.longDesc;</div>
<div id="ed_netTimeout">&netTimeout.longDesc;</div>
<div id="ed_redirectLoop">&redirectLoop.longDesc;</div>
<div id="ed_unknownSocketType">&unknownSocketType.longDesc;</div>
--- a/browser/base/content/illustrations/error-malformed-url.svg
+++ b/browser/base/content/illustrations/error-malformed-url.svg
@@ -1,8 +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/. -->
<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 300 300">
<defs>
<linearGradient id="a" x1="-300.021" y1="-272.736" x2="547.138" y2="574.423" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#ccfbff"/>
<stop offset="1" stop-color="#c9e4ff"/>
</linearGradient>
<linearGradient id="b" x1="-18.672" y1="23.78" x2="279.805" y2="322.256" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#00c8d7"/>
new file mode 100644
--- /dev/null
+++ b/browser/base/content/illustrations/error-server-not-found.svg
@@ -0,0 +1,60 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 300 300">
+ <defs>
+ <linearGradient id="a" x1="-300.021" y1="-272.736" x2="547.138" y2="574.423" gradientUnits="userSpaceOnUse">
+ <stop offset="0" stop-color="#ccfbff"/>
+ <stop offset="1" stop-color="#c9e4ff"/>
+ </linearGradient>
+ <linearGradient id="b" x1="-18.672" y1="23.78" x2="279.805" y2="322.256" gradientUnits="userSpaceOnUse">
+ <stop offset="0" stop-color="#00c8d7"/>
+ <stop offset="1" stop-color="#0a84ff"/>
+ </linearGradient>
+ </defs>
+ <path d="M224.245 144.067h-10.733c.136.343.274.674.41 1h10.323a.5.5 0 0 0 0-1zm2.454-11.821a.5.5 0 0 0-.5-.5h-20.26c.373.357.727.688 1.065 1h19.2a.5.5 0 0 0 .496-.5zm8.546 11.821h-3a.5.5 0 1 0 0 1h3a.5.5 0 0 0 0-1zm5 0h-1a.5.5 0 1 0 0 1h1a.5.5 0 0 0 0-1zm-3.3-6.66h-25.78a12.767 12.767 0 0 1 .862 2h24.918a1 1 0 0 0 0-2zm20.422 6.66h-8.122a.5.5 0 1 0 0 1h8.122a.5.5 0 0 0 0-1z" fill="#eaeaee"/>
+ <path d="M269.53 87.757h-24.236c-2.108-3.9-7.559-12.718-14.4-14.023-8.952-1.707-10.737 7.217-10.737 7.217s-5.949-15.468-21-13.419c-16.878 2.3-8.928 20.065-8.928 20.065h-25.408l8.181.159h-8.184a1 1 0 0 0 0 2H269.53a1 1 0 0 0 0-2z" fill="#fff"/>
+ <path d="M118.373 63.908h-13.69c-1.129-2.112-4.19-7.156-8.057-7.894-4.978-.949-5.971 4.013-5.971 4.013s-3.309-8.6-11.68-7.462c-9.386 1.278-4.965 11.158-4.965 11.158H59.88l9.471.185h-9.212a1 1 0 0 0 0 2h58.233a1 1 0 1 0 0-2z" fill="#fff"/>
+ <path d="M102.31 121.507H60.818a1 1 0 0 0 0 2h41.492a1 1 0 1 0 0-2zM70.336 117.6H82.1a.5.5 0 0 0 0-1H70.336a.5.5 0 0 0 0 1z" fill="#eaeaee"/>
+ <path d="M111.457 174.8h-78.3a1 1 0 0 0 0 2h78.3a1 1 0 1 0 0-2zm-26.742-3.793h1a.5.5 0 0 0 0-1h-1a.5.5 0 0 0 0 1zm10 0h3.1a.5.5 0 0 0 0-1h-3.1a.5.5 0 0 0 0 1zm-17 0h3a.5.5 0 0 0 0-1h-3a.5.5 0 0 0 0 1zm-20 0h12a.5.5 0 0 0 0-1h-12a.5.5 0 0 0 0 1z" fill="#eaeaee"/>
+ <path d="M206.885 62.973l.045-.1c-.058.027-.063.059-.045.1z" fill="#fff"/>
+ <path d="M77.937 214.941H39.95a1 1 0 1 1 0-2h37.987a1 1 0 1 1 0 2z" fill="#eaeaee"/>
+ <path d="M258.931 214.941h-61.813a1 1 0 0 1 0-2h61.813a1 1 0 0 1 0 2z" fill="#eaeaee"/>
+ <path d="M265.745 85.333h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 1 0 1zm-11 0h-8.07a.5.5 0 0 1-.447-.277c-.007-.014-.724-1.425-1.979-3.342a.5.5 0 1 1 .837-.548c.393.6 1.444 2.293 1.888 3.167h7.772a.5.5 0 0 1 0 1zm-66.489-.712h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 1 0 1zm-11 0h-12a.5.5 0 0 1 0-1h12a.5.5 0 0 1 0 1zM190.1 83.13a.5.5 0 0 1-.474-.339c-.1-.29-.2-.615-.31-.971a.5.5 0 1 1 .958-.287c.1.343.2.657.3.937a.5.5 0 0 1-.474.661zm30.5-5.156a.5.5 0 0 1-.467-.32 23.7 23.7 0 0 0-2.182-4.039.5.5 0 0 1 .834-.552 27.291 27.291 0 0 1 1.719 2.982 10.522 10.522 0 0 1 3.679-5.015.5.5 0 0 1 .571.82 10.181 10.181 0 0 0-3.665 5.721.5.5 0 0 1-.448.4zm18.345-2.964a.5.5 0 0 1-.339-.132q-.361-.333-.735-.651a.5.5 0 0 1 .647-.762q.39.331.765.678a.5.5 0 0 1-.339.868zm-49.923-1.725a.47.47 0 0 1-.09-.008.5.5 0 0 1-.4-.581c.792-4.351 3.544-7.229 8.18-8.556a.5.5 0 0 1 .275.962c-4.24 1.212-6.753 3.828-7.472 7.773a.5.5 0 0 1-.499.411zm45.893-1.218a.5.5 0 0 1-.237-.06 12.545 12.545 0 0 0-2.666-1.081.5.5 0 1 1 .261-.966 13.559 13.559 0 0 1 2.88 1.167.5.5 0 0 1-.238.94zM212.146 67.4a.5.5 0 0 1-.28-.086q-.4-.27-.82-.524a.5.5 0 1 1 .516-.856q.444.267.865.552a.5.5 0 0 1-.281.914zm-4.47-2.2a.5.5 0 0 1-.154-.024 16.724 16.724 0 0 0-2.832-.647.5.5 0 0 1 .137-.99 17.6 17.6 0 0 1 3 .686.5.5 0 0 1-.154.976z" fill="#eaeaee"/>
+ <path d="M72.315 62.052h-12a.5.5 0 0 1 0-1h12a.5.5 0 0 1 0 1zm45.582-.184h-1.8a.5.5 0 0 1 0-1h1.8a.5.5 0 0 1 0 1zm-10.8 0h-1a.5.5 0 0 1 0-1h1a.5.5 0 0 1 0 1zm-3.491-2.881a.5.5 0 0 1-.39-.186 18.484 18.484 0 0 0-2-2.129.5.5 0 1 1 .668-.744A19.433 19.433 0 0 1 104 58.174a.5.5 0 0 1-.389.814zm-12.521-.631a.5.5 0 0 1-.466-.319 13.8 13.8 0 0 0-3.857-5.165.5.5 0 0 1 .623-.782 14.47 14.47 0 0 1 3.624 4.438A5.414 5.414 0 0 1 94.12 53.5a.5.5 0 0 1 .326.945 4.994 4.994 0 0 0-2.867 3.51.5.5 0 0 1-.49.401zm-17.637-2.037h-.051a.5.5 0 0 1-.447-.548 6.454 6.454 0 0 1 1.057-3.036.5.5 0 1 1 .824.566 5.46 5.46 0 0 0-.886 2.571.5.5 0 0 1-.497.447zm4.193-5.039a.5.5 0 0 1-.151-.977 10.27 10.27 0 0 1 1.017-.264.5.5 0 0 1 .2.979 9.033 9.033 0 0 0-.917.237.5.5 0 0 1-.148.025z" fill="#eaeaee"/>
+ <ellipse cx="143.502" cy="244.914" rx="54.673" ry="8.306" fill="#eaeaee"/>
+ <path d="M223.695 147.595a8.557 8.557 0 0 0-3.594-1.658v-.084a5 5 0 0 0-5.98-5.15 36.839 36.839 0 0 0-6.483-9.3 83.918 83.918 0 0 0-8.865-9.925 5.554 5.554 0 0 0-2.252-1.3c-7.134-6.844-21.832-19.69-32.3-20.412a27.308 27.308 0 0 0-1.879-.063A46.863 46.863 0 0 0 147.3 102.6l-5.07-1.386a5 5 0 0 0-6.142 3.5l-.959 3.508a68.223 68.223 0 0 0-7.774 5.252l-2.026-.047h-.116a5 5 0 0 0-5 4.884l-.042 1.8a45.3 45.3 0 0 0-5.6 7.593 5 5 0 0 0-2.508 5.313c-1.868 5.441-2.827 13.654-2.855 24.468-.454 2.653-1 5.24-1.63 7.721l-4.239 2.569a6.3 6.3 0 0 0-2.122 8.645l1.5 2.469q-.366.757-.741 1.478l-4 1.227a6.3 6.3 0 0 0-4.171 7.866l.59 1.923q-.5.569-1.007 1.109l-1.588-.122a5.857 5.857 0 0 0-.5-.02 6.325 6.325 0 0 0-6.268 5.8l-.113 1.431c-2.725 2.033-5.38 4.525-5.38 9.073 0 6.507 10.219 10.526 13.578 11.847a68.529 68.529 0 0 0 24.074 4.751q.549 0 1.093-.012c.6 2.385 1.2 4.42 1.778 6.08a54.622 54.622 0 0 0 4.716 10.2c1.741 2.827 4.2 6.072 7.821 6.072a5.668 5.668 0 0 0 3.569-1.267c1.74-1.416 2.422-3.057 2.477-10.005a86.376 86.376 0 0 0 16.716 1.516 80.415 80.415 0 0 0 14.4-1.446c-.21 6.755.477 8.474 2.273 9.935a5.668 5.668 0 0 0 3.568 1.267c5.627 0 9.914-8.85 12.52-16.273.379-1.079.76-2.326 1.133-3.705h-.008c1.555-5.314 12.415-46.933 15.771-59.81l9.2.076h.041q.235 0 .47-.022a13.639 13.639 0 0 0 8.795-4.994l.014.011c4.448-5.667 4.514-11.806.157-15.28z" fill="#fff"/>
+ <g fill="url(#a)">
+ <path d="M121.625 218.616c-4.1-12.832-7.76-39.924-7.746-61.081a103.51 103.51 0 0 1-2.321 10.573l-5.961 3.612a1.3 1.3 0 0 0-.437 1.779l2.865 4.729a59.209 59.209 0 0 1-2.977 5.993l-5.939 1.823a1.3 1.3 0 0 0-.858 1.619l1.385 4.511a51.054 51.054 0 0 1-4.661 5.155l-3.9-.308a1.3 1.3 0 0 0-1.394 1.19l-.294 3.726c-3.236 2.342-5.183 3.517-5.183 6.38 0 4.117 20.661 13.327 37.645 11.314-.078-.339-.149-.677-.224-1.015z"/>
+ <path d="M186.98 169.883l-12.066-1.734s10.339 13.394 7.748 33.691c-1 7.817-6.478 19.433-22.024 22.456a45.69 45.69 0 0 1-27.449-3.428v8.583s7.584 3.05 21.835 3.05a87.741 87.741 0 0 0 19.743-2.7c-.4 5.8-.622 11.737.084 12.311 1.416 1.153 5.381-4.714 8.214-12.785a48.073 48.073 0 0 0 1.019-3.337c1.268-3.235 4.283-12.279 4.623-25.878a176.857 176.857 0 0 0-1.727-30.229z"/>
+ <path d="M189.791 210.674l-4.457-18.074-8.517-31.348a1.288 1.288 0 0 0-1.554-.989l-20.588 10.535-2.94.327-15.735.134a1.287 1.287 0 0 0-1.177 1.782l6.114 14.682 4.476 18.806a1.278 1.278 0 0 0 .146.349l-1.614 14.85a1.287 1.287 0 0 0 1.3 1.426l18.745-.305q.061 0 .121-.008a1.288 1.288 0 0 0 .151-.026l24.607-10.476a1.287 1.287 0 0 0 .926-1.665z"/>
+ <path d="M139.025 177.647a1.384 1.384 0 0 0 .773-1.1 1.407 1.407 0 0 0-1.269-1.533s-1.257-.638-4.768-.72a7.635 7.635 0 0 0-5.773 2.53 75.369 75.369 0 0 1-13.532-5.021 2.5 2.5 0 0 0-2.225 4.478 76.1 76.1 0 0 0 15.616 5.619c1.4 1.485 3.989 2.07 5.679 2.241.1.031 5.754.357 7.31-3.608.474-1.206-.654-2.449-1.811-2.886z"/>
+ <path d="M212.017 152.78c2.378-2.584 6.425-3.047 8.227-1.609 2.856 2.278.577 6.3-.976 8.274-.044.09-3.736 4.39-7.671 2.758-1.2-.5-1.309-2.171-.821-3.307a1.384 1.384 0 0 1-1.327-.206 1.407 1.407 0 0 1-.223-1.978s.413-1.348 2.791-3.932z"/>
+ <path d="M210.657 147.674a12.766 12.766 0 0 0-.357-2.321c-1.084-4.224-4.233-8.285-6.851-11.094a78.307 78.307 0 0 0-8.425-9.468.648.648 0 0 0-.887.944 80.955 80.955 0 0 1 7.823 8.7c1.579 2.767 3.417 6.488 3.862 9.489a17.1 17.1 0 0 1-1.055 7.18zm-56.427 14.1a1.3 1.3 0 0 0 .514 1.758c.142.078 2.046 1.108 5.194 2.412l2.974-1.612a63.892 63.892 0 0 1-6.924-3.073 1.3 1.3 0 0 0-1.758.517z"/>
+ </g>
+ <g fill="#f9f9fa">
+ <path d="M164.107 222.841q-.06.007-.121.008l-18.745.305a1.287 1.287 0 0 1-1.3-1.426l1.614-14.85a1.28 1.28 0 0 1-.146-.349l-4.476-18.806-2.024-4.861a9.694 9.694 0 0 1-5.383 1.28c-1.69-.17-4.282-.756-5.679-2.241a70.415 70.415 0 0 1-13.1-4.449c1.326 16.092 3.99 32.149 6.873 41.164a93.749 93.749 0 0 0 2.817 10.711c2.833 8.071 6.815 13.938 8.231 12.785.67-.545.705-6.511.557-12.645l-.042-.016v-8.583a45.69 45.69 0 0 0 27.449 3.428 29.062 29.062 0 0 0 11.749-4.94l-8.127 3.46a1.29 1.29 0 0 1-.147.025z"/>
+ <path d="M218.386 185.448c-.284-.616-4.741-17.387-4.741-17.387l.274-5.519a4.792 4.792 0 0 1-2.322-.339c-1.2-.5-1.309-2.171-.821-3.307a1.384 1.384 0 0 1-1.328-.206 1.407 1.407 0 0 1-.223-1.978s.413-1.348 2.791-3.932a7.392 7.392 0 0 1 2.474-1.729l.287-5.78-10.011 5.837a17.1 17.1 0 0 0 1.055-7.18c-.445-3-2.283-6.722-3.862-9.489a80.955 80.955 0 0 0-7.823-8.7.648.648 0 0 1-.028-.915s.011-.006.015-.011c-10.105-9.943-22.875-19.853-30.577-20.384-4.5-.311-10.323.8-16.37 3.082l-6.6-1.805-1.511 5.524a63.4 63.4 0 0 0-10.33 6.958l-3.858-.09-.086 3.719a40.259 40.259 0 0 0-7.075 9.61l-1.076.336.36 1.137c-3.164 7.31-3.661 22.679-2.656 38.859.037.016.076.024.113.043a75.369 75.369 0 0 0 13.532 5.021 6.434 6.434 0 0 1 .467-.48c.065-.061.135-.118.2-.177.1-.088.2-.175.314-.259l.3-.218a7.807 7.807 0 0 1 .651-.406c.045-.025.091-.048.137-.072a7.522 7.522 0 0 1 3.707-.919c.615.014 1.137.049 1.619.092l-.56-1.346a1.287 1.287 0 0 1 1.176-1.779l15.739-.139 2.94-.327 20.588-10.535a1.287 1.287 0 0 1 1.554.989l8.517 31.348 4.457 18.078a1.287 1.287 0 0 1-.926 1.665l-24.607 10.476a1.29 1.29 0 0 1-.151.026q-.06.007-.121.008l-18.745.305a1.287 1.287 0 0 1-1.3-1.426l1.614-14.85a1.28 1.28 0 0 1-.146-.349l-4.476-18.806-2.024-4.861a7.222 7.222 0 0 1-1.957.882l1.244 2.643 4.883 18.667-1.442 20.018 22.316.754 28.2-12.809 22.4-5.773 12.27-10s-8.157-11.179-8.441-11.795zm-58.447-19.5c-3.153-1.305-5.053-2.334-5.2-2.412a1.3 1.3 0 0 1 1.244-2.273 64.081 64.081 0 0 0 6.926 3.071z"/>
+ </g>
+ <path d="M148.2 151.572a1 1 0 0 0-.969-.513l-5.848.544a1 1 0 0 0-.518 1.788l3.4 2.625a1 1 0 0 0 .611.208 1.023 1.023 0 0 0 .128-.008 1 1 0 0 0 .664-.381l2.444-3.169a1 1 0 0 0 .088-1.094z" fill="#fff"/>
+ <g fill="url(#a)">
+ <path d="M215.942 188.189a.5.5 0 0 0-.643-.294c-.657.244-6.829 2.359-9.226 3.179a.485.485 0 0 0-.129.02l-.223.082-.3-.533-4.132-16.317c3.722-1.631 9.422-4.082 10-4.2a.5.5 0 0 0 .43-.551.507.507 0 0 0-.552-.442c-.612.068-7.152 2.91-10.007 4.159l-.978-16.222a.506.506 0 0 0-.529-.469.5.5 0 0 0-.469.529l1.027 16.881a.482.482 0 0 0 .005.087v.063l4.244 16.8a.5.5 0 0 0 .048.121l.252.452-14.371 5.266a.5.5 0 1 0 .345.938l14.53-5.331 7.075 12.687a.5.5 0 1 0 .873-.487l-6.987-12.529c2.259-.773 8.727-2.988 9.423-3.247a.5.5 0 0 0 .294-.642zm-17.866-13.124a.5.5 0 0 0-.645-.29l-12.685 4.811a.5.5 0 0 0 .177.967.49.49 0 0 0 .177-.033l12.685-4.811a.5.5 0 0 0 .29-.644z"/>
+ <path d="M177.573 181.528a1.031 1.031 0 1 0 1.081.668 1.036 1.036 0 0 0-1.081-.668z"/>
+ </g>
+ <path d="M186.537 198.867a.5.5 0 0 0-.634-.312l-22.81 7.758-.215-2.424-3.513-18.32 22.327-4.386a.5.5 0 0 0-.192-.981l-22.373 4.4-4.2-13.34a.5.5 0 0 0-.954.3l4.153 13.167-15.205 1.277a.5.5 0 0 0 .042 1h.042l15.376-1.294 3.513 18.32.214 2.418c-3.146-.116-12.594-.432-13.583-.117a.5.5 0 0 0-.321.621.506.506 0 0 0 .623.333c.734-.214 8.379-.017 13.371.167l1.382 15.6a.5.5 0 0 0 .5.456h.044a.5.5 0 0 0 .454-.542l-1.386-15.624 23.041-7.837a.5.5 0 0 0 .304-.64z" fill="#f9f9fa"/>
+ <g fill="url(#b)">
+ <path d="M158.845 166.591l-3.592-1.575a1 1 0 0 1 .8-1.832l4.854 2.129z"/>
+ <path d="M151.812 151.976a11.582 11.582 0 0 0-15.092 1.077 1 1 0 0 0 1.387 1.441 10.932 10.932 0 0 1 1.693-1.238c1.011 1.259 2.852 3.273 4.438 3.474a1.779 1.779 0 0 0 .228.014c1.905 0 3.843-2.924 4.537-4.082a11.155 11.155 0 0 1 1.621.922 1 1 0 0 0 1.189-1.608zm-7.448 3.762c-1.113-.141-2.654-1.735-3.671-2.971a9.546 9.546 0 0 1 4.815-1.067 9.091 9.091 0 0 1 2.56.576c-.968 1.589-2.592 3.611-3.705 3.461z"/>
+ <path d="M195.7 141.2a5.614 5.614 0 0 0-9.187 0 1 1 0 1 0 1.679 1.088 3.7 3.7 0 0 1 2.915-1.475 3.648 3.648 0 0 1 2.918 1.48 1 1 0 0 0 1.675-1.093z"/>
+ <path d="M155.081 127.311a1 1 0 0 0 1.383-.28 3.618 3.618 0 0 1 5.838 0 1 1 0 0 0 1.675-1.093 5.614 5.614 0 0 0-9.187 0 1 1 0 0 0 .291 1.373z"/>
+ <path d="M189.934 134.871c0 .034-.01.066-.01.1v2.844a6.008 6.008 0 0 1 2.784.078v-2.922a1.378 1.378 0 0 0-.023-.227 5.846 5.846 0 0 0 2.993-2.135 1 1 0 0 0-1.678-1.094 3.617 3.617 0 0 1-5.838 0 1 1 0 0 0-1.674 1.094 5.755 5.755 0 0 0 3.446 2.262z"/>
+ <path d="M158.008 134.971v3.152a5.941 5.941 0 0 1 2.781-.038v-3.114a1.392 1.392 0 1 0-2.784 0z"/>
+ <path d="M159.4 139.021a5.674 5.674 0 0 0-4.593 2.387 1 1 0 0 0 1.674 1.094 3.618 3.618 0 0 1 5.838 0 1 1 0 0 0 1.675-1.093 5.674 5.674 0 0 0-4.594-2.388z"/>
+ <path d="M180.388 181.389a2.938 2.938 0 1 0-4.66 3.254 4.326 4.326 0 0 0 .765.557l2.4 1.8a.562.562 0 0 0 .531.077h.008a.564.564 0 0 0 .35-.418l.577-3a3.9 3.9 0 0 0 .029-2.27zm-2.344 2.132a1.031 1.031 0 1 1 .61-1.325 1.034 1.034 0 0 1-.61 1.325z"/>
+ <path d="M212.864 169.173a.64.64 0 0 0-.9-.158l-6.583 4.6-6.6 4.16-.891.437-6.69-16.391-6.419 2.481-1.271-5.447a.643.643 0 1 0-1.252.294l1.315 5.621-3.806 1.471v.01l-19.531 7.538 3.908 11.6-2.937 1.966-7.657 3.829-11.434.845a.8.8 0 0 0-.1.031l.3 1.246 11.461-.848.127-.01 7.955-3.983 2.715-1.815 8.963 26.609 13.988-4.649-.86-1.86 3.448-1.219 1.248-.441 5.962 3.956a.643.643 0 1 0 .71-1.073l-5.168-3.415.03-.01-1.152-2.5 13.594-5.606-6.957-17.044 1.032-.505 6.682-4.212 6.609-4.621a.642.642 0 0 0 .161-.887zm-9.2 26.575l-13.647 5.629.785 1.7-2.343-2.449-1.288-1.346-4.425-3.346L180.2 193l-.376-4.707a1.748 1.748 0 0 1-1.294-.042l.421 5.273 2.862 3.309 4.5 3.41 3.112 3.263.648.68-.228.081-.146.052-4.8 1.7.847 1.836-11.4 3.79-8.665-25.724 1.41-.943 5.921.554 2.9 2.118 1.361-.251-1.479-1.1a5.89 5.89 0 0 1-.9-.663 4.206 4.206 0 0 1-.783-.893l-.624-.456-6.729-.628-1.5 1-3.4-10.1 19.632-7.577v-.01l2.388-.923.438 1.874.528 4.731.565 3.225-1 2.954-2.623 1.281-.4.374a4.217 4.217 0 0 1 .218.466 3.835 3.835 0 0 1 .2.87l.634-.6 3.021-1.474 1.275-3.774-.616-3.508-.536-4.767-.5-2.123 5.41-2.091 6.246 15.3-10.983 5.386-4.378 1.031-.267 1.386 4.4-1.038.607-.143 11.1-5.432z"/>
+ <path d="M211.383 147.927l2.9-1.77.039 5.23a.5.5 0 0 0 .5.5.5.5 0 0 0 .5-.5l-.046-6.113a.5.5 0 0 0-.76-.423l-3.655 2.229a.5.5 0 0 0 .521.854zm15.845 49.026l-8.383-11.723-4.7-17.252-.32-5.243a.51.51 0 0 0-.529-.469.5.5 0 0 0-.469.529l.323 5.294a.5.5 0 0 0 .017.1l4.733 17.391a.5.5 0 0 0 .076.16l8.163 11.414-11.821 9.633-22.291 5.745c-.015 0-.026.014-.04.02s-.028 0-.041.01l-28.095 12.761-21.68-.732 1.4-19.5a.506.506 0 0 0-.015-.163l-4.876-18.668a.537.537 0 0 0-.041-.1l-1.539-2.96a.5.5 0 0 0-.887.463l1.515 2.9 4.848 18.532-1.435 19.936a.5.5 0 0 0 .481.536l22.316.754h.017a.5.5 0 0 0 .207-.045l28.159-12.79 22.358-5.762a.505.505 0 0 0 .191-.1l12.27-10a.5.5 0 0 0 .088-.671zm-96.2-26.9l23.165-.486a.5.5 0 0 0 .228-.061l22.133-12 14.9-1.49h.011l7.36-.909a.5.5 0 0 0 .187-.062l8.711-4.962a.5.5 0 1 0-.5-.869l-8.624 4.913-7.249.9-15 1.5a.5.5 0 0 0-.188.058l-22.115 11.992-23.782.5a.5.5 0 0 0-.449.7l1.47 3.46a.5.5 0 0 0 .46.3.493.493 0 0 0 .2-.04.5.5 0 0 0 .265-.655z"/>
+ <path d="M221.337 150.947c-.37-.407-2.546-2.481-6.929-.472a1 1 0 0 0 .832 1.818c3.251-1.489 4.553-.074 4.594-.03.024.03.064.072.091.1.076.074 1.82 1.86-.674 5.575-2.65 3.945-5.713 3.84-5.862 3.832a1 1 0 0 0-.142 1.995c.019 0 .085.006.193.006.877 0 4.494-.285 7.471-4.717 3.289-4.902.831-7.7.426-8.107zm-9.037 2.245a.5.5 0 1 0-.567-.823c-.354.244-3.456 2.447-3.149 4.537.13.889.826 1.577 2.071 2.049v2.479a.5.5 0 0 0 1 0V158.6a.5.5 0 0 0-.347-.476c-1.069-.345-1.652-.8-1.735-1.363-.183-1.25 1.962-3.041 2.727-3.569z"/>
+ <path d="M141.324 179.661a1 1 0 0 0-1.361.384 5.382 5.382 0 0 1-3.357 2.765c-3.375.921-7.389-1.383-7.43-1.407a1.043 1.043 0 0 0-.494-.137 23.844 23.844 0 0 1-5.361-1.266 94.816 94.816 0 0 1-10.046-4.156 1 1 0 1 0-.87 1.8 94.837 94.837 0 0 0 10.318 4.263 28.613 28.613 0 0 0 5.662 1.344 14.825 14.825 0 0 0 6.505 1.775 8.516 8.516 0 0 0 2.233-.285 7.38 7.38 0 0 0 4.585-3.72 1 1 0 0 0-.384-1.36zm-13.077-2.407c1.673-1.014 6.485-3.407 8.631-2.308a2.26 2.26 0 0 1 1.111 2.027.5.5 0 0 0 .125.292l1.333 1.5a.5.5 0 1 0 .747-.664l-1.225-1.378a3.151 3.151 0 0 0-1.637-2.667c-3.076-1.572-9.338 2.182-9.6 2.343a.5.5 0 0 0 .519.855z"/>
+ <path d="M187.079 215.322a62.9 62.9 0 0 1-2.99 10.65 48.268 48.268 0 0 1-1.024 3.355c-2.593 7.389-6.135 12.929-7.8 12.929a.634.634 0 0 1-.412-.145c-.706-.575-.484-6.506-.084-12.311a87.741 87.741 0 0 1-19.743 2.7c-11.364 0-18.463-1.931-20.878-2.715l-.237-5.569a.5.5 0 0 0-1 .043l.386 9.076c.038 4.572-.1 8.349-.622 8.777a.635.635 0 0 1-.412.145c-1.67 0-5.226-5.541-7.819-12.929a88.238 88.238 0 0 1-2.593-9.678v-.018c-2.557-10.229-4.4-21.578-4.427-21.725a.5.5 0 0 0-.984.174c.025.144 1.891 11.541 4.373 21.641a43.511 43.511 0 0 1-3.955.194c-15.782 0-32.651-7.878-32.651-11.6 0-2.862 1.947-4.038 5.183-6.379l.294-3.727a1.3 1.3 0 0 1 1.284-1.194h.109l2.658.209c-.932 1-1.8 1.954-1.856 2.019a.5.5 0 0 0 .741.672c.02-.022 1.7-1.876 2.915-3.143a51.528 51.528 0 0 0 4.106-4.6l-1.385-4.51a1.3 1.3 0 0 1 .858-1.619l4.541-1.395-1.472 2.6a.5.5 0 0 0 .871.492l2-3.526a59.168 59.168 0 0 0 2.977-5.992l-2.871-4.723a1.3 1.3 0 0 1 .436-1.78l4.685-2.84-.841 2.8a.5.5 0 0 0 .335.623.506.506 0 0 0 .144.021.5.5 0 0 0 .479-.356l1.159-3.861a103.318 103.318 0 0 0 2.315-10.528c0-9.635.771-18.028 2.6-23.3l.629 1.572a.5.5 0 0 0 .929-.371l-1.036-2.59-.354-1.132 1.076-.336a39.516 39.516 0 0 1 6.206-8.693 17.58 17.58 0 0 0 .293 2.241.5.5 0 0 0 .472.34.5.5 0 0 0 .477-.656c-.081-.25-.222-1.675-.361-3.33l.075-3.231 3.858.09a63.4 63.4 0 0 1 10.33-6.958l1.511-5.524 5.175 1.415-2.448 1.1a.5.5 0 1 0 .409.912l3.465-1.619a43.83 43.83 0 0 1 14.834-3.133q.79 0 1.535.051c7.7.531 20.471 10.442 30.576 20.384a.65.65 0 0 1 .461-.192.635.635 0 0 1 .439.175 78.316 78.316 0 0 1 8.426 9.469c2.618 2.808 5.766 6.87 6.851 11.093a12.766 12.766 0 0 1 .357 2.321l1.9-1.109a14.088 14.088 0 0 0-.321-1.71c-1.189-4.633-4.577-9-7.244-11.873a80.227 80.227 0 0 0-8.6-9.651 2.616 2.616 0 0 0-1.645-.711 132.405 132.405 0 0 0-15.667-13.173c-6.275-4.386-11.455-6.747-15.4-7.019-.538-.037-1.1-.056-1.673-.056a44.826 44.826 0 0 0-14.927 3.034l-5.98-1.635a2 2 0 0 0-2.457 1.4l-1.287 4.707a65.217 65.217 0 0 0-9.321 6.285l-3.115-.072h-.047a2 2 0 0 0-2 1.953l-.068 2.94a42.293 42.293 0 0 0-6.474 8.772l-.291.091a2 2 0 0 0-1.313 2.506l.143.457c-1.979 5.088-2.989 13.356-3 24.6a102.64 102.64 0 0 1-2.034 9.4l-5.279 3.2a3.3 3.3 0 0 0-1.111 4.526l2.326 3.838a57.63 57.63 0 0 1-2.077 4.169l-5.176 1.59a3.3 3.3 0 0 0-2.183 4.118l1.073 3.494a49.486 49.486 0 0 1-3.185 3.519l-3-.236a3.17 3.17 0 0 0-.266-.011 3.31 3.31 0 0 0-3.278 3.035l-.221 2.8c-2.946 2.116-5.262 3.81-5.262 7.461 0 3.883 7.315 7.34 11.675 9.055a65.414 65.414 0 0 0 22.976 4.543 46.33 46.33 0 0 0 3.429-.125 80.231 80.231 0 0 0 2.274 8.2c.513 1.46 5.14 14.267 9.706 14.267a2.624 2.624 0 0 0 1.675-.594c.828-.674 1.5-1.218 1.349-11.451a76.223 76.223 0 0 0 19.738 2.288 85.8 85.8 0 0 0 17.577-2.149c-.579 10.036.152 10.631.988 11.312a2.623 2.623 0 0 0 1.674.594c4.55 0 9.177-12.807 9.689-14.267.345-.983.694-2.123 1.039-3.39a67.385 67.385 0 0 0 3.306-12.285z"/>
+ </g>
+</svg>
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -34,16 +34,17 @@ browser.jar:
content/browser/abouthome/bookmarks@2x.png (content/abouthome/bookmarks@2x.png)
content/browser/abouthome/history@2x.png (content/abouthome/history@2x.png)
content/browser/abouthome/addons@2x.png (content/abouthome/addons@2x.png)
content/browser/abouthome/sync@2x.png (content/abouthome/sync@2x.png)
content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png)
content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png)
content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
+ content/browser/illustrations/error-server-not-found.svg (content/illustrations/error-server-not-found.svg)
content/browser/illustrations/error-malformed-url.svg (content/illustrations/error-malformed-url.svg)
content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml)
#ifdef MOZ_SERVICES_HEALTHREPORT
content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml)
content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js)
content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css)
#endif
--- a/browser/locales/en-US/chrome/overrides/appstrings.properties
+++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
@@ -1,16 +1,16 @@
# 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/.
malformedURI2=Please check that the URL is correct and try again.
fileNotFound=Firefox can’t find the file at %S.
fileAccessDenied=The file at %S is not readable.
-dnsNotFound=Firefox can’t find the server at %S.
+dnsNotFound2=We can’t connect to the server at %S.
unknownProtocolFound=Firefox doesn’t know how to open this address, because one of the following protocols (%S) isn’t associated with any program or is not allowed in this context.
connectionFailure=Firefox can’t establish a connection to the server at %S.
netInterrupt=The connection to %S was interrupted while the page was loading.
netTimeout=The server at %S is taking too long to respond.
redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete.
## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don’t translate "%S"
confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
resendButton.label=Resend
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -13,26 +13,25 @@
<!-- Specific error messages -->
<!ENTITY connectionFailure.title "Unable to connect">
<!ENTITY connectionFailure.longDesc "&sharedLongDesc;">
<!ENTITY deniedPortAccess.title "This address is restricted">
<!ENTITY deniedPortAccess.longDesc "">
-<!ENTITY dnsNotFound.title "Server not found">
-<!ENTITY dnsNotFound.longDesc "
+<!ENTITY dnsNotFound.pageTitle "Server Not Found">
+<!-- Localization note (dnsNotFound.title1) - "Hmm" is a sound made when considering or puzzling over something. You don't have to include it in your translation if your language does not have a written word like this. -->
+<!ENTITY dnsNotFound.title1 "Hmm. We’re having trouble finding that site.">
+<!ENTITY dnsNotFound.longDesc1 "
+<strong>If that address is correct, here are three other things you can try:</strong>
<ul>
- <li>Check the address for typing errors such as
- <strong>ww</strong>.example.com instead of
- <strong>www</strong>.example.com</li>
- <li>If you are unable to load any pages, check your computer’s network
- connection.</li>
- <li>If your computer or network is protected by a firewall or proxy, make sure
- that &brandShortName; is permitted to access the Web.</li>
+ <li>Try again later.</li>
+ <li>Check your network connection.</li>
+ <li>If you are connected but behind a firewall, check that &brandShortName; has permission to access the Web.</li>
</ul>
">
<!ENTITY fileNotFound.title "File not found">
<!ENTITY fileNotFound.longDesc "
<ul>
<li>Check the file name for capitalization or other typing errors.</li>
<li>Check to see if the file was moved, renamed or deleted.</li>
@@ -53,16 +52,18 @@
<!ENTITY captivePortal.title "Log in to network">
<!ENTITY captivePortal.longDesc2 "
<p>You must log in to this network before you can access the Internet.</p>
">
<!ENTITY openPortalLoginPage.label2 "Open Network Login Page">
+<!ENTITY malformedURI.pageTitle "Invalid URL">
+<!-- Localization note (malformedURI.title1) - "Hmm" is a sound made when considering or puzzling over something. You don't have to include it in your translation if your language does not have a written word like this. -->
<!ENTITY malformedURI.title1 "Hmm. That address doesn’t look right.">
<!ENTITY netInterrupt.title "The connection was interrupted">
<!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
<!ENTITY notCached.title "Document Expired">
<!ENTITY notCached.longDesc "<p>The requested document is not available in &brandShortName;’s cache.</p><ul><li>As a security precaution, &brandShortName; does not automatically re-request sensitive documents.</li><li>Click Try Again to re-request the document from the website.</li></ul>">
--- a/browser/themes/shared/aboutNetError.css
+++ b/browser/themes/shared/aboutNetError.css
@@ -155,16 +155,17 @@ span#hostname {
display: flex;
justify-content: end;
padding: 10px;
}
.illustrated #errorPageContainer {
min-height: 300px;
display: flex;
+ flex-direction: column;
background-position: left center;
}
.illustrated[dir="rtl"] #errorPageContainer {
background-position: right center;
}
.illustrated .title {
@@ -178,15 +179,19 @@ span#hostname {
padding-inline-start: 38%;
}
.illustrated #errorPageContainer {
background-repeat: no-repeat;
background-size: 38%;
}
+.dnsNotFound #errorPageContainer {
+ background-image: url("chrome://browser/content/illustrations/error-server-not-found.svg");
+}
+
.malformedURI #errorPageContainer {
background-image: url("chrome://browser/content/illustrations/error-malformed-url.svg");
}
.malformedURI #errorTryAgain {
display: none;
}
--- a/devtools/client/inspector/test/browser_inspector_navigate_to_errors.js
+++ b/devtools/client/inspector/test/browser_inspector_navigate_to_errors.js
@@ -32,17 +32,17 @@ add_task(function* () {
[domain], 1);
is(yield getDisplayedNodeTextContent("#errorShortDescText", inspector), errorMsg,
"Inpector really inspects the error page");
info("Navigate to unknown domain");
yield navigateTo(inspector, TEST_URL_3);
domain = TEST_URL_3.match(/^http:\/\/(.*)\/$/)[1];
- errorMsg = bundle.formatStringFromName("dnsNotFound",
+ errorMsg = bundle.formatStringFromName("dnsNotFound2",
[domain], 1);
is(yield getDisplayedNodeTextContent("#errorShortDescText", inspector), errorMsg,
"Inspector really inspects the new error page");
info("Navigate to a valid url");
yield navigateTo(inspector, TEST_URL_4);
is(yield getDisplayedNodeTextContent("body", inspector), "test-doc-4",
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5013,16 +5013,17 @@ nsDocShell::DisplayLoadError(nsresult aE
} else if (NS_ERROR_UNKNOWN_HOST == aError) {
NS_ENSURE_ARG_POINTER(aURI);
// Get the host
nsAutoCString host;
nsCOMPtr<nsIURI> innermostURI = NS_GetInnermostURI(aURI);
innermostURI->GetHost(host);
CopyUTF8toUTF16(host, formatStrs[0]);
formatStrCount = 1;
+ errorDescriptionID = "dnsNotFound2";
error = "dnsNotFound";
} else if (NS_ERROR_CONNECTION_REFUSED == aError) {
NS_ENSURE_ARG_POINTER(aURI);
addHostPort = true;
error = "connectionFailure";
} else if (NS_ERROR_NET_INTERRUPT == aError) {
NS_ENSURE_ARG_POINTER(aURI);
addHostPort = true;
--- a/dom/locales/en-US/chrome/appstrings.properties
+++ b/dom/locales/en-US/chrome/appstrings.properties
@@ -1,16 +1,16 @@
# 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/.
malformedURI2=Please check that the URL is correct and try again.
fileNotFound=The file %S cannot be found. Please check the location and try again.
fileAccessDenied=The file at %S is not readable.
-dnsNotFound=%S could not be found. Please check the name and try again.
+dnsNotFound2=%S could not be found. Please check the name and try again.
unknownProtocolFound=One of the following (%S) is not a registered protocol or is not allowed in this context.
connectionFailure=The connection was refused when attempting to contact %S.
netInterrupt=The connection to %S has terminated unexpectedly. Some data may have been transferred.
netTimeout=The operation timed out when attempting to contact %S.
redirectLoop=Redirection limit for this URL exceeded. Unable to load the requested page. This may be caused by cookies that are blocked.
confirmRepostPrompt=To display this page, the application must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
resendButton.label=Resend
unknownSocketType=This document cannot be displayed unless you install the Personal Security Manager (PSM). Download and install PSM and try again, or contact your system administrator.
--- a/mobile/locales/en-US/overrides/appstrings.properties
+++ b/mobile/locales/en-US/overrides/appstrings.properties
@@ -1,16 +1,16 @@
# 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/.
malformedURI2=The URL is not valid and cannot be loaded.
fileNotFound=Firefox can't find the file at %S.
fileAccessDenied=The file at %S is not readable.
-dnsNotFound=Firefox can't find the server at %S.
+dnsNotFound2=Firefox can't find the server at %S.
unknownProtocolFound=Firefox doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context.
connectionFailure=Firefox can't establish a connection to the server at %S.
netInterrupt=The connection to %S was interrupted while the page was loading.
netTimeout=The server at %S is taking too long to respond.
redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete.
## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
resendButton.label=Resend
--- a/toolkit/themes/shared/in-content/info-pages.inc.css
+++ b/toolkit/themes/shared/in-content/info-pages.inc.css
@@ -61,19 +61,19 @@ body {
}
.title-text {
padding-top: 0;
}
}
ul, ol {
- margin: 0;
+ margin: 1em 0;
padding: 0;
- margin-inline-start: 1em;
+ margin-inline-start: 2em;
}
ul > li, ol > li {
margin-bottom: .5em;
}
ul {
list-style: disc;
