[cvslog] [CVS] Module eggdrop1.8: Change committed

cvs at eggheads.org cvs at eggheads.org
Wed Nov 10 15:17:07 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Branch tags: gettext
Commit time: 2010-11-10 21:17:07 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
  Tag: gettext
     doc/Changes1.8 src/patch.h src/mod/assoc.mod/assoc.c
     src/mod/blowfish.mod/blowfish.c src/mod/compress.mod/compress.c
     src/mod/console.mod/console.c src/mod/ctcp.mod/ctcp.c
     src/mod/dns.mod/coredns.c src/mod/dns.mod/dns.c
     src/mod/share.mod/share.c src/mod/uptime.mod/uptime.c
     src/mod/woobie.mod/woobie.c

Log message:

Converted the assoc, blowfish, console, compress, dns, share, uptime and woobie modules to gettext.

---------------------- diff included ----------------------
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.36.2.3 eggdrop1.8/doc/Changes1.8:1.36.2.4
--- eggdrop1.8/doc/Changes1.8:1.36.2.3	Wed Nov 10 07:39:19 2010
+++ eggdrop1.8/doc/Changes1.8	Wed Nov 10 15:16:56 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.36.2.3 2010/11/10 13:39:19 pseudo Exp $
+$Id: Changes1.8,v 1.36.2.4 2010/11/10 21:16:56 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,10 @@
 
 1.8.0 (CVS):
 
+  - Converted the assoc, blowfish, console, compress, dns, share, uptime
+    and woobie modules to gettext.
+    Patch by: pseudo
+
   - Converted remaining lang #defines in the core to english strings from
     core.english.lang. Gettextified most of the hardcoded strings.
     Patch by: pseudo
Index: eggdrop1.8/src/mod/assoc.mod/assoc.c
diff -u eggdrop1.8/src/mod/assoc.mod/assoc.c:1.2 eggdrop1.8/src/mod/assoc.mod/assoc.c:1.2.2.1
--- eggdrop1.8/src/mod/assoc.mod/assoc.c:1.2	Tue Jul 27 15:49:41 2010
+++ eggdrop1.8/src/mod/assoc.mod/assoc.c	Wed Nov 10 15:16:56 2010
@@ -2,7 +2,7 @@
  * assoc.c -- part of assoc.mod
  *   the assoc code, moved here mainly from botnet.c for module work
  *
- * $Id: assoc.c,v 1.2 2010/07/27 21:49:41 pseudo Exp $
+ * $Id: assoc.c,v 1.2.2.1 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -180,10 +180,10 @@
   assoc_t *a = assoc;
 
   if (a == NULL) {
-    dprintf(idx, "%s\n", ASSOC_NOCHNAMES);
+    dprintf(idx, _("No channel names\n"));
     return;
   }
-  dprintf(idx, " %s  %s\n", ASSOC_CHAN, ASSOC_NAME);
+  dprintf(idx, _(" Chan  Name\n"));
   for (; a && a->name[0]; a = a->next)
     dprintf(idx, "%c%5d %s\n", (a->channel < GLOBAL_CHANS) ? ' ' : '*',
             a->channel % GLOBAL_CHANS, a->name);
@@ -199,54 +199,55 @@
     putlog(LOG_CMDS, "*", "#%s# assoc", dcc[idx].nick);
     dump_assoc(idx);
   } else if (!u || !(u->flags & USER_BOTMAST))
-    dprintf(idx, "%s", MISC_NOSUCHCMD);
+    dprintf(idx, _("What?  You need '.help'\n"));
   else {
     num = newsplit(&par);
     if (num[0] == '*') {
       chan = GLOBAL_CHANS + atoi(num + 1);
       if ((chan < GLOBAL_CHANS) || (chan > 199999)) {
-        dprintf(idx, "%s\n", ASSOC_LCHAN_RANGE);
+        dprintf(idx, _("Channel # out of range: must be *0-*99999\n"));
         return 0;
       }
     } else {
       chan = atoi(num);
       if (chan == 0) {
-        dprintf(idx, "%s\n", ASSOC_PARTYLINE);
+        dprintf(idx, _("You can't name the main party line; "
+                "it's just a party line.\n"));
         return 0;
       } else if ((chan < 1) || (chan >= GLOBAL_CHANS)) {
-        dprintf(idx, "%s\n", ASSOC_CHAN_RANGE);
+        dprintf(idx, _("Channel # out of range: must be 1-99999 \n"));
         return 0;
       }
     }
     if (!par[0]) {
       /* Remove an association */
       if (get_assoc_name(chan) == NULL) {
-        dprintf(idx, ASSOC_NONAME_CHAN, (chan < GLOBAL_CHANS) ? "" : "*",
+        dprintf(idx, _("Channel %s%d has no name.\n"), (chan < GLOBAL_CHANS) ? "" : "*",
                 chan % GLOBAL_CHANS);
         return 0;
       }
       kill_assoc(chan);
       putlog(LOG_CMDS, "*", "#%s# assoc %d", dcc[idx].nick, chan);
-      dprintf(idx, ASSOC_REMNAME_CHAN, (chan < GLOBAL_CHANS) ? "" : "*",
+      dprintf(idx, _("Okay,  removed name for channel %s%d.\n"), (chan < GLOBAL_CHANS) ? "" : "*",
               chan % GLOBAL_CHANS);
-      chanout_but(-1, chan, ASSOC_REMOUT_CHAN, dcc[idx].nick);
+      chanout_but(-1, chan, _("--- %s removed this channel's name.\n"), dcc[idx].nick);
       if (chan < GLOBAL_CHANS)
         botnet_send_assoc(-1, chan, dcc[idx].nick, "0");
       return 0;
     }
     if (strlen(par) > 20) {
-      dprintf(idx, "%s\n", ASSOC_CHNAME_TOOLONG);
+      dprintf(idx, "%s\n", _("Channel's name can't be that long (20 chars max)."));
       return 0;
     }
     if ((par[0] >= '0') && (par[0] <= '9')) {
-      dprintf(idx, "%s\n", ASSOC_CHNAME_FIRSTCHAR);
+      dprintf(idx, "%s\n", _("First character of the channel name can't be a digit."));
       return 0;
     }
     add_assoc(par, chan);
     putlog(LOG_CMDS, "*", "#%s# assoc %d %s", dcc[idx].nick, chan, par);
-    dprintf(idx, ASSOC_NEWNAME_CHAN, (chan < GLOBAL_CHANS) ? "" : "*",
+    dprintf(idx, _("Okay  channel %s%d is '%s' now.\n"), (chan < GLOBAL_CHANS) ? "" : "*",
             chan % GLOBAL_CHANS, par);
-    chanout_but(-1, chan, ASSOC_NEWOUT_CHAN, dcc[idx].nick, par);
+    chanout_but(-1, chan, _("--- %s named this channel '%s'\n"), dcc[idx].nick, par);
     if (chan < GLOBAL_CHANS)
       botnet_send_assoc(-1, chan, dcc[idx].nick, par);
   }
@@ -330,15 +331,15 @@
           dcc[idx].user) & BOT_HUB)))) {
         add_assoc(par, chan);
         botnet_send_assoc(idx, chan, nick, par);
-        chanout_but(-1, chan, ASSOC_CHNAME_NAMED, nick, par);
+        chanout_but(-1, chan, _("--- (%s) named this channel '%s'.\n"), nick, par);
       } else if (par[0] == '0') {
         kill_assoc(chan);
-        chanout_but(-1, chan, ASSOC_CHNAME_REM, botnick, nick);
+        chanout_but(-1, chan, _("--- (%s) %s removed this channel's name.\n"), botnick, nick);
       } else if (get_assoc(par) != chan) {
         /* New one i didn't know about -- pass it on */
         s1 = get_assoc_name(chan);
         add_assoc(par, chan);
-        chanout_but(-1, chan, ASSOC_CHNAME_NAMED2, botnick, nick, par);
+        chanout_but(-1, chan, _("--- (%s) %s named this channel '%s'.\n"), botnick, nick, par);
       }
     }
   }
