Bug 1394460 - Update illustration and copy for error: invalid URL. ui-r=shorlander r=johannh
authorErica Wright <ewright@mozilla.com>
Tue, 29 Aug 2017 16:55:31 -0400
changeset 8977 3dcb68d59843e63ad498f197fc04f3984a642bca
parent 8976 aeff032a89dd619ecebdd5fb078a8da508a673b4
child 8978 0af0ee845054ba78fd0306250feab4da4e623925
push id5
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:18:45 +0000
reviewersshorlander, johannh
bugs1394460
Bug 1394460 - Update illustration and copy for error: invalid URL. ui-r=shorlander r=johannh MozReview-Commit-ID: 8mMUvlOzygj X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: f28b312705df90d41bf211916e2417d4aafcc32e
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
dom/chrome/appstrings.properties
mobile/overrides/appstrings.properties
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -1,13 +1,13 @@
 # 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/.
 
-malformedURI=The URL is not valid and cannot be loaded.
+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.
 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.
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -53,25 +53,17 @@
 
 <!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.title "The address isn’t valid">
-<!ENTITY malformedURI.longDesc "
-<ul>
-  <li>Web addresses are usually written like
-    <strong>http://www.example.com/</strong></li>
-  <li>Make sure that you’re using forward slashes (i.e.
-    <strong>/</strong>).</li>
-</ul>
-">
+<!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>">
 
 <!ENTITY netOffline.title "Offline mode">
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -1,13 +1,13 @@
 # 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/.
 
-malformedURI=The URL is not valid and cannot be loaded.
+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.
 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.
--- a/mobile/overrides/appstrings.properties
+++ b/mobile/overrides/appstrings.properties
@@ -1,13 +1,13 @@
 # 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/.
 
-malformedURI=The URL is not valid and cannot be loaded.
+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.
 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.