Merge.

diff --git a/chanserv/chanserv_messages.h b/chanserv/chanserv_messages.h
index d2784ab31c56760b75a14d56c59600c7bb9447d6..696c69b2467899235ac80de1cc09626175307313 100644 (file)
--- a/chanserv/chanserv_messages.h
+++ b/chanserv/chanserv_messages.h
@@ -65,7 +65,7 @@ BeginMessages() {
   msg(QM_NOTPROTECTED, "Sorry, your nick $0 is not protected.", "s"),
   msg(QM_SAMEAUTH, "$0 is authed as $1. Cannot reclaim nick.", "ss"),
   msg(QM_AUTHFAIL, "Username or password incorrect.", ""),
-  msg(QM_AUTHOK, "You are now logged in as $0.", "s"),
+  msg(QM_AUTHOK, "You are now logged in as $0.\nRemember: NO-ONE from QuakeNet will ever ask for your password.  NEVER send your password to ANYONE except Q@CServe.quakenet.org.", "s"),
   msg(QM_NEWACCOUNT, "Account $0 created successfully.\nInformation about how to access and use your new account will be sent to your email address, $1.\nIf you do not see an email soon be sure to check your spam folder.", "ss"),
   msg(QM_AUTHNAMEINUSE, "Someone already has the account name $0!\nIf this is your account use AUTH to login, otherwise please change your nick using /NICK and try again.", "s"),
   msg(QM_ALREADYONCHAN, "You're already on $0.", "s"),