Disallow $ in usernames as this may cause problems with ban forwarding.

[solanum.git] / src / messages.tab

diff --git a/src/messages.tab b/src/messages.tab
index fe95da81dffc6ec87ca0381787adc9c1a5900c86..8e51e858edb953f56afcb26ac3363ef2b8336be0 100644 (file)
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -232,7 +232,7 @@ static  const char *  replies[] = {
 /* 209 RPL_TRACECLASS, */       "Class %s %d",
 /* 210 */       NULL,
 /* 211 RPL_STATSLINKINFO, */    NULL,
-/* 212 RPL_STATSCOMMANDS, */    "%s %u %u :%u",
+/* 212 RPL_STATSCOMMANDS, */    "%s %u %lu :%u",
 /* 213 RPL_STATSCLINE, */       "C %s %s %s %d %s",
 /* 214 RPL_STATSNLINE, */       NULL,
 /* 215 RPL_STATSILINE, */       "I %s %s %s@%s %d %s",
@@ -271,11 +271,11 @@ static  const char *  replies[] = {
 
 /* 248 RPL_STATSULINE, */       "U %s %s@%s %s",
 /* 249 RPL_STATSDEBUG */       NULL,
-/* 250 RPL_STATSCONN, */       ":Highest connection count: %d (%d clients) (%d connections received)",
+/* 250 RPL_STATSCONN, */       ":Highest connection count: %d (%d clients) (%lu connections received)",
 /* 251 RPL_LUSERCLIENT, */     ":There are %d users and %d invisible on %d servers",
 /* 252 RPL_LUSEROP, */          "%d :IRC Operators online",
 /* 253 RPL_LUSERUNKNOWN, */     "%d :unknown connection(s)",
-/* 254 RPL_LUSERCHANNELS, */    "%d :channels formed",
+/* 254 RPL_LUSERCHANNELS, */    "%lu :channels formed",
 /* 255 RPL_LUSERME, */          ":I have %d clients and %d servers",
 /* 256 RPL_ADMINME, */          ":Administrative info about %s",
 /* 257 RPL_ADMINLOC1, */        ":%s",
@@ -343,15 +343,15 @@ static  const char *  replies[] = {
 /* 319 RPL_WHOISCHANNELS, */    ":%s 319 %s %s :",
 /* 320 */      NULL,
 /* 321 RPL_LISTSTART, */        ":%s 321 %s Channel :Users  Name",
-/* 322 RPL_LIST, */             ":%s 322 %s %s %d :%s",
+/* 322 RPL_LIST, */             ":%s 322 %s %s%s %lu :%s",
 /* 323 RPL_LISTEND, */          ":%s 323 %s :End of /LIST",
 /* 324 RPL_CHANNELMODEIS, */    ":%s 324 %s %s %s",
-/* 325 */       NULL,
+/* 325 RPL_CHANNELMLOCKIS, */   ":%s 325 %s %s %s :is the current channel mode-lock",
 /* 326 */       NULL,
 /* 327 */       NULL,
 /* 328 RPL_CHANNELURL */       NULL,
 /* 329 RPL_CREATIONTIME, */    ":%s 329 %s %s %lu", 
-/* 330 RPL_WHOISLOGGEDIN */    ":%s 330 %s %s %s :is logged in as",
+/* 330 RPL_WHOISLOGGEDIN */    "%s %s :is logged in as",
 /* 331 RPL_NOTOPIC, */          ":%s 331 %s %s :No topic is set.",
 /* 332 RPL_TOPIC, */            ":%s 332 %s %s :%s",
 /* 333 RPL_TOPICWHOTIME, */     ":%s 333 %s %s %s %lu",
@@ -372,7 +372,11 @@ static  const char *  replies[] = {
 /* 348 RPL_EXCEPTLIST */        ":%s 348 %s %s %s %s %lu",
 /* 349 RPL_ENDOFEXCEPTLIST */   ":%s 349 %s %s :End of Channel Exception List",
 /* 350 */       NULL,
+#ifndef CUSTOM_BRANDING
 /* 351 RPL_VERSION, */          "%s(%s). %s :%s TS%dow %s",
+#else
+/* 351 RPL_VERSION, */          "%s(%s, %s). %s :%s TS%dow %s",
+#endif
 /* 352 RPL_WHOREPLY, */         ":%s 352 %s %s %s %s %s %s %s :%d %s",
 /* 353 RPL_NAMREPLY, */         ":%s 353 %s %s %s :",
 /* 354 RPL_WHOSPCRPL */         NULL,
@@ -402,7 +406,7 @@ static  const char *  replies[] = {
 /* 378 RPL_WHOISHOST, */        "%s :is connecting from *@%s %s",
 /* 379 */       NULL,
 /* 380 */       NULL,
-/* 381 RPL_YOUREOPER, */        ":%s 381 %s :You're a <censored> <censored> IRC operator! Did you know that? This message is FACTUAL.",
+/* 381 RPL_YOUREOPER, */        ":%s 381 %s :IRCOP FLAG TURN ON",
 /* 382 RPL_REHASHING, */        ":%s 382 %s %s :Rehashing",
 /* 383 */       NULL,
 /* 384 RPL_MYPORTIS, */                NULL,
@@ -515,7 +519,7 @@ static  const char *  replies[] = {
 /* 491 ERR_NOOPERHOST, */       ":No appropriate operator blocks were found for your host",
 /* 492 */       NULL,
 /* 493 */       NULL,
-/* 494 */       NULL,
+/* 494 ERR_OWNMODE, */          "%s :cannot answer you while you are %s, your message was not sent",
 /* 495 */       NULL,
 /* 496 */       NULL,
 /* 497 */       NULL,
@@ -763,7 +767,7 @@ static  const char *  replies[] = {
 /* 739 */      NULL,
 /* 740 RPL_RSACHALLENGE2*/     ":%s 740 %s :%s",
 /* 741 RPL_ENDOFRSACHALLENGE2*/        ":%s 741 %s :End of CHALLENGE",
-/* 742 */      NULL,
+/* 742 ERR_MLOCKRESTRICTED */  "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
 /* 743 */      NULL,
 /* 744 */      NULL,
 /* 745 */      NULL,