diff --git a/plugins/Misc/locale/fr.po b/plugins/Misc/locale/fr.po
index e6544c62d..c541a031c 100644
--- a/plugins/Misc/locale/fr.po
+++ b/plugins/Misc/locale/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Supybot-fr\n"
-"POT-Creation-Date: 2012-03-11 20:58+UTC\n"
+"POT-Creation-Date: 2012-07-30 11:30+CEST\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Valentin Lorentz <progval@gmail.com>\n"
 "Language-Team: Supybot-fr <progval@gmail.com>\n"
@@ -51,15 +51,20 @@ msgid ""
 "    command"
 msgstr "Détermine si le nick est inclu dans la sortie de 'last' lorsqu'il est dans une commande imbriquée."
 
-#: plugin.py:104
+#: plugin.py:105
 msgid "You've given me %s invalid commands within the last minute; I'm now ignoring you for %s."
 msgstr "Vous m'avez donné %s commandes invalides dans la dernière minute, je vous ignore maitenant pendant %s."
 
-#: plugin.py:116
+#: plugin.py:144
 msgid "The %q plugin is loaded, but there is no command named %q in it.  Try \"list %s\" to see the commands in the %q plugin."
 msgstr "Le plugin %q est chargé, mais il n'a pas de commande appelée %q. Essayez \"list %s\" pour voir les commandes dans le plugin %q."
 
-#: plugin.py:142
+#: plugin.py:150
+#: plugin.py:153
+msgid "command"
+msgstr "commande"
+
+#: plugin.py:170
 msgid ""
 "[--private] [--unloaded] [<plugin>]\n"
 "\n"
@@ -73,23 +78,23 @@ msgstr ""
 "\n"
 "Liste les commandes disponibles dans le plugin donné. Si aucun plugin n'est donné, liste les plugins publics. Si --private est donné, il liste les plugins privés. Si --unloaded est donné, il liste les plugins disponibles qui ne sont pas chargés."
 
-#: plugin.py:163
+#: plugin.py:191
 msgid "--private and --unloaded are uncompatible options."
 msgstr "--private et --unloaded ne sont pas des options compatibles."
 
-#: plugin.py:194
+#: plugin.py:222
 msgid "There are no private plugins."
 msgstr "Il n'y a pas de plugin privé."
 
-#: plugin.py:196
+#: plugin.py:224
 msgid "There are no public plugins."
 msgstr "Il n'y a pas de plugin privé."
 
-#: plugin.py:203
+#: plugin.py:231
 msgid "That plugin exists, but has no commands.  This probably means that it has some configuration variables that can be changed in order to modify its behavior.  Try \"config list supybot.plugins.%s\" to see what configuration variables it has."
 msgstr "Ce plugin existe, mais n'a pas de commande. Cela signifie probablement qu'il a des variables de configuration qui peuvent être changés pour modifier son comportement. Essayez \"config list supybot.plugins.%s\" pour voir quelles variables de configuration il a."
 
-#: plugin.py:215
+#: plugin.py:243
 msgid ""
 "<string>\n"
 "\n"
@@ -101,11 +106,11 @@ msgstr ""
 "\n"
 "Recherche la <chaîne> dans les commandes actuellement fournies par le bot et retourne une list des commandes contenant cette chaîne."
 
-#: plugin.py:234
+#: plugin.py:262
 msgid "No appropriate commands were found."
 msgstr "Aucune commande appropriée n'a été trouvée."
 
-#: plugin.py:239
+#: plugin.py:267
 msgid ""
 "[<plugin>] [<command>]\n"
 "\n"
@@ -117,15 +122,15 @@ msgstr ""
 "\n"
 "Cette commande donne une description utile de ce que fait la <commande>. <plugin> n'est nécessaire que si la commande est présente dans plus d'un plugin."
 
-#: plugin.py:249
+#: plugin.py:277
 msgid "That command exists in the %L plugins.  Please specify exactly which plugin command you want help with."
 msgstr "Cette commande existe dans les plugins %L. Veuillez spécifier dans quel plugin se trouve la commande pour laquelle vous cherchez de l'aide."
 
-#: plugin.py:256
+#: plugin.py:284
 msgid "There is no command %q."
 msgstr "Il n'y a pas de commande %q."
 
-#: plugin.py:262
+#: plugin.py:290
 msgid ""
 "takes no arguments\n"
 "\n"
