PO update

14 files changed, 1261 insertions, 1018 deletions

diff --git a/po/en_US/rbot-nickrecover.po b/po/en_US/rbot-nickrecover.po
new file mode 100644
index 00000000..fae49fb0
--- /dev/null
+++ b/po/en_US/rbot-nickrecover.po
@@ -0,0 +1,40 @@
+# English translations for PACKAGE package.
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rbot\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
+"PO-Revision-Date: 2008-07-30 23:38+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: data/rbot/plugins/nickrecover.rb:24
+msgid ""
+"Time in seconds to wait between attempts to recover the nick. set to 0 to "
+"disable nick recovery."
+msgstr ""
+"Time in seconds to wait between attempts to recover the nick. set to 0 to "
+"disable nick recovery."
+
+#: data/rbot/plugins/nickrecover.rb:28
+msgid ""
+"the nickrecover plugin takes care of recovering the bot nick by trying to "
+"change nick until it succeeds."
+msgstr ""
+"the nickrecover plugin takes care of recovering the bot nick by trying to "
+"change nick until it succeeds."
+
+#: data/rbot/plugins/nickrecover.rb:29
+msgid "the plugin waits irc.nick_retry seconds between attempts."
+msgstr "the plugin waits irc.nick_retry seconds between attempts."
+
+#: data/rbot/plugins/nickrecover.rb:30
+msgid "set irc.nick_retry to 0 to disable it."
+msgstr "set irc.nick_retry to 0 to disable it."
diff --git a/po/en_US/rbot.po b/po/en_US/rbot.po
index 73570d82..74dd21ad 100644
--- a/po/en_US/rbot.po
+++ b/po/en_US/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-07-07 18:02+0200\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
 "PO-Revision-Date: 2007-07-14 00:06-0400\n"
 "Last-Translator: Yaohan Chen <yaohan.chen@gmail.com>\n"
 "Language-Team: English\n"
@@ -63,118 +63,118 @@ msgstr ""
 "The rest of rbot's configuration can be manipulated via IRC once rbot is "
 "connected and you are auth'd."
 
-#: lib/rbot/core/auth.rb:69
+#: lib/rbot/core/auth.rb:76
 msgid "please do not use + or - in front of command %{command} when resetting"
 msgstr "please do not use + or - in front of command %{command} when resetting"
 
-#: lib/rbot/core/auth.rb:71
+#: lib/rbot/core/auth.rb:78
 msgid "+ or - expected in front of %{string}"
 msgstr "+ or - expected in front of %{string}"
 
-#: lib/rbot/core/auth.rb:84
+#: lib/rbot/core/auth.rb:91
 msgid "'%{string}' doesn't look like a channel name"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:93
+#: lib/rbot/core/auth.rb:100
 msgid "trailing comma"
 msgstr "trailing comma"
 
-#: lib/rbot/core/auth.rb:94
+#: lib/rbot/core/auth.rb:101
 msgid "you probably forgot a comma"
 msgstr "you probably forgot a comma"
 
-#: lib/rbot/core/auth.rb:109 lib/rbot/core/auth.rb:163
-#: lib/rbot/core/auth.rb:229
+#: lib/rbot/core/auth.rb:116 lib/rbot/core/auth.rb:170
+#: lib/rbot/core/auth.rb:236
 msgid "couldn't find botuser %{name}"
 msgstr "couldn't find botuser %{name}"
 
-#: lib/rbot/core/auth.rb:111
+#: lib/rbot/core/auth.rb:118
 msgid "you can't change permissions for %{username}"
 msgstr "you can't change permissions for %{username}"
 
-#: lib/rbot/core/auth.rb:118
+#: lib/rbot/core/auth.rb:125
 msgid "couldn't satisfy your request: %{errors}"
 msgstr "couldn't satisfy your request: %{errors}"
 
-#: lib/rbot/core/auth.rb:157
+#: lib/rbot/core/auth.rb:164
 msgid "you are owner, you can do anything"
 msgstr "you are owner, you can do anything"
 
-#: lib/rbot/core/auth.rb:160
+#: lib/rbot/core/auth.rb:167
 msgid "owner can do anything"
 msgstr "owner can do anything"
 
-#: lib/rbot/core/auth.rb:171
+#: lib/rbot/core/auth.rb:178
 msgid "on any channel: "
 msgstr "on any channel: "
 
-#: lib/rbot/core/auth.rb:173
+#: lib/rbot/core/auth.rb:180
 msgid "in private: "
 msgstr "in private: "
 
-#: lib/rbot/core/auth.rb:185
+#: lib/rbot/core/auth.rb:192
 msgid "no permissions set for %{user}"
 msgstr "no permissions set for %{user}"
 
-#: lib/rbot/core/auth.rb:187
+#: lib/rbot/core/auth.rb:194
 msgid "permissions for %{user}:: %{permissions}"
 msgstr "permissions for %{user}:: %{permissions}"
 
-#: lib/rbot/core/auth.rb:197
+#: lib/rbot/core/auth.rb:204
 msgid ". only %{max} will be shown"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:198
+#: lib/rbot/core/auth.rb:205
 msgid "%{count} commands found matching %{pattern}%{extra}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:203
+#: lib/rbot/core/auth.rb:210
 msgid "%{cmd}: %{perms}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:260
+#: lib/rbot/core/auth.rb:267
 msgid "%{user} can already do that"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:262
+#: lib/rbot/core/auth.rb:269
 msgid "%{user} can't do that already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:272
+#: lib/rbot/core/auth.rb:279
 msgid ""
 "sorry, %{cmd} doesn't look like a valid command. maybe you misspelled it, or "
 "you need to specify it should be in private?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:295
+#: lib/rbot/core/auth.rb:302
 msgid "welcome, %{user}"
 msgstr "welcome, %{user}"
 
-#: lib/rbot/core/auth.rb:310
+#: lib/rbot/core/auth.rb:317
 msgid "sorry, can't do"
 msgstr "sorry, can't do"
 
-#: lib/rbot/core/auth.rb:313
+#: lib/rbot/core/auth.rb:320
 msgid "couldn't login: %{exception}"
 msgstr "couldn't login: %{exception}"
 
-#: lib/rbot/core/auth.rb:321
+#: lib/rbot/core/auth.rb:328
 msgid "I couldn't find anything to let you login automatically"
 msgstr "I couldn't find anything to let you login automatically"
 
-#: lib/rbot/core/auth.rb:332
+#: lib/rbot/core/auth.rb:339
 msgid "you are %{who}"
 msgstr "you are %{who}"
 
-#: lib/rbot/core/auth.rb:334 lib/rbot/core/auth.rb:347
+#: lib/rbot/core/auth.rb:341 lib/rbot/core/auth.rb:354
 msgid "no one that I know"
 msgstr "no one that I know"
 
-#: lib/rbot/core/auth.rb:335 lib/rbot/core/auth.rb:348
+#: lib/rbot/core/auth.rb:342 lib/rbot/core/auth.rb:355
 msgid "my boss"
 msgstr "my boss"
 
-#: lib/rbot/core/auth.rb:355
+#: lib/rbot/core/auth.rb:362
 msgid ""
 "login [<botuser>] [<pass>]: logs in to the bot as botuser <botuser> with "
 "password <pass>. When using the full form, you must contact the bot in "
@@ -188,15 +188,15 @@ msgstr ""
 "netmask is among the known ones. if <botuser> is omitted too autologin will "
 "be attempted"
 
-#: lib/rbot/core/auth.rb:357
+#: lib/rbot/core/auth.rb:364
 msgid "whoami: names the botuser you're linked to"
 msgstr "whoami: names the botuser you're linked to"
 
-#: lib/rbot/core/auth.rb:359
+#: lib/rbot/core/auth.rb:366
 msgid "who is <user>: names the botuser <user> is linked to"
 msgstr "whoami: names the botuser you're linked to"
 
-#: lib/rbot/core/auth.rb:363
+#: lib/rbot/core/auth.rb:370
 msgid ""
 "a permission is specified as module::path::to::cmd; when you want to enable "
 "it, prefix it with +; when you want to disable it, prefix it with -; when "
@@ -206,7 +206,7 @@ msgstr ""
 "it, prefix it with +; when you want to disable it, prefix it with -; when "
 "using the +reset+ command, do not use any prefix"
 
-#: lib/rbot/core/auth.rb:365
+#: lib/rbot/core/auth.rb:372
 msgid ""
 "permissions [re]set <permission> [in <channel>] for <user>: sets or resets "
 "the permissions for botuser <user> in channel <channel> (use ? to change the "
@@ -216,21 +216,21 @@ msgstr ""
 "the permissions for botuser <user> in channel <channel> (use ? to change the "
 "permissions for private addressing)"
 
-#: lib/rbot/core/auth.rb:367
+#: lib/rbot/core/auth.rb:374
 msgid "permissions view [for <user>]: display the permissions for user <user>"
 msgstr "permissions view [for <user>]: display the permissions for user <user>"
 
-#: lib/rbot/core/auth.rb:369
+#: lib/rbot/core/auth.rb:376
 msgid ""
 "permissions search <pattern>: display the permissions associated with the "
 "commands matching <pattern>"
 msgstr "permissions view [for <user>]: display the permissions for user <user>"
 
-#: lib/rbot/core/auth.rb:371
+#: lib/rbot/core/auth.rb:378
 msgid "permission topics: syntax, (re)set, view, search"
 msgstr "permission topics: syntax, (re)set, view"
 
-#: lib/rbot/core/auth.rb:376
+#: lib/rbot/core/auth.rb:383
 msgid ""
 "user show <what> : shows info about the user; <what> can be any of "
 "autologin, login-by-mask, netmasks"
@@ -238,7 +238,7 @@ msgstr ""
 "user show <what> : shows info about the user; <what> can be any of "
 "autologin, login-by-mask, netmasks"
 
-#: lib/rbot/core/auth.rb:378
+#: lib/rbot/core/auth.rb:385
 msgid ""
 "user enable|disable <what> : turns on or off <what> (autologin, login-by-"
 "mask)"
@@ -246,7 +246,7 @@ msgstr ""
 "user enable|disable <what> : turns on or off <what> (autologin, login-by-"
 "mask)"
 
-#: lib/rbot/core/auth.rb:380
+#: lib/rbot/core/auth.rb:387
 msgid ""
 "user set password <blah> : sets the user password to <blah>; passwords can "
 "only contain upper and lowercase letters and numbers, and must be at least 4 "
@@ -256,7 +256,7 @@ msgstr ""
 "only contain upper and lowercase letters and numbers, and must be at least 4 "
 "characters long"
 
-#: lib/rbot/core/auth.rb:382
+#: lib/rbot/core/auth.rb:389
 msgid ""
 "user add|rm netmask <mask> : adds/removes netmask <mask> from the list of "
 "netmasks known to the botuser you're linked to"
@@ -264,7 +264,7 @@ msgstr ""
 "user add|rm netmask <mask> : adds/removes netmask <mask> from the list of "
 "netmasks known to the botuser you're linked to"
 
-#: lib/rbot/core/auth.rb:384
+#: lib/rbot/core/auth.rb:391
 msgid ""
 "user reset <what> : resets <what> to the default values. <what> can be "
 "+netmasks+ (the list will be emptied), +autologin+ or +login-by-mask+ (will "
@@ -276,7 +276,7 @@ msgstr ""
 "be reset to the default value) or +password+ (a new one will be generated "
 "and you'll be told in private)"
 
-#: lib/rbot/core/auth.rb:386
+#: lib/rbot/core/auth.rb:393
 msgid ""
 "user tell <who> the password for <botuser> : contacts <who> in private to "
 "tell him/her the password for <botuser>"
@@ -284,7 +284,7 @@ msgstr ""
 "user tell <who> the password for <botuser> : contacts <who> in private to "
 "tell him/her the password for <botuser>"
 
-#: lib/rbot/core/auth.rb:388
+#: lib/rbot/core/auth.rb:395
 msgid ""
 "user create <name> <password> : create botuser named <name> with password "
 "<password>. The password can be omitted, in which case a random one will be "
@@ -296,11 +296,11 @@ msgstr ""
 "generated. The <name> should only contain alphanumeric characters and the "
 "underscore (_)"
 
-#: lib/rbot/core/auth.rb:390
+#: lib/rbot/core/auth.rb:397
 msgid "user list : lists all the botusers"
 msgstr "user list : lists all the botusers"
 
-#: lib/rbot/core/auth.rb:392
+#: lib/rbot/core/auth.rb:399
 msgid ""
 "user destroy <botuser> : destroys <botuser>. This function %{highlight}must%"
 "{highlight} be called in two steps. On the first call <botuser> is queued "
@@ -315,7 +315,7 @@ msgstr ""
 "will be destroyed. If you want to cancel the destruction, issue the command "
 "+user cancel destroy <botuser>+"
 
-#: lib/rbot/core/auth.rb:394
+#: lib/rbot/core/auth.rb:401
 msgid ""
 "user topics: show, enable|disable, add|rm netmask, set, reset, tell, create, "
 "list, destroy"
@@ -323,7 +323,7 @@ msgstr ""
 "user topics: show, enable|disable, add|rm netmask, set, reset, tell, create, "
 "list, destroy"
 
-#: lib/rbot/core/auth.rb:397
+#: lib/rbot/core/auth.rb:404
 msgid ""
 "auth <masterpassword>: log in as the bot owner; other commands: login, "
 "whoami, permissions syntax, permissions [re]set, permissions view, user, "
@@ -332,204 +332,204 @@ msgstr ""
 "auth <masterpassword>: log in as the bot owner; other commands: login, "
 "whoami, permission syntax, permissions [re]set, permissions view, user"
 
-#: lib/rbot/core/auth.rb:399
+#: lib/rbot/core/auth.rb:406
 msgid ""
 "meet <nick> [as <user>]: creates a bot user for nick, calling it user "
 "(defaults to the nick itself)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:401
+#: lib/rbot/core/auth.rb:408
 msgid "hello: creates a bot user for the person issuing the command"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:403
+#: lib/rbot/core/auth.rb:410
 msgid ""
 "allow <user> to do <sample command> [<where>]: gives botuser <user> the "
 "permissions to execute a command such as the provided sample command (in "
 "private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:405
+#: lib/rbot/core/auth.rb:412
 msgid ""
 "deny <user> from doing <sample command> [<where>]: removes from botuser "
 "<user> the permissions to execute a command such as the provided sample "
 "command (in private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:407
+#: lib/rbot/core/auth.rb:414
 msgid ""
 "auth commands: auth, login, whoami, who, permission[s], user, meet, hello, "
 "allow, deny"
 msgstr "auth commands: auth, login, whoami, permission[s], user"
 
-#: lib/rbot/core/auth.rb:412
+#: lib/rbot/core/auth.rb:419
 msgid "sorry, I need more arguments to %{command}"
 msgstr "sorry, I need more arguments to %{command}"
 
-#: lib/rbot/core/auth.rb:416
+#: lib/rbot/core/auth.rb:423
 msgid "I can only %{command} these: %{arguments}"
 msgstr "I can only %{command} these: %{arguments}"
 
-#: lib/rbot/core/auth.rb:451
+#: lib/rbot/core/auth.rb:458
 msgid "no such bot user %{user}"
 msgstr "no such botuser %{user}"
 
-#: lib/rbot/core/auth.rb:454
+#: lib/rbot/core/auth.rb:461
 msgid "you can't mess with %{user}"
 msgstr "you can't mess with %{user}"
 
-#: lib/rbot/core/auth.rb:466
+#: lib/rbot/core/auth.rb:473
 msgid "you can't see the properties of %{user}"
 msgstr "you can't see the properties of %{user}"
 
-#: lib/rbot/core/auth.rb:475
+#: lib/rbot/core/auth.rb:482
 msgid "no way I'm telling you the master password!"
 msgstr "no way I'm telling you the master password!"
 
-#: lib/rbot/core/auth.rb:476
+#: lib/rbot/core/auth.rb:483
 msgid "you can't ask for someone else's password"
 msgstr "you can't ask for someone else's password"
 
-#: lib/rbot/core/auth.rb:478
+#: lib/rbot/core/auth.rb:485
 msgid ""
 "c'mon, you can't be asking me seriously to tell you the password in public!"
 msgstr ""
 "c'mon, you can't be asking me seriously to tell you the password in public!"
 
-#: lib/rbot/core/auth.rb:479
+#: lib/rbot/core/auth.rb:486
 msgid "the password for %{user} is %{password}"
 msgstr "the password for %{user} is %{password}"
 
-#: lib/rbot/core/auth.rb:493
+#: lib/rbot/core/auth.rb:500
 msgid "can %{action}"
 msgstr "can %{action}"
 
-#: lib/rbot/core/auth.rb:495
+#: lib/rbot/core/auth.rb:502
 msgid "can not %{action}"
 msgstr "can not %{action}"
 
-#: lib/rbot/core/auth.rb:499
+#: lib/rbot/core/auth.rb:506
 msgid "knows no netmasks"
 msgstr "knows no netmasks"
 
-#: lib/rbot/core/auth.rb:501
+#: lib/rbot/core/auth.rb:508
 msgid "knows %{netmasks}"
 msgstr "knows %{netmasks}"
 
-#: lib/rbot/core/auth.rb:508 lib/rbot/core/auth.rb:535
-#: lib/rbot/core/auth.rb:553 lib/rbot/core/auth.rb:585
+#: lib/rbot/core/auth.rb:515 lib/rbot/core/auth.rb:542
+#: lib/rbot/core/auth.rb:560 lib/rbot/core/auth.rb:592
 msgid "you can't change the default user"
 msgstr "you can't change the default user"
 
-#: lib/rbot/core/auth.rb:509 lib/rbot/core/auth.rb:537
-#: lib/rbot/core/auth.rb:555 lib/rbot/core/auth.rb:587
+#: lib/rbot/core/auth.rb:516 lib/rbot/core/auth.rb:544
+#: lib/rbot/core/auth.rb:562 lib/rbot/core/auth.rb:594
 msgid "you can't edit %{user}"
 msgstr "you can't edit %{user}"
 
-#: lib/rbot/core/auth.rb:524 lib/rbot/core/auth.rb:571
+#: lib/rbot/core/auth.rb:531 lib/rbot/core/auth.rb:578
 msgid "I ignored %{things} because %{reason}"
 msgstr "I ignored %{things} because %{reason}"
 
-#: lib/rbot/core/auth.rb:528 lib/rbot/core/auth.rb:575
+#: lib/rbot/core/auth.rb:535 lib/rbot/core/auth.rb:582
 msgid "I haven't changed anything"
 msgstr "I haven't changed anything"
 
-#: lib/rbot/core/auth.rb:546
+#: lib/rbot/core/auth.rb:553
 msgid "is that a joke? setting the password in public?"
 msgstr "is that a joke? setting the password in public?"
 
-#: lib/rbot/core/auth.rb:578
+#: lib/rbot/core/auth.rb:585
 msgid "the password for %{user} is now %{password}"
 msgstr "the password for %{user} is now %{password}"
 
-#: lib/rbot/core/auth.rb:592
+#: lib/rbot/core/auth.rb:599
 msgid ""
 "I can only add/remove netmasks. See +help user add+ for more instructions"
 msgstr ""
 "I can only add/remove netmasks. See +help user add+ for more instructions"
 
-#: lib/rbot/core/auth.rb:613
+#: lib/rbot/core/auth.rb:620
 msgid "sorry, I don't know how to %{request}"
 msgstr "sorry, I don't know how to %{request}"
 
-#: lib/rbot/core/auth.rb:616
+#: lib/rbot/core/auth.rb:623
 msgid "couldn't %{cmd}: %{exception}"
 msgstr "couldn't login: %{exception}"
 
-#: lib/rbot/core/auth.rb:645
+#: lib/rbot/core/auth.rb:652
 msgid ""
 "you are now registered as %{buname}. I created a random password for you : %"
 "{pass} and you can change it at any time by telling me 'user set password "
 "<password>' in private"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:652
+#: lib/rbot/core/auth.rb:659
 msgid "but I already know %{buname}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:654
+#: lib/rbot/core/auth.rb:661
 msgid "I had problems meeting %{nick}: %{e}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:663
+#: lib/rbot/core/auth.rb:670
 msgid "couldn't find botuser %{user}"
 msgstr "couldn't find botuser %{user}"
 
-#: lib/rbot/core/auth.rb:665
+#: lib/rbot/core/auth.rb:672
 msgid "I'm not telling the master password to anyone, pal"
 msgstr "I'm not telling the master password to anyone, pal"
 
-#: lib/rbot/core/auth.rb:666
+#: lib/rbot/core/auth.rb:673
 msgid "the password for botuser %{user} is %{password}"
 msgstr "the password for botuser %{user} is %{password}"
 
-#: lib/rbot/core/auth.rb:669
+#: lib/rbot/core/auth.rb:676
 msgid "I told %{user} that %{message}"
 msgstr "I told %{user} that %{message}"
 
-#: lib/rbot/core/auth.rb:675
+#: lib/rbot/core/auth.rb:682
 msgid "are you nuts, creating a botuser with a publicly known password?"
 msgstr "are you nuts, creating a botuser with a publicly known password?"
 
-#: lib/rbot/core/auth.rb:680
+#: lib/rbot/core/auth.rb:687
 msgid "failed to create %{user}: %{exception}"
 msgstr "failed to create %{user}: %{exception}"
 
-#: lib/rbot/core/auth.rb:684
+#: lib/rbot/core/auth.rb:691
 msgid "created botuser %{user}"
 msgstr "created botuser %{user}"
 
-#: lib/rbot/core/auth.rb:692
+#: lib/rbot/core/auth.rb:699
 msgid " (queued for destruction)"
 msgstr " (queued for destruction)"
 
-#: lib/rbot/core/auth.rb:695
+#: lib/rbot/core/auth.rb:702
 msgid "I have no botusers other than the default ones"
 msgstr "I have no botusers other than the default ones"
 
-#: lib/rbot/core/auth.rb:696
+#: lib/rbot/core/auth.rb:703
 msgid "botuser: %{list}"
 msgid_plural "botusers: %{list}"
 msgstr[0] "botuser: %{list}"
 msgstr[1] "botusers: %{list}"
 
-#: lib/rbot/core/auth.rb:703
+#: lib/rbot/core/auth.rb:710
 msgid "You can't destroy %{user}"
 msgstr "You can't destroy %{user}"
 
-#: lib/rbot/core/auth.rb:713
+#: lib/rbot/core/auth.rb:720
 msgid "no such botuser %{user}"
 msgstr "no such botuser %{user}"
 
-#: lib/rbot/core/auth.rb:720
+#: lib/rbot/core/auth.rb:727
 msgid "%{user} removed from the destruction queue"
 msgstr "%{user} removed from the destruction queue"
 
-#: lib/rbot/core/auth.rb:722
+#: lib/rbot/core/auth.rb:729
 msgid "%{user} was not queued for destruction"
 msgstr "%{user} was not queued for destruction"
 
-#: lib/rbot/core/auth.rb:727
+#: lib/rbot/core/auth.rb:734
 msgid ""
 "%{user} already queued for destruction, use %{highlight}user confirm destroy "
 "%{user}%{highlight} to destroy it"
@@ -537,7 +537,7 @@ msgstr ""
 "%{user} already queued for destruction, use %{highlight}user destroy %{user} "
 "<password>%{highlight} to destroy it"
 
-#: lib/rbot/core/auth.rb:730
+#: lib/rbot/core/auth.rb:737
 msgid ""
 "%{user} queued for destruction, use %{highlight}user confirm destroy %{user}%"
 "{highlight} to destroy it"
@@ -545,79 +545,79 @@ msgstr ""
 "%{user} queued for destruction, use %{highlight}user destroy %{user} "
 "<password>%{highlight} to destroy it"
 
-#: lib/rbot/core/auth.rb:734
+#: lib/rbot/core/auth.rb:741
 msgid "%{user} is not queued for destruction yet"
 msgstr "%{user} is not queued for destruction yet"
 
-#: lib/rbot/core/auth.rb:743 lib/rbot/core/auth.rb:783
+#: lib/rbot/core/auth.rb:750 lib/rbot/core/auth.rb:790
 msgid "failed: %{exception}"
 msgstr "failed: %{exception}"
 
-#: lib/rbot/core/auth.rb:745
+#: lib/rbot/core/auth.rb:752
 msgid "botuser %{user} destroyed"
 msgstr "botuser %{user} destroyed"
 
-#: lib/rbot/core/auth.rb:752
+#: lib/rbot/core/auth.rb:759
 msgid "please don't touch the default users"
 msgstr "please don't touch the default users"
 
-#: lib/rbot/core/auth.rb:761
+#: lib/rbot/core/auth.rb:768
 msgid "no such botuser %{source}"
 msgstr "no such botuser %{source}"
 
-#: lib/rbot/core/auth.rb:763
+#: lib/rbot/core/auth.rb:770
 msgid "botuser %{dest} exists already"
 msgstr "botuser %{dest} exists already"
 
-#: lib/rbot/core/auth.rb:786
+#: lib/rbot/core/auth.rb:793
 msgid "botuser %{source} copied to %{dest}"
 msgstr "botuser %{source} copied to %{dest}"
 
-#: lib/rbot/core/auth.rb:789
+#: lib/rbot/core/auth.rb:796
 msgid "botuser %{source} renamed to %{dest}"
 msgstr "botuser %{source} renamed to %{dest}"
 
-#: lib/rbot/core/auth.rb:809
+#: lib/rbot/core/auth.rb:816
 msgid "selecting data to export ..."
 msgstr "selecting data to export ..."
 
-#: lib/rbot/core/auth.rb:825
+#: lib/rbot/core/auth.rb:832
 msgid "preparing data for export ..."
 msgstr "preparing data for export ..."
 
