#define NUMERIC_STR_208 "<newtype> 0 %s"
#define NUMERIC_STR_209 "Class %s %d"
#define NUMERIC_STR_212 "%s %u %lu :%u"
-#define NUMERIC_STR_213 "C %s %s %s %d %s"
+#define NUMERIC_STR_213 "C %s %s %s %d %s %s"
#define NUMERIC_STR_215 "I %s %s %s@%s %d %s"
#define NUMERIC_STR_216 "%c %s * %s :%s%s%s"
#define NUMERIC_STR_217 "%c %d %s :%s"
#define NUMERIC_STR_218 "Y %s %d %d %d %u %d.%d %d.%d %u"
#define NUMERIC_STR_219 "%c :End of /STATS report"
-#define NUMERIC_STR_220 "%c %d %s %d :%s%s"
+#define NUMERIC_STR_220 "%c %d %s %d :%s%s%s"
#define NUMERIC_STR_221 "%s"
#define NUMERIC_STR_225 "%c %s :%s%s%s"
#define NUMERIC_STR_241 "L %s * %s 0 -1"
#define NUMERIC_STR_263 ":%s 263 %s %s :This command could not be completed because it has been used recently, and is rate-limited."
#define NUMERIC_STR_265 "%d %d :Current local users %d, max %d"
#define NUMERIC_STR_266 "%d %d :Current global users %d, max %d"
-#define NUMERIC_STR_270 "%s :%s"
+#define NUMERIC_STR_270 ":%s 270 %s %s :%s"
#define NUMERIC_STR_276 "%s :has client certificate fingerprint %s"
#define NUMERIC_STR_281 ":%s 281 %s %s"
#define NUMERIC_STR_282 ":%s 282 %s :End of /ACCEPT list."
#define NUMERIC_STR_317 "%s %ld %lu :seconds idle, signon time"
#define NUMERIC_STR_318 "%s :End of /WHOIS list."
#define NUMERIC_STR_319 ":%s 319 %s %s :"
-#define NUMERIC_STR_320 "%s :%s"
#define NUMERIC_STR_321 ":%s 321 %s Channel :Users Name"
#define NUMERIC_STR_322 ":%s 322 %s %s%s %lu :%s"
#define NUMERIC_STR_323 ":%s 323 %s :End of /LIST"
#define NUMERIC_STR_348 ":%s 348 %s %s %s %s %lu"
#define NUMERIC_STR_349 ":%s 349 %s %s :End of Channel Exception List"
#ifndef CUSTOM_BRANDING
-#define NUMERIC_STR_351 "%s(%s). %s :%s TS%dow %s"
+#define NUMERIC_STR_351 "%s(%s). %s :%s TS%dow"
#else
-#define NUMERIC_STR_351 "%s(%s,%s). %s :%s TS%dow %s"
+#define NUMERIC_STR_351 "%s(%s,%s). %s :%s TS%dow"
#endif
#define NUMERIC_STR_352 ":%s 352 %s %s %s %s %s %s %s :%d %s"
#define NUMERIC_STR_353 ":%s 353 %s %s %s :"
#define NUMERIC_STR_401 "%s :No such nick/channel"
#define NUMERIC_STR_402 "%s :No such server"
#define NUMERIC_STR_403 "%s :No such channel"
-#define NUMERIC_STR_404 "%s :Cannot send to channel"
+#define NUMERIC_STR_404 "%s :Cannot send to nick/channel"
#define NUMERIC_STR_405 ":%s 405 %s %s :You have joined too many channels"
-#define NUMERIC_STR_406 ":%s :There was no such nickname"
+#define NUMERIC_STR_406 "%s :There was no such nickname"
#define NUMERIC_STR_407 ":%s 407 %s %s :Too many recipients."
#define NUMERIC_STR_409 ":%s 409 %s :No origin specified"
#define NUMERIC_STR_410 ":%s 410 %s %s :Invalid CAP subcommand"
#define NUMERIC_STR_412 ":%s 412 %s :No text to send"
#define NUMERIC_STR_413 "%s :No toplevel domain specified"
#define NUMERIC_STR_414 "%s :Wildcard in toplevel Domain"
+#define NUMERIC_STR_415 "%s %s :Cannot send message to channel (+R) - you need to be logged into your NickServ account"
#define NUMERIC_STR_416 ":%s 416 %s %s :output too large, truncated"
#define NUMERIC_STR_421 ":%s 421 %s %s :Unknown command"
#define NUMERIC_STR_422 ":%s 422 %s :MOTD File is missing"
#define NUMERIC_STR_431 ":%s 431 %s :No nickname given"
#define NUMERIC_STR_432 ":%s 432 %s %s :Erroneous Nickname"
#define NUMERIC_STR_433 ":%s 433 %s %s :Nickname is already in use."
-#define NUMERIC_STR_435 "%s %s :Cannot change nickname while banned on channel"
+#define NUMERIC_STR_435 "%s %s :Cannot change nickname because you are banned or quieted while in this channel."
#define NUMERIC_STR_436 "%s :Nickname collision KILL"
#define NUMERIC_STR_437 ":%s 437 %s %s :Nick/channel is temporarily unavailable"
#define NUMERIC_STR_438 ":%s 438 %s %s %s :Nick change too fast. Please wait %d seconds."
#define NUMERIC_STR_457 ":%s 457 %s %s :is already on your accept list"
#define NUMERIC_STR_458 ":%s 458 %s %s :is not on your accept list"
#define NUMERIC_STR_461 ":%s 461 %s %s :Not enough parameters"
-#define NUMERIC_STR_462 ":%s 462 %s :You may not reregister"
+#define NUMERIC_STR_462 ":%s 462 %s :You are already connected and cannot handshake again"
#define NUMERIC_STR_464 ":%s 464 %s :Password Incorrect"
#define NUMERIC_STR_465 ":%s 465 %s :You are banned from this server- %s"
#define NUMERIC_STR_470 "%s %s :Forwarding to another channel"
#define NUMERIC_STR_473 ":%s 473 %s %s :Cannot join channel (+i) - you must be invited"
#define NUMERIC_STR_474 ":%s 474 %s %s :Cannot join channel (+b) - you are banned"
#define NUMERIC_STR_475 ":%s 475 %s %s :Cannot join channel (+k) - bad key"
-#define NUMERIC_STR_477 ":%s 477 %s %s :Cannot join channel (+r) - you need to be identified with services"
+#define NUMERIC_STR_477 ":%s 477 %s %s :Cannot join channel (+r) - you need to be logged into your NickServ account"
#define NUMERIC_STR_478 ":%s 478 %s %s %s :Channel ban list is full"
#define NUMERIC_STR_479 "%s :Illegal channel name"
#define NUMERIC_STR_480 ":%s 480 %s %s :Cannot join channel (+j) - throttle exceeded, try again later"
#define NUMERIC_STR_482 ":%s 482 %s %s :You're not a channel operator"
#define NUMERIC_STR_483 ":You can't kill a server!"
#define NUMERIC_STR_484 ":%s 484 %s %s %s :Cannot kick or deop a network service"
-#define NUMERIC_STR_486 "%s :You must log in with services to message this user"
+#define NUMERIC_STR_486 "%s :You must log into your NickServ account to message this user"
#define NUMERIC_STR_489 ":%s 489 %s %s :You're neither voiced nor channel operator"
#define NUMERIC_STR_491 ":No appropriate operator blocks were found for your host"
#define NUMERIC_STR_492 ":Cannot send to user %s (%s)"
#define NUMERIC_STR_501 ":%s 501 %s :Unknown MODE flag"
#define NUMERIC_STR_502 ":%s 502 %s :Can't change mode for other users"
#define NUMERIC_STR_504 ":%s 504 %s %s :User is not on this server"
-#define NUMERIC_STR_513 ":%s 513 %s :To connect type /QUOTE PONG %08lX"
+#define NUMERIC_STR_513 ":%s 513 %s :To connect type /QUOTE PONG %08X"
#define NUMERIC_STR_517 "%s :This command has been administratively disabled"
#define NUMERIC_STR_524 ":%s 524 %s %s :Help not found"
#define NUMERIC_STR_670 ":STARTTLS successful, proceed with TLS handshake"
#define NUMERIC_STR_713 "%s :Channel is open."
#define NUMERIC_STR_714 ":%s 714 %s %s :You are already on that channel."
#define NUMERIC_STR_715 ":%s 715 %s :KNOCKs are disabled."
-#define NUMERIC_STR_716 "%s :is in +g mode (server-side ignore.)"
+#define NUMERIC_STR_716 "%s :is in %s mode and must manually allow you to message them."
#define NUMERIC_STR_717 "%s :has been informed that you messaged them."
-#define NUMERIC_STR_718 ":%s 718 %s %s %s@%s :is messaging you, and you have umode +g."
+#define NUMERIC_STR_718 ":%s 718 %s %s %s@%s :is messaging you, and you have umode %s."
#define NUMERIC_STR_720 ":%s 720 %s :Start of OPER MOTD"
#define NUMERIC_STR_721 ":%s 721 %s :%s"
#define NUMERIC_STR_722 ":%s 722 %s :End of OPER MOTD"