@@ -136,23 +141,23 @@ msgstr ""
 "\n"
 "Retourne la version actuelle du bot"
 
-#: plugin.py:276
+#: plugin.py:306
 msgid "The newest versions available online are %s."
 msgstr "Les dernières versions disponibles en ligne sont %s."
 
-#: plugin.py:277
+#: plugin.py:307
 msgid "%s (in %s)"
 msgstr "%s (dans %s)"
 
-#: plugin.py:281
+#: plugin.py:311
 msgid "I couldn't fetch the newest version from the Limnoria repository."
 msgstr "Je ne peux récupérer la dernière version sur le dépôt de Limnoria."
 
-#: plugin.py:283
+#: plugin.py:313
 msgid "The current (running) version of this Supybot is %s.  %s"
 msgstr "La version de ce Supybot est %s. %s"
 
-#: plugin.py:290
+#: plugin.py:320
 msgid ""
 "takes no arguments\n"
 "\n"
@@ -163,11 +168,11 @@ msgstr ""
 "\n"
 "Retourne une URL disant où trouver Limnoria."
 
-#: plugin.py:294
+#: plugin.py:324
 msgid "My source is at https://github.com/ProgVal/Limnoria"
 msgstr "Ma source est disponible sur https://github.com/ProgVal/Limnoria"
 
-#: plugin.py:299
+#: plugin.py:329
 msgid ""
 "[<nick>]\n"
 "\n"
@@ -181,31 +186,31 @@ msgstr ""
 "\n"
 "Si la dernière commande était tronquée par les limitations de taille des messages sur IRC, retourne le morceau suivant résultant de la dernière commande. Si le <nick> est donné, continue la dernière commande du <nick> plutôt que de la personne envoyant ce message."
 
-#: plugin.py:313
+#: plugin.py:343
 msgid "%s has no public mores."
 msgstr "%s n'a pas de 'more' public."
 
-#: plugin.py:316
+#: plugin.py:346
 msgid "Sorry, I can't find any mores for %s"
 msgstr "Désolé, je ne peux trouver de 'more' pour %s"
 
-#: plugin.py:323
+#: plugin.py:353
 msgid "more message"
 msgstr "autre message"
 
-#: plugin.py:325
+#: plugin.py:355
 msgid "more messages"
 msgstr "autres messages"
 
-#: plugin.py:329
+#: plugin.py:359
 msgid "You haven't asked me a command; perhaps you want to see someone else's more.  To do so, call this command with that person's nick."
 msgstr "Vous ne m'avez donné aucune commande. Peut-être que vous voulez voir celle de quelqu'un d'autre. Pour cela, appelez cette commande en ajoutant le nick de cette personne."
 
-#: plugin.py:333
+#: plugin.py:363
 msgid "That's all, there is no more."
 msgstr "C'est tout, il n'y a plus de 'more'"
 
-#: plugin.py:343
+#: plugin.py:373
 msgid ""
 "[--{from,in,on,with,without,regexp} <value>] [--nolimit]\n"
 "\n"
@@ -222,15 +227,15 @@ msgstr ""
 "\n"
 "Retourne le dernier message correspondant aux critères donnés. --from requiert le nick de la personne qui a envoyé le message ; --in requiert le canal sur lequel a été envoyé le message ; --with requiert une chaîne qui doit être dans le message --regexp requiert une expression régulière à laquelle le message doit correspondre ; --nolimit retourne tous les messages qui peuvent être trouvés. Par défaut, recherche dans les logs du canal sur lequel est envoyée cette commande."
 
-#: plugin.py:445
+#: plugin.py:475
 msgid "The regular expression timed out."
 msgstr "L'expression régulière a pris trop de temps à être évaluée."
 
-#: plugin.py:458
+#: plugin.py:488
 msgid "I couldn't find a message matching that criteria in my history of %s messages."
 msgstr "Je ne peux trouver de message correspondant à ce critère dans mon historique de %s messages."
 
-#: plugin.py:473
+#: plugin.py:503
 msgid ""
 "<nick> <text>\n"
 "\n"
@@ -242,23 +247,23 @@ msgstr ""
 "\n"
 "Dit le <texte> au <nick>. Utile si vous utilisez des commandes imbriquées."
 
