[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sun Oct 14 09:10:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-14 14:09:45 UTC
Commited by: Federico Mennite <ite at techmonkeys.org>

Modified files:
     INSTALL README acinclude.m4 bootstrap configure.in po/eggdrop.pot
     src/main.c src/modules.c src/mod/modvals.h

Log message:

* STATIC is #defined again on static builds.
* Removed code for old module loading emulation on static builds.
* Updated README and INSTALL: new static build explanation.
* More string's gettextized-
* Synched po/eggdrop.pot with sources.

---------------------- diff included ----------------------
Index: eggdrop1.7/INSTALL
diff -u eggdrop1.7/INSTALL:1.10 eggdrop1.7/INSTALL:1.11
--- eggdrop1.7/INSTALL:1.10	Wed Oct 10 08:15:58 2001
+++ eggdrop1.7/INSTALL	Sun Oct 14 09:09:35 2001
@@ -23,54 +23,51 @@
 
   1. If you downloaded eggdrop from the CVS repository type './bootstrap' from
      the eggdrop directory. That script will prepare system configuration
-     detection's scripts. It requires that a working autoconf2.13 version
-     is installed on your system, otherwhise you need to get an eggdrop.tar.gz
-     distribution. If you don't know of what we are talking about in this step
+     detection's scripts. For a successful run of bootstrap, your system needs
+     to satisfy some requirements (read bootstrap top contents to know which),
+     otherwhise you need to get an already bootstrapped package from
+     ftp://ftp.eggheads.org/pub/eggdrop/source/current/.
+     If you don't know of what we are talking about in this step
      it probably means you don't need to run the bootstrap script, so just
      ignore this step.
 
   2. Type './configure' from the eggdrop directory.  That script will
      determine how your system is set up, and figure out how to compile
      eggdrop.  It will also try to find Tcl, which is required to compile.
+     Or to force a statically linked module bot type './configure
+     --disable-shared'.  Otherwise the configure script will determin which
+     type of bot your system will support.  Dynamic is always the better way
+     to go if possible. There is also the option --enable-debug which will
+     give more detailed output on (a highly unlikely :) crash. This might
+     help the devteam to track down the crash and fix the bug. The bot will
+     take a little longer to build and will enlarge the binary a bit, but
+     it's worth if you want to support eggdrop development.
 
-  3. Type either 'make config' or 'make iconfig' to determine which modules
-     will be compiled.  'make config' creates the default modules.  If you
-     want to choose which modules to make use 'make iconfig'.
-
-  4. Type 'make' from the eggdrop directory.  Or to force a statically
-     linked module bot type 'make static'.  Otherwise the Makefile will
-     determin which type of bot your system will support.  Dynamic isalways
-     the better way to go if possible. There're also the options debug and
-     sdebug (static-debug) which will give more detailed output on (a
-     highly unlikely :) crash. This might help the devteam to track down
-     the crash and fix the bug. Debug and sdebug will take a little longer
-     to compile and will enlarge the binary a bit, but it's worth if you
-     want to support eggdrop development.
+  3. Type 'make' from the eggdrop directory.
 
-  5. Eggdrop must be installed in a directory somewhere.  This is
+  4. Eggdrop must be installed in a directory somewhere.  This is
      accomplished by entering the unix command:
 
      make install
      This will install the eggdrop in your home directory in a directory
      called eggdrop (ie. /home/user/eggdrop).
 
-     If you want to install to a different directory use:
-
-     make install DEST=<directory>
-     example make install DEST=/home/user/otherdir
-     (note you must use full path for every file to be correctly installed)
+     If you want to install to a different directory make sure you have run
+     './configure --prefix=<directory>' before the make process.
+     Example, if you ran './configure --prefix=/home/user/otherdir',
+     'make install' will install eggdrop in /home/user/otherdir.
 
      [The following is performed from the directory installed above]
 
-  6. Copy the file 'eggdrop.complete.conf' to a new file, usually the same name
+  5. Copy the file 'eggdrop.complete.conf' to a new file, usually the same name
      as the bot that will use it, e.g. "LamestBot.conf".
 
-  7. Edit your config file LamestBot.conf completely.
+  6. Edit your config file LamestBot.conf completely.
 
-  8. Start the bot with the "-m" option to create a user file, ie './eggdrop
+  7. Start the bot with the "-m" option to create a user file, ie './eggdrop
      -m LamestBot.conf'.
 
-  9. When starting the bot in the future, drop the "-m".  If you have
+  8. When starting the bot in the future, drop the "-m".  If you have
      edited your bot script correctly, you can type:
      chmod u+x <my-bot-script-name>
      e.g.
@@ -81,12 +78,12 @@
      start up your bot.  For this to work, the top line of your script MUST
      contain the correct path to eggdrop.
 
- 10. It's advisable to run your bot via crontab so that it will
+  9. It's advisable to run your bot via crontab so that it will
      automatically restart if the machine goes down or (heaven forbid) the
      bot should crash. Look at the file 'scripts/botchk' and
      'scripts/autobotchk' for a great start with crontabbing the bot.
 
- 11. Smile, and if you haven't already read the README file in its
+ 10. Smile, and if you haven't already read the README file in its
      entirety, go take a long walk off a short pier.
 
 (3) MODULES
Index: eggdrop1.7/README
diff -u eggdrop1.7/README:1.19 eggdrop1.7/README:1.20
--- eggdrop1.7/README:1.19	Wed Oct 10 08:15:58 2001
+++ eggdrop1.7/README	Sun Oct 14 09:09:35 2001
@@ -337,9 +337,7 @@
                system CAN'T run modules it will setup 'make' to
                link the modules in statically for you, you can
                also choose this option if you can do dynamic
-               modules by typing 'make static'. You can also try
-               to compile dynamic modules on a static-only system
-               by typing 'make eggdrop'.
+               modules by typing 'configure --disable-shared'.
 
                8.1 DO I STILL NEED TO 'loadmodule modules' ???
 
@@ -433,8 +431,7 @@
                --enable-shared' when you configure TCL (not the
                bot) and then remake, & reinstall
                (2) if it's not you machine, you make have to
-               resort to 'make static' and 'make sinstall
-               DESTDIR=<dir>' to make and install your bot.
+               resort to './configure --disable-shared'.
                (3) if you are of a more aggressive sense of mind,
                go beat the stuffing out of your admin for have
                lame static libraries :)
Index: eggdrop1.7/acinclude.m4
diff -u eggdrop1.7/acinclude.m4:1.5 eggdrop1.7/acinclude.m4:1.6
--- eggdrop1.7/acinclude.m4:1.5	Sat Oct 13 16:36:58 2001
+++ eggdrop1.7/acinclude.m4	Sun Oct 14 09:09:35 2001
@@ -1,7 +1,7 @@
 dnl acinclude.m4
 dnl   macros autoconf uses when building configure from configure.in
 dnl
-dnl $Id: acinclude.m4,v 1.5 2001/10/13 21:36:58 tothwolf Exp $
+dnl $Id: acinclude.m4,v 1.6 2001/10/14 14:09:35 ite Exp $
 dnl
 
 
@@ -1098,6 +1098,25 @@
 
 AM_GNU_GETTEXT
 ])
+
+
+dnl  EGG_LIBTOOL
+dnl
+AC_DEFUN(EGG_LIBTOOL, [dnl
+AC_DISABLE_FAST_INSTALL
+AC_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
+AC_LIBLTDL_CONVENIENCE
+AC_SUBST(INCLTDL)
+AC_SUBST(LIBLTDL)
+AC_LIBTOOL_DLOPEN
+AM_PROG_LIBTOOL
+
+if test "x$enable_shared" = "xno"
+then
+  AC_DEFINE_UNQUOTED(STATIC, 1, Define if build is static)
+fi
+])dnl
 
 
 dnl  EGG_DEBUG_OPTIONS
Index: eggdrop1.7/bootstrap
diff -u eggdrop1.7/bootstrap:1.5 eggdrop1.7/bootstrap:1.6
--- eggdrop1.7/bootstrap:1.5	Tue Oct  9 20:20:08 2001
+++ eggdrop1.7/bootstrap	Sun Oct 14 09:09:35 2001
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: bootstrap,v 1.5 2001/10/10 01:20:08 ite Exp $
+# $Id: bootstrap,v 1.6 2001/10/14 14:09:35 ite Exp $
 #
 # Recommended development tools versions:
 #   autoconf 2.52
@@ -27,18 +27,17 @@
 # Bring in libtool with libtdl abstraction
 libtoolize --force --copy --ltdl
 
-# Generate config.h.in from acconfig.h and configure.in
-autoheader
+# Generate config.h.in from configure.in
+autoheader2.50
 
 # Generate Makefile.in from Makefile.am
 automake --add-missing --copy
 
 # Generate configure script
-autoconf
+autoconf2.50
 
 # Remove previous config.cache
 if [ -f config.cache ]; then
   rm -f config.cache
 fi
 
-set -x
Index: eggdrop1.7/configure.in
diff -u eggdrop1.7/configure.in:1.51 eggdrop1.7/configure.in:1.52
--- eggdrop1.7/configure.in:1.51	Sat Oct 13 23:44:36 2001
+++ eggdrop1.7/configure.in	Sun Oct 14 09:09:35 2001
@@ -26,14 +26,7 @@
 EGG_GNU_GETTEXT
 
 # Libtool support
-AC_DISABLE_FAST_INSTALL
-AC_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AC_LIBLTDL_CONVENIENCE
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
+EGG_LIBTOOL
 
 # Speedup compile
 EGG_CHECK_CCPIPE
Index: eggdrop1.7/po/eggdrop.pot
diff -u eggdrop1.7/po/eggdrop.pot:1.3 eggdrop1.7/po/eggdrop.pot:1.4
--- eggdrop1.7/po/eggdrop.pot:1.3	Tue Oct  9 20:20:09 2001
+++ eggdrop1.7/po/eggdrop.pot	Sun Oct 14 09:09:35 2001
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-09 02:13+0200\n"
+"POT-Creation-Date: 2001-10-14 13:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,7 +15,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Kill bot incase a botchk is run from crond.
-#: src/bg.c:125 src/bg.c:133 src/main.c:853 src/main.c:859
+#: src/bg.c:125 src/bg.c:133 src/main.c:818 src/main.c:824
 #, c-format
 msgid "* Warning!  Could not write %s file!\n"
 msgstr ""