-#: lib/rbot/core/auth.rb:848
+#: lib/rbot/core/auth.rb:855
 msgid "failed to prepare data: %{exception}"
 msgstr "failed to prepare data: %{exception}"
 
-#: lib/rbot/core/auth.rb:853
+#: lib/rbot/core/auth.rb:860
 msgid "exporting to %{file} ..."
 msgstr "exporting to %{file} ..."
 
-#: lib/rbot/core/auth.rb:860
+#: lib/rbot/core/auth.rb:867
 msgid "failed to export users: %{exception}"
 msgstr "failed to export users: %{exception}"
 
-#: lib/rbot/core/auth.rb:864 lib/rbot/core/auth.rb:942
+#: lib/rbot/core/auth.rb:871 lib/rbot/core/auth.rb:949
 msgid "done"
 msgstr "done"
 
-#: lib/rbot/core/auth.rb:881
+#: lib/rbot/core/auth.rb:888
 msgid "reading %{file} ..."
 msgstr "reading %{file} ..."
 
-#: lib/rbot/core/auth.rb:885
+#: lib/rbot/core/auth.rb:892
 msgid "failed to import from: %{exception}"
 msgstr "failed to import from: %{exception}"
 
-#: lib/rbot/core/auth.rb:892
+#: lib/rbot/core/auth.rb:899
 msgid "selecting data to import ..."
 msgstr "selecting data to import ..."
 
-#: lib/rbot/core/auth.rb:902
+#: lib/rbot/core/auth.rb:909
 msgid "parsing data from import ..."
 msgstr "parsing data from import ..."
 
-#: lib/rbot/core/auth.rb:922
+#: lib/rbot/core/auth.rb:929
 msgid "failed to parse data: %{exception}"
 msgstr "failed to parse data: %{exception}"
 
@@ -638,10 +638,6 @@ msgid "hide => part all channels"
 msgstr "hide => part all channels"
 
 #: lib/rbot/core/basics.rb:117
-msgid "nick <nick> => attempt to change nick to <nick>"
-msgstr "nick <nick> => attempt to change nick to <nick>"
-
-#: lib/rbot/core/basics.rb:119
 msgid ""
 "say <channel>|<nick> <message> => say <message> to <channel> or in private "
 "message to <nick>"
@@ -649,7 +645,7 @@ msgstr ""
 "say <channel>|<nick> <message> => say <message> to <channel> or in private "
 "message to <nick>"
 
-#: lib/rbot/core/basics.rb:121
+#: lib/rbot/core/basics.rb:119
 msgid ""
 "action <channel>|<nick> <message> => does a /me <message> to <channel> or in "
 "private message to <nick>"
@@ -657,7 +653,7 @@ msgstr ""
 "action <channel>|<nick> <message> => does a /me <message> to <channel> or in "
 "private message to <nick>"
 
-#: lib/rbot/core/basics.rb:123
+#: lib/rbot/core/basics.rb:121
 msgid ""
 "quiet [in here|<channel>] => with no arguments, stop speaking in all "
 "channels, if \"in here\", stop speaking in this channel, or stop speaking in "
@@ -667,7 +663,7 @@ msgstr ""
 "channels, if \"in here\", stop speaking in this channel, or stop speaking in "
 "<channel>"
 
-#: lib/rbot/core/basics.rb:125
+#: lib/rbot/core/basics.rb:123
 msgid ""
 "talk [in here|<channel>] => with no arguments, resume speaking in all "
 "channels, if \"in here\", resume speaking in this channel, or resume "
@@ -677,11 +673,11 @@ msgstr ""
 "channels, if \"in here\", resume speaking in this channel, or resume "
 "speaking in <channel>"
 
-#: lib/rbot/core/basics.rb:127
+#: lib/rbot/core/basics.rb:125
 msgid "ping => replies with a pong"
 msgstr "ping => replies with a pong"
 
-#: lib/rbot/core/basics.rb:129
+#: lib/rbot/core/basics.rb:127
 msgid ""
 "mode <channel> <mode> <nicks> => set channel modes for <nicks> on <channel> "
 "to <mode>"
@@ -689,10 +685,11 @@ msgstr ""
 "mode <channel> <mode> <nicks> => set channel modes for <nicks> on <channel> "
 "to <mode>"
 
-#: lib/rbot/core/basics.rb:135
+#: lib/rbot/core/basics.rb:133
+#, fuzzy
 msgid ""
-"%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
-"quiet, talk, ping, mode"
+"%{name}: quit, restart, join, part, hide, save, say, action, topic, quiet, "
+"talk, ping, mode"
 msgstr ""
 "%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
 "quiet, talk,version, ping, mode"
@@ -761,7 +758,7 @@ msgstr "rescanning ..."
 msgid "done. %{plugin_status}"
 msgstr "done. %{plugin_status}"
 
-#: lib/rbot/core/config.rb:220
+#: lib/rbot/core/config.rb:221
 msgid ""
 "config list => list configuration modules, config list <module> => list "
 "configuration keys for module <module>"
@@ -769,25 +766,25 @@ msgstr ""
 "config list => list configuration modules, config list <module> => list "
 "configuration keys for module <module>"
 
-#: lib/rbot/core/config.rb:222
+#: lib/rbot/core/config.rb:223
 msgid "config get <key> => get configuration value for key <key>"
 msgstr "config get <key> => get configuration value for key <key>"
 
-#: lib/rbot/core/config.rb:224
+#: lib/rbot/core/config.rb:225
 msgid "reset key <key> to the default"
 msgstr "reset key <key> to the default"
 
-#: lib/rbot/core/config.rb:226
+#: lib/rbot/core/config.rb:227
 msgid ""
 "config set <key> <value> => set configuration value for key <key> to <value>"
 msgstr ""
 "config set <key> <value> => set configuration value for key <key> to <value>"
 
-#: lib/rbot/core/config.rb:228
+#: lib/rbot/core/config.rb:229
 msgid "config desc <key> => describe what key <key> configures"
 msgstr "config desc <key> => describe what key <key> configures"
 
-#: lib/rbot/core/config.rb:230
+#: lib/rbot/core/config.rb:231
 msgid ""
 "config add <value> to <key> => add value <value> to key <key> if <key> is an "
 "array"
@@ -795,7 +792,7 @@ msgstr ""
 "config add <value> to <key> => add value <value> to key <key> if <key> is an "
 "array"
 
-#: lib/rbot/core/config.rb:232
+#: lib/rbot/core/config.rb:233
 msgid ""
 "config rm <value> from <key> => remove value <value> from key <key> if <key> "
 "is an array"
@@ -803,7 +800,7 @@ msgstr ""
 "config rm <value> from <key> => remove value <value> from key <key> if <key> "
 "is an array"
 
-#: lib/rbot/core/config.rb:234
+#: lib/rbot/core/config.rb:235
 msgid ""
 "config module - bot configuration. usage: list, desc, get, set, unset, add, "
 "rm"
@@ -811,27 +808,27 @@ msgstr ""
 "config module - bot configuration. usage: list, desc, get, set, unset, add, "
 "rm"
 
-#: lib/rbot/core/config.rb:239
+#: lib/rbot/core/config.rb:240
 msgid "nick <newnick> => change the bot nick to <newnick>, if possible"
 msgstr "nick <nick> => attempt to change nick to <nick>"
 
-#: lib/rbot/core/config.rb:241
+#: lib/rbot/core/config.rb:242
 msgid "status => display some information on the bot's status"
 msgstr ""
 
-#: lib/rbot/core/config.rb:243
+#: lib/rbot/core/config.rb:244
 msgid "save => save current dynamic data and configuration"
 msgstr "save => save current dynamic data and configuration"
 
-#: lib/rbot/core/config.rb:245
+#: lib/rbot/core/config.rb:246
 msgid "rescan => reload modules and static facts"
 msgstr "rescan => reload modules and static facts"
 
-#: lib/rbot/core/config.rb:247
+#: lib/rbot/core/config.rb:248
 msgid "version => describes software version"
 msgstr "version => describes software version"
 
-#: lib/rbot/core/config.rb:249
+#: lib/rbot/core/config.rb:250
 msgid "config-related tasks: config, save, rescan, version, nick, status"
 msgstr "config-related tasks: config, save, rescan"
 
@@ -965,19 +962,19 @@ msgstr ""
 msgid "%{m} days"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1209
+#: lib/rbot/ircbot.rb:1233
 msgid "help topics: "
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1211
+#: lib/rbot/ircbot.rb:1235
 msgid " (help <topic> for more info)"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1214
+#: lib/rbot/ircbot.rb:1238
 msgid "no help for topic %{topic}"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1225
+#: lib/rbot/ircbot.rb:1249
 msgid ""
 "Uptime %{up}, %{plug} plugins active, %{sent} lines sent, %{recv} received."
 msgstr ""
@@ -1095,3 +1092,6 @@ msgstr ""
 #: lib/rbot/registry.rb:190
 msgid "marshal recovery failed, trying default"
 msgstr "marshal recovery failed, trying default"
+
+#~ msgid "nick <nick> => attempt to change nick to <nick>"
+#~ msgstr "nick <nick> => attempt to change nick to <nick>"
diff --git a/po/fr/rbot-nickrecover.po b/po/fr/rbot-nickrecover.po
new file mode 100644
index 00000000..1c0eff13
--- /dev/null
+++ b/po/fr/rbot-nickrecover.po
@@ -0,0 +1,36 @@
+# French translations for PACKAGE package.
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rbot\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
+"PO-Revision-Date: 2008-07-30 23:38+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: data/rbot/plugins/nickrecover.rb:24
+msgid ""
+"Time in seconds to wait between attempts to recover the nick. set to 0 to "
+"disable nick recovery."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:28
+msgid ""
+"the nickrecover plugin takes care of recovering the bot nick by trying to "
+"change nick until it succeeds."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:29
+msgid "the plugin waits irc.nick_retry seconds between attempts."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:30
+msgid "set irc.nick_retry to 0 to disable it."
+msgstr ""
diff --git a/po/fr/rbot.po b/po/fr/rbot.po
index 955b51eb..c5d6338a 100644
--- a/po/fr/rbot.po
+++ b/po/fr/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-07-07 18:02+0200\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
 "PO-Revision-Date: 2008-06-23 22:27+0100\n"
 "Last-Translator: Lagrange Marc <markocpc@gmail.com>\n"
 "Language-Team: French\n"
@@ -66,86 +66,86 @@ msgstr ""
 "Le reste de la configuration de rbot peut être manipulé via IRC une fois le "
 "bot connecté et vous authentifié."
 
-#: lib/rbot/core/auth.rb:69
+#: lib/rbot/core/auth.rb:76
 msgid "please do not use + or - in front of command %{command} when resetting"
 msgstr ""
 "veuillez ne pas utiliser + ou - au debut de la commande %{command} lors du "
 "reset"
 
-#: lib/rbot/core/auth.rb:71
+#: lib/rbot/core/auth.rb:78
 msgid "+ or - expected in front of %{string}"
 msgstr "+ ou - attendu au debut de %{string}"
 
-#: lib/rbot/core/auth.rb:84
+#: lib/rbot/core/auth.rb:91
 msgid "'%{string}' doesn't look like a channel name"
 msgstr "'%{string}' ne ressemble pas à un nom de salon"
 
-#: lib/rbot/core/auth.rb:93
+#: lib/rbot/core/auth.rb:100
 msgid "trailing comma"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:94
+#: lib/rbot/core/auth.rb:101
 msgid "you probably forgot a comma"
 msgstr "vous avez probablement oublié une virgule"
 
-#: lib/rbot/core/auth.rb:109 lib/rbot/core/auth.rb:163
-#: lib/rbot/core/auth.rb:229
+#: lib/rbot/core/auth.rb:116 lib/rbot/core/auth.rb:170
+#: lib/rbot/core/auth.rb:236
 msgid "couldn't find botuser %{name}"
 msgstr "l'utilisateur %{name} est introuvable"
 
-#: lib/rbot/core/auth.rb:111
+#: lib/rbot/core/auth.rb:118
 msgid "you can't change permissions for %{username}"
 msgstr "vous ne pouvez pas changer les permissions de %{username}"
 
-#: lib/rbot/core/auth.rb:118
+#: lib/rbot/core/auth.rb:125
 msgid "couldn't satisfy your request: %{errors}"
 msgstr "impossible de traiter votre requete: %{errors}"
 
-#: lib/rbot/core/auth.rb:157
+#: lib/rbot/core/auth.rb:164
 msgid "you are owner, you can do anything"
 msgstr "tu es le propriétaire, fais ce qu'il te plaît"
 
-#: lib/rbot/core/auth.rb:160
+#: lib/rbot/core/auth.rb:167
 msgid "owner can do anything"
 msgstr "le propriétaire peut tout faire"
 
-#: lib/rbot/core/auth.rb:171
+#: lib/rbot/core/auth.rb:178
 msgid "on any channel: "
 msgstr "sur nimporte quel salon: "
 
-#: lib/rbot/core/auth.rb:173
+#: lib/rbot/core/auth.rb:180
 msgid "in private: "
 msgstr "en privé: "
 
-#: lib/rbot/core/auth.rb:185
+#: lib/rbot/core/auth.rb:192
 msgid "no permissions set for %{user}"
 msgstr "aucunes permissions établies pour %{user}"
 
-#: lib/rbot/core/auth.rb:187
+#: lib/rbot/core/auth.rb:194
 msgid "permissions for %{user}:: %{permissions}"
 msgstr "permissions pour %{user}:: %{permissions}"
 
-#: lib/rbot/core/auth.rb:197
+#: lib/rbot/core/auth.rb:204
 msgid ". only %{max} will be shown"
 msgstr ". seulement %{max} sera affiché"
 
-#: lib/rbot/core/auth.rb:198
+#: lib/rbot/core/auth.rb:205
 msgid "%{count} commands found matching %{pattern}%{extra}"
 msgstr "%{count} commandes trouvés correspondant à %{pattern}%{extra}"
 
-#: lib/rbot/core/auth.rb:203
+#: lib/rbot/core/auth.rb:210
 msgid "%{cmd}: %{perms}"
 msgstr "%{cmd}: %{perms}"
 
-#: lib/rbot/core/auth.rb:260
+#: lib/rbot/core/auth.rb:267
 msgid "%{user} can already do that"
 msgstr "%{user} peut déjà faire ceci"
 
-#: lib/rbot/core/auth.rb:262
+#: lib/rbot/core/auth.rb:269
 msgid "%{user} can't do that already"
 msgstr "%{user} ne peut déja plus faire ceci"
 
-#: lib/rbot/core/auth.rb:272
+#: lib/rbot/core/auth.rb:279
 msgid ""
 "sorry, %{cmd} doesn't look like a valid command. maybe you misspelled it, or "
 "you need to specify it should be in private?"
@@ -153,35 +153,35 @@ msgstr ""
 "désolé, %{cmd} ne semble pas être une commande valide. l'avez vous mal "
 "écrite, ou vous avez besoin de le spécifier de préference en privé ?"
 
-#: lib/rbot/core/auth.rb:295
+#: lib/rbot/core/auth.rb:302
 msgid "welcome, %{user}"
 msgstr "bienvenue, %{user}"
 
-#: lib/rbot/core/auth.rb:310
+#: lib/rbot/core/auth.rb:317
 msgid "sorry, can't do"
 msgstr "désolé, je ne peux pas"
 
-#: lib/rbot/core/auth.rb:313
+#: lib/rbot/core/auth.rb:320
 msgid "couldn't login: %{exception}"
 msgstr "impossible de se loguer: %{exception}"
 
-#: lib/rbot/core/auth.rb:321
+#: lib/rbot/core/auth.rb:328
 msgid "I couldn't find anything to let you login automatically"
 msgstr "Je ne peux rien trouver pour vous loguer automatiquement"
 
-#: lib/rbot/core/auth.rb:332
+#: lib/rbot/core/auth.rb:339
 msgid "you are %{who}"
 msgstr "vous êtes %{who}"
 
-#: lib/rbot/core/auth.rb:334 lib/rbot/core/auth.rb:347
+#: lib/rbot/core/auth.rb:341 lib/rbot/core/auth.rb:354
 msgid "no one that I know"
 msgstr "pour autant que je sache"
 
-#: lib/rbot/core/auth.rb:335 lib/rbot/core/auth.rb:348
+#: lib/rbot/core/auth.rb:342 lib/rbot/core/auth.rb:355
 msgid "my boss"
 msgstr "mon patron"
 
-#: lib/rbot/core/auth.rb:355
+#: lib/rbot/core/auth.rb:362
 msgid ""
 "login [<botuser>] [<pass>]: logs in to the bot as botuser <botuser> with "
 "password <pass>. When using the full form, you must contact the bot in "
@@ -195,17 +195,17 @@ msgstr ""
 "ommis si <utilisateur> autorise le login-par-masque et votre netmask est "
 "connu par le bot. si <utilisateur> est ommis un autologin sera tenté"
 
-#: lib/rbot/core/auth.rb:357
+#: lib/rbot/core/auth.rb:364
 msgid "whoami: names the botuser you're linked to"
 msgstr "whoami: nomme l'tilisateur avec lequel vous êtes lié"
 
-#: lib/rbot/core/auth.rb:359
+#: lib/rbot/core/auth.rb:366
 msgid "who is <user>: names the botuser <user> is linked to"
 msgstr ""
 "who is <utilisateur>: donne le nom de l'utilisateur avec lequel "
 "<utilisateur> est lié"
 
-#: lib/rbot/core/auth.rb:363
+#: lib/rbot/core/auth.rb:370
 msgid ""
 "a permission is specified as module::path::to::cmd; when you want to enable "
 "it, prefix it with +; when you want to disable it, prefix it with -; when "
@@ -216,7 +216,7 @@ msgstr ""
 "la avec un - ; lorsque vous utilisez la commande +reset+, veuillez ne pas "
 "utiliser de prefixe"
 
-#: lib/rbot/core/auth.rb:365
+#: lib/rbot/core/auth.rb:372
 msgid ""
 "permissions [re]set <permission> [in <channel>] for <user>: sets or resets "
 "the permissions for botuser <user> in channel <channel> (use ? to change the "
@@ -226,13 +226,13 @@ msgstr ""
 "remet à zero les permissions pour un utilisateur <utilisateur> sur le salon "
 "<salon> (utilisez ? pour changer les permissions en privées)"
 
-#: lib/rbot/core/auth.rb:367
+#: lib/rbot/core/auth.rb:374
 msgid "permissions view [for <user>]: display the permissions for user <user>"
 msgstr ""
 "permissions view [for <utilisateur>]: affiche les permissions de "
 "l'utilisateur <utilisateur>"
 
-#: lib/rbot/core/auth.rb:369
+#: lib/rbot/core/auth.rb:376
 msgid ""
 "permissions search <pattern>: display the permissions associated with the "
 "commands matching <pattern>"
@@ -240,11 +240,11 @@ msgstr ""
 "permissions search <pattern>: affiche les permissions associés avec la "
 "commande correspondant à <pattern>"
 
-#: lib/rbot/core/auth.rb:371
+#: lib/rbot/core/auth.rb:378
 msgid "permission topics: syntax, (re)set, view, search"
 msgstr "sujets de permissions: syntax, (re)set, view"
 
-#: lib/rbot/core/auth.rb:376
+#: lib/rbot/core/auth.rb:383
 msgid ""
 "user show <what> : shows info about the user; <what> can be any of "
 "autologin, login-by-mask, netmasks"
@@ -252,14 +252,14 @@ msgstr ""
 "user show <qui> : affiche les informations à propos de l'utilisateur; <qui> "
 "peuvent être  autologin, login-by-mask, netmasks"
 
-#: lib/rbot/core/auth.rb:378
+#: lib/rbot/core/auth.rb:385
 msgid ""
 "user enable|disable <what> : turns on or off <what> (autologin, login-by-"
 "mask)"
 msgstr ""
 "user enable|disable <qui> : met on ou off <quit> (autologin, login-by-mask)"
 
-#: lib/rbot/core/auth.rb:380
+#: lib/rbot/core/auth.rb:387
 msgid ""
 "user set password <blah> : sets the user password to <blah>; passwords can "
 "only contain upper and lowercase letters and numbers, and must be at least 4 "
@@ -269,7 +269,7 @@ msgstr ""
 "le mot de passe ne peut contenir que des lettres minuscules et majuscules "
 "ainsi que des nombres, et doit être supérieur à 4 caracteres"
 
-#: lib/rbot/core/auth.rb:382
+#: lib/rbot/core/auth.rb:389
 msgid ""
 "user add|rm netmask <mask> : adds/removes netmask <mask> from the list of "
 "netmasks known to the botuser you're linked to"
@@ -277,7 +277,7 @@ msgstr ""
 "user add|rm netmask <masque> : ajoute/supprime le netmask <masque> depuis la "
 "liste des netmask connus de votre utilisateur"
 
-#: lib/rbot/core/auth.rb:384
+#: lib/rbot/core/auth.rb:391
 msgid ""
 "user reset <what> : resets <what> to the default values. <what> can be "
 "+netmasks+ (the list will be emptied), +autologin+ or +login-by-mask+ (will "
@@ -289,7 +289,7 @@ msgstr ""
 "sera remis à zero) ou +password+ (un nouveau sera régénéré et vous sera "
 "donné en privé)"
 
-#: lib/rbot/core/auth.rb:386
+#: lib/rbot/core/auth.rb:393
 msgid ""
 "user tell <who> the password for <botuser> : contacts <who> in private to "
 "tell him/her the password for <botuser>"
@@ -297,7 +297,7 @@ msgstr ""
 "user tell <who> the password for <botuser> : contacte <who> en privé pour "
 "lui donner le mot de passe de <botuser>"
 
-#: lib/rbot/core/auth.rb:388
+#: lib/rbot/core/auth.rb:395
 msgid ""
 "user create <name> <password> : create botuser named <name> with password "
 "<password>. The password can be omitted, in which case a random one will be "
@@ -309,11 +309,11 @@ msgstr ""
 "mot de passe alléatoire sera généré. Le <nom> devrait seulement contenir des "
 "caracteres alphanumeriques ou un underscore (_)"
 
-#: lib/rbot/core/auth.rb:390
+#: lib/rbot/core/auth.rb:397
 msgid "user list : lists all the botusers"
 msgstr "user list : liste tous les utilisateurs"
 
-#: lib/rbot/core/auth.rb:392
+#: lib/rbot/core/auth.rb:399
 msgid ""
 "user destroy <botuser> : destroys <botuser>. This function %{highlight}must%"
 "{highlight} be called in two steps. On the first call <botuser> is queued "
@@ -328,7 +328,7 @@ msgstr ""
 "mot de passe pour <utilisateur>, et il sera detruit. Si vous voulez annuler "
 "la destruction, utilise cette commande +user cancel destroy <utilisateur>+"
 
-#: lib/rbot/core/auth.rb:394
+#: lib/rbot/core/auth.rb:401
 msgid ""
 "user topics: show, enable|disable, add|rm netmask, set, reset, tell, create, "
 "list, destroy"
@@ -336,7 +336,7 @@ msgstr ""
 "sujets utilisateur: show, enable|disable, add|rm netmask, set, reset, tell, "
 "create, list, destroy"
 
-#: lib/rbot/core/auth.rb:397
+#: lib/rbot/core/auth.rb:404
 msgid ""
 "auth <masterpassword>: log in as the bot owner; other commands: login, "
 "whoami, permissions syntax, permissions [re]set, permissions view, user, "
@@ -346,7 +346,7 @@ msgstr ""
 "commandes: login, whoami, permission syntax, permissions [re]set, "
 "permissions view, user"
 
-#: lib/rbot/core/auth.rb:399
+#: lib/rbot/core/auth.rb:406
 msgid ""
 "meet <nick> [as <user>]: creates a bot user for nick, calling it user "
 "(defaults to the nick itself)"
@@ -354,11 +354,11 @@ msgstr ""
 "meet <pseudo> [<utilisateur>]: crée un utilisateur nommé pseudo, appellé "
 "<utilisateur> (par defaut le pseudo est utilisé)"
 
-#: lib/rbot/core/auth.rb:401
+#: lib/rbot/core/auth.rb:408
 msgid "hello: creates a bot user for the person issuing the command"
 msgstr "hello: crée un utilisateur pour la personne ayant tapé la commande"
 
-#: lib/rbot/core/auth.rb:403
+#: lib/rbot/core/auth.rb:410
 msgid ""
 "allow <user> to do <sample command> [<where>]: gives botuser <user> the "
 "permissions to execute a command such as the provided sample command (in "
@@ -368,7 +368,7 @@ msgstr ""
 "l'utilisateur <utilisateur> la permission d'executer une commande tel que "
 "l'exemple (en privé ou sur un salon, selon l'option <où>)"
 
-#: lib/rbot/core/auth.rb:405
+#: lib/rbot/core/auth.rb:412
 msgid ""
 "deny <user> from doing <sample command> [<where>]: removes from botuser "
 "<user> the permissions to execute a command such as the provided sample "
@@ -378,7 +378,7 @@ msgstr ""
 "l'utilisateur <utilisateur> la permission d'executer une commande comme "
 "l'exemple (en privé ou sur un salon, selon l'option <où>)"
 
-#: lib/rbot/core/auth.rb:407
+#: lib/rbot/core/auth.rb:414
 msgid ""
 "auth commands: auth, login, whoami, who, permission[s], user, meet, hello, "
 "allow, deny"
@@ -386,103 +386,103 @@ msgstr ""
 "commandes d'auth: auth, login, whoami, who, permission[s], user, meet, "
 "hello, allow, deny"
 