@@ -355,9 +356,9 @@
       size += sizeof(assoc_t);
     }
 
-    dprintf(idx, "    %d current association%s\n", count,
+    dprintf(idx, _("    %d current association%s\n"), count,
             (count != 1) ? "s" : "");
-    dprintf(idx, "    Using %d byte%s of memory\n", size,
+    dprintf(idx, _("    Using %d byte%s of memory\n"), size,
             (size != 1) ? "s" : "");
   }
 }
@@ -412,7 +413,7 @@
   module_register(MODULE_NAME, assoc_table, 2, 1);
   if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
     module_undepend(MODULE_NAME);
-    return "This module requires Eggdrop 1.8.0 or later.";
+    return _("This module requires Eggdrop 1.8.0 or later.");
   }
   assoc = NULL;
   add_builtins(H_dcc, mydcc);
Index: eggdrop1.8/src/mod/blowfish.mod/blowfish.c
diff -u eggdrop1.8/src/mod/blowfish.mod/blowfish.c:1.2 eggdrop1.8/src/mod/blowfish.mod/blowfish.c:1.2.2.1
--- eggdrop1.8/src/mod/blowfish.mod/blowfish.c:1.2	Tue Jul 27 15:49:41 2010
+++ eggdrop1.8/src/mod/blowfish.mod/blowfish.c	Wed Nov 10 15:16:56 2010
@@ -2,7 +2,7 @@
  * blowfish.c -- part of blowfish.mod
  *   encryption and decryption of passwords
  *
- * $Id: blowfish.c,v 1.2 2010/07/27 21:49:41 pseudo Exp $
+ * $Id: blowfish.c,v 1.2.2.1 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -146,15 +146,15 @@
       if (box[i].P != NULL)
         tot++;
 
-    dprintf(idx, "    Blowfish encryption module:\n");
-    dprintf(idx, "      %d of %d boxes in use: ", tot, BOXES);
+    dprintf(idx, _("    Blowfish encryption module:\n"));
+    dprintf(idx, _("      %d of %d boxes in use: "), tot, BOXES);
     for (i = 0; i < BOXES; i++)
       if (box[i].P != NULL) {
-        dprintf(idx, "(age: %d) ", now - box[i].lastuse);
+        dprintf(idx, _("(age: %d) "), now - box[i].lastuse);
       }
     dprintf(idx, "\n");
-    dprintf(idx, "      Using %d byte%s of memory\n", size,
-            (size != 1) ? "s" : "");
+    dprintf(idx, _("      Using %d %s of memory\n"), size,
+            P_("byte", "bytes", size));
   }
 }
 
@@ -439,7 +439,7 @@
 
 static char *blowfish_close()
 {
-  return "You can't unload the encryption module";
+  return _("You can't unload the encryption module");
 }
 
 EXPORT_SCOPE char *blowfish_start(Function *);
@@ -468,7 +468,7 @@
     global = global_funcs;
 
     if (!module_rename("blowfish", MODULE_NAME))
-      return "Already loaded.";
+      return _("Already loaded.");
     /* Initialize buffered boxes */
     for (i = 0; i < BOXES; i++) {
       box[i].P = NULL;
@@ -479,7 +479,7 @@
     module_register(MODULE_NAME, blowfish_table, 2, 2);
     if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
       module_undepend(MODULE_NAME);
-      return "This module requires Eggdrop 1.8.0 or later.";
+      return _("This module requires Eggdrop 1.8.0 or later.");
     }
     add_hook(HOOK_ENCRYPT_PASS, (Function) blowfish_encrypt_pass);
     add_hook(HOOK_ENCRYPT_STRING, (Function) encrypt_string);
Index: eggdrop1.8/src/mod/compress.mod/compress.c
diff -u eggdrop1.8/src/mod/compress.mod/compress.c:1.2 eggdrop1.8/src/mod/compress.mod/compress.c:1.2.2.1
--- eggdrop1.8/src/mod/compress.mod/compress.c:1.2	Tue Jul 27 15:49:42 2010
+++ eggdrop1.8/src/mod/compress.mod/compress.c	Wed Nov 10 15:16:56 2010
@@ -6,7 +6,7 @@
  * Written by Fabian Knittel <fknittel at gmx.de>. Based on zlib examples
  * by Jean-loup Gailly and Miguel Albrecht.
  *