@@ -44,7 +44,7 @@
 msgid "Note sent to"
 msgstr ""
 
-#: src/botcmd.c:295 src/botnet.c:1657 src/botnet.c:1664
+#: src/botcmd.c:295 src/botnet.c:1654 src/botnet.c:1661
 msgid "Disconnected from:"
 msgstr ""
 
@@ -77,7 +77,7 @@
 msgid "idle"
 msgstr ""
 
-#: src/botcmd.c:377 src/botcmd.c:413 src/botnet.c:547
+#: src/botcmd.c:377 src/botcmd.c:413 src/botnet.c:558
 msgid "AWAY"
 msgstr ""
 
@@ -139,7 +139,7 @@
 msgstr ""
 
 #. we're directly connected to the offending bot?! (shudder!)
-#: src/botcmd.c:702 src/users.c:1062 src/users.c:1065
+#: src/botcmd.c:702 src/users.c:1049 src/users.c:1052
 msgid "Rejecting bot"
 msgstr ""
 
@@ -165,7 +165,7 @@
 
 #. I'm the connection to the rejected bot
 #: src/botcmd.c:844 src/botcmd.c:845 src/botcmd.c:848 src/botcmd.c:1066
-#: src/users.c:1059
+#: src/users.c:1046
 msgid "rejected"
 msgstr ""
 
@@ -258,299 +258,299 @@
 msgid "Note arrived for you"
 msgstr ""
 
-#: src/botnet.c:448
+#: src/botnet.c:459
 msgid "Users across the botnet"
 msgstr ""
 
-#: src/botnet.c:448
+#: src/botnet.c:459
 msgid "Party line"
 msgstr ""
 
-#: src/botnet.c:449
+#: src/botnet.c:460
 msgid "Local channel"
 msgstr ""
 
-#: src/botnet.c:453 src/botnet.c:456
+#: src/botnet.c:464 src/botnet.c:467
 msgid "Users on channel"
 msgstr ""
 
-#: src/botnet.c:562 src/botnet.c:597
+#: src/botnet.c:573 src/botnet.c:608
 msgid "No bots linked."
 msgstr ""
 
-#: src/botnet.c:583
+#: src/botnet.c:594
 msgid "total"
 msgstr ""
 
-#: src/botnet.c:613
+#: src/botnet.c:624
 msgid "No trace info for:"
 msgstr ""
 
-#: src/botnet.c:626
+#: src/botnet.c:637
 msgid "Tree too complex!"
 msgstr ""
 
-#: src/botnet.c:893
+#: src/botnet.c:904
 msgid "Unlinking all bots..."
 msgstr ""
 
-#: src/botnet.c:898 src/botnet.c:901
+#: src/botnet.c:909 src/botnet.c:912
 msgid "Killed link attempt to"
 msgstr ""
 
-#: src/botnet.c:909
+#: src/botnet.c:920
 msgid "No longer trying to link:"
 msgstr ""
 
-#: src/botnet.c:922
+#: src/botnet.c:933
 msgid "Breaking link with"
 msgstr ""
 
-#: src/botnet.c:930 src/botnet.c:936
+#: src/botnet.c:941 src/botnet.c:947
 msgid "Unlinked from:"
 msgstr ""
 
-#: src/botnet.c:950
+#: src/botnet.c:961
 msgid "Not connected to that bot."
 msgstr ""
 
-#: src/botnet.c:973
+#: src/botnet.c:984
 msgid "Smooshing bot tables and assocs..."
 msgstr ""
 
-#: src/botnet.c:1004
+#: src/botnet.c:1015
 #, c-format
 msgid "%s is not a known bot.\n"
 msgstr ""
 
-#: src/botnet.c:1007
+#: src/botnet.c:1018
 msgid "Link to myself?  Oh boy, Freud would have a field day.\n"
 msgstr ""
 
-#: src/botnet.c:1010
+#: src/botnet.c:1021
 msgid "That bot is already connected up.\n"
 msgstr ""
 
-#: src/botnet.c:1017
+#: src/botnet.c:1028
 msgid "Already linking to that bot.\n"
 msgstr ""
 
-#: src/botnet.c:1024 src/botnet.c:1151
+#: src/botnet.c:1035 src/botnet.c:1162
 #, c-format
 msgid "Invalid telnet address:port stored for '%s'.\n"
 msgstr ""
 
-#: src/botnet.c:1025 src/botnet.c:1152
+#: src/botnet.c:1036 src/botnet.c:1163
 #, c-format
 msgid "Use: .chaddr %s <address>:<port#>[/<relay-port#>]\n"
 msgstr ""
 
-#: src/botnet.c:1030 src/botnet.c:1159
+#: src/botnet.c:1041 src/botnet.c:1170
 msgid "Sorry, too many DCC connections.\n"
 msgstr ""
 
-#: src/botnet.c:1035
+#: src/botnet.c:1046
 #, c-format
 msgid "Linking to %s at %s:%d ..."
 msgstr ""
 
-#: src/botnet.c:1063 src/dcc.c:223
+#: src/botnet.c:1074 src/dcc.c:223
 #, c-format
 msgid "Failed link to %s."
 msgstr ""
 
-#: src/botnet.c:1097 src/botnet.c:1349
+#: src/botnet.c:1108 src/botnet.c:1360
 msgid "Cant find user for relay!"
 msgstr ""
 
-#: src/botnet.c:1106
+#: src/botnet.c:1117
 msgid "Could not link to"
 msgstr ""
 
-#: src/botnet.c:1141
+#: src/botnet.c:1152
 msgid "is not a known bot."
 msgstr ""
 
-#: src/botnet.c:1145
+#: src/botnet.c:1156
 msgid "Relay to myself?  What on EARTH would be the point?!"
 msgstr ""
 
-#: src/botnet.c:1166
+#: src/botnet.c:1177
 msgid "No free sockets available.\n"
 msgstr ""
 
-#: src/botnet.c:1177
+#: src/botnet.c:1188
 msgid "(Type *BYE* on a line by itself to abort.)\n"
 msgstr ""
 
-#: src/botnet.c:1207 src/botnet.c:1268 src/botnet.c:1314
+#: src/botnet.c:1218 src/botnet.c:1279 src/botnet.c:1325
 #, c-format
 msgid "Cant find user for relay!  %d -> %d"
 msgstr ""
 
-#: src/botnet.c:1214
+#: src/botnet.c:1225
 #, c-format
 msgid "Could not link to %s.\n"
 msgstr ""
 
-#: src/botnet.c:1278
+#: src/botnet.c:1289
 #, c-format
 msgid "Aborting relay attempt to %s.\n"
 msgstr ""
 
-#: src/botnet.c:1279
+#: src/botnet.c:1290
 #, c-format
 msgid ""
 "You are now back on %s.\n"
 "\n"
 msgstr ""
 
-#: src/botnet.c:1280
+#: src/botnet.c:1291
 #, c-format
 msgid "Relay aborted: %s -> %s"
 msgstr ""
 
-#: src/botnet.c:1320
+#: src/botnet.c:1331
 #, c-format
 msgid "Lost dcc connection to [%s]%s/%d"
 msgstr ""
 
-#: src/botnet.c:1322
+#: src/botnet.c:1333
 #, c-format
 msgid "(Dropping relay attempt to %s)"
 msgstr ""
 
-#: src/botnet.c:1358
+#: src/botnet.c:1369
 msgid ""
 "Success!\n"
 "\n"
 "NOW CONNECTED TO RELAY BOT"
 msgstr ""
 
-#: src/botnet.c:1359
+#: src/botnet.c:1370
 msgid "(You can type *BYE* to prematurely close the connection.)"
 msgstr ""
 
-#: src/botnet.c:1360
+#: src/botnet.c:1371
 msgid "Relay link:"
 msgstr ""
 
-#: src/botnet.c:1367
+#: src/botnet.c:1378
 msgid "left the party line."
 msgstr ""
 
-#: src/botnet.c:1395
+#: src/botnet.c:1406
 msgid "Ended relay link"
 msgstr ""
 
-#: src/botnet.c:1397
+#: src/botnet.c:1408
 msgid ""
 "RELAY CONNECTION DROPPED.\n"
 "You are now back on"
 msgstr ""
 
-#: src/botnet.c:1404
+#: src/botnet.c:1415
 msgid "rejoined the party line."
 msgstr ""
 
-#: src/botnet.c:1419
+#: src/botnet.c:1430
 msgid "Lost dcc connection to"
 msgstr ""
 
-#: src/botnet.c:1424
+#: src/botnet.c:1435
 msgid "Dropping relay link to"
 msgstr ""
 
-#: src/botnet.c:1489
+#: src/botnet.c:1500
 msgid "Breaking connection to"
 msgstr ""
 
-#: src/botnet.c:1490
+#: src/botnet.c:1501
 msgid "You are now back on"
 msgstr ""
 
-#: src/botnet.c:1491
+#: src/botnet.c:1502
 msgid "Relay broken"
 msgstr ""
 
-#: src/botnet.c:1630 src/botnet.c:1634
+#: src/botnet.c:1627 src/botnet.c:1631
 msgid "Ping timeout"
 msgstr ""
 
-#: src/botnet.c:1658 src/botnet.c:1659 src/botnet.c:1664
+#: src/botnet.c:1655 src/botnet.c:1656 src/botnet.c:1661
 msgid "unleaflike behavior"
 msgstr ""
 
-#: src/botnet.c:1691
+#: src/botnet.c:1688
 msgid "Dropped bot"
 msgstr ""
 
-#: src/chanprog.c:272 src/cmds.c:558
+#: src/chanprog.c:257 src/cmds.c:558
 msgid "background"
 msgstr ""
 
-#: src/chanprog.c:275 src/cmds.c:558
+#: src/chanprog.c:260 src/cmds.c:558
 msgid "terminal mode"
 msgstr ""
 
-#: src/chanprog.c:277 src/cmds.c:559
+#: src/chanprog.c:262 src/cmds.c:559
 msgid "status mode"
 msgstr ""
 
-#: src/chanprog.c:279 src/cmds.c:559
+#: src/chanprog.c:264 src/cmds.c:559
 msgid "log dump mode"
 msgstr ""
 
