Merge default.

[irc/quakenet/newserv.git] / chanserv / chanserv_messages.h

diff --git a/chanserv/chanserv_messages.h b/chanserv/chanserv_messages.h
index 3fe68824a3f96205e14506d5434eaa84bade9d0f..e18dbac8b2553a927c2fd486f83b8c97d94fa85e 100644 (file)
--- a/chanserv/chanserv_messages.h
+++ b/chanserv/chanserv_messages.h
@@ -56,6 +56,7 @@ BeginMessages() {
   msg(QM_NOCHANBANAUTOREMOVE, "Bans on $0 will not be automatically removed.", "s"),
   msg(QM_INVALIDCHANNAME, "$0 is not a valid channel name.", "s"),
   msg(QM_ALREADYREGISTERED, "$0 is already registered.", "s"),
+  msg(QM_TOOMANYCHANNELS, "User is known on too many channels.", ""),
   msg(QM_CURUSERFLAGS, "User flags for $0: $1", "ss"),
   msg(QM_WELCOMEMESSAGEIS, "Welcome message for $0: $1", "ss"),
   msg(QM_GLOBALINFO, "Default info line: $0", "s"),
@@ -65,9 +66,9 @@ 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_NEWACCOUNT, "User $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, "A user with that name already exists. If you have said HELLO before, use AUTH to\nlogin, or REQUESTPASSWORD if you have forgotten the password. Otherwise,\nplease change your nick and try again.", ""),
+  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"),
   msg(QM_NOTONCHAN, "You're not on $0.", "s"),
   msg(QM_ALREADYOPPED, "You're already opped on $0.", "s"),
@@ -225,6 +226,23 @@ BeginMessages() {
   msg(QM_CONFIGURATIONERROR, "Configuration error, contact an IRC Operator.", ""),
   msg(QM_INVALIDHMAC, "The supplied login credentials are not valid (bad HMAC).", ""),
   msg(QM_PASSEMAILCHANGED, "Auth failed: account password has been changed since you logged in.", ""),
+  msg(QM_REASONREQUIRED, "Supply a decent reason.", ""),
+  msg(QM_BYPASSINGSUSPEND,"NOTE: $0 is suspended, bypassing suspension.", "s"),
+  msg(QM_ACHIEVEMENTUNLOCKED,"ACHIEVEMENT UNLOCKED: [$1] $0","sd"),
+  msg(QM_ACHIEVEMENTLISTHEADER,"User $0 has unlocked the following achievements:","s"),
+  msg(QM_ACHIEVEMENTLISTMEHEADER,"You have unlocked the following achievements:",""),
+  msg(QM_ACHIEVEMENTLISTEND,"End of list ($0 total achievement points).","d"),
+  msg(QM_NOACHIEVEMENTS,"User $0 does not have any achievements yet.","s"),
+  msg(QM_ACHIEVEMENTCOMPARETIE,"End of list.  It's a tie!",""),
+  msg(QM_ACHIEVEMENTCOMPARERESULT,"End of list.  User $0 is ahead by $1 points!", "sd"),
+  msg(QM_FEATOFSTRENGTHUNLOCKED,"FEAT OF STRENGTH: $0", "s"),
+  msg(QM_ACHCHANNELHEADER,"Achievement points for users on $0:\n  #  Nick            Username        Points","s"),
+  msg(QM_TITLEUNLOCKED,"TITLE UNLOCKED: $0", "s"),
+  msg(QM_NOTITLES,"You have not unlocked any titles.",""),
+  msg(QM_TITLEHEADER,"Available titles:\n  #  Title",""),
+  msg(QM_INVALIDTITLE,"Invalid title ID.",""),
+  msg(QM_TITLETOOFAST,"You have already changed your title recently.  Please wait a while and try again.",""),
+  msg(QM_INACTIVEACCOUNT,"This account has not yet been activated.",""),
 } 
 EndMessages()
 #endif