* Replacement and removal of defines from old eggdrop language system...

  (still more left)


svn: 2039

src/bg.c

@@ -100,7 +100,7 @@ writepid(const char *pidfile, pid_t pid)
     fprintf(fp, "%u\n", pid);
     if (fflush(fp)) {
       /* Kill bot incase a botchk is run from crond. */
-      printf(EGG_NOWRITE, pidfile);
+      printf("* Warning!  Could not write %s file!\n", pidfile);
       printf("  Try freeing some disk space\n");
       fclose(fp);
       unlink(pidfile);
@@ -108,7 +108,7 @@ writepid(const char *pidfile, pid_t pid)
     } else
       fclose(fp);
   } else
-    printf(EGG_NOWRITE, pidfile);
+    printf("* Warning!  Could not write %s file!\n", pidfile);
 }
 
 #if !defined(CYGWIN_HACKS) && !defined(__sun__)

src/botcmd.c

@@ -333,15 +333,12 @@ static void remote_tell_who(int idx, char *nick, int chan)
     botnet_send_priv(idx, conf.bot->nick, nick, NULL, "Admin: %s", admin);
   if (chan == 0) {
     botnet_send_priv(idx, conf.bot->nick, nick, NULL,
-		     "%s  (* = %s, + = %s, @ = %s)",
-		     BOT_PARTYMEMBS, MISC_OWNER, MISC_MASTER, MISC_OP);
+		     "Party line members:  (^ = admin, * = owner, + = master, @ = op)");
   } else {
       botnet_send_priv(idx, conf.bot->nick, nick, NULL,
-		       "%s %s%d:  (* = %s, + = %s, @ = %s)\n",
-		       BOT_PEOPLEONCHAN,
+		       "People on channel %s%d:  (^ = admin, * = owner, + = master, @ = op)\n",
 		       (chan < GLOBAL_CHANS) ? "" : "*",
-		       chan % GLOBAL_CHANS,
-		       MISC_OWNER, MISC_MASTER, MISC_OP);
+		       chan % GLOBAL_CHANS);
   }
   for (i = 0; i < dcc_total; i++) {
     if (dcc[i].type && dcc[i].type->flags & DCT_REMOTEWHO) {
@@ -355,15 +352,15 @@ static void remote_tell_who(int idx, char *nick, int chan)
 	  hrs = ((now - dcc[i].timeval) - (mydays * 86400)) / 3600;
 	  mins = ((now - dcc[i].timeval) - (hrs * 3600)) / 60;
 	  if (mydays > 0)
-	    sprintf(s + k, " (%s %lud%luh)", MISC_IDLE, mydays, hrs);
+	    sprintf(s + k, " (idle %lud%luh)", mydays, hrs);
 	  else if (hrs > 0)
-	    sprintf(s + k, " (%s %luh%lum)", MISC_IDLE, hrs, mins);
+	    sprintf(s + k, " (idle %luh%lum)", hrs, mins);
 	  else
-	    sprintf(s + k, " (%s %lum)", MISC_IDLE, mins);
+	    sprintf(s + k, " (idle %lum)", mins);
 	}
 	botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s", s);
 	if (dcc[i].u.chat->away != NULL)
-	  botnet_send_priv(idx, conf.bot->nick, nick, NULL, "      %s: %s", MISC_AWAY, dcc[i].u.chat->away);
+	  botnet_send_priv(idx, conf.bot->nick, nick, NULL, "      AWAY: %s", dcc[i].u.chat->away);
       }
     }
   }
@@ -392,13 +389,13 @@ static void remote_tell_who(int idx, char *nick, int chan)
 	if (now - dcc[i].timeval > 300) {
 	  k = (now - dcc[i].timeval) / 60;
 	  if (k < 60)
-	    sprintf(s + l, " (%s %dm)", MISC_IDLE, k);
+	    sprintf(s + l, " (idle %dm)", k);
 	  else
-	    sprintf(s + l, " (%s %dh%dm)", MISC_IDLE, k / 60, k % 60);
+	    sprintf(s + l, " (idle %dh%dm)", k / 60, k % 60);
 	}
 	botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s", s);
 	if (dcc[i].u.chat->away != NULL)
-	  botnet_send_priv(idx, conf.bot->nick, nick, NULL, "      %s: %s", MISC_AWAY, dcc[i].u.chat->away);
+	  botnet_send_priv(idx, conf.bot->nick, nick, NULL, "      AWAY: %s", dcc[i].u.chat->away);
       }
     }
   }
@@ -613,12 +610,12 @@ static void bot_nlinked(int idx, char *par)
   s[0] = 0;
   if (!next[0]) {
     putlog(LOG_BOTS, "*", "Invalid eggnet protocol from %s (zapfing)", dcc[idx].nick);
-    simple_sprintf(s, "%s %s (%s)", MISC_DISCONNECTED, dcc[idx].nick, MISC_INVALIDBOT);
+    simple_sprintf(s, "Disconnected %s (invalid bot)", dcc[idx].nick);
     dprintf(idx, "error invalid eggnet protocol for 'nlinked'\n");
   } else if ((in_chain(newbot)) || (!egg_strcasecmp(newbot, conf.bot->nick))) {
     /* Loop! */
-    putlog(LOG_BOTS, "*", "%s %s (mutual: %s)", BOT_LOOPDETECT, dcc[idx].nick, newbot);
-    simple_sprintf(s, "%s %s: disconnecting %s", MISC_LOOP, newbot, dcc[idx].nick);
+    putlog(LOG_BOTS, "*", "Loop detected %s (mutual: %s)", dcc[idx].nick, newbot);
+    simple_sprintf(s, "Detected loop: two bots exist named %s: disconnecting %s", newbot, dcc[idx].nick);
     dprintf(idx, "error Loop (%s)\n", newbot);
   }
   if (!s[0]) {
@@ -630,14 +627,14 @@ static void bot_nlinked(int idx, char *par)
       bogus = 1;
   }
   if (bogus) {
-    putlog(LOG_BOTS, "*", "%s %s!  (%s -> %s)", BOT_BOGUSLINK, dcc[idx].nick, next, newbot);
-    simple_sprintf(s, "%s: %s %s", BOT_BOGUSLINK, dcc[idx].nick, MISC_DISCONNECTED);
-    dprintf(idx, "error %s (%s -> %s)\n", BOT_BOGUSLINK, next, newbot);
+    putlog(LOG_BOTS, "*", "Bogus link notice from %s!  (%s -> %s)", dcc[idx].nick, next, newbot);
+    simple_sprintf(s, "Bogus link notice from: %s Disconnected", dcc[idx].nick);
+    dprintf(idx, "error Bogus link notice from (%s -> %s)\n", next, newbot);
   }
   if (s[0]) {
     chatout("*** %s\n", s);
     botnet_send_unlinked(idx, dcc[idx].nick, s);
-    dprintf(idx, "bye %s\n", BOT_ILLEGALLINK);
+    dprintf(idx, "bye Illegal link by leaf\n");
     killsock(dcc[idx].sock);
     lostdcc(idx);
     return;
@@ -827,10 +824,9 @@ static void bot_thisbot(int idx, char *par)
   if (egg_strcasecmp(par, dcc[idx].nick)) {
     char s[1024] = "";
 
-    putlog(LOG_BOTS, "*", NET_WRONGBOT, dcc[idx].nick, par);
-    dprintf(idx, "bye %s\n", MISC_IMPOSTER);
-    simple_sprintf(s, "%s %s (%s)", MISC_DISCONNECTED, dcc[idx].nick,
-		   MISC_IMPOSTER);
+    putlog(LOG_BOTS, "*", "Wrong bot--wanted %s, got %s", dcc[idx].nick, par);
+    dprintf(idx, "bye imposter\n");
+    simple_sprintf(s, "Disconnected %s (imposter)", dcc[idx].nick);
     chatout("*** %s\n", s);
     botnet_send_unlinked(idx, dcc[idx].nick, s);
     unvia(idx, findbot(dcc[idx].nick));

src/botmsg.c

@@ -485,7 +485,7 @@ int add_note(char *to, char *from, char *msg, int idx, int echo)
   }
   if (!(u = get_user_by_handle(userlist, to))) {
     if (idx >= 0)
-      dprintf(idx, USERF_UNKNOWN);
+      dprintf(idx, "I don't know anyone by that name.\n");
     return NOTE_ERROR;
   }
   if (is_bot(u)) {

src/botnet.c

@@ -508,8 +508,7 @@ void answer_local_whom(int idx, int chan)
         dprintf(idx, format, c, party[i].nick, (party[i].chan == 0) && (chan == (-1)) ? '+' : ' ', idle);
 
       if (party[i].status & PLSTAT_AWAY)
-	dprintf(idx, "   %s: %s\n", MISC_AWAY,
-		party[i].away ? party[i].away : "");
+	dprintf(idx, "   AWAY: %s\n", party[i].away ? party[i].away : "");
     }
   }
   dprintf(idx, "Total users: %d\n", total);
@@ -956,7 +955,7 @@ int botlink(char *linker, int idx, char *nick)
       dprintf(idx, "%s\n", BOT_CANTLINKMYSELF);
   } else if (in_chain(nick) && (idx != -3)) {
     if (idx >= 0)
-      dprintf(idx, "%s\n", BOT_ALREADYLINKED);
+      dprintf(idx, "That bot is already connected up.\n");
   } else {
     register int i;
 
@@ -965,7 +964,7 @@ int botlink(char *linker, int idx, char *nick)
 	  ((dcc[i].type == &DCC_FORK_BOT) ||
 	   (dcc[i].type == &DCC_BOT_NEW))) {
 	if (idx >= 0)
-	  dprintf(idx, "%s\n", BOT_ALREADYLINKING);
+	  dprintf(idx, "Already linking to that bot\n");
 	return 0;
       }
     }