-#: lib/rbot/core/auth.rb:412
+#: lib/rbot/core/auth.rb:419
 msgid "sorry, I need more arguments to %{command}"
 msgstr "désolé, j'ai besoin de plus d'arguments pour %{command}"
 
-#: lib/rbot/core/auth.rb:416
+#: lib/rbot/core/auth.rb:423
 msgid "I can only %{command} these: %{arguments}"
 msgstr "Je peux seulement %{command} avec: %{arguments}"
 
-#: lib/rbot/core/auth.rb:451
+#: lib/rbot/core/auth.rb:458
 msgid "no such bot user %{user}"
 msgstr "aucun utilisateur %{user}"
 
-#: lib/rbot/core/auth.rb:454
+#: lib/rbot/core/auth.rb:461
 msgid "you can't mess with %{user}"
 msgstr "vous ne pouvez pas le bricoler avec un %{user}"
 
-#: lib/rbot/core/auth.rb:466
+#: lib/rbot/core/auth.rb:473
 msgid "you can't see the properties of %{user}"
 msgstr "vous ne pouvez pas voir la propriété de %{user}"
 
-#: lib/rbot/core/auth.rb:475
+#: lib/rbot/core/auth.rb:482
 msgid "no way I'm telling you the master password!"
 msgstr "aucune chance que je vous dise le mot de passe du maitre!"
 
-#: lib/rbot/core/auth.rb:476
+#: lib/rbot/core/auth.rb:483
 msgid "you can't ask for someone else's password"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:478
+#: lib/rbot/core/auth.rb:485
 msgid ""
 "c'mon, you can't be asking me seriously to tell you the password in public!"
 msgstr ""
 "voyons, soyons sérieux, vous ne pouvez pas me demander de dire le mot de "
 "passe en publique !"
 
-#: lib/rbot/core/auth.rb:479
+#: lib/rbot/core/auth.rb:486
 msgid "the password for %{user} is %{password}"
 msgstr "le mot de passe de %{user} est %{password}"
 
-#: lib/rbot/core/auth.rb:493
+#: lib/rbot/core/auth.rb:500
 msgid "can %{action}"
 msgstr "faire %{action}"
 
-#: lib/rbot/core/auth.rb:495
+#: lib/rbot/core/auth.rb:502
 msgid "can not %{action}"
 msgstr "impossible de %{action}"
 
-#: lib/rbot/core/auth.rb:499
+#: lib/rbot/core/auth.rb:506
 msgid "knows no netmasks"
 msgstr "aucun netmasks connus"
 
-#: lib/rbot/core/auth.rb:501
+#: lib/rbot/core/auth.rb:508
 msgid "knows %{netmasks}"
 msgstr "connus %{netmasks}"
 
-#: lib/rbot/core/auth.rb:508 lib/rbot/core/auth.rb:535
-#: lib/rbot/core/auth.rb:553 lib/rbot/core/auth.rb:585
+#: lib/rbot/core/auth.rb:515 lib/rbot/core/auth.rb:542
+#: lib/rbot/core/auth.rb:560 lib/rbot/core/auth.rb:592
 msgid "you can't change the default user"
 msgstr "vous ne pouvez changer l'utilisateur par default"
 
-#: lib/rbot/core/auth.rb:509 lib/rbot/core/auth.rb:537
-#: lib/rbot/core/auth.rb:555 lib/rbot/core/auth.rb:587
+#: lib/rbot/core/auth.rb:516 lib/rbot/core/auth.rb:544
+#: lib/rbot/core/auth.rb:562 lib/rbot/core/auth.rb:594
 msgid "you can't edit %{user}"
 msgstr "vous ne pouvez pas éditer %{user}"
 
-#: lib/rbot/core/auth.rb:524 lib/rbot/core/auth.rb:571
+#: lib/rbot/core/auth.rb:531 lib/rbot/core/auth.rb:578
 msgid "I ignored %{things} because %{reason}"
 msgstr "J'ai ignoré %{things} a cause de %{reason}"
 
-#: lib/rbot/core/auth.rb:528 lib/rbot/core/auth.rb:575
+#: lib/rbot/core/auth.rb:535 lib/rbot/core/auth.rb:582
 msgid "I haven't changed anything"
 msgstr "Je n'ai rien changé"
 
-#: lib/rbot/core/auth.rb:546
+#: lib/rbot/core/auth.rb:553
 msgid "is that a joke? setting the password in public?"
 msgstr "c'est une blague? établir le mot de passe en public?"
 
-#: lib/rbot/core/auth.rb:578
+#: lib/rbot/core/auth.rb:585
 msgid "the password for %{user} is now %{password}"
 msgstr "le mot de passe de %{user} est maintenant %{password}"
 
-#: lib/rbot/core/auth.rb:592
+#: lib/rbot/core/auth.rb:599
 msgid ""
 "I can only add/remove netmasks. See +help user add+ for more instructions"
 msgstr ""
 "Je peux seulement ajouter/supprimer des netmasks. Voyez +help user add+ pour "
 "plus d'instructions"
 
-#: lib/rbot/core/auth.rb:613
+#: lib/rbot/core/auth.rb:620
 msgid "sorry, I don't know how to %{request}"
 msgstr "désolé, je ne sais pas comment %{request}"
 
-#: lib/rbot/core/auth.rb:616
+#: lib/rbot/core/auth.rb:623
 msgid "couldn't %{cmd}: %{exception}"
 msgstr "impossible %{cmd}: %{exception}"
 
-#: lib/rbot/core/auth.rb:645
+#: lib/rbot/core/auth.rb:652
 msgid ""
 "you are now registered as %{buname}. I created a random password for you : %"
 "{pass} and you can change it at any time by telling me 'user set password "
@@ -492,73 +492,73 @@ msgstr ""
 "alleatoire pour vous: %{pass} vous pouvez le changer n'importe quand en me "
 "disant 'user set password <mot de passe>' en privé"
 
-#: lib/rbot/core/auth.rb:652
+#: lib/rbot/core/auth.rb:659
 msgid "but I already know %{buname}"
 msgstr "mais aussi connu sous %{buname}"
 
-#: lib/rbot/core/auth.rb:654
+#: lib/rbot/core/auth.rb:661
 msgid "I had problems meeting %{nick}: %{e}"
 msgstr "J'ai des problèmes pour rencontrer %{nick}: %{e}"
 
-#: lib/rbot/core/auth.rb:663
+#: lib/rbot/core/auth.rb:670
 msgid "couldn't find botuser %{user}"
 msgstr "impossible de trouver l'utilisateur %{user}"
 
-#: lib/rbot/core/auth.rb:665
+#: lib/rbot/core/auth.rb:672
 msgid "I'm not telling the master password to anyone, pal"
 msgstr "Je ne donne pas le mot de passe à n'importe qui, mon ami"
 
-#: lib/rbot/core/auth.rb:666
+#: lib/rbot/core/auth.rb:673
 msgid "the password for botuser %{user} is %{password}"
 msgstr "le mot de passe de l'utilisateur %{user} est %{password}"
 
-#: lib/rbot/core/auth.rb:669
+#: lib/rbot/core/auth.rb:676
 msgid "I told %{user} that %{message}"
 msgstr "Je viens de dire à %{user} ce message: %{message}"
 
-#: lib/rbot/core/auth.rb:675
+#: lib/rbot/core/auth.rb:682
 msgid "are you nuts, creating a botuser with a publicly known password?"
 msgstr "est tu fou?, créer un utilisateur avec un mot de passe publique?"
 
-#: lib/rbot/core/auth.rb:680
+#: lib/rbot/core/auth.rb:687
 msgid "failed to create %{user}: %{exception}"
 msgstr "impossible de créer %{user}: %{exception}"
 
-#: lib/rbot/core/auth.rb:684
+#: lib/rbot/core/auth.rb:691
 msgid "created botuser %{user}"
 msgstr "utilisateur crée %{user}"
 
-#: lib/rbot/core/auth.rb:692
+#: lib/rbot/core/auth.rb:699
 msgid " (queued for destruction)"
 msgstr " (dans la queue de destruction)"
 
-#: lib/rbot/core/auth.rb:695
+#: lib/rbot/core/auth.rb:702
 msgid "I have no botusers other than the default ones"
 msgstr "Je n'ai aucun utilisateurs autres que celui de defaut"
 
-#: lib/rbot/core/auth.rb:696
+#: lib/rbot/core/auth.rb:703
 msgid "botuser: %{list}"
 msgid_plural "botusers: %{list}"
 msgstr[0] "utilisateur: %{list}"
 msgstr[1] "utilisateurs: %{list}"
 
-#: lib/rbot/core/auth.rb:703
+#: lib/rbot/core/auth.rb:710
 msgid "You can't destroy %{user}"
 msgstr "Vous ne pouvez detruire %{user}"
 
-#: lib/rbot/core/auth.rb:713
+#: lib/rbot/core/auth.rb:720
 msgid "no such botuser %{user}"
 msgstr "aucun utilisateur %{user}"
 
-#: lib/rbot/core/auth.rb:720
+#: lib/rbot/core/auth.rb:727
 msgid "%{user} removed from the destruction queue"
 msgstr "%{user} supprimé de la queue de destruction"
 
-#: lib/rbot/core/auth.rb:722
+#: lib/rbot/core/auth.rb:729
 msgid "%{user} was not queued for destruction"
 msgstr "%{user} n'est pas dans la queue de destruction"
 
-#: lib/rbot/core/auth.rb:727
+#: lib/rbot/core/auth.rb:734
 msgid ""
 "%{user} already queued for destruction, use %{highlight}user confirm destroy "
 "%{user}%{highlight} to destroy it"
@@ -566,7 +566,7 @@ msgstr ""
 "%{user} est déjà dans la queue de destruction, utilise %{highlight}user "
 "destroy %{user} <mot de passe>%{highlight} pour le detruire"
 
-#: lib/rbot/core/auth.rb:730
+#: lib/rbot/core/auth.rb:737
 msgid ""
 "%{user} queued for destruction, use %{highlight}user confirm destroy %{user}%"
 "{highlight} to destroy it"
@@ -574,79 +574,79 @@ msgstr ""
 "%{user} a été mis dans la queue de destruction, utilise %{highlight}user "
 "destroy %{user} <mot de passe>%{highlight} pour le detruire"
 
-#: lib/rbot/core/auth.rb:734
+#: lib/rbot/core/auth.rb:741
 msgid "%{user} is not queued for destruction yet"
 msgstr "%{user} n'est pas encore dans la queue de destruction"
 
-#: lib/rbot/core/auth.rb:743 lib/rbot/core/auth.rb:783
+#: lib/rbot/core/auth.rb:750 lib/rbot/core/auth.rb:790
 msgid "failed: %{exception}"
 msgstr "echec: %{exception}"
 
-#: lib/rbot/core/auth.rb:745
+#: lib/rbot/core/auth.rb:752
 msgid "botuser %{user} destroyed"
 msgstr "utilisateur %{user} detruit"
 
-#: lib/rbot/core/auth.rb:752
+#: lib/rbot/core/auth.rb:759
 msgid "please don't touch the default users"
 msgstr "veuillez ne pas toucher aux utilisateurs par defaut"
 
-#: lib/rbot/core/auth.rb:761
+#: lib/rbot/core/auth.rb:768
 msgid "no such botuser %{source}"
 msgstr "aucun utilisateur %{source}"
 
-#: lib/rbot/core/auth.rb:763
+#: lib/rbot/core/auth.rb:770
 msgid "botuser %{dest} exists already"
 msgstr "utilisateur %{dest} existe déjà"
 
-#: lib/rbot/core/auth.rb:786
+#: lib/rbot/core/auth.rb:793
 msgid "botuser %{source} copied to %{dest}"
 msgstr "utilisateur %{source} copié vers %{dest}"
 
-#: lib/rbot/core/auth.rb:789
+#: lib/rbot/core/auth.rb:796
 msgid "botuser %{source} renamed to %{dest}"
 msgstr "utilisateur %{source} renommé vers %{dest}"
 
-#: lib/rbot/core/auth.rb:809
+#: lib/rbot/core/auth.rb:816
 msgid "selecting data to export ..."
 msgstr "selection des données à exporter ..."
 
-#: lib/rbot/core/auth.rb:825
+#: lib/rbot/core/auth.rb:832
 msgid "preparing data for export ..."
 msgstr "préparation des données à exporter ..."
 
-#: lib/rbot/core/auth.rb:848
+#: lib/rbot/core/auth.rb:855
 msgid "failed to prepare data: %{exception}"
 msgstr "échec de la préparation des données: %{exception}"
 
-#: lib/rbot/core/auth.rb:853
+#: lib/rbot/core/auth.rb:860
 msgid "exporting to %{file} ..."
 msgstr "exportation vers %{file} ..."
 
-#: lib/rbot/core/auth.rb:860
+#: lib/rbot/core/auth.rb:867
 msgid "failed to export users: %{exception}"
 msgstr "échec de l'export des utilisateurs: %{exception}"
 
-#: lib/rbot/core/auth.rb:864 lib/rbot/core/auth.rb:942
+#: lib/rbot/core/auth.rb:871 lib/rbot/core/auth.rb:949
 msgid "done"
 msgstr "terminé"
 
-#: lib/rbot/core/auth.rb:881
+#: lib/rbot/core/auth.rb:888
 msgid "reading %{file} ..."
 msgstr "lecture %{file} ..."
 
-#: lib/rbot/core/auth.rb:885
+#: lib/rbot/core/auth.rb:892
 msgid "failed to import from: %{exception}"
 msgstr "échec de l'import depuis: %{exception}"
 
-#: lib/rbot/core/auth.rb:892
+#: lib/rbot/core/auth.rb:899
 msgid "selecting data to import ..."
 msgstr "sélection des données à importer ..."
 
-#: lib/rbot/core/auth.rb:902
+#: lib/rbot/core/auth.rb:909
 msgid "parsing data from import ..."
 msgstr "analyse des données à importer ..."
 
-#: lib/rbot/core/auth.rb:922
+#: lib/rbot/core/auth.rb:929
 msgid "failed to parse data: %{exception}"
 msgstr "echec de l'analyse des données: %{exception}"
 
@@ -669,10 +669,6 @@ msgid "hide => part all channels"
 msgstr "hide =>quitte tous les salons"
 
 #: lib/rbot/core/basics.rb:117
-msgid "nick <nick> => attempt to change nick to <nick>"
-msgstr "nick <nick> => essaye de changer le pseudo en <nick>"
-
-#: lib/rbot/core/basics.rb:119
 msgid ""
 "say <channel>|<nick> <message> => say <message> to <channel> or in private "
 "message to <nick>"
@@ -680,7 +676,7 @@ msgstr ""
 "say <channel>|<nick> <message> => dire <message> sur <channel> ou message "
 "privé à <nick>"
 
-#: lib/rbot/core/basics.rb:121
+#: lib/rbot/core/basics.rb:119
 msgid ""
 "action <channel>|<nick> <message> => does a /me <message> to <channel> or in "
 "private message to <nick>"
@@ -688,7 +684,7 @@ msgstr ""
 "action <channel>|<nick> <message> => équivaut à un /me <message> sur "
 "<channel> ou en message privé à <nick>"
 
-#: lib/rbot/core/basics.rb:123
+#: lib/rbot/core/basics.rb:121
 msgid ""
 "quiet [in here|<channel>] => with no arguments, stop speaking in all "
 "channels, if \"in here\", stop speaking in this channel, or stop speaking in "
@@ -697,7 +693,7 @@ msgstr ""
 "quiet [in here|<channel>] => sans arguments, silencieux sur tous les salons, "
 "si \"in here\", silencieux sur ce salon ou dans le <channel>"
 
-#: lib/rbot/core/basics.rb:125
+#: lib/rbot/core/basics.rb:123
 msgid ""
 "talk [in here|<channel>] => with no arguments, resume speaking in all "
 "channels, if \"in here\", resume speaking in this channel, or resume "
@@ -707,11 +703,11 @@ msgstr ""
 "tous les salons, si \"in here\", reprend la conversation ici ou dans le "
 "<channel>"
 
-#: lib/rbot/core/basics.rb:127
+#: lib/rbot/core/basics.rb:125
 msgid "ping => replies with a pong"
 msgstr "ping => repond avec un pong"
 
-#: lib/rbot/core/basics.rb:129
+#: lib/rbot/core/basics.rb:127
 msgid ""
 "mode <channel> <mode> <nicks> => set channel modes for <nicks> on <channel> "
 "to <mode>"
@@ -719,10 +715,11 @@ msgstr ""
 "mode <channel> <mode> <nicks> => établit les modes du salon pour <nicks> sur "
 "<channel> vers <mode>"
 
-#: lib/rbot/core/basics.rb:135
+#: lib/rbot/core/basics.rb:133
+#, fuzzy
 msgid ""
-"%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
-"quiet, talk, ping, mode"
+"%{name}: quit, restart, join, part, hide, save, say, action, topic, quiet, "
+"talk, ping, mode"
 msgstr ""
 "%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
 "quiet, talk,version, ping, mode"
@@ -791,7 +788,7 @@ msgstr "rafraîchit ..."
 msgid "done. %{plugin_status}"
 msgstr "terminé. %{plugin_status}"
 
-#: lib/rbot/core/config.rb:220
+#: lib/rbot/core/config.rb:221
 msgid ""
 "config list => list configuration modules, config list <module> => list "
 "configuration keys for module <module>"
@@ -799,24 +796,24 @@ msgstr ""
 "config list => liste de la configuration des modules, config list <module> "
 "=> liste des clés de configuration du module <module>"
 
-#: lib/rbot/core/config.rb:222
+#: lib/rbot/core/config.rb:223
 msgid "config get <key> => get configuration value for key <key>"
 msgstr "config get <clé> => obtient la valeur de la <clé>"
 
-#: lib/rbot/core/config.rb:224
+#: lib/rbot/core/config.rb:225
 msgid "reset key <key> to the default"
 msgstr "reset key <clé> remet la clé à sa valeur d'origine"
 
-#: lib/rbot/core/config.rb:226
+#: lib/rbot/core/config.rb:227
 msgid ""
 "config set <key> <value> => set configuration value for key <key> to <value>"
 msgstr "config set <clé> <valeur> => enregistre la <valeur> de la <clé>"
 
-#: lib/rbot/core/config.rb:228
+#: lib/rbot/core/config.rb:229
 msgid "config desc <key> => describe what key <key> configures"
 msgstr "config desc <clé> => décris ce que la <clé> configure"
 
-#: lib/rbot/core/config.rb:230
+#: lib/rbot/core/config.rb:231
 msgid ""
 "config add <value> to <key> => add value <value> to key <key> if <key> is an "
 "array"
@@ -824,7 +821,7 @@ msgstr ""
 "config add <valeur> to <clé> => ajoute la <valeur> à la <clé> si <clé> est "
 "un tableau"
 
-#: lib/rbot/core/config.rb:232
+#: lib/rbot/core/config.rb:233
 msgid ""
 "config rm <value> from <key> => remove value <value> from key <key> if <key> "
 "is an array"
@@ -832,7 +829,7 @@ msgstr ""
 "config rm <valeur> from <clé> => supprime la <valeur> de la <clé> si <clé> "
 "est un tableau"
 
-#: lib/rbot/core/config.rb:234
+#: lib/rbot/core/config.rb:235
 msgid ""
 "config module - bot configuration. usage: list, desc, get, set, unset, add, "
 "rm"
@@ -840,29 +837,29 @@ msgstr ""
 "config module - configuration du bot. utilisation: list, desc, get, set, "
 "unset, add, rm"
 
-#: lib/rbot/core/config.rb:239
+#: lib/rbot/core/config.rb:240
 msgid "nick <newnick> => change the bot nick to <newnick>, if possible"
 msgstr "nick <pseudo> => change le pseudo en <pseudo>"
 
-#: lib/rbot/core/config.rb:241
+#: lib/rbot/core/config.rb:242
 msgid "status => display some information on the bot's status"
 msgstr "status => affiche quelques informations sur le status du bot"
 
-#: lib/rbot/core/config.rb:243
+#: lib/rbot/core/config.rb:244
 msgid "save => save current dynamic data and configuration"
 msgstr ""
 "save => sauvegarde les données dynamiques courantes et les données de "
 "configuration"
 
-#: lib/rbot/core/config.rb:245
+#: lib/rbot/core/config.rb:246
 msgid "rescan => reload modules and static facts"
 msgstr "rescan => recharge les modules et les definitions statiques"
 
-#: lib/rbot/core/config.rb:247
+#: lib/rbot/core/config.rb:248
 msgid "version => describes software version"
 msgstr "version => affiche la version logicielle"
 
-#: lib/rbot/core/config.rb:249
+#: lib/rbot/core/config.rb:250
 msgid "config-related tasks: config, save, rescan, version, nick, status"
 msgstr "taches de configuration similaire: config, save, rescan"
 
@@ -999,19 +996,19 @@ msgstr ""
 msgid "%{m} days"
 msgstr "jours"
 
-#: lib/rbot/ircbot.rb:1209
+#: lib/rbot/ircbot.rb:1233
 msgid "help topics: "
 msgstr "sujets d'aide: "
 
-#: lib/rbot/ircbot.rb:1211
+#: lib/rbot/ircbot.rb:1235
 msgid " (help <topic> for more info)"
 msgstr "(help <sujet> pour plus d'informations)"
 
-#: lib/rbot/ircbot.rb:1214
+#: lib/rbot/ircbot.rb:1238
 msgid "no help for topic %{topic}"
 msgstr "aucune aide pour le sujet %{topic}"
 
-#: lib/rbot/ircbot.rb:1225
+#: lib/rbot/ircbot.rb:1249
 msgid ""
 "Uptime %{up}, %{plug} plugins active, %{sent} lines sent, %{recv} received."
 msgstr ""
@@ -1131,3 +1128,6 @@ msgstr ""
 #: lib/rbot/registry.rb:190
 msgid "marshal recovery failed, trying default"
 msgstr "la tentative de récuperation marshal a échoué, essai des defauts"
+
+#~ msgid "nick <nick> => attempt to change nick to <nick>"
+#~ msgstr "nick <nick> => essaye de changer le pseudo en <nick>"
diff --git a/po/it/rbot-nickrecover.po b/po/it/rbot-nickrecover.po
new file mode 100644
index 00000000..5bd595b1
--- /dev/null
+++ b/po/it/rbot-nickrecover.po
@@ -0,0 +1,36 @@
+# Italian translations for PACKAGE package.
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rbot\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
+"PO-Revision-Date: 2008-07-30 23:38+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: data/rbot/plugins/nickrecover.rb:24
+msgid ""
+"Time in seconds to wait between attempts to recover the nick. set to 0 to "
+"disable nick recovery."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:28
+msgid ""
+"the nickrecover plugin takes care of recovering the bot nick by trying to "
+"change nick until it succeeds."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:29
+msgid "the plugin waits irc.nick_retry seconds between attempts."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:30
+msgid "set irc.nick_retry to 0 to disable it."
+msgstr ""
diff --git a/po/it/rbot.po b/po/it/rbot.po
index 6606d715..742365dc 100644
--- a/po/it/rbot.po
+++ b/po/it/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-07-07 18:02+0200\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
 "PO-Revision-Date: 2008-06-26 14:50+0200\n"
 "Last-Translator: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>\n"
 "Language-Team: it\n"
@@ -64,84 +64,84 @@ msgstr ""
 "Il resto della configurazione di rbot può essere manipolata da IRC quando "
 "rbot è connesso e ti sei identificato"
 
-#: lib/rbot/core/auth.rb:69
+#: lib/rbot/core/auth.rb:76
 msgid "please do not use + or - in front of command %{command} when resetting"
 msgstr "non usare + o - davanti al comando %{command} per il reset"
 
-#: lib/rbot/core/auth.rb:71
+#: lib/rbot/core/auth.rb:78
 msgid "+ or - expected in front of %{string}"
 msgstr "+ o - atteso prima di %{string}"
 
-#: lib/rbot/core/auth.rb:84
+#: lib/rbot/core/auth.rb:91
 msgid "'%{string}' doesn't look like a channel name"
 msgstr "'%{string}' non sembra il nome di un canale"
 
-#: lib/rbot/core/auth.rb:93
+#: lib/rbot/core/auth.rb:100
 msgid "trailing comma"
 msgstr "virgola in più"
 
-#: lib/rbot/core/auth.rb:94
+#: lib/rbot/core/auth.rb:101
 msgid "you probably forgot a comma"
 msgstr "probabilmente hai dimenticato una virgola"
 
-#: lib/rbot/core/auth.rb:109 lib/rbot/core/auth.rb:163
-#: lib/rbot/core/auth.rb:229
+#: lib/rbot/core/auth.rb:116 lib/rbot/core/auth.rb:170
+#: lib/rbot/core/auth.rb:236
 msgid "couldn't find botuser %{name}"
 msgstr "impossibile trovare il botuser %{name}"
 
-#: lib/rbot/core/auth.rb:111
+#: lib/rbot/core/auth.rb:118
 msgid "you can't change permissions for %{username}"
 msgstr "non puoi cambiare i permessi di %{username}"
 
-#: lib/rbot/core/auth.rb:118
+#: lib/rbot/core/auth.rb:125
 msgid "couldn't satisfy your request: %{errors}"
 msgstr "impossibile soddisfare la richiesta: %{errors}"
 
-#: lib/rbot/core/auth.rb:157
+#: lib/rbot/core/auth.rb:164
 msgid "you are owner, you can do anything"
 msgstr "sei il padrone, puoi fare tutto"
 
-#: lib/rbot/core/auth.rb:160
+#: lib/rbot/core/auth.rb:167
 msgid "owner can do anything"
 msgstr "il padrone può fare tutto"
 