-#: src/chanprog.c:296 src/cmds.c:557
+#: src/chanprog.c:281 src/cmds.c:557
 msgid "Online for"
 msgstr ""
 
-#: src/chanprog.c:297
+#: src/chanprog.c:282
 msgid "cache hit"
 msgstr ""
 
 #. info library
-#: src/chanprog.c:301
+#: src/chanprog.c:286
 msgid "Tcl library:"
 msgstr ""
 
 #. info tclversion/patchlevel
-#: src/chanprog.c:306
+#: src/chanprog.c:291
 msgid "Tcl version:"
 msgstr ""
 
-#: src/chanprog.c:309
+#: src/chanprog.c:294
 msgid "header version"
 msgstr ""
 
-#: src/chanprog.c:339
+#: src/chanprog.c:324
 msgid "New users get flags"
 msgstr ""
 
-#: src/chanprog.c:340
+#: src/chanprog.c:325
 msgid "notify"
 msgstr ""
 
-#: src/chanprog.c:342
+#: src/chanprog.c:327
 msgid "Permanent owner(s)"
 msgstr ""
 
-#: src/chanprog.c:392
+#: src/chanprog.c:377
 msgid "CONFIG FILE NOT LOADED (NOT FOUND, OR ERROR)"
 msgstr ""
 
-#: src/chanprog.c:415
+#: src/chanprog.c:396
 msgid ""
 "STARTING BOT IN USERFILE CREATION MODE.\n"
 "Telnet to the bot and enter 'NEW' as your nickname."
 msgstr ""
 
-#: src/chanprog.c:421
+#: src/chanprog.c:402
 #, c-format
 msgid "USER FILE NOT FOUND!  (try ./eggdrop -m %s to make one)\n"
 msgstr ""
 
-#: src/chanprog.c:424
+#: src/chanprog.c:405
 msgid ""
 "\n"
 "\n"
@@ -558,30 +558,30 @@
 "Telnet to the bot and enter 'NEW' as your nickname.\n"
 msgstr ""
 
-#: src/chanprog.c:427
+#: src/chanprog.c:408
 #, c-format
 msgid "OR Go to IRC and:  /msg %s hello\n"
 msgstr ""
 
-#: src/chanprog.c:428
+#: src/chanprog.c:409
 msgid ""
 "This will make the bot recognize you as the master.\n"
 "\n"
 msgstr ""
 
-#: src/chanprog.c:431
+#: src/chanprog.c:412
 msgid "USERFILE ALREADY EXISTS (drop the -m)\n"
 msgstr ""
 
-#: src/chanprog.c:459
+#: src/chanprog.c:440
 msgid "CANT WRITE TO TEMP DIR"
 msgstr ""
 
-#: src/chanprog.c:474
+#: src/chanprog.c:455
 msgid "Cant reload user file!"
 msgstr ""
 
-#: src/chanprog.c:483
+#: src/chanprog.c:464
 msgid "User file is missing!"
 msgstr ""
 
@@ -595,48 +595,48 @@
 msgid "(Added hostmask for %1$s from %2$s)\n"
 msgstr ""
 
-#: src/cmds.c:1063
+#: src/cmds.c:1059
 msgid "You can not .restart a bot when running -n (due to tcl)"
 msgstr ""
 
-#: src/cmds.c:1070
+#: src/cmds.c:1066
 msgid "Restarting ..."
 msgstr ""
 
-#: src/cmds.c:1079
+#: src/cmds.c:1075
 msgid "Rehashing."
 msgstr ""
 
-#: src/cmds.c:1083 src/mod/irc.mod/msgcmds.c:903 src/tcldcc.c:1014
+#: src/cmds.c:1079 src/mod/irc.mod/msgcmds.c:878 src/tcldcc.c:1003
 msgid "Rehashing..."
 msgstr ""
 
-#: src/cmds.c:1090
+#: src/cmds.c:1086
 msgid "Reloading user file..."
 msgstr ""
 
-#: src/cmds.c:1100 src/cmds.c:1106
+#: src/cmds.c:1096 src/cmds.c:1102
 msgid "BOT SHUTDOWN"
 msgstr ""
 
-#: src/cmds.c:1102 src/cmds.c:1108
+#: src/cmds.c:1098 src/cmds.c:1104
 msgid "DIE BY"
 msgstr ""
 
-#: src/cmds.c:1106
+#: src/cmds.c:1102
 msgid "Authorized by"
 msgstr ""
 
-#: src/cmds.c:1109
+#: src/cmds.c:1105
 msgid "requested"
 msgstr ""
 
-#: src/cmds.c:2219 src/cmds.c:2238 src/cmds.c:2271 src/cmds.c:2293
+#: src/cmds.c:2216 src/cmds.c:2235 src/cmds.c:2268 src/cmds.c:2290
 #: src/mod/server.mod/cmdsserv.c:53
 msgid "What?  You need .help\n"
 msgstr ""
 
-#: src/cmds.c:2275 src/cmds.c:2297 src/cmds.c:2551
+#: src/cmds.c:2272 src/cmds.c:2294 src/cmds.c:2548
 #: src/mod/filesys.mod/files.c:325 src/mod/filesys.mod/files.c:337
 #: src/mod/filesys.mod/files.c:434 src/mod/filesys.mod/files.c:556
 #: src/mod/filesys.mod/files.c:598 src/mod/filesys.mod/files.c:640
@@ -647,87 +647,87 @@
 #: src/mod/irc.mod/msgcmds.c:733 src/mod/notes.mod/cmdsnote.c:31
 #: src/mod/notes.mod/cmdsnote.c:73 src/mod/notes.mod/cmdsnote.c:153
 #: src/mod/notes.mod/cmdsnote.c:187 src/mod/notes.mod/cmdsnote.c:221
-#: src/mod/notes.mod/notes.c:737 src/mod/notes.mod/notes.c:773
+#: src/mod/notes.mod/notes.c:738 src/mod/notes.mod/notes.c:774
 msgid "Usage"
 msgstr ""
 
-#: src/cmds.c:2279
+#: src/cmds.c:2276
 msgid "Error loading module:"
 msgstr ""
 
-#: src/cmds.c:2282 src/modules.c:661
+#: src/cmds.c:2279 src/modules.c:598
 #, c-format
 msgid "Module loaded: %-16s"
 msgstr ""
 
-#: src/cmds.c:2301
+#: src/cmds.c:2298
 msgid "Error unloading module:"
 msgstr ""
 
-#: src/cmds.c:2304 src/modules.c:698
+#: src/cmds.c:2301
 msgid "Module unloaded:"
 msgstr ""
 
-#: src/cmds.c:2551
+#: src/cmds.c:2548
 msgid "handle"
 msgstr ""
 
-#: src/cmds.c:2552
+#: src/cmds.c:2549
 msgid "hostmask"
 msgstr ""
 
-#: src/cmds.c:2565 src/mod/notes.mod/cmdsnote.c:159
+#: src/cmds.c:2562 src/mod/notes.mod/cmdsnote.c:159
 msgid "No such user."
 msgstr ""
 
-#: src/cmds.c:2573
+#: src/cmds.c:2570
 msgid "You can't remove hosts while having the +d or +k flag."
 msgstr ""
 
-#: src/cmds.c:2580
+#: src/cmds.c:2577
 msgid "You can't remove hostmasks from non-bots.\n"
 msgstr ""
 
-#: src/cmds.c:2584
+#: src/cmds.c:2581
 msgid "You can't remove hostmask from a shared bot.\n"
 msgstr ""
 
-#: src/cmds.c:2588
+#: src/cmds.c:2585
 msgid "Can't remove hostmasks from the bot owner/master.\n"
 msgstr ""
 
-#: src/cmds.c:2591
+#: src/cmds.c:2588
 msgid "Permission denied.\n"
 msgstr ""
 
-#: src/cmds.c:2597
+#: src/cmds.c:2594
 #, c-format
 msgid "Removed '%1$s' from %2$s\n"
 msgstr ""
 
-#: src/cmds.c:2599 src/mod/filesys.mod/files.c:990
+#: src/cmds.c:2596 src/mod/filesys.mod/files.c:990
 #: src/mod/filesys.mod/files.c:1086
 msgid "Failed.\n"
 msgstr ""
 
-#: src/cmds.c:2607
+#: src/cmds.c:2604
 msgid "Usage: modules <bot>\n"
 msgstr ""
 
-#: src/cmds.c:2614
+#: src/cmds.c:2611
 msgid "No such bot online.\n"
 msgstr ""
 
-#: src/cmds.c:2717
+#: src/cmds.c:2714
 #, c-format
 msgid "You are %s@%s\n"
 msgstr ""
 
-#: src/cmds.c:2727
+#: src/cmds.c:2724
 msgid "*** Ja mata!\n"
 msgstr ""
 
-#: src/cmds.c:2729
+#: src/cmds.c:2726
 #, c-format
 msgid "DCC connection closed (%s!%s)"
 msgstr ""
@@ -768,126 +768,126 @@
 msgid "Timeout: bot link to %s at %s:%d"
 msgstr ""
 
-#: src/dcc.c:554 src/dcc.c:593
+#: src/dcc.c:546 src/dcc.c:582
 #, c-format
 msgid "Bad Password: [%s]%s/%d"
 msgstr ""
 
 #. Log entry for successful login -slennox 3/28/1999
-#: src/dcc.c:573
+#: src/dcc.c:564
 #, c-format
 msgid "Logged in: %s (%s/%d)"
 msgstr ""
 
-#: src/dcc.c:592
+#: src/dcc.c:581
 msgid "Negative on that, Houston.\n"
 msgstr ""
 
-#: src/dcc.c:608 src/dcc.c:1732
+#: src/dcc.c:595 src/dcc.c:1679
 #, c-format
 msgid "*** %s has joined the party line.\n"
 msgstr ""
 
-#: src/dcc.c:618 src/dcc.c:845
+#: src/dcc.c:605 src/dcc.c:808
 #, c-format
 msgid "Lost dcc connection to %s (%s/%d)"
 msgstr ""
 
-#: src/dcc.c:627
+#: src/dcc.c:614
 #, c-format
 msgid "Password timeout on dcc chat: [%s]%s"
 msgstr ""
 