@@ -974,9 +973,8 @@ int botlink(char *linker, int idx, char *nick)
 
     if (!bi || !strlen(bi->address) || !bi->telnet_port || (bi->telnet_port <= 0)) {
       if (idx >= 0) {
-	dprintf(idx, "%s '%s'.\n", BOT_NOTELNETADDY, nick);
-	dprintf(idx, "%s .chaddr %s %s\n",
-		MISC_USEFORMAT, nick, MISC_CHADDRFORMAT);
+	dprintf(idx, "Invalid telnet address:port stored for '%s'.\n", nick);
+	dprintf(idx, "Use: %schaddr %s <address>:<port#>[/<relay-port#>]\n", settings.dcc_prefix, nick);
       }
     } else if (dcc_total == max_dcc) {
       if (idx >= 0)
@@ -985,7 +983,7 @@ int botlink(char *linker, int idx, char *nick)
       correct_handle(nick);
 
       if (idx > -2)
-	putlog(LOG_BOTS, "*", "%s %s at %s:%d ...", BOT_LINKING, nick,
+	putlog(LOG_BOTS, "*", "Linking to %s at %s:%d ...", nick,
 	       bi->address, bi->telnet_port);
 
       i = new_dcc(&DCC_DNSWAIT, sizeof(struct dns_info));
@@ -1077,8 +1075,7 @@ static void failed_tandem_relay(int idx)
       uidx = i;
   }
   if (uidx < 0) {
-    putlog(LOG_MISC, "*", "%s  %d -> %d", BOT_CANTFINDRELAYUSER,
-	   dcc[idx].sock, dcc[idx].u.relay->sock);
+    putlog(LOG_MISC, "*", "Can't find user for relay!  %d -> %d", dcc[idx].sock, dcc[idx].u.relay->sock);
     killsock(dcc[idx].sock);
     lostdcc(idx);
     return;
@@ -1086,7 +1083,7 @@ static void failed_tandem_relay(int idx)
   if (dcc[idx].port >= dcc[idx].u.relay->port + 3) {
     struct chat_info *ci = dcc[uidx].u.relay->chat;
 
-    dprintf(uidx, "%s %s.\n", BOT_CANTLINKTO, dcc[idx].nick);
+    dprintf(uidx, "Could not link to %s.\n", dcc[idx].nick);
     dcc[uidx].status = dcc[uidx].u.relay->old_status;
     free(dcc[uidx].u.relay);
     dcc[uidx].u.chat = ci;
@@ -1137,9 +1134,8 @@ void tandem_relay(int idx, char *nick, register int i)
   struct bot_addr *bi = (struct bot_addr *) get_user(&USERENTRY_BOTADDR, u);
 
   if (!bi || !strlen(bi->address) || !bi->relay_port || (bi->relay_port <= 0)) {
-    dprintf(idx, "%s '%s'.\n", BOT_NOTELNETADDY, nick);
-    dprintf(idx, "%s .chaddr %s %s\n",
-	    MISC_USEFORMAT, nick, MISC_CHADDRFORMAT);
+    dprintf(idx, "Invalid telnet address:port stored for '%s'.\n", nick);
+    dprintf(idx, "Use: %schaddr %s <address>:<port#>[/<relay-port#>]\n", settings.dcc_prefix, nick);
 
     return;
   }
@@ -1159,7 +1155,7 @@ void tandem_relay(int idx, char *nick, register int i)
   strcpy(dcc[i].host, bi->address);
   if (conf.bot->hub) 
     dprintf(idx, "%s %s @ %s:%d ...\n", BOT_CONNECTINGTO, nick, bi->address, bi->relay_port);
-  dprintf(idx, "%s\n", BOT_BYEINFO1);
+  dprintf(idx, "(Type *BYE* on a line by itself to abort.)\n");
   dcc[idx].type = &DCC_PRE_RELAY;
 
   struct chat_info *ci = dcc[idx].u.chat;
@@ -1190,7 +1186,7 @@ static void tandem_relay_dns_callback(int id, void *client_data, const char *hos
     idx = dcc[i].u.dns->ibuf;
   
   if (idx < 0) {
-    putlog(LOG_MISC, "*", "%s  %d -> %d", BOT_CANTFINDRELAYUSER, i, idx);
+    putlog(LOG_MISC, "*", "Can't find user for relay!  %d -> %d", i, idx);
     lostdcc(i);
     return;
   }
@@ -1198,7 +1194,7 @@ static void tandem_relay_dns_callback(int id, void *client_data, const char *hos
   if (!ips) {
     struct chat_info *ci = dcc[idx].u.relay->chat;
 
-    dprintf(idx, "%s %s.\n", BOT_CANTLINKTO, dcc[i].nick);
+    dprintf(idx, "Could not link to %s.\n", dcc[i].nick);
     dcc[idx].status = dcc[idx].u.relay->old_status;
     free(dcc[idx].u.relay);
     dcc[idx].u.chat = ci;
@@ -1215,7 +1211,7 @@ static void tandem_relay_dns_callback(int id, void *client_data, const char *hos
 
   if (dcc[i].sock < 0) {
     lostdcc(i);
-    dprintf(idx, "%s\n", MISC_NOFREESOCK);
+    dprintf(idx, "No free sockets available.\n");
     return;
   }
 
@@ -1265,8 +1261,7 @@ static void pre_relay(int idx, char *buf, register int len)
     }
   }
   if (tidx < 0) {
-    putlog(LOG_MISC, "*", "%s  %d -> %d", BOT_CANTFINDRELAYUSER,
-	   dcc[idx].sock, dcc[idx].u.relay->sock);
+    putlog(LOG_MISC, "*", "Can't find user for relay!  %d -> %d", dcc[idx].sock, dcc[idx].u.relay->sock);
     killsock(dcc[idx].sock);
     lostdcc(idx);
     return;
@@ -1275,9 +1270,9 @@ static void pre_relay(int idx, char *buf, register int len)
     /* Disconnect */
     struct chat_info *ci = dcc[idx].u.relay->chat;
 
-    dprintf(idx, "%s %s.\n", BOT_ABORTRELAY1, dcc[tidx].nick);
-    dprintf(idx, "%s %s.\n\n", BOT_ABORTRELAY2, conf.bot->nick);
-    putlog(LOG_MISC, "*", "%s %s -> %s", BOT_ABORTRELAY3, dcc[idx].nick, dcc[tidx].nick);
+    dprintf(idx, "Aborting relay attempt to %s.\n", dcc[tidx].nick);
+    dprintf(idx, "You are now back on %s.\n\n", conf.bot->nick);
+    putlog(LOG_MISC, "*", "Relay aborted: %s -> %s", dcc[idx].nick, dcc[tidx].nick);
     dcc[idx].status = dcc[idx].u.relay->old_status;
     free(dcc[idx].u.relay);
     dcc[idx].u.chat = ci;
@@ -1311,8 +1306,7 @@ static void failed_pre_relay(int idx)
     }
   }
   if (tidx < 0) {
-    putlog(LOG_MISC, "*", "%s  %d -> %d", BOT_CANTFINDRELAYUSER,
-	   dcc[idx].sock, dcc[idx].u.relay->sock);
+    putlog(LOG_MISC, "*", "Can't find user for relay!  %d -> %d", dcc[idx].sock, dcc[idx].u.relay->sock);
     killsock(dcc[idx].sock);
     lostdcc(idx);
     return;
@@ -1347,8 +1341,7 @@ static void cont_tandem_relay(int idx, char *buf, register int len)
   }
 
   if (uidx < 0) {
-    putlog(LOG_MISC, "*", "%s  %d -> %d", BOT_CANTFINDRELAYUSER,
-	   dcc[idx].sock, dcc[idx].u.relay->sock);
+    putlog(LOG_MISC, "*", "Can't find user for relay!  %d -> %d", dcc[idx].sock, dcc[idx].u.relay->sock);
     killsock(dcc[idx].sock);
     lostdcc(idx);
     return;
@@ -1357,7 +1350,7 @@ static void cont_tandem_relay(int idx, char *buf, register int len)
   dcc[idx].u.relay->sock = dcc[uidx].sock;
   dcc[uidx].u.relay->sock = dcc[idx].sock;
   dprintf(uidx, "%s %s ...\n", BOT_RELAYSUCCESS, dcc[idx].nick);
-  dprintf(uidx, "%s\n\n", BOT_BYEINFO2);
+  dprintf(uidx, "(You can type *BYE* to prematurely close the connection.)\n\n");
   putlog(LOG_MISC, "*", "%s %s -> %s", BOT_RELAYLINK,
 	 dcc[uidx].nick, dcc[idx].nick);
 
@@ -1365,8 +1358,7 @@ static void cont_tandem_relay(int idx, char *buf, register int len)
   dcc[uidx].type = &DCC_CHAT;
   dcc[uidx].u.chat = ri->chat;
   if (dcc[uidx].u.chat->channel >= 0) {
-    chanout_but(-1, dcc[uidx].u.chat->channel, "*** %s %s\n",
-		dcc[uidx].nick, BOT_PARTYLEFT);
+    chanout_but(-1, dcc[uidx].u.chat->channel, "*** %s left the party line.\n", dcc[uidx].nick);
     if (dcc[uidx].u.chat->channel < GLOBAL_CHANS)
       botnet_send_part_idx(uidx, NULL);
   }
@@ -1488,7 +1480,7 @@ static void dcc_relaying(int idx, char *buf, int j)
   if (dcc[idx].status & STAT_TELNET)
     dprintf(idx, TLN_IAC_C TLN_WONT_C TLN_ECHO_C "\n");
   dprintf(idx, "\n(%s %s.)\n", BOT_BREAKRELAY, dcc[j].nick);
-  dprintf(idx, "%s %s.\n\n", BOT_ABORTRELAY2, conf.bot->nick);
+  dprintf(idx, "You are now back on %s.\n\n", conf.bot->nick);
   putlog(LOG_MISC, "*", "%s: %s -> %s", BOT_RELAYBROKEN, dcc[idx].nick, dcc[j].nick);
   if (dcc[idx].u.relay->chat->channel >= 0) {
     chanout_but(-1, dcc[idx].u.relay->chat->channel, "*** %s joined the party line.\n", dcc[idx].nick);

src/chanprog.c

@@ -238,14 +238,14 @@ void tell_verbose_uptime(int idx)
   sprintf(&s[strlen(s)], "%02d:%02d", (int) hr, (int) min);
   s1[0] = 0;
   if (backgrd)
-    strcpy(s1, MISC_BACKGROUND);
+    strcpy(s1, "background");
   else {
     if (term_z)
-      strcpy(s1, MISC_TERMMODE);
+      strcpy(s1, "terminal mode");
     else
-      strcpy(s1, MISC_LOGMODE);
+      strcpy(s1, "log dump mode");
   }
-  dprintf(idx, "%s %s  (%s)\n", MISC_ONLINEFOR, s, s1);
+  dprintf(idx, "Online for %s  (%s)\n", s, s1);
 }
 
 /* Dump status info out to dcc
@@ -295,12 +295,12 @@ void tell_verbose_status(int idx)
   sprintf(&s[strlen(s)], "%02d:%02d", (int) hr, (int) min);
   s1[0] = 0;
   if (backgrd)
-    strcpy(s1, MISC_BACKGROUND);
+    strcpy(s1, "background");
   else {
     if (term_z)
-      strcpy(s1, MISC_TERMMODE);
+      strcpy(s1, "terminal mode");
     else
-      strcpy(s1, MISC_LOGMODE);
+      strcpy(s1, "log dump mode");
   }
 #if HAVE_GETRUSAGE
   getrusage(RUSAGE_SELF, &ru);
@@ -317,8 +317,8 @@ void tell_verbose_status(int idx)
   simple_sprintf(s2, "CPU ???");
 # endif
 #endif /* HAVE_GETRUSAGE */
-  dprintf(idx, "%s %s  (%s)  %s  %s %4.1f%%\n", MISC_ONLINEFOR,
-	  s, s1, s2, MISC_CACHEHIT,
+  dprintf(idx, "Online for %s  (%s)  %s  cache hit %4.1f%%\n",
+	  s, s1, s2,
 	  100.0 * ((float) cache_hit) / ((float) (cache_hit + cache_miss)));
 
   if (admin[0])
@@ -343,9 +343,9 @@ void tell_settings(int idx)
   fr.global = default_flags;
 
   build_flags(s, &fr, NULL);
-  dprintf(idx, "%s [%s]\n", MISC_NEWUSERFLAGS, s);
+  dprintf(idx, "New users get flags [%s]\n", s);
   if (conf.bot->hub && owner[0])
-    dprintf(idx, "%s: %s\n", MISC_PERMOWNER, owner);
+    dprintf(idx, "Permanent owner(s): %s\n", owner);
   dprintf(idx, "Ignores last %li mins\n", ignore_time);
 }
 
@@ -579,7 +579,7 @@ void reload()
   FILE *f = fopen(userfile, "r");
 
   if (f == NULL) {
-    putlog(LOG_MISC, "*", MISC_CANTRELOADUSER);
+    putlog(LOG_MISC, "*", "Can't reload user file!");
     return;
   }
   fclose(f);
@@ -590,7 +590,7 @@ void reload()
   loading = 1;
   checkchans(0);
   if (!readuserfile(userfile, &userlist))
-    fatal(MISC_MISSINGUSERF, 0);
+    fatal("User file is missing!", 0);
   Auth::FillUsers();
   checkchans(1);
   loading = 0;

src/cmds.c

@@ -60,13 +60,11 @@ static void tell_who(int idx, int chan)
   char s[1024] = "";
 
   if (!chan)
-    dprintf(idx, "%s  (* = %s, + = %s, @ = %s)\n", BOT_PARTYMEMBS, MISC_OWNER, MISC_MASTER, MISC_OP);
+    dprintf(idx, "Party line members:  (^ = admin, * = owner, + = master, @ = op)\n");
   else {
-    dprintf(idx, "%s %s%d:  (* = %s, + = %s, @ = %s)\n",
-                      BOT_PEOPLEONCHAN,
+    dprintf(idx, "People on channel %s%d:  (^ = admin, * = owner, + = master, @ = op)\n",
                       (chan < GLOBAL_CHANS) ? "" : "*",
-                      chan % GLOBAL_CHANS,
-                      MISC_OWNER, MISC_MASTER, MISC_OP);
+                      chan % GLOBAL_CHANS);
   }
 
   /* calculate max nicklen */

src/dcc.c

@@ -1211,7 +1211,7 @@ detect_telnet_flood(char *floodhost)
     lasttelnets = 0;
     lasttelnettime = 0;
     lasttelnethost[0] = 0;
-    putlog(LOG_MISC, "*", IRC_TELNETFLOOD, floodhost);
+    putlog(LOG_MISC, "*", "Telnet connection flood from %s!  Placing on ignore!", floodhost);
     addignore(floodhost, origbotname, "Telnet connection flood", now + (60 * ignore_time));
     return 1;
   }

src/dccutil.c

@@ -650,7 +650,7 @@ detect_dcc_flood(time_t * timer, struct chat_info *chat, int idx)
     chat->msgs_per_sec++;
     if (chat->msgs_per_sec > dcc_flood_thr) {
       /* FLOOD */
-      dprintf(idx, "*** FLOOD: %s.\n", IRC_GOODBYE);
+      dprintf(idx, "*** FLOOD: Goodbye.\n");
       /* Evil assumption here that flags&DCT_CHAT implies chat type */
       if ((dcc[idx].type->flags & DCT_CHAT) && chat && (chat->channel >= 0)) {
         char x[1024];

src/lang.h

@@ -7,275 +7,8 @@
 #define _EGG_LANG_H
 
 
-#define DETEST			"WORKS"
 
-#define MISC_USAGE		"Usage"
-#define MISC_FAILED		"Failed.\n"
 
-/* Userfile messages
- */
-#define USERF_XFERDONE		"Userlist transfer complete; switched over"
-/* was: USERF_BADREREAD - 0x401 */
-#define USERF_CANTREAD		"CAN'T READ NEW USERFILE"
-#define USERF_CANTSEND		"Can't send userfile to you (internal error)"
-#define USERF_NOMATCH		"Can't find anyone matching that"
-#define USERF_INVALID		"Invalid userfile format."
-#define USERF_CORRUPT		"Corrupt user record"
-#define USERF_DUPE		"Duplicate user record"
-#define USERF_BROKEPASS		"Corrupted password reset for"
-#define USERF_IGNBANS		"Ignored masks for channel(s):"
-#define USERF_WRITING		"Writing user file..."
-#define USERF_ERRWRITE		"ERROR writing user file."
-#define USERF_ERRWRITE2		"ERROR writing user file to transfer."
-#define USERF_NONEEDNEW		"Userfile creation not necessary--skipping"
-#define USERF_REHASHING		"Rehashing..."
-#define USERF_UNKNOWN		"I don't know anyone by that name.\n"
-#define USERF_NOUSERREC		"No user record."
-#define USERF_BACKUP		"Backing up user file..."
-#define USERF_FAILEDXFER	"Failed connection; aborted userfile transfer."
-#define USERF_OLDSHARE		"Old style share request by"
-#define USERF_ANTIQUESHARE	"Antiquated sharing request"
-#define USERF_REJECTED		"User file rejected by"
-
-/* Misc messages
- */
-
-#define USERF_OLDFMT		"boring...."
-#define MISC_EXPIRED		"expired"
-#define MISC_TOTAL		"total"
-#define MISC_ERASED		"Erased"
-/* was: MISC_LEFT - 0x503 */
-#define MISC_ONLOCALE		"on"
-#define MISC_MATCHING		"Matching"
-#define MISC_SKIPPING		"skipping first"
-#define MISC_TRUNCATED		"(more than %d matches; list truncated)\n"
-#define MISC_FOUNDMATCH		"--- Found %d match%s.\n"
-#define MISC_AMBIGUOUS		"Ambiguous command.\n"
-#define MISC_NOSUCHCMD		"What?  You need 'help'\n"
-#define MISC_CMDBINDS		"Command bindings:\n"
-#define MISC_RESTARTING		"Restarting..."
-#define MISC_MATCH_PLURAL	"es"
-#define MISC_LOGSWITCH		"Switching logfiles..."
-#define MISC_OWNER		"owner"
-#define MISC_MASTER		"master"
-#define MISC_OP			"op"
-#define MISC_IDLE		"idle"
-#define MISC_AWAY		"AWAY"
-/* was: MISC_IGNORING - 0x514 */
-/* was: MISC_UNLINKED - 0x515 */
-#define MISC_DISCONNECTED	"Disconnected"
-#define MISC_INVALIDBOT		"invalid bot"
-#define MISC_LOOP		"Detected loop: two bots exist named"
-/* was: MISC_MUTUAL - 0x519 */
-#define MISC_FROM		"from"
-#define MISC_OUTDATED		"outdated"
-#define MISC_REJECTED		"rejected"
-#define MISC_IMPOSTER		"imposter"
-#define MISC_TRYING		"trying"
-#define MISC_MOTDFILE		"MOTD file:"
-#define MISC_NOMOTDFILE		"No MOTD file."
-#define MISC_USEFORMAT		"Use:"
-#define MISC_CHADDRFORMAT	"<address>:<port#>[/<relay-port#>]"
-/* was: MISC_UNKNOWN - 0x523 */
-/* was: MISC_CHANNELS - 0x524 */
-/* was: MISC_TRYINGMISTAKE - 0x525 */
-#define MISC_PENDING		"pending"
-#define MISC_JOINING            "joining"
-#define MISC_WANTOPS		"want ops!"
-#define MISC_LURKING		"lurking"
-#define MISC_BACKGROUND		"background"
-#define MISC_TERMMODE		"terminal mode"
-#define MISC_STATMODE		"status mode"
-#define MISC_LOGMODE		"log dump mode"
-#define MISC_ONLINEFOR		"Online for"
-#define MISC_CACHEHIT		"cache hit"
-#define MISC_TCLLIBRARY		"Tcl library:"
-#define MISC_NEWUSERFLAGS	"New users get flags"
-#define MISC_NOTIFY		"notify"
-#define MISC_PERMOWNER		"Permanent owner(s)"
-/* was: MISC_ROOTWARN - 0x533 */
-#define MISC_NOUSERFILE		"USER FILE NOT FOUND!  (try './eggdrop -m %s' to make one)\n"
-#define MISC_NOUSERFILE2	"STARTING BOT IN USERFILE CREATION MODE.\nTelnet to the bot and enter 'NEW' as your nickname."
-#define MISC_USERFCREATE1	"OR go to IRC and type:  /msg %s hello\n"
-#define MISC_USERFCREATE2	"This will make the bot recognize you as the master."
-#define MISC_USERFEXISTS	"USERFILE ALREADY EXISTS (drop the '-m')"
-#define MISC_CANTWRITETEMP	"CAN'T WRITE TO TEMP DIR"
-#define MISC_CANTRELOADUSER	"Can't reload user file!"
-#define MISC_MISSINGUSERF	"User file is missing!"
-/* was: MISC_BOTSCONNECTED - 0x53d */
-#define MISC_BANNER		"%B  (%E)\n\nPlease enter your nickname.\n"
-#define MISC_CLOGS		"Cycling logfile %s, over max-logsize (%d)"
-#define MISC_BANNER_STEALTH	"\nNickname.\n"
-#define MISC_LOGREPEAT		"Last message repeated %d time(s).\n"
-#define MISC_JUPED		"juped"
-#define MISC_NOFREESOCK		"No free sockets available."
-#define MISC_TCLVERSION		"Tcl version:"
-#define MISC_TCLHVERSION	"header version"
-
-/* IRC */
-#define IRC_BANNED		"Banned"
-#define IRC_YOUREBANNED		"You are banned"
-/* BOT log messages when attempting to place a ban which matches me */
-#define IRC_IBANNEDME		"Wanted to ban myself--deflected."
-#define IRC_FUNKICK		"that was fun, let's do it again!"
-#define IRC_HI			"Hi"
-#define IRC_GOODBYE		"Goodbye"
-#define IRC_BANNED2		"You're banned, goober."
-#define IRC_NICKTOOLONG		"NOTICE %s :Your nick was too long and therefore it was truncated to '%s'.\n"
-#define IRC_INTRODUCED		"Introduced to"
-#define IRC_COMMONSITE		"common site"
-#define IRC_SALUT1		"NOTICE %s :Hi %s!  I'm %s, an eggdrop bot.\n"
-#define IRC_SALUT2		"NOTICE %s :I'll recognize you by hostmask '%s' from now on.\n"
-#define IRC_SALUT2A		"Since you come from a common irc site, this means you should"
-#define IRC_SALUT2B		"always use this nickname when talking to me."
-#define IRC_INITOWNER1		"YOU ARE THE OWNER ON THIS BOT NOW"
-#define IRC_INIT1		"Bot installation complete, first master is %s"
-#define IRC_INITNOTE		"Welcome to Eggdrop! =]"
-#define IRC_INITINTRO		"introduced to %s from %s"
-#define IRC_PASS		"You have a password set."
-#define IRC_NOPASS		"You don't have a password set."
-/* was: IRC_NOPASS2 - 0x614 */
-#define IRC_EXISTPASS		"You already have a password set."
-#define IRC_PASSFORMAT		"Please use at least 6 characters."
-#define IRC_SETPASS		"Password set to:"
-#define IRC_FAILPASS		"Incorrect password."
-#define IRC_CHANGEPASS		"Password changed to:"
-#define IRC_FAILCOMMON		"You're at a common site; you can't IDENT."
-#define IRC_MISIDENT		"NOTICE %s :You're not %s, you're %s.\n"
-#define IRC_DENYACCESS		"Access denied."
-#define IRC_RECOGNIZED		"I recognize you there."
-#define IRC_ADDHOSTMASK		"Added hostmask"
-/* was: IRC_DELMAILADDR - 0x61f */
-#define IRC_FIELDCURRENT	"Currently:"
-#define IRC_FIELDCHANGED	"Now:"
-#define IRC_FIELDTOREMOVE	"To remove it:"
-/* was: IRC_NOEMAIL - 0x623 */
-#define IRC_INFOLOCKED		"Your info line is locked"
-#define IRC_REMINFOON		"Removed your info line on"
-#define IRC_REMINFO		"Removed your info line."
-#define IRC_NOINFOON		"You have no info set on"
-#define IRC_NOINFO		"You have no info set."
-#define IRC_NOMONITOR		"I don't monitor that channel."
-#define IRC_RESETCHAN		"Resetting channel info."
-#define IRC_JUMP		"Jumping servers..."
-#define IRC_CHANHIDDEN		"Channel is currently hidden."
-#define IRC_ONCHANNOW		"Now on channel"
-#define IRC_NEVERJOINED		"Never joined one of my channels."
-#define IRC_LASTSEENAT		"Last seen at"
-#define IRC_DONTKNOWYOU		"I don't know you; please introduce yourself first."
-#define IRC_NOHELP		"No help."
-#define IRC_NOHELP2		"No help available on that."
-#define IRC_NOTONCHAN		"Not on that channel right now."
-#define IRC_GETORIGNICK		"Switching back to nick %s"
-#define IRC_BADBOTNICK		"Server says my nickname is invalid."
-#define IRC_BOTNICKINUSE	"NICK IN USE: Trying '%s'"
-#define IRC_BOTNICKJUPED	"Nickname has been juped"
-#define IRC_CHANNELJUPED	"Channel %s is juped. :("
-#define IRC_NOTREGISTERED1	"%s says I'm not registered, trying next one."
-#define	IRC_NOTREGISTERED2	"The server says we are not registered yet.."
-#define IRC_FLOODIGNORE1	"Flood from @%s!  Placing on ignore!"
-/* was: IRC_FLOODIGNORE2 - 0x63e */
-#define IRC_FLOODIGNORE3	"JOIN flood from @%s!  Banning."
-#define IRC_FLOODKICK		"Channel flood from %s -- kicking"
-#define IRC_SERVERTRY		"Trying server"
-#define IRC_DNSFAILED		"DNS lookup failed"
-#define IRC_FAILEDCONNECT	"Failed connect to"
-#define IRC_SERVERSTONED	"Server got stoned; jumping..."
-#define IRC_DISCONNECTED	"Disconnected from"
-#define IRC_NOSERVER		"No server currently."
-#define IRC_MODEQUEUE		"Mode queue is at"
-#define IRC_SERVERQUEUE		"Server queue is at"
-#define IRC_HELPQUEUE		"Help queue is at"
-/* was: IRC_BOTNOTONIRC - 0x64a */
-#define IRC_NOTACTIVECHAN	"Not active on channel"
-#define IRC_PROCESSINGCHAN	"Processing channel"
-#define IRC_CHANNEL		"Channel"
-#define IRC_DESIRINGCHAN	"Desiring channel"
-#define IRC_CHANNELTOPIC	"Channel Topic"
-#define IRC_PENDINGOP		"pending +o -- I'm lagged"
-#define IRC_PENDINGDEOP		"pending -o -- I'm lagged"
-#define IRC_PENDINGKICK		"pending kick"
-#define IRC_FAKECHANOP		"FAKE CHANOP GIVEN BY SERVER"
-#define IRC_ENDCHANINFO		"End of channel info."
-#define IRC_MASSKICK		"mass kick, go sit in a corner"
-#define IRC_REMOVEDBAN		"Removed ban"
-#define IRC_UNEXPECTEDMODE	"Hmm, mode info from a channel I'm not on"
-#define IRC_POLITEKICK		"...and thank you for playing."
-#define IRC_AUTOJUMP		"Jumping servers (need %d servers, only have %d)"
-#define IRC_CHANGINGSERV	"changing servers"
-#define IRC_TOOMANYCHANS	"I'm on too many channels--can't join: %s"
-#define IRC_CHANFULL		"Channel full--can't join: %s"
-#define IRC_CHANINVITEONLY	"Channel invite only--can't join: %s"
-#define IRC_BANNEDFROMCHAN	"Banned from channel--can't join: %s"
-#define IRC_SERVNOTONCHAN	"Server says I'm not on channel: %s"
-#define IRC_BADCHANKEY		"Bad key--can't join: %s"
-#define IRC_TELNETFLOOD		"Telnet connection flood from %s!  Placing on ignore!"
-#define IRC_JOIN_FLOOD		"join flood"
-#define IRC_KICK_PROTECT	"don't kick my friends, bud"
-#define IRC_DEOP_PROTECT	"don't deop my friends, bud"
-#define IRC_COMMENTKICK		"...and don't come back."
-#define IRC_REMOVEDEXEMPT	"Removed exempt"
-#define IRC_REMOVEDINVITE	"Removed invite"
-#define IRC_FLOODIGNORE4	"NICK flood from @%s!  Banning."
-#define IRC_NICK_FLOOD		"nick flood"
-
-/* Eggdrop command line usage
- */
-#define EGG_RUNNING1		"I detect %s already running from this directory.\n"
-#define EGG_RUNNING2		"If this is incorrect, erase the '%s'\n"
-#define EGG_NOWRITE		"* Warning!  Could not write %s file!\n"
-
-#define USER_ISGLOBALOP		"(is a global op)"
-#define USER_ISBOT		"(is a bot)"
-#define USER_ISMASTER		"(is a master)"
-
-/* '.bans/.invites/.exempts' common messages
- */
-#define MODES_CREATED		"Created"
-#define MODES_LASTUSED		"last used"
-#define MODES_INACTIVE		"inactive"
-#define MODES_PLACEDBY		"placed by"
-#define MODES_NOTACTIVE		"not active on"
-#define MODES_NOTACTIVE2	"not active"
-#define MODES_NOTBYBOT		"not placed by bot"
-
-/* Messages used when listing with `.bans'
- */
-#define BANS_GLOBAL		"Global bans"
-#define BANS_BYCHANNEL		"Channel bans for"
-#define BANS_USEBANSALL		"Use 'bans all' to see the total list"
-#define BANS_NOLONGER		"No longer banning"
-
-/* Messages used when listing with '.exempts'
- */
-#define EXEMPTS_GLOBAL		"Global exempts"
-#define EXEMPTS_BYCHANNEL	"Channel exempts for"
-#define EXEMPTS_USEEXEMPTSALL	"Use 'exempts all' to see the total list"
-#define EXEMPTS_NOLONGER	"No longer ban exempting"
-
-/* Messages used when listing with '.invites'
- */
-#define INVITES_GLOBAL		"Global invites"
-#define INVITES_BYCHANNEL	"Channel invites for"
-#define INVITES_USEINVITESALL	"Use 'invites all' to see the total list"
-#define INVITES_NOLONGER	"No longer inviting"
-
-
-/* Messages referring to channels
- */
-#define CHAN_NOSUCH		"No such channel defined"
-#define CHAN_BADCHANMODE	"* Mode change on %s for nonexistant %s!"
-#define CHAN_MASSDEOP		"Mass deop on %s by %s"
-#define CHAN_MASSDEOP_KICK	"Mass deop.  Go sit in a corner."
-#define CHAN_FORCEJOIN		"Oops.   Someone made me join %s... leaving..."
-#define CHAN_FAKEMODE		"Mode change by fake op on %s!  Reversing..."
-#define CHAN_FAKEMODE_KICK	"Abusing ill-gained server ops"
-#define CHAN_DESYNCMODE		"Mode change by non-chanop on %s!  Reversing..."
-#define CHAN_DESYNCMODE_KICK	"Abusing desync"
-#define CHAN_FLOOD		"flood"
-
-/* Messages referring to ignores
- */
 #define IGN_NONE		"No ignores"
 #define IGN_CURRENT		"Currently ignoring"
 #define IGN_NOLONGER		"No longer ignoring"
@@ -289,7 +22,6 @@
 #define BOT_MSGDIE		"Bot shut down beginning...."
 #define BOT_NOSUCHUSER		"No such user"
 #define BOT_NOCHANNELS		"no channels"
-#define BOT_PARTYMEMBS		"Party line members:"
 #define BOT_BOTSCONNECTED	"Bots connected"
 #define BOT_OTHERPEOPLE		"Other people on the bot"
 /* was: BOT_OUTDATEDWHOM - 0xb1e */
@@ -299,15 +31,11 @@
 #define BOT_NOTEISAWAY		"is away; note stored."
 #define BOT_NOTESENTTO		"Note sent to"
 #define BOT_DISCONNECTED	"Disconnected from:"
-#define BOT_PEOPLEONCHAN	"People on channel"
 #define BOT_CANTLINKTHERE	"Can't link there"
 #define BOT_CANTUNLINK		"Can't unlink"
-#define BOT_LOOPDETECT		"Loop detected"
-#define BOT_BOGUSLINK		"Bogus link notice from"
 /* was: BOT_BOGUSLINK2 - 0xb2a */
 #define BOT_DISCONNLEAF		"Disconnected left"
 #define BOT_LINKEDTO		"Linked to"
-#define BOT_ILLEGALLINK		"Illegal link by leaf"
 #define BOT_YOUREALEAF		"You are supposed to be a leaf!"
 #define BOT_REJECTING		"Rejecting bot"
 #define BOT_OLDBOT		"Older bot detected (unsupported)"
@@ -333,24 +61,13 @@
 #define BOT_WIPEBOTTABLE	"Smooshing bot tables and assocs..."
 #define BOT_BOTUNKNOWN		"is not a known bot."
 #define BOT_CANTLINKMYSELF	"Link to myself?  Oh boy, Freud would have a field day."
-#define BOT_ALREADYLINKED	"That bot is already connected up."
-#define BOT_NOTELNETADDY	"Invalid telnet address:port stored for"
-#define BOT_LINKING		"Linking to"
-#define BOT_CANTFINDRELAYUSER	"Can't find user for relay!"
-#define BOT_CANTLINKTO		"Could not link to"
 #define BOT_CANTRELAYMYSELF	"Relay to myself?  What on EARTH would be the point?!"
 #define BOT_CONNECTINGTO	"Connecting to"
-#define BOT_BYEINFO1		"(Type *BYE* on a line by itself to abort.)"
-#define BOT_ABORTRELAY1		"Aborting relay attempt to"
-#define BOT_ABORTRELAY2		"You are now back on"
-#define BOT_ABORTRELAY3		"Relay aborted:"
 /* was: BOT_PARTYJOINED - 0xb52 */
 #define BOT_LOSTDCCUSER		"Lost dcc connection to"
 #define BOT_DROPPINGRELAY	"Dropping relay attempt to"
 #define BOT_RELAYSUCCESS	"Success!\n\nNOW CONNECTED TO RELAY BOT"
-#define BOT_BYEINFO2		"(You can type *BYE* to prematurely close the connection.)"
 #define BOT_RELAYLINK		"Relay link:"
-#define BOT_PARTYLEFT		"left the party line."
 #define BOT_ENDRELAY1		"Ended relay link"
 #define BOT_ENDRELAY2		"RELAY CONNECTION DROPPED.\nYou are now back on"
 #define BOT_PARTYREJOINED	"rejoined the party line."
@@ -360,7 +77,6 @@
 #define BOT_PINGTIMEOUT		"Ping timeout"
 #define BOT_BOTNOTLEAFLIKE	"unleaflike behavior"
 #define BOT_BOTDROPPED		"Dropped bot"
-#define BOT_ALREADYLINKING	"Already linking to that bot."
 
 /* Messages pertaining to MODULES
  */
@@ -427,7 +143,6 @@
  */
 #define NET_FAKEREJECT		"Fake message rejected"
 #define NET_LINKEDTO		"Linked to"
-#define NET_WRONGBOT		"Wrong bot--wanted %s, got %s"
 #define NET_LEFTTHE		"has left the"
 #define NET_JOINEDTHE		"has joined the"
 #define NET_AWAY		"is now away"

src/mod/channels.mod/channels.c

@@ -761,7 +761,7 @@ void channels_report(int idx, int details)
       if (s[0])
 	s[strlen(s) - 2] = 0;
       if (!s[0])
-	strcpy(s, MISC_LURKING);
+	strcpy(s, "lurking");
       get_mode_protect(chan, s2);
       if (channel_closed(chan)) {
         if (chan->closed_invite)

src/mod/channels.mod/userchan.c

@@ -312,7 +312,7 @@ bool u_addmask(char type, struct chanset_t *chan, char *who, char *from, char *n
     else
       simple_sprintf(s, "%s!%s", botname, botuserhost);
   if (s[0] && type == 'b' && wild_match(host, s)) {
-    putlog(LOG_MISC, "*", IRC_IBANNEDME);
+    putlog(LOG_MISC, "*", "Wanted to ban myself--deflected.");
     return 0;
   }
   if (expire_time == now)
@@ -383,10 +383,10 @@ static void display_mask(const char type, int idx, int number, maskrec *mask, st
 
   if (mask->added) {
     daysago(now, mask->added, s);
-    simple_sprintf(dates, "%s %s", MODES_CREATED, s);
+    simple_sprintf(dates, "Created %s", s);
     if (mask->added < mask->lastactive) {
       strcat(dates, ", ");
-      strcat(dates, MODES_LASTUSED);
+      strcat(dates, "last used");
       strcat(dates, " ");
       daysago(now, mask->lastactive, s);
       strcat(dates, s);
@@ -439,7 +439,7 @@ static void tell_masks(const char type, int idx, bool show_inact, char *match)
     if (chname[0] && (strchr(CHANMETA, chname[0]))) {
       chan = findchan_by_dname(chname);
       if (!chan) {
-	dprintf(idx, "%s.\n", CHAN_NOSUCH);
+	dprintf(idx, "No such channel defined.\n");
 	return;
       }
     } else
@@ -451,7 +451,7 @@ static void tell_masks(const char type, int idx, bool show_inact, char *match)
     chan = NULL;
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
   if (privchan(user, chan, PRIV_OP)) {
-    dprintf(idx, "%s.\n", CHAN_NOSUCH);
+    dprintf(idx, "No such channel defined.\n");
     return;
   }
 
@@ -815,7 +815,7 @@ void channels_writeuserfile()
     fclose(f);
   }
   if (ret < 5)
-    putlog(LOG_MISC, "*", USERF_ERRWRITE);
+    putlog(LOG_MISC, "*", "ERROR writing user file.");
 }
 
 /* Expire mask originally set by `who' on `chan'?
@@ -881,7 +881,7 @@ static void check_expired_bans(void)
   for (u = global_bans; u; u = u2) { 
     u2 = u->next;
     if (!(u->flags & MASKREC_PERM) && (now >= u->expire)) {
-      putlog(LOG_MISC, "*", "%s %s (%s)", BANS_NOLONGER, u->mask, MISC_EXPIRED);
+      putlog(LOG_MISC, "*", "No longer banning %s (expired)", u->mask);
       for (chan = chanset; chan; chan = chan->next)
         for (b = chan->channel.ban; b->mask[0]; b = b->next)
 	  if (!rfc_casecmp(b->mask, u->mask) && expired_mask(chan, b->who) && b->timer != now) {
@@ -897,8 +897,7 @@ static void check_expired_bans(void)
     for (u = chan->bans; u; u = u2) {
       u2 = u->next;
       if (!(u->flags & MASKREC_PERM) && (now >= u->expire)) {
-	putlog(LOG_MISC, "*", "%s %s %s %s (%s)", BANS_NOLONGER,
-	       u->mask, MISC_ONLOCALE, chan->dname, MISC_EXPIRED);
+	putlog(LOG_MISC, "*", "No longer banning %s on %s (expired)", u->mask, chan->dname);
 	for (b = chan->channel.ban; b->mask[0]; b = b->next)
           if (!rfc_casecmp(b->mask, u->mask) && expired_mask(chan, b->who) && b->timer != now) {
             if (!conf.bot->hub)
@@ -926,8 +925,7 @@ static void check_expired_exempts(void)
   for (u = global_exempts; u; u = u2) {
     u2 = u->next;
     if (!(u->flags & MASKREC_PERM) && (now >= u->expire)) {
-      putlog(LOG_MISC, "*", "%s %s (%s)", EXEMPTS_NOLONGER,
-	     u->mask, MISC_EXPIRED);
+      putlog(LOG_MISC, "*", "No longer ban exempting %s (expired)", u->mask);
       for (chan = chanset; chan; chan = chan->next) {
         match = 0;
         b = chan->channel.ban;
@@ -972,8 +970,7 @@ static void check_expired_exempts(void)
             "Exempt not expired on channel %s. Ban still set!",
             chan->dname);
         else {
-          putlog(LOG_MISC, "*", "%s %s %s %s (%s)", EXEMPTS_NOLONGER,
-		 u->mask, MISC_ONLOCALE, chan->dname, MISC_EXPIRED);
+          putlog(LOG_MISC, "*", "No longer ban exempting %s on %s (expired)", u->mask, chan->dname);
 	  for (e = chan->channel.exempt; e->mask[0]; e = e->next)
 	    if (!rfc_casecmp(e->mask, u->mask) && expired_mask(chan, e->who) && e->timer != now) {
               if (!conf.bot->hub)
@@ -1001,8 +998,7 @@ static void check_expired_invites(void)
   for (u = global_invites; u; u = u2) {
     u2 = u->next;
     if (!(u->flags & MASKREC_PERM) && (now >= u->expire)) {
-      putlog(LOG_MISC, "*", "%s %s (%s)", INVITES_NOLONGER,
-	     u->mask, MISC_EXPIRED);
+      putlog(LOG_MISC, "*", "No longer inviting %s (expired)", u->mask);
       for (chan = chanset; chan; chan = chan->next)
 	if (!(chan->channel.mode & CHANINV))
 	  for (b = chan->channel.invite; b->mask[0]; b = b->next)
@@ -1019,8 +1015,7 @@ static void check_expired_invites(void)
     for (u = chan->invites; u; u = u2) {
       u2 = u->next;
       if (!(u->flags & MASKREC_PERM) && (now >= u->expire)) {
-	putlog(LOG_MISC, "*", "%s %s %s %s (%s)", INVITES_NOLONGER,
-	       u->mask, MISC_ONLOCALE, chan->dname, MISC_EXPIRED);
+	putlog(LOG_MISC, "*", "No longing inviting %s on %s (expired)", u->mask, chan->dname);
 	if (!(chan->channel.mode & CHANINV))
 	  for (b = chan->channel.invite; b->mask[0]; b = b->next)
 	    if (!rfc_casecmp(b->mask, u->mask) && expired_mask(chan, b->who) && b->timer != now) {

src/mod/irc.mod/chan.c

@@ -458,7 +458,7 @@ static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
     case FLOOD_CTCP:
       /* Flooding chan! either by public or notice */
       if (!chan_sentkick(m) && me_op(chan)) {
-	putlog(LOG_MODES, chan->dname, IRC_FLOODKICK, floodnick);
+	putlog(LOG_MODES, chan->dname, "Channel flood from %s -- kicking", floodnick);
         dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, floodnick, kickprefix, response(RES_FLOOD));
 	m->flags |= SENTKICK;
       }
@@ -478,9 +478,9 @@ static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
 	  || (u_match_mask(chan->bans, from)))
 	return 1;		/* Already banned */
       if (which == FLOOD_JOIN)
-	putlog(LOG_MISC | LOG_JOIN, chan->dname, IRC_FLOODIGNORE3, p);
+	putlog(LOG_MISC | LOG_JOIN, chan->dname, "JOIN flood from @%s!  Banning.", p);
       else
-	putlog(LOG_MISC | LOG_JOIN, chan->dname, IRC_FLOODIGNORE4, p);
+	putlog(LOG_MISC | LOG_JOIN, chan->dname, "NICK flood from @%s!  Banning.", p);
       strcpy(ftype + 4, " flood");
       u_addmask('b', chan, h, conf.bot->nick, ftype, now + (60 * chan->ban_time), 0);
       if (!channel_enforcebans(chan) && me_op(chan)) {
@@ -492,8 +492,7 @@ static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
 		!chan_sentkick(m) && !match_my_nick(m->nick) && me_op(chan)) {
 	      m->flags |= SENTKICK;
 	      if (which == FLOOD_JOIN)
-   	        dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick,
-		      kickprefix, IRC_JOIN_FLOOD);
+   	        dprintf(DP_SERVER, "KICK %s %s :%sjoin flood\n", chan->name, m->nick, kickprefix);
 	      else
                 dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_NICKFLOOD));
 	    }
@@ -510,7 +509,7 @@ static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
     case FLOOD_DEOP:
       if (me_op(chan) && !chan_sentkick(m)) {
 	putlog(LOG_MODES, chan->dname,
-	       CHAN_MASSDEOP, chan->dname, from);
+	       "Mass deop on %s by %s", chan->dname, from);
         dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, floodnick, kickprefix, response(RES_MASSDEOP));
 	m->flags |= SENTKICK;
       }
@@ -630,7 +629,7 @@ static void refresh_ban_kick(struct chanset_t *chan, char *user, char *nick)
 	else
 	  c[0] = 0;
         if (role == 2)
-  	  kick_all(chan, b->mask, c[0] ? (const char *) c : IRC_YOUREBANNED, 0);
+  	  kick_all(chan, b->mask, c[0] ? (const char *) c : "You are banned", 0);
         return;					/* Drop out on 1st ban.	*/
       } 
     }