-#: lib/rbot/core/auth.rb:171
+#: lib/rbot/core/auth.rb:178
 msgid "on any channel: "
 msgstr "su tutti i canali: "
 
-#: lib/rbot/core/auth.rb:173
+#: lib/rbot/core/auth.rb:180
 msgid "in private: "
 msgstr "in privato: "
 
-#: lib/rbot/core/auth.rb:185
+#: lib/rbot/core/auth.rb:192
 msgid "no permissions set for %{user}"
 msgstr "nessun permesso impostato per %{user}"
 
-#: lib/rbot/core/auth.rb:187
+#: lib/rbot/core/auth.rb:194
 msgid "permissions for %{user}:: %{permissions}"
 msgstr "permessi per %{user}:: %{permissions}"
 
-#: lib/rbot/core/auth.rb:197
+#: lib/rbot/core/auth.rb:204
 msgid ". only %{max} will be shown"
 msgstr ". solo %{max} verranno mostrati"
 
-#: lib/rbot/core/auth.rb:198
+#: lib/rbot/core/auth.rb:205
 msgid "%{count} commands found matching %{pattern}%{extra}"
 msgstr "%{count} comandi trovati corrispondenti a %{pattern}%{extra}"
 
-#: lib/rbot/core/auth.rb:203
+#: lib/rbot/core/auth.rb:210
 msgid "%{cmd}: %{perms}"
 msgstr "%{cmd}: %{perms}"
 
-#: lib/rbot/core/auth.rb:260
+#: lib/rbot/core/auth.rb:267
 msgid "%{user} can already do that"
 msgstr "%{user} può già farlo"
 
-#: lib/rbot/core/auth.rb:262
+#: lib/rbot/core/auth.rb:269
 msgid "%{user} can't do that already"
 msgstr "%{user} già non può farlo"
 
-#: lib/rbot/core/auth.rb:272
+#: lib/rbot/core/auth.rb:279
 msgid ""
 "sorry, %{cmd} doesn't look like a valid command. maybe you misspelled it, or "
 "you need to specify it should be in private?"
@@ -149,35 +149,35 @@ msgstr ""
 "spiacente, %{cmd} non sembra un comando valido. forse non è scritto "
 "correttamente, o devi specificare che dev'essere in privato?"
 
-#: lib/rbot/core/auth.rb:295
+#: lib/rbot/core/auth.rb:302
 msgid "welcome, %{user}"
 msgstr "benvenuto, %{user}"
 
-#: lib/rbot/core/auth.rb:310
+#: lib/rbot/core/auth.rb:317
 msgid "sorry, can't do"
 msgstr "spiacente, non si può"
 
-#: lib/rbot/core/auth.rb:313
+#: lib/rbot/core/auth.rb:320
 msgid "couldn't login: %{exception}"
 msgstr "impossibile effettuare il login: %{exception}"
 
-#: lib/rbot/core/auth.rb:321
+#: lib/rbot/core/auth.rb:328
 msgid "I couldn't find anything to let you login automatically"
 msgstr "non ho trovato nulla con cui farti effettuare il login automatico"
 
-#: lib/rbot/core/auth.rb:332
+#: lib/rbot/core/auth.rb:339
 msgid "you are %{who}"
 msgstr "sei %{who}"
 
-#: lib/rbot/core/auth.rb:334 lib/rbot/core/auth.rb:347
+#: lib/rbot/core/auth.rb:341 lib/rbot/core/auth.rb:354
 msgid "no one that I know"
 msgstr "nessuno di mia conoscenza"
 
-#: lib/rbot/core/auth.rb:335 lib/rbot/core/auth.rb:348
+#: lib/rbot/core/auth.rb:342 lib/rbot/core/auth.rb:355
 msgid "my boss"
 msgstr "il mio padrone"
 
-#: lib/rbot/core/auth.rb:355
+#: lib/rbot/core/auth.rb:362
 msgid ""
 "login [<botuser>] [<pass>]: logs in to the bot as botuser <botuser> with "
 "password <pass>. When using the full form, you must contact the bot in "
@@ -191,16 +191,16 @@ msgstr ""
 "mask e la tua netmask è tra quelle conosciute. se anche <botuser> viene "
 "omesso tenterò il login automatico"
 
-#: lib/rbot/core/auth.rb:357
+#: lib/rbot/core/auth.rb:364
 msgid "whoami: names the botuser you're linked to"
 msgstr "whoami: fornisce il nome del botuser a cui sei identificato"
 
-#: lib/rbot/core/auth.rb:359
+#: lib/rbot/core/auth.rb:366
 msgid "who is <user>: names the botuser <user> is linked to"
 msgstr ""
 "who is <utente>: fornisce il nome del botuser a cui è identificato <utente>"
 
-#: lib/rbot/core/auth.rb:363
+#: lib/rbot/core/auth.rb:370
 msgid ""
 "a permission is specified as module::path::to::cmd; when you want to enable "
 "it, prefix it with +; when you want to disable it, prefix it with -; when "
@@ -210,7 +210,7 @@ msgstr ""
 "abilitarlo, premetti un +; per disabilitarlo, premetti un -; per "
 "reimpostarlo (+reset+) non usare alcun prefisso"
 
-#: lib/rbot/core/auth.rb:365
+#: lib/rbot/core/auth.rb:372
 msgid ""
 "permissions [re]set <permission> [in <channel>] for <user>: sets or resets "
 "the permissions for botuser <user> in channel <channel> (use ? to change the "
@@ -220,11 +220,11 @@ msgstr ""
 "reimposta i permessi per il botuser <user> nel canale <channel> (usa ? per "
 "cambiare i permessi delle comunicazioni private)"
 
-#: lib/rbot/core/auth.rb:367
+#: lib/rbot/core/auth.rb:374
 msgid "permissions view [for <user>]: display the permissions for user <user>"
 msgstr "permissions view [for <user>]: mostra i permessi per l'utente <user>"
 
-#: lib/rbot/core/auth.rb:369
+#: lib/rbot/core/auth.rb:376
 msgid ""
 "permissions search <pattern>: display the permissions associated with the "
 "commands matching <pattern>"
@@ -232,11 +232,11 @@ msgstr ""
 "permissions search <pattern>: mostra i permessi associati ai comandi che "
 "corrispondono a <pattern>"
 
-#: lib/rbot/core/auth.rb:371
+#: lib/rbot/core/auth.rb:378
 msgid "permission topics: syntax, (re)set, view, search"
 msgstr "argomenti di permission: syntax, (re)set, view, search"
 
-#: lib/rbot/core/auth.rb:376
+#: lib/rbot/core/auth.rb:383
 msgid ""
 "user show <what> : shows info about the user; <what> can be any of "
 "autologin, login-by-mask, netmasks"
@@ -244,7 +244,7 @@ msgstr ""
 "user show <what>: mostra informazioni sull'utente; <what> può essere "
 "autologin, login-by-mask, netmask"
 
-#: lib/rbot/core/auth.rb:378
+#: lib/rbot/core/auth.rb:385
 msgid ""
 "user enable|disable <what> : turns on or off <what> (autologin, login-by-"
 "mask)"
@@ -252,7 +252,7 @@ msgstr ""
 "user enable|disable <what>: abilita o disabilita <what> per l'utente (<what> "
 "può essere autologin o login-by-mask)"
 
-#: lib/rbot/core/auth.rb:380
+#: lib/rbot/core/auth.rb:387
 msgid ""
 "user set password <blah> : sets the user password to <blah>; passwords can "
 "only contain upper and lowercase letters and numbers, and must be at least 4 "
@@ -262,7 +262,7 @@ msgstr ""
 "essere lunga almeno 4 caratteri e può contenere solo lettere maiuscole e "
 "minuscole, e numeri"
 
-#: lib/rbot/core/auth.rb:382
+#: lib/rbot/core/auth.rb:389
 msgid ""
 "user add|rm netmask <mask> : adds/removes netmask <mask> from the list of "
 "netmasks known to the botuser you're linked to"
@@ -270,7 +270,7 @@ msgstr ""
 "user add|rm netmask <mask>: aggiunge o rimuove la netmask <mask> dalla lista "
 "delle netmask conosciute dal botuser a cui sei identificato"
 
-#: lib/rbot/core/auth.rb:384
+#: lib/rbot/core/auth.rb:391
 msgid ""
 "user reset <what> : resets <what> to the default values. <what> can be "
 "+netmasks+ (the list will be emptied), +autologin+ or +login-by-mask+ (will "
@@ -282,7 +282,7 @@ msgstr ""
 "(verranno reimpostati ai valori predefiniti) o +password+ (una nuova "
 "password verrà generata e ti verrà comunicata in privato)"
 
-#: lib/rbot/core/auth.rb:386
+#: lib/rbot/core/auth.rb:393
 msgid ""
 "user tell <who> the password for <botuser> : contacts <who> in private to "
 "tell him/her the password for <botuser>"
@@ -290,7 +290,7 @@ msgstr ""
 "user tell <who> the password for <botuser>: contatta <who> in privato per "
 "comunicargli la password per <botuser>"
 
-#: lib/rbot/core/auth.rb:388
+#: lib/rbot/core/auth.rb:395
 msgid ""
 "user create <name> <password> : create botuser named <name> with password "
 "<password>. The password can be omitted, in which case a random one will be "
@@ -302,11 +302,11 @@ msgstr ""
 "una casuale. <name> può contenere solo caratteri alfanumerici ed il "
 "carattere di sottolineatura (_)"
 
-#: lib/rbot/core/auth.rb:390
+#: lib/rbot/core/auth.rb:397
 msgid "user list : lists all the botusers"
 msgstr "user list: elenca i botuser"
 
-#: lib/rbot/core/auth.rb:392
+#: lib/rbot/core/auth.rb:399
 msgid ""
 "user destroy <botuser> : destroys <botuser>. This function %{highlight}must%"
 "{highlight} be called in two steps. On the first call <botuser> is queued "
@@ -321,7 +321,7 @@ msgstr ""
 "verrà distrutto. per annullare la distruzione usa il comando 'user cancel "
 "destroy <botuser>'"
 
-#: lib/rbot/core/auth.rb:394
+#: lib/rbot/core/auth.rb:401
 msgid ""
 "user topics: show, enable|disable, add|rm netmask, set, reset, tell, create, "
 "list, destroy"
@@ -329,7 +329,7 @@ msgstr ""
 "argomenti per user: show, enable|disable add|rm, netmask, set, reset, tell, "
 "create, list, destroy"
 
-#: lib/rbot/core/auth.rb:397
+#: lib/rbot/core/auth.rb:404
 msgid ""
 "auth <masterpassword>: log in as the bot owner; other commands: login, "
 "whoami, permissions syntax, permissions [re]set, permissions view, user, "
@@ -339,7 +339,7 @@ msgstr ""
 "login, whoami, permission syntax, permissions [re]set, permissions view, "
 "user, meet, hello, allow, prevent"
 
-#: lib/rbot/core/auth.rb:399
+#: lib/rbot/core/auth.rb:406
 msgid ""
 "meet <nick> [as <user>]: creates a bot user for nick, calling it user "
 "(defaults to the nick itself)"
@@ -347,11 +347,11 @@ msgstr ""
 "meet <nick> [as <user>]: crea un bot user per il dato nick, chiamandolo user "
 "(predefinito: il nick stesso)"
 
-#: lib/rbot/core/auth.rb:401
+#: lib/rbot/core/auth.rb:408
 msgid "hello: creates a bot user for the person issuing the command"
 msgstr "hello: crea un botuser per la persona che esegue il comando"
 
-#: lib/rbot/core/auth.rb:403
+#: lib/rbot/core/auth.rb:410
 msgid ""
 "allow <user> to do <sample command> [<where>]: gives botuser <user> the "
 "permissions to execute a command such as the provided sample command (in "
@@ -361,7 +361,7 @@ msgstr ""
 "del bot <utente> i permessi per eseguire un comando come quello fornito come "
 "esempio (in privato o nel canale, a seconda dell'opzione <dove>)"
 
-#: lib/rbot/core/auth.rb:405
+#: lib/rbot/core/auth.rb:412
 msgid ""
 "deny <user> from doing <sample command> [<where>]: removes from botuser "
 "<user> the permissions to execute a command such as the provided sample "
@@ -371,7 +371,7 @@ msgstr ""
 "all'utente del bot <botuser>i permessi er eseguire un comando come quello "
 "fornito come esempio (in privato o nel canale, a seconda dell'opzione <dove>)"
 
-#: lib/rbot/core/auth.rb:407
+#: lib/rbot/core/auth.rb:414
 msgid ""
 "auth commands: auth, login, whoami, who, permission[s], user, meet, hello, "
 "allow, deny"
@@ -379,102 +379,102 @@ msgstr ""
 "comandi auth: auth, login, whoami, permission[s], user, neet, hello, allow, "
 "deny"
 
-#: lib/rbot/core/auth.rb:412
+#: lib/rbot/core/auth.rb:419
 msgid "sorry, I need more arguments to %{command}"
 msgstr "scusa, ma mi servono più argomenti per %{command}"
 
-#: lib/rbot/core/auth.rb:416
+#: lib/rbot/core/auth.rb:423
 msgid "I can only %{command} these: %{arguments}"
 msgstr "posso usare %{command} solo su: %{arguments}"
 
-#: lib/rbot/core/auth.rb:451
+#: lib/rbot/core/auth.rb:458
 msgid "no such bot user %{user}"
 msgstr "nessun botuser %{user}"
 
-#: lib/rbot/core/auth.rb:454
+#: lib/rbot/core/auth.rb:461
 msgid "you can't mess with %{user}"
 msgstr "non puoi alterare %{user}"
 
-#: lib/rbot/core/auth.rb:466
+#: lib/rbot/core/auth.rb:473
 msgid "you can't see the properties of %{user}"
 msgstr "non puoi vedere le proprietà di %{user}"
 
-#: lib/rbot/core/auth.rb:475
+#: lib/rbot/core/auth.rb:482
 msgid "no way I'm telling you the master password!"
 msgstr "non esiste proprio che io ti dica la password del padrone!"
 
-#: lib/rbot/core/auth.rb:476
+#: lib/rbot/core/auth.rb:483
 msgid "you can't ask for someone else's password"
 msgstr "non puoi chiedere la password di qualcun altro"
 
-#: lib/rbot/core/auth.rb:478
+#: lib/rbot/core/auth.rb:485
 msgid ""
 "c'mon, you can't be asking me seriously to tell you the password in public!"
 msgstr ""
 "non mi stai chiedendo veramente di dirti la passord in pubblico, spero!"
 
-#: lib/rbot/core/auth.rb:479
+#: lib/rbot/core/auth.rb:486
 msgid "the password for %{user} is %{password}"
 msgstr "la password per %{user} è %{password}"
 
-#: lib/rbot/core/auth.rb:493
+#: lib/rbot/core/auth.rb:500
 msgid "can %{action}"
 msgstr "può fare %{action}"
 
-#: lib/rbot/core/auth.rb:495
+#: lib/rbot/core/auth.rb:502
 msgid "can not %{action}"
 msgstr "non può fare %{action}"
 
-#: lib/rbot/core/auth.rb:499
+#: lib/rbot/core/auth.rb:506
 msgid "knows no netmasks"
 msgstr "non conosce netmask"
 
-#: lib/rbot/core/auth.rb:501
+#: lib/rbot/core/auth.rb:508
 msgid "knows %{netmasks}"
 msgstr "conosce %{netmasks}"
 
-#: lib/rbot/core/auth.rb:508 lib/rbot/core/auth.rb:535
-#: lib/rbot/core/auth.rb:553 lib/rbot/core/auth.rb:585
+#: lib/rbot/core/auth.rb:515 lib/rbot/core/auth.rb:542
+#: lib/rbot/core/auth.rb:560 lib/rbot/core/auth.rb:592
 msgid "you can't change the default user"
 msgstr "non puoi cambiare l'utente predefinito"
 
-#: lib/rbot/core/auth.rb:509 lib/rbot/core/auth.rb:537
-#: lib/rbot/core/auth.rb:555 lib/rbot/core/auth.rb:587
+#: lib/rbot/core/auth.rb:516 lib/rbot/core/auth.rb:544
+#: lib/rbot/core/auth.rb:562 lib/rbot/core/auth.rb:594
 msgid "you can't edit %{user}"
 msgstr "non puoi modificare %{user}"
 
-#: lib/rbot/core/auth.rb:524 lib/rbot/core/auth.rb:571
+#: lib/rbot/core/auth.rb:531 lib/rbot/core/auth.rb:578
 msgid "I ignored %{things} because %{reason}"
 msgstr "ho ignorato %{things} perché %{reason}"
 
-#: lib/rbot/core/auth.rb:528 lib/rbot/core/auth.rb:575
+#: lib/rbot/core/auth.rb:535 lib/rbot/core/auth.rb:582
 msgid "I haven't changed anything"
 msgstr "non ho cambiato nulla"
 
-#: lib/rbot/core/auth.rb:546
+#: lib/rbot/core/auth.rb:553
 msgid "is that a joke? setting the password in public?"
 msgstr "scherzi? cambiare la password in pubblico?"
 
-#: lib/rbot/core/auth.rb:578
+#: lib/rbot/core/auth.rb:585
 msgid "the password for %{user} is now %{password}"
 msgstr "la password per %{user} è ora %{password}"
 
-#: lib/rbot/core/auth.rb:592
+#: lib/rbot/core/auth.rb:599
 msgid ""
 "I can only add/remove netmasks. See +help user add+ for more instructions"
 msgstr ""
 "Posso aggiungere e rimuovere solo le netmask. Vedi anche +help user add+ per "
 "ulteriori istruzioni"
 
-#: lib/rbot/core/auth.rb:613
+#: lib/rbot/core/auth.rb:620
 msgid "sorry, I don't know how to %{request}"
 msgstr "spiacente non so come fare %{request}"
 
-#: lib/rbot/core/auth.rb:616
+#: lib/rbot/core/auth.rb:623
 msgid "couldn't %{cmd}: %{exception}"
 msgstr "impossibile effettuare il login: %{exception}"
 
-#: lib/rbot/core/auth.rb:645
+#: lib/rbot/core/auth.rb:652
 msgid ""
 "you are now registered as %{buname}. I created a random password for you : %"
 "{pass} and you can change it at any time by telling me 'user set password "
@@ -484,73 +484,73 @@ msgstr ""
 "te : %{pass} ma puoi cambiarla in qualsiasi momento scrivendomi 'user set "
 "password <password>' in privato "
 
-#: lib/rbot/core/auth.rb:652
+#: lib/rbot/core/auth.rb:659
 msgid "but I already know %{buname}"
 msgstr "ma io conosco già %{buname}"
 
-#: lib/rbot/core/auth.rb:654
+#: lib/rbot/core/auth.rb:661
 msgid "I had problems meeting %{nick}: %{e}"
 msgstr "ho problemi a incontrare %{nick}: %{e}"
 
-#: lib/rbot/core/auth.rb:663
+#: lib/rbot/core/auth.rb:670
 msgid "couldn't find botuser %{user}"
 msgstr "non conosco alcun botuser %{user}"
 
-#: lib/rbot/core/auth.rb:665
+#: lib/rbot/core/auth.rb:672
 msgid "I'm not telling the master password to anyone, pal"
 msgstr "la password del padrone non la dico a nessuno, compare"
 
-#: lib/rbot/core/auth.rb:666
+#: lib/rbot/core/auth.rb:673
 msgid "the password for botuser %{user} is %{password}"
 msgstr "la password per %{user} è %{password}"
 
-#: lib/rbot/core/auth.rb:669
+#: lib/rbot/core/auth.rb:676
 msgid "I told %{user} that %{message}"
 msgstr "ho detto a %{user} che %{message}"
 
-#: lib/rbot/core/auth.rb:675
+#: lib/rbot/core/auth.rb:682
 msgid "are you nuts, creating a botuser with a publicly known password?"
 msgstr "sei scemo, a creare botuser con una password in pubblico?"
 
-#: lib/rbot/core/auth.rb:680
+#: lib/rbot/core/auth.rb:687
 msgid "failed to create %{user}: %{exception}"
 msgstr "impossibile creare %{user}: %{exception}"
 
-#: lib/rbot/core/auth.rb:684
+#: lib/rbot/core/auth.rb:691
 msgid "created botuser %{user}"
 msgstr "botuser creato %{user}"
 
-#: lib/rbot/core/auth.rb:692
+#: lib/rbot/core/auth.rb:699
 msgid " (queued for destruction)"
 msgstr "(in coda per la distruzione)"
 
-#: lib/rbot/core/auth.rb:695
+#: lib/rbot/core/auth.rb:702
 msgid "I have no botusers other than the default ones"
 msgstr "non ho botuser se non i predefiniti"
 
-#: lib/rbot/core/auth.rb:696
+#: lib/rbot/core/auth.rb:703
 msgid "botuser: %{list}"
 msgid_plural "botusers: %{list}"
 msgstr[0] "botuser: %{list}"
 msgstr[1] "botuser: %{list}"
 
-#: lib/rbot/core/auth.rb:703
+#: lib/rbot/core/auth.rb:710
 msgid "You can't destroy %{user}"
 msgstr "non puoi distruggere %{user}"
 
-#: lib/rbot/core/auth.rb:713
+#: lib/rbot/core/auth.rb:720
 msgid "no such botuser %{user}"
 msgstr "nessun botuser %{user}"
 
-#: lib/rbot/core/auth.rb:720
+#: lib/rbot/core/auth.rb:727
 msgid "%{user} removed from the destruction queue"
 msgstr "%{user} rimosso dalla coda per la distruzione"
 
-#: lib/rbot/core/auth.rb:722
+#: lib/rbot/core/auth.rb:729
 msgid "%{user} was not queued for destruction"
 msgstr "%{user} non era in coda per la distruzione"
 
-#: lib/rbot/core/auth.rb:727
+#: lib/rbot/core/auth.rb:734
 msgid ""
 "%{user} already queued for destruction, use %{highlight}user confirm destroy "
 "%{user}%{highlight} to destroy it"
@@ -558,7 +558,7 @@ msgstr ""
 "%{user} era già in coda per la distruzione, usa %{highlight}user destroy %"
 "{user} <password>%{highlight} per distruggerlo"
 
-#: lib/rbot/core/auth.rb:730
+#: lib/rbot/core/auth.rb:737
 msgid ""
 "%{user} queued for destruction, use %{highlight}user confirm destroy %{user}%"
 "{highlight} to destroy it"
@@ -566,79 +566,79 @@ msgstr ""
 "%{user} messo in coda per la distruzione, usa %{highlight}user destroy %"
 "{user} <password>%{highlight} per distruggerlo"
 
-#: lib/rbot/core/auth.rb:734
+#: lib/rbot/core/auth.rb:741
 msgid "%{user} is not queued for destruction yet"
 msgstr "%{user} non è ancora in coda per la distruzione"
 
-#: lib/rbot/core/auth.rb:743 lib/rbot/core/auth.rb:783
+#: lib/rbot/core/auth.rb:750 lib/rbot/core/auth.rb:790
 msgid "failed: %{exception}"
 msgstr "fallito: %{exception}"
 
-#: lib/rbot/core/auth.rb:745
+#: lib/rbot/core/auth.rb:752
 msgid "botuser %{user} destroyed"
 msgstr "botuser %{user} distrutto"
 
-#: lib/rbot/core/auth.rb:752
+#: lib/rbot/core/auth.rb:759
 msgid "please don't touch the default users"
 msgstr "per favore non toccare gli utenti predefiniti"
 
-#: lib/rbot/core/auth.rb:761
+#: lib/rbot/core/auth.rb:768
 msgid "no such botuser %{source}"
 msgstr "nessun botuser %{source}"
 
-#: lib/rbot/core/auth.rb:763
+#: lib/rbot/core/auth.rb:770
 msgid "botuser %{dest} exists already"
 msgstr "il botuser %{dest} esiste già"
 
-#: lib/rbot/core/auth.rb:786
+#: lib/rbot/core/auth.rb:793
 msgid "botuser %{source} copied to %{dest}"
 msgstr "botuser %{source} copiato in %{dest}"
 
-#: lib/rbot/core/auth.rb:789
+#: lib/rbot/core/auth.rb:796
 msgid "botuser %{source} renamed to %{dest}"
 msgstr "botuser %{source} rinominato %{dest}"
 
-#: lib/rbot/core/auth.rb:809
+#: lib/rbot/core/auth.rb:816
 msgid "selecting data to export ..."
 msgstr "sto selezionando i dati da esportare ..."
 
-#: lib/rbot/core/auth.rb:825
+#: lib/rbot/core/auth.rb:832
 msgid "preparing data for export ..."
 msgstr "preparo i dati da esportare ..."
 
-#: lib/rbot/core/auth.rb:848
+#: lib/rbot/core/auth.rb:855
 msgid "failed to prepare data: %{exception}"
 msgstr "impossibile preparare i dati: %{exception}"
 
-#: lib/rbot/core/auth.rb:853
+#: lib/rbot/core/auth.rb:860
 msgid "exporting to %{file} ..."
 msgstr "esporto su %{file} ..."
 
-#: lib/rbot/core/auth.rb:860
+#: lib/rbot/core/auth.rb:867
 msgid "failed to export users: %{exception}"
 msgstr "impossibile esportare gli utenti: %{exception}"
 
-#: lib/rbot/core/auth.rb:864 lib/rbot/core/auth.rb:942
+#: lib/rbot/core/auth.rb:871 lib/rbot/core/auth.rb:949
 msgid "done"
 msgstr "fatto"
 