-#: src/dcc.c:1033
+#: src/dcc.c:995
 #, c-format
 msgid "Telnet connection flood from %s!  Placing on ignore!"
 msgstr ""
 
-#: src/dcc.c:1060
+#: src/dcc.c:1022
 #, c-format
 msgid "Failed TELNET incoming (%s)"
 msgstr ""
 
-#: src/dcc.c:1076
+#: src/dcc.c:1038
 #, c-format
 msgid "Refused %s/%d (bad src port)"
 msgstr ""
 
-#: src/dcc.c:1085
+#: src/dcc.c:1047
 #, c-format
 msgid "Refused %s/%d (invalid ip)"
 msgstr ""
 
-#: src/dcc.c:1130
+#: src/dcc.c:1092
 #, c-format
 msgid "Refused %s (bad hostname)"
 msgstr ""
 
-#: src/dcc.c:1147
+#: src/dcc.c:1109
 #, c-format
 msgid "Telnet connection: %s/%d"
 msgstr ""
 
-#: src/dcc.c:1162
+#: src/dcc.c:1124
 #, c-format
 msgid "Ident failed for %s: %s"
 msgstr ""
 
-#: src/dcc.c:1179
+#: src/dcc.c:1141
 #, c-format
 msgid "(!) Listening port %d abruptly died."
 msgstr ""
 
-#: src/dcc.c:1207
+#: src/dcc.c:1168
 #, c-format
 msgid "Lost telnet connection from %s while checking for duplicate"
 msgstr ""
 
-#: src/dcc.c:1229
+#: src/dcc.c:1190
 #, c-format
 msgid "Refused telnet connection from %s (duplicate)"
 msgstr ""
 
-#: src/dcc.c:1305
+#: src/dcc.c:1255
 #, c-format
 msgid "Refused %s (bad nick)"
 msgstr ""
 
-#: src/dcc.c:1315
+#: src/dcc.c:1265
 #, c-format
 msgid "Refused %s (non-bot)"
 msgstr ""
 
-#: src/dcc.c:1322
+#: src/dcc.c:1272
 #, c-format
 msgid "Refused %s (non-user)"
 msgstr ""
 
-#: src/dcc.c:1333
+#: src/dcc.c:1283
 #, c-format
 msgid ""
 "This is the telnet interface to %s, an eggdrop bot.\n"
 "Dont abuse it, and it will be open for all your friends, too.\n"
 msgstr ""
 
-#: src/dcc.c:1334
+#: src/dcc.c:1284
 msgid ""
 "You now get to pick a nick to use on the bot,\n"
 "and a password so nobody else can pretend to be you.\n"
 "Please remember both!"
 msgstr ""
 
-#: src/dcc.c:1352
+#: src/dcc.c:1302
 #, c-format
 msgid "Refused %s (invalid handle: %s)"
 msgstr ""
 
-#: src/dcc.c:1362
+#: src/dcc.c:1312
 #, c-format
 msgid "Refused telnet connection from %s (tried using my botnetnick)"
 msgstr ""
 
-#: src/dcc.c:1406
+#: src/dcc.c:1356
 #, c-format
 msgid "Refused [%s]%s (no password)"
 msgstr ""
@@ -900,92 +900,92 @@
 #. *       <Cybah>
 #.
 #. Turn off remote telnet echo (send IAC WILL ECHO).
-#: src/dcc.c:1465 src/mod/filesys.mod/filesys.c:881
-#: src/mod/server.mod/server.c:1505
+#: src/dcc.c:1415 src/mod/filesys.mod/filesys.c:864
+#: src/mod/server.mod/server.c:1332
 msgid "Enter your password."
 msgstr ""
 
-#: src/dcc.c:1471
+#: src/dcc.c:1421
 #, c-format
 msgid "Lost telnet connection to %s/%d"
 msgstr ""
 
-#: src/dcc.c:1480
+#: src/dcc.c:1430
 #, c-format
 msgid "Ident timeout on telnet: %s"
 msgstr ""
 
-#: src/dcc.c:1559
+#: src/dcc.c:1508
 msgid ""
 "From now on, you dont need to use the -m option to start the bot.\n"
 "Enjoy !!"
 msgstr ""
 
-#: src/dcc.c:1560 src/mod/irc.mod/msgcmds.c:94
+#: src/dcc.c:1509 src/mod/irc.mod/msgcmds.c:94
 #, c-format
 msgid "Bot installation complete, first master is %s"
 msgstr ""
 
-#: src/dcc.c:1591
+#: src/dcc.c:1540
 #, c-format
 msgid "New user via telnet: [%s]%s/%d"
 msgstr ""
 
-#: src/dcc.c:1618
+#: src/dcc.c:1567
 #, c-format
 msgid "Lost new telnet user (%s/%d)"
 msgstr ""
 
-#: src/dcc.c:1625
+#: src/dcc.c:1574
 #, c-format
 msgid "Lost new telnet user %s (%s/%d)"
 msgstr ""
 
-#: src/dcc.c:1635
+#: src/dcc.c:1584
 #, c-format
 msgid "Timeout on new telnet user: %s/%d"
 msgstr ""
 
-#: src/dcc.c:1644
+#: src/dcc.c:1593
 #, c-format
 msgid "Timeout on new telnet user: [%s]%s/%d"
 msgstr ""
 
-#: src/dcc.c:1696 src/dns.c:254
+#: src/dcc.c:1643 src/dns.c:226
 #, c-format
 msgid "Tcl error [%s]: %s"
 msgstr ""
 
-#: src/dcc.c:1765
+#: src/dcc.c:1712
 #, c-format
 msgid "*** ATTENTION: DEAD SOCKET (%d) OF TYPE %s UNTRAPPED"
 msgstr ""
 
-#: src/dcc.c:1877
+#: src/dcc.c:1811
 #, c-format
 msgid "Lost connection while identing [%s/%d]"
 msgstr ""
 
-#: src/dcc.c:1942
+#: src/dcc.c:1875
 msgid "Timeout/EOF ident connection"
 msgstr ""
 
-#: src/dcc.c:1981
+#: src/dcc.c:1913
 msgid "Lost ident wait telnet socket!!"
 msgstr ""
 
-#: src/dcc.c:2005
+#: src/dcc.c:1937
 #, c-format
 msgid "Denied telnet: %s, No Access"
 msgstr ""
 
-#: src/dcc.c:2050
+#: src/dcc.c:1981
 msgid ""
 "\n"
 "Nickname.\n"
 msgstr ""
 
-#: src/dcc.c:2053
+#: src/dcc.c:1984
 msgid ""
 "%B  (%E)\n"
 "\n"
@@ -993,30 +993,30 @@
 msgstr ""
 
 #. FLOOD
-#: src/dccutil.c:496
+#: src/dccutil.c:457
 msgid "Goodbye"
 msgstr ""
 
-#: src/dccutil.c:502
+#: src/dccutil.c:463
 #, c-format
 msgid "%s has been forcibly removed for flooding.\n"
 msgstr ""
 
-#: src/dccutil.c:527 src/mod/filesys.mod/filesys.c:938
+#: src/dccutil.c:488 src/mod/filesys.mod/filesys.c:916
 msgid "-=- poof -=-\n"
 msgstr ""
 
-#: src/dccutil.c:528
+#: src/dccutil.c:489
 #, c-format
 msgid "Youve been booted from the %s by %s%s%s\n"
 msgstr ""
 
-#: src/dccutil.c:537
+#: src/dccutil.c:498
 #, c-format
 msgid "%s booted %s from the party line%s%s\n"
 msgstr ""
 
-#: src/main.c:483
+#: src/main.c:450
 msgid ""
 "Command line arguments:\n"
 "  -h   help\n"
@@ -1028,132 +1028,132 @@
 "  optional config filename (default 'eggdrop.conf')\n"
 msgstr ""
 
-#: src/main.c:504
+#: src/main.c:471
 msgid "Backing up user file..."
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:552
 msgid "Switching logfiles..."
 msgstr ""
 
-#: src/main.c:788
+#: src/main.c:751
 msgid "ERROR: Eggdrop will not run as root!"
 msgstr ""
 
-#: src/main.c:807
+#: src/main.c:772
 msgid ""
 "You have installed modules but have not selected an encryption\n"
 "module, please consult the default config file for info.\n"
 msgstr ""
 
-#: src/main.c:829
+#: src/main.c:794
 #, c-format
 msgid "I detect %s already running from this directory.\n"
 msgstr ""
 
-#: src/main.c:830
+#: src/main.c:795
 #, c-format
 msgid "If this is incorrect, erase the %s\n"
 msgstr ""
 
 #. Should be only 2 modules now - blowfish (or some other
 #. encryption module) and eggdrop.
-#: src/main.c:1066
+#: src/main.c:1034
 msgid "Stagnant module; there WILL be memory leaks!"
 msgstr ""
 
-#: src/misc.c:587 src/misc.c:590 src/misc.c:698 src/misc.c:701
+#: src/misc.c:558 src/misc.c:561 src/misc.c:669 src/misc.c:672
 #, c-format
 msgid "Last message repeated %d time(s).\n"
 msgstr ""
 
 #. write to the log before closing it huh..
-#: src/misc.c:660
+#: src/misc.c:631
 #, c-format
 msgid "Cycling logfile %s, over max-logsize (%d)"
 msgstr ""
 
-#: src/misc.c:1214 src/misc.c:1253
+#: src/misc.c:1179 src/misc.c:1218
 msgid "No help available on that."
 msgstr ""
 
-#: src/misc.c:1277 src/misc.c:1302
+#: src/misc.c:1242 src/misc.c:1267
 msgid "No help available on that.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:185
+#: src/mod/assoc.mod/assoc.c:176
 msgid "No channel names\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:188
+#: src/mod/assoc.mod/assoc.c:179
 msgid " Chan  Name\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:204
+#: src/mod/assoc.mod/assoc.c:195
 msgid "What?  You need '.help'\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:210
+#: src/mod/assoc.mod/assoc.c:201
 msgid "Channel # out of range: must be *0-*99999\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:216
+#: src/mod/assoc.mod/assoc.c:207
 msgid "You cant name the main party line; its just a party line.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:219
+#: src/mod/assoc.mod/assoc.c:210
 msgid "Channel # out of range: must be 1-99999\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:226
