From 9b6b7ed1efaa6345834a533872f2b0d4a1d6ef79 Mon Sep 17 00:00:00 2001
From: "rginda%netscape.com"
 <rginda%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 1 Sep 2007 17:28:23 +0000
Subject: [PATCH] bug 197108, land chatzilla 0.8.25, chatzilla only 160295
 chatzilla doesn't display nicknames in userlist when the 194184 nickname
 change doesn't affect screenname 194287 ChatZilla alters taken nickname only
 at the very first at 169804 Blank text area + Crtl+Enter in multi-text mode
 shows you 162251 Chatzilla doesnt start maximized 178313 /names command fails
 to show output for other channels 196265 message type([info],[error]) auto
 wrapped after localizat 197024 Multi/Single-line input mode ought to be
 configurable in 198843 Spelling mistake in Prefs > Chatzilla > Stalking

git-svn-id: svn://10.0.0.236/trunk@233575 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/irc/locales/en-US/chrome/pref-irc.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/extensions/irc/locales/en-US/chrome/pref-irc.dtd b/mozilla/extensions/irc/locales/en-US/chrome/pref-irc.dtd
index 7581b9fd5b4..9ab10291793 100644
--- a/mozilla/extensions/irc/locales/en-US/chrome/pref-irc.dtd
+++ b/mozilla/extensions/irc/locales/en-US/chrome/pref-irc.dtd
@@ -64,7 +64,7 @@
 <!ENTITY userDetails.title "User Identification">
 <!ENTITY userDetails.help.label "What do these mean?">
 <!ENTITY userDetails.help.accesskey "W">
-<!ENTITY userDetails.help.desc "Your hostmask, which is used to identify you to other clients and the server, places your user name before the host you are connecting from. So a user name of 'myself' would mean you would be identified as 'myself@host.tld', where 'host.tld' would be dependant on your internet service provider.">
+<!ENTITY userDetails.help.desc "Your hostmask, which is used to identify you to other clients and the server, places your user name before the host you are connecting from. So a user name of 'myself' would mean you would be identified as 'myself@host.tld', where 'host.tld' would be dependent on your internet service provider.">
 
 <!ENTITY userDetails.nick.label "Nick name:">
 <!ENTITY userDetails.nick.accesskey "N">
@@ -133,7 +133,7 @@
 <!ENTITY stalkWords.title "Stalk Words">
 <!ENTITY stalkWords.accesskey "S">
 
-<!ENTITY stalkWords.label1 "When ChatZilla sees an 'important' message, it will highlight the line and the channel's tab. If you have 'aggressive notify' enabled, ChatZilla will also use an OS-dependant method to grab your attention.">
+<!ENTITY stalkWords.label1 "When ChatZilla sees an 'important' message, it will highlight the line and the channel's tab. If you have 'aggressive notify' enabled, ChatZilla will also use an OS-dependent method to grab your attention.">
 <!ENTITY stalkWords.label2 "Your nickname is always considered 'important', but you can add more words; just add them to the list below.">
 
 <!ENTITY list.up.label "Move Up">