@@ -699,7 +698,7 @@ static void enforce_bans(struct chanset_t *chan)
   for (masklist *b = chan->channel.ban; b && b->mask[0]; b = b->next) {
     if (!(wild_match(b->mask, me) || match_cidr(b->mask, meip)))
       if (!isexempted(chan, b->mask) && !(chan->ircnet_status & CHAN_ASKED_EXEMPTS))
-	kick_all(chan, b->mask, IRC_YOUREBANNED, 1);
+	kick_all(chan, b->mask, "You are banned", 1);
   }
 }
 
@@ -1376,7 +1375,7 @@ static int got341(char *from, char *msg)
   struct chanset_t *chan = findchan(chname);
 
   if (!chan) {
-    putlog(LOG_MISC, "*", "%s: %s", IRC_UNEXPECTEDMODE, chname);
+    putlog(LOG_MISC, "*", "%s: %s", "Hmm, mode info from a channel I'm not on", chname);
     dprintf(DP_SERVER, "PART %s\n", chname);
     return 0;
   }
@@ -1438,7 +1437,7 @@ static int got324(char *from, char *msg)
   struct chanset_t *chan = findchan(chname);
 
   if (!chan) {
-    putlog(LOG_MISC, "*", "%s: %s", IRC_UNEXPECTEDMODE, chname);
+    putlog(LOG_MISC, "*", "%s: %s", "Hmm, mode info from a channel I'm not on", chname);
     dprintf(DP_SERVER, "PART %s\n", chname);
     return 0;
   }