- * $Id: compress.c,v 1.2 2010/07/27 21:49:42 pseudo Exp $
+ * $Id: compress.c,v 1.2.2.1 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Copyright (C) 2000 - 2010 Eggheads Development Team
@@ -125,19 +125,20 @@
   FILE *fin, *fout;
 
   if (!is_file(f_src)) {
-    putlog(LOG_MISC, "*", "Failed to uncompress file `%s': not a file.", f_src);
+    putlog(LOG_MISC, "*", _("Failed to uncompress file `%s': not a file."),
+           f_src);
     return COMPF_ERROR;
   }
   fin = gzopen(f_src, "rb");
   if (!fin) {
-    putlog(LOG_MISC, "*", "Failed to uncompress file `%s': gzopen failed.",
+    putlog(LOG_MISC, "*", _("Failed to uncompress file `%s': gzopen failed."),
            f_src);
     return COMPF_ERROR;
   }
 
   fout = fopen(f_target, "wb");
   if (!fout) {
-    putlog(LOG_MISC, "*", "Failed to uncompress file `%s': open failed: %s.",
+    putlog(LOG_MISC, "*", _("Failed to uncompress file `%s': open failed: %s."),
            f_src, strerror(errno));
     return COMPF_ERROR;
   }
@@ -145,25 +146,25 @@
   while (1) {
     len = gzread(fin, buf, sizeof(buf));
     if (len < 0) {
-      putlog(LOG_MISC, "*", "Failed to uncompress file `%s': gzread failed.",
+      putlog(LOG_MISC, "*", _("Failed to uncompress file `%s': gzread failed."),
              f_src);
       return COMPF_ERROR;
     }
     if (!len)
       break;
     if ((int) fwrite(buf, 1, (unsigned int) len, fout) != len) {
-      putlog(LOG_MISC, "*", "Failed to uncompress file `%s': fwrite "
-             "failed: %s.", f_src, strerror(errno));
+      putlog(LOG_MISC, "*", _("Failed to uncompress file `%s': fwrite "
+             "failed: %s."), f_src, strerror(errno));
       return COMPF_ERROR;
     }
   }
   if (fclose(fout)) {
-    putlog(LOG_MISC, "*", "Failed to uncompress file `%s': fclose failed: %s.",
-           f_src, strerror(errno));
+    putlog(LOG_MISC, "*", _("Failed to uncompress file `%s': "
+           "fclose failed: %s."), f_src, strerror(errno));
     return COMPF_ERROR;
   }
   if (gzclose(fin) != Z_OK) {
-    putlog(LOG_MISC, "*", "Failed to uncompress file `%s': gzclose failed.",
+    putlog(LOG_MISC, "*", _("Failed to uncompress file `%s': gzclose failed."),
            f_src);
     return COMPF_ERROR;
   }
@@ -226,19 +227,19 @@
   egg_snprintf(mode, sizeof mode, "wb%d", mode_num);
 
   if (!is_file(f_src)) {
-    putlog(LOG_MISC, "*", "Failed to compress file `%s': not a file.", f_src);
+    putlog(LOG_MISC, "*", _("Failed to compress file `%s': not a file."), f_src);
     return COMPF_ERROR;
   }
   fin = fopen(f_src, "rb");
   if (!fin) {
-    putlog(LOG_MISC, "*", "Failed to compress file `%s': open failed: %s.",
+    putlog(LOG_MISC, "*", _("Failed to compress file `%s': open failed: %s."),
            f_src, strerror(errno));
     return COMPF_ERROR;
   }
 
   fout = gzopen(f_target, mode);
   if (!fout) {
-    putlog(LOG_MISC, "*", "Failed to compress file `%s': gzopen failed.",
+    putlog(LOG_MISC, "*", _("Failed to compress file `%s': gzopen failed."),
            f_src);
     return COMPF_ERROR;
   }
@@ -259,21 +260,21 @@
   while (1) {
     len = fread(buf, 1, sizeof(buf), fin);
     if (ferror(fin)) {
-      putlog(LOG_MISC, "*", "Failed to compress file `%s': fread failed: %s",
+      putlog(LOG_MISC, "*", _("Failed to compress file `%s': fread failed: %s"),
              f_src, strerror(errno));
       return COMPF_ERROR;
     }
     if (!len)
       break;
     if (gzwrite(fout, buf, (unsigned int) len) != len) {
-      putlog(LOG_MISC, "*", "Failed to compress file `%s': gzwrite failed.",
+      putlog(LOG_MISC, "*", _("Failed to compress file `%s': gzwrite failed."),
              f_src);
       return COMPF_ERROR;
     }
   }
   fclose(fin);
   if (gzclose(fout) != Z_OK) {
-    putlog(LOG_MISC, "*", "Failed to compress file `%s': gzclose failed.",
+    putlog(LOG_MISC, "*", _("Failed to compress file `%s': gzclose failed."),
            f_src);
     return COMPF_ERROR;
   }
@@ -383,11 +384,11 @@
   if (details) {
     int size = compress_expmem();
 
-    dprintf(idx, "    %u file%s compressed\n", compressed_files,
+    dprintf(idx, _("    %u file%s compressed\n"), compressed_files,
             (compressed_files != 1) ? "s" : "");
-    dprintf(idx, "    %u file%s uncompressed\n", uncompressed_files,
+    dprintf(idx, _("    %u file%s uncompressed\n"), uncompressed_files,
             (uncompressed_files != 1) ? "s" : "");
-    dprintf(idx, "    Using %d byte%s of memory\n", size,
+    dprintf(idx, _("    Using %d byte%s of memory\n"), size,
             (size != 1) ? "s" : "");
   }
   return 0;
@@ -433,13 +434,13 @@
   module_register(MODULE_NAME, compress_table, 1, 2);
   if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
     module_undepend(MODULE_NAME);
-    return "This module requires Eggdrop 1.8.0 or later.";
+    return _("This module requires Eggdrop 1.8.0 or later.");
   }
 
   share_funcs = module_depend(MODULE_NAME, "share", 2, 3);
   if (!share_funcs) {
     module_undepend(MODULE_NAME);
-    return "This module requires share module 2.3 or later.";
+    return _("This module requires share module 2.3 or later.");
   }
 
   uff_addtable(compress_uff_table);
Index: eggdrop1.8/src/mod/console.mod/console.c
diff -u eggdrop1.8/src/mod/console.mod/console.c:1.2 eggdrop1.8/src/mod/console.mod/console.c:1.2.2.1
--- eggdrop1.8/src/mod/console.mod/console.c:1.2	Tue Jul 27 15:49:42 2010
+++ eggdrop1.8/src/mod/console.mod/console.c	Wed Nov 10 15:16:56 2010
@@ -3,7 +3,7 @@
  *   saved console settings based on console.tcl
  *   by cmwagner/billyjoe/D. Senso
  *
- * $Id: console.c,v 1.2 2010/07/27 21:49:42 pseudo Exp $
+ * $Id: console.c,v 1.2.2.1 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -200,15 +200,13 @@
   struct console_info *i = e->u.extra;
 
   if (dcc[idx].user && (dcc[idx].user->flags & USER_MASTER)) {
-    dprintf(idx, "  %s\n", CONSOLE_SAVED_SETTINGS);
-    dprintf(idx, "    %s %s\n", CONSOLE_CHANNEL, i->channel);
-    dprintf(idx, "    %s %s, %s %s, %s %s\n", CONSOLE_FLAGS,
-            masktype(i->conflags), CONSOLE_STRIPFLAGS,
-            stripmasktype(i->stripflags), CONSOLE_ECHO,
-            i->echoflags ? CONSOLE_YES : CONSOLE_NO);
-    dprintf(idx, "    %s %d, %s %s%d\n", CONSOLE_PAGE_SETTING, i->page,
-            CONSOLE_CHANNEL2, (i->conchan < GLOBAL_CHANS) ? "" : "*",
-            i->conchan % GLOBAL_CHANS);
+    dprintf(idx, _("  Saved Console Settings:\n"));
+    dprintf(idx, _("    Channel: %s\n"), i->channel);
+    dprintf(idx, _("    Console flags: %s, Strip flags: %s, Echo: %s\n"),
+            masktype(i->conflags), stripmasktype(i->stripflags),
+            i->echoflags ? _("yes") : _("no"));
+    dprintf(idx, _("    Page setting: %d, Console channel: %s%d\n"), i->page,
+            (i->conchan < GLOBAL_CHANS) ? "" : "*", i->conchan % GLOBAL_CHANS);
   }
 }
 
@@ -312,14 +310,13 @@
     i->page = 0;
   i->conchan = dcc[idx].u.chat->channel;
   if (par) {
-    dprintf(idx, "%s\n", CONSOLE_SAVED_SETTINGS2);
-    dprintf(idx, "  %s %s\n", CONSOLE_CHANNEL, i->channel);
-    dprintf(idx, "  %s %s, %s %s, %s %s\n", CONSOLE_FLAGS,
-            masktype(i->conflags), CONSOLE_STRIPFLAGS,
-            stripmasktype(i->stripflags), CONSOLE_ECHO,
-            i->echoflags ? CONSOLE_YES : CONSOLE_NO);
-    dprintf(idx, "  %s %d, %s %d\n", CONSOLE_PAGE_SETTING, i->page,
-            CONSOLE_CHANNEL2, i->conchan);
+    dprintf(idx, _("Saved your Console Settings:\n"));
+    dprintf(idx, _("  Channel: %s\n"), i->channel);
+    dprintf(idx, _("  Console flags: %s, Strip flags: %s, Echo: %s\n"),
+            masktype(i->conflags), stripmasktype(i->stripflags),
+            i->echoflags ? _("yes") : _("no"));
+    dprintf(idx, _("  Page setting: %d, Console channel: %d\n"), i->page,
+            i->conchan);
   }
   set_user(&USERENTRY_CONSOLE, u, i);
   return 0;
@@ -379,7 +376,7 @@
   module_register(MODULE_NAME, console_table, 1, 3);
   if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
     module_undepend(MODULE_NAME);
-    return "This module requires Eggdrop 1.8.0 or later.";
+    return _("This module requires Eggdrop 1.8.0 or later.");
   }
   add_builtins(H_chon, mychon);
   add_builtins(H_dcc, mydcc);
Index: eggdrop1.8/src/mod/ctcp.mod/ctcp.c
diff -u eggdrop1.8/src/mod/ctcp.mod/ctcp.c:1.4 eggdrop1.8/src/mod/ctcp.mod/ctcp.c:1.4.2.1
--- eggdrop1.8/src/mod/ctcp.mod/ctcp.c:1.4	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/mod/ctcp.mod/ctcp.c	Wed Nov 10 15:16:56 2010
@@ -2,7 +2,7 @@
  * ctcp.c -- part of ctcp.mod
  *   all the ctcp handling (except DCC, it's special ;)
  *
- * $Id: ctcp.c,v 1.4 2010/10/19 12:13:33 pseudo Exp $
+ * $Id: ctcp.c,v 1.4.2.1 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -153,8 +153,8 @@
   if ((atr & (USER_PARTY | USER_XFER)) || ((atr & USER_OP) && !require_p)) {
 
     if (u_pass_match(u, "-")) {
-      simple_sprintf(ctcp_reply, "%s\001ERROR no password set\001",
-                     ctcp_reply);
+      simple_sprintf(ctcp_reply, "%s\001ERROR %s\001", ctcp_reply,
+                     _("no password set"));
       return 1;
     }
 
@@ -184,11 +184,13 @@
       }
     }
 #ifdef TLS
-    simple_sprintf(ctcp_reply, "%s\001ERROR no %stelnet port\001", ctcp_reply,
-	 	   (ssl ? "SSL enabled " : ""));
-#else
-    simple_sprintf(ctcp_reply, "%s\001ERROR no telnet port\001", ctcp_reply);
+    if (ssl)
+      simple_sprintf(ctcp_reply, "%s\001ERROR %s\001", ctcp_reply,
+                     _("no SSL enabled telnet port"));
+    else
 #endif
+      simple_sprintf(ctcp_reply, "%s\001ERROR %s\001", ctcp_reply,
+                     _("no telnet port"));
   }
   return 1;
 }
@@ -247,11 +249,11 @@
   module_register(MODULE_NAME, ctcp_table, 1, 1);
   if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
     module_undepend(MODULE_NAME);
-    return "This module requires Eggdrop 1.8.0 or later.";
+    return _("This module requires Eggdrop 1.8.0 or later.");
   }
   if (!(server_funcs = module_depend(MODULE_NAME, "server", 1, 0))) {
     module_undepend(MODULE_NAME);
-    return "This module requires server module 1.0 or later.";
+    return _("This module requires server module 1.0 or later.");
   }
   add_tcl_strings(mystrings);
   add_tcl_ints(myints);
Index: eggdrop1.8/src/mod/dns.mod/coredns.c
diff -u eggdrop1.8/src/mod/dns.mod/coredns.c:1.4 eggdrop1.8/src/mod/dns.mod/coredns.c:1.4.2.1
--- eggdrop1.8/src/mod/dns.mod/coredns.c:1.4	Thu Oct 14 03:49:47 2010
+++ eggdrop1.8/src/mod/dns.mod/coredns.c	Wed Nov 10 15:16:56 2010
@@ -6,7 +6,7 @@
  * Modified/written by Fabian Knittel <fknittel at gmx.de>
  * IPv6 support added by pseudo <pseudo at egg6.net>
  *
- * $Id: coredns.c,v 1.4 2010/10/14 09:49:47 pseudo Exp $
+ * $Id: coredns.c,v 1.4.2.1 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Portions Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -1241,22 +1241,21 @@
   resfd = socket(AF_INET, SOCK_DGRAM, 0);
   if (resfd == -1) {
     putlog(LOG_MISC, "*",
-           "Unable to allocate socket for nameserver communication: %s",
+           _("Unable to allocate socket for nameserver communication: %s"),
            strerror(errno));
     return 0;
   }
   if (allocsock(resfd, SOCK_PASS) == -1) {
-    putlog(LOG_MISC, "*",
-           "Unable to allocate socket in socklist for nameserver communication");
+    putlog(LOG_MISC, "*", _("Unable to allocate socket in socklist for "
+           "nameserver communication"));
     killsock(resfd);
     return 0;
   }
   option = 1;
   if (setsockopt(resfd, SOL_SOCKET, SO_BROADCAST, (char *) &option,
                  sizeof(option))) {
-    putlog(LOG_MISC, "*",
-           "Unable to setsockopt() on nameserver communication socket: %s",
-           strerror(errno));
+    putlog(LOG_MISC, "*", _("Unable to setsockopt() on nameserver communication "
+           "socket: %s"), strerror(errno));
     killsock(resfd);
     return 0;
   }
@@ -1275,7 +1274,7 @@
   /* Initialise the resolv library. */
   res_init();
   if (!_res.nscount)
-    putlog(LOG_MISC, "*", "No nameservers found.");
+    putlog(LOG_MISC, "*", _("No nameservers found."));
   _res.options |= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH;
   for (i = 0; i < _res.nscount; i++)
     _res.nsaddr_list[i].sin_family = AF_INET;
Index: eggdrop1.8/src/mod/dns.mod/dns.c
diff -u eggdrop1.8/src/mod/dns.mod/dns.c:1.4 eggdrop1.8/src/mod/dns.mod/dns.c:1.4.2.1
--- eggdrop1.8/src/mod/dns.mod/dns.c:1.4	Mon Sep 27 13:38:14 2010
+++ eggdrop1.8/src/mod/dns.mod/dns.c	Wed Nov 10 15:16:56 2010
@@ -4,7 +4,7 @@
  *
  * Written by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: dns.c,v 1.4 2010/09/27 19:38:14 pseudo Exp $
+ * $Id: dns.c,v 1.4.2.1 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -90,11 +90,11 @@
 
 static void eof_dns_socket(int idx)
 {
-  putlog(LOG_MISC, "*", "DNS Error: socket closed.");
+  putlog(LOG_MISC, "*", _("DNS Error: socket closed."));
   killsock(dcc[idx].sock);
   /* Try to reopen socket */
   if (init_dns_network()) {
-    putlog(LOG_MISC, "*", "DNS socket successfully reopened!");
+    putlog(LOG_MISC, "*", _("DNS socket successfully reopened!"));
     dcc[idx].sock = resfd;
     dcc[idx].timeval = now;
   } else
@@ -225,14 +225,13 @@
   if (details) {
     int i, size = dns_expmem();
 
-    dprintf(idx, "    Async DNS resolver is active.\n");
-    dprintf(idx, "    DNS server list:");
+    dprintf(idx, _("    Async DNS resolver is active.\n"));
+    dprintf(idx, _("    DNS server list:"));
     for (i = 0; i < _res.nscount; i++)
       dprintf(idx, " %s:%d", iptostr((struct sockaddr *) &_res.nsaddr_list[i]),
               ntohs(_res.nsaddr_list[i].sin_port));
     dprintf(idx, "\n");
-    dprintf(idx, "    Using %d byte%s of memory\n", size,
-            (size != 1) ? "s" : "");
+    dprintf(idx, _("    Using %d bytes of memory\n"), size);
   }
   return 0;
 }
@@ -283,15 +282,15 @@
   module_register(MODULE_NAME, dns_table, 1, 1);
   if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
     module_undepend(MODULE_NAME);
-    return "This module requires Eggdrop 1.8.0 or later.";
+    return _("This module requires Eggdrop 1.8.0 or later.");
   }
 
   idx = new_dcc(&DCC_DNS, 0);
   if (idx < 0)
-    return "NO MORE DCC CONNECTIONS -- Can't create DNS socket.";
+    return _("NO MORE DCC CONNECTIONS -- Can't create DNS socket.");
   if (!init_dns_core()) {
     lostdcc(idx);
-    return "DNS initialisation failed.";
+    return _("DNS initialisation failed.");
   }
   dcc[idx].sock = resfd;
   dcc[idx].timeval = now;
Index: eggdrop1.8/src/mod/share.mod/share.c
diff -u eggdrop1.8/src/mod/share.mod/share.c:1.4 eggdrop1.8/src/mod/share.mod/share.c:1.4.2.1
--- eggdrop1.8/src/mod/share.mod/share.c:1.4	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/mod/share.mod/share.c	Wed Nov 10 15:16:56 2010
@@ -1,7 +1,7 @@
 /*
  * share.c -- part of share.mod
  *
- * $Id: share.c,v 1.4 2010/10/19 12:13:33 pseudo Exp $
+ * $Id: share.c,v 1.4.2.1 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -222,8 +222,12 @@
           noshare = 0;
           return;
         }
-      putlog(LOG_CMDS, "*", "Rejecting invalid sticky ban: %s on %s%s",
-             host, par, yn ? "" : " (unstick)");
+      if (yn)
+        putlog(LOG_CMDS, "*", _("Rejecting invalid sticky ban: %s on %s"),
+               host, par);
+      else
+        putlog(LOG_CMDS, "*", _("Rejecting invalid sticky ban: %s on %s "
+               "(unstick)"), host, par);
     }
     noshare = 0;
   }
@@ -262,8 +266,12 @@
           noshare = 0;
           return;
         }
-      putlog(LOG_CMDS, "*", "Rejecting invalid sticky exempt: %s on %s%s",
-             host, par, yn ? "" : " (unstick)");
+      if (yn)
+        putlog(LOG_CMDS, "*", _("Rejecting invalid sticky exempt: %s on %s"),
+               host, par);
+      else
+        putlog(LOG_CMDS, "*", _("Rejecting invalid sticky exempt: %s on %s "
+               "(unstick)"), host, par);
     }
     noshare = 0;
   }
@@ -302,8 +310,12 @@
           noshare = 0;
           return;
         }
-      putlog(LOG_CMDS, "*", "Rejecting invalid sticky invite: %s on %s%s",
-             host, par, yn ? "" : " (unstick)");
+      if (yn)
+        putlog(LOG_CMDS, "*", _("Rejecting invalid sticky invite: %s on %s"),
+               host, par);
+      else
+        putlog(LOG_CMDS, "*", _("Rejecting invalid sticky invite: %s on %s "
+               "(unstick)"), host, par);
     }
     noshare = 0;
   }
@@ -370,7 +382,7 @@
             }
           } else
             putlog(LOG_CMDS, "*",
-                   "Rejected flags for unshared channel %s from %s",
+                   _("Rejected flags for unshared channel %s from %s"),
                    par, dcc[idx].nick);
         } else if (!private_global) {
           int pgbm = private_globals_bitmask();
@@ -397,7 +409,7 @@
               (func[IRC_RECHECK_CHANNEL]) (cst, 0);
           }
         } else
-          putlog(LOG_CMDS, "*", "Rejected global flags for %s from %s",
+          putlog(LOG_CMDS, "*", _("Rejected global flags for %s from %s"),
                  hand, dcc[idx].nick);
         noshare = 0;
       }
@@ -419,7 +431,7 @@
       get_user_flagrec(dcc[idx].user, &fr, par);
       if (!chan || !channel_shared(chan) || !(bot_chan(fr) || bot_global(fr)))
         putlog(LOG_CMDS, "*",
-               "Rejected info for unshared channel %s from %s",
+               _("Rejected info for unshared channel %s from %s"),
                par, dcc[idx].nick);
       else {
         noshare = 1;
@@ -448,7 +460,7 @@
       get_user_flagrec(dcc[idx].user, &fr, par);
       if (!chan || !channel_shared(chan) || !(bot_chan(fr) || bot_global(fr)))
         putlog(LOG_CMDS, "*",
-               "Rejected info for unshared channel %s from %s",
+               _("Rejected info for unshared channel %s from %s"),
                par, dcc[idx].nick);
       else {
         noshare = 1;
@@ -657,7 +669,7 @@
       get_user_flagrec(dcc[idx].user, &fr, chan);
       if (!cst || !channel_shared(cst) || !(bot_chan(fr) || bot_global(fr)))
         putlog(LOG_CMDS, "*",
-               "Info line change from %s denied.  Channel %s not shared.",
+               _("Info line change from %s denied.  Channel %s not shared."),
                dcc[idx].nick, chan);
       else {
         shareout_but(cst, idx, "chchinfo %s %s %s\n", hand, chan, par);
@@ -761,7 +773,7 @@
     get_user_flagrec(dcc[idx].user, &fr, chname);
     if (!chan || !channel_shared(chan) || !(bot_chan(fr) || bot_global(fr)))
       putlog(LOG_CMDS, "*",
-             "Cancel channel exempt %s on %s rejected - channel not shared.",
+             _("Cancel channel exempt %s on %s rejected - channel not shared."),
              par, chname);
     else {
       shareout_but(chan, idx, "-ec %s %s\n", chname, par);
@@ -788,7 +800,7 @@
     get_user_flagrec(dcc[idx].user, &fr, chname);
     if (!chan || !channel_shared(chan) || !(bot_chan(fr) || bot_global(fr)))
       putlog(LOG_CMDS, "*",
-             "Cancel channel invite %s on %s rejected - channel not shared.",
+             _("Cancel channel invite %s on %s rejected - channel not shared."),
              par, chname);
     else {
       shareout_but(chan, idx, "-invc %s %s\n", chname, par);
@@ -859,7 +871,7 @@
     get_user_flagrec(dcc[idx].user, &fr, chname);
     if (!chan || !channel_shared(chan) || !(bot_chan(fr) || bot_global(fr)))
       putlog(LOG_CMDS, "*",
-             "Channel ban %s on %s rejected - channel not shared.",
+             _("Channel ban %s on %s rejected - channel not shared."),
              ban, chname);
     else {
       shareout_but(chan, idx, "+bc %s %s %s %s\n", ban, tm, chname, par);
@@ -930,7 +942,7 @@
     get_user_flagrec(dcc[idx].user, &fr, chname);
     if (!chan || !channel_shared(chan) || !(bot_chan(fr) || bot_global(fr)))
       putlog(LOG_CMDS, "*",
-             "Channel exempt %s on %s rejected - channel not shared.",
+             _("Channel exempt %s on %s rejected - channel not shared."),
              exempt, chname);
     else {
       shareout_but(chan, idx, "+ec %s %s %s %s\n", exempt, tm, chname, par);
@@ -1001,7 +1013,7 @@
     get_user_flagrec(dcc[idx].user, &fr, chname);
     if (!chan || !channel_shared(chan) || !(bot_chan(fr) || bot_global(fr)))
       putlog(LOG_CMDS, "*",
-             "Channel invite %s on %s rejected - channel not shared.",
+             _("Channel invite %s on %s rejected - channel not shared."),
              invite, chname);
     else {
       shareout_but(chan, idx, "+invc %s %s %s %s\n", invite, tm, chname, par);
@@ -1057,7 +1069,7 @@
 
 static void share_ufno(int idx, char *par)
 {
-  putlog(LOG_BOTS, "*", "User file rejected by %s: %s", dcc[idx].nick, par);
+  putlog(LOG_BOTS, "*", _("User file rejected by %s: %s"), dcc[idx].nick, par);
   dcc[idx].status &= ~STAT_OFFERED;
   if (!(dcc[idx].status & STAT_GETTING))
     dcc[idx].status &= ~(STAT_SHARE | STAT_AGGRESSIVE);
@@ -1071,7 +1083,7 @@
     dcc[idx].status |= STAT_SENDING;
     uf_features_parse(idx, par);
     start_sending_users(idx);
-    putlog(LOG_BOTS, "*", "Sending user file send request to %s",
+    putlog(LOG_BOTS, "*", _("Sending user file send request to %s"),
            dcc[idx].nick);
   }
 }
@@ -1108,7 +1120,7 @@
         dprintf(idx, "s uy\n");
       /* Set stat-getting to astatic void race condition (robey 23jun1996) */
       dcc[idx].status |= STAT_SHARE | STAT_GETTING | STAT_AGGRESSIVE;
-      putlog(LOG_BOTS, "*", "Downloading user file from %s", dcc[idx].nick);
+      putlog(LOG_BOTS, "*", _("Downloading user file from %s"), dcc[idx].nick);
     }
   }
 }
@@ -1128,11 +1140,11 @@
     dprintf(idx, "s e Ask before sending the userfile.\n");
     zapfbot(idx);
   } else if (dcc_total == max_dcc) {
-    putlog(LOG_MISC, "*", "NO MORE DCC CONNECTIONS -- can't grab userfile");
+    putlog(LOG_MISC, "*", _("NO MORE DCC CONNECTIONS -- can't grab userfile"));
     dprintf(idx, "s e I can't open a DCC to you; I'm full.\n");
     zapfbot(idx);
   } else if (!(f = fopen(s, "wb"))) {
-    putlog(LOG_MISC, "*", "CAN'T WRITE USERFILE DOWNLOAD FILE!");
+    putlog(LOG_MISC, "*", _("CAN'T WRITE DOWNLOADED USERFILE!"));
     zapfbot(idx);
   } else {
     ip = newsplit(&par);
@@ -1187,7 +1199,7 @@
       dump_resync(idx);
       dcc[idx].status &= ~STAT_OFFERED;
       dcc[idx].status |= STAT_SHARE;
-      putlog(LOG_BOTS, "*", "Resync'd user file with %s", dcc[idx].nick);
+      putlog(LOG_BOTS, "*", _("Resync'd user file with %s"), dcc[idx].nick);
       updatebot(-1, dcc[idx].nick, '+', 0);
     } else
       dprintf(idx, "s rn No resync buffer.\n");
@@ -1201,13 +1213,13 @@
     dcc[idx].status &= ~STAT_OFFERED;
     dcc[idx].status |= STAT_SHARE;
     updatebot(-1, dcc[idx].nick, '+', 0);
-    putlog(LOG_BOTS, "*", "Resync'd user file with %s", dcc[idx].nick);
+    putlog(LOG_BOTS, "*", _("Resync'd user file with %s"), dcc[idx].nick);
   }
 }
 
 static void share_resync_no(int idx, char *par)
 {
-  putlog(LOG_BOTS, "*", "Resync refused by %s: %s", dcc[idx].nick, par);
+  putlog(LOG_BOTS, "*", _("Resync refused by %s: %s"), dcc[idx].nick, par);
   flush_tbuf(dcc[idx].nick);
   dprintf(idx, "s u?\n");
 }
