Merge "Fix bug 2248975, edits to load error HTML pages."
diff --git a/core/res/res/raw/loaderror.html b/core/res/res/raw/loaderror.html
index fd3d766..565e8e9 100644
--- a/core/res/res/raw/loaderror.html
+++ b/core/res/res/raw/loaderror.html
@@ -1,7 +1,7 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>Web page not available</title>
+ <title>Webpage not available</title>
<style type="text/css">
body { margin-top: 0px; padding-top: 0px; }
h2 { margin-top: 5px; padding-top: 0px; }
@@ -10,8 +10,8 @@
<body>
<img src="file:///android_asset/webkit/android-weberror.png" align="top" />
- <h2>Web page not available</h2>
- <p>The Web page at <a href="%s">%s</a> could not be loaded as:</p>
+ <h2>Webpage not available</h2>
+ <p>The webpage at <a href="%s">%s</a> could not be loaded because:</p>
<!-- The %e is replaced by a localized error string -->
<p>%e</p>
</body>
diff --git a/core/res/res/raw/nodomain.html b/core/res/res/raw/nodomain.html
index a71dbcd..d757483 100644
--- a/core/res/res/raw/nodomain.html
+++ b/core/res/res/raw/nodomain.html
@@ -1,7 +1,7 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>Web page not available</title>
+ <title>Webpage not available</title>
<style type="text/css">
body { margin-top: 0px; padding-top: 0px; }
h2 { margin-top: 5px; padding-top: 0px; }
@@ -10,18 +10,16 @@
<body>
<img src="file:///android_asset/webkit/android-weberror.png" align="top" />
- <h2>Web page not available</h2>
- <p>The Web page at <a href="%s">%s</a> might be
+ <h2>Webpage not available</h2>
+ <p>The webpage at <a href="%s">%s</a> might be
temporarily down or it may have moved permanently to a new web
address.</p>
- <p><b>Here are some suggestions:</b></p>
+ <p><b>Suggestions:</b></p>
<ul>
- <li>Check to make sure your device has a signal and data
- connection</li>
- <li>Reload this web page later.</li>
- <li>View a cached copy of the web page from Google</li>
-
+ <li>Make sure you have a data connection</li>
+ <li>Reload this webpage later</li>
+ <li>Check the address you entered</li>
</ul>
</body>
</head>