+#: src/mod/assoc.mod/assoc.c:217
 #, c-format
 msgid "Channel %s%d has no name.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:232
+#: src/mod/assoc.mod/assoc.c:223
 #, c-format
 msgid "Okay, removed name for channel %s%d.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:234
+#: src/mod/assoc.mod/assoc.c:225
 #, c-format
 msgid "--- %s removed this channels name.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:240
+#: src/mod/assoc.mod/assoc.c:231
 msgid "Channels name cant be that long (20 chars max).\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:244
+#: src/mod/assoc.mod/assoc.c:235
 msgid "First character of the channel name cant be a digit.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:249
+#: src/mod/assoc.mod/assoc.c:240
 #, c-format
 msgid "Okay, channel %s%d is %s now.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:251
+#: src/mod/assoc.mod/assoc.c:242
 #, c-format
 msgid "--- %s named this channel %s\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:331
+#: src/mod/assoc.mod/assoc.c:322
 #, c-format
 msgid "--- (%s) named this channel %s.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:334
+#: src/mod/assoc.mod/assoc.c:325
 #, c-format
 msgid "--- (%s) %s removed this channels name.\n"
 msgstr ""
 
-#: src/mod/assoc.mod/assoc.c:339
+#: src/mod/assoc.mod/assoc.c:330
 #, c-format
 msgid "--- (%s) %s named this channel '%s'.\n"
 msgstr ""
 
-#: src/mod/channels.mod/channels.c:566
+#: src/mod/channels.mod/channels.c:555
 msgid "lurking"
 msgstr ""
 
@@ -1172,162 +1172,162 @@
 msgid "Removed invite"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:415
+#: src/mod/channels.mod/userchan.c:413
 msgid "Wanted to ban myself--deflected."
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:602 src/mod/channels.mod/userchan.c:650
-#: src/mod/channels.mod/userchan.c:698
+#: src/mod/channels.mod/userchan.c:591 src/mod/channels.mod/userchan.c:639
+#: src/mod/channels.mod/userchan.c:687
 msgid "Created"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:605 src/mod/channels.mod/userchan.c:653
-#: src/mod/channels.mod/userchan.c:701
+#: src/mod/channels.mod/userchan.c:594 src/mod/channels.mod/userchan.c:642
+#: src/mod/channels.mod/userchan.c:690
 msgid "last used"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:632 src/mod/channels.mod/userchan.c:680
-#: src/mod/channels.mod/userchan.c:728
+#: src/mod/channels.mod/userchan.c:621 src/mod/channels.mod/userchan.c:669
+#: src/mod/channels.mod/userchan.c:717
 msgid "inactive"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:750 src/mod/channels.mod/userchan.c:929
+#: src/mod/channels.mod/userchan.c:739 src/mod/channels.mod/userchan.c:916
 msgid "No such channel defined"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:760 src/mod/channels.mod/userchan.c:763
+#: src/mod/channels.mod/userchan.c:749 src/mod/channels.mod/userchan.c:752
 msgid "Global bans"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:761 src/mod/channels.mod/userchan.c:849
-#: src/mod/channels.mod/userchan.c:940
+#: src/mod/channels.mod/userchan.c:750 src/mod/channels.mod/userchan.c:837
+#: src/mod/channels.mod/userchan.c:927
 msgid "not active on"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:775
+#: src/mod/channels.mod/userchan.c:764
 #, c-format
 msgid "Channel bans for %s:   (! = not active, * = not placed by bot)\n"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:778
+#: src/mod/channels.mod/userchan.c:767
 #, c-format
 msgid "Channel bans for %s:  (* = not placed by bot)\n"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:820
+#: src/mod/channels.mod/userchan.c:808
 msgid "(There are no bans, permanent or otherwise.)\n"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:822
+#: src/mod/channels.mod/userchan.c:810
 msgid "Use .bans all to see the total list.\n"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:838
+#: src/mod/channels.mod/userchan.c:826
 msgid "No such channel defined.\n"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:848
+#: src/mod/channels.mod/userchan.c:836
 msgid "Global exempts"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:851
+#: src/mod/channels.mod/userchan.c:839
 msgid "Global exempts:\n"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:864 src/mod/channels.mod/userchan.c:869
+#: src/mod/channels.mod/userchan.c:852 src/mod/channels.mod/userchan.c:857
 msgid "Channel exempts for"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:865 src/mod/channels.mod/userchan.c:956
+#: src/mod/channels.mod/userchan.c:853 src/mod/channels.mod/userchan.c:943
 msgid "not active"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:866 src/mod/channels.mod/userchan.c:870
-#: src/mod/channels.mod/userchan.c:957 src/mod/channels.mod/userchan.c:961
+#: src/mod/channels.mod/userchan.c:854 src/mod/channels.mod/userchan.c:858
+#: src/mod/channels.mod/userchan.c:944 src/mod/channels.mod/userchan.c:948
 msgid "not placed by bot"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:913
+#: src/mod/channels.mod/userchan.c:900
 msgid "Use .exempts all to see the total list"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:939 src/mod/channels.mod/userchan.c:942
+#: src/mod/channels.mod/userchan.c:926 src/mod/channels.mod/userchan.c:929
 msgid "Global invites"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:955 src/mod/channels.mod/userchan.c:960
+#: src/mod/channels.mod/userchan.c:942 src/mod/channels.mod/userchan.c:947
 msgid "Channel invites for"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:1004
+#: src/mod/channels.mod/userchan.c:990
 msgid "Use .invites all to see the total list"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:1204 src/userrec.c:534 src/userrec.c:549
+#: src/mod/channels.mod/userchan.c:1190 src/userrec.c:428 src/userrec.c:443
 msgid "ERROR writing user file."
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:1274 src/mod/channels.mod/userchan.c:1291
+#: src/mod/channels.mod/userchan.c:1260 src/mod/channels.mod/userchan.c:1277
 msgid "No longer banning"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:1275 src/mod/channels.mod/userchan.c:1292
-#: src/mod/channels.mod/userchan.c:1320 src/mod/channels.mod/userchan.c:1366
-#: src/mod/channels.mod/userchan.c:1394 src/mod/channels.mod/userchan.c:1412
-#: src/users.c:220
+#: src/mod/channels.mod/userchan.c:1261 src/mod/channels.mod/userchan.c:1278
+#: src/mod/channels.mod/userchan.c:1306 src/mod/channels.mod/userchan.c:1352
+#: src/mod/channels.mod/userchan.c:1380 src/mod/channels.mod/userchan.c:1398
+#: src/users.c:217
 msgid "expired"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:1292 src/mod/channels.mod/userchan.c:1366
-#: src/mod/channels.mod/userchan.c:1412
+#: src/mod/channels.mod/userchan.c:1278 src/mod/channels.mod/userchan.c:1352
+#: src/mod/channels.mod/userchan.c:1398
 msgid "on"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:1319 src/mod/channels.mod/userchan.c:1365
+#: src/mod/channels.mod/userchan.c:1305 src/mod/channels.mod/userchan.c:1351
 msgid "No longer ban exempting"
 msgstr ""
 
-#: src/mod/channels.mod/userchan.c:1393 src/mod/channels.mod/userchan.c:1411
+#: src/mod/channels.mod/userchan.c:1379 src/mod/channels.mod/userchan.c:1397
 msgid "No longer inviteing"
 msgstr ""
 
-#: src/mod/console.mod/console.c:203
+#: src/mod/console.mod/console.c:193
 msgid "Saved Console Settings:"
 msgstr ""
 
-#: src/mod/console.mod/console.c:204 src/mod/console.mod/console.c:316
+#: src/mod/console.mod/console.c:194 src/mod/console.mod/console.c:301
 msgid "Channel:"
 msgstr ""
 
-#: src/mod/console.mod/console.c:205 src/mod/console.mod/console.c:317
+#: src/mod/console.mod/console.c:195 src/mod/console.mod/console.c:302
 msgid "Console flags:"
 msgstr ""
 
-#: src/mod/console.mod/console.c:206 src/mod/console.mod/console.c:318
+#: src/mod/console.mod/console.c:196 src/mod/console.mod/console.c:303
 msgid "Strip flags:"
 msgstr ""
 
-#: src/mod/console.mod/console.c:207 src/mod/console.mod/console.c:319
+#: src/mod/console.mod/console.c:197 src/mod/console.mod/console.c:304
 msgid "Echo:"
 msgstr ""
 
-#: src/mod/console.mod/console.c:208 src/mod/console.mod/console.c:320
+#: src/mod/console.mod/console.c:198 src/mod/console.mod/console.c:305
 msgid "yes"
 msgstr ""
 
-#: src/mod/console.mod/console.c:208 src/mod/console.mod/console.c:320
+#: src/mod/console.mod/console.c:198 src/mod/console.mod/console.c:305
 msgid "no"
 msgstr ""
 
-#: src/mod/console.mod/console.c:209 src/mod/console.mod/console.c:321
+#: src/mod/console.mod/console.c:199 src/mod/console.mod/console.c:306
 msgid "Page setting:"
 msgstr ""
 
-#: src/mod/console.mod/console.c:210 src/mod/console.mod/console.c:322
+#: src/mod/console.mod/console.c:200 src/mod/console.mod/console.c:307
 msgid "Console channel:"
 msgstr ""
 
-#: src/mod/console.mod/console.c:315
+#: src/mod/console.mod/console.c:300
 msgid "Saved your Console Settings:"
 msgstr ""
 
@@ -1336,32 +1336,32 @@
 msgid "Converting filesystem image in %s ..."
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:654
+#: src/mod/filesys.mod/filedb3.c:646
 msgid "filedb-update: cant open directory!"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:768
+#: src/mod/filesys.mod/filedb3.c:760
 #, c-format
 msgid "(!) Broken convert to filedb in %s"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:906
+#: src/mod/filesys.mod/filedb3.c:898
 msgid "Filename                        Size  Sent by/Date         # Gets\n"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:907
+#: src/mod/filesys.mod/filedb3.c:899
 msgid "------------------------------  ----  -------------------  ------\n"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:931 src/mod/filesys.mod/filedb3.c:935
+#: src/mod/filesys.mod/filedb3.c:923 src/mod/filesys.mod/filedb3.c:927
 msgid "requires"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:1016