@@ -1254,7 +1266,7 @@
 
 static void share_end(int idx, char *par)
 {
-  putlog(LOG_BOTS, "*", "Ending sharing with %s (%s).", dcc[idx].nick, par);
+  putlog(LOG_BOTS, "*", _("Ending sharing with %s (%s)."), dcc[idx].nick, par);
   cancel_user_xfer(-idx, 0);
   dcc[idx].status &= ~(STAT_SHARE | STAT_GETTING | STAT_SENDING |
                        STAT_OFFERED | STAT_AGGRESSIVE);
@@ -1409,7 +1421,7 @@
   new->timer = now;
   new->next = *old;
   *old = new;
-  putlog(LOG_BOTS, "*", "Creating resync buffer for %s", bot);
+  putlog(LOG_BOTS, "*", _("Creating resync buffer for %s"), bot);
 }
 
 static void del_tbuf(tandbuf *goner)
@@ -1460,7 +1472,7 @@
   for (t = tbuf; t; t = tnext) {
     tnext = t->next;
     if ((now - t->timer) > resync_time) {
-      putlog(LOG_BOTS, "*", "Flushing resync buffer for clonebot %s.", t->bot);
+      putlog(LOG_BOTS, "*", _("Flushing resync buffer for clonebot %s."), t->bot);
       del_tbuf(t);
     }
   }
