diff --git a/plugins/ChannelStats/ChannelStats.pot b/plugins/ChannelStats/messages.pot
similarity index 57%
rename from plugins/ChannelStats/ChannelStats.pot
rename to plugins/ChannelStats/messages.pot
index d5f4c7797..984790c1a 100644
--- a/plugins/ChannelStats/ChannelStats.pot
+++ b/plugins/ChannelStats/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-06 16:16+0200\n"
+"POT-Creation-Date: 2010-10-09 17:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,52 +17,85 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugin.py:252
-msgid "I couldn't find you in my user database."
+#: plugin.py:48
+msgid "ChannelStats"
 msgstr ""
 
-#: plugin.py:265
-msgid ""
-"%s has sent %n; a total of %n, %n, %n, and %n; %s of those messages %s. %s "
-"has joined %n, parted %n, quit %n, kicked someone %n, been kicked %n, "
-"changed the topic %n, and changed the mode %n."
+#: plugin.py:51
+msgid "actions"
 msgstr ""
 
-#: plugin.py:272
-msgid "character"
+#: plugin.py:51
+msgid "chars"
 msgstr ""
 
-#: plugin.py:273 plugin.py:355
-msgid "word"
+#: plugin.py:51 plugin.py:83
+msgid "frowns"
 msgstr ""
 
-#: plugin.py:274 plugin.py:356
-msgid "smiley"
+#: plugin.py:51
+msgid "joins"
 msgstr ""
 
-#: plugin.py:275 plugin.py:357
-msgid "frown"
+#: plugin.py:51
+msgid "kicks"
 msgstr ""
 
-#: plugin.py:277 plugin.py:358
-msgid "was an ACTION"
+#: plugin.py:51
+msgid "modes"
 msgstr ""
 
-#: plugin.py:278 plugin.py:359
-msgid "were ACTIONs"
+#: plugin.py:52
+msgid "msgs"
 msgstr ""
 
-#: plugin.py:280 plugin.py:281 plugin.py:282 plugin.py:283 plugin.py:284
-#: plugin.py:285 plugin.py:286
-msgid "time"
+#: plugin.py:52
+msgid "parts"
 msgstr ""
 
-#: plugin.py:289
-#, python-format
-msgid "I have no stats for that %s in %s."
+#: plugin.py:52
+msgid "quits"
 msgstr ""
 
-#: plugin.py:291
+#: plugin.py:52 plugin.py:84
+msgid "smileys"
+msgstr ""
+
+#: plugin.py:52
+msgid "topics"
+msgstr ""
+
+#: plugin.py:52
+msgid "words"
+msgstr ""
+
+#: plugin.py:52
+msgid "users"
+msgstr ""
+
+#: plugin.py:121
+msgid "kicked"
+msgstr ""
+
+#: plugin.py:139 plugin.py:147 plugin.py:148 plugin.py:149 plugin.py:160
+#: plugin.py:206 plugin.py:207 plugin.py:208 plugin.py:210 plugin.py:225
+#: plugin.py:226 plugin.py:227
+msgid "channelStats"
+msgstr ""
+
+#: plugin.py:165
+msgid "ChannelStats.db"
+msgstr ""
+
+#: plugin.py:195
+msgid "PRIVMSG"
+msgstr ""
+
+#: plugin.py:197
+msgid "selfStats"
+msgstr ""
+
+#: plugin.py:246
 msgid ""
 "[<channel>] [<name>]\n"
 "\n"
@@ -73,21 +106,68 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:305
+#: plugin.py:259
+msgid "I couldn't find you in my user database."
+msgstr ""
+
+#: plugin.py:272
 msgid ""
-"There's really no reason why you should have underscores or brackets in your "
-"mathematical expression.  Please remove them."
+"%s has sent %n; a total of %n, %n, %n, and %n; %s of those messages %s. %s "
+"has joined %n, parted %n, quit %n, kicked someone %n, been kicked %n, "
+"changed the topic %n, and changed the mode %n."
 msgstr ""
 
-#: plugin.py:309
-msgid "You can't use lambda in this command."
+#: plugin.py:278
+msgid "message"
 msgstr ""
 
-#: plugin.py:323
-msgid "stat variable"
+#: plugin.py:279
+msgid "character"
 msgstr ""
 