@@ -1937,7 +1936,7 @@ static int got405(char *from, char *msg)
 
   newsplit(&msg);
   chname = newsplit(&msg);
-  putlog(LOG_MISC, "*", IRC_TOOMANYCHANS, chname);
+  putlog(LOG_MISC, "*", "I'm on too many channels--can't join: %s", chname);
   return 0;
 }
 
@@ -2002,14 +2001,14 @@ static int got471(char *from, char *msg)
    */
   chan = findchan_by_dname(chname);
   if (chan) {
-    putlog(LOG_JOIN, chan->dname, IRC_CHANFULL, chan->dname);
+    putlog(LOG_JOIN, chan->dname, "Channel full--can't join: %s", chan->dname);
     request_in(chan);
 /* need: limit */
     chan = findchan_by_dname(chname); 
     if (!chan)
       return 0;
   } else
-    putlog(LOG_JOIN, chname, IRC_CHANFULL, chname);
+    putlog(LOG_JOIN, chname, "Channel full--can't join: %s", chname);
   return 0;
 }
 
@@ -2034,14 +2033,14 @@ static int got473(char *from, char *msg)
    */
   chan = findchan_by_dname(chname);
   if (chan) {
-    putlog(LOG_JOIN, chan->dname, IRC_CHANINVITEONLY, chan->dname);
+    putlog(LOG_JOIN, chan->dname, "Channel invite only--can't join: %s", chan->dname);
     request_in(chan);
 /* need: invite */
     chan = findchan_by_dname(chname); 
     if (!chan)
       return 0;
   } else