-#: plugin.py:483
+#: plugin.py:513
 msgid "Dude, just give the command.  No need for the tell."
 msgstr "Mec, contentes-toi de me donner la commande. Pas besoin d'utiliser 'tell'."
 
-#: plugin.py:488
+#: plugin.py:518
 msgid "You just told me, why should I tell myself?"
 msgstr "Vous venez de me le dire, pourquoi devrais-je me le dire moi-même ?"
 
-#: plugin.py:493
+#: plugin.py:523
 msgid "I haven't seen %s, I'll let you do the telling."
 msgstr "Je n'ai pas vu %s, je vous laisse lui dire."
 
-#: plugin.py:498
+#: plugin.py:528
 msgid "%s wants me to tell you: %s"
 msgstr "%s veut que je vous dise : %s"
 
-#: plugin.py:505
+#: plugin.py:535
 msgid ""
 "takes no arguments\n"
 "\n"
@@ -269,11 +274,11 @@ msgstr ""
 "\n"
 "Vérifie si le bot est encore en vie."
 
-#: plugin.py:509
+#: plugin.py:539
 msgid "pong"
 msgstr "pong"
 
-#: plugin.py:513
+#: plugin.py:543
 msgid ""
 "[<channel>] <beginning> [--match-case]\n"
 "\n"
@@ -284,11 +289,11 @@ msgstr ""
 "[<canal>] <lettres> [--match-case]\\n"
 "Retourne le nick de quelqu'un dans le salon dont le nick commence par les <lettres> indiquées.<channel> correspond par défaut au salon actuel."
 
-#: plugin.py:519
+#: plugin.py:549
 msgid "I'm not even in %s."
 msgstr "Je ne suis pas dans %s."
 
-#: plugin.py:531
+#: plugin.py:561
 msgid "No such nick."
 msgstr "Ce nick n'existe pas."
 
diff --git a/plugins/Misc/messages.pot b/plugins/Misc/messages.pot
index f7df3d79e..e0600e6a4 100644
--- a/plugins/Misc/messages.pot
+++ b/plugins/Misc/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-11 20:58+UTC\n"
+"POT-Creation-Date: 2012-07-30 11:30+CEST\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"
@@ -53,15 +53,19 @@ msgid ""
 "    command"
 msgstr ""
 
-#: plugin.py:104
+#: plugin.py:105
 msgid "You've given me %s invalid commands within the last minute; I'm now ignoring you for %s."
 msgstr ""
 
-#: plugin.py:116
+#: plugin.py:144
 msgid "The %q plugin is loaded, but there is no command named %q in it.  Try \"list %s\" to see the commands in the %q plugin."
 msgstr ""
 
-#: plugin.py:142
+#: plugin.py:150 plugin.py:153
+msgid "command"
+msgstr ""
+
+#: plugin.py:170
 #, docstring
 msgid ""
 "[--private] [--unloaded] [<plugin>]\n"
@@ -73,23 +77,23 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:163
+#: plugin.py:191
 msgid "--private and --unloaded are uncompatible options."
 msgstr ""
 
-#: plugin.py:194
+#: plugin.py:222
 msgid "There are no private plugins."
 msgstr ""
 
-#: plugin.py:196
+#: plugin.py:224
 msgid "There are no public plugins."
 msgstr ""
 
-#: plugin.py:203
+#: plugin.py:231
 msgid "That plugin exists, but has no commands.  This probably means that it has some configuration variables that can be changed in order to modify its behavior.  Try \"config list supybot.plugins.%s\" to see what configuration variables it has."
 msgstr ""
 
-#: plugin.py:215
+#: plugin.py:243
 #, docstring
 msgid ""
 "<string>\n"
@@ -99,11 +103,11 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:234
+#: plugin.py:262
 msgid "No appropriate commands were found."
 msgstr ""
 
-#: plugin.py:239
+#: plugin.py:267
 #, docstring
 msgid ""
 "[<plugin>] [<command>]\n"
@@ -113,15 +117,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:249
+#: plugin.py:277
 msgid "That command exists in the %L plugins.  Please specify exactly which plugin command you want help with."
 msgstr ""
 
-#: plugin.py:256
+#: plugin.py:284
 msgid "There is no command %q."
 msgstr ""
 
-#: plugin.py:262
+#: plugin.py:290
 #, docstring
 msgid ""
 "takes no arguments\n"