-#: plugin.py:335
+#: plugin.py:280 plugin.py:365
+msgid "word"
+msgstr ""
+
+#: plugin.py:281 plugin.py:366
+msgid "smiley"
+msgstr ""
+
+#: plugin.py:282 plugin.py:367
+msgid "frown"
+msgstr ""
+
+#: plugin.py:284 plugin.py:368
+msgid "was an ACTION"
+msgstr ""
+
+#: plugin.py:285 plugin.py:369
+msgid "were ACTIONs"
+msgstr ""
+
+#: plugin.py:287 plugin.py:288 plugin.py:289 plugin.py:290 plugin.py:291
+#: plugin.py:292 plugin.py:293
+msgid "time"
+msgstr ""
+
+#: plugin.py:296
+#, python-format
+msgid "I have no stats for that %s in %s."
+msgstr ""
+
+#: plugin.py:298 plugin.py:346 plugin.py:382
+msgid "channeldb"
+msgstr ""
+
+#: plugin.py:298
+msgid "something"
+msgstr ""
+
+#: plugin.py:300
+msgid "__builtins__"
+msgstr ""
+
+#: plugin.py:305
 msgid ""
 "[<channel>] <stat expression>\n"
 "\n"
@@ -100,51 +180,42 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:349
+#: plugin.py:315
+msgid "_[]"
+msgstr ""
+
+#: plugin.py:316
 msgid ""
-"On %s there %h been %i messages, containing %i characters, %n, %n, and %n; "
-"%i of those messages %s.  There have been %n, %n, %n, %n, %n, and %n.  There "
-"%b currently %n and the channel has peaked at %n."
+"There's really no reason why you should have underscores or brackets in your "
+"mathematical expression.  Please remove them."
 msgstr ""
 
-#: plugin.py:360
-msgid "join"
+#: plugin.py:319
+msgid "lambda"
 msgstr ""
 
-#: plugin.py:361
-msgid "part"
+#: plugin.py:320
+msgid "You can't use lambda in this command."
 msgstr ""
 
-#: plugin.py:362
-msgid "quit"
+#: plugin.py:332
+msgid "inf"
 msgstr ""
 
-#: plugin.py:363
-msgid "kick"
+#: plugin.py:334
+msgid "stat variable"
 msgstr ""
 
-#: plugin.py:364
-msgid "mode"
-msgstr ""
-
-#: plugin.py:364 plugin.py:365
-msgid "change"
-msgstr ""
-
-#: plugin.py:365
-msgid "topic"
-msgstr ""
-
-#: plugin.py:367 plugin.py:368
-msgid "user"
-msgstr ""
-
-#: plugin.py:371
+#: plugin.py:343
 #, python-format
-msgid "I've never been on %s."
+msgid "#%s %s (%.3g)"
 msgstr ""
 
-#: plugin.py:372
+#: plugin.py:346
+msgid "text"
+msgstr ""
+
+#: plugin.py:351
 msgid ""
 "[<channel>]\n"
 "\n"
@@ -153,3 +224,47 @@ msgid ""
 "        the message isn't sent on the channel itself.\n"
 "        "
 msgstr ""
+
+#: plugin.py:359
+msgid ""
+"On %s there %h been %i messages, containing %i characters, %n, %n, and %n; "
+"%i of those messages %s.  There have been %n, %n, %n, %n, %n, and %n.  There "
+"%b currently %n and the channel has peaked at %n."
+msgstr ""
+
+#: plugin.py:370
+msgid "join"
+msgstr ""
+
+#: plugin.py:371
+msgid "part"
+msgstr ""
+
+#: plugin.py:372
+msgid "quit"
+msgstr ""
+
+#: plugin.py:373
+msgid "kick"
+msgstr ""
+
+#: plugin.py:374
+msgid "mode"
+msgstr ""
+
+#: plugin.py:374 plugin.py:375
+msgid "change"
+msgstr ""
+
+#: plugin.py:375
+msgid "topic"
+msgstr ""
+
+#: plugin.py:377 plugin.py:378
+msgid "user"
+msgstr ""
+
+#: plugin.py:381
+#, python-format
+msgid "I've never been on %s."
+msgstr ""