-    putlog(LOG_JOIN, chname, IRC_CHANINVITEONLY, chname);
+    putlog(LOG_JOIN, chname, "Channel invite only--can't join: %s", chname);
   return 0;
 }
 
@@ -2066,14 +2065,14 @@ static int got474(char *from, char *msg)
    */
   chan = findchan_by_dname(chname);
   if (chan) {
-    putlog(LOG_JOIN, chan->dname, IRC_BANNEDFROMCHAN, chan->dname);
+    putlog(LOG_JOIN, chan->dname, "Banned from channel--can't join: %s", chan->dname);
     request_in(chan);
 /* need: unban */
     chan = findchan_by_dname(chname); 
     if (!chan)
       return 0;
   } else
-    putlog(LOG_JOIN, chname, IRC_BANNEDFROMCHAN, chname);
+    putlog(LOG_JOIN, chname, "Banned from channel--can't join: %s", chname);
   return 0;
 }
 
@@ -2098,7 +2097,7 @@ static int got475(char *from, char *msg)
    */
   chan = findchan_by_dname(chname);
   if (chan) {
-    putlog(LOG_JOIN, chan->dname, IRC_BADCHANKEY, chan->dname);
+    putlog(LOG_JOIN, chan->dname, "Bad key--can't join: %s", chan->dname);
     if (chan->channel.key[0]) {
       free(chan->channel.key);
       chan->channel.key = (char *) my_calloc(1, 1);
@@ -2111,7 +2110,7 @@ static int got475(char *from, char *msg)
         return 0;
     }
   } else