-#: lib/rbot/core/auth.rb:881
+#: lib/rbot/core/auth.rb:888
 msgid "reading %{file} ..."
 msgstr "leggo %{file} ..."
 
-#: lib/rbot/core/auth.rb:885
+#: lib/rbot/core/auth.rb:892
 msgid "failed to import from: %{exception}"
 msgstr "impossibile importare: %{exception}"
 
-#: lib/rbot/core/auth.rb:892
+#: lib/rbot/core/auth.rb:899
 msgid "selecting data to import ..."
 msgstr "seleziono i dati da importare ..."
 
-#: lib/rbot/core/auth.rb:902
+#: lib/rbot/core/auth.rb:909
 msgid "parsing data from import ..."
 msgstr "elaboro i dati da importare ..."
 
-#: lib/rbot/core/auth.rb:922
+#: lib/rbot/core/auth.rb:929
 msgid "failed to parse data: %{exception}"
 msgstr "impossibile elaborare i dati: %{exception}"
 
@@ -661,10 +661,6 @@ msgid "hide => part all channels"
 msgstr "hide => lascia tutti i canali"
 
 #: lib/rbot/core/basics.rb:117
-msgid "nick <nick> => attempt to change nick to <nick>"
-msgstr "nick <nick> => cerca di cambiare il nick in <nick>"
-
-#: lib/rbot/core/basics.rb:119
 msgid ""
 "say <channel>|<nick> <message> => say <message> to <channel> or in private "
 "message to <nick>"
@@ -672,7 +668,7 @@ msgstr ""
 "say <canale>|<nick> <messaggio> => invia <messaggio> nel <canale> o in "
 "unmessagio privato a <nick>"
 
-#: lib/rbot/core/basics.rb:121
+#: lib/rbot/core/basics.rb:119
 msgid ""
 "action <channel>|<nick> <message> => does a /me <message> to <channel> or in "
 "private message to <nick>"
@@ -680,7 +676,7 @@ msgstr ""
 "action <canale>|<nick> <messaggio> => invia un /me <messaggio> nel <canale> "
 "o inmessaggi privato a <nick>"
 
-#: lib/rbot/core/basics.rb:123
+#: lib/rbot/core/basics.rb:121
 msgid ""
 "quiet [in here|<channel>] => with no arguments, stop speaking in all "
 "channels, if \"in here\", stop speaking in this channel, or stop speaking in "
@@ -690,7 +686,7 @@ msgstr ""
 "canali, se si specifica \"in here\", smette di parlare in questo canale, "
 "oppure smette di parlare in <canale>"
 
-#: lib/rbot/core/basics.rb:125
+#: lib/rbot/core/basics.rb:123
 msgid ""
 "talk [in here|<channel>] => with no arguments, resume speaking in all "
 "channels, if \"in here\", resume speaking in this channel, or resume "
@@ -700,11 +696,11 @@ msgstr ""
 "canali, se \"in here\", ricomincia a parlare in questo canale, oppure "
 "ricomincia a parlare in <canale>"
 
-#: lib/rbot/core/basics.rb:127
+#: lib/rbot/core/basics.rb:125
 msgid "ping => replies with a pong"
 msgstr "ping => risponde con un pong"
 
-#: lib/rbot/core/basics.rb:129
+#: lib/rbot/core/basics.rb:127
 msgid ""
 "mode <channel> <mode> <nicks> => set channel modes for <nicks> on <channel> "
 "to <mode>"
@@ -712,13 +708,13 @@ msgstr ""
 "mode <canale> <mode> <nicks> => imposta i modi del canale per <nicks> nel "
 "<canale> "
 
-#: lib/rbot/core/basics.rb:135
+#: lib/rbot/core/basics.rb:133
 msgid ""
-"%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
-"quiet, talk, ping, mode"
+"%{name}: quit, restart, join, part, hide, save, say, action, topic, quiet, "
+"talk, ping, mode"
 msgstr ""
-"%{name}: quit, restart, join, part, hide, save, nick, say, action, topic,"
-"quiet, talk, ping, mode"
+"%{name}: quit, restart, join, part, hide, save, say, action, topic,quiet, "
+"talk, ping, mode"
 
 #: lib/rbot/core/config.rb:12
 msgid " [%{secs} ago]"
@@ -788,7 +784,7 @@ msgstr "rescan ..."
 msgid "done. %{plugin_status}"
 msgstr "fatto. %{plugin_status}"
 
-#: lib/rbot/core/config.rb:220
+#: lib/rbot/core/config.rb:221
 msgid ""
 "config list => list configuration modules, config list <module> => list "
 "configuration keys for module <module>"
@@ -796,28 +792,28 @@ msgstr ""
 "config list => elenca i moduli di configurazione, config list <modulo> => "
 "elenca le chiavi di configurazione per il <modulo>"
 
-#: lib/rbot/core/config.rb:222
+#: lib/rbot/core/config.rb:223
 msgid "config get <key> => get configuration value for key <key>"
 msgstr ""
 "config get <chiave> => restituisce il valore di configurazione per la "
 "<chiave>"
 
-#: lib/rbot/core/config.rb:224
+#: lib/rbot/core/config.rb:225
 msgid "reset key <key> to the default"
 msgstr "reset key <chiave> => ripristina il valore di default di <chiave>"
 
-#: lib/rbot/core/config.rb:226
+#: lib/rbot/core/config.rb:227
 msgid ""
 "config set <key> <value> => set configuration value for key <key> to <value>"
 msgstr ""
 "config set <key> <valore> => assegna a <chiave> il valore di configurazione "
 "<valore>"
 
-#: lib/rbot/core/config.rb:228
+#: lib/rbot/core/config.rb:229
 msgid "config desc <key> => describe what key <key> configures"
 msgstr "config desc <chiavey> => descrive ciò che la <chiave> configura"
 
-#: lib/rbot/core/config.rb:230
+#: lib/rbot/core/config.rb:231
 msgid ""
 "config add <value> to <key> => add value <value> to key <key> if <key> is an "
 "array"
@@ -825,7 +821,7 @@ msgstr ""
 "config add <valore> to <chiave> => aggiunge il <valore> alla <chiave> se la "
 "<chiave> è un array"
 
-#: lib/rbot/core/config.rb:232
+#: lib/rbot/core/config.rb:233
 msgid ""
 "config rm <value> from <key> => remove value <value> from key <key> if <key> "
 "is an array"
@@ -833,7 +829,7 @@ msgstr ""
 "config rm <valore> from <chiave> => rimuove <valore> da <chiave> se <chiave> "
 "è un array"
 
-#: lib/rbot/core/config.rb:234
+#: lib/rbot/core/config.rb:235
 msgid ""
 "config module - bot configuration. usage: list, desc, get, set, unset, add, "
 "rm"
@@ -841,27 +837,27 @@ msgstr ""
 "Modulo di configurazione - configurazione del bot. uso: list, desc, get, "
 "set, unset, add, rm"
 
-#: lib/rbot/core/config.rb:239
+#: lib/rbot/core/config.rb:240
 msgid "nick <newnick> => change the bot nick to <newnick>, if possible"
 msgstr "nick <nick> => cerca di cambiare il nick in <nick>"
 
-#: lib/rbot/core/config.rb:241
+#: lib/rbot/core/config.rb:242
 msgid "status => display some information on the bot's status"
 msgstr "status => mostra alcune informazioni circa lo stato del bot"
 
-#: lib/rbot/core/config.rb:243
+#: lib/rbot/core/config.rb:244
 msgid "save => save current dynamic data and configuration"
 msgstr "save => salva i dati dinamici attuali e la configurazione"
 
-#: lib/rbot/core/config.rb:245
+#: lib/rbot/core/config.rb:246
 msgid "rescan => reload modules and static facts"
 msgstr "rescan => effettua il reload dei moduli e dei dati statici"
 
-#: lib/rbot/core/config.rb:247
+#: lib/rbot/core/config.rb:248
 msgid "version => describes software version"
 msgstr "version => descrive la versione del software"
 
-#: lib/rbot/core/config.rb:249
+#: lib/rbot/core/config.rb:250
 msgid "config-related tasks: config, save, rescan, version, nick, status"
 msgstr "config-related tasks: config, save, rescan, version, nick, status"
 
@@ -993,19 +989,19 @@ msgstr "circa un giorno"
 msgid "%{m} days"
 msgstr "%{m} giorni"
 
-#: lib/rbot/ircbot.rb:1209
+#: lib/rbot/ircbot.rb:1233
 msgid "help topics: "
 msgstr "argomenti: "
 
-#: lib/rbot/ircbot.rb:1211
+#: lib/rbot/ircbot.rb:1235
 msgid " (help <topic> for more info)"
 msgstr " (help <argomento> per ulteriori informazioni)"
 
-#: lib/rbot/ircbot.rb:1214
+#: lib/rbot/ircbot.rb:1238
 msgid "no help for topic %{topic}"
 msgstr "nessun aiuto disponibile su %{topic}"
 
-#: lib/rbot/ircbot.rb:1225
+#: lib/rbot/ircbot.rb:1249
 msgid ""
 "Uptime %{up}, %{plug} plugins active, %{sent} lines sent, %{recv} received."
 msgstr ""
@@ -1126,3 +1122,6 @@ msgstr ""
 #: lib/rbot/registry.rb:190
 msgid "marshal recovery failed, trying default"
 msgstr "recupero dati marshal fallito, tento di usare il valore predefinito"
+
+#~ msgid "nick <nick> => attempt to change nick to <nick>"
+#~ msgstr "nick <nick> => cerca di cambiare il nick in <nick>"
diff --git a/po/ja/rbot-nickrecover.po b/po/ja/rbot-nickrecover.po
new file mode 100644
index 00000000..97e73163
--- /dev/null
+++ b/po/ja/rbot-nickrecover.po
@@ -0,0 +1,36 @@
+# Japanese translations for PACKAGE package.
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rbot\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
+"PO-Revision-Date: 2008-07-30 23:38+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: data/rbot/plugins/nickrecover.rb:24
+msgid ""
+"Time in seconds to wait between attempts to recover the nick. set to 0 to "
+"disable nick recovery."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:28
+msgid ""
+"the nickrecover plugin takes care of recovering the bot nick by trying to "
+"change nick until it succeeds."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:29
+msgid "the plugin waits irc.nick_retry seconds between attempts."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:30
+msgid "set irc.nick_retry to 0 to disable it."
+msgstr ""
diff --git a/po/ja/rbot.po b/po/ja/rbot.po
index ce6fad03..c8f2bf41 100644
--- a/po/ja/rbot.po
+++ b/po/ja/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-07-07 18:02+0200\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
 "PO-Revision-Date: 2007-07-09 01:36-0400\n"
 "Last-Translator: Yaohan Chen <yaohan.chen@gmail.com>\n"
 "Language-Team: Japanese\n"
@@ -57,119 +57,119 @@ msgid ""
 "connected and you are auth'd."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:69
+#: lib/rbot/core/auth.rb:76
 msgid "please do not use + or - in front of command %{command} when resetting"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:71
+#: lib/rbot/core/auth.rb:78
 msgid "+ or - expected in front of %{string}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:84
+#: lib/rbot/core/auth.rb:91
 msgid "'%{string}' doesn't look like a channel name"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:93
+#: lib/rbot/core/auth.rb:100
 msgid "trailing comma"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:94
+#: lib/rbot/core/auth.rb:101
 msgid "you probably forgot a comma"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:109 lib/rbot/core/auth.rb:163
-#: lib/rbot/core/auth.rb:229
+#: lib/rbot/core/auth.rb:116 lib/rbot/core/auth.rb:170
+#: lib/rbot/core/auth.rb:236
 msgid "couldn't find botuser %{name}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:111
+#: lib/rbot/core/auth.rb:118
 msgid "you can't change permissions for %{username}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:118
+#: lib/rbot/core/auth.rb:125
 msgid "couldn't satisfy your request: %{errors}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:157
+#: lib/rbot/core/auth.rb:164
 msgid "you are owner, you can do anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:160
+#: lib/rbot/core/auth.rb:167
 msgid "owner can do anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:171
+#: lib/rbot/core/auth.rb:178
 msgid "on any channel: "
 msgstr ""
 
-#: lib/rbot/core/auth.rb:173
+#: lib/rbot/core/auth.rb:180
 msgid "in private: "
 msgstr ""
 
-#: lib/rbot/core/auth.rb:185
+#: lib/rbot/core/auth.rb:192
 msgid "no permissions set for %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:187
+#: lib/rbot/core/auth.rb:194
 msgid "permissions for %{user}:: %{permissions}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:197
+#: lib/rbot/core/auth.rb:204
 msgid ". only %{max} will be shown"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:198
+#: lib/rbot/core/auth.rb:205
 msgid "%{count} commands found matching %{pattern}%{extra}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:203
+#: lib/rbot/core/auth.rb:210
 msgid "%{cmd}: %{perms}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:260
+#: lib/rbot/core/auth.rb:267
 msgid "%{user} can already do that"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:262
+#: lib/rbot/core/auth.rb:269
 msgid "%{user} can't do that already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:272
+#: lib/rbot/core/auth.rb:279
 msgid ""
 "sorry, %{cmd} doesn't look like a valid command. maybe you misspelled it, or "
 "you need to specify it should be in private?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:295
+#: lib/rbot/core/auth.rb:302
 msgid "welcome, %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:310
+#: lib/rbot/core/auth.rb:317
 msgid "sorry, can't do"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:313
+#: lib/rbot/core/auth.rb:320
 #, fuzzy
 msgid "couldn't login: %{exception}"
 msgstr "プラグイン%{count}個：%{list}"
 
-#: lib/rbot/core/auth.rb:321
+#: lib/rbot/core/auth.rb:328
 msgid "I couldn't find anything to let you login automatically"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:332
+#: lib/rbot/core/auth.rb:339
 msgid "you are %{who}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:334 lib/rbot/core/auth.rb:347
+#: lib/rbot/core/auth.rb:341 lib/rbot/core/auth.rb:354
 msgid "no one that I know"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:335 lib/rbot/core/auth.rb:348
+#: lib/rbot/core/auth.rb:342 lib/rbot/core/auth.rb:355
 msgid "my boss"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:355
+#: lib/rbot/core/auth.rb:362
 msgid ""
 "login [<botuser>] [<pass>]: logs in to the bot as botuser <botuser> with "
 "password <pass>. When using the full form, you must contact the bot in "
@@ -178,68 +178,68 @@ msgid ""
 "be attempted"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:357
+#: lib/rbot/core/auth.rb:364
 msgid "whoami: names the botuser you're linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:359
+#: lib/rbot/core/auth.rb:366
 msgid "who is <user>: names the botuser <user> is linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:363
+#: lib/rbot/core/auth.rb:370
 msgid ""
 "a permission is specified as module::path::to::cmd; when you want to enable "
 "it, prefix it with +; when you want to disable it, prefix it with -; when "
 "using the +reset+ command, do not use any prefix"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:365
+#: lib/rbot/core/auth.rb:372
 msgid ""
 "permissions [re]set <permission> [in <channel>] for <user>: sets or resets "
 "the permissions for botuser <user> in channel <channel> (use ? to change the "
 "permissions for private addressing)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:367
+#: lib/rbot/core/auth.rb:374
 msgid "permissions view [for <user>]: display the permissions for user <user>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:369
+#: lib/rbot/core/auth.rb:376
 msgid ""
 "permissions search <pattern>: display the permissions associated with the "
 "commands matching <pattern>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:371
+#: lib/rbot/core/auth.rb:378
 msgid "permission topics: syntax, (re)set, view, search"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:376
+#: lib/rbot/core/auth.rb:383
 msgid ""
 "user show <what> : shows info about the user; <what> can be any of "
 "autologin, login-by-mask, netmasks"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:378
+#: lib/rbot/core/auth.rb:385
 msgid ""
 "user enable|disable <what> : turns on or off <what> (autologin, login-by-"
 "mask)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:380
+#: lib/rbot/core/auth.rb:387
 msgid ""
 "user set password <blah> : sets the user password to <blah>; passwords can "
 "only contain upper and lowercase letters and numbers, and must be at least 4 "
 "characters long"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:382
+#: lib/rbot/core/auth.rb:389
 msgid ""
 "user add|rm netmask <mask> : adds/removes netmask <mask> from the list of "
 "netmasks known to the botuser you're linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:384
+#: lib/rbot/core/auth.rb:391
 msgid ""
 "user reset <what> : resets <what> to the default values. <what> can be "
 "+netmasks+ (the list will be emptied), +autologin+ or +login-by-mask+ (will "
@@ -247,13 +247,13 @@ msgid ""
 "and you'll be told in private)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:386
+#: lib/rbot/core/auth.rb:393
 msgid ""
 "user tell <who> the password for <botuser> : contacts <who> in private to "
 "tell him/her the password for <botuser>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:388
+#: lib/rbot/core/auth.rb:395
 msgid ""
 "user create <name> <password> : create botuser named <name> with password "
 "<password>. The password can be omitted, in which case a random one will be "
@@ -261,11 +261,11 @@ msgid ""
 "underscore (_)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:390
+#: lib/rbot/core/auth.rb:397
 msgid "user list : lists all the botusers"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:392
+#: lib/rbot/core/auth.rb:399
 msgid ""
 "user destroy <botuser> : destroys <botuser>. This function %{highlight}must%"
 "{highlight} be called in two steps. On the first call <botuser> is queued "
@@ -274,299 +274,299 @@ msgid ""
 "destruction, issue the command 'user cancel destroy <botuser>'"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:394
+#: lib/rbot/core/auth.rb:401
 msgid ""
 "user topics: show, enable|disable, add|rm netmask, set, reset, tell, create, "
 "list, destroy"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:397
+#: lib/rbot/core/auth.rb:404
 msgid ""
 "auth <masterpassword>: log in as the bot owner; other commands: login, "
 "whoami, permissions syntax, permissions [re]set, permissions view, user, "
 "meet, hello, allow, prevent"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:399
+#: lib/rbot/core/auth.rb:406
 msgid ""
 "meet <nick> [as <user>]: creates a bot user for nick, calling it user "
 "(defaults to the nick itself)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:401
+#: lib/rbot/core/auth.rb:408
 msgid "hello: creates a bot user for the person issuing the command"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:403
+#: lib/rbot/core/auth.rb:410
 msgid ""
 "allow <user> to do <sample command> [<where>]: gives botuser <user> the "
 "permissions to execute a command such as the provided sample command (in "
 "private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:405
+#: lib/rbot/core/auth.rb:412
 msgid ""
 "deny <user> from doing <sample command> [<where>]: removes from botuser "
 "<user> the permissions to execute a command such as the provided sample "
 "command (in private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:407
+#: lib/rbot/core/auth.rb:414
 msgid ""
 "auth commands: auth, login, whoami, who, permission[s], user, meet, hello, "
 "allow, deny"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:412
+#: lib/rbot/core/auth.rb:419
 msgid "sorry, I need more arguments to %{command}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:416
+#: lib/rbot/core/auth.rb:423
 msgid "I can only %{command} these: %{arguments}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:451
+#: lib/rbot/core/auth.rb:458
 msgid "no such bot user %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:454
+#: lib/rbot/core/auth.rb:461
 msgid "you can't mess with %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:466
+#: lib/rbot/core/auth.rb:473
 msgid "you can't see the properties of %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:475
+#: lib/rbot/core/auth.rb:482
 msgid "no way I'm telling you the master password!"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:476
+#: lib/rbot/core/auth.rb:483
 msgid "you can't ask for someone else's password"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:478
+#: lib/rbot/core/auth.rb:485
 msgid ""
 "c'mon, you can't be asking me seriously to tell you the password in public!"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:479
+#: lib/rbot/core/auth.rb:486
 msgid "the password for %{user} is %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:493
+#: lib/rbot/core/auth.rb:500
 msgid "can %{action}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:495
+#: lib/rbot/core/auth.rb:502
 msgid "can not %{action}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:499
+#: lib/rbot/core/auth.rb:506
 msgid "knows no netmasks"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:501
+#: lib/rbot/core/auth.rb:508
 msgid "knows %{netmasks}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:508 lib/rbot/core/auth.rb:535
-#: lib/rbot/core/auth.rb:553 lib/rbot/core/auth.rb:585
+#: lib/rbot/core/auth.rb:515 lib/rbot/core/auth.rb:542
+#: lib/rbot/core/auth.rb:560 lib/rbot/core/auth.rb:592
 msgid "you can't change the default user"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:509 lib/rbot/core/auth.rb:537
-#: lib/rbot/core/auth.rb:555 lib/rbot/core/auth.rb:587
+#: lib/rbot/core/auth.rb:516 lib/rbot/core/auth.rb:544
+#: lib/rbot/core/auth.rb:562 lib/rbot/core/auth.rb:594
 msgid "you can't edit %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:524 lib/rbot/core/auth.rb:571
+#: lib/rbot/core/auth.rb:531 lib/rbot/core/auth.rb:578
 msgid "I ignored %{things} because %{reason}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:528 lib/rbot/core/auth.rb:575
+#: lib/rbot/core/auth.rb:535 lib/rbot/core/auth.rb:582
 msgid "I haven't changed anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:546
+#: lib/rbot/core/auth.rb:553
 msgid "is that a joke? setting the password in public?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:578
+#: lib/rbot/core/auth.rb:585
 msgid "the password for %{user} is now %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:592
+#: lib/rbot/core/auth.rb:599
 msgid ""
 "I can only add/remove netmasks. See +help user add+ for more instructions"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:613
+#: lib/rbot/core/auth.rb:620
 msgid "sorry, I don't know how to %{request}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:616
+#: lib/rbot/core/auth.rb:623
 msgid "couldn't %{cmd}: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:645
+#: lib/rbot/core/auth.rb:652
 msgid ""
 "you are now registered as %{buname}. I created a random password for you : %"
 "{pass} and you can change it at any time by telling me 'user set password "
 "<password>' in private"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:652
+#: lib/rbot/core/auth.rb:659
 msgid "but I already know %{buname}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:654
+#: lib/rbot/core/auth.rb:661
 msgid "I had problems meeting %{nick}: %{e}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:663
+#: lib/rbot/core/auth.rb:670
 msgid "couldn't find botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:665
+#: lib/rbot/core/auth.rb:672
 msgid "I'm not telling the master password to anyone, pal"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:666
+#: lib/rbot/core/auth.rb:673
 msgid "the password for botuser %{user} is %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:669
+#: lib/rbot/core/auth.rb:676
 msgid "I told %{user} that %{message}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:675
+#: lib/rbot/core/auth.rb:682
 msgid "are you nuts, creating a botuser with a publicly known password?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:680
+#: lib/rbot/core/auth.rb:687
 msgid "failed to create %{user}: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:684
+#: lib/rbot/core/auth.rb:691
 msgid "created botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:692
+#: lib/rbot/core/auth.rb:699
 msgid " (queued for destruction)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:695
+#: lib/rbot/core/auth.rb:702
 msgid "I have no botusers other than the default ones"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:696
+#: lib/rbot/core/auth.rb:703
 #, fuzzy
 msgid "botuser: %{list}"
 msgid_plural "botusers: %{list}"
 msgstr[0] "プラグイン%{count}個：%{list}"
 
-#: lib/rbot/core/auth.rb:703
+#: lib/rbot/core/auth.rb:710
 msgid "You can't destroy %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:713
+#: lib/rbot/core/auth.rb:720
 msgid "no such botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:720
+#: lib/rbot/core/auth.rb:727
 msgid "%{user} removed from the destruction queue"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:722
+#: lib/rbot/core/auth.rb:729
 msgid "%{user} was not queued for destruction"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:727
+#: lib/rbot/core/auth.rb:734
 msgid ""
 "%{user} already queued for destruction, use %{highlight}user confirm destroy "
 "%{user}%{highlight} to destroy it"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:730
+#: lib/rbot/core/auth.rb:737
 msgid ""
 "%{user} queued for destruction, use %{highlight}user confirm destroy %{user}%"
 "{highlight} to destroy it"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:734
+#: lib/rbot/core/auth.rb:741
 msgid "%{user} is not queued for destruction yet"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:743 lib/rbot/core/auth.rb:783
+#: lib/rbot/core/auth.rb:750 lib/rbot/core/auth.rb:790
 msgid "failed: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:745
+#: lib/rbot/core/auth.rb:752
 msgid "botuser %{user} destroyed"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:752
+#: lib/rbot/core/auth.rb:759
 msgid "please don't touch the default users"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:761
+#: lib/rbot/core/auth.rb:768
 msgid "no such botuser %{source}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:763
+#: lib/rbot/core/auth.rb:770
 msgid "botuser %{dest} exists already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:786
+#: lib/rbot/core/auth.rb:793
 msgid "botuser %{source} copied to %{dest}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:789
+#: lib/rbot/core/auth.rb:796
 msgid "botuser %{source} renamed to %{dest}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:809
+#: lib/rbot/core/auth.rb:816
 msgid "selecting data to export ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:825
+#: lib/rbot/core/auth.rb:832
 msgid "preparing data for export ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:848
+#: lib/rbot/core/auth.rb:855
 msgid "failed to prepare data: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:853
+#: lib/rbot/core/auth.rb:860
 msgid "exporting to %{file} ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:860
+#: lib/rbot/core/auth.rb:867
 msgid "failed to export users: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:864 lib/rbot/core/auth.rb:942
+#: lib/rbot/core/auth.rb:871 lib/rbot/core/auth.rb:949
 msgid "done"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:881
+#: lib/rbot/core/auth.rb:888
 msgid "reading %{file} ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:885
+#: lib/rbot/core/auth.rb:892
 msgid "failed to import from: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:892
+#: lib/rbot/core/auth.rb:899
 msgid "selecting data to import ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:902
