From 6dc5e154318bf3c163a365b956db9fd2b975e971 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 19 Jul 2011 14:58:25 -0700
Subject: [PATCH] Bug 582048 - Follow up to fix spelling of Wi-Fi. r=mfinkle

---
 mobile/locales/en-US/chrome/overrides/netError.dtd | 6 +++---
 mobile/locales/en-US/chrome/phishing.dtd           | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mobile/locales/en-US/chrome/overrides/netError.dtd b/mobile/locales/en-US/chrome/overrides/netError.dtd
index f9b91f717e6..0490abf678c 100644
--- a/mobile/locales/en-US/chrome/overrides/netError.dtd
+++ b/mobile/locales/en-US/chrome/overrides/netError.dtd
@@ -18,7 +18,7 @@
   <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 device's data or wifi connection.</li>
+  <li>If you are unable to load any pages, check your device's data or Wi-Fi connection.</li>
 </ul>
 ">
 
@@ -96,7 +96,7 @@
 <!ENTITY proxyResolveFailure.longDesc2 "
 <ul>
   <li>Check the proxy settings to make sure that they are correct.</li>
-  <li>Check to make sure your device has a working data or WiFi connection.</li>
+  <li>Check to make sure your device has a working data or Wi-Fi connection.</li>
 </ul>
 ">
 
@@ -138,7 +138,7 @@ be temporary, and you can try again later.</li>
 <!ENTITY sharedLongDesc2 "
 <ul>
   <li>The site could be temporarily unavailable or too busy. Try again in a few moments.</li>
-  <li>If you are unable to load any pages, check your mobile device's data or wifi connection.</li>
+  <li>If you are unable to load any pages, check your mobile device's data or Wi-Fi connection.</li>
 </ul>
 ">
 
diff --git a/mobile/locales/en-US/chrome/phishing.dtd b/mobile/locales/en-US/chrome/phishing.dtd
index a022486be4c..5299348f440 100644
--- a/mobile/locales/en-US/chrome/phishing.dtd
+++ b/mobile/locales/en-US/chrome/phishing.dtd
@@ -21,6 +21,5 @@
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
 
 <!ENTITY safeb.blocked.phishingPage.title2 "Suspected Web Forgery!">
-<!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.phishingPage.shortDesc2 "Entering any personal information on this page may result in identity theft or other fraud.">
 <!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>">