+#: src/mod/filesys.mod/filedb3.c:1008
 msgid "No files in this directory.\n"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:1018 src/mod/filesys.mod/files.c:466
+#: src/mod/filesys.mod/filedb3.c:1010 src/mod/filesys.mod/files.c:466
 #: src/mod/filesys.mod/files.c:513 src/mod/filesys.mod/files.c:566
 #: src/mod/filesys.mod/files.c:582 src/mod/filesys.mod/files.c:608
 #: src/mod/filesys.mod/files.c:624 src/mod/filesys.mod/files.c:650
@@ -1372,27 +1372,27 @@
 msgid "No matching files.\n"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:1046
+#: src/mod/filesys.mod/filedb3.c:1038
 msgid "Directory does not exist"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:1052
+#: src/mod/filesys.mod/filedb3.c:1044
 msgid "File does not exist"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:1056
+#: src/mod/filesys.mod/filedb3.c:1048
 msgid "File is not shared"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:1067
+#: src/mod/filesys.mod/filedb3.c:1059
 msgid "(remote)"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:1070
+#: src/mod/filesys.mod/filedb3.c:1062
 msgid "Error trying to send file"
 msgstr ""
 
-#: src/mod/filesys.mod/filedb3.c:1094
+#: src/mod/filesys.mod/filedb3.c:1086
 #, c-format
 msgid "Remote request for /%s%s%s (sending)"
 msgstr ""
@@ -1496,7 +1496,7 @@
 msgstr ""
 
 #: src/mod/filesys.mod/files.c:923 src/mod/filesys.mod/files.c:935
-#: src/mod/notes.mod/notes.c:655 src/mod/notes.mod/notes.c:658
+#: src/mod/notes.mod/notes.c:656 src/mod/notes.mod/notes.c:659
 msgid "Erased"
 msgstr ""
 
@@ -1551,48 +1551,48 @@
 msgid "Moved"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:654 src/mod/filesys.mod/filesys.c:854
-#: src/mod/server.mod/server.c:1444 src/mod/server.mod/server.c:1488
-#: src/mod/transfer.mod/transfer.c:724
+#: src/mod/filesys.mod/filesys.c:640 src/mod/filesys.mod/filesys.c:839
+#: src/mod/server.mod/server.c:1271 src/mod/server.mod/server.c:1315
+#: src/mod/transfer.mod/transfer.c:708
 msgid "Failed to connect"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:833 src/mod/server.mod/server.c:1429
+#: src/mod/filesys.mod/filesys.c:818 src/mod/server.mod/server.c:1256
 #, c-format
 msgid "DCC connections full: %s %s (%s!%s)"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:838 src/mod/server.mod/server.c:1434
+#: src/mod/filesys.mod/filesys.c:823 src/mod/server.mod/server.c:1261
 msgid "No access"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:839 src/mod/server.mod/server.c:1435
-#: src/mod/server.mod/servmsg.c:447
+#: src/mod/filesys.mod/filesys.c:824 src/mod/server.mod/server.c:1262
+#: src/mod/server.mod/servmsg.c:446
 msgid "Refused DCC chat (no access)"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:842 src/mod/server.mod/server.c:1438
+#: src/mod/filesys.mod/filesys.c:827 src/mod/server.mod/server.c:1265
 msgid "You must have a password set."
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:843 src/mod/server.mod/server.c:1439
+#: src/mod/filesys.mod/filesys.c:828 src/mod/server.mod/server.c:1266
 msgid "Refused DCC chat (no password)"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:845
+#: src/mod/filesys.mod/filesys.c:830
 msgid "Refused DCC chat (+x but no file area)"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:855 src/mod/server.mod/server.c:1489
-#: src/mod/transfer.mod/transfer.c:725
+#: src/mod/filesys.mod/filesys.c:840 src/mod/server.mod/server.c:1316
+#: src/mod/transfer.mod/transfer.c:709
 msgid "DCC connection failed"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:863
+#: src/mod/filesys.mod/filesys.c:848
 msgid "Failed to connect (invalid port)\n"
 msgstr ""
 
-#: src/mod/filesys.mod/filesys.c:864
+#: src/mod/filesys.mod/filesys.c:849
 msgid "Refused DCC chat (invalid port)"
 msgstr ""
 
@@ -1641,7 +1641,7 @@
 msgstr ""
 
 #: src/mod/irc.mod/chan.c:421 src/mod/irc.mod/chan.c:490
-#: src/mod/irc.mod/chan.c:1658
+#: src/mod/irc.mod/chan.c:1661
 msgid "You are banned"
 msgstr ""
 
@@ -1673,29 +1673,29 @@
 msgid "Banned from channel--can't join: %s"
 msgstr ""
 
-#: src/mod/irc.mod/chan.c:1311 src/mod/irc.mod/chan.c:1320
+#: src/mod/irc.mod/chan.c:1311 src/mod/irc.mod/chan.c:1319
 #, c-format
 msgid "Bad key--cant join: %s"
 msgstr ""
 
-#: src/mod/irc.mod/chan.c:1674
+#: src/mod/irc.mod/chan.c:1677
 msgid "...and dont come back."
 msgstr ""
 
-#: src/mod/irc.mod/chan.c:1937 src/mod/server.mod/servmsg.c:676
+#: src/mod/irc.mod/chan.c:1942 src/mod/server.mod/servmsg.c:677
 #: src/mod/server.mod/servmsg.c:824 src/mod/server.mod/servmsg.c:836
 #, c-format
 msgid "Switching back to nick %s"
 msgstr ""
 
-#: src/mod/irc.mod/chan.c:1941 src/mod/server.mod/servmsg.c:679
+#: src/mod/irc.mod/chan.c:1946 src/mod/server.mod/servmsg.c:680
 #: src/mod/server.mod/servmsg.c:828 src/mod/server.mod/servmsg.c:840
 #, c-format
 msgid "Switching back to altnick %s"
 msgstr ""
 
-#: src/mod/irc.mod/chan.c:1990 src/mod/irc.mod/chan.c:1995
-#: src/mod/irc.mod/chan.c:2126 src/mod/irc.mod/chan.c:2131
+#: src/mod/irc.mod/chan.c:1996 src/mod/irc.mod/chan.c:2001
+#: src/mod/irc.mod/chan.c:2134 src/mod/irc.mod/chan.c:2139
 msgid "that was fun, lets do it again!"
 msgstr ""
 
@@ -1740,7 +1740,7 @@
 msgstr ""
 
 #: src/mod/irc.mod/cmdsirc.c:948 src/mod/irc.mod/msgcmds.c:310
-#: src/mod/irc.mod/msgcmds.c:399 src/mod/irc.mod/msgcmds.c:951
+#: src/mod/irc.mod/msgcmds.c:399 src/mod/irc.mod/msgcmds.c:926
 msgid "I dont monitor that channel."
 msgstr ""
 
@@ -1752,23 +1752,23 @@
 msgid "dont deop my friends, bud"
 msgstr ""
 
-#: src/mod/irc.mod/irc.c:830
+#: src/mod/irc.mod/irc.c:833
 msgid "juped"
 msgstr ""
 
-#: src/mod/irc.mod/irc.c:832
+#: src/mod/irc.mod/irc.c:835
 msgid "trying"
 msgstr ""
 
-#: src/mod/irc.mod/irc.c:834
+#: src/mod/irc.mod/irc.c:837
 msgid "pending"
 msgstr ""
 
-#: src/mod/irc.mod/irc.c:836
+#: src/mod/irc.mod/irc.c:839
 msgid "opless"
 msgstr ""
 
-#: src/mod/irc.mod/irc.c:838
+#: src/mod/irc.mod/irc.c:841
 msgid "want ops!"
 msgstr ""
 
@@ -1782,7 +1782,7 @@
 msgid "Banned"
 msgstr ""
 
-#: src/mod/irc.mod/mode.c:877
+#: src/mod/irc.mod/mode.c:875
 #, c-format
 msgid "Oops.   Someone made me join %s... leaving..."
 msgstr ""
@@ -1894,9 +1894,8 @@
 
 #: src/mod/irc.mod/msgcmds.c:139 src/mod/irc.mod/msgcmds.c:202
 #: src/mod/irc.mod/msgcmds.c:265 src/mod/irc.mod/msgcmds.c:305
-#: src/mod/irc.mod/msgcmds.c:787 src/mod/irc.mod/msgcmds.c:850
-#: src/mod/irc.mod/msgcmds.c:874 src/mod/irc.mod/msgcmds.c:945
-#: src/mod/irc.mod/msgcmds.c:976
+#: src/mod/irc.mod/msgcmds.c:787 src/mod/irc.mod/msgcmds.c:849
+#: src/mod/irc.mod/msgcmds.c:920 src/mod/irc.mod/msgcmds.c:951
 msgid "You dont have a password set."
 msgstr ""
 
@@ -2021,15 +2020,15 @@
 msgid "Not on that channel right now."
 msgstr ""
 
-#: src/mod/irc.mod/msgcmds.c:878
+#: src/mod/irc.mod/msgcmds.c:853
 msgid "Bot shut down beginning...."
 msgstr ""
 
-#: src/mod/irc.mod/msgcmds.c:955 src/mod/irc.mod/msgcmds.c:960
+#: src/mod/irc.mod/msgcmds.c:930 src/mod/irc.mod/msgcmds.c:935
 msgid "Resetting channel info."
 msgstr ""
 
-#: src/mod/irc.mod/msgcmds.c:993 src/mod/server.mod/cmdsserv.c:81
+#: src/mod/irc.mod/msgcmds.c:968 src/mod/server.mod/cmdsserv.c:81
 msgid "Jumping servers..."
 msgstr ""
 
@@ -2092,7 +2091,7 @@
 msgid "Changed notes forwarding for %s to: %s\n"
 msgstr ""
 
-#: src/mod/notes.mod/cmdsnote.c:190 src/mod/notes.mod/notes.c:741
+#: src/mod/notes.mod/cmdsnote.c:190 src/mod/notes.mod/notes.c:742
 msgid "# may be numbers and/or intervals separated by ;"
 msgstr ""
 
@@ -2100,153 +2099,153 @@
 msgid "Function must be one of INDEX, READ, or ERASE."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:74
+#: src/mod/notes.mod/notes.c:75
 #, c-format
 msgid "  Forward notes to: %.70s\n"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:153