-    putlog(LOG_JOIN, chname, IRC_BADCHANKEY, chname);
+    putlog(LOG_JOIN, chname, "Bad key--can't join: %s", chname);
   return 0;
 }
 
@@ -2778,7 +2777,7 @@ static int gotquit(char *from, char *msg)
    */
   if (keepnick) {
     if (!rfc_casecmp(nick, origbotname)) {
-      putlog(LOG_MISC, "*", IRC_GETORIGNICK, origbotname);
+      putlog(LOG_MISC, "*", "Switching back to nick %s", origbotname);
       dprintf(DP_SERVER, "NICK %s\n", origbotname);
     }
   }
@@ -2834,12 +2833,11 @@ static int gotmsg(char *from, char *msg)
       if (ban_fun) {
 	check_exemptlist(chan, from);
 	u_addmask('b', chan, quickban(chan, uhost), conf.bot->nick,
-               IRC_FUNKICK, now + (60 * chan->ban_time), 0);
+               "that was fun, let's do it again!", now + (60 * chan->ban_time), 0);
       }
       if (kick_fun) {
 	/* This can induce kickflood - arthur2 */
-	dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, nick,
-		kickprefix, IRC_FUNKICK);
+	dprintf(DP_SERVER, "KICK %s %s :%sthat was fun, let's do it again!\n", chan->name, nick, kickprefix);
 	m->flags |= SENTKICK;
       }
     }
@@ -2994,12 +2992,11 @@ static int gotnotice(char *from, char *msg)
       if (ban_fun) {
 	check_exemptlist(chan, from);
 	u_addmask('b', chan, quickban(chan, uhost), conf.bot->nick,
-               IRC_FUNKICK, now + (60 * chan->ban_time), 0);
+               "that was fun, let's do it again!", now + (60 * chan->ban_time), 0);
       }
       if (kick_fun) {
 	/* This can induce kickflood - arthur2 */
-	dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, nick,
-		kickprefix, IRC_FUNKICK);
+	dprintf(DP_SERVER, "KICK %s %s :%sthat was fun, let's do it again!\n", chan->name, nick, kickprefix);
 	m->flags |= SENTKICK;
       }
     }

src/mod/irc.mod/cmdsirc.c

@@ -1282,16 +1282,16 @@ static void cmd_channel(int idx, char *par)
   putlog(LOG_CMDS, "*", "#%s# (%s) channel", dcc[idx].nick, chan->dname);
   strlcpy(s, getchanmode(chan), sizeof s);
   if (channel_pending(chan)) {
-    simple_snprintf(s1, sizeof s1, "%s %s", IRC_PROCESSINGCHAN, chan->dname);
+    simple_snprintf(s1, sizeof s1, "Processing channel %s", chan->dname);
   } else if (channel_active(chan)) {
-    simple_snprintf(s1, sizeof s1, "%s %s", IRC_CHANNEL, chan->dname);
+    simple_snprintf(s1, sizeof s1, "Channel %s", chan->dname);
   } else {
-    simple_snprintf(s1, sizeof s1, "%s %s", IRC_DESIRINGCHAN, chan->dname);
+    simple_snprintf(s1, sizeof s1, "Desiring channel %s", chan->dname);
   }
   dprintf(idx, "%s, %d member%s, mode %s:\n", s1, chan->channel.members,
 	  chan->channel.members == 1 ? "" : "s", s);
   if (chan->channel.topic)
-    dprintf(idx, "%s: %s\n", IRC_CHANNELTOPIC, chan->channel.topic);
+    dprintf(idx, "%s: %s\n", "Channel Topic", chan->channel.topic);
   if (channel_active(chan)) {
     /* find max nicklen and handlen */
     maxnicklen = maxhandlen = 0;
@@ -1412,16 +1412,16 @@ static void cmd_channel(int idx, char *par)
                      s1, m->userhost);
       }
       if (chan_fakeop(m))
-	dprintf(idx, "    (%s)\n", IRC_FAKECHANOP);
+	dprintf(idx, "    (FAKE CHANOP GIVEN BY SERVER)\n");
       if (chan_sentop(m))
-	dprintf(idx, "    (%s)\n", IRC_PENDINGOP);
+	dprintf(idx, "    (pending +o -- I'm lagged)\n");
       if (chan_sentdeop(m))
-	dprintf(idx, "    (%s)\n", IRC_PENDINGDEOP);
+	dprintf(idx, "    (pending -o -- I'm lagged)\n");
       if (chan_sentkick(m))
-	dprintf(idx, "    (%s)\n", IRC_PENDINGKICK);
+	dprintf(idx, "    (pending kick)\n");
     }
   }
-  dprintf(idx, "%s\n", IRC_ENDCHANINFO);
+  dprintf(idx, "End of channel info.\n");
 }
 
 static void cmd_topic(int idx, char *par)
@@ -1670,7 +1670,7 @@ static void cmd_reset(int idx, char *par)
     if (chan)
       get_user_flagrec(dcc[idx].user, &user, chan->dname);
     if (!chan || privchan(user, chan, PRIV_OP)) {
-      dprintf(idx, "%s\n", IRC_NOMONITOR);
+      dprintf(idx, "I don't monitor that channel.\n");
     } else {
       get_user_flagrec(dcc[idx].user, &user, par);
       if (!glob_master(user) && !chan_master(user)) {

src/mod/irc.mod/irc.c

@@ -800,12 +800,12 @@ punish_badguy(struct chanset_t *chan, char *whobad,
   reason[0] = 0;
   switch (type) {
     case REVENGE_KICK:
-      kick_msg = IRC_KICK_PROTECT;
+      kick_msg = "don't kick my friends, bud";
       simple_sprintf(reason, "kicked %s off %s", victimstr, chan->dname);
       break;
     case REVENGE_DEOP:
       simple_sprintf(reason, "deopped %s on %s", victimstr, chan->dname);
-      kick_msg = IRC_DEOP_PROTECT;
+      kick_msg = "don't deop my friends, bud";
       break;
     default:
       kick_msg = "revenge!";
@@ -1416,15 +1416,15 @@ irc_report(int idx, int details)
       p = NULL;
       if (shouldjoin(chan)) {
         if (chan->status & CHAN_JUPED)
-          p = MISC_JUPED;
+          p = "juped";
         else if (channel_joining(chan))
-          p = MISC_JOINING;
+          p = "joining";
         else if (!(chan->status & CHAN_ACTIVE))
-          p = MISC_TRYING;
+          p = "trying";
         else if (chan->status & CHAN_PEND)
-          p = MISC_PENDING;
+          p = "pending";
         else if ((chan->dname[0] != '+') && !me_op(chan))
-          p = MISC_WANTOPS;
+          p = "want ops!";
       }
       len = simple_sprintf(ch, "%s%s%s%s, ", chan->dname, p ? "(" : "", p ? p : "", p ? ")" : "");
       if ((k + len) > 70) {

src/mod/irc.mod/mode.c

@@ -929,7 +929,7 @@ static memberlist *assert_ismember(struct chanset_t *chan, const char *nick)
   } else {
     if (channel_pending(chan))
       return NULL;
-    putlog(LOG_MISC, chan->dname, CHAN_BADCHANMODE, chan->dname, nick);
+    putlog(LOG_MISC, chan->dname, "* Mode change on %s for nonexistant %s!", chan->dname, nick);
     dprintf(DP_MODE, "WHO %s\n", nick);
   }
 
@@ -952,7 +952,7 @@ gotmode(char *from, char *msg)
     struct chanset_t *chan = findchan(ch);
 
     if (!chan) {
-      putlog(LOG_MISC, "*", CHAN_FORCEJOIN, ch);
+      putlog(LOG_MISC, "*", "Oops.   Someone made me join %s... leaving...", ch);
       dprintf(DP_SERVER, "PART %s\n", ch);
       return 0;
     }
@@ -986,7 +986,7 @@ gotmode(char *from, char *msg)
           if (channel_pending(chan))
             return 0;
           dprintf(DP_MODE, "KICK %s %s :Desync\n", chan->dname, nick);
-          putlog(LOG_MISC, "*", CHAN_BADCHANMODE, chan->dname, nick);
+          putlog(LOG_MISC, "*", "* Mode change on %s for nonexistant %s!", chan->dname, nick);
           dprintf(DP_MODE, "WHO %s\n", nick);
           return 0;
         }
@@ -1180,13 +1180,13 @@ gotmode(char *from, char *msg)
 
       if (m && channel_active(chan) && me_op(chan)) {
         if (chan_fakeop(m)) {
-          putlog(LOG_MODES, ch, CHAN_FAKEMODE, ch);
-          dprintf(DP_MODE, "KICK %s %s :%s%s\n", ch, m->nick, kickprefix, CHAN_FAKEMODE_KICK);
+          putlog(LOG_MODES, ch, "Mode change by fake op on %s!  Reversing...", ch);
+          dprintf(DP_MODE, "KICK %s %s :%sAbusing ill-gained server ops\n", ch, m->nick, kickprefix);
           m->flags |= SENTKICK;
           reversing = 1;
         } else if (!chan_hasop(m) && !channel_nodesynch(chan)) {
-          putlog(LOG_MODES, ch, CHAN_DESYNCMODE, ch);
-          dprintf(DP_MODE, "KICK %s %s :%s%s\n", ch, m->nick, kickprefix, CHAN_DESYNCMODE_KICK);
+          putlog(LOG_MODES, ch, "Mode change by non-chanop on %s!  Reversing...", ch);
+          dprintf(DP_MODE, "KICK %s %s :%sAbusing desync\n", ch, m->nick, kickprefix);
           m->flags |= SENTKICK;
           reversing = 1;
         }

src/mod/irc.mod/msgcmds.c

@@ -20,20 +20,20 @@ static int msg_pass(char *nick, char *host, struct userrec *u, char *par)
   if (u->bot)
     return BIND_RET_BREAK;
   if (!par[0]) {
-    dprintf(DP_HELP, "NOTICE %s :%s\n", nick, u_pass_match(u, "-") ? IRC_NOPASS : IRC_PASS);
+    dprintf(DP_HELP, "NOTICE %s :%s\n", nick, u_pass_match(u, "-") ? "You don't have a password set." : "You have a password set.");
     putlog(LOG_CMDS, "*", "(%s!%s) !%s! PASS?", nick, host, u->handle);
     return BIND_RET_BREAK;
   }
   old = newsplit(&par);
   if (!u_pass_match(u, "-") && !par[0]) {
     putlog(LOG_CMDS, "*", "(%s!%s) !%s! $b!$bPASS...", nick, host, u->handle);
-    dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_EXISTPASS);
+    dprintf(DP_HELP, "NOTICE %s :You already have a password set.\n", nick);
     return BIND_RET_BREAK;
   }
   if (par[0]) {
     if (!u_pass_match(u, old)) {
       putlog(LOG_CMDS, "*", "(%s!%s) !%s! $b!$bPASS...", nick, host, u->handle);
-      dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_FAILPASS);
+      dprintf(DP_HELP, "NOTICE %s :Incorrent password.\n", nick);
       return BIND_RET_BREAK;
     }
     mynew = newsplit(&par);
@@ -52,7 +52,7 @@ static int msg_pass(char *nick, char *host, struct userrec *u, char *par)
 
   set_user(&USERENTRY_PASS, u, mynew);
   dprintf(DP_HELP, "NOTICE %s :%s '%s'.\n", nick,
-	  mynew == old ? IRC_SETPASS : IRC_CHANGEPASS, mynew);
+	  mynew == old ? "Password set to:" : "Password changed to:", mynew);
   return BIND_RET_BREAK;
 }
 
@@ -117,16 +117,16 @@ static int msg_ident(char *nick, char *host, struct userrec *u, char *par)
   u2 = get_user_by_handle(userlist, who);
   if (!u2) {
     if (u && !quiet_reject)
-      dprintf(DP_HELP, IRC_MISIDENT, nick, nick, u->handle);
+      dprintf(DP_HELP, "NOTICE %s :You're not %s, you're %s.\n", nick, nick, u->handle);
   } else if (rfc_casecmp(who, origbotname) && !u2->bot) {
     /* This could be used as detection... */
     if (u_pass_match(u2, "-")) {
       putlog(LOG_CMDS, "*", "(%s!%s) !*! IDENT %s", nick, host, who);
       if (!quiet_reject)
-        dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_NOPASS);
+        dprintf(DP_HELP, "NOTICE %s :You don't have a password set.\n", nick);
     } else if (!u_pass_match(u2, pass)) {
       if (!quiet_reject)
-        dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_DENYACCESS);
+        dprintf(DP_HELP, "NOTICE %s :Access denied.\n", nick);
     } else if (u == u2) {
       /*
        * NOTE: Checking quiet_reject *after* u_pass_match()
@@ -134,16 +134,16 @@ static int msg_ident(char *nick, char *host, struct userrec *u, char *par)
        * (Broken since 1.3.0+bel17)  Bad Beldin! No Cookie!
        *   -Toth  [July 30, 2003]
        */
-      dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_RECOGNIZED);
+      dprintf(DP_HELP, "NOTICE %s :I recognize you there.\n", nick);
       return BIND_RET_BREAK;
     } else if (u) {
-      dprintf(DP_HELP, IRC_MISIDENT, nick, who, u->handle);
+      dprintf(DP_HELP, "NOTICE %s :You're not %s, you're %s.\n", nick, who, u->handle);
       return BIND_RET_BREAK;
     } else {
       putlog(LOG_CMDS, "*", "(%s!%s) !*! IDENT %s", nick, host, who);
       simple_snprintf(s, sizeof s, "%s!%s", nick, host);
       maskhost(s, s1);
-      dprintf(DP_HELP, "NOTICE %s :%s: %s\n", nick, IRC_ADDHOSTMASK, s1);
+      dprintf(DP_HELP, "NOTICE %s :Added hostmask: %s\n", nick, s1);
       addhost_by_handle(who, s1);
       check_this_user(who, 0, NULL);
       return BIND_RET_BREAK;
@@ -175,12 +175,11 @@ static int msg_invite(char *nick, char *host, struct userrec *u, char *par)
       return BIND_RET_BREAK;
     }
     if (!(chan = findchan_by_dname(par))) {
-      dprintf(DP_HELP, "NOTICE %s :%s: /MSG %s invite <pass> <channel>\n",
-	      nick, MISC_USAGE, botname);
+      dprintf(DP_HELP, "NOTICE %s :Usage: /MSG %s invite <pass> <channel>\n", nick, botname);
       return BIND_RET_BREAK;
     }
     if (!channel_active(chan)) {
-      dprintf(DP_HELP, "NOTICE %s :%s: %s\n", nick, par, IRC_NOTONCHAN);
+      dprintf(DP_HELP, "NOTICE %s :%s: Not on that channel right now.\n", nick, par);
       return BIND_RET_BREAK;
     }
     /* We need to check access here also (dw 991002) */