@@ -1600,7 +1612,7 @@
     }
   if (off) {
     s[off - 2] = 0;
-    dprintf(idx, "    Pending sharebot buffers: %s\n", s);
+    dprintf(idx, _("    Pending sharebot buffers: %s\n"), s);
   }
 }
 
@@ -1638,8 +1650,8 @@
           ok = 0;
       }
     } else
-      putlog(LOG_BOTS, "*", "%s is too old: not sharing exempts and invites.",
-             dcc[idx].nick);
+      putlog(LOG_BOTS, "*", _("%s is too old: not sharing exempts and "
+             "invites."), dcc[idx].nick);
     fclose(f);
   }
   if (!ok)
@@ -1734,7 +1746,7 @@
     return;
 
   if (!uff_call_receiving(j, dcc[idx].u.xfer->filename)) {
-    putlog(LOG_BOTS, "*", "A uff parsing function failed for the userfile!");
+    putlog(LOG_BOTS, "*", _("A uff parsing function failed for the userfile!"));
     unlink(dcc[idx].u.xfer->filename);
     return;
   }
@@ -1922,7 +1934,7 @@
   if (!uff_call_sending(idx, share_file)) {
     unlink(share_file);
     dprintf(idx, "s e %s\n", "uff parsing failed");
-    putlog(LOG_BOTS, "*", "uff parsing failed");
+    putlog(LOG_BOTS, "*", _("uff parsing failed"));
     dcc[idx].status &= ~(STAT_SHARE | STAT_SENDING | STAT_AGGRESSIVE);
     return;
   }