+#: lib/rbot/core/auth.rb:909
 msgid "parsing data from import ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:922
+#: lib/rbot/core/auth.rb:929
 msgid "failed to parse data: %{exception}"
 msgstr ""
 
@@ -587,49 +587,45 @@ msgid "hide => part all channels"
 msgstr ""
 
 #: lib/rbot/core/basics.rb:117
-msgid "nick <nick> => attempt to change nick to <nick>"
-msgstr ""
-
-#: lib/rbot/core/basics.rb:119
 msgid ""
 "say <channel>|<nick> <message> => say <message> to <channel> or in private "
 "message to <nick>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:121
+#: lib/rbot/core/basics.rb:119
 msgid ""
 "action <channel>|<nick> <message> => does a /me <message> to <channel> or in "
 "private message to <nick>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:123
+#: lib/rbot/core/basics.rb:121
 msgid ""
 "quiet [in here|<channel>] => with no arguments, stop speaking in all "
 "channels, if \"in here\", stop speaking in this channel, or stop speaking in "
 "<channel>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:125
+#: lib/rbot/core/basics.rb:123
 msgid ""
 "talk [in here|<channel>] => with no arguments, resume speaking in all "
 "channels, if \"in here\", resume speaking in this channel, or resume "
 "speaking in <channel>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:127
+#: lib/rbot/core/basics.rb:125
 msgid "ping => replies with a pong"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:129
+#: lib/rbot/core/basics.rb:127
 msgid ""
 "mode <channel> <mode> <nicks> => set channel modes for <nicks> on <channel> "
 "to <mode>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:135
+#: lib/rbot/core/basics.rb:133
 msgid ""
-"%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
-"quiet, talk, ping, mode"
+"%{name}: quit, restart, join, part, hide, save, say, action, topic, quiet, "
+"talk, ping, mode"
 msgstr ""
 
 #: lib/rbot/core/config.rb:12
@@ -697,68 +693,68 @@ msgstr ""
 msgid "done. %{plugin_status}"
 msgstr ""
 
-#: lib/rbot/core/config.rb:220
+#: lib/rbot/core/config.rb:221
 msgid ""
 "config list => list configuration modules, config list <module> => list "
 "configuration keys for module <module>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:222
+#: lib/rbot/core/config.rb:223
 msgid "config get <key> => get configuration value for key <key>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:224
+#: lib/rbot/core/config.rb:225
 msgid "reset key <key> to the default"
 msgstr ""
 
-#: lib/rbot/core/config.rb:226
+#: lib/rbot/core/config.rb:227
 msgid ""
 "config set <key> <value> => set configuration value for key <key> to <value>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:228
+#: lib/rbot/core/config.rb:229
 msgid "config desc <key> => describe what key <key> configures"
 msgstr ""
 
-#: lib/rbot/core/config.rb:230
+#: lib/rbot/core/config.rb:231
 msgid ""
 "config add <value> to <key> => add value <value> to key <key> if <key> is an "
 "array"
 msgstr ""
 
-#: lib/rbot/core/config.rb:232
+#: lib/rbot/core/config.rb:233
 msgid ""
 "config rm <value> from <key> => remove value <value> from key <key> if <key> "
 "is an array"
 msgstr ""
 
-#: lib/rbot/core/config.rb:234
+#: lib/rbot/core/config.rb:235
 msgid ""
 "config module - bot configuration. usage: list, desc, get, set, unset, add, "
 "rm"
 msgstr ""
 
-#: lib/rbot/core/config.rb:239
+#: lib/rbot/core/config.rb:240
 msgid "nick <newnick> => change the bot nick to <newnick>, if possible"
 msgstr ""
 
-#: lib/rbot/core/config.rb:241
+#: lib/rbot/core/config.rb:242
 msgid "status => display some information on the bot's status"
 msgstr ""
 
-#: lib/rbot/core/config.rb:243
+#: lib/rbot/core/config.rb:244
 msgid "save => save current dynamic data and configuration"
 msgstr ""
 
-#: lib/rbot/core/config.rb:245
+#: lib/rbot/core/config.rb:246
 msgid "rescan => reload modules and static facts"
 msgstr ""
 
-#: lib/rbot/core/config.rb:247
+#: lib/rbot/core/config.rb:248
 msgid "version => describes software version"
 msgstr ""
 
-#: lib/rbot/core/config.rb:249
+#: lib/rbot/core/config.rb:250
 msgid "config-related tasks: config, save, rescan, version, nick, status"
 msgstr ""
 
@@ -891,19 +887,19 @@ msgstr ""
 msgid "%{m} days"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1209
+#: lib/rbot/ircbot.rb:1233
 msgid "help topics: "
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1211
+#: lib/rbot/ircbot.rb:1235
 msgid " (help <topic> for more info)"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1214
+#: lib/rbot/ircbot.rb:1238
 msgid "no help for topic %{topic}"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1225
+#: lib/rbot/ircbot.rb:1249
 msgid ""
 "Uptime %{up}, %{plug} plugins active, %{sent} lines sent, %{recv} received."
 msgstr ""
diff --git a/po/rbot-nickrecover.pot b/po/rbot-nickrecover.pot
new file mode 100644
index 00000000..f223d961
--- /dev/null
+++ b/po/rbot-nickrecover.pot
@@ -0,0 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: rbot\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
+"PO-Revision-Date: 2008-07-30 23:38+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: data/rbot/plugins/nickrecover.rb:24
+msgid ""
+"Time in seconds to wait between attempts to recover the nick. set to 0 to "
+"disable nick recovery."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:28
+msgid ""
+"the nickrecover plugin takes care of recovering the bot nick by trying to "
+"change nick until it succeeds."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:29
+msgid "the plugin waits irc.nick_retry seconds between attempts."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:30
+msgid "set irc.nick_retry to 0 to disable it."
+msgstr ""
diff --git a/po/rbot.pot b/po/rbot.pot
index f4d3c4d6..12c2cd20 100644
--- a/po/rbot.pot
+++ b/po/rbot.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-07-07 18:02+0200\n"
-"PO-Revision-Date: 2008-07-07 18:02+0200\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
+"PO-Revision-Date: 2008-07-30 23:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,118 +58,118 @@ msgid ""
 "connected and you are auth'd."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:69
+#: lib/rbot/core/auth.rb:76
 msgid "please do not use + or - in front of command %{command} when resetting"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:71
+#: lib/rbot/core/auth.rb:78
 msgid "+ or - expected in front of %{string}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:84
+#: lib/rbot/core/auth.rb:91
 msgid "'%{string}' doesn't look like a channel name"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:93
+#: lib/rbot/core/auth.rb:100
 msgid "trailing comma"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:94
+#: lib/rbot/core/auth.rb:101
 msgid "you probably forgot a comma"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:109 lib/rbot/core/auth.rb:163
-#: lib/rbot/core/auth.rb:229
+#: lib/rbot/core/auth.rb:116 lib/rbot/core/auth.rb:170
+#: lib/rbot/core/auth.rb:236
 msgid "couldn't find botuser %{name}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:111
+#: lib/rbot/core/auth.rb:118
 msgid "you can't change permissions for %{username}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:118
+#: lib/rbot/core/auth.rb:125
 msgid "couldn't satisfy your request: %{errors}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:157
+#: lib/rbot/core/auth.rb:164
 msgid "you are owner, you can do anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:160
+#: lib/rbot/core/auth.rb:167
 msgid "owner can do anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:171
+#: lib/rbot/core/auth.rb:178
 msgid "on any channel: "
 msgstr ""
 
-#: lib/rbot/core/auth.rb:173
+#: lib/rbot/core/auth.rb:180
 msgid "in private: "
 msgstr ""
 
-#: lib/rbot/core/auth.rb:185
+#: lib/rbot/core/auth.rb:192
 msgid "no permissions set for %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:187
+#: lib/rbot/core/auth.rb:194
 msgid "permissions for %{user}:: %{permissions}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:197
+#: lib/rbot/core/auth.rb:204
 msgid ". only %{max} will be shown"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:198
+#: lib/rbot/core/auth.rb:205
 msgid "%{count} commands found matching %{pattern}%{extra}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:203
+#: lib/rbot/core/auth.rb:210
 msgid "%{cmd}: %{perms}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:260
+#: lib/rbot/core/auth.rb:267
 msgid "%{user} can already do that"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:262
+#: lib/rbot/core/auth.rb:269
 msgid "%{user} can't do that already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:272
+#: lib/rbot/core/auth.rb:279
 msgid ""
 "sorry, %{cmd} doesn't look like a valid command. maybe you misspelled it, or "
 "you need to specify it should be in private?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:295
+#: lib/rbot/core/auth.rb:302
 msgid "welcome, %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:310
+#: lib/rbot/core/auth.rb:317
 msgid "sorry, can't do"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:313
+#: lib/rbot/core/auth.rb:320
 msgid "couldn't login: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:321
+#: lib/rbot/core/auth.rb:328
 msgid "I couldn't find anything to let you login automatically"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:332
+#: lib/rbot/core/auth.rb:339
 msgid "you are %{who}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:334 lib/rbot/core/auth.rb:347
+#: lib/rbot/core/auth.rb:341 lib/rbot/core/auth.rb:354
 msgid "no one that I know"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:335 lib/rbot/core/auth.rb:348
+#: lib/rbot/core/auth.rb:342 lib/rbot/core/auth.rb:355
 msgid "my boss"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:355
+#: lib/rbot/core/auth.rb:362
 msgid ""
 "login [<botuser>] [<pass>]: logs in to the bot as botuser <botuser> with "
 "password <pass>. When using the full form, you must contact the bot in "
@@ -178,68 +178,68 @@ msgid ""
 "be attempted"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:357
+#: lib/rbot/core/auth.rb:364
 msgid "whoami: names the botuser you're linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:359
+#: lib/rbot/core/auth.rb:366
 msgid "who is <user>: names the botuser <user> is linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:363
+#: lib/rbot/core/auth.rb:370
 msgid ""
 "a permission is specified as module::path::to::cmd; when you want to enable "
 "it, prefix it with +; when you want to disable it, prefix it with -; when "
 "using the +reset+ command, do not use any prefix"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:365
+#: lib/rbot/core/auth.rb:372
 msgid ""
 "permissions [re]set <permission> [in <channel>] for <user>: sets or resets "
 "the permissions for botuser <user> in channel <channel> (use ? to change the "
 "permissions for private addressing)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:367
+#: lib/rbot/core/auth.rb:374
 msgid "permissions view [for <user>]: display the permissions for user <user>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:369
+#: lib/rbot/core/auth.rb:376
 msgid ""
 "permissions search <pattern>: display the permissions associated with the "
 "commands matching <pattern>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:371
+#: lib/rbot/core/auth.rb:378
 msgid "permission topics: syntax, (re)set, view, search"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:376
+#: lib/rbot/core/auth.rb:383
 msgid ""
 "user show <what> : shows info about the user; <what> can be any of "
 "autologin, login-by-mask, netmasks"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:378
+#: lib/rbot/core/auth.rb:385
 msgid ""
 "user enable|disable <what> : turns on or off <what> (autologin, login-by-"
 "mask)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:380
+#: lib/rbot/core/auth.rb:387
 msgid ""
 "user set password <blah> : sets the user password to <blah>; passwords can "
 "only contain upper and lowercase letters and numbers, and must be at least 4 "
 "characters long"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:382
+#: lib/rbot/core/auth.rb:389
 msgid ""
 "user add|rm netmask <mask> : adds/removes netmask <mask> from the list of "
 "netmasks known to the botuser you're linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:384
+#: lib/rbot/core/auth.rb:391
 msgid ""
 "user reset <what> : resets <what> to the default values. <what> can be "
 "+netmasks+ (the list will be emptied), +autologin+ or +login-by-mask+ (will "
@@ -247,13 +247,13 @@ msgid ""
 "and you'll be told in private)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:386
+#: lib/rbot/core/auth.rb:393
 msgid ""
 "user tell <who> the password for <botuser> : contacts <who> in private to "
 "tell him/her the password for <botuser>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:388
+#: lib/rbot/core/auth.rb:395
 msgid ""
 "user create <name> <password> : create botuser named <name> with password "
 "<password>. The password can be omitted, in which case a random one will be "
@@ -261,11 +261,11 @@ msgid ""
 "underscore (_)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:390
+#: lib/rbot/core/auth.rb:397
 msgid "user list : lists all the botusers"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:392
+#: lib/rbot/core/auth.rb:399
 msgid ""
 "user destroy <botuser> : destroys <botuser>. This function %{highlight}must%"
 "{highlight} be called in two steps. On the first call <botuser> is queued "
@@ -274,299 +274,299 @@ msgid ""
 "destruction, issue the command 'user cancel destroy <botuser>'"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:394
+#: lib/rbot/core/auth.rb:401
 msgid ""
 "user topics: show, enable|disable, add|rm netmask, set, reset, tell, create, "
 "list, destroy"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:397
+#: lib/rbot/core/auth.rb:404
 msgid ""
 "auth <masterpassword>: log in as the bot owner; other commands: login, "
 "whoami, permissions syntax, permissions [re]set, permissions view, user, "
 "meet, hello, allow, prevent"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:399
+#: lib/rbot/core/auth.rb:406
 msgid ""
 "meet <nick> [as <user>]: creates a bot user for nick, calling it user "
 "(defaults to the nick itself)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:401
+#: lib/rbot/core/auth.rb:408
 msgid "hello: creates a bot user for the person issuing the command"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:403
+#: lib/rbot/core/auth.rb:410
 msgid ""
 "allow <user> to do <sample command> [<where>]: gives botuser <user> the "
 "permissions to execute a command such as the provided sample command (in "
 "private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:405
+#: lib/rbot/core/auth.rb:412
 msgid ""
 "deny <user> from doing <sample command> [<where>]: removes from botuser "
 "<user> the permissions to execute a command such as the provided sample "
 "command (in private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:407
+#: lib/rbot/core/auth.rb:414
 msgid ""
 "auth commands: auth, login, whoami, who, permission[s], user, meet, hello, "
 "allow, deny"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:412
+#: lib/rbot/core/auth.rb:419
 msgid "sorry, I need more arguments to %{command}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:416
+#: lib/rbot/core/auth.rb:423
 msgid "I can only %{command} these: %{arguments}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:451
+#: lib/rbot/core/auth.rb:458
 msgid "no such bot user %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:454
+#: lib/rbot/core/auth.rb:461
 msgid "you can't mess with %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:466
+#: lib/rbot/core/auth.rb:473
 msgid "you can't see the properties of %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:475
+#: lib/rbot/core/auth.rb:482
 msgid "no way I'm telling you the master password!"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:476
+#: lib/rbot/core/auth.rb:483
 msgid "you can't ask for someone else's password"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:478
+#: lib/rbot/core/auth.rb:485
 msgid ""
 "c'mon, you can't be asking me seriously to tell you the password in public!"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:479
+#: lib/rbot/core/auth.rb:486
 msgid "the password for %{user} is %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:493
+#: lib/rbot/core/auth.rb:500
 msgid "can %{action}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:495
+#: lib/rbot/core/auth.rb:502
 msgid "can not %{action}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:499
+#: lib/rbot/core/auth.rb:506
 msgid "knows no netmasks"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:501
+#: lib/rbot/core/auth.rb:508
 msgid "knows %{netmasks}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:508 lib/rbot/core/auth.rb:535
-#: lib/rbot/core/auth.rb:553 lib/rbot/core/auth.rb:585
+#: lib/rbot/core/auth.rb:515 lib/rbot/core/auth.rb:542
+#: lib/rbot/core/auth.rb:560 lib/rbot/core/auth.rb:592
 msgid "you can't change the default user"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:509 lib/rbot/core/auth.rb:537
-#: lib/rbot/core/auth.rb:555 lib/rbot/core/auth.rb:587
+#: lib/rbot/core/auth.rb:516 lib/rbot/core/auth.rb:544
+#: lib/rbot/core/auth.rb:562 lib/rbot/core/auth.rb:594
 msgid "you can't edit %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:524 lib/rbot/core/auth.rb:571
+#: lib/rbot/core/auth.rb:531 lib/rbot/core/auth.rb:578
 msgid "I ignored %{things} because %{reason}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:528 lib/rbot/core/auth.rb:575
+#: lib/rbot/core/auth.rb:535 lib/rbot/core/auth.rb:582
 msgid "I haven't changed anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:546
+#: lib/rbot/core/auth.rb:553
 msgid "is that a joke? setting the password in public?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:578
+#: lib/rbot/core/auth.rb:585
 msgid "the password for %{user} is now %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:592
+#: lib/rbot/core/auth.rb:599
 msgid ""
 "I can only add/remove netmasks. See +help user add+ for more instructions"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:613
+#: lib/rbot/core/auth.rb:620
 msgid "sorry, I don't know how to %{request}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:616
+#: lib/rbot/core/auth.rb:623
 msgid "couldn't %{cmd}: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:645
+#: lib/rbot/core/auth.rb:652
 msgid ""
 "you are now registered as %{buname}. I created a random password for you : %"
 "{pass} and you can change it at any time by telling me 'user set password "
 "<password>' in private"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:652
+#: lib/rbot/core/auth.rb:659
 msgid "but I already know %{buname}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:654
+#: lib/rbot/core/auth.rb:661
 msgid "I had problems meeting %{nick}: %{e}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:663
+#: lib/rbot/core/auth.rb:670
 msgid "couldn't find botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:665
+#: lib/rbot/core/auth.rb:672
 msgid "I'm not telling the master password to anyone, pal"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:666
+#: lib/rbot/core/auth.rb:673
 msgid "the password for botuser %{user} is %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:669
+#: lib/rbot/core/auth.rb:676
 msgid "I told %{user} that %{message}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:675
+#: lib/rbot/core/auth.rb:682
 msgid "are you nuts, creating a botuser with a publicly known password?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:680
+#: lib/rbot/core/auth.rb:687
 msgid "failed to create %{user}: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:684
+#: lib/rbot/core/auth.rb:691
 msgid "created botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:692
+#: lib/rbot/core/auth.rb:699
 msgid " (queued for destruction)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:695
+#: lib/rbot/core/auth.rb:702
 msgid "I have no botusers other than the default ones"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:696
+#: lib/rbot/core/auth.rb:703
 msgid "botuser: %{list}"
 msgid_plural "botusers: %{list}"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/rbot/core/auth.rb:703
+#: lib/rbot/core/auth.rb:710
 msgid "You can't destroy %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:713
+#: lib/rbot/core/auth.rb:720
 msgid "no such botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:720
+#: lib/rbot/core/auth.rb:727
 msgid "%{user} removed from the destruction queue"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:722
+#: lib/rbot/core/auth.rb:729
 msgid "%{user} was not queued for destruction"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:727
+#: lib/rbot/core/auth.rb:734
 msgid ""
 "%{user} already queued for destruction, use %{highlight}user confirm destroy "
 "%{user}%{highlight} to destroy it"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:730
+#: lib/rbot/core/auth.rb:737
 msgid ""
 "%{user} queued for destruction, use %{highlight}user confirm destroy %{user}%"
 "{highlight} to destroy it"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:734
+#: lib/rbot/core/auth.rb:741
 msgid "%{user} is not queued for destruction yet"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:743 lib/rbot/core/auth.rb:783
+#: lib/rbot/core/auth.rb:750 lib/rbot/core/auth.rb:790
 msgid "failed: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:745
+#: lib/rbot/core/auth.rb:752
 msgid "botuser %{user} destroyed"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:752
+#: lib/rbot/core/auth.rb:759
 msgid "please don't touch the default users"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:761
+#: lib/rbot/core/auth.rb:768
 msgid "no such botuser %{source}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:763
+#: lib/rbot/core/auth.rb:770
 msgid "botuser %{dest} exists already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:786
+#: lib/rbot/core/auth.rb:793
 msgid "botuser %{source} copied to %{dest}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:789
+#: lib/rbot/core/auth.rb:796
 msgid "botuser %{source} renamed to %{dest}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:809
+#: lib/rbot/core/auth.rb:816
 msgid "selecting data to export ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:825
+#: lib/rbot/core/auth.rb:832
 msgid "preparing data for export ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:848
+#: lib/rbot/core/auth.rb:855
 msgid "failed to prepare data: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:853
+#: lib/rbot/core/auth.rb:860
 msgid "exporting to %{file} ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:860
+#: lib/rbot/core/auth.rb:867
 msgid "failed to export users: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:864 lib/rbot/core/auth.rb:942
+#: lib/rbot/core/auth.rb:871 lib/rbot/core/auth.rb:949
 msgid "done"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:881
+#: lib/rbot/core/auth.rb:888
 msgid "reading %{file} ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:885
+#: lib/rbot/core/auth.rb:892
 msgid "failed to import from: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:892
+#: lib/rbot/core/auth.rb:899
 msgid "selecting data to import ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:902
+#: lib/rbot/core/auth.rb:909
 msgid "parsing data from import ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:922
+#: lib/rbot/core/auth.rb:929
 msgid "failed to parse data: %{exception}"
 msgstr ""
 
@@ -587,49 +587,45 @@ msgid "hide => part all channels"
 msgstr ""
 
 #: lib/rbot/core/basics.rb:117
-msgid "nick <nick> => attempt to change nick to <nick>"
-msgstr ""
-
-#: lib/rbot/core/basics.rb:119
 msgid ""
 "say <channel>|<nick> <message> => say <message> to <channel> or in private "
 "message to <nick>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:121
+#: lib/rbot/core/basics.rb:119
 msgid ""
 "action <channel>|<nick> <message> => does a /me <message> to <channel> or in "
 "private message to <nick>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:123
+#: lib/rbot/core/basics.rb:121
 msgid ""
 "quiet [in here|<channel>] => with no arguments, stop speaking in all "
 "channels, if \"in here\", stop speaking in this channel, or stop speaking in "
 "<channel>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:125
+#: lib/rbot/core/basics.rb:123
 msgid ""
 "talk [in here|<channel>] => with no arguments, resume speaking in all "
 "channels, if \"in here\", resume speaking in this channel, or resume "
 "speaking in <channel>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:127
+#: lib/rbot/core/basics.rb:125
 msgid "ping => replies with a pong"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:129
+#: lib/rbot/core/basics.rb:127
 msgid ""
 "mode <channel> <mode> <nicks> => set channel modes for <nicks> on <channel> "
 "to <mode>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:135
+#: lib/rbot/core/basics.rb:133
 msgid ""
-"%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
-"quiet, talk, ping, mode"
+"%{name}: quit, restart, join, part, hide, save, say, action, topic, quiet, "
+"talk, ping, mode"
 msgstr ""
 
 #: lib/rbot/core/config.rb:12
@@ -696,68 +692,68 @@ msgstr ""
 msgid "done. %{plugin_status}"
 msgstr ""
 
-#: lib/rbot/core/config.rb:220
+#: lib/rbot/core/config.rb:221
 msgid ""
 "config list => list configuration modules, config list <module> => list "
 "configuration keys for module <module>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:222
+#: lib/rbot/core/config.rb:223
 msgid "config get <key> => get configuration value for key <key>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:224
+#: lib/rbot/core/config.rb:225
 msgid "reset key <key> to the default"
 msgstr ""
 
-#: lib/rbot/core/config.rb:226
+#: lib/rbot/core/config.rb:227
 msgid ""
 "config set <key> <value> => set configuration value for key <key> to <value>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:228
+#: lib/rbot/core/config.rb:229
 msgid "config desc <key> => describe what key <key> configures"
 msgstr ""
 
-#: lib/rbot/core/config.rb:230
+#: lib/rbot/core/config.rb:231
 msgid ""
 "config add <value> to <key> => add value <value> to key <key> if <key> is an "
 "array"
 msgstr ""
 
-#: lib/rbot/core/config.rb:232
+#: lib/rbot/core/config.rb:233
 msgid ""
 "config rm <value> from <key> => remove value <value> from key <key> if <key> "
 "is an array"
 msgstr ""
 
-#: lib/rbot/core/config.rb:234
+#: lib/rbot/core/config.rb:235
 msgid ""
 "config module - bot configuration. usage: list, desc, get, set, unset, add, "
 "rm"
 msgstr ""
 
-#: lib/rbot/core/config.rb:239
+#: lib/rbot/core/config.rb:240
 msgid "nick <newnick> => change the bot nick to <newnick>, if possible"
 msgstr ""
 
-#: lib/rbot/core/config.rb:241
+#: lib/rbot/core/config.rb:242
 msgid "status => display some information on the bot's status"
 msgstr ""
 
-#: lib/rbot/core/config.rb:243
+#: lib/rbot/core/config.rb:244
 msgid "save => save current dynamic data and configuration"
 msgstr ""
 
-#: lib/rbot/core/config.rb:245
+#: lib/rbot/core/config.rb:246
 msgid "rescan => reload modules and static facts"
 msgstr ""
 
-#: lib/rbot/core/config.rb:247
+#: lib/rbot/core/config.rb:248
 msgid "version => describes software version"
 msgstr ""
 
-#: lib/rbot/core/config.rb:249
+#: lib/rbot/core/config.rb:250
 msgid "config-related tasks: config, save, rescan, version, nick, status"
 msgstr ""
 
@@ -889,19 +885,19 @@ msgstr ""
 msgid "%{m} days"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1209
+#: lib/rbot/ircbot.rb:1233
 msgid "help topics: "
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1211
+#: lib/rbot/ircbot.rb:1235
 msgid " (help <topic> for more info)"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1214
+#: lib/rbot/ircbot.rb:1238
 msgid "no help for topic %{topic}"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1225
+#: lib/rbot/ircbot.rb:1249
 msgid ""
 "Uptime %{up}, %{plug} plugins active, %{sent} lines sent, %{recv} received."
 msgstr ""