src/mod/notes.mod/notes.c

@@ -454,7 +454,7 @@ void notes_read(const char *hand, const char *nick, const char *srd, int idx)
       if (idx >= 0)
 	dprintf(idx, "### %s.\n", NOTES_DCC_USAGE_READ);
       else
-	dprintf(DP_HELP, "NOTICE %s :(%d %s)\n", nick, ix - 1, MISC_TOTAL);
+	dprintf(DP_HELP, "NOTICE %s :(%d total)\n", nick, ix - 1);
     }
   } else if ((ir == 0) && (ix == 1)) {
     if (idx >= 0)
@@ -553,7 +553,7 @@ void notes_del(const char *hand, const char *nick, const char *sdl, int idx)
 	dprintf(idx, "%s %d note%s; %d %s.\n", NOTES_ERASED, er,
 		(er != 1) ? "s" : "", in - 1 - er, NOTES_LEFT);
       else
-	dprintf(DP_HELP, "NOTICE %s :%s %d note%s; %d %s.\n", nick, MISC_ERASED,
+	dprintf(DP_HELP, "NOTICE %s :Erased %d note%s; %d %s.\n", nick,
 		er, (er != 1) ? "s" : "", in - 1 - er, NOTES_LEFT);
     }
   }

src/mod/server.mod/cmdsserv.c

@@ -65,7 +65,7 @@ static void cmd_jump(int idx, char *par)
     strlcpy(newserverpass, par, sizeof newserverpass);
   } else
     putlog(LOG_CMDS, "*", "#%s# jump", dcc[idx].nick);
-  dprintf(idx, "%s...\n", IRC_JUMP);
+  dprintf(idx, "Jumping servers...\n");
   nuke_server("changing servers");
   cycle_time = 0;
 }

src/mod/server.mod/server.c

@@ -969,7 +969,7 @@ static void server_5minutely()
        * Server is probably stoned.
        */
       disconnect_server(servidx, DO_LOST);
-      putlog(LOG_SERV, "*", IRC_SERVERSTONED);
+      putlog(LOG_SERV, "*", "Server got stoned; jumping...");
   }
 }
 
@@ -1012,16 +1012,16 @@ void server_report(int idx, int details)
     dprintf(idx, "    Server %s:%d %s\n", dcc[servidx].host, dcc[servidx].port,
 	    trying_server ? "(trying)" : s);
   } else
-    dprintf(idx, "    %s\n", IRC_NOSERVER);
+    dprintf(idx, "    No server currently.\n");
   if (modeq.tot)
-    dprintf(idx, "    %s %d%%, %d msgs\n", IRC_MODEQUEUE,
+    dprintf(idx, "    Mode queue is at %d%%, %d msgs\n",
             (int) ((float) (modeq.tot * 100.0) / (float) maxqmsg),
 	    (int) modeq.tot);
   if (mq.tot)
-    dprintf(idx, "    %s %d%%, %d msgs\n", IRC_SERVERQUEUE,
+    dprintf(idx, "    Server queue is at %d%%, %d msgs\n",
            (int) ((float) (mq.tot * 100.0) / (float) maxqmsg), (int) mq.tot);
   if (hq.tot)
-    dprintf(idx, "    %s %d%%, %d msgs\n", IRC_HELPQUEUE,
+    dprintf(idx, "    Help queue is at %d%%, %d msgs\n",
            (int) ((float) (hq.tot * 100.0) / (float) maxqmsg), (int) hq.tot);
   if (details) {
     dprintf(idx, "    Flood is: %d msg/%lus, %d ctcp/%lus\n",

src/mod/server.mod/servmsg.c

@@ -87,7 +87,7 @@ static int gotfake433(char *from)
     }
   }
 
-  putlog(LOG_SERV, "*", IRC_BOTNICKINUSE, botname);
+  putlog(LOG_SERV, "*", "NICK IN USE: Trying '%s'", botname);
   dprintf(DP_SERVER, "NICK %s\n", botname);
   return 0;
 }
@@ -270,7 +270,7 @@ static int got442(char *from, char *msg)
   chan = findchan(chname);
   if (chan)
     if (shouldjoin(chan) && !channel_joining(chan)) {
-      putlog(LOG_MISC, chname, IRC_SERVNOTONCHAN, chname);
+      putlog(LOG_MISC, chname, "Server says I'm not on channel: %s", chname);
       clear_channel(chan, 1);
       chan->status &= ~CHAN_ACTIVE;
       chan->status |= CHAN_JOINING;
@@ -362,7 +362,7 @@ static bool detect_flood(char *floodnick, char *floodhost, char *from, int which
     u = get_user_by_host(from);
     /* Private msg */
     simple_sprintf(h, "*!*@%s", p);
-    putlog(LOG_MISC, "*", IRC_FLOODIGNORE1, p);
+    putlog(LOG_MISC, "*", "Flood from @%s!  Placing on ignore!", p);
     addignore(h, conf.bot->nick, (which == FLOOD_CTCP) ? "CTCP flood" : "MSG/NOTICE flood", now + (60 * ignore_time));
     return 1;
   }
@@ -731,7 +731,7 @@ static void got303(char *from, char *msg)
     }
     if (!ison_orig) {
       if (!nick_juped)
-        putlog(LOG_MISC, "*", IRC_GETORIGNICK, origbotname);
+        putlog(LOG_MISC, "*", "Switching back to nick %s", origbotname);
       dprintf(DP_SERVER, "NICK %s\n", origbotname);
     }
   }
@@ -749,7 +749,7 @@ static int got432(char *from, char *msg)
     putlog(LOG_MISC, "*", "NICK IS INVALID: %s (keeping '%s').", erroneus,
 	   botname);
   else {
-    putlog(LOG_MISC, "*", IRC_BADBOTNICK);
+    putlog(LOG_MISC, "*", "Server says my nickname is invalid.");
     if (!keepnick) {
       makepass(erroneus);
       erroneus[NICKMAX] = 0;
@@ -795,7 +795,7 @@ static int got437(char *from, char *msg)
 	putlog(LOG_MISC, "*", IRC_CANTCHANGENICK, s);
       } else {
 	if (!channel_juped(chan)) {
-	  putlog(LOG_MISC, "*", IRC_CHANNELJUPED, s);
+	  putlog(LOG_MISC, "*", "Channel %s is juped. :(", s);
 	  chan->status |= CHAN_JUPED;
 	}
       }
@@ -806,7 +806,7 @@ static int got437(char *from, char *msg)
     if (!rfc_casecmp(s, origbotname))
       nick_juped = 1;
   } else {
-    putlog(LOG_MISC, "*", "%s: %s", IRC_BOTNICKJUPED, s);
+    putlog(LOG_MISC, "*", "%s: %s", "Nickname has been juped", s);
     gotfake433(from);
   }
   return 0;
@@ -834,7 +834,7 @@ static int got451(char *from, char *msg)
    * Probably should do something about it some time - beldin
    */
   putlog(LOG_MISC, "*", "%s says I'm not registered, trying next one.", from);
-  nuke_server(IRC_NOTREGISTERED2);
+  nuke_server("The server says we are not registered yet..");
   return 0;
 }
 