@@ -1930,11 +1942,11 @@
   if ((i = raw_dcc_send(share_file, "*users", "(users)", share_file)) > 0) {
     unlink(share_file);
     dprintf(idx, "s e %s\n", USERF_CANTSEND);
-    putlog(LOG_BOTS, "*", "%s -- can't send userfile",
-           i == DCCSEND_FULL ? "NO MORE DCC CONNECTIONS" :
-           i == DCCSEND_NOSOCK ? "CAN'T OPEN A LISTENING SOCKET" :
-           i == DCCSEND_BADFN ? "BAD FILE" :
-           i == DCCSEND_FEMPTY ? "EMPTY FILE" : "UNKNOWN REASON!");
+    putlog(LOG_BOTS, "*", _("%s -- can't send userfile"),
+           i == DCCSEND_FULL ? _("NO MORE DCC CONNECTIONS") :
+           i == DCCSEND_NOSOCK ? _("CAN'T OPEN A LISTENING SOCKET") :
+           i == DCCSEND_BADFN ? _("BAD FILE") :
+           i == DCCSEND_FEMPTY ? _("EMPTY FILE") : _("UNKNOWN REASON!"));
     dcc[idx].status &= ~(STAT_SHARE | STAT_SENDING | STAT_AGGRESSIVE);
   } else {
     updatebot(-1, dcc[idx].nick, '+', 0);
@@ -2033,7 +2045,7 @@
         unlink(dcc[j].u.xfer->filename);
         lostdcc(j);
       }
