Merge chanserv-live into default.

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

diff --git a/chanserv/chanserv_messages.h b/chanserv/chanserv_messages.h
index e18dbac8b2553a927c2fd486f83b8c97d94fa85e..cbd87f9734ca8ccd57e240f1e97952c731be63cc 100644 (file)
--- a/chanserv/chanserv_messages.h
+++ b/chanserv/chanserv_messages.h
@@ -18,6 +18,11 @@
 #define EndMessages() csrawmessages; extern char *defaultmessages[MAXMESSAGES*2];
 #endif
 
+/************************ DANGER WILL ROBINSON!!! **************************/
+/* if you want to add a new message you must add it at the end.            */
+/* also don't remove any, as these messages end up as ids in the database! */
+/************************ DANGER WILL ROBINSON!!! **************************/
+
 BeginMessages() {
   msg(QM_PROTECTED, "Channel $0 is protected by $1.", "ss"),
   msg(QM_UNKNOWNCMD, "Unknown command $0. Type SHOWCOMMANDS for a list of available commands.", "s"),
@@ -56,7 +61,6 @@ 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"),
@@ -107,7 +111,7 @@ BeginMessages() {
   msg(QM_MAILTHROTTLED, "Sorry, but you have already requested a password. You will have to wait atleast $0 hours, before requesting again.", "g"),
   msg(QM_MAILQUEUED, "Mail queued for delivery", ""),
   msg(QM_PWDONTMATCH, "Sorry, but passwords do not match", ""),
-  msg(QM_PWTOSHORT, "Sorry, but new password is to short", ""),
+  msg(QM_PWTOSHORT, "Sorry, but new password is too short", ""),
   msg(QM_PWCHANGED, "Ok, password changed", ""),
   msg(QM_INVALIDDURATION2, "Duration too long or invalid: $0", "s"),
   msg(QM_EMAILCHANGED, "Ok, email changed to \"$0\"", "s"),
@@ -243,6 +247,10 @@ BeginMessages() {
   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.",""),
+  msg(QM_PWTOLONG, "Sorry, but new password is too long (maximum length 10 chars)", ""),
+  msg(QM_TOOMANYCHANNELS, "User is known on too many channels.", ""),
+  msg(QM_PWINVALID, "Password contains invalid characters.", ""),
+  msg(QM_TOOMANYAUTHATTEMPTS, "Too many auth attempts -- reconnect to QuakeNet to try again.", ""),
 } 
 EndMessages()
 #endif