@@ -872,7 +872,7 @@ static int gotnick(char *from, char *msg)
     } else if (keepnick && strcmp(nick, msg)) {
       putlog(LOG_SERV | LOG_MISC, "*", "Nickname changed to '%s'???", msg);
       if (!rfc_casecmp(nick, origbotname)) {
-        putlog(LOG_MISC, "*", IRC_GETORIGNICK, origbotname);
+        putlog(LOG_MISC, "*", "Switching back to nick %s", origbotname);
         dprintf(DP_SERVER, "NICK %s\n", origbotname);
       }
     } else
@@ -880,7 +880,7 @@ static int gotnick(char *from, char *msg)
   } else if ((keepnick) && (rfc_casecmp(nick, msg))) {
     /* Only do the below if there was actual nick change, case doesn't count */
     if (!rfc_casecmp(nick, origbotname)) {
-      putlog(LOG_MISC, "*", IRC_GETORIGNICK, origbotname);
+      putlog(LOG_MISC, "*", "Switching back to nick %s", origbotname);
       dprintf(DP_SERVER, "NICK %s\n", origbotname);
     }
   }

src/mod/share.mod/share.c

@@ -1131,7 +1131,7 @@ write_tmp_userfile(char *fn, const struct userrec *bu, int idx)
     fclose(f);
   }
   if (!ok)
-    putlog(LOG_MISC, "*", USERF_ERRWRITE2);
+    putlog(LOG_MISC, "*", "ERROR writing user file to transfer.");
   return ok;
 }
 
@@ -1241,7 +1241,7 @@ finish_share(int idx)
 
     /* old userlist is now being used, safe to do this stuff... */
     loading = 0;
-    putlog(LOG_MISC, "*", "%s", USERF_CANTREAD);
+    putlog(LOG_MISC, "*", "%s", "CAN'T READ NEW USERFILE");
     dprintf(idx, "bye\n");
     simple_snprintf(xx, sizeof xx, "Disconnected %s (can't read userfile)", dcc[j].nick);
     botnet_send_unlinked(j, dcc[j].nick, xx);
@@ -1261,7 +1261,7 @@ finish_share(int idx)
                                  * channel lists.                       */
   userlist = u;                 /* Set new user list.                   */
   lastuser = NULL;              /* Reset last accessed user ptr.        */
-  putlog(LOG_BOTS, "*", "%s.", USERF_XFERDONE);
+  putlog(LOG_BOTS, "*", "%s.", "Userlist transfer complete; switched over");
 
   /*
    * Migrate:
@@ -1302,7 +1302,7 @@ start_sending_users(int idx)
 
   if ((i = raw_dcc_send(share_file, "*users", "(users)", share_file, &j)) > 0) {
     unlink(share_file);
-    dprintf(idx, "s e %s\n", USERF_CANTSEND);
+    dprintf(idx, "s e %s\n", "Can't send userfile to you (internal error)");
     putlog(LOG_BOTS, "@", "%s -- can't send userfile",
            i == DCCSEND_FULL ? "NO MORE DCC CONNECTIONS" :
            i == DCCSEND_NOSOCK ? "CAN'T OPEN A LISTENING SOCKET" :

src/mod/transfer.mod/transfer.c

@@ -112,7 +112,7 @@ void eof_dcc_fork_send(int idx)
       dcc[y].status &= ~STAT_GETTING;
       dcc[y].status &= ~STAT_SHARE;
     }
-    putlog(LOG_BOTS, "*", USERF_FAILEDXFER);
+    putlog(LOG_BOTS, "*", "Failed connection; aborted userfile transfer.");
     unlink(dcc[idx].u.xfer->filename);
   } else if (!strcmp(dcc[idx].nick, "*binary")) {
     int x, y = -1;

src/userrec.c

@@ -398,7 +398,7 @@ int write_userfile(int idx)
   f = fopen(new_userfile, "w");
   fixmod(new_userfile);
   if (f == NULL) {
-    putlog(LOG_MISC, "*", USERF_ERRWRITE);
+    putlog(LOG_MISC, "*", "ERROR writing user file.");
     free(new_userfile);
     return 2;
   }
@@ -422,7 +422,7 @@ int write_userfile(int idx)
   for (struct userrec *u = userlist; u && ok; u = u->next)
     ok = write_user(u, f, idx);
   if (!ok || fflush(f)) {
-    putlog(LOG_MISC, "*", "%s (%s)", USERF_ERRWRITE, strerror(ferror(f)));
+    putlog(LOG_MISC, "*", "ERROR writing user file. (%s)", strerror(ferror(f)));
     fclose(f);
     free(new_userfile);
     return 3;

src/users.c

@@ -165,7 +165,7 @@ void display_ignore(int idx, int number, struct igrec *ignore)
   if (ignore->msg && ignore->msg[0])
     dprintf(idx, "        %s: %s\n", ignore->user, ignore->msg);
   else
-    dprintf(idx, "        %s %s\n", MODES_PLACEDBY, ignore->user);
+    dprintf(idx, "        placed by %s\n", ignore->user);
   if (dates[0])
     dprintf(idx, "        %s\n", dates);
 }
@@ -204,7 +204,7 @@ void check_expired_ignores()
     return;
   while (*u) {
     if (!((*u)->flags & IGREC_PERM) && (now >= (*u)->expire)) {
-      putlog(LOG_MISC, "*", "%s %s (%s)", IGN_NOLONGER, (*u)->igmask, MISC_EXPIRED);
+      putlog(LOG_MISC, "*", "%s %s (expired)", IGN_NOLONGER, (*u)->igmask);
       delignore((*u)->igmask);
     } else {
       u = &((*u)->next);
@@ -515,7 +515,7 @@ void tell_user_ident(int idx, char *id)
     u = get_user_by_host(id);
 
   if (u == NULL || (u && !whois_access(dcc[idx].user, u))) {
-    dprintf(idx, "%s.\n", USERF_NOMATCH);
+    dprintf(idx, "Can't find anyone matching that.\n");
     return;
   }
 
@@ -542,7 +542,7 @@ void tell_users_match(int idx, char *mtch, int start, int limit, char *chname, i
   struct list_type *q = NULL;
   struct flag_record user, pls, mns;
 
-  dprintf(idx, "*** %s '%s':\n", MISC_MATCHING, mtch);
+  dprintf(idx, "*** Matching '%s':\n", mtch);
   if (isbot) {
     egg_snprintf(format, sizeof format, "%%-%us FLAGS    LAST\n", HANDLEN);
     dprintf(idx, format, "BOTNICK");
@@ -551,7 +551,7 @@ void tell_users_match(int idx, char *mtch, int start, int limit, char *chname, i
     dprintf(idx, format, "HANDLE");
   }
   if (start > 1)
-    dprintf(idx, "(%s %d)\n", MISC_SKIPPING, start - 1);
+    dprintf(idx, "(skipping first %d)\n", start - 1);
   if (strchr("+-&|", *mtch)) {
     user.match = pls.match = FR_GLOBAL | FR_CHAN;
     break_down_flags(mtch, &pls, &mns);
@@ -579,7 +579,7 @@ void tell_users_match(int idx, char *mtch, int start, int limit, char *chname, i
 	  if ((cnt <= limit) && (cnt >= start))
 	    tell_user(idx, u);
 	  if (cnt == limit + 1)
-	    dprintf(idx, MISC_TRUNCATED, limit);
+	    dprintf(idx, "(more than %d matches; list truncated)\n", limit);
 	}
       }
     } else if (wild_match(mtch, u->handle)) {
@@ -587,7 +587,7 @@ void tell_users_match(int idx, char *mtch, int start, int limit, char *chname, i
       if ((cnt <= limit) && (cnt >= start))
 	tell_user(idx, u);
       if (cnt == limit + 1)
-	dprintf(idx, MISC_TRUNCATED, limit);
+	dprintf(idx, "(more than %d matches; list truncated)\n", limit);
     } else {
       fnd = 0;
       for (q = (struct list_type *) get_user(&USERENTRY_HOSTS, u); q; q = q->next) {
@@ -598,19 +598,19 @@ void tell_users_match(int idx, char *mtch, int start, int limit, char *chname, i
 	    tell_user(idx, u);
 	  }
 	  if (cnt == limit + 1)
-	    dprintf(idx, MISC_TRUNCATED, limit);
+	    dprintf(idx, "(more than %d matches; list truncated)\n", limit);
 	}
       }
     }
   }
-  dprintf(idx, MISC_FOUNDMATCH, cnt, cnt == 1 ? "" : MISC_MATCH_PLURAL);
+  dprintf(idx, "--- Found %d match%s.\n", cnt, cnt == 1 ? "" : "es");
 }
 
 void backup_userfile()
 {
   char s[DIRMAX] = "", s2[DIRMAX] = "";
 
-  putlog(LOG_MISC, "*", USERF_BACKUP);
+  putlog(LOG_MISC, "*", "Backing up user file...");
   simple_snprintf(s, sizeof s, "%s.u.0", tempdir);
   simple_snprintf(s2, sizeof s2, "%s.u.1", tempdir);
   movefile(s, s2);
@@ -681,10 +681,10 @@ int readuserfile(const char *file, struct userrec **ret)
   simple_snprintf(s, 180, "%s", temps);
   free(temps);
   if (s[1] < '4') {
-    fatal(USERF_OLDFMT, 0);
+    fatal("boring....", 0);
   }
   if (s[1] > '4')
-    fatal(USERF_INVALID, 0);
+    fatal("Invalid userfile format.", 0);
   while (!feof(f)) {
     s = buf;
     fgets(cbuf, 1024, f);
@@ -918,7 +918,7 @@ int readuserfile(const char *file, struct userrec **ret)
 	  attr = newsplit(&s);
 	  rmspace(s);
 	  if (!attr[0] || !pass[0]) {
-	    putlog(LOG_MISC, "*", "* %s line: %d!", USERF_CORRUPT, line);
+	    putlog(LOG_MISC, "*", "* Corrupt user record line: %d!", line);
 	    lasthand[0] = 0;
             fclose(f);
             return 0;
@@ -932,7 +932,7 @@ int readuserfile(const char *file, struct userrec **ret)
 
 	    u = get_user_by_handle(bu, code);
 	    if (u) {
-	      putlog(LOG_ERROR, "@", "* %s '%s'!", USERF_DUPE, code);
+	      putlog(LOG_ERROR, "@", "* Duplicate user record '%s'!", code);
 	      lasthand[0] = 0;
 	      u = NULL;
 	    } else {
@@ -944,7 +944,7 @@ int readuserfile(const char *file, struct userrec **ret)
 	      if (strlen(code) > HANDLEN)
 		code[HANDLEN] = 0;
 	      if (strlen(pass) > 20) {
-		putlog(LOG_MISC, "*", "* %s '%s'", USERF_BROKEPASS, code);
+		putlog(LOG_MISC, "*", "* Corrupted password reset for '%s'", code);
 		strcpy(pass, "-");
 	      }
 	      bu = adduser(bu, code, 0, pass, sanity_check(fr.global, isbot), isbot);
@@ -967,7 +967,7 @@ int readuserfile(const char *file, struct userrec **ret)
   fclose(f);
   (*ret) = bu;
   if (ignored[0]) {
-    putlog(LOG_MISC, "*", "%s %s", USERF_IGNBANS, ignored);
+    putlog(LOG_MISC, "*", "Ignored masks for channel(s): %s", ignored);
   }
   putlog(LOG_MISC, "*", "Userfile loaded, unpacking...");
   for (u = bu; u; u = u->next) {