+#: src/mod/notes.mod/notes.c:154
 #, c-format
 msgid "Switched %d note%s from %s to %s."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:205
+#: src/mod/notes.mod/notes.c:206
 #, c-format
 msgid "Expired %d note%s"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:279
+#: src/mod/notes.mod/notes.c:280
 #, c-format
 msgid "Not online; forwarded to %s.\n"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:291 src/mod/notes.mod/notes.c:803
+#: src/mod/notes.mod/notes.c:292 src/mod/notes.mod/notes.c:804
 msgid "Notes are not supported by this bot."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:294
+#: src/mod/notes.mod/notes.c:295
 msgid "Sorry, that user has too many notes already."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:301 src/mod/notes.mod/notes.c:810
+#: src/mod/notes.mod/notes.c:302 src/mod/notes.mod/notes.c:811
 msgid "Cant create notefile.  Sorry."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:302 src/mod/notes.mod/notes.c:811
+#: src/mod/notes.mod/notes.c:303 src/mod/notes.mod/notes.c:812
 msgid "Notefile unreachable!"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:319
+#: src/mod/notes.mod/notes.c:320
 msgid "Stored message"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:480 src/mod/notes.mod/notes.c:482
-#: src/mod/notes.mod/notes.c:488 src/mod/notes.mod/notes.c:490
-#: src/mod/notes.mod/notes.c:552 src/mod/notes.mod/notes.c:554
-#: src/mod/notes.mod/notes.c:563 src/mod/notes.mod/notes.c:565
-#: src/mod/notes.mod/notes.c:586 src/mod/notes.mod/notes.c:588
-#: src/mod/notes.mod/notes.c:594 src/mod/notes.mod/notes.c:596
-#: src/mod/notes.mod/notes.c:644 src/mod/notes.mod/notes.c:646
+#: src/mod/notes.mod/notes.c:481 src/mod/notes.mod/notes.c:483
+#: src/mod/notes.mod/notes.c:489 src/mod/notes.mod/notes.c:491
+#: src/mod/notes.mod/notes.c:553 src/mod/notes.mod/notes.c:555
+#: src/mod/notes.mod/notes.c:564 src/mod/notes.mod/notes.c:566
+#: src/mod/notes.mod/notes.c:587 src/mod/notes.mod/notes.c:589
+#: src/mod/notes.mod/notes.c:595 src/mod/notes.mod/notes.c:597
+#: src/mod/notes.mod/notes.c:645 src/mod/notes.mod/notes.c:647
 msgid "You have no messages"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:515
+#: src/mod/notes.mod/notes.c:516
 msgid " -- EXPIRES TODAY"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:517
+#: src/mod/notes.mod/notes.c:518
 #, c-format
 msgid " -- EXPIRES IN %d DAY%s"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:523
+#: src/mod/notes.mod/notes.c:524
 msgid "You have the following notes waiting"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:545 src/mod/notes.mod/notes.c:547
-#: src/mod/notes.mod/notes.c:639 src/mod/notes.mod/notes.c:641
+#: src/mod/notes.mod/notes.c:546 src/mod/notes.mod/notes.c:548
+#: src/mod/notes.mod/notes.c:640 src/mod/notes.mod/notes.c:642
 msgid "You dont have that many messages"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:557 src/mod/notes.mod/notes.c:821
+#: src/mod/notes.mod/notes.c:558 src/mod/notes.mod/notes.c:822
 msgid "Use .notes read to read them."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:603 src/mod/notes.mod/notes.c:605
+#: src/mod/notes.mod/notes.c:604 src/mod/notes.mod/notes.c:606
 msgid "Cant modify the note file"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:650 src/mod/notes.mod/notes.c:652
+#: src/mod/notes.mod/notes.c:651 src/mod/notes.mod/notes.c:653
 msgid "Erased all notes"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:656 src/mod/notes.mod/notes.c:659
+#: src/mod/notes.mod/notes.c:657 src/mod/notes.mod/notes.c:660
 msgid "left"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:778
+#: src/mod/notes.mod/notes.c:779
 msgid "I don't know anyone by that name.\n"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:781
+#: src/mod/notes.mod/notes.c:782
 msgid "Thats a bot.  You cant leave notes for a bot."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:796
+#: src/mod/notes.mod/notes.c:797
 msgid "Outside note"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:797 src/mod/notes.mod/notes.c:817
+#: src/mod/notes.mod/notes.c:798 src/mod/notes.mod/notes.c:818
 msgid "Note delivered."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:854 src/mod/notes.mod/notes.c:911
+#: src/mod/notes.mod/notes.c:855 src/mod/notes.mod/notes.c:912
 msgid "For a list:"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:862
+#: src/mod/notes.mod/notes.c:863
 #, c-format
 msgid "### You have %d note%s waiting.\n"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:863
+#: src/mod/notes.mod/notes.c:864
 msgid "### Use '.notes read' to read them.\n"
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:876
+#: src/mod/notes.mod/notes.c:877
 msgid "Notes will be stored."
 msgstr ""
 
-#: src/mod/notes.mod/notes.c:908
+#: src/mod/notes.mod/notes.c:909
 #, c-format
 msgid "NOTICE %s :You have %d note%s waiting on %s.\n"
 msgstr ""
 
-#: src/mod/server.mod/server.c:1428
+#: src/mod/server.mod/server.c:1255
 msgid "Sorry, too many DCC connections."
 msgstr ""
 
-#: src/mod/server.mod/server.c:1445
+#: src/mod/server.mod/server.c:1272
 msgid "DCC invalid port"
 msgstr ""
 
-#: src/mod/server.mod/server.c:1535
+#: src/mod/server.mod/server.c:1362
 msgid "Server got stoned; jumping..."
 msgstr ""
 
-#: src/mod/server.mod/server.c:1609
+#: src/mod/server.mod/server.c:1436
 msgid "No server currently."
 msgstr ""
 
-#: src/mod/server.mod/server.c:1611
+#: src/mod/server.mod/server.c:1438
 msgid "Mode queue is at"
 msgstr ""
 
-#: src/mod/server.mod/server.c:1615
+#: src/mod/server.mod/server.c:1442
 msgid "Server queue is at"
 msgstr ""
 
-#: src/mod/server.mod/server.c:1618
+#: src/mod/server.mod/server.c:1445
 msgid "Help queue is at"
 msgstr ""
 
@@ -2255,35 +2254,35 @@
 msgid "NICK IN USE: Trying %s"
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:251
+#: src/mod/server.mod/servmsg.c:248
 #, c-format
 msgid "Server says Im not on channel: %s"
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:345
+#: src/mod/server.mod/servmsg.c:342
 #, c-format
 msgid "Flood from @%s!  Placing on ignore!"
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:444
+#: src/mod/server.mod/servmsg.c:443
 msgid "I dont accept DCC chats from strangers."
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:697
+#: src/mod/server.mod/servmsg.c:698
 msgid "Server says my nickname is invalid."
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:740
+#: src/mod/server.mod/servmsg.c:741
 #, c-format
 msgid "Cant change nickname on %s.  Is my nickname banned?"
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:743
+#: src/mod/server.mod/servmsg.c:744
 #, c-format
 msgid "Channel %s is juped. :("
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:754
+#: src/mod/server.mod/servmsg.c:755
 msgid "Nickname has been juped"
 msgstr ""
 
@@ -2295,12 +2294,12 @@
 #. * (minutely) sending of joins occurs before the bot does its ping reply.
 #. * Probably should do something about it some time - beldin
 #.
-#: src/mod/server.mod/servmsg.c:781
+#: src/mod/server.mod/servmsg.c:782
 #, c-format
 msgid "%s says Im not registered, trying next one."
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:782
+#: src/mod/server.mod/servmsg.c:783
 msgid "You have a fucked up server."
 msgstr ""
 
@@ -2308,149 +2307,171 @@
 msgid "Disconnected from"
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:1109
+#: src/mod/server.mod/servmsg.c:1108
 msgid "Trying server"
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:1151 src/mod/server.mod/servmsg.c:1169
+#: src/mod/server.mod/servmsg.c:1150 src/mod/server.mod/servmsg.c:1168
 msgid "Failed connect to"
 msgstr ""
 
-#: src/mod/server.mod/servmsg.c:1152
+#: src/mod/server.mod/servmsg.c:1151
 msgid "DNS lookup failed"
 msgstr ""
 
-#: src/mod/share.mod/share.c:1609 src/mod/share.mod/share.c:1634
+#: src/mod/share.mod/share.c:1595 src/mod/share.mod/share.c:1620
 msgid "ERROR writing user file to transfer."
 msgstr ""
 
-#: src/mod/share.mod/share.c:1787
+#: src/mod/share.mod/share.c:1772
 msgid "CANT READ NEW USERFILE"
 msgstr ""
 
-#: src/mod/share.mod/share.c:1797
+#: src/mod/share.mod/share.c:1782
 msgid "Userlist transfer complete; switched over"
 msgstr ""
 
-#: src/mod/share.mod/share.c:1917
+#: src/mod/share.mod/share.c:1902
 msgid "Cant send userfile to you (internal error)"
 msgstr ""
 
-#: src/mod/transfer.mod/transfer.c:718
+#: src/mod/transfer.mod/transfer.c:702
 msgid "Failed connection; aborted userfile transfer."
 msgstr ""
 
-#: src/modules.c:544
+#: src/modules.c:104
+#, c-format
+msgid "User file rejected by %s: %s"
+msgstr ""
+
+#: src/modules.c:111
+msgid "Not sharing userfile.\n"
+msgstr ""
+
+#: src/modules.c:523
 #, c-format
 msgid "error during libtdl initialization: %s\n"
 msgstr ""
 
-#: src/modules.c:617 src/tclmisc.c:408
+#: src/modules.c:560 src/tclmisc.c:464
 msgid "Already loaded."
 msgstr ""
 
-#: src/modules.c:621
+#: src/modules.c:564
 msgid "Cant determine current directory."
 msgstr ""
 
-#: src/modules.c:632
+#: src/modules.c:578
 msgid "No start function defined."
 msgstr ""
 
-#: src/modules.c:677
+#: src/modules.c:582
+msgid "Malloc error"
+msgstr ""
+
+#: src/modules.c:614
 msgid "Needed by another module"
 msgstr ""
 