-      putlog(LOG_BOTS, "*", "(Userlist download aborted.)");
+      putlog(LOG_BOTS, "*", _("(Userlist download aborted.)"));
     }
     if (dcc[idx].status & STAT_SENDING) {
       j = 0;
@@ -2047,7 +2059,7 @@
         unlink(dcc[j].u.xfer->filename);
         lostdcc(j);
       }
-      putlog(LOG_BOTS, "*", "(Userlist transmit aborted.)");
+      putlog(LOG_BOTS, "*", _("(Userlist transmit aborted.)"));
     }
     if (allow_resync && (!(dcc[idx].status & STAT_GETTING)) &&
         (!(dcc[idx].status & STAT_SENDING)))
@@ -2074,11 +2086,11 @@
 static void cmd_flush(struct userrec *u, int idx, char *par)
 {
   if (!par[0])
-    dprintf(idx, "Usage: flush <botname>\n");
+    dprintf(idx, _("Usage: flush <botname>\n"));
   else if (flush_tbuf(par))
-    dprintf(idx, "Flushed resync buffer for %s\n", par);
+    dprintf(idx, _("Flushed resync buffer for %s\n"), par);
   else
-    dprintf(idx, "There is no resync buffer for that bot.\n");
+    dprintf(idx, _("There is no resync buffer for that bot.\n"));
 }
 
 static cmd_t my_cmds[] = {
@@ -2092,7 +2104,8 @@
   tandbuf *t, *tnext = NULL;
 
   module_undepend(MODULE_NAME);
-  putlog(LOG_MISC | LOG_BOTS, "*", "Sending 'share end' to all sharebots...");
+  putlog(LOG_MISC | LOG_BOTS, "*", _("Sending 'share end' to all "
+        "sharebots..."));
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type->flags & DCT_BOT) && (dcc[i].status & STAT_SHARE)) {
       dprintf(i, "s e Unload module\n");
@@ -2103,7 +2116,7 @@
       dcc[i].u.bot->uff_flags = 0;
     }
   putlog(LOG_MISC | LOG_BOTS, "*",
-         "Unloaded sharing module, flushing tbuf's...");
+         _("Unloaded sharing module, flushing tbuf's..."));
   for (t = tbuf; t; t = tnext) {
     tnext = t->next;
     del_tbuf(t);
@@ -2146,9 +2159,10 @@
   if (details) {
     int i, j, size = share_expmem();
 
-    dprintf(idx, "    Private owners: %s\n", (private_global ||
-            (private_globals_bitmask() & USER_OWNER)) ? "yes" : "no");
-    dprintf(idx, "    Allow resync: %s\n", allow_resync ? "yes" : "no");
+    dprintf(idx, _("    Private owners: %s\n"), (private_global ||
+            (private_globals_bitmask() & USER_OWNER)) ? _("yes") : _("no"));
+    dprintf(idx, _("    Allow resync: %s\n"), allow_resync ? _("yes") :
+            _("no"));
 
     for (i = 0; i < dcc_total; i++) {
       if (dcc[i].type == &DCC_BOT) {
@@ -2159,38 +2173,37 @@
             if (((dcc[j].type->flags & (DCT_FILETRAN | DCT_FILESEND)) ==
                 (DCT_FILETRAN | DCT_FILESEND)) &&
                 !egg_strcasecmp(dcc[j].host, dcc[i].nick)) {
-              dprintf(idx, "    Downloading userlist from %s (%d%% done)\n",
+              dprintf(idx, _("    Downloading userlist from %s (%d%% done)\n"),
                       dcc[i].nick, (int) (100.0 * ((float) dcc[j].status) /
                       ((float) dcc[j].u.xfer->length)));
               ok = 1;
               break;
             }
           if (!ok)
-            dprintf(idx, "    Download userlist from %s (negotiating "
-                    "botentries)\n", dcc[i].nick);
+            dprintf(idx, _("    Download userlist from %s (negotiating "
+                    "botentries)\n"), dcc[i].nick);
         } else if (dcc[i].status & STAT_SENDING) {
           for (j = 0; j < dcc_total; j++) {
             if (((dcc[j].type->flags & (DCT_FILETRAN | DCT_FILESEND)) ==
                 DCT_FILETRAN) && !egg_strcasecmp(dcc[j].host, dcc[i].nick)) {
               if (dcc[j].type == &DCC_GET)
-                dprintf(idx, "    Sending userlist to %s (%d%% done)\n",
+                dprintf(idx, _("    Sending userlist to %s (%d%% done)\n"),
                         dcc[i].nick, (int) (100.0 * ((float) dcc[j].status) /
                         ((float) dcc[j].u.xfer->length)));
               else
-                dprintf(idx, "    Sending userlist to %s (waiting for connect)\n",
-                        dcc[i].nick);
+                dprintf(idx, _("    Sending userlist to %s (waiting for "
+                        "connect)\n"), dcc[i].nick);
             }
           }
         } else if (dcc[i].status & STAT_AGGRESSIVE) {
-          dprintf(idx, "    Passively sharing with %s.\n", dcc[i].nick);
+          dprintf(idx, _("    Passively sharing with %s.\n"), dcc[i].nick);
         } else if (dcc[i].status & STAT_SHARE) {
-          dprintf(idx, "    Aggressively sharing with %s.\n", dcc[i].nick);
+          dprintf(idx, _("    Aggressively sharing with %s.\n"), dcc[i].nick);
         }
       }
     }
     status_tbufs(idx);
-    dprintf(idx, "    Using %d byte%s of memory\n", size,
-            (size != 1) ? "s" : "");
+    dprintf(idx, _("    Using %d bytes of memory\n"), size);
   }
 }
 
@@ -2217,15 +2230,15 @@
   module_register(MODULE_NAME, share_table, 2, 4);
   if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
     module_undepend(MODULE_NAME);
-    return "This module requires Eggdrop 1.8.0 or later.";
+    return _("This module requires Eggdrop 1.8.0 or later.");
   }
   if (!(transfer_funcs = module_depend(MODULE_NAME, "transfer", 2, 0))) {
     module_undepend(MODULE_NAME);
-    return "This module requires transfer module 2.0 or later.";
+    return _("This module requires transfer module 2.0 or later.");
   }
   if (!(channels_funcs = module_depend(MODULE_NAME, "channels", 1, 0))) {
     module_undepend(MODULE_NAME);
-    return "This module requires channels module 1.0 or later.";
+    return _("This module requires channels module 1.0 or later.");
   }
   add_hook(HOOK_SHAREOUT, (Function) shareout_mod);
   add_hook(HOOK_SHAREIN, (Function) sharein_mod);