@@ -130,23 +134,23 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:276
+#: plugin.py:306
 msgid "The newest versions available online are %s."
 msgstr ""
 
-#: plugin.py:277
+#: plugin.py:307
 msgid "%s (in %s)"
 msgstr ""
 
-#: plugin.py:281
+#: plugin.py:311
 msgid "I couldn't fetch the newest version from the Limnoria repository."
 msgstr ""
 
-#: plugin.py:283
+#: plugin.py:313
 msgid "The current (running) version of this Supybot is %s.  %s"
 msgstr ""
 
-#: plugin.py:290
+#: plugin.py:320
 #, docstring
 msgid ""
 "takes no arguments\n"
@@ -155,11 +159,11 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:294
+#: plugin.py:324
 msgid "My source is at https://github.com/ProgVal/Limnoria"
 msgstr ""
 
-#: plugin.py:299
+#: plugin.py:329
 #, docstring
 msgid ""
 "[<nick>]\n"
@@ -171,31 +175,31 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:313
+#: plugin.py:343
 msgid "%s has no public mores."
 msgstr ""
 
-#: plugin.py:316
+#: plugin.py:346
 msgid "Sorry, I can't find any mores for %s"
 msgstr ""
 
-#: plugin.py:323
+#: plugin.py:353
 msgid "more message"
 msgstr ""
 
-#: plugin.py:325
+#: plugin.py:355
 msgid "more messages"
 msgstr ""
 
-#: plugin.py:329
+#: plugin.py:359
 msgid "You haven't asked me a command; perhaps you want to see someone else's more.  To do so, call this command with that person's nick."
 msgstr ""
 
-#: plugin.py:333
+#: plugin.py:363
 msgid "That's all, there is no more."
 msgstr ""
 
-#: plugin.py:343
+#: plugin.py:373
 #, docstring
 msgid ""
 "[--{from,in,on,with,without,regexp} <value>] [--nolimit]\n"
@@ -210,15 +214,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:445
+#: plugin.py:475
 msgid "The regular expression timed out."
 msgstr ""
 
-#: plugin.py:458
+#: plugin.py:488
 msgid "I couldn't find a message matching that criteria in my history of %s messages."
 msgstr ""
 
-#: plugin.py:473
+#: plugin.py:503
 #, docstring
 msgid ""
 "<nick> <text>\n"
@@ -228,23 +232,23 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:483
+#: plugin.py:513
 msgid "Dude, just give the command.  No need for the tell."
 msgstr ""
 
-#: plugin.py:488
+#: plugin.py:518
 msgid "You just told me, why should I tell myself?"
 msgstr ""
 
-#: plugin.py:493
+#: plugin.py:523
 msgid "I haven't seen %s, I'll let you do the telling."
 msgstr ""
 
-#: plugin.py:498
+#: plugin.py:528
 msgid "%s wants me to tell you: %s"
 msgstr ""
 
-#: plugin.py:505
+#: plugin.py:535
 #, docstring
 msgid ""
 "takes no arguments\n"
@@ -253,11 +257,11 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:509
+#: plugin.py:539
 msgid "pong"
 msgstr ""
 
-#: plugin.py:513
+#: plugin.py:543
 #, docstring
 msgid ""
 "[<channel>] <beginning> [--match-case]\n"
@@ -267,11 +271,11 @@ msgid ""
 "        <channel> defaults to the current channel."
 msgstr ""
 
-#: plugin.py:519
+#: plugin.py:549
 msgid "I'm not even in %s."
 msgstr ""
 
-#: plugin.py:531
+#: plugin.py:561
 msgid "No such nick."
 msgstr ""
 
diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py
index 8b8b47882..9dfc394f8 100644
--- a/plugins/Misc/plugin.py
+++ b/plugins/Misc/plugin.py
@@ -147,10 +147,10 @@ class Misc(callbacks.Plugin):
                                      'plugin.'), plugin, tokens[1],
                                      plugin, plugin))
                 else:
-                    irc.errorInvalid('command', tokens[0], repr=False)
+                    irc.errorInvalid(_('command'), tokens[0], repr=False)
             else:
                 command = tokens and tokens[0] or ''
-                irc.errorInvalid('command', command, repr=False)
+                irc.errorInvalid(_('command'), command, repr=False)
         else:
             if tokens:
                 # echo [] will get us an empty token set, but there's no need