diff --git a/po/zh_CN/rbot-nickrecover.po b/po/zh_CN/rbot-nickrecover.po
new file mode 100644
index 00000000..15e19578
--- /dev/null
+++ b/po/zh_CN/rbot-nickrecover.po
@@ -0,0 +1,36 @@
+# Chinese translations for PACKAGE package.
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rbot\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
+"PO-Revision-Date: 2008-07-30 23:38+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: data/rbot/plugins/nickrecover.rb:24
+msgid ""
+"Time in seconds to wait between attempts to recover the nick. set to 0 to "
+"disable nick recovery."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:28
+msgid ""
+"the nickrecover plugin takes care of recovering the bot nick by trying to "
+"change nick until it succeeds."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:29
+msgid "the plugin waits irc.nick_retry seconds between attempts."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:30
+msgid "set irc.nick_retry to 0 to disable it."
+msgstr ""
diff --git a/po/zh_CN/rbot.po b/po/zh_CN/rbot.po
index 3442bf46..bce4869b 100644
--- a/po/zh_CN/rbot.po
+++ b/po/zh_CN/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-07-07 18:02+0200\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
 "PO-Revision-Date: 2007-07-09 01:39-0400\n"
 "Last-Translator: Yaohan Chen <yaohan.chen@gmail.com>\n"
 "Language-Team: Chinese\n"
@@ -57,118 +57,118 @@ msgid ""
 "connected and you are auth'd."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:69
+#: lib/rbot/core/auth.rb:76
 msgid "please do not use + or - in front of command %{command} when resetting"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:71
+#: lib/rbot/core/auth.rb:78
 msgid "+ or - expected in front of %{string}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:84
+#: lib/rbot/core/auth.rb:91
 msgid "'%{string}' doesn't look like a channel name"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:93
+#: lib/rbot/core/auth.rb:100
 msgid "trailing comma"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:94
+#: lib/rbot/core/auth.rb:101
 msgid "you probably forgot a comma"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:109 lib/rbot/core/auth.rb:163
-#: lib/rbot/core/auth.rb:229
+#: lib/rbot/core/auth.rb:116 lib/rbot/core/auth.rb:170
+#: lib/rbot/core/auth.rb:236
 msgid "couldn't find botuser %{name}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:111
+#: lib/rbot/core/auth.rb:118
 msgid "you can't change permissions for %{username}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:118
+#: lib/rbot/core/auth.rb:125
 msgid "couldn't satisfy your request: %{errors}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:157
+#: lib/rbot/core/auth.rb:164
 msgid "you are owner, you can do anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:160
+#: lib/rbot/core/auth.rb:167
 msgid "owner can do anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:171
+#: lib/rbot/core/auth.rb:178
 msgid "on any channel: "
 msgstr ""
 
-#: lib/rbot/core/auth.rb:173
+#: lib/rbot/core/auth.rb:180
 msgid "in private: "
 msgstr ""
 
-#: lib/rbot/core/auth.rb:185
+#: lib/rbot/core/auth.rb:192
 msgid "no permissions set for %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:187
+#: lib/rbot/core/auth.rb:194
 msgid "permissions for %{user}:: %{permissions}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:197
+#: lib/rbot/core/auth.rb:204
 msgid ". only %{max} will be shown"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:198
+#: lib/rbot/core/auth.rb:205
 msgid "%{count} commands found matching %{pattern}%{extra}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:203
+#: lib/rbot/core/auth.rb:210
 msgid "%{cmd}: %{perms}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:260
+#: lib/rbot/core/auth.rb:267
 msgid "%{user} can already do that"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:262
+#: lib/rbot/core/auth.rb:269
 msgid "%{user} can't do that already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:272
+#: lib/rbot/core/auth.rb:279
 msgid ""
 "sorry, %{cmd} doesn't look like a valid command. maybe you misspelled it, or "
 "you need to specify it should be in private?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:295
+#: lib/rbot/core/auth.rb:302
 msgid "welcome, %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:310
+#: lib/rbot/core/auth.rb:317
 msgid "sorry, can't do"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:313
+#: lib/rbot/core/auth.rb:320
 msgid "couldn't login: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:321
+#: lib/rbot/core/auth.rb:328
 msgid "I couldn't find anything to let you login automatically"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:332
+#: lib/rbot/core/auth.rb:339
 msgid "you are %{who}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:334 lib/rbot/core/auth.rb:347
+#: lib/rbot/core/auth.rb:341 lib/rbot/core/auth.rb:354
 msgid "no one that I know"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:335 lib/rbot/core/auth.rb:348
+#: lib/rbot/core/auth.rb:342 lib/rbot/core/auth.rb:355
 msgid "my boss"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:355
+#: lib/rbot/core/auth.rb:362
 msgid ""
 "login [<botuser>] [<pass>]: logs in to the bot as botuser <botuser> with "
 "password <pass>. When using the full form, you must contact the bot in "
@@ -177,68 +177,68 @@ msgid ""
 "be attempted"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:357
+#: lib/rbot/core/auth.rb:364
 msgid "whoami: names the botuser you're linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:359
+#: lib/rbot/core/auth.rb:366
 msgid "who is <user>: names the botuser <user> is linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:363
+#: lib/rbot/core/auth.rb:370
 msgid ""
 "a permission is specified as module::path::to::cmd; when you want to enable "
 "it, prefix it with +; when you want to disable it, prefix it with -; when "
 "using the +reset+ command, do not use any prefix"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:365
+#: lib/rbot/core/auth.rb:372
 msgid ""
 "permissions [re]set <permission> [in <channel>] for <user>: sets or resets "
 "the permissions for botuser <user> in channel <channel> (use ? to change the "
 "permissions for private addressing)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:367
+#: lib/rbot/core/auth.rb:374
 msgid "permissions view [for <user>]: display the permissions for user <user>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:369
+#: lib/rbot/core/auth.rb:376
 msgid ""
 "permissions search <pattern>: display the permissions associated with the "
 "commands matching <pattern>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:371
+#: lib/rbot/core/auth.rb:378
 msgid "permission topics: syntax, (re)set, view, search"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:376
+#: lib/rbot/core/auth.rb:383
 msgid ""
 "user show <what> : shows info about the user; <what> can be any of "
 "autologin, login-by-mask, netmasks"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:378
+#: lib/rbot/core/auth.rb:385
 msgid ""
 "user enable|disable <what> : turns on or off <what> (autologin, login-by-"
 "mask)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:380
+#: lib/rbot/core/auth.rb:387
 msgid ""
 "user set password <blah> : sets the user password to <blah>; passwords can "
 "only contain upper and lowercase letters and numbers, and must be at least 4 "
 "characters long"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:382
+#: lib/rbot/core/auth.rb:389
 msgid ""
 "user add|rm netmask <mask> : adds/removes netmask <mask> from the list of "
 "netmasks known to the botuser you're linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:384
+#: lib/rbot/core/auth.rb:391
 msgid ""
 "user reset <what> : resets <what> to the default values. <what> can be "
 "+netmasks+ (the list will be emptied), +autologin+ or +login-by-mask+ (will "
@@ -246,13 +246,13 @@ msgid ""
 "and you'll be told in private)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:386
+#: lib/rbot/core/auth.rb:393
 msgid ""
 "user tell <who> the password for <botuser> : contacts <who> in private to "
 "tell him/her the password for <botuser>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:388
+#: lib/rbot/core/auth.rb:395
 msgid ""
 "user create <name> <password> : create botuser named <name> with password "
 "<password>. The password can be omitted, in which case a random one will be "
@@ -260,11 +260,11 @@ msgid ""
 "underscore (_)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:390
+#: lib/rbot/core/auth.rb:397
 msgid "user list : lists all the botusers"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:392
+#: lib/rbot/core/auth.rb:399
 msgid ""
 "user destroy <botuser> : destroys <botuser>. This function %{highlight}must%"
 "{highlight} be called in two steps. On the first call <botuser> is queued "
@@ -273,299 +273,299 @@ msgid ""
 "destruction, issue the command 'user cancel destroy <botuser>'"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:394
+#: lib/rbot/core/auth.rb:401
 msgid ""
 "user topics: show, enable|disable, add|rm netmask, set, reset, tell, create, "
 "list, destroy"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:397
+#: lib/rbot/core/auth.rb:404
 msgid ""
 "auth <masterpassword>: log in as the bot owner; other commands: login, "
 "whoami, permissions syntax, permissions [re]set, permissions view, user, "
 "meet, hello, allow, prevent"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:399
+#: lib/rbot/core/auth.rb:406
 msgid ""
 "meet <nick> [as <user>]: creates a bot user for nick, calling it user "
 "(defaults to the nick itself)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:401
+#: lib/rbot/core/auth.rb:408
 msgid "hello: creates a bot user for the person issuing the command"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:403
+#: lib/rbot/core/auth.rb:410
 msgid ""
 "allow <user> to do <sample command> [<where>]: gives botuser <user> the "
 "permissions to execute a command such as the provided sample command (in "
 "private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:405
+#: lib/rbot/core/auth.rb:412
 msgid ""
 "deny <user> from doing <sample command> [<where>]: removes from botuser "
 "<user> the permissions to execute a command such as the provided sample "
 "command (in private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:407
+#: lib/rbot/core/auth.rb:414
 msgid ""
 "auth commands: auth, login, whoami, who, permission[s], user, meet, hello, "
 "allow, deny"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:412
+#: lib/rbot/core/auth.rb:419
 msgid "sorry, I need more arguments to %{command}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:416
+#: lib/rbot/core/auth.rb:423
 msgid "I can only %{command} these: %{arguments}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:451
+#: lib/rbot/core/auth.rb:458
 msgid "no such bot user %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:454
+#: lib/rbot/core/auth.rb:461
 msgid "you can't mess with %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:466
+#: lib/rbot/core/auth.rb:473
 msgid "you can't see the properties of %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:475
+#: lib/rbot/core/auth.rb:482
 msgid "no way I'm telling you the master password!"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:476
+#: lib/rbot/core/auth.rb:483
 msgid "you can't ask for someone else's password"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:478
+#: lib/rbot/core/auth.rb:485
 msgid ""
 "c'mon, you can't be asking me seriously to tell you the password in public!"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:479
+#: lib/rbot/core/auth.rb:486
 msgid "the password for %{user} is %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:493
+#: lib/rbot/core/auth.rb:500
 msgid "can %{action}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:495
+#: lib/rbot/core/auth.rb:502
 msgid "can not %{action}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:499
+#: lib/rbot/core/auth.rb:506
 msgid "knows no netmasks"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:501
+#: lib/rbot/core/auth.rb:508
 msgid "knows %{netmasks}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:508 lib/rbot/core/auth.rb:535
-#: lib/rbot/core/auth.rb:553 lib/rbot/core/auth.rb:585
+#: lib/rbot/core/auth.rb:515 lib/rbot/core/auth.rb:542
+#: lib/rbot/core/auth.rb:560 lib/rbot/core/auth.rb:592
 msgid "you can't change the default user"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:509 lib/rbot/core/auth.rb:537
-#: lib/rbot/core/auth.rb:555 lib/rbot/core/auth.rb:587
+#: lib/rbot/core/auth.rb:516 lib/rbot/core/auth.rb:544
+#: lib/rbot/core/auth.rb:562 lib/rbot/core/auth.rb:594
 msgid "you can't edit %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:524 lib/rbot/core/auth.rb:571
+#: lib/rbot/core/auth.rb:531 lib/rbot/core/auth.rb:578
 msgid "I ignored %{things} because %{reason}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:528 lib/rbot/core/auth.rb:575
+#: lib/rbot/core/auth.rb:535 lib/rbot/core/auth.rb:582
 msgid "I haven't changed anything"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:546
+#: lib/rbot/core/auth.rb:553
 msgid "is that a joke? setting the password in public?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:578
+#: lib/rbot/core/auth.rb:585
 msgid "the password for %{user} is now %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:592
+#: lib/rbot/core/auth.rb:599
 msgid ""
 "I can only add/remove netmasks. See +help user add+ for more instructions"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:613
+#: lib/rbot/core/auth.rb:620
 msgid "sorry, I don't know how to %{request}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:616
+#: lib/rbot/core/auth.rb:623
 msgid "couldn't %{cmd}: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:645
+#: lib/rbot/core/auth.rb:652
 msgid ""
 "you are now registered as %{buname}. I created a random password for you : %"
 "{pass} and you can change it at any time by telling me 'user set password "
 "<password>' in private"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:652
+#: lib/rbot/core/auth.rb:659
 msgid "but I already know %{buname}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:654
+#: lib/rbot/core/auth.rb:661
 msgid "I had problems meeting %{nick}: %{e}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:663
+#: lib/rbot/core/auth.rb:670
 msgid "couldn't find botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:665
+#: lib/rbot/core/auth.rb:672
 msgid "I'm not telling the master password to anyone, pal"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:666
+#: lib/rbot/core/auth.rb:673
 msgid "the password for botuser %{user} is %{password}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:669
+#: lib/rbot/core/auth.rb:676
 msgid "I told %{user} that %{message}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:675
+#: lib/rbot/core/auth.rb:682
 msgid "are you nuts, creating a botuser with a publicly known password?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:680
+#: lib/rbot/core/auth.rb:687
 msgid "failed to create %{user}: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:684
+#: lib/rbot/core/auth.rb:691
 msgid "created botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:692
+#: lib/rbot/core/auth.rb:699
 msgid " (queued for destruction)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:695
+#: lib/rbot/core/auth.rb:702
 msgid "I have no botusers other than the default ones"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:696
+#: lib/rbot/core/auth.rb:703
 msgid "botuser: %{list}"
 msgid_plural "botusers: %{list}"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/rbot/core/auth.rb:703
+#: lib/rbot/core/auth.rb:710
 msgid "You can't destroy %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:713
+#: lib/rbot/core/auth.rb:720
 msgid "no such botuser %{user}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:720
+#: lib/rbot/core/auth.rb:727
 msgid "%{user} removed from the destruction queue"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:722
+#: lib/rbot/core/auth.rb:729
 msgid "%{user} was not queued for destruction"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:727
+#: lib/rbot/core/auth.rb:734
 msgid ""
 "%{user} already queued for destruction, use %{highlight}user confirm destroy "
 "%{user}%{highlight} to destroy it"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:730
+#: lib/rbot/core/auth.rb:737
 msgid ""
 "%{user} queued for destruction, use %{highlight}user confirm destroy %{user}%"
 "{highlight} to destroy it"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:734
+#: lib/rbot/core/auth.rb:741
 msgid "%{user} is not queued for destruction yet"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:743 lib/rbot/core/auth.rb:783
+#: lib/rbot/core/auth.rb:750 lib/rbot/core/auth.rb:790
 msgid "failed: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:745
+#: lib/rbot/core/auth.rb:752
 msgid "botuser %{user} destroyed"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:752
+#: lib/rbot/core/auth.rb:759
 msgid "please don't touch the default users"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:761
+#: lib/rbot/core/auth.rb:768
 msgid "no such botuser %{source}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:763
+#: lib/rbot/core/auth.rb:770
 msgid "botuser %{dest} exists already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:786
+#: lib/rbot/core/auth.rb:793
 msgid "botuser %{source} copied to %{dest}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:789
+#: lib/rbot/core/auth.rb:796
 msgid "botuser %{source} renamed to %{dest}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:809
+#: lib/rbot/core/auth.rb:816
 msgid "selecting data to export ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:825
+#: lib/rbot/core/auth.rb:832
 msgid "preparing data for export ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:848
+#: lib/rbot/core/auth.rb:855
 msgid "failed to prepare data: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:853
+#: lib/rbot/core/auth.rb:860
 msgid "exporting to %{file} ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:860
+#: lib/rbot/core/auth.rb:867
 msgid "failed to export users: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:864 lib/rbot/core/auth.rb:942
+#: lib/rbot/core/auth.rb:871 lib/rbot/core/auth.rb:949
 msgid "done"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:881
+#: lib/rbot/core/auth.rb:888
 msgid "reading %{file} ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:885
+#: lib/rbot/core/auth.rb:892
 msgid "failed to import from: %{exception}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:892
+#: lib/rbot/core/auth.rb:899
 msgid "selecting data to import ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:902
+#: lib/rbot/core/auth.rb:909
 msgid "parsing data from import ..."
 msgstr ""
 
-#: lib/rbot/core/auth.rb:922
+#: lib/rbot/core/auth.rb:929
 msgid "failed to parse data: %{exception}"
 msgstr ""
 
@@ -586,49 +586,45 @@ msgid "hide => part all channels"
 msgstr ""
 
 #: lib/rbot/core/basics.rb:117
-msgid "nick <nick> => attempt to change nick to <nick>"
-msgstr ""
-
-#: lib/rbot/core/basics.rb:119
 msgid ""
 "say <channel>|<nick> <message> => say <message> to <channel> or in private "
 "message to <nick>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:121
+#: lib/rbot/core/basics.rb:119
 msgid ""
 "action <channel>|<nick> <message> => does a /me <message> to <channel> or in "
 "private message to <nick>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:123
+#: lib/rbot/core/basics.rb:121
 msgid ""
 "quiet [in here|<channel>] => with no arguments, stop speaking in all "
 "channels, if \"in here\", stop speaking in this channel, or stop speaking in "
 "<channel>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:125
+#: lib/rbot/core/basics.rb:123
 msgid ""
 "talk [in here|<channel>] => with no arguments, resume speaking in all "
 "channels, if \"in here\", resume speaking in this channel, or resume "
 "speaking in <channel>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:127
+#: lib/rbot/core/basics.rb:125
 msgid "ping => replies with a pong"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:129
+#: lib/rbot/core/basics.rb:127
 msgid ""
 "mode <channel> <mode> <nicks> => set channel modes for <nicks> on <channel> "
 "to <mode>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:135
+#: lib/rbot/core/basics.rb:133
 msgid ""
-"%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
-"quiet, talk, ping, mode"
+"%{name}: quit, restart, join, part, hide, save, say, action, topic, quiet, "
+"talk, ping, mode"
 msgstr ""
 
 #: lib/rbot/core/config.rb:12
@@ -696,68 +692,68 @@ msgstr ""
 msgid "done. %{plugin_status}"
 msgstr ""
 
-#: lib/rbot/core/config.rb:220
+#: lib/rbot/core/config.rb:221
 msgid ""
 "config list => list configuration modules, config list <module> => list "
 "configuration keys for module <module>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:222
+#: lib/rbot/core/config.rb:223
 msgid "config get <key> => get configuration value for key <key>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:224
+#: lib/rbot/core/config.rb:225
 msgid "reset key <key> to the default"
 msgstr ""
 
-#: lib/rbot/core/config.rb:226
+#: lib/rbot/core/config.rb:227
 msgid ""
 "config set <key> <value> => set configuration value for key <key> to <value>"
 msgstr ""
 
-#: lib/rbot/core/config.rb:228
+#: lib/rbot/core/config.rb:229
 msgid "config desc <key> => describe what key <key> configures"
 msgstr ""
 
-#: lib/rbot/core/config.rb:230
+#: lib/rbot/core/config.rb:231
 msgid ""
 "config add <value> to <key> => add value <value> to key <key> if <key> is an "
 "array"
 msgstr ""
 
-#: lib/rbot/core/config.rb:232
+#: lib/rbot/core/config.rb:233
 msgid ""
 "config rm <value> from <key> => remove value <value> from key <key> if <key> "
 "is an array"
 msgstr ""
 
-#: lib/rbot/core/config.rb:234
+#: lib/rbot/core/config.rb:235
 msgid ""
 "config module - bot configuration. usage: list, desc, get, set, unset, add, "
 "rm"
 msgstr ""
 
-#: lib/rbot/core/config.rb:239
+#: lib/rbot/core/config.rb:240
 msgid "nick <newnick> => change the bot nick to <newnick>, if possible"
 msgstr ""
 
-#: lib/rbot/core/config.rb:241
+#: lib/rbot/core/config.rb:242
 msgid "status => display some information on the bot's status"
 msgstr ""
 
-#: lib/rbot/core/config.rb:243
+#: lib/rbot/core/config.rb:244
 msgid "save => save current dynamic data and configuration"
 msgstr ""
 
-#: lib/rbot/core/config.rb:245
+#: lib/rbot/core/config.rb:246
 msgid "rescan => reload modules and static facts"
 msgstr ""
 
-#: lib/rbot/core/config.rb:247
+#: lib/rbot/core/config.rb:248
 msgid "version => describes software version"
 msgstr ""
 
-#: lib/rbot/core/config.rb:249
+#: lib/rbot/core/config.rb:250
 msgid "config-related tasks: config, save, rescan, version, nick, status"
 msgstr ""
 
@@ -889,19 +885,19 @@ msgstr ""
 msgid "%{m} days"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1209
+#: lib/rbot/ircbot.rb:1233
 msgid "help topics: "
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1211
+#: lib/rbot/ircbot.rb:1235
 msgid " (help <topic> for more info)"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1214
+#: lib/rbot/ircbot.rb:1238
 msgid "no help for topic %{topic}"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1225
+#: lib/rbot/ircbot.rb:1249
 msgid ""
 "Uptime %{up}, %{plug} plugins active, %{sent} lines sent, %{recv} received."
 msgstr ""
diff --git a/po/zh_TW/rbot-nickrecover.po b/po/zh_TW/rbot-nickrecover.po
new file mode 100644
index 00000000..15e19578
--- /dev/null
+++ b/po/zh_TW/rbot-nickrecover.po
@@ -0,0 +1,36 @@
+# Chinese translations for PACKAGE package.
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rbot\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
+"PO-Revision-Date: 2008-07-30 23:38+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: data/rbot/plugins/nickrecover.rb:24
+msgid ""
+"Time in seconds to wait between attempts to recover the nick. set to 0 to "
+"disable nick recovery."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:28
+msgid ""
+"the nickrecover plugin takes care of recovering the bot nick by trying to "
+"change nick until it succeeds."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:29
+msgid "the plugin waits irc.nick_retry seconds between attempts."
+msgstr ""
+
+#: data/rbot/plugins/nickrecover.rb:30
+msgid "set irc.nick_retry to 0 to disable it."
+msgstr ""
diff --git a/po/zh_TW/rbot.po b/po/zh_TW/rbot.po
index efad81f9..6eed89ee 100644
--- a/po/zh_TW/rbot.po
+++ b/po/zh_TW/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-07-07 18:02+0200\n"
+"POT-Creation-Date: 2008-07-30 23:38+0200\n"
 "PO-Revision-Date: 2007-07-09 01:24-0400\n"
 "Last-Translator: Liang-Bin Hsueh <hlb@handlino.com>\n"
 "Language-Team: Chinese\n"
@@ -61,118 +61,118 @@ msgid ""
 "connected and you are auth'd."
 msgstr "一旦機器人連上 IRC，只要你認證成功，就可以修改其餘的設定。"
 
-#: lib/rbot/core/auth.rb:69
+#: lib/rbot/core/auth.rb:76
 msgid "please do not use + or - in front of command %{command} when resetting"
 msgstr "請勿在重設的時候，在 #{command} 前面使用 + 或 -"
 
-#: lib/rbot/core/auth.rb:71
+#: lib/rbot/core/auth.rb:78
 msgid "+ or - expected in front of %{string}"
 msgstr "%{string} 前面應該有 + 或 -"
 
-#: lib/rbot/core/auth.rb:84
+#: lib/rbot/core/auth.rb:91
 msgid "'%{string}' doesn't look like a channel name"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:93
+#: lib/rbot/core/auth.rb:100
 msgid "trailing comma"
 msgstr "結尾有逗點"
 
-#: lib/rbot/core/auth.rb:94
+#: lib/rbot/core/auth.rb:101
 msgid "you probably forgot a comma"
 msgstr "你也許忘了一個逗點"
 
-#: lib/rbot/core/auth.rb:109 lib/rbot/core/auth.rb:163
-#: lib/rbot/core/auth.rb:229
+#: lib/rbot/core/auth.rb:116 lib/rbot/core/auth.rb:170
+#: lib/rbot/core/auth.rb:236
 msgid "couldn't find botuser %{name}"
 msgstr "無法找到使用者 ${name}"
 
-#: lib/rbot/core/auth.rb:111
+#: lib/rbot/core/auth.rb:118
 msgid "you can't change permissions for %{username}"
 msgstr "你無法替 ${username} 改變權限"
 
-#: lib/rbot/core/auth.rb:118
+#: lib/rbot/core/auth.rb:125
 msgid "couldn't satisfy your request: %{errors}"
 msgstr "無法滿足你的要求: %{errors}"
 
-#: lib/rbot/core/auth.rb:157
+#: lib/rbot/core/auth.rb:164
 msgid "you are owner, you can do anything"
 msgstr "你是擁有者，你可以做任何事"
 
-#: lib/rbot/core/auth.rb:160
+#: lib/rbot/core/auth.rb:167
 msgid "owner can do anything"
 msgstr "擁有者可以做任何事"
 
-#: lib/rbot/core/auth.rb:171
+#: lib/rbot/core/auth.rb:178
 msgid "on any channel: "
 msgstr "在任何頻道: "
 
-#: lib/rbot/core/auth.rb:173
+#: lib/rbot/core/auth.rb:180
 msgid "in private: "
 msgstr "在私人頻道:"
 
-#: lib/rbot/core/auth.rb:185
+#: lib/rbot/core/auth.rb:192
 msgid "no permissions set for %{user}"
 msgstr "沒有為 ${user} 設定權限"
 
-#: lib/rbot/core/auth.rb:187
+#: lib/rbot/core/auth.rb:194
 msgid "permissions for %{user}:: %{permissions}"
 msgstr "${user} 的權限:: ${permission}"
 