Index: eggdrop1.8/src/mod/uptime.mod/uptime.c
diff -u eggdrop1.8/src/mod/uptime.mod/uptime.c:1.2 eggdrop1.8/src/mod/uptime.mod/uptime.c:1.2.2.1
--- eggdrop1.8/src/mod/uptime.mod/uptime.c:1.2	Tue Jul 27 15:49:42 2010
+++ eggdrop1.8/src/mod/uptime.mod/uptime.c	Wed Nov 10 15:16:56 2010
@@ -1,5 +1,5 @@
 /*
- * $Id: uptime.c,v 1.2 2010/07/27 21:49:42 pseudo Exp $
+ * $Id: uptime.c,v 1.2.2.1 2010/11/10 21:16:56 pseudo Exp $
  *
  * This module reports uptime information about your bot to http://uptime.eggheads.org. The
  * purpose for this is to see how your bot rates against many others (including EnergyMechs
@@ -105,10 +105,11 @@
     next_update_at = ctime(&next_update);
     next_update_at[strlen(next_update_at) - 1] = 0;
 
-    dprintf(idx, "      %d uptime packet%s sent\n", uptimecount,
+    dprintf(idx, _("      %d uptime packet%s sent\n"), uptimecount,
             (uptimecount != 1) ? "s" : "");
-    dprintf(idx, "      Approximately %-.2f hours until next update "
-            "(at %s)\n", delta_seconds / 3600.0, next_update_at);
+    dprintf(idx, _("      Approximately %-.2f %s until next update "
+            "(at %s)\n"), delta_seconds / 3600.0,
+            P_("hour", "hours", delta_seconds / 3600.0), next_update_at);
   }
 }
 
@@ -150,7 +151,7 @@
   strncpyz(uptime_version, z, sizeof uptime_version);
 
   if ((uptimesock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-    putlog(LOG_DEBUG, "*", "init_uptime socket returned < 0 %d", uptimesock);
+    putlog(LOG_DEBUG, "*", _("init_uptime socket returned < 0 %d"), uptimesock);
     return ((uptimesock = -1));
   }
   egg_memset(&sai, 0, sizeof(sai));
@@ -264,8 +265,8 @@
 
 static char *uptime_close()
 {
-  return "You cannot unload the uptime module "
-         "(doing so will reset your stats).";
+  return _("You cannot unload the uptime module "
+         "(doing so will reset your stats).");
 }
 
 EXPORT_SCOPE char *uptime_start(Function *);
@@ -285,7 +286,7 @@
     module_register(MODULE_NAME, uptime_table, 1, 4);
     if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
       module_undepend(MODULE_NAME);
-      return "This module requires Eggdrop 1.8.0 or later.";
+      return _("This module requires Eggdrop 1.8.0 or later.");
     }
 
     add_help_reference("uptime.help");
Index: eggdrop1.8/src/mod/woobie.mod/woobie.c
diff -u eggdrop1.8/src/mod/woobie.mod/woobie.c:1.2 eggdrop1.8/src/mod/woobie.mod/woobie.c:1.2.2.1
--- eggdrop1.8/src/mod/woobie.mod/woobie.c:1.2	Tue Jul 27 15:49:42 2010
+++ eggdrop1.8/src/mod/woobie.mod/woobie.c	Wed Nov 10 15:16:57 2010
@@ -5,7 +5,7 @@
  * Originally written by ButchBub         15 July     1997
  * Comments by Fabian Knittel             29 December 1999
  *
- * $Id: woobie.c,v 1.2 2010/07/27 21:49:42 pseudo Exp $
+ * $Id: woobie.c,v 1.2.2.1 2010/11/10 21:16:57 pseudo Exp $
  */
 /*
  * Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -74,8 +74,8 @@
   if (details) {
     int size = woobie_expmem();
 
-    dprintf(idx, "    Using %d byte%s of memory\n", size,
-            (size != 1) ? "s" : "");
+    /* Localize output by using the _() shortcut to gettext */
+    dprintf(idx, _("    Using %d bytes of memory\n"), size);
   }
 }
 
@@ -138,7 +138,7 @@
 
   if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
     module_undepend(MODULE_NAME);
-    return "This module requires Eggdrop 1.8.0 or later.";
+    return _("This module requires Eggdrop 1.8.0 or later.");
   }
 
   /* Add command table to bind list H_dcc, responsible for dcc commands.
Index: eggdrop1.8/src/patch.h
diff -u eggdrop1.8/src/patch.h:1.25.2.3 eggdrop1.8/src/patch.h:1.25.2.4
--- eggdrop1.8/src/patch.h:1.25.2.3	Wed Nov 10 07:39:19 2010
+++ eggdrop1.8/src/patch.h	Wed Nov 10 15:16:56 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.25.2.3 2010/11/10 13:39:19 pseudo Exp $
+ * $Id: patch.h,v 1.25.2.4 2010/11/10 21:16:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1289396336");            /* current unixtime */
+patch("1289423631");            /* current unixtime */
 /*
  *
  *
  */
-patch("lang2gettext-core");
+patch("lang2gettext-mod1");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list