-#: src/modules.c:681
+#: src/modules.c:618
 msgid "No close function"
 msgstr ""
 
-#: src/modules.c:704
+#: src/modules.c:633
+#, c-format
+msgid "Module unloaded: %s"
+msgstr ""
+
+#: src/modules.c:639
 msgid "No such module"
 msgstr ""
 
-#: src/tcldcc.c:815
+#: src/modules.c:858
+msgid "MODULES LOADED:\n"
+msgstr ""
+
+#: src/modules.c:883
+msgid "No such module.\n"
+msgstr ""
+
+#: src/tcldcc.c:804
 msgid "No free sockets available."
 msgstr ""
 
-#: src/tcldcc.c:1010 src/tcldcc.c:1027
+#: src/tcldcc.c:999 src/tcldcc.c:1016
 msgid "Userfile creation not necessary--skipping"
 msgstr ""
 
-#: src/tcldcc.c:1031
+#: src/tcldcc.c:1020
 msgid "Restarting..."
 msgstr ""
 
-#: src/tclhash.c:1197
-msgid "Ambiguous command.\n"
-msgstr ""
-
-#: src/tclhash.c:1450
+#: src/tclhash.c:1352
 msgid "Command bindings:\n"
 msgstr ""
 
-#: src/tclmisc.c:409
+#: src/tclmisc.c:465
 msgid "Cant load modules"
 msgstr ""
 
-#: src/userrec.c:539
+#: src/userrec.c:433
 msgid "Writing user file..."
 msgstr ""
 
-#: src/users.c:182
+#: src/users.c:179
 msgid "placed by"
 msgstr ""
 
-#: src/users.c:197
+#: src/users.c:194
 msgid "Currently ignoring"
 msgstr ""
 
-#: src/users.c:219
+#: src/users.c:216
 msgid "No longer ignoring"
 msgstr ""
 
-#: src/users.c:539
+#: src/users.c:530
 msgid "Cant find anyone matching that"
 msgstr ""
 
-#: src/users.c:559
+#: src/users.c:550
 msgid "Matching"
 msgstr ""
 
-#: src/users.c:565
+#: src/users.c:556
 msgid "skipping first"
 msgstr ""
 
-#: src/users.c:593 src/users.c:601 src/users.c:612
+#: src/users.c:584 src/users.c:592 src/users.c:603
 #, c-format
 msgid "(more than %d matches; list truncated)\n"
 msgstr ""
 
-#: src/users.c:617
+#: src/users.c:608
 #, c-format
 msgid "--- Found %d match%s.\n"
 msgstr ""
 
-#: src/users.c:683
+#: src/users.c:674
 msgid "Old userfile, use tclsh scripts/weed <userfile> c to convert"
 msgstr ""
 
-#: src/users.c:686
+#: src/users.c:677
 msgid "Invalid userfile format."
 msgstr ""
 
-#: src/users.c:911
+#: src/users.c:899
 msgid "Corrupt user record"
 msgstr ""
 
-#: src/users.c:916
+#: src/users.c:904
 msgid "Duplicate user record"
 msgstr ""
 
-#: src/users.c:930
+#: src/users.c:918
 msgid "Corrupted password reset for"
 msgstr ""
 
-#: src/users.c:951
+#: src/users.c:939
 msgid "Ignored masks for channel(s):"
 msgstr ""
Index: eggdrop1.7/src/main.c
diff -u eggdrop1.7/src/main.c:1.83 eggdrop1.7/src/main.c:1.84
--- eggdrop1.7/src/main.c:1.83	Sat Oct 13 23:44:36 2001
+++ eggdrop1.7/src/main.c	Sun Oct 14 09:09:35 2001
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.83 2001/10/14 04:44:36 stdarg Exp $
+ * $Id: main.c,v 1.84 2001/10/14 14:09:35 ite Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -630,11 +630,6 @@
 extern module_entry *module_list;
 void restart_chons();
 
-#ifdef STATIC
-void check_static(char *, char *(*)());
-
-#include "mod/static.h"
-#endif
 int init_dcc_max(), init_userent(), init_misc(), init_net(),
  init_modules(), init_tcl(int, char **);
 void botnet_init();
@@ -769,9 +764,6 @@
 
   init_tcl(argc, argv);
 
-#ifdef STATIC
-  link_statics();
-#endif
   strncpyz(s, ctime(&now), sizeof s);
   strcpy(&s[11], &s[20]);
   putlog(LOG_ALL, "*", "--- Loading %s (%s)", ver, s);
Index: eggdrop1.7/src/mod/modvals.h
diff -u eggdrop1.7/src/mod/modvals.h:1.25 eggdrop1.7/src/mod/modvals.h:1.26
--- eggdrop1.7/src/mod/modvals.h:1.25	Fri Oct 12 10:50:26 2001
+++ eggdrop1.7/src/mod/modvals.h	Sun Oct 14 09:09:35 2001
@@ -1,7 +1,7 @@
 /*
  * modvals.h
  *
- * $Id: modvals.h,v 1.25 2001/10/12 15:50:26 tothwolf Exp $
+ * $Id: modvals.h,v 1.26 2001/10/14 14:09:35 ite Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -91,9 +91,7 @@
   char			*name;	/* Name of the module (without .so)	*/
   int			 major;	/* Major version number MUST match	*/
   int			 minor;	/* Minor version number MUST be >=	*/
-#ifndef STATIC
   lt_dlhandle		hand;
-#endif		/* STATIC */
   Function		*funcs;
 } module_entry;
 
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.69 eggdrop1.7/src/modules.c:1.70
--- eggdrop1.7/src/modules.c:1.69	Sat Oct 13 23:44:36 2001
+++ eggdrop1.7/src/modules.c	Sun Oct 14 09:09:35 2001
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.69 2001/10/14 04:44:36 stdarg Exp $
+ * $Id: modules.c,v 1.70 2001/10/14 14:09:35 ite Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -68,24 +68,6 @@
 /* Directory to look for modules */
 char moddir[121] = "modules/";
 
-#else
-
-struct static_list {
-  struct static_list *next;
-  char *name;
-  char *(*func) ();
-} *static_modules = NULL;
-
-void check_static(char *name, char *(*func) ())
-{
-  struct static_list *p = malloc(sizeof(struct static_list));
-
-  malloc_strcpy(p->name, name);
-  p->func = func;
-  p->next = static_modules;
-  static_modules = p;
-}
-
 #endif
 
 
@@ -119,14 +101,14 @@
 static void null_share(int idx, char *x)
 {
   if ((x[0] == 'u') && (x[1] == 'n')) {
-    putlog(LOG_BOTS, "*", "User file rejected by %s: %s",
+    putlog(LOG_BOTS, "*", _("User file rejected by %s: %s"),
 	   dcc[idx].nick, x + 3);
     dcc[idx].status &= ~STAT_OFFERED;
     if (!(dcc[idx].status & STAT_GETTING)) {
       dcc[idx].status &= ~STAT_SHARE;
     }
   } else if ((x[0] != 'v') && (x[0] != 'e'))
-    dprintf(idx, "s un Not sharing userfile.\n");
+    dprintf(idx, _("Not sharing userfile.\n"));
 }
 
 void (*encrypt_pass) (char *, char *) = 0;
@@ -533,7 +515,6 @@
   malloc_strcpy(module_list->name, "eggdrop");
   module_list->major = (egg_numver) / 10000;
   module_list->minor = ((egg_numver) / 100) % 100;
-#ifndef STATIC
   module_list->hand = NULL;
   
   LTDL_SET_PRELOADED_SYMBOLS();
@@ -543,7 +524,7 @@
 		    lt_dlerror());
     fatal(wbuf, 0);
   }
-#endif
+
   module_list->next = NULL;
   module_list->funcs = NULL;
   for (i = 0; i < REAL_HOOKS; i++)
@@ -572,10 +553,8 @@
   Function f;
 #ifndef STATIC
   char workbuf[1024];
-  lt_dlhandle hand;
-#else
-  struct static_list *sl;
 #endif
+  lt_dlhandle hand;
 
   if (module_find(name, 0, 0) != NULL)
     return _("Already loaded.");
@@ -587,6 +566,9 @@
   } else
     sprintf(workbuf, "%s%s", moddir, name);
   hand = lt_dlopenext(workbuf);
+#else
+  hand = lt_dlopenext(name);
+#endif
   if (!hand)
     return lt_dlerror();
 
@@ -595,21 +577,13 @@
     lt_dlclose(hand);
       return _("No start function defined.");
     }
-#else
-  for (sl = static_modules; sl && egg_strcasecmp(sl->name, name); sl = sl->next);
-  if (!sl)
-    return "Unknown module.";
-  f = (Function) sl->func;
-#endif
   p = malloc(sizeof(module_entry));
   if (p == NULL)
-    return "Malloc error";
+    return _("Malloc error");
   malloc_strcpy(p->name, name);
   p->major = 0;
   p->minor = 0;
-#ifndef STATIC
   p->hand = hand;
-#endif
   p->funcs = 0;
   p->next = module_list;
   module_list = p;
@@ -647,9 +621,7 @@
 	e = (((char *(*)()) f[MODCALL_CLOSE]) (user));
 	if (e != NULL)
 	  return e;
-#ifndef STATIC
 	lt_dlclose(p->hand);
-#endif				/* STATIC */
       }
       free(p->name);
       if (o == NULL) {
@@ -658,7 +630,7 @@
 	o->next = p->next;
       }
       free(p);
-      putlog(LOG_MISC, "*", "%s %s", _("Module unloaded:"), name);
+      putlog(LOG_MISC, "*", _("Module unloaded: %s"), name);
       return NULL;
     }
     o = p;
@@ -883,7 +855,7 @@
   module_entry *p = module_list;
 
   if (p && !which && details)
-    dprintf(idx, "MODULES LOADED:\n");
+    dprintf(idx, _("MODULES LOADED:\n"));
   for (; p; p = p->next) {
     if (!which || !egg_strcasecmp(which, p->name)) {
       dependancy *d;
@@ -908,5 +880,5 @@
     }
   }
   if (which)
-    dprintf(idx, "No such module.\n");
+    dprintf(idx, _("No such module.\n"));
 }
----------------------- End of diff -----------------------



More information about the Changes mailing list