Resolve shfit/reduce conflict in timespec production (#54)

[solanum.git] / include / messages.h

diff --git a/include/messages.h b/include/messages.h
index 0eba376cc359715629dc2d957891f4727c1696bc..dbdf704e299d9280674285a049f8be28b6971a24 100644 (file)
--- a/include/messages.h
+++ b/include/messages.h
@@ -54,7 +54,7 @@
 #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"
@@ -143,7 +143,7 @@
 #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_407      ":%s 407 %s %s :Too many recipients."
@@ -217,9 +217,9 @@
 #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"