-#: lib/rbot/core/auth.rb:197
+#: lib/rbot/core/auth.rb:204
 msgid ". only %{max} will be shown"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:198
+#: lib/rbot/core/auth.rb:205
 msgid "%{count} commands found matching %{pattern}%{extra}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:203
+#: lib/rbot/core/auth.rb:210
 msgid "%{cmd}: %{perms}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:260
+#: lib/rbot/core/auth.rb:267
 msgid "%{user} can already do that"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:262
+#: lib/rbot/core/auth.rb:269
 msgid "%{user} can't do that already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:272
+#: lib/rbot/core/auth.rb:279
 msgid ""
 "sorry, %{cmd} doesn't look like a valid command. maybe you misspelled it, or "
 "you need to specify it should be in private?"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:295
+#: lib/rbot/core/auth.rb:302
 msgid "welcome, %{user}"
 msgstr "歡迎，%{user}"
 
-#: lib/rbot/core/auth.rb:310
+#: lib/rbot/core/auth.rb:317
 msgid "sorry, can't do"
 msgstr "抱歉，辦不到"
 
-#: lib/rbot/core/auth.rb:313
+#: lib/rbot/core/auth.rb:320
 msgid "couldn't login: %{exception}"
 msgstr "無法登入: %{exception}"
 
-#: lib/rbot/core/auth.rb:321
+#: lib/rbot/core/auth.rb:328
 msgid "I couldn't find anything to let you login automatically"
 msgstr "我不知道有什麼辦法可以讓你自動登入"
 
-#: lib/rbot/core/auth.rb:332
+#: lib/rbot/core/auth.rb:339
 msgid "you are %{who}"
 msgstr "你是%{who}"
 
-#: lib/rbot/core/auth.rb:334 lib/rbot/core/auth.rb:347
+#: lib/rbot/core/auth.rb:341 lib/rbot/core/auth.rb:354
 msgid "no one that I know"
 msgstr "我不認識認識的人"
 
-#: lib/rbot/core/auth.rb:335 lib/rbot/core/auth.rb:348
+#: lib/rbot/core/auth.rb:342 lib/rbot/core/auth.rb:355
 msgid "my boss"
 msgstr "我老大"
 
-#: lib/rbot/core/auth.rb:355
+#: lib/rbot/core/auth.rb:362
 msgid ""
 "login [<botuser>] [<pass>]: logs in to the bot as botuser <botuser> with "
 "password <pass>. When using the full form, you must contact the bot in "
@@ -181,69 +181,69 @@ msgid ""
 "be attempted"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:357
+#: lib/rbot/core/auth.rb:364
 msgid "whoami: names the botuser you're linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:359
+#: lib/rbot/core/auth.rb:366
 msgid "who is <user>: names the botuser <user> is linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:363
+#: lib/rbot/core/auth.rb:370
 msgid ""
 "a permission is specified as module::path::to::cmd; when you want to enable "
 "it, prefix it with +; when you want to disable it, prefix it with -; when "
 "using the +reset+ command, do not use any prefix"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:365
+#: lib/rbot/core/auth.rb:372
 msgid ""
 "permissions [re]set <permission> [in <channel>] for <user>: sets or resets "
 "the permissions for botuser <user> in channel <channel> (use ? to change the "
 "permissions for private addressing)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:367
+#: lib/rbot/core/auth.rb:374
 #, fuzzy
 msgid "permissions view [for <user>]: display the permissions for user <user>"
 msgstr "${user} 的權限:: ${permission}"
 
-#: lib/rbot/core/auth.rb:369
+#: lib/rbot/core/auth.rb:376
 msgid ""
 "permissions search <pattern>: display the permissions associated with the "
 "commands matching <pattern>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:371
+#: lib/rbot/core/auth.rb:378
 msgid "permission topics: syntax, (re)set, view, search"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:376
+#: lib/rbot/core/auth.rb:383
 msgid ""
 "user show <what> : shows info about the user; <what> can be any of "
 "autologin, login-by-mask, netmasks"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:378
+#: lib/rbot/core/auth.rb:385
 msgid ""
 "user enable|disable <what> : turns on or off <what> (autologin, login-by-"
 "mask)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:380
+#: lib/rbot/core/auth.rb:387
 msgid ""
 "user set password <blah> : sets the user password to <blah>; passwords can "
 "only contain upper and lowercase letters and numbers, and must be at least 4 "
 "characters long"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:382
+#: lib/rbot/core/auth.rb:389
 msgid ""
 "user add|rm netmask <mask> : adds/removes netmask <mask> from the list of "
 "netmasks known to the botuser you're linked to"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:384
+#: lib/rbot/core/auth.rb:391
 msgid ""
 "user reset <what> : resets <what> to the default values. <what> can be "
 "+netmasks+ (the list will be emptied), +autologin+ or +login-by-mask+ (will "
@@ -251,13 +251,13 @@ msgid ""
 "and you'll be told in private)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:386
+#: lib/rbot/core/auth.rb:393
 msgid ""
 "user tell <who> the password for <botuser> : contacts <who> in private to "
 "tell him/her the password for <botuser>"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:388
+#: lib/rbot/core/auth.rb:395
 msgid ""
 "user create <name> <password> : create botuser named <name> with password "
 "<password>. The password can be omitted, in which case a random one will be "
@@ -265,11 +265,11 @@ msgid ""
 "underscore (_)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:390
+#: lib/rbot/core/auth.rb:397
 msgid "user list : lists all the botusers"
 msgstr "user list : 列出所有使用者"
 
-#: lib/rbot/core/auth.rb:392
+#: lib/rbot/core/auth.rb:399
 msgid ""
 "user destroy <botuser> : destroys <botuser>. This function %{highlight}must%"
 "{highlight} be called in two steps. On the first call <botuser> is queued "
@@ -278,13 +278,13 @@ msgid ""
 "destruction, issue the command 'user cancel destroy <botuser>'"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:394
+#: lib/rbot/core/auth.rb:401
 msgid ""
 "user topics: show, enable|disable, add|rm netmask, set, reset, tell, create, "
 "list, destroy"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:397
+#: lib/rbot/core/auth.rb:404
 msgid ""
 "auth <masterpassword>: log in as the bot owner; other commands: login, "
 "whoami, permissions syntax, permissions [re]set, permissions view, user, "
@@ -293,300 +293,300 @@ msgstr ""
 "auth <masterpassword>: 登入成為機器人擁有者; 其他指令: login, whoami, "
 "permission syntax, permissions [re]set, permissions view, user"
 
-#: lib/rbot/core/auth.rb:399
+#: lib/rbot/core/auth.rb:406
 msgid ""
 "meet <nick> [as <user>]: creates a bot user for nick, calling it user "
 "(defaults to the nick itself)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:401
+#: lib/rbot/core/auth.rb:408
 msgid "hello: creates a bot user for the person issuing the command"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:403
+#: lib/rbot/core/auth.rb:410
 msgid ""
 "allow <user> to do <sample command> [<where>]: gives botuser <user> the "
 "permissions to execute a command such as the provided sample command (in "
 "private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:405
+#: lib/rbot/core/auth.rb:412
 msgid ""
 "deny <user> from doing <sample command> [<where>]: removes from botuser "
 "<user> the permissions to execute a command such as the provided sample "
 "command (in private or in channel, according to the optional <where>)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:407
+#: lib/rbot/core/auth.rb:414
 msgid ""
 "auth commands: auth, login, whoami, who, permission[s], user, meet, hello, "
 "allow, deny"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:412
+#: lib/rbot/core/auth.rb:419
 msgid "sorry, I need more arguments to %{command}"
 msgstr "抱歉，我需要更多參數來執行 %{command}"
 
-#: lib/rbot/core/auth.rb:416
+#: lib/rbot/core/auth.rb:423
 msgid "I can only %{command} these: %{arguments}"
 msgstr "我只能用這些參數執行 %{command}: %{argument}"
 
-#: lib/rbot/core/auth.rb:451
+#: lib/rbot/core/auth.rb:458
 msgid "no such bot user %{user}"
 msgstr "已建立使用者 %{user}"
 
-#: lib/rbot/core/auth.rb:454
+#: lib/rbot/core/auth.rb:461
 #, fuzzy
 msgid "you can't mess with %{user}"
 msgstr "你無法替 ${username} 改變權限"
 
-#: lib/rbot/core/auth.rb:466
+#: lib/rbot/core/auth.rb:473
 #, fuzzy
 msgid "you can't see the properties of %{user}"
 msgstr "你無法替 ${username} 改變權限"
 
-#: lib/rbot/core/auth.rb:475
+#: lib/rbot/core/auth.rb:482
 msgid "no way I'm telling you the master password!"
 msgstr "我不會告訴你密碼的！"
 
-#: lib/rbot/core/auth.rb:476
+#: lib/rbot/core/auth.rb:483
 msgid "you can't ask for someone else's password"
 msgstr "你不能詢問其他人的密碼"
 
-#: lib/rbot/core/auth.rb:478
+#: lib/rbot/core/auth.rb:485
 msgid ""
 "c'mon, you can't be asking me seriously to tell you the password in public!"
 msgstr "別鬧了，你不是真的要我在公開場合講出密碼吧！"
 
-#: lib/rbot/core/auth.rb:479
+#: lib/rbot/core/auth.rb:486
 msgid "the password for %{user} is %{password}"
 msgstr "%{user} 的密碼是 %{password}"
 
-#: lib/rbot/core/auth.rb:493
+#: lib/rbot/core/auth.rb:500
 msgid "can %{action}"
 msgstr "能 %{action}"
 
-#: lib/rbot/core/auth.rb:495
+#: lib/rbot/core/auth.rb:502
 msgid "can not %{action}"
 msgstr "不能 %{action}"
 
-#: lib/rbot/core/auth.rb:499
+#: lib/rbot/core/auth.rb:506
 msgid "knows no netmasks"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:501
+#: lib/rbot/core/auth.rb:508
 msgid "knows %{netmasks}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:508 lib/rbot/core/auth.rb:535
-#: lib/rbot/core/auth.rb:553 lib/rbot/core/auth.rb:585
+#: lib/rbot/core/auth.rb:515 lib/rbot/core/auth.rb:542
+#: lib/rbot/core/auth.rb:560 lib/rbot/core/auth.rb:592
 #, fuzzy
 msgid "you can't change the default user"
 msgstr "你無法替 ${username} 改變權限"
 
-#: lib/rbot/core/auth.rb:509 lib/rbot/core/auth.rb:537
-#: lib/rbot/core/auth.rb:555 lib/rbot/core/auth.rb:587
+#: lib/rbot/core/auth.rb:516 lib/rbot/core/auth.rb:544
+#: lib/rbot/core/auth.rb:562 lib/rbot/core/auth.rb:594
 #, fuzzy
 msgid "you can't edit %{user}"
 msgstr "找不到使用者 %{user}"
 
-#: lib/rbot/core/auth.rb:524 lib/rbot/core/auth.rb:571
+#: lib/rbot/core/auth.rb:531 lib/rbot/core/auth.rb:578
 msgid "I ignored %{things} because %{reason}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:528 lib/rbot/core/auth.rb:575
+#: lib/rbot/core/auth.rb:535 lib/rbot/core/auth.rb:582
 #, fuzzy
 msgid "I haven't changed anything"
 msgstr "擁有者可以做任何事"
 
-#: lib/rbot/core/auth.rb:546
+#: lib/rbot/core/auth.rb:553
 msgid "is that a joke? setting the password in public?"
 msgstr "這是個玩笑嗎？在公開場合設定密碼？"
 
-#: lib/rbot/core/auth.rb:578
+#: lib/rbot/core/auth.rb:585
 msgid "the password for %{user} is now %{password}"
 msgstr "%{user} 的密碼已經是 %{password}"
 
-#: lib/rbot/core/auth.rb:592
+#: lib/rbot/core/auth.rb:599
 msgid ""
 "I can only add/remove netmasks. See +help user add+ for more instructions"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:613
+#: lib/rbot/core/auth.rb:620
 msgid "sorry, I don't know how to %{request}"
 msgstr "抱歉，我不知道如何 %{request}"
 
-#: lib/rbot/core/auth.rb:616
+#: lib/rbot/core/auth.rb:623
 msgid "couldn't %{cmd}: %{exception}"
 msgstr "無法登入: %{exception}"
 
-#: lib/rbot/core/auth.rb:645
+#: lib/rbot/core/auth.rb:652
 msgid ""
 "you are now registered as %{buname}. I created a random password for you : %"
 "{pass} and you can change it at any time by telling me 'user set password "
 "<password>' in private"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:652
+#: lib/rbot/core/auth.rb:659
 msgid "but I already know %{buname}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:654
+#: lib/rbot/core/auth.rb:661
 msgid "I had problems meeting %{nick}: %{e}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:663
+#: lib/rbot/core/auth.rb:670
 msgid "couldn't find botuser %{user}"
 msgstr "找不到使用者 %{user}"
 
-#: lib/rbot/core/auth.rb:665
+#: lib/rbot/core/auth.rb:672
 msgid "I'm not telling the master password to anyone, pal"
 msgstr "我怎麼樣都不會說出密碼的"
 
-#: lib/rbot/core/auth.rb:666
+#: lib/rbot/core/auth.rb:673
 msgid "the password for botuser %{user} is %{password}"
 msgstr "使用者 %{user} 的密碼是 %{password}"
 
-#: lib/rbot/core/auth.rb:669
+#: lib/rbot/core/auth.rb:676
 msgid "I told %{user} that %{message}"
 msgstr "我告訴 %{user} 關於 %{message}"
 
-#: lib/rbot/core/auth.rb:675
+#: lib/rbot/core/auth.rb:682
 msgid "are you nuts, creating a botuser with a publicly known password?"
 msgstr "你瘋了嗎？用誰都曉得的密碼建立使用者？"
 
-#: lib/rbot/core/auth.rb:680
+#: lib/rbot/core/auth.rb:687
 msgid "failed to create %{user}: %{exception}"
 msgstr "無法建立 %{user}: %{exception}"
 
-#: lib/rbot/core/auth.rb:684
+#: lib/rbot/core/auth.rb:691
 msgid "created botuser %{user}"
 msgstr "已建立使用者 %{user}"
 
-#: lib/rbot/core/auth.rb:692
+#: lib/rbot/core/auth.rb:699
 msgid " (queued for destruction)"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:695
+#: lib/rbot/core/auth.rb:702
 msgid "I have no botusers other than the default ones"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:696
+#: lib/rbot/core/auth.rb:703
 msgid "botuser: %{list}"
 msgid_plural "botusers: %{list}"
 msgstr[0] "使用者: %{list}"
 
-#: lib/rbot/core/auth.rb:703
+#: lib/rbot/core/auth.rb:710
 #, fuzzy
 msgid "You can't destroy %{user}"
 msgstr "找不到使用者 %{user}"
 
-#: lib/rbot/core/auth.rb:713
+#: lib/rbot/core/auth.rb:720
 #, fuzzy
 msgid "no such botuser %{user}"
 msgstr "已建立使用者 %{user}"
 
-#: lib/rbot/core/auth.rb:720
+#: lib/rbot/core/auth.rb:727
 msgid "%{user} removed from the destruction queue"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:722
+#: lib/rbot/core/auth.rb:729
 msgid "%{user} was not queued for destruction"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:727
+#: lib/rbot/core/auth.rb:734
 msgid ""
 "%{user} already queued for destruction, use %{highlight}user confirm destroy "
 "%{user}%{highlight} to destroy it"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:730
+#: lib/rbot/core/auth.rb:737
 msgid ""
 "%{user} queued for destruction, use %{highlight}user confirm destroy %{user}%"
 "{highlight} to destroy it"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:734
+#: lib/rbot/core/auth.rb:741
 msgid "%{user} is not queued for destruction yet"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:743 lib/rbot/core/auth.rb:783
+#: lib/rbot/core/auth.rb:750 lib/rbot/core/auth.rb:790
 #, fuzzy
 msgid "failed: %{exception}"
 msgstr "分析資料失敗: %{excaption}"
 
-#: lib/rbot/core/auth.rb:745
+#: lib/rbot/core/auth.rb:752
 #, fuzzy
 msgid "botuser %{user} destroyed"
 msgstr "已建立使用者 %{user}"
 
-#: lib/rbot/core/auth.rb:752
+#: lib/rbot/core/auth.rb:759
 msgid "please don't touch the default users"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:761
+#: lib/rbot/core/auth.rb:768
 #, fuzzy
 msgid "no such botuser %{source}"
 msgstr "已建立使用者 %{user}"
 
-#: lib/rbot/core/auth.rb:763
+#: lib/rbot/core/auth.rb:770
 msgid "botuser %{dest} exists already"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:786
+#: lib/rbot/core/auth.rb:793
 msgid "botuser %{source} copied to %{dest}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:789
+#: lib/rbot/core/auth.rb:796
 msgid "botuser %{source} renamed to %{dest}"
 msgstr ""
 
-#: lib/rbot/core/auth.rb:809
+#: lib/rbot/core/auth.rb:816
 #, fuzzy
 msgid "selecting data to export ..."
 msgstr "選擇資料以載入 ..."
 
-#: lib/rbot/core/auth.rb:825
+#: lib/rbot/core/auth.rb:832
 #, fuzzy
 msgid "preparing data for export ..."
 msgstr "分析載入資料 ..."
 
-#: lib/rbot/core/auth.rb:848
+#: lib/rbot/core/auth.rb:855
 #, fuzzy
 msgid "failed to prepare data: %{exception}"
 msgstr "分析資料失敗: %{excaption}"
 
-#: lib/rbot/core/auth.rb:853
+#: lib/rbot/core/auth.rb:860
 #, fuzzy
 msgid "exporting to %{file} ..."
 msgstr "讀取 %{file} ..."
 
-#: lib/rbot/core/auth.rb:860
+#: lib/rbot/core/auth.rb:867
 #, fuzzy
 msgid "failed to export users: %{exception}"
 msgstr "載入失敗: %{exception}"
 
-#: lib/rbot/core/auth.rb:864 lib/rbot/core/auth.rb:942
+#: lib/rbot/core/auth.rb:871 lib/rbot/core/auth.rb:949
 msgid "done"
 msgstr "完成"
 
-#: lib/rbot/core/auth.rb:881
+#: lib/rbot/core/auth.rb:888
 msgid "reading %{file} ..."
 msgstr "讀取 %{file} ..."
 
-#: lib/rbot/core/auth.rb:885
+#: lib/rbot/core/auth.rb:892
 msgid "failed to import from: %{exception}"
 msgstr "載入失敗: %{exception}"
 
-#: lib/rbot/core/auth.rb:892
+#: lib/rbot/core/auth.rb:899
 msgid "selecting data to import ..."
 msgstr "選擇資料以載入 ..."
 
-#: lib/rbot/core/auth.rb:902
+#: lib/rbot/core/auth.rb:909
 msgid "parsing data from import ..."
 msgstr "分析載入資料 ..."
 
-#: lib/rbot/core/auth.rb:922
+#: lib/rbot/core/auth.rb:929
 msgid "failed to parse data: %{exception}"
 msgstr "分析資料失敗: %{excaption}"
 
@@ -607,40 +607,36 @@ msgid "hide => part all channels"
 msgstr ""
 
 #: lib/rbot/core/basics.rb:117
-msgid "nick <nick> => attempt to change nick to <nick>"
-msgstr "nick <nick> => 嘗試把暱稱改為 <nick>"
-
-#: lib/rbot/core/basics.rb:119
 msgid ""
 "say <channel>|<nick> <message> => say <message> to <channel> or in private "
 "message to <nick>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:121
+#: lib/rbot/core/basics.rb:119
 msgid ""
 "action <channel>|<nick> <message> => does a /me <message> to <channel> or in "
 "private message to <nick>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:123
+#: lib/rbot/core/basics.rb:121
 msgid ""
 "quiet [in here|<channel>] => with no arguments, stop speaking in all "
 "channels, if \"in here\", stop speaking in this channel, or stop speaking in "
 "<channel>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:125
+#: lib/rbot/core/basics.rb:123
 msgid ""
 "talk [in here|<channel>] => with no arguments, resume speaking in all "
 "channels, if \"in here\", resume speaking in this channel, or resume "
 "speaking in <channel>"
 msgstr ""
 
-#: lib/rbot/core/basics.rb:127
+#: lib/rbot/core/basics.rb:125
 msgid "ping => replies with a pong"
 msgstr "ping => 回答 pong"
 
-#: lib/rbot/core/basics.rb:129
+#: lib/rbot/core/basics.rb:127
 msgid ""
 "mode <channel> <mode> <nicks> => set channel modes for <nicks> on <channel> "
 "to <mode>"
@@ -648,10 +644,10 @@ msgstr ""
 "mode <channel> <mode> <nicks> => 設定 <nicks> 在 <channel> 頻道的權限為 "
 "<mode>"
 
-#: lib/rbot/core/basics.rb:135
+#: lib/rbot/core/basics.rb:133
 msgid ""
-"%{name}: quit, restart, join, part, hide, save, nick, say, action, topic, "
-"quiet, talk, ping, mode"
+"%{name}: quit, restart, join, part, hide, save, say, action, topic, quiet, "
+"talk, ping, mode"
 msgstr ""
 
 #: lib/rbot/core/config.rb:12
@@ -722,7 +718,7 @@ msgstr "正在重新掃描 ..."
 msgid "done. %{plugin_status}"
 msgstr "完成。%{plugin_status}"
 
-#: lib/rbot/core/config.rb:220
+#: lib/rbot/core/config.rb:221
 msgid ""
 "config list => list configuration modules, config list <module> => list "
 "configuration keys for module <module>"
@@ -730,62 +726,62 @@ msgstr ""
 "config list => 列出可設定模組, config list <module> => 列出 <module> 模組的可"
 "設定參數"
 
-#: lib/rbot/core/config.rb:222
+#: lib/rbot/core/config.rb:223
 msgid "config get <key> => get configuration value for key <key>"
 msgstr "config get <key> => 取得 <key> 的設定值"
 
-#: lib/rbot/core/config.rb:224
+#: lib/rbot/core/config.rb:225
 msgid "reset key <key> to the default"
 msgstr "重設 <key> 回預設值"
 
-#: lib/rbot/core/config.rb:226
+#: lib/rbot/core/config.rb:227
 msgid ""
 "config set <key> <value> => set configuration value for key <key> to <value>"
 msgstr "config set <key> <value> => 設定參數 <key> 的數值為 <value>"
 
-#: lib/rbot/core/config.rb:228
+#: lib/rbot/core/config.rb:229
 msgid "config desc <key> => describe what key <key> configures"
 msgstr "config desc <key> => 描述參數 <key> 的功用"
 
-#: lib/rbot/core/config.rb:230
+#: lib/rbot/core/config.rb:231
 msgid ""
 "config add <value> to <key> => add value <value> to key <key> if <key> is an "
 "array"
 msgstr ""
 
-#: lib/rbot/core/config.rb:232
+#: lib/rbot/core/config.rb:233
 msgid ""
 "config rm <value> from <key> => remove value <value> from key <key> if <key> "
 "is an array"
 msgstr ""
 
-#: lib/rbot/core/config.rb:234
+#: lib/rbot/core/config.rb:235
 msgid ""
 "config module - bot configuration. usage: list, desc, get, set, unset, add, "
 "rm"
 msgstr "config 模組 - 機器人設定。用法: list, desc, get, set, unset, add, "
 
-#: lib/rbot/core/config.rb:239
+#: lib/rbot/core/config.rb:240
 msgid "nick <newnick> => change the bot nick to <newnick>, if possible"
 msgstr "nick <nick> => 嘗試把暱稱改為 <nick>"
 
-#: lib/rbot/core/config.rb:241
+#: lib/rbot/core/config.rb:242
 msgid "status => display some information on the bot's status"
 msgstr ""
 
-#: lib/rbot/core/config.rb:243
+#: lib/rbot/core/config.rb:244
 msgid "save => save current dynamic data and configuration"
 msgstr "save => 儲存目前動態資料與設定"
 
-#: lib/rbot/core/config.rb:245
+#: lib/rbot/core/config.rb:246
 msgid "rescan => reload modules and static facts"
 msgstr "rescan => 重新載入模組與靜態論據"
 
-#: lib/rbot/core/config.rb:247
+#: lib/rbot/core/config.rb:248
 msgid "version => describes software version"
 msgstr "version => 描述軟體版本"
 
-#: lib/rbot/core/config.rb:249
+#: lib/rbot/core/config.rb:250
 msgid "config-related tasks: config, save, rescan, version, nick, status"
 msgstr "設定相關任務: config, save, rescan"
 
@@ -918,19 +914,19 @@ msgstr ""
 msgid "%{m} days"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1209
+#: lib/rbot/ircbot.rb:1233
 msgid "help topics: "
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1211
+#: lib/rbot/ircbot.rb:1235
 msgid " (help <topic> for more info)"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1214
+#: lib/rbot/ircbot.rb:1238
 msgid "no help for topic %{topic}"
 msgstr ""
 
-#: lib/rbot/ircbot.rb:1225
+#: lib/rbot/ircbot.rb:1249
 msgid ""
 "Uptime %{up}, %{plug} plugins active, %{sent} lines sent, %{recv} received."
 msgstr ""
@@ -1033,3 +1029,6 @@ msgstr ""
 #: lib/rbot/registry.rb:190
 msgid "marshal recovery failed, trying default"
 msgstr ""
+
+#~ msgid "nick <nick> => attempt to change nick to <nick>"
+#~ msgstr "nick <nick> => 嘗試把暱稱改為 <nick>"