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

[solanum.git] / include / messages.h

diff --git a/include/messages.h b/include/messages.h
index 4f4455fa52ef37d86ec4e8453a2f5bdaf8767739..dbdf704e299d9280674285a049f8be28b6971a24 100644 (file)
--- a/include/messages.h
+++ b/include/messages.h
@@ -15,8 +15,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *   $Id: messages.tab 3548 2007-08-09 06:40:52Z nenolod $
  */
 
 #ifndef INCLUDED_messages_h
@@ -50,13 +48,13 @@
 #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"
@@ -89,6 +87,7 @@
 #define NUMERIC_STR_303      ":%s 303 %s :"
 #define NUMERIC_STR_305      ":You are no longer marked as being away"
 #define NUMERIC_STR_306      ":You have been marked as being away"
+#define NUMERIC_STR_310      "%s :is available for help."
 #define NUMERIC_STR_311      "%s %s %s * :%s"
 #define NUMERIC_STR_312      "%s %s :%s"
 #define NUMERIC_STR_313      "%s :%s"
@@ -130,7 +129,7 @@
 #define NUMERIC_STR_366      ":%s 366 %s %s :End of /NAMES list."
 #define NUMERIC_STR_367      ":%s 367 %s %s %s %s %lu"
 #define NUMERIC_STR_368      ":%s 368 %s %s :End of Channel Ban List"
-#define NUMERIC_STR_369      ":%s 369 %s %s :End of WHOWAS"
+#define NUMERIC_STR_369      "%s :End of WHOWAS"
 #define NUMERIC_STR_371      ":%s"
 #define NUMERIC_STR_372      ":%s 372 %s :- %s"
 #define NUMERIC_STR_374      ":End of /INFO list."
@@ -144,9 +143,9 @@
 #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 406 %s %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"
@@ -193,17 +192,18 @@
 #define NUMERIC_STR_486      "%s :You must log in with services 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_494      "%s :cannot answer you while you are %s, your message was not sent"
 #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_671      "%s :%s"
 #define NUMERIC_STR_691      ":%s"
-#define NUMERIC_STR_702      ":%s 702 %s %s 0x%lx %s %s"
+#define NUMERIC_STR_702      ":%s 702 %s %s 0x%lx %s%s :[Version %s] [Description: %s]"
 #define NUMERIC_STR_703      ":%s 703 %s :End of /MODLIST."
 #define NUMERIC_STR_704      ":%s 704 %s %s :%s"
 #define NUMERIC_STR_705      ":%s 705 %s %s :%s"
@@ -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"