diff --git a/locales/fi.po b/locales/fi.po
index 912447c1f..826a3d70c 100644
--- a/locales/fi.po
+++ b/locales/fi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-06-07 22:03+EEST\n"
-"PO-Revision-Date: 2014-06-07 22:33+0200\n"
+"POT-Creation-Date: 2014-08-01 20:08+EEST\n"
+"PO-Revision-Date: 2014-08-01 20:16+0200\n"
 "Last-Translator: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>\n"
 "Language-Team: Finnish <>\n"
 "Language: fi\n"
@@ -73,7 +73,7 @@ msgstr ""
 "Yritit enempiä sisäkkäisiä komentoja, kuin on tällä hetkellä sallittu tässä "
 "botissa."
 
-#: src/callbacks.py:822
+#: src/callbacks.py:823
 msgid ""
 "The command %q is available in the %L plugins.  Please specify the plugin "
 "whose command you wish to call by using its name as a command before %q."
@@ -81,19 +81,19 @@ msgstr ""
 "Komento %q on saatavilla %L lisäosissa. Ole hyvä ja määritä minkä lisäosan "
 "komentoa tahdot kutsua laittamalla sen nimi komentoon ennen %q:ta."
 
-#: src/callbacks.py:908 src/callbacks.py:921
+#: src/callbacks.py:909 src/callbacks.py:922
 msgid "(XX more messages)"
 msgstr "(XX viestiä jatkoa)"
 
-#: src/callbacks.py:954
+#: src/callbacks.py:955
 msgid "more message"
 msgstr "viesti jatkoa"
 
-#: src/callbacks.py:956
+#: src/callbacks.py:957
 msgid "more messages"
 msgstr "viestejä jatkoa"
 
-#: src/callbacks.py:1073
+#: src/callbacks.py:1074
 msgid ""
 "Determines what commands are currently disabled.  Such\n"
 "    commands will not appear in command lists, etc.  They will appear not "
@@ -104,11 +104,11 @@ msgstr ""
 "     komennot eivät ilmesty komento listoissa, jne.  Ne eivät näytä edes\n"
 "    olevan olemassa."
 
-#: src/callbacks.py:1277
+#: src/callbacks.py:1278
 msgid "Invalid arguments for %s."
 msgstr "Virheelliset parametrit kohteelle %s."
 
-#: src/callbacks.py:1303
+#: src/callbacks.py:1304
 msgid "The %q command has no help."
 msgstr "Komennolla %q ei ole ohjetta."
 
@@ -309,12 +309,11 @@ msgstr ""
 
 #: src/conf.py:217
 msgid ""
-"Determines the user the bot sends to the server.\n"
-"    A standard user using the current version of the bot will be generated "
-"if\n"
-"    this is left empty."
+"Determines the real name which the bot sends to\n"
+"    the server. A standard real name using the current version of the bot\n"
+"    will be generated if this is left empty."
 msgstr ""
-"Määrittää minkä user:in (oikean nimen) botti lähettää palvelimelle.\n"
+"Määrittää minkä oikean nimen botti lähettää palvelimelle.\n"
 "    Perus user-merkkiketju luodaan botin nykyisestä versiosta, mikäli\n"
 "    tämä on jätetty tyhjäksi."
 
@@ -400,7 +399,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Determines\n"
-"        the username the bot sends to the server. If empty, defaults to\n"
+"        the real name which the bot sends to the server. If empty, defaults "
+"to\n"
 "        supybot.user"
 msgstr ""
 "Määrittää käyttäjätunnuksen, jonka botti lähettää palvelimelle. Ollessaan "
@@ -459,7 +459,7 @@ msgstr ""
 "    aika moduulille nähdäksesi kelvolliset muotoilumerkit \n"
 "    ajan muodoille."
 
-#: src/conf.py:384
+#: src/conf.py:385
 msgid ""
 "Determines whether elapsed times will be given\n"
 "    as \"1 day, 2 hours, 3 minutes, and 15 seconds\" or as \"1d 2h 3m 15s\"."
@@ -467,7 +467,7 @@ msgstr ""
 "Määrittää näytetäänkö kulunut aika muodossa\n"
 "    \"1 päivä, 2 tuntia, 3 minuuttia, ja 15 sekuntia\" vai \"1d 2h 3m 15s\"."
 
-#: src/conf.py:394
+#: src/conf.py:395
 msgid ""
 "Determines the absolute maximum length of\n"
 "    the bot's reply -- no reply will be passed through the bot with a "
@@ -478,7 +478,7 @@ msgstr ""
 "    -- yksikään vastaus, joka on suurempi, kuin tämä\n"
 "    ei mene botin läpi."
 
-#: src/conf.py:399
+#: src/conf.py:400
 msgid ""
 "Determines whether the bot will break up long\n"
 "    messages into chunks and allow users to use  the 'more' command to get "
@@ -489,7 +489,7 @@ msgstr ""
 "    paloihin ja sallii käyttäjien käyttää 'more' komentoa\n"
 "    saadakseen jäljelläolevat palat."
 
-#: src/conf.py:404
+#: src/conf.py:405
 msgid ""
 "Determines what the maximum number of\n"
 "    chunks (for use with the 'more' command) will be."
@@ -497,7 +497,7 @@ msgstr ""
 "Määrittää maksimimäärän\n"
 "    paloja (käytettäväksi 'more' komennon) kanssa."
 
-#: src/conf.py:408
+#: src/conf.py:409
 msgid ""
 "Determines how long individual chunks\n"
 "    will be.  If set to 0, uses our super-tweaked,\n"
@@ -507,7 +507,7 @@ msgstr ""
 "    olemaan.  Jos tämä on asetettu arvoon 0, tämä käyttää meidän\n"
 "    super-muokattua-saa-suurin-osa-ulos-yksittäisestä-viestistä oletusta."
 
-#: src/conf.py:413
+#: src/conf.py:414
 msgid ""
 "Determines how many mores will be sent\n"
 "    instantly (i.e., without the use of the more command, immediately when\n"
@@ -522,7 +522,7 @@ msgstr ""
 "kaikille muille, paitsi\n"
 "    ensinmäiselle palalle."
 
-#: src/conf.py:419
+#: src/conf.py:420
 msgid ""
 "Determines whether the bot will send\n"
 "    multi-message replies in a single message. This defaults to True \n"
@@ -535,7 +535,7 @@ msgstr ""
 "\", botti\n"
 " lähettää monen viestin vastaukset usealla rivillä."
 
-#: src/conf.py:425
+#: src/conf.py:426
 msgid ""
 "Determines whether the bot will reply with an\n"
 "    error message when it is addressed but not given a valid command.  If "
@@ -549,7 +549,7 @@ msgstr ""
 "    botti pysyy hiljaisena, mikäli muita lisäosia, jotka ohittavat \n"
 "    tämän käytöksen ei ole."
 
-#: src/conf.py:432
+#: src/conf.py:433
 msgid ""
 "Determines whether error messages that result\n"
 "    from bugs in the bot will show a detailed error message (the uncaught\n"
@@ -560,7 +560,7 @@ msgstr ""
 "    (selittämätön poikkeus )\n"
 "    vai tavallisen virheilmoituksen."
 
-#: src/conf.py:436
+#: src/conf.py:437
 msgid ""
 "Determines whether the bot will send error\n"
 "    messages to users in private.  You might want to do this in order to "
@@ -574,7 +574,7 @@ msgstr ""
 "    Tämä voidaan yhdistää asetusarvon \n"
 "    supybot.reply.error.withNotice kanssa."
 
-#: src/conf.py:441
+#: src/conf.py:442
 msgid ""
 "Determines whether the bot will send error\n"
 "    messages to users via NOTICE instead of PRIVMSG.  You might want to do "
@@ -595,7 +595,7 @@ msgstr ""
 "yksityiskeskustelu ikkunaa \n"
 "    enimmissä IRC-asiakasohjelmissa."
 
-#: src/conf.py:448
+#: src/conf.py:449
 msgid ""
 "Determines whether the bot will send an error\n"
 "    message to users who attempt to call a command for which they do not "
@@ -612,7 +612,7 @@ msgstr ""
 "suorittamasta \n"
 "    tiettyjä komentoja."
 
-#: src/conf.py:455
+#: src/conf.py:456
 msgid ""
 "Determines whether the bot will reply\n"
 "     privately when replying in a channel, rather than replying to the "
@@ -623,7 +623,7 @@ msgstr ""
 "     kanavalla mielummin, kuin vastaa koko \n"
 "     kanavalle."
 
-#: src/conf.py:460
+#: src/conf.py:461
 msgid ""
 "Determines whether the bot will reply with a\n"
 "    notice when replying in a channel, rather than replying with a privmsg "
@@ -634,7 +634,7 @@ msgstr ""
 "    mielummin kuin PRIVMSG:llä, jolla se vastaa \n"
 "    tavallisesti."
 
-#: src/conf.py:466
+#: src/conf.py:467
 msgid ""
 "Determines whether the bot will reply with a\n"
 "    notice when it is sending a private message, in order not to open a /"
@@ -648,7 +648,7 @@ msgstr ""
 "    Yksittäiset käyttäjät voivat ohittaa tämän asetusarvolla \n"
 "    reply.withNoticeWhenPrivate."
 
-#: src/conf.py:472
+#: src/conf.py:473
 #, fuzzy
 msgid ""
 "Determines whether the bot will always prefix\n"
@@ -657,7 +657,7 @@ msgstr ""
 "Määrittää aloittaako botti rivin sen käyttäjän nimimerkillä, joka antoi \n"
 "     komennon."
 
-#: src/conf.py:476
+#: src/conf.py:477
 msgid ""
 "Determines whether the bot should attempt to\n"
 "    reply to all messages even if they don't address it (either via its "
@@ -672,7 +672,7 @@ msgstr ""
 "    sen etuliitemerkillä. Jos tämä asetetaan arvoon True,\n"
 "    supybot.reply.whenNotCommand tahdotaan asettaa Falseksi."
 
-#: src/conf.py:482
+#: src/conf.py:483
 msgid ""
 "Determines whether the bot will allow you to\n"
 "    send channel-related commands outside of that channel.  Sometimes "
@@ -688,7 +688,7 @@ msgstr ""
 "    käyttäytymistä kanavalla, mutta komento lähetettiin kanavan itsensä \n"
 "    ulkopuolella."
 
-#: src/conf.py:489
+#: src/conf.py:490
 msgid ""
 "Determines whether the bot will unidentify\n"
 "    someone when that person changes their nick.  Setting this to True\n"
@@ -701,7 +701,7 @@ msgstr ""
 "mmuutoksia. Se\n"
 "    on oletuksena False hiukan paremman turvallisuuden vuoksi."
 
-#: src/conf.py:495
+#: src/conf.py:496
 #, fuzzy
 msgid ""
 "Determines whether the bot will always join a\n"
@@ -716,7 +716,7 @@ msgstr ""
 "joka kutsuu sen on 'admin' valtuus (tai jos se on käsketty liittymään "
 "kanavalle käyttämällä Admin.join komentoa)."
 
-#: src/conf.py:501
+#: src/conf.py:502
 msgid ""
 "Supybot normally replies with the full help\n"
 "    whenever a user misuses a command.  If this value is set to True, the "
@@ -729,7 +729,7 @@ msgstr ""
 "vastaa vain komennon syntaksilla (ensinmäinen rivi ohjetekstiä) ennemmin, "
 "kuin täydellä ohjetekstillä."
 
-#: src/conf.py:515
+#: src/conf.py:516
 msgid ""
 "Determines what prefix characters the bot will\n"
 "    reply to.  A prefix character is a single character that the bot will "
@@ -750,7 +750,7 @@ msgstr ""
 "niistä käyetään etuliitemerkkinä, botti olettaa, että viesti on osoitettu "
 "sille."
 
-#: src/conf.py:524
+#: src/conf.py:525
 msgid ""
 "Determines what strings the\n"
 "    bot will reply to when they are at the beginning of the message.  "
@@ -768,7 +768,7 @@ msgstr ""
 "joksikin, kuten '@@ ??' ja botti vastaa, kun viestissä on etuliiteenä joko "
 "@@ tai ??."
 
-#: src/conf.py:531
+#: src/conf.py:532
 msgid ""
 "Determines whether the bot will reply when\n"
 "    people address it by its nick, rather than with a prefix character."
@@ -776,7 +776,7 @@ msgstr ""
 "Määrittää vastaako botti, kun ihmiset osoittavat sitä \n"
 "    nimimerkillä, mielummin kuin aloitusmerkillä."
 
-#: src/conf.py:534
+#: src/conf.py:535
 msgid ""
 "Determines whether the bot will reply when\n"
 "    people address it by its nick at the end of the message, rather than at\n"
@@ -787,7 +787,7 @@ msgstr ""
 "eikä \n"
 "    alussa."
 
-#: src/conf.py:538
+#: src/conf.py:539
 msgid ""
 "Determines what extra nicks\n"
 "    the bot will always respond to when addressed by, even if its current "
@@ -798,11 +798,11 @@ msgstr ""
 "    vastaa aina, jopa jos sen nykyinen nimimerkki on jokin \n"
 "    muu."
 
-#: src/conf.py:548
+#: src/conf.py:549
 msgid "The operation succeeded."
 msgstr "Tehtävä suoritettu onnistuneesti."
 
-#: src/conf.py:549
+#: src/conf.py:550
 msgid ""
 "Determines what message the bot replies with when a command succeeded.\n"
 "    If this configuration variable is empty, no success message will be\n"
@@ -811,7 +811,7 @@ msgstr ""
 "Määrittää millä viestillä botti vastaa, kun komento on onnistunut.\n"
 "    Jos tämä asetusarvo on tyhjä, onnistumisviestejä ei lähetetä."
 
-#: src/conf.py:554
+#: src/conf.py:555
 msgid ""
 "An error has occurred and has been logged.\n"
 "    Please contact this bot's administrator for more information."
@@ -820,27 +820,24 @@ msgstr ""
 "    Ole hyvä ja ota yhteyttä tämän botin ylläpitäjään saadaksesi lisätietoja."
 
 # Google Kääntäjän mukaan "ambiguos" tarkoittaa epäselvää, mutta miksi botti haluaisi olla epäselvä?
-#: src/conf.py:555
-#, fuzzy
+#: src/conf.py:556
 msgid ""
 "\n"
 "    Determines what error message the bot gives when it wants to be\n"
 "    ambiguous."
 msgstr ""
 "\n"
-"    Määrittää, minkä virheilmoituksen botti antaa, kun se tahtoo olla "
-"epäselvä."
+" Määrittää minkä virheilmoituksen botti antaa tahtoessaan olla epäselvä."
 
-#: src/conf.py:560
+#: src/conf.py:561
 msgid ""
 "An error has occurred and has been logged.\n"
-"    Check the logs for more informations."
+"    Check the logs for more information."
 msgstr ""
-"Virhe on tapahtunut ja tallennettu lokiin.\n"
-"    Tarkista lokit saadaksesi lisätietoja."
+"Virhe on tapahtunut ja tallennettu lokiin. Lisätietoja saadaan lokeista."
 
 # Miksi botti tahtoisi olevansa epäselvä? Google Kääntäjä...
-#: src/conf.py:561
+#: src/conf.py:562
 #, fuzzy
 msgid ""
 "Determines what error\n"
@@ -850,13 +847,13 @@ msgstr ""
 "epäselvä."
 
 # Pitäisikö "hostmask" kääntää "isäntänaamioksi" vai pitää kuten se on?
-#: src/conf.py:565
+#: src/conf.py:566
 msgid ""
 "Your hostmask doesn't match or your password\n"
 "    is wrong."
 msgstr "Hostmask ei täsmää tai salasana on väärä."
 
-#: src/conf.py:566
+#: src/conf.py:567
 msgid ""
 "Determines what message the bot replies with when\n"
 "     someone tries to use a command that requires being identified or having "
@@ -866,7 +863,7 @@ msgstr ""
 "Määrittää millä viestillä botti vastaa, kun joku yrittää antaa komennon, "
 "joka vaatii tunnistautumista, ja kumpikaan vaatimus ei ole täytetty."
 
-#: src/conf.py:572
+#: src/conf.py:573
 msgid ""
 "I can't find %s in my user\n"
 "    database.  If you didn't give a user name, then I might not know what "
@@ -879,7 +876,7 @@ msgstr ""
 "kuin tämä\n"
 " komento saattaa toimia."
 
-#: src/conf.py:575
+#: src/conf.py:576
 msgid ""
 "Determines what error message the bot replies with when someone tries\n"
 "    to accessing some information on a user the bot doesn't know about."
@@ -887,7 +884,7 @@ msgstr ""
 "Määrittää millä virheilmoituksella botti vastaa, kun joku yrittää päästä "
 "tietoihin käyttäjästä, jota ei ole olemassakaan."
 
-#: src/conf.py:579
+#: src/conf.py:580
 msgid ""
 "You must be registered to use this command.\n"
 "    If you are already registered, you must either identify (using the "
@@ -901,7 +898,7 @@ msgstr ""
 " hostmask, joka täsmää nykyiseen hostmaskiisi (käyttämällä \"hostmask add\" "
 "komentoa)."
 
-#: src/conf.py:582
+#: src/conf.py:583
 msgid ""
 "Determines what error message the bot\n"
 "    replies with when someone tries to do something that requires them to "
@@ -915,7 +912,7 @@ msgstr ""
 " tunnistettu."
 
 # Tämän pitäisi mahdollisesti olla passiivissa, mutta en ole varma miten tämä pitäisi olla passiivissa. Merkitsen sen epäselväksi.
-#: src/conf.py:587
+#: src/conf.py:588
 #, fuzzy
 msgid ""
 "You don't have the %s capability.  If you\n"
@@ -930,7 +927,7 @@ msgstr ""
 "'whoami' voi\n"
 " kertoa sinulle oletko tunnistautunut."
 
-#: src/conf.py:590
+#: src/conf.py:591
 msgid ""
 "Determines what error message is given when the bot\n"
 "    is telling someone they aren't cool enough to use the command they tried "
@@ -941,7 +938,7 @@ msgstr ""
 "ole\n"
 " riittävän kuuli käyttääkseen komentoa, jota hän yritti käyttää."
 
-#: src/conf.py:595
+#: src/conf.py:596
 msgid ""
 "You're missing some capability you need.\n"
 "    This could be because you actually possess the anti-capability for the\n"
@@ -964,7 +961,7 @@ msgstr ""
 "mitä tahdot\n"
 " tehdä."
 
-#: src/conf.py:603
+#: src/conf.py:604
 msgid ""
 "Determines what generic error message is given when the bot is telling\n"
 "    someone that they aren't cool enough to use the command they tried to "
@@ -979,13 +976,13 @@ msgstr ""
 " kutsuu errorNoCapability koodin ei tarjonnut tarkkaa valtuutta ihansama "
 "mistä syystä."
 
-#: src/conf.py:609
+#: src/conf.py:610
 msgid ""
 "That operation cannot be done in a\n"
 "    channel."
 msgstr "Tätä tehtävää ei voida suorittaa kanavalla."
 
-#: src/conf.py:610
+#: src/conf.py:611
 msgid ""
 "Determines what error messages the bot sends to people\n"
 "    who try to do things in a channel that really should be done in\n"
@@ -995,7 +992,7 @@ msgstr ""
 "tehdä\n"
 " asioita, jotka todella pitäisi tehdä yksityisesti, kanavalla."
 
-#: src/conf.py:615
+#: src/conf.py:616
 msgid ""
 "This may be a bug.  If you think it is,\n"
 "    please file a bug report at\n"
@@ -1005,7 +1002,7 @@ msgstr ""
 " <https://github.com/ProgVal/Limnoria/issues>. Bugiraportit kirjoitetaan "
 "englanniksi."
 
-#: src/conf.py:618
+#: src/conf.py:619
 msgid ""
 "Determines what message the bot sends when it thinks you've\n"
 "    encountered a bug that the developers don't know about."
@@ -1014,7 +1011,7 @@ msgstr ""
 "josta\n"
 " kehittäjät eivät ole tietoisia."
 
-#: src/conf.py:625
+#: src/conf.py:626
 msgid ""
 "A floating point number of seconds to throttle\n"
 "    snarfed URLs, in order to prevent loops between two bots snarfing the "
@@ -1027,7 +1024,7 @@ msgstr ""
 "ulostulevassa\n"
 " kaappausviestissä."
 
-#: src/conf.py:630
+#: src/conf.py:631
 msgid ""
 "Determines the number of seconds\n"
 "    between running the upkeep function that flushes (commits) open "
@@ -1040,7 +1037,7 @@ msgstr ""
 " , kerää jätteet ja tallentaa hyödyllisiä tilastotietoja debuggaus tasolle, "
 "välissä."
 
-#: src/conf.py:636
+#: src/conf.py:637
 msgid ""
 "Determines whether the bot will periodically\n"
 "    flush data and configuration files to disk.  Generally, the only time\n"
@@ -1064,7 +1061,7 @@ msgstr ""
 " muokata itse."
 
 # Google Kääntäjä ei tiedä mitä "tokenized" tarkoittaa. En tiedä minäkään.
-#: src/conf.py:661
+#: src/conf.py:662
 #, fuzzy
 msgid ""
 "Determines what characters are valid for quoting\n"
@@ -1075,7 +1072,7 @@ msgstr ""
 "estetään niitä\n"
 " tulemasta tokenisoiduiksi "
 
-#: src/conf.py:668
+#: src/conf.py:669
 msgid ""
 "Determines whether the bot will allow nested\n"
 "    commands, which rule.  You definitely should keep this on."
@@ -1084,7 +1081,7 @@ msgstr ""
 "parhaita. Tämä\n"
 " täytyy varmasti pitää käytössä."
 
-#: src/conf.py:671
+#: src/conf.py:672
 msgid ""
 "Determines what the maximum number of\n"
 "    nested commands will be; users will receive an error if they attempt\n"
@@ -1096,7 +1093,7 @@ msgstr ""
 "komentoja,\n"
 " kuin tämä arvo sallii."
 
-#: src/conf.py:679
+#: src/conf.py:680
 msgid ""
 "Supybot allows you to specify what brackets are\n"
 "    used for your nested commands.  Valid sets of brackets include [], <>, "
@@ -1119,7 +1116,7 @@ msgstr ""
 "sallita tällä\n"
 " kanavalla."
 
-#: src/conf.py:686
+#: src/conf.py:687
 msgid ""
 "Supybot allows nested commands. Enabling this\n"
 "    option will allow nested commands with a syntax similar to UNIX pipes, "
@@ -1132,7 +1129,7 @@ msgstr ""
 "putket,\n"
 " esimerkiksi 'botti: foo | bar'."
 
-#: src/conf.py:691
+#: src/conf.py:692
 msgid ""
 "Determines what commands have default\n"
 "    plugins set, and which plugins are set to be the default for each of "
@@ -1143,7 +1140,7 @@ msgstr ""
 "on\n"
 " määritetty olemann oletuksia kaikille noille komennoille."
 
-#: src/conf.py:697
+#: src/conf.py:698
 msgid ""
 "Determines what plugins automatically get precedence over all\n"
 "        other plugins when selecting a default plugin for a command.  By\n"
@@ -1163,20 +1160,20 @@ msgstr ""
 "asetusarvossa\n"
 " kirjainkoolla on merkitystä."
 
-#: src/conf.py:712
+#: src/conf.py:713
 #, fuzzy
 msgid ""
 "Determines the interval used for\n"
 "    the history storage."
 msgstr "Määrittää historian tallennukseen käytettävän aikavälin."
 
-#: src/conf.py:715
+#: src/conf.py:716
 msgid ""
 "Determines whether the bot will defend itself\n"
 "    against command-flooding."
 msgstr "Määrittää puolustaako botti itseään komento tulvimista vastaan."
 
-#: src/conf.py:718
+#: src/conf.py:719
 #, fuzzy
 msgid ""
 "Determines how many commands users are\n"
@@ -1193,7 +1190,7 @@ msgstr ""
 "asetusarvossa\n"
 " supybot.abuse.flood.command.punishment."
 
-#: src/conf.py:723
+#: src/conf.py:724
 msgid ""
 "Determines how many seconds the bot\n"
 "    will ignore users who flood it with commands."
@@ -1202,7 +1199,7 @@ msgstr ""
 "sitä\n"
 " komennoilla, botti jättää huomioimatta."
 
-#: src/conf.py:727
+#: src/conf.py:728
 msgid ""
 "Determines whether the bot will defend itself\n"
 "    against invalid command-flooding."
@@ -1210,7 +1207,7 @@ msgstr ""
 "Määrittää puolustaako botti itseään \n"
 "    viallisten komentojen tulvaa vastaan."
 
-#: src/conf.py:730
+#: src/conf.py:731
 #, fuzzy
 msgid ""
 "Determines how many invalid commands users\n"
@@ -1235,7 +1232,7 @@ msgstr ""
 "heille\n"
 " tulvia kelvollisilla komennoilla."
 
-#: src/conf.py:738
+#: src/conf.py:739
 msgid ""
 "Determines how many seconds the bot\n"
 "    will ignore users who flood it with invalid commands.  Typically, this\n"
@@ -1254,7 +1251,7 @@ msgstr ""
 "tulvia\n"
 " kelvollisilla komennoilla."
 
-#: src/conf.py:744
+#: src/conf.py:745
 msgid ""
 "Determines whether the bot will notify people\n"
 "    that they're being ignored for invalid command flooding."
@@ -1264,7 +1261,7 @@ msgstr ""
 "    heidän olemassa olostaan ei välitetä viallisten komentojen tulvan takia."
 
 # Mitäköhän tämä tarkoittaa?
-#: src/conf.py:753
+#: src/conf.py:754
 #, fuzzy
 msgid ""
 "Determines the default length of time a\n"
@@ -1272,23 +1269,19 @@ msgid ""
 msgstr ""
 "Määrittää, oletus ajanjakson, joka ajurin pitäisi estää odottaen sisääntuloa."
 
-#: src/conf.py:760
+#: src/conf.py:761
 msgid ""
-"Determines what driver module the bot\n"
-"    will use.  Socket, a simple driver based on timeout sockets, is used by\n"
-"    default because it's simple and stable.  Twisted is very stable and "
-"simple,\n"
-"    and if you've got Twisted installed, is probably your best bet."
+"Determines what driver module the \n"
+"    bot will use. The default is Socket which is simple and stable \n"
+"    and supports SSL. Twisted doesn't work if the IRC server which \n"
+"    you are connecting to has IPv6 (most of them do)."
 msgstr ""
-"Määrittää mitä ajurimoduulia botti käyttää. Socket, yksinkertainen ajuri, "
-"joka perustuu\n"
-" aikakatkaisu sokkeleihin, on käytössä oletuksena, koska se on "
-"yksinkertainen ja vakaa.\n"
-" Twisted on erittäin vakaa ja yksinkertainen, ja jos Twisted on asennettuna, "
-"se on\n"
-" luultavasti paras vaihtoehto."
+"Määrittää botin käyttämän ajurimoduulin. Oletus on Socket, joka on\n"
+" yksinkertainen ja vakaa ja tukee SSL:ää. Twisted ei toimi mikäli "
+"yhdistettävällä\n"
+" IRC-palvelimella on IPv6 (useimmilla niistä on)."
 
-#: src/conf.py:766
+#: src/conf.py:767
 msgid ""
 "Determines the maximum time the bot will\n"
 "    wait before attempting to reconnect to an IRC server.  The bot may, of\n"
@@ -1300,17 +1293,17 @@ msgstr ""
 "aikaisemminkin,\n"
 " mikäli se on mahdollista."
 
-#: src/conf.py:815
+#: src/conf.py:816
 msgid ""
 "Determines what directory configuration data is\n"
 "    put into."
 msgstr "Määrittää mihin hakemistoon asetustiedostot laitetaan."
 
-#: src/conf.py:818
+#: src/conf.py:819
 msgid "Determines what directory data is put into."
 msgstr "Määrittää mihin hakemistoon data laitetaan."
 
-#: src/conf.py:820
+#: src/conf.py:821
 msgid ""
 "Determines what directory backup data is put\n"
 "    into. Set it to /dev/null to disable backup (it is a special value,\n"
@@ -1323,13 +1316,13 @@ msgstr ""
 " erityisarvo, joten se toimi myös Windowsilla ja käyttöjärjestelmillä,\n"
 " joilla ei ole hakemistoa /dev/null)."
 
-#: src/conf.py:824
+#: src/conf.py:825
 msgid ""
 "Determines what directory temporary files\n"
 "    are put into."
 msgstr "Määrittää mihin hakemistoon väliaikaistiedostot laitetaan."
 
-#: src/conf.py:827
+#: src/conf.py:828
 msgid ""
 "Determines what directory files of the\n"
 "    web server (templates, custom images, ...) are put into."
@@ -1338,7 +1331,7 @@ msgstr ""
 "kuvat\n"
 " jne.) laitetaan."
 
-#: src/conf.py:834
+#: src/conf.py:835
 msgid ""
 "Determines what directories\n"
 "    the bot will look for plugins in.  Accepts a comma-separated list of\n"
@@ -1357,13 +1350,13 @@ msgstr ""
 " 'config supybot.directories.plugins [config supybot.directories.plugins],\n"
 " UusiLisäosaHakemisto."
 
-#: src/conf.py:842
+#: src/conf.py:843
 msgid ""
 "Determines what plugins will\n"
 "    be loaded."
 msgstr "Määrittää mitkä lisäosat ladataan."
 
-#: src/conf.py:845
+#: src/conf.py:846
 msgid ""
 "Determines whether the bot will always load\n"
 "    important plugins (Admin, Channel, Config, Misc, Owner, and User)\n"
@@ -1384,7 +1377,7 @@ msgstr ""
 "lisäosia ovat\n"
 " tarpeeksi teräviä vaihtaakseen tätä asetusarvoa sopivasti :)"
 
-#: src/conf.py:872
+#: src/conf.py:873
 msgid ""
 "Determines what databases are available for use. If this\n"
 "    value is not configured (that is, if its value is empty) then sane "
@@ -1395,7 +1388,7 @@ msgstr ""
 "määritetty,\n"
 " (se tarkottaa, että sen arvo on tyhjä) niin järkevät oletukset tarjotaan."
 
-#: src/conf.py:878
+#: src/conf.py:879
 msgid ""
 "Determines what filename will be used\n"
 "    for the users database.  This file will go into the directory specified "
@@ -1407,7 +1400,7 @@ msgstr ""
 " tiedosto menee hakemistoon, jonka määrittää asetusarvo supybot.directories."
 "conf."
 
-#: src/conf.py:882
+#: src/conf.py:883
 msgid ""
 "Determines how long it takes identification to\n"
 "    time out.  If the value is less than or equal to zero, identification "
@@ -1418,7 +1411,7 @@ msgstr ""
 "on vähemmän\n"
 " tai yhtäsuuri kuin nolla, tunnistautuminen ei ikinä vanhene."
 
-#: src/conf.py:886
+#: src/conf.py:887
 msgid ""
 "Determines whether the bot will allow users to\n"
 "    unregister their users.  This can wreak havoc with already-existing\n"
@@ -1437,7 +1430,7 @@ msgstr ""
 "asetusarvo estä\n"
 " botin omistajaa käyttänästä \"unregister\" komentoa.)"
 
-#: src/conf.py:895
+#: src/conf.py:896
 msgid ""
 "Determines what filename will be used\n"
 "    for the ignores database.  This file will go into the directory "
@@ -1449,7 +1442,7 @@ msgstr ""
 "asetusarvo\n"
 " supybot.directories.conf."
 
-#: src/conf.py:901
+#: src/conf.py:902
 msgid ""
 "Determines what filename will be used\n"
 "    for the channels database.  This file will go into the directory "
@@ -1460,7 +1453,7 @@ msgstr ""
 "tiedosto laitetaan\n"
 " hakemistoon, joka määritetään asetusarvolla supybot.directories.conf."
 
-#: src/conf.py:931
+#: src/conf.py:932
 msgid ""
 "Determines whether database-based plugins that\n"
 "    can be channel-specific will be so.  This can be overridden by "
@@ -1485,7 +1478,7 @@ msgstr ""
 "sopivaksi,\n"
 " mikäli tietyn kanavan tietokannat, tahdotaan jakaa globaalisti."
 
-#: src/conf.py:939
+#: src/conf.py:940
 msgid ""
 "Determines what channel global\n"
 "    (non-channel-specific) databases will be considered a part of.  This is\n"
@@ -1514,7 +1507,7 @@ msgstr ""
 "lisäosat\n"
 " eivät välttämättä toimi kanavalla."
 
-#: src/conf.py:948
+#: src/conf.py:949
 msgid ""
 "Determines whether another channel's global\n"
 "    (non-channel-specific) databases will be allowed to link to this "
@@ -1533,14 +1526,14 @@ msgstr ""
 "lisäosat\n"
 " eivät välttämättä toimi kanavalla."
 
-#: src/conf.py:965
+#: src/conf.py:966
 msgid ""
 "Determines\n"
 "    whether CDB databases will be allowed as a database implementation."
 msgstr ""
 "Määrittää sallitaanko CDB tietokantojen käyttö tietokantaimplementaationa."
 
-#: src/conf.py:968
+#: src/conf.py:969
 msgid ""
 "Determines how often CDB databases will have\n"
 "    their modifications flushed to disk.  When the number of modified "
@@ -1555,13 +1548,13 @@ msgstr ""
 "yhteismäärästä,\n"
 " tietokanta tallennetaan levylle kokonaan."
 
-#: src/conf.py:1057
+#: src/conf.py:1058
 msgid ""
 "Determines what will be used as the\n"
 "    default banmask style."
 msgstr "Määrittää mitä käytetään oletus porttikiellon anto tyylinä."
 
-#: src/conf.py:1061
+#: src/conf.py:1062
 msgid ""
 "Determines whether the bot will strictly follow\n"
 "    the RFC; currently this only affects what strings are considered to be\n"
@@ -1578,7 +1571,7 @@ msgstr ""
 " verkkoa, joka vaatii viestien lähetyksen nimimerkille, kuten esimerkiksi\n"
 " services@tämän.verkon.palvelin, niin tämä pitäisi asettaa arvoon \"False\"."
 
-#: src/conf.py:1068
+#: src/conf.py:1069
 msgid ""
 "Determines what certificate file (if any) the bot\n"
 "    will use connect with SSL sockets by default."
@@ -1586,7 +1579,7 @@ msgstr ""
 "Määrittää mitä SSL-varmennetta (jos mitään) botti käyttää oletuksena\n"
 " yhdistäessään SSL-solmuilla."
 
-#: src/conf.py:1072
+#: src/conf.py:1073
 msgid ""
 "Determines what user modes the bot will request\n"
 "    from the server when it first connects.  Many people might choose +i; "
@@ -1603,7 +1596,7 @@ msgstr ""
 "antaa\n"
 " väärennetty isäntä."
 
-#: src/conf.py:1078
+#: src/conf.py:1079
 #, fuzzy
 msgid ""
 "Determines what vhost the bot will bind to before\n"
@@ -1613,7 +1606,7 @@ msgstr ""
 "HTTP\n"
 " jne.) palvelimeen käyttäen IPv4:ää."
 
-#: src/conf.py:1082
+#: src/conf.py:1083
 #, fuzzy
 msgid ""
 "Determines what vhost the bot will bind to before\n"
@@ -1623,7 +1616,7 @@ msgstr ""
 "HTTP\n"
 " jne.) palvelimeen käyttäen IPv6:tta."
 
-#: src/conf.py:1086
+#: src/conf.py:1087
 msgid ""
 "Determines how many old messages the bot will\n"
 "    keep around in its history.  Changing this variable will not take "
@@ -1634,7 +1627,7 @@ msgstr ""
 "asetusarvon\n"
 " muuttaminen ei vaikuta ennen uudelleenkäynnistystä."
 
-#: src/conf.py:1091
+#: src/conf.py:1092
 #, fuzzy
 msgid ""
 "A floating point number of seconds to throttle\n"
@@ -1646,7 +1639,7 @@ msgstr ""
 "estää viestejä\n"
 " tulemasta lähetetyiksi nopeammin kuin kerran throttleTime sekunteja."
 
-#: src/conf.py:1096
+#: src/conf.py:1097
 msgid ""
 "Determines whether the bot will send PINGs to\n"
 "    the server it's connected to in order to keep the connection alive and\n"
@@ -1663,7 +1656,7 @@ msgstr ""
 "olla \"True\",\n"
 " mikäli et kokeile omituisia palvelinongelmia."
 
-#: src/conf.py:1103
+#: src/conf.py:1104
 msgid ""
 "Determines the number of seconds between sending\n"
 "    pings to the server, if pings are being sent to the server."
@@ -1672,7 +1665,7 @@ msgstr ""
 "pingejä\n"
 " lähetetään palvelimelle."
 
-#: src/conf.py:1108
+#: src/conf.py:1109
 msgid ""
 "Determines whether the bot will refuse\n"
 "    duplicated messages to be queued for delivery to the server.  This is a\n"
@@ -1689,7 +1682,7 @@ msgstr ""
 "merkitystä\n"
 " mikäli et ole tekemässä lisäosien hakkerointia."
 
-#: src/conf.py:1116
+#: src/conf.py:1117
 msgid ""
 "Determines how many seconds must elapse between\n"
 "    JOINs sent to the server."
@@ -1697,7 +1690,7 @@ msgstr ""
 "Määrittää, kuinka monta sekuntia täytyy kulua palvelimelle lähetettyjen \n"
 "    JOINien välissä."
 
-#: src/conf.py:1124
+#: src/conf.py:1125
 msgid ""
 "Determines how many bytes the bot will\n"
 "    'peek' at when looking through a URL for a doctype or title or "
@@ -1712,7 +1705,7 @@ msgstr ""
 "määrän bittejä,\n"
 " vaikka ei löytäisikään etsimäänsä."
 
-#: src/conf.py:1130
+#: src/conf.py:1131
 msgid ""
 "Determines what proxy all HTTP requests should go\n"
 "    through.  The value should be of the form 'host:port'."
@@ -1721,7 +1714,7 @@ msgstr ""
 "mennä. \n"
 "   Arvon pitäisi olla muodossa 'isäntä:portti'."
 
-#: src/conf.py:1150
+#: src/conf.py:1151
 #, fuzzy
 msgid ""
 "Space-separated list of IPv4 hosts the HTTP server\n"
@@ -1730,7 +1723,7 @@ msgstr ""
 "Välilyönneilla erotettu lista IPv4-osoitteista, joihin HTTP-palvelin "
 "sitoutuu."
 
-#: src/conf.py:1153
+#: src/conf.py:1154
 #, fuzzy
 msgid ""
 "Space-separated list of IPv6 hosts the HTTP server will\n"
@@ -1739,7 +1732,7 @@ msgstr ""
 "Välilyönneilla erotettu lista IPv6-osoitteista, joihin HTTP-palvelin "
 "sitoutuu."
 
-#: src/conf.py:1156
+#: src/conf.py:1157
 msgid ""
 "Determines what port the HTTP server will\n"
 "    bind."
@@ -1747,7 +1740,7 @@ msgstr ""
 "Määrittää mihin porttiin HTTP palvelin \n"
 "    sitoutuu."
 
-#: src/conf.py:1159
+#: src/conf.py:1160
 msgid ""
 "Determines whether the server will stay\n"
 "    alive if no plugin is using it. This also means that the server will\n"
@@ -1758,28 +1751,27 @@ msgstr ""
 "mikäli sitä \n"
 " ei käytetä."
 
-#: src/conf.py:1163
+#: src/conf.py:1164
 #, fuzzy
 msgid ""
 "Determines the path of the file served as\n"
 "    favicon to browsers."
 msgstr "Määrittää polun tiedostoon, joka annetaan faviconina selaimille."
 
-#: src/conf.py:1171
+#: src/conf.py:1172
 msgid ""
 "Determines whether the bot will ignore\n"
-"    unregistered users by default.  Of course, that'll make it particularly\n"
-"    hard for those users to register or identify with the bot, but that's "
-"your\n"
-"    problem to solve."
+"    unidentified users by default.  Of course, that'll make it\n"
+"    particularly hard for those users to register or identify with the bot\n"
+"    without adding their hostmasks, but that's your problem to solve."
 msgstr ""
-"Määrittää jättääkö botti rekisteröimättömät käyttäjät huomioitta oletuksena. "
-"Tietysti,\n"
-" se tekee rekisteröitymisen tai tunnistautumisen botin kanssa erityisen "
-"hankalaksi,\n"
-" mutta se on sinun ongelmasi. "
+"Määrittää jättääkö botti tunnistautumattomat käyttäjät huomiotta.\n"
+" Tietysti se tekee heidän rekisteröitymisestään tai tunnistautumisestaan "
+"botin\n"
+" kanssa vaikeaksi, ellei heillä ole lisättyjä hostmaskeja, mutta se on sinun "
+"ongelmasi."
 
-#: src/conf.py:1178
+#: src/conf.py:1179
 msgid ""
 "A string that is the external IP of the bot.  If this is the\n"
 "   empty string, the bot will attempt to find out its IP dynamically "
@@ -1791,7 +1783,7 @@ msgstr ""
 "(vaikko\n"
 "    joskus se ei toimi, siksi tämä asetusarvo)."
 
-#: src/conf.py:1192
+#: src/conf.py:1193
 msgid ""
 "Determines what the default timeout for socket\n"
 "    objects will be.  This means that *all* sockets will timeout when this "
@@ -1806,7 +1798,7 @@ msgstr ""
 "solmuja\n"
 " käyttävän koodin kirjoittaja on erikseen muokannut tätä)."
 
-#: src/conf.py:1198
+#: src/conf.py:1199
 msgid ""
 "Determines what file the bot should write its PID\n"
 "    (Process ID) to, so you can kill it more easily.  If it's left unset (as "
@@ -1822,7 +1814,7 @@ msgstr ""
 "käynnistys on vaadittu\n"
 "    tämän asetusarvon muutosten vaikutuksen aikaansaamiseksi."
 
-#: src/conf.py:1208
+#: src/conf.py:1209
 msgid ""
 "Determines whether the bot will automatically\n"
 "    thread all commands."
@@ -1830,7 +1822,7 @@ msgstr ""
 "Määrittää ketjuttaako botti kaikki\n"
 "    komennot."
 
-#: src/conf.py:1211
+#: src/conf.py:1212
 msgid ""
 "Determines whether the bot will automatically\n"
 "    flush all flushers *very* often.  Useful for debugging when you don't "
@@ -1928,9 +1920,8 @@ msgid "Value must be an integer, not %r."
 msgstr "Arvon täytyy olla kokonaisluku, eikä %r."
 
 #: src/registry.py:441
-#, fuzzy
 msgid "Value must be a non-negative integer, not %r."
-msgstr "ei-negatiivinen kokonaisluku"
+msgstr "Arvon täytyy olla positiivinen kokonaisluku, ei %r."
 
 #: src/registry.py:449
 msgid "Value must be positive (non-zero) integer, not %r."
@@ -1947,7 +1938,7 @@ msgstr "Arvon täytyy olla nollaa suurempi liukuluku, ei %r."
 #: src/registry.py:482
 #, fuzzy
 msgid "Value must be a floating point number in the range [0, 1], not %r."
-msgstr "Arvon täytyy olla likuluku alueella [0,1] eikä %r."
+msgstr "Arvon täytyy olla liukuluku alueella [0,1] eikä %r."
 
 #: src/registry.py:496
 msgid "Value is not a valid Python string, not %r."
@@ -1998,6 +1989,22 @@ msgstr "%s sitten"
 msgid "and"
 msgstr "ja"
 
+#~ msgid ""
+#~ "Determines what driver module the bot\n"
+#~ "    will use.  Socket, a simple driver based on timeout sockets, is used "
+#~ "by\n"
+#~ "    default because it's simple and stable.  Twisted is very stable and "
+#~ "simple,\n"
+#~ "    and if you've got Twisted installed, is probably your best bet."
+#~ msgstr ""
+#~ "Määrittää mitä ajurimoduulia botti käyttää. Socket, yksinkertainen ajuri, "
+#~ "joka perustuu\n"
+#~ " aikakatkaisu sokkeleihin, on käytössä oletuksena, koska se on "
+#~ "yksinkertainen ja vakaa.\n"
+#~ " Twisted on erittäin vakaa ja yksinkertainen, ja jos Twisted on "
+#~ "asennettuna, se on\n"
+#~ " luultavasti paras vaihtoehto."
+
 #~ msgid ""
 #~ "Determines the content of the robots.txt file,\n"
 #~ "    served on the server to search engine."
diff --git a/locales/messages.pot b/locales/messages.pot
index f390845cf..55631c685 100644
--- a/locales/messages.pot
+++ b/locales/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-06-07 22:03+EEST\n"
+"POT-Creation-Date: 2014-08-01 20:08+EEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,34 +51,34 @@ msgstr ""
 msgid "You've attempted more nesting than is currently allowed on this bot."
 msgstr ""
 
-#: src/callbacks.py:822
+#: src/callbacks.py:823
 msgid "The command %q is available in the %L plugins.  Please specify the plugin whose command you wish to call by using its name as a command before %q."
 msgstr ""
 
-#: src/callbacks.py:908 src/callbacks.py:921
+#: src/callbacks.py:909 src/callbacks.py:922
 msgid "(XX more messages)"
 msgstr ""
 
-#: src/callbacks.py:954
+#: src/callbacks.py:955
 msgid "more message"
 msgstr ""
 
-#: src/callbacks.py:956
+#: src/callbacks.py:957
 msgid "more messages"
 msgstr ""
 
-#: src/callbacks.py:1073
+#: src/callbacks.py:1074
 msgid ""
 "Determines what commands are currently disabled.  Such\n"
 "    commands will not appear in command lists, etc.  They will appear not even\n"
 "    to exist."
 msgstr ""
 
-#: src/callbacks.py:1277
+#: src/callbacks.py:1278
 msgid "Invalid arguments for %s."
 msgstr ""
 
-#: src/callbacks.py:1303
+#: src/callbacks.py:1304
 msgid "The %q command has no help."
 msgstr ""
 
@@ -261,9 +261,9 @@ msgstr ""
 
 #: src/conf.py:217
 msgid ""
-"Determines the user the bot sends to the server.\n"
-"    A standard user using the current version of the bot will be generated if\n"
-"    this is left empty."
+"Determines the real name which the bot sends to\n"
+"    the server. A standard real name using the current version of the bot\n"
+"    will be generated if this is left empty."
 msgstr ""
 
 #: src/conf.py:225
@@ -323,7 +323,7 @@ msgstr ""
 #: src/conf.py:332
 msgid ""
 "Determines\n"
-"        the username the bot sends to the server. If empty, defaults to\n"
+"        the real name which the bot sends to the server. If empty, defaults to\n"
 "        supybot.user"
 msgstr ""
 
@@ -363,40 +363,40 @@ msgid ""
 "    time formats."
 msgstr ""
 
-#: src/conf.py:384
+#: src/conf.py:385
 msgid ""
 "Determines whether elapsed times will be given\n"
 "    as \"1 day, 2 hours, 3 minutes, and 15 seconds\" or as \"1d 2h 3m 15s\"."
 msgstr ""
 
-#: src/conf.py:394
+#: src/conf.py:395
 msgid ""
 "Determines the absolute maximum length of\n"
 "    the bot's reply -- no reply will be passed through the bot with a length\n"
 "    greater than this."
 msgstr ""
 
-#: src/conf.py:399
+#: src/conf.py:400
 msgid ""
 "Determines whether the bot will break up long\n"
 "    messages into chunks and allow users to use  the 'more' command to get the\n"
 "    remaining chunks."
 msgstr ""
 
-#: src/conf.py:404
+#: src/conf.py:405
 msgid ""
 "Determines what the maximum number of\n"
 "    chunks (for use with the 'more' command) will be."
 msgstr ""
 
-#: src/conf.py:408
+#: src/conf.py:409
 msgid ""
 "Determines how long individual chunks\n"
 "    will be.  If set to 0, uses our super-tweaked,\n"
 "    get-the-most-out-of-an-individual-message default."
 msgstr ""
 
-#: src/conf.py:413
+#: src/conf.py:414
 msgid ""
 "Determines how many mores will be sent\n"
 "    instantly (i.e., without the use of the more command, immediately when\n"
@@ -404,7 +404,7 @@ msgid ""
 "    required for all but the first chunk."
 msgstr ""
 
-#: src/conf.py:419
+#: src/conf.py:420
 msgid ""
 "Determines whether the bot will send\n"
 "    multi-message replies in a single message. This defaults to True \n"
@@ -412,7 +412,7 @@ msgid ""
 "    the bot will send multi-message replies on multiple lines."
 msgstr ""
 
-#: src/conf.py:425
+#: src/conf.py:426
 msgid ""
 "Determines whether the bot will reply with an\n"
 "    error message when it is addressed but not given a valid command.  If this\n"
@@ -420,14 +420,14 @@ msgid ""
 "    override the normal behavior."
 msgstr ""
 
-#: src/conf.py:432
+#: src/conf.py:433
 msgid ""
 "Determines whether error messages that result\n"
 "    from bugs in the bot will show a detailed error message (the uncaught\n"
 "    exception) or a generic error message."
 msgstr ""
 
-#: src/conf.py:436
+#: src/conf.py:437
 msgid ""
 "Determines whether the bot will send error\n"
 "    messages to users in private.  You might want to do this in order to keep\n"
@@ -435,7 +435,7 @@ msgid ""
 "    supybot.reply.error.withNotice."
 msgstr ""
 
-#: src/conf.py:441
+#: src/conf.py:442
 msgid ""
 "Determines whether the bot will send error\n"
 "    messages to users via NOTICE instead of PRIVMSG.  You might want to do this\n"
@@ -445,7 +445,7 @@ msgid ""
 "    in most IRC clients."
 msgstr ""
 
-#: src/conf.py:448
+#: src/conf.py:449
 msgid ""
 "Determines whether the bot will send an error\n"
 "    message to users who attempt to call a command for which they do not have\n"
@@ -454,21 +454,21 @@ msgid ""
 "    running certain commands."
 msgstr ""
 
-#: src/conf.py:455
+#: src/conf.py:456
 msgid ""
 "Determines whether the bot will reply\n"
 "     privately when replying in a channel, rather than replying to the whole\n"
 "     channel."
 msgstr ""
 
-#: src/conf.py:460
+#: src/conf.py:461
 msgid ""
 "Determines whether the bot will reply with a\n"
 "    notice when replying in a channel, rather than replying with a privmsg as\n"
 "    normal."
 msgstr ""
 
-#: src/conf.py:466
+#: src/conf.py:467
 msgid ""
 "Determines whether the bot will reply with a\n"
 "    notice when it is sending a private message, in order not to open a /query\n"
@@ -476,13 +476,13 @@ msgid ""
 "    configuration variable reply.withNoticeWhenPrivate."
 msgstr ""
 
-#: src/conf.py:472
+#: src/conf.py:473
 msgid ""
 "Determines whether the bot will always prefix\n"
 "     the user's nick to its reply to that user's command."
 msgstr ""
 
-#: src/conf.py:476
+#: src/conf.py:477
 msgid ""
 "Determines whether the bot should attempt to\n"
 "    reply to all messages even if they don't address it (either via its nick\n"
@@ -490,7 +490,7 @@ msgid ""
 "    to set supybot.reply.whenNotCommand to False."
 msgstr ""
 
-#: src/conf.py:482
+#: src/conf.py:483
 msgid ""
 "Determines whether the bot will allow you to\n"
 "    send channel-related commands outside of that channel.  Sometimes people\n"
@@ -499,7 +499,7 @@ msgid ""
 "    itself."
 msgstr ""
 
-#: src/conf.py:489
+#: src/conf.py:490
 msgid ""
 "Determines whether the bot will unidentify\n"
 "    someone when that person changes their nick.  Setting this to True\n"
@@ -507,7 +507,7 @@ msgid ""
 "    little greater security."
 msgstr ""
 
-#: src/conf.py:495
+#: src/conf.py:496
 msgid ""
 "Determines whether the bot will always join a\n"
 "    channel when it's invited.  If this value is False, the bot will only join\n"
@@ -515,7 +515,7 @@ msgid ""
 "    explicitly told to join the channel using the Admin.join command)."
 msgstr ""
 
-#: src/conf.py:501
+#: src/conf.py:502
 msgid ""
 "Supybot normally replies with the full help\n"
 "    whenever a user misuses a command.  If this value is set to True, the bot\n"
@@ -523,7 +523,7 @@ msgid ""
 "    help) rather than the full help."
 msgstr ""
 
-#: src/conf.py:515
+#: src/conf.py:516
 msgid ""
 "Determines what prefix characters the bot will\n"
 "    reply to.  A prefix character is a single character that the bot will use\n"
@@ -534,7 +534,7 @@ msgid ""
 "    assume it is being addressed."
 msgstr ""
 
-#: src/conf.py:524
+#: src/conf.py:525
 msgid ""
 "Determines what strings the\n"
 "    bot will reply to when they are at the beginning of the message.  Whereas\n"
@@ -544,89 +544,89 @@ msgid ""
 "    prefixed by either @@ or ??."
 msgstr ""
 
-#: src/conf.py:531
+#: src/conf.py:532
 msgid ""
 "Determines whether the bot will reply when\n"
 "    people address it by its nick, rather than with a prefix character."
 msgstr ""
 
-#: src/conf.py:534
+#: src/conf.py:535
 msgid ""
 "Determines whether the bot will reply when\n"
 "    people address it by its nick at the end of the message, rather than at\n"
 "    the beginning."
 msgstr ""
 
-#: src/conf.py:538
+#: src/conf.py:539
 msgid ""
 "Determines what extra nicks\n"
 "    the bot will always respond to when addressed by, even if its current nick\n"
 "    is something else."
 msgstr ""
 
-#: src/conf.py:548
+#: src/conf.py:549
 msgid "The operation succeeded."
 msgstr ""
 
-#: src/conf.py:549
+#: src/conf.py:550
 msgid ""
 "Determines what message the bot replies with when a command succeeded.\n"
 "    If this configuration variable is empty, no success message will be\n"
 "    sent."
 msgstr ""
 
-#: src/conf.py:554
+#: src/conf.py:555
 msgid ""
 "An error has occurred and has been logged.\n"
 "    Please contact this bot's administrator for more information."
 msgstr ""
 
-#: src/conf.py:555
+#: src/conf.py:556
 msgid ""
 "\n"
 "    Determines what error message the bot gives when it wants to be\n"
 "    ambiguous."
 msgstr ""
 
-#: src/conf.py:560
+#: src/conf.py:561
 msgid ""
 "An error has occurred and has been logged.\n"
-"    Check the logs for more informations."
+"    Check the logs for more information."
 msgstr ""
 
-#: src/conf.py:561
+#: src/conf.py:562
 msgid ""
 "Determines what error\n"
 "    message the bot gives to the owner when it wants to be ambiguous."
 msgstr ""
 
-#: src/conf.py:565
+#: src/conf.py:566
 msgid ""
 "Your hostmask doesn't match or your password\n"
 "    is wrong."
 msgstr ""
 
-#: src/conf.py:566
+#: src/conf.py:567
 msgid ""
 "Determines what message the bot replies with when\n"
 "     someone tries to use a command that requires being identified or having a\n"
 "    password and neither credential is correct."
 msgstr ""
 
-#: src/conf.py:572
+#: src/conf.py:573
 msgid ""
 "I can't find %s in my user\n"
 "    database.  If you didn't give a user name, then I might not know what your\n"
 "    user is, and you'll need to identify before this command might work."
 msgstr ""
 
-#: src/conf.py:575
+#: src/conf.py:576
 msgid ""
 "Determines what error message the bot replies with when someone tries\n"
 "    to accessing some information on a user the bot doesn't know about."
 msgstr ""
 
-#: src/conf.py:579
+#: src/conf.py:580
 msgid ""
 "You must be registered to use this command.\n"
 "    If you are already registered, you must either identify (using the identify\n"
@@ -634,14 +634,14 @@ msgid ""
 "    \"hostmask add\" command)."
 msgstr ""
 
-#: src/conf.py:582
+#: src/conf.py:583
 msgid ""
 "Determines what error message the bot\n"
 "    replies with when someone tries to do something that requires them to be\n"
 "    registered but they're not currently recognized."
 msgstr ""
 
-#: src/conf.py:587
+#: src/conf.py:588
 msgid ""
 "You don't have the %s capability.  If you\n"
 "    think that you should have this capability, be sure that you are identified\n"
@@ -649,14 +649,14 @@ msgid ""
 "    identified."
 msgstr ""
 
-#: src/conf.py:590
+#: src/conf.py:591
 msgid ""
 "Determines what error message is given when the bot\n"
 "    is telling someone they aren't cool enough to use the command they tried to\n"
 "    use."
 msgstr ""
 
-#: src/conf.py:595
+#: src/conf.py:596
 msgid ""
 "You're missing some capability you need.\n"
 "    This could be because you actually possess the anti-capability for the\n"
@@ -668,7 +668,7 @@ msgid ""
 "    what you want to do."
 msgstr ""
 
-#: src/conf.py:603
+#: src/conf.py:604
 msgid ""
 "Determines what generic error message is given when the bot is telling\n"
 "    someone that they aren't cool enough to use the command they tried to use,\n"
@@ -676,40 +676,40 @@ msgid ""
 "    explicit capability for whatever reason."
 msgstr ""
 
-#: src/conf.py:609
+#: src/conf.py:610
 msgid ""
 "That operation cannot be done in a\n"
 "    channel."
 msgstr ""
 
-#: src/conf.py:610
+#: src/conf.py:611
 msgid ""
 "Determines what error messages the bot sends to people\n"
 "    who try to do things in a channel that really should be done in\n"
 "    private."
 msgstr ""
 
-#: src/conf.py:615
+#: src/conf.py:616
 msgid ""
 "This may be a bug.  If you think it is,\n"
 "    please file a bug report at\n"
 "    <https://github.com/ProgVal/Limnoria/issues>."
 msgstr ""
 
-#: src/conf.py:618
+#: src/conf.py:619
 msgid ""
 "Determines what message the bot sends when it thinks you've\n"
 "    encountered a bug that the developers don't know about."
 msgstr ""
 
-#: src/conf.py:625
+#: src/conf.py:626
 msgid ""
 "A floating point number of seconds to throttle\n"
 "    snarfed URLs, in order to prevent loops between two bots snarfing the same\n"
 "    URLs and having the snarfed URL in the output of the snarf message."
 msgstr ""
 
-#: src/conf.py:630
+#: src/conf.py:631
 msgid ""
 "Determines the number of seconds\n"
 "    between running the upkeep function that flushes (commits) open databases,\n"
@@ -717,7 +717,7 @@ msgid ""
 "     level."
 msgstr ""
 
-#: src/conf.py:636
+#: src/conf.py:637
 msgid ""
 "Determines whether the bot will periodically\n"
 "    flush data and configuration files to disk.  Generally, the only time\n"
@@ -728,27 +728,27 @@ msgid ""
 "    permanent, you must edit the registry yourself."
 msgstr ""
 
-#: src/conf.py:661
+#: src/conf.py:662
 msgid ""
 "Determines what characters are valid for quoting\n"
 "    arguments to commands in order to prevent them from being tokenized.\n"
 "    "
 msgstr ""
 
-#: src/conf.py:668
+#: src/conf.py:669
 msgid ""
 "Determines whether the bot will allow nested\n"
 "    commands, which rule.  You definitely should keep this on."
 msgstr ""
 
-#: src/conf.py:671
+#: src/conf.py:672
 msgid ""
 "Determines what the maximum number of\n"
 "    nested commands will be; users will receive an error if they attempt\n"
 "    commands more nested than this."
 msgstr ""
 
-#: src/conf.py:679
+#: src/conf.py:680
 msgid ""
 "Supybot allows you to specify what brackets are\n"
 "    used for your nested commands.  Valid sets of brackets include [], <>, and\n"
@@ -758,21 +758,21 @@ msgid ""
 "    not be allowed in this channel."
 msgstr ""
 
-#: src/conf.py:686
+#: src/conf.py:687
 msgid ""
 "Supybot allows nested commands. Enabling this\n"
 "    option will allow nested commands with a syntax similar to UNIX pipes, for\n"
 "    example: 'bot: foo | bar'."
 msgstr ""
 
-#: src/conf.py:691
+#: src/conf.py:692
 msgid ""
 "Determines what commands have default\n"
 "    plugins set, and which plugins are set to be the default for each of those\n"
 "    commands."
 msgstr ""
 
-#: src/conf.py:697
+#: src/conf.py:698
 msgid ""
 "Determines what plugins automatically get precedence over all\n"
 "        other plugins when selecting a default plugin for a command.  By\n"
@@ -782,19 +782,19 @@ msgid ""
 "        case-sensitive."
 msgstr ""
 
-#: src/conf.py:712
+#: src/conf.py:713
 msgid ""
 "Determines the interval used for\n"
 "    the history storage."
 msgstr ""
 
-#: src/conf.py:715
+#: src/conf.py:716
 msgid ""
 "Determines whether the bot will defend itself\n"
 "    against command-flooding."
 msgstr ""
 
-#: src/conf.py:718
+#: src/conf.py:719
 msgid ""
 "Determines how many commands users are\n"
 "    allowed per minute.  If a user sends more than this many commands in any\n"
@@ -802,19 +802,19 @@ msgid ""
 "    supybot.abuse.flood.command.punishment seconds."
 msgstr ""
 
-#: src/conf.py:723
+#: src/conf.py:724
 msgid ""
 "Determines how many seconds the bot\n"
 "    will ignore users who flood it with commands."
 msgstr ""
 
-#: src/conf.py:727
+#: src/conf.py:728
 msgid ""
 "Determines whether the bot will defend itself\n"
 "    against invalid command-flooding."
 msgstr ""
 
-#: src/conf.py:730
+#: src/conf.py:731
 msgid ""
 "Determines how many invalid commands users\n"
 "    are allowed per minute.  If a user sends more than this many invalid\n"
@@ -825,7 +825,7 @@ msgid ""
 "    commands than for them to flood with valid commands."
 msgstr ""
 
-#: src/conf.py:738
+#: src/conf.py:739
 msgid ""
 "Determines how many seconds the bot\n"
 "    will ignore users who flood it with invalid commands.  Typically, this\n"
@@ -834,63 +834,63 @@ msgid ""
 "    commands than for them to flood with valid commands."
 msgstr ""
 
-#: src/conf.py:744
+#: src/conf.py:745
 msgid ""
 "Determines whether the bot will notify people\n"
 "    that they're being ignored for invalid command flooding."
 msgstr ""
 
-#: src/conf.py:753
+#: src/conf.py:754
 msgid ""
 "Determines the default length of time a\n"
 "    driver should block waiting for input."
 msgstr ""
 
-#: src/conf.py:760
+#: src/conf.py:761
 msgid ""
-"Determines what driver module the bot\n"
-"    will use.  Socket, a simple driver based on timeout sockets, is used by\n"
-"    default because it's simple and stable.  Twisted is very stable and simple,\n"
-"    and if you've got Twisted installed, is probably your best bet."
+"Determines what driver module the \n"
+"    bot will use. The default is Socket which is simple and stable \n"
+"    and supports SSL. Twisted doesn't work if the IRC server which \n"
+"    you are connecting to has IPv6 (most of them do)."
 msgstr ""
 
-#: src/conf.py:766
+#: src/conf.py:767
 msgid ""
 "Determines the maximum time the bot will\n"
 "    wait before attempting to reconnect to an IRC server.  The bot may, of\n"
 "    course, reconnect earlier if possible."
 msgstr ""
 
-#: src/conf.py:815
+#: src/conf.py:816
 msgid ""
 "Determines what directory configuration data is\n"
 "    put into."
 msgstr ""
 
-#: src/conf.py:818
+#: src/conf.py:819
 msgid "Determines what directory data is put into."
 msgstr ""
 
-#: src/conf.py:820
+#: src/conf.py:821
 msgid ""
 "Determines what directory backup data is put\n"
 "    into. Set it to /dev/null to disable backup (it is a special value,\n"
 "    so it also works on Windows and systems without /dev/null)."
 msgstr ""
 
-#: src/conf.py:824
+#: src/conf.py:825
 msgid ""
 "Determines what directory temporary files\n"
 "    are put into."
 msgstr ""
 
-#: src/conf.py:827
+#: src/conf.py:828
 msgid ""
 "Determines what directory files of the\n"
 "    web server (templates, custom images, ...) are put into."
 msgstr ""
 
-#: src/conf.py:834
+#: src/conf.py:835
 msgid ""
 "Determines what directories\n"
 "    the bot will look for plugins in.  Accepts a comma-separated list of\n"
@@ -900,13 +900,13 @@ msgid ""
 "    [config supybot.directories.plugins], newPluginDirectory'."
 msgstr ""
 
-#: src/conf.py:842
+#: src/conf.py:843
 msgid ""
 "Determines what plugins will\n"
 "    be loaded."
 msgstr ""
 
-#: src/conf.py:845
+#: src/conf.py:846
 msgid ""
 "Determines whether the bot will always load\n"
 "    important plugins (Admin, Channel, Config, Misc, Owner, and User)\n"
@@ -916,28 +916,28 @@ msgid ""
 "    enough to change the value of this variable appropriately :)"
 msgstr ""
 
-#: src/conf.py:872
+#: src/conf.py:873
 msgid ""
 "Determines what databases are available for use. If this\n"
 "    value is not configured (that is, if its value is empty) then sane defaults\n"
 "    will be provided."
 msgstr ""
 
-#: src/conf.py:878
+#: src/conf.py:879
 msgid ""
 "Determines what filename will be used\n"
 "    for the users database.  This file will go into the directory specified by\n"
 "    the supybot.directories.conf variable."
 msgstr ""
 
-#: src/conf.py:882
+#: src/conf.py:883
 msgid ""
 "Determines how long it takes identification to\n"
 "    time out.  If the value is less than or equal to zero, identification never\n"
 "    times out."
 msgstr ""
 
-#: src/conf.py:886
+#: src/conf.py:887
 msgid ""
 "Determines whether the bot will allow users to\n"
 "    unregister their users.  This can wreak havoc with already-existing\n"
@@ -947,21 +947,21 @@ msgid ""
 "    "
 msgstr ""
 
-#: src/conf.py:895
+#: src/conf.py:896
 msgid ""
 "Determines what filename will be used\n"
 "    for the ignores database.  This file will go into the directory specified\n"
 "    by the supybot.directories.conf variable."
 msgstr ""
 
-#: src/conf.py:901
+#: src/conf.py:902
 msgid ""
 "Determines what filename will be used\n"
 "    for the channels database.  This file will go into the directory specified\n"
 "    by the supybot.directories.conf variable."
 msgstr ""
 
-#: src/conf.py:931
+#: src/conf.py:932
 msgid ""
 "Determines whether database-based plugins that\n"
 "    can be channel-specific will be so.  This can be overridden by individual\n"
@@ -972,7 +972,7 @@ msgid ""
 "    to share a certain channel's databases globally."
 msgstr ""
 
-#: src/conf.py:939
+#: src/conf.py:940
 msgid ""
 "Determines what channel global\n"
 "    (non-channel-specific) databases will be considered a part of.  This is\n"
@@ -984,7 +984,7 @@ msgid ""
 "    for your channel."
 msgstr ""
 
-#: src/conf.py:948
+#: src/conf.py:949
 msgid ""
 "Determines whether another channel's global\n"
 "    (non-channel-specific) databases will be allowed to link to this channel's\n"
@@ -993,13 +993,13 @@ msgid ""
 "    "
 msgstr ""
 
-#: src/conf.py:965
+#: src/conf.py:966
 msgid ""
 "Determines\n"
 "    whether CDB databases will be allowed as a database implementation."
 msgstr ""
 
-#: src/conf.py:968
+#: src/conf.py:969
 msgid ""
 "Determines how often CDB databases will have\n"
 "    their modifications flushed to disk.  When the number of modified records\n"
@@ -1007,13 +1007,13 @@ msgid ""
 "    will be entirely flushed to disk."
 msgstr ""
 
-#: src/conf.py:1057
+#: src/conf.py:1058
 msgid ""
 "Determines what will be used as the\n"
 "    default banmask style."
 msgstr ""
 
-#: src/conf.py:1061
+#: src/conf.py:1062
 msgid ""
 "Determines whether the bot will strictly follow\n"
 "    the RFC; currently this only affects what strings are considered to be\n"
@@ -1022,13 +1022,13 @@ msgid ""
 "    False."
 msgstr ""
 
-#: src/conf.py:1068
+#: src/conf.py:1069
 msgid ""
 "Determines what certificate file (if any) the bot\n"
 "    will use connect with SSL sockets by default."
 msgstr ""
 
-#: src/conf.py:1072
+#: src/conf.py:1073
 msgid ""
 "Determines what user modes the bot will request\n"
 "    from the server when it first connects.  Many people might choose +i; some\n"
@@ -1036,33 +1036,33 @@ msgid ""
 "    that you should be given a fake host."
 msgstr ""
 
-#: src/conf.py:1078
+#: src/conf.py:1079
 msgid ""
 "Determines what vhost the bot will bind to before\n"
 "    connecting a server (IRC, HTTP, ...) via IPv4."
 msgstr ""
 
-#: src/conf.py:1082
+#: src/conf.py:1083
 msgid ""
 "Determines what vhost the bot will bind to before\n"
 "    connecting a server (IRC, HTTP, ...) via IPv6."
 msgstr ""
 
-#: src/conf.py:1086
+#: src/conf.py:1087
 msgid ""
 "Determines how many old messages the bot will\n"
 "    keep around in its history.  Changing this variable will not take effect\n"
 "    until the bot is restarted."
 msgstr ""
 
-#: src/conf.py:1091
+#: src/conf.py:1092
 msgid ""
 "A floating point number of seconds to throttle\n"
 "    queued messages -- that is, messages will not be sent faster than once per\n"
 "    throttleTime seconds."
 msgstr ""
 
-#: src/conf.py:1096
+#: src/conf.py:1097
 msgid ""
 "Determines whether the bot will send PINGs to\n"
 "    the server it's connected to in order to keep the connection alive and\n"
@@ -1071,13 +1071,13 @@ msgid ""
 "    some strange server issues."
 msgstr ""
 
-#: src/conf.py:1103
+#: src/conf.py:1104
 msgid ""
 "Determines the number of seconds between sending\n"
 "    pings to the server, if pings are being sent to the server."
 msgstr ""
 
-#: src/conf.py:1108
+#: src/conf.py:1109
 msgid ""
 "Determines whether the bot will refuse\n"
 "    duplicated messages to be queued for delivery to the server.  This is a\n"
@@ -1086,13 +1086,13 @@ msgid ""
 "    doing certain kinds of plugin hacking."
 msgstr ""
 
-#: src/conf.py:1116
+#: src/conf.py:1117
 msgid ""
 "Determines how many seconds must elapse between\n"
 "    JOINs sent to the server."
 msgstr ""
 
-#: src/conf.py:1124
+#: src/conf.py:1125
 msgid ""
 "Determines how many bytes the bot will\n"
 "    'peek' at when looking through a URL for a doctype or title or something\n"
@@ -1100,59 +1100,59 @@ msgid ""
 "    found what it was looking for."
 msgstr ""
 
-#: src/conf.py:1130
+#: src/conf.py:1131
 msgid ""
 "Determines what proxy all HTTP requests should go\n"
 "    through.  The value should be of the form 'host:port'."
 msgstr ""
 
-#: src/conf.py:1150
+#: src/conf.py:1151
 msgid ""
 "Space-separated list of IPv4 hosts the HTTP server\n"
 "    will bind."
 msgstr ""
 
-#: src/conf.py:1153
+#: src/conf.py:1154
 msgid ""
 "Space-separated list of IPv6 hosts the HTTP server will\n"
 "    bind."
 msgstr ""
 
-#: src/conf.py:1156
+#: src/conf.py:1157
 msgid ""
 "Determines what port the HTTP server will\n"
 "    bind."
 msgstr ""
 
-#: src/conf.py:1159
+#: src/conf.py:1160
 msgid ""
 "Determines whether the server will stay\n"
 "    alive if no plugin is using it. This also means that the server will\n"
 "    start even if it is not used."
 msgstr ""
 
-#: src/conf.py:1163
+#: src/conf.py:1164
 msgid ""
 "Determines the path of the file served as\n"
 "    favicon to browsers."
 msgstr ""
 
-#: src/conf.py:1171
+#: src/conf.py:1172
 msgid ""
 "Determines whether the bot will ignore\n"
-"    unregistered users by default.  Of course, that'll make it particularly\n"
-"    hard for those users to register or identify with the bot, but that's your\n"
-"    problem to solve."
+"    unidentified users by default.  Of course, that'll make it\n"
+"    particularly hard for those users to register or identify with the bot\n"
+"    without adding their hostmasks, but that's your problem to solve."
 msgstr ""
 
-#: src/conf.py:1178
+#: src/conf.py:1179
 msgid ""
 "A string that is the external IP of the bot.  If this is the\n"
 "   empty string, the bot will attempt to find out its IP dynamically (though\n"
 "   sometimes that doesn't work, hence this variable)."
 msgstr ""
 
-#: src/conf.py:1192
+#: src/conf.py:1193
 msgid ""
 "Determines what the default timeout for socket\n"
 "    objects will be.  This means that *all* sockets will timeout when this many\n"
@@ -1160,7 +1160,7 @@ msgid ""
 "    that uses the sockets)."
 msgstr ""
 
-#: src/conf.py:1198
+#: src/conf.py:1199
 msgid ""
 "Determines what file the bot should write its PID\n"
 "    (Process ID) to, so you can kill it more easily.  If it's left unset (as is\n"
@@ -1168,13 +1168,13 @@ msgid ""
 "    changes to this variable to take effect."
 msgstr ""
 
-#: src/conf.py:1208
+#: src/conf.py:1209
 msgid ""
 "Determines whether the bot will automatically\n"
 "    thread all commands."
 msgstr ""
 
-#: src/conf.py:1211
+#: src/conf.py:1212
 msgid ""
 "Determines whether the bot will automatically\n"
 "    flush all flushers *very* often.  Useful for debugging when you don't know\n"
diff --git a/plugins/Aka/locales/fi.po b/plugins/Aka/locales/fi.po
index 0e47fd2c0..a015f86bb 100644
--- a/plugins/Aka/locales/fi.po
+++ b/plugins/Aka/locales/fi.po
@@ -5,16 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Aka plugin for Limnoria\n"
-"POT-Creation-Date: 2014-03-22 12:24+EET\n"
-"PO-Revision-Date: 2014-03-22 12:39+0200\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
+"PO-Revision-Date: 2014-08-01 20:05+0200\n"
 "Last-Translator: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>\n"
 "Language-Team: \n"
+"Language: Finnish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 1.5.4\n"
-"Language: Finnish\n"
 
 #: config.py:55
 msgid ""
@@ -131,7 +131,7 @@ msgstr ""
 "parametrit.\n"
 "        "
 
-#: plugin.py:539 plugin.py:565 plugin.py:597 plugin.py:620
+#: plugin.py:539 plugin.py:565 plugin.py:597 plugin.py:620 plugin.py:643
 msgid "%r is not a valid channel."
 msgstr "%r ei ole kelvollinen kanava."
 
@@ -181,6 +181,17 @@ msgstr ""
 
 #: plugin.py:635
 msgid ""
+"<command>\n"
+"\n"
+"        This command shows the content of an Aka.\n"
+"        "
+msgstr ""
+"<komento>\n"
+"\n"
+" Tämä komento näyttää Akan sisällön."
+
+#: plugin.py:652
+msgid ""
 "takes no arguments\n"
 "\n"
 "        Imports the Alias database into Aka's, and clean the former."
@@ -189,10 +200,10 @@ msgstr ""
 "\n"
 " Tuo Aliaksen tietokannan Akaan ja tyhjentää aiemman."
 
-#: plugin.py:640
+#: plugin.py:657
 msgid "Alias plugin is not loaded."
 msgstr "Alias lisä-osa ei ole ladattu."
 
-#: plugin.py:650
+#: plugin.py:667
 msgid "Error occured when importing the %n: %L"
 msgstr "Virhe komennon %n tuomisessa: %L"
diff --git a/plugins/Aka/messages.pot b/plugins/Aka/messages.pot
index eaa71f05d..0ca717a03 100644
--- a/plugins/Aka/messages.pot
+++ b/plugins/Aka/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-22 16:34+EET\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -104,7 +104,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:539 plugin.py:565 plugin.py:597 plugin.py:620
+#: plugin.py:539 plugin.py:565 plugin.py:597 plugin.py:620 plugin.py:643
 msgid "%r is not a valid channel."
 msgstr ""
 
@@ -145,16 +145,25 @@ msgstr ""
 #: plugin.py:635
 #, docstring
 msgid ""
+"<command>\n"
+"\n"
+"        This command shows the content of an Aka.\n"
+"        "
+msgstr ""
+
+#: plugin.py:652
+#, docstring
+msgid ""
 "takes no arguments\n"
 "\n"
 "        Imports the Alias database into Aka's, and clean the former."
 msgstr ""
 
-#: plugin.py:640
+#: plugin.py:657
 msgid "Alias plugin is not loaded."
 msgstr ""
 
-#: plugin.py:650
+#: plugin.py:667
 msgid "Error occured when importing the %n: %L"
 msgstr ""
 
diff --git a/plugins/Anonymous/locales/fi.po b/plugins/Anonymous/locales/fi.po
index 01ceaf2ac..5b0089d48 100644
--- a/plugins/Anonymous/locales/fi.po
+++ b/plugins/Anonymous/locales/fi.po
@@ -1,20 +1,19 @@
 # Anonymous plugin in Limnoria.
-# Copyright (C) 2011 Limnoria
-# Mikaela Suomalainen <mikaela.suomalainen@outlook.com>, 2011.
+# Copyright (C) 2011-2014 Limnoria
+# Mikaela Suomalainen <mikaela.suomalainen@outlook.com>, 2011-2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Supybot Anonymous\n"
-"POT-Creation-Date: 2011-06-09 18:26+CEST\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: fi_FI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-Country: FINLAND\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: config.py:49
 msgid ""
@@ -45,70 +44,99 @@ msgstr ""
 #: config.py:59
 msgid ""
 "Determines whether the bot will require \n"
-"    targets of the \"say\" command to be public (i.e., channels).  If this is\n"
-"    True, the bot will allow people to use the \"say\" command to send private\n"
+"    targets of the \"say\" command to be public (i.e., channels).  If this "
+"is\n"
+"    True, the bot will allow people to use the \"say\" command to send "
+"private\n"
 "    messages to other users."
 msgstr ""
 "Määrittää vaatiiko botti \n"
 "\"say\" komennon kohteiden olevan julkisia (esim., kanavia). Jos tämä on\n"
-" True, botti sallii ihmisten käyttää \"say\" komentoa lähettääkseen yksityisviestejä \n"
+" True, botti sallii ihmisten käyttää \"say\" komentoa lähettääkseen "
+"yksityisviestejä \n"
 " toisille käyttäjille."
 
-#: plugin.py:40
+#: plugin.py:41
 msgid ""
 "This plugin allows users to act through the bot anonymously.  The 'do'\n"
 "    command has the bot perform an anonymous action in a given channel, and\n"
 "    the 'say' command allows other people to speak through the bot.  Since\n"
 "    this can be fairly well abused, you might want to set\n"
 "    supybot.plugins.Anonymous.requireCapability so only users with that\n"
-"    capability can use this plugin.  For extra security, you can require that\n"
-"    the user be *in* the channel they are trying to address anonymously with\n"
+"    capability can use this plugin.  For extra security, you can require "
+"that\n"
+"    the user be *in* the channel they are trying to address anonymously "
+"with\n"
 "    supybot.plugins.Anonymous.requirePresenceInChannel, or you can require\n"
 "    that the user be registered by setting\n"
 "    supybot.plugins.Anonymous.requireRegistration.\n"
 "    "
 msgstr ""
 "Tämä lisäosa sallii käyttäjien toimia botin kautta tuntemattomasti.\n"
-"    Komento 'do' sallii botin tehdä tuntemattoman toiminnon annetulla kanavalla ja\n"
+"    Komento 'do' sallii botin tehdä tuntemattoman toiminnon annetulla "
+"kanavalla ja\n"
 "    komento 'say' sallii toisten ihmisten puhua botin läpi. Koska\n"
 "    tätä voidaan väärinkäyttää helposti voit tahtoa asettaa asetuksen\n"
-"    supybot.plugins.Anonymous.requireCapability niin, että vain käyttäjät tuolla\n"
-"    valtuudella voivat käyttää tätä lisäosaa. Lisäturvallisuuden vuoksi voit vaatia, että käyttäjien täytyy *olla* kanavilla joita he yrittävät puhutella tuntemattomasti asetuksella supybot.plugins.Anonymous.requirePresenceInChannel, tai sinä voit vaatia,\n"
+"    supybot.plugins.Anonymous.requireCapability niin, että vain käyttäjät "
+"tuolla\n"
+"    valtuudella voivat käyttää tätä lisäosaa. Lisäturvallisuuden vuoksi voit "
+"vaatia, että käyttäjien täytyy *olla* kanavilla joita he yrittävät puhutella "
+"tuntemattomasti asetuksella supybot.plugins.Anonymous."
+"requirePresenceInChannel, tai sinä voit vaatia,\n"
 "    että tuo käyttäjä on rekisteröitynyt asetuksella\n"
 "    supybot.plugins.Anonymous.requireRegistration"
 
-#: plugin.py:64
+#: plugin.py:65
 msgid "You must be in %s to %q in there."
 msgstr "Sinun täytyy olla kanavalla %s %q sinne."
 
-#: plugin.py:68
+#: plugin.py:69
 msgid "I'm lobotomized in %s."
 msgstr "Minut on lobotomoitu kanavalla %s."
 
-#: plugin.py:71
-msgid "That channel has set its capabilities so as to disallow the use of this plugin."
+#: plugin.py:72
+msgid ""
+"That channel has set its capabilities so as to disallow the use of this "
+"plugin."
 msgstr "Tuo kanava on asettanut valtuudet kieltämään tämän Pluginin käytön."
 
-#: plugin.py:74
+#: plugin.py:75
 msgid "%q cannot be used to send private messages."
 msgstr "%q:ta ei voi käyttää yksityisviestien lähettämiseen."
 
-#: plugin.py:80
+#: plugin.py:81
 msgid ""
-"<channel|nick> <text>\n"
+"<channel> <text>\n"
 "\n"
-"        Sends <text> to <channel|nick>.  Can only send to <nick> if\n"
+"        Sends <text> to <channel>.  Can only send to <nick> if\n"
 "        supybot.plugins.Anonymous.allowPrivateTarget is True.\n"
 "        "
 msgstr ""
-"<kanava|nimimerkki> <teksti>\n"
+"<kanava> <teksti>\n"
 "\n"
-"       Lähettää <tekstin> <kanavalle|nimimerkille>.  <Nimimerkille> voi lähettää vain jos\n"
-"       supybot.plugins.Anonymous.allowPrivateTarget on True.\n"
+"       Lähettää <tekstin> <kanavalle>.  <Nimimerkille> voidaan lähettää "
+"viestejä vain \n"
+"       asetusarvon supybot.plugins.Anonymous.allowPrivateTarget ollessa "
+"True.\n"
 "        "
 
 #: plugin.py:94
 msgid ""
+"<nick> <text>\n"
+"\n"
+"        Sends <text> to <nick>.  Can only be used if\n"
+"        supybot.plugins.Anonymous.allowPrivateTarget is True.\n"
+"        "
+msgstr ""
+"<kanava> <teksti>\n"
+"\n"
+"       Lähettää <tekstin> <nimimerkille>.  <Nimimerkille> voidaan lähettää\n"
+" viestejä vain asetusarvon supybot.plugins.Anonymous.allowPrivateTarget\n"
+" ollessa True.\n"
+"        "
+
+#: plugin.py:108
+msgid ""
 "<channel> <action>\n"
 "\n"
 "        Performs <action> in <channel>.\n"
@@ -118,4 +146,3 @@ msgstr ""
 "\n"
 "Suorittaa <toiminnon> <kanavalla>.\n"
 "        "
-
diff --git a/plugins/Anonymous/messages.pot b/plugins/Anonymous/messages.pot
index e18510700..ed4e764e0 100644
--- a/plugins/Anonymous/messages.pot
+++ b/plugins/Anonymous/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-22 16:34+EET\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,14 +77,24 @@ msgstr ""
 #: plugin.py:81
 #, docstring
 msgid ""
-"<channel|nick> <text>\n"
+"<channel> <text>\n"
 "\n"
-"        Sends <text> to <channel|nick>.  Can only send to <nick> if\n"
+"        Sends <text> to <channel>.  Can only send to <nick> if\n"
 "        supybot.plugins.Anonymous.allowPrivateTarget is True.\n"
 "        "
 msgstr ""
 
-#: plugin.py:95
+#: plugin.py:94
+#, docstring
+msgid ""
+"<nick> <text>\n"
+"\n"
+"        Sends <text> to <nick>.  Can only be used if\n"
+"        supybot.plugins.Anonymous.allowPrivateTarget is True.\n"
+"        "
+msgstr ""
+
+#: plugin.py:108
 #, docstring
 msgid ""
 "<channel> <action>\n"
diff --git a/plugins/Karma/locales/fi.po b/plugins/Karma/locales/fi.po
index 65ec772a2..ae0ad03d6 100644
--- a/plugins/Karma/locales/fi.po
+++ b/plugins/Karma/locales/fi.po
@@ -1,12 +1,12 @@
 # Karma plugin in Limnoria.
-# Copyright (C) 2011 Limnoria
-# Mikaela Suomalainen <mikaela.suomalainen@outlook.com>, 2011.
+# Copyright (C) 2011-2014 Limnoria
+# Mikaela Suomalainen <mikaela.suomalainen@outlook.com>, 2011-2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-03-22 15:42+EET\n"
-"PO-Revision-Date: 2014-03-22 16:11+0200\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
+"PO-Revision-Date: 2014-08-01 20:07+0200\n"
 "Last-Translator: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -63,15 +63,15 @@ msgstr ""
 "Määrittää nostaako/vähentääkö botti karmaa\n"
 "    ilman, että sille tarkoitetaan viestejä."
 
-#: plugin.py:234
+#: plugin.py:237
 msgid "%(thing)s's karma is now %(karma)i"
 msgstr "%(thing)in karma on nyt %(karma)i"
 
-#: plugin.py:245 plugin.py:254
+#: plugin.py:248 plugin.py:257
 msgid "You're not allowed to adjust your own karma."
 msgstr "Sinä et saa määrittää omaa karmaasi."
 
-#: plugin.py:284
+#: plugin.py:287
 msgid ""
 "[<channel>] [<thing> ...]\n"
 "\n"
@@ -99,36 +99,36 @@ msgstr ""
 "        viestiä ei lähetetä kanavalla itsellään.\n"
 "        "
 
-#: plugin.py:297
+#: plugin.py:300
 msgid "%s has neutral karma."
 msgstr "%s:llä on neutraali karma."
 
-#: plugin.py:304
+#: plugin.py:307
 msgid ""
 "Karma for %q has been increased %n and decreased %n for a total karma of %s."
 msgstr "Karma %q:lle on noussut %n ja laskenut %n yhteiskarmalle %s."
 
-#: plugin.py:306 plugin.py:307
+#: plugin.py:309 plugin.py:310
 msgid "time"
 msgstr "aika"
 
-#: plugin.py:320
+#: plugin.py:323
 msgid "I didn't know the karma for any of those things."
 msgstr "Minä en tiennyt yhtäkään noiden asioiden karmoista."
 
-#: plugin.py:330 plugin.py:359
+#: plugin.py:333 plugin.py:362
 msgid "I have no karma for this channel."
 msgstr "Minulla ei ole karmaa tälle kanavalle."
 
-#: plugin.py:335
+#: plugin.py:338
 msgid "  You (%s) are ranked %i out of %i."
 msgstr "Sinä olet rankingissa (%s) %i %i:stä."
 
-#: plugin.py:339
+#: plugin.py:342
 msgid "Highest karma: %L.  Lowest karma: %L.%s"
 msgstr "Korkein karma: %L.  Alhaisin karma: %L.%s"
 
-#: plugin.py:347
+#: plugin.py:350
 msgid ""
 "[<channel>] {increased,decreased,active}\n"
 "\n"
@@ -147,19 +147,21 @@ msgstr ""
 "        viestiä ei lähetetä kanavalla itsellään.\n"
 "        "
 
-#: plugin.py:365
+#: plugin.py:368
 msgid ""
-"[<channel>] <name>\n"
+"[<channel>] [<name>]\n"
 "\n"
-"        Resets the karma of <name> to 0.\n"
+"        Resets the karma of <name> to 0. If <name> is not given, resets\n"
+"        everything.\n"
 "        "
 msgstr ""
 "[<kanava>] <nimi>\n"
 "\n"
-"        Nollaa <nimen> karman.\n"
-"        "
+" Asettaa <nimen> karman arvoksi 0. Jos <nimeä> ei ole annettu, asettaa "
+"kaiken\n"
+" arvoksi 0."
 
-#: plugin.py:375
+#: plugin.py:379
 msgid ""
 "[<channel>] <filename>\n"
 "\n"
@@ -177,7 +179,7 @@ msgstr ""
 "         kanavalla itsellään.\n"
 "        "
 
-#: plugin.py:387
+#: plugin.py:391
 msgid ""
 "[<channel>] <filename>\n"
 "\n"
diff --git a/plugins/Karma/messages.pot b/plugins/Karma/messages.pot
index b7d9cdc19..dcb40bafb 100644
--- a/plugins/Karma/messages.pot
+++ b/plugins/Karma/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-22 16:34+EET\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,15 +51,15 @@ msgid ""
 "    increase/decrease karma without being addressed."
 msgstr ""
 
-#: plugin.py:234
+#: plugin.py:237
 msgid "%(thing)s's karma is now %(karma)i"
 msgstr ""
 
-#: plugin.py:245 plugin.py:254
+#: plugin.py:248 plugin.py:257
 msgid "You're not allowed to adjust your own karma."
 msgstr ""
 
-#: plugin.py:284
+#: plugin.py:287
 #, docstring
 msgid ""
 "[<channel>] [<thing> ...]\n"
@@ -73,35 +73,35 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:297
+#: plugin.py:300
 msgid "%s has neutral karma."
 msgstr ""
 
-#: plugin.py:304
+#: plugin.py:307
 msgid "Karma for %q has been increased %n and decreased %n for a total karma of %s."
 msgstr ""
 
-#: plugin.py:306 plugin.py:307
+#: plugin.py:309 plugin.py:310
 msgid "time"
 msgstr ""
 
-#: plugin.py:320
+#: plugin.py:323
 msgid "I didn't know the karma for any of those things."
 msgstr ""
 
-#: plugin.py:330 plugin.py:359
+#: plugin.py:333 plugin.py:362
 msgid "I have no karma for this channel."
 msgstr ""
 
-#: plugin.py:335
+#: plugin.py:338
 msgid "  You (%s) are ranked %i out of %i."
 msgstr ""
 
-#: plugin.py:339
+#: plugin.py:342
 msgid "Highest karma: %L.  Lowest karma: %L.%s"
 msgstr ""
 
-#: plugin.py:347
+#: plugin.py:350
 #, docstring
 msgid ""
 "[<channel>] {increased,decreased,active}\n"
@@ -112,16 +112,17 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:365
+#: plugin.py:368
 #, docstring
 msgid ""
-"[<channel>] <name>\n"
+"[<channel>] [<name>]\n"
 "\n"
-"        Resets the karma of <name> to 0.\n"
+"        Resets the karma of <name> to 0. If <name> is not given, resets\n"
+"        everything.\n"
 "        "
 msgstr ""
 
-#: plugin.py:375
+#: plugin.py:379
 #, docstring
 msgid ""
 "[<channel>] <filename>\n"
@@ -132,7 +133,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:387
+#: plugin.py:391
 #, docstring
 msgid ""
 "[<channel>] <filename>\n"
diff --git a/plugins/RSS/locales/fi.po b/plugins/RSS/locales/fi.po
index cd68f0a6e..df41d342c 100755
--- a/plugins/RSS/locales/fi.po
+++ b/plugins/RSS/locales/fi.po
@@ -1,12 +1,12 @@
 # RSS plugin in Limnoria.
-# Copyright (C) Limnoria 2011
-# Mikaela Suomalainen <mkaysi@outlook.com>, 2011, 2012.
+# Copyright (C) Limnoria 2011-2014
+# Mikaela Suomalainen <mkaysi@outlook.com>, 2011-2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-05-31 15:04+EEST\n"
-"PO-Revision-Date: 2014-05-31 15:10+0200\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
+"PO-Revision-Date: 2014-08-01 20:03+0200\n"
 "Last-Translator: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>\n"
 "Language-Team: Finnish <>\n"
 "Language: fi\n"
@@ -23,13 +23,15 @@ msgstr ""
 "Kelvolliset arvot ovat 'asInFeed' (kuten syötteessä), 'oldestFirst' (vanhin "
 "ensin), 'newestFirst' (uusin ensin)."
 
-#: config.py:54
+#: config.py:55
 msgid ""
-"Determines whether the bot will bold the title of the feed when\n"
-"    it announces news."
-msgstr "Määrittää korostetaanko syötteen otsikko uutisia kuuluttaessa."
+"Determines what feeds should be accessible as\n"
+"    commands."
+msgstr ""
+"Määrittää mitten syötteiden pitäisi olla käytettävissä\n"
+"    komentoina."
 
-#: config.py:57
+#: config.py:62
 msgid ""
 "Determines what string is\n"
 "    used to separate headlines in new feeds."
@@ -37,30 +39,44 @@ msgstr ""
 "Määrittää mitä merkkiketjua käytetään\n"
 "    erottamaan otsikot uusissa syötteissä."
 
-#: config.py:60
+# This looks like something that shouldn't be translated.
+#: config.py:65
+msgid "$date: $title <$link>"
+msgstr "$date: $title <$link>"
+
+#: config.py:65
+#, fuzzy
 msgid ""
-"Determines what\n"
-"    prefix is prepended (if any) to the news item announcements made in the\n"
-"    channel."
+"The format the bot\n"
+"    will use for displaying headlines of a RSS feed that is triggered\n"
+"    manually. In addition to fields defined by feedparser ($published\n"
+"    (the entry date), $title, $link, $description, $id, etc.), the "
+"following\n"
+"    variables can be used: $feed_name, $date (parsed date, as defined in\n"
+"    supybot.reply.format.time)"
 msgstr ""
-"Määrittää kanavalla tehtyihin uutiskuulutuksiin liitettävän etuliitteen (jos "
-"mikään)."
+"Muoto, jota käytetään manuaalisesti pyydetyn RSS-syltteen otsikoissa.\n"
+" Feedparserin määrittämien kenttien ($published (julkaisuaika), $title, "
+"$link\n"
+"     $description, $id jne.) lisäksi voidaan käyttää seuraavia muuttujia: "
+"$feed_name,\n"
+" $date (parsittu päiväys, jonka määrittää asetus supybot.reply.format.time)"
 
-#: config.py:60
-msgid "News from "
-msgstr "Uutisia kohteesta "
+#: config.py:72
+msgid "News from $feed_name: $title <$link>"
+msgstr "Uutisia lähteestä $feed_name: $title <$link>"
 
-#: config.py:64
-msgid ": "
-msgstr ": "
-
-#: config.py:64
+#: config.py:73
 msgid ""
-"Determines what\n"
-"    suffix is appended to the feed name in a news item."
-msgstr "Määrittää uutissyötteen nimeen liitettävän jälkiliitteen."
+"The format the bot will use for displaying headlines of a RSS feed\n"
+"    that is announced. See supybot.plugins.RSS.format for the available\n"
+"    variables."
+msgstr ""
+"Muoto, jotaa botti käyttää kuulutettavan RSS-syötteen otsikoiden "
+"näyttämiseen.\n"
+" Kelvolliset muuttujat näkee asetuksesta supybot.plugins.RSS.format."
 
-#: config.py:67
+#: config.py:81
 msgid ""
 "Determines which RSS feeds\n"
 "    should be announced in the channel; valid input is a list of strings\n"
@@ -71,7 +87,7 @@ msgstr ""
 "syöte\n"
 "-osoitteita) välilyönneillä erotettuina."
 
-#: config.py:71
+#: config.py:85
 msgid ""
 "Indicates how many seconds the bot will\n"
 "    wait between retrieving RSS feeds; requests made within this period "
@@ -83,7 +99,7 @@ msgstr ""
 "ajalla\n"
 "    palauttavat välimuistissa olevia tuloksia."
 
-#: config.py:75
+#: config.py:89
 msgid ""
 "Determines whether feed items should be\n"
 "    sorted by their update timestamp or kept in the same order as they "
@@ -95,27 +111,7 @@ msgstr ""
 "ilmestyvät\n"
 " syötteessä."
 
-#: config.py:83
-msgid ""
-"Determines what feeds should be accessible as\n"
-"    commands."
-msgstr ""
-"Määrittää mitten syötteiden pitäisi olla käytettävissä\n"
-"    komentoina."
-
-#: config.py:86
-msgid ""
-"Determines whether the bot will list the link\n"
-"    along with the title of the feed when the rss command is called.\n"
-"    supybot.plugins.RSS.announce.showLinks affects whether links will be\n"
-"    listed when a feed is automatically announced."
-msgstr ""
-"Määrittää luetteleeko botti linkin\n"
-"    syötteen otsikon kanssa, kun rss komentoa kutsutaan.\n"
-"    supybot.plugins.RSS.announce.showLinks vaikuttaa luetellaanko\n"
-"    linkit, kun syöte on kuulutettu automaattisesti."
-
-#: config.py:97
+#: config.py:96
 msgid ""
 "Indicates how many headlines an rss feed\n"
 "    will output by default, if no number is provided."
@@ -123,7 +119,7 @@ msgstr ""
 "Ilmaisee kuinka monta otsikkoa RSS-syötteen ulostulossa on oletuksena,\n"
 " jos määrää ei määritetä komennossa."
 
-#: config.py:100
+#: config.py:99
 msgid ""
 "Indicates how many headlines an rss feed\n"
 "    will output when it is first added to announce for a channel."
@@ -132,7 +128,7 @@ msgstr ""
 "kerralla, kun sen kuuluttaminen\n"
 " lisätään kanavalle."
 
-#: config.py:103
+#: config.py:102
 msgid ""
 "Space separated list of \n"
 "    strings, lets you filter headlines to those containing one or more "
@@ -143,7 +139,7 @@ msgstr ""
 "suodattamisen\n"
 " yhteen tai useampaan kohteeseen, jotka ovat tällä valkoisella listalla."
 
-#: config.py:107
+#: config.py:106
 msgid ""
 "Space separated list of \n"
 "    strings, lets you filter headlines to those not containing any items\n"
@@ -153,17 +149,30 @@ msgstr ""
 " tämä sallii kohteiden, jotka ovat tällä mustalla listalla, suodattamisen "
 "pois."
 
-#: config.py:113
+#: plugin.py:91
 msgid ""
-"Determines whether the bot will list the link\n"
-"    along with the title of the feed when a feed is automatically\n"
-"    announced."
+"[<number of headlines>]\n"
+"\n"
+"        Reports the titles for %s at the RSS feed %u.  If\n"
+"        <number of headlines> is given, returns only that many headlines.\n"
+"        RSS feeds are only looked up every supybot.plugins.RSS.waitPeriod\n"
+"        seconds, which defaults to 1800 (30 minutes) since that's what most\n"
+"        websites prefer."
 msgstr ""
-"Määrittää luetteleeko botti linkin\n"
-"    syötteen otsikon kautta, kun syöte kuulutetaan\n"
-"    automaattisesti."
+"[<otsikoiden määrä>]\n"
+"\n"
+" Raportoi otsikot kohteelle %s RSS-syötteessä %u. Jos <otsikoiden määrä> on\n"
+" annettu, tämä palauttaa vain sen määrän otsikoita. RSS-syötteitä "
+"tarkistetaan\n"
+" asetuksen supybot.plugins.RSS.waitPeriod sekuntejen mukaan, joka on\n"
+" oletuksena 1800 (30 minuuttia), koska se on useimpien verkkosivujen suosima "
+"aika."
 
-#: plugin.py:57
+#: plugin.py:106
+msgid "Return feed items, sorted according to sortFeedItems."
+msgstr "Palauttaa syötteen kohteet järjestettynä sortFeedItems :in mukaan."
+
+#: plugin.py:130
 msgid ""
 "This plugin is useful both for announcing updates to RSS feeds in a\n"
 "    channel, and for retrieving the headlines of RSS feeds via command.  "
@@ -180,11 +189,15 @@ msgstr ""
 "    komentoa määrittämään mitkä syötteet pitäisi kuuluttaa annetulla "
 "kanavalla."
 
-#: plugin.py:335
-msgid "Return feed items, sorted according to sortFeedItems."
-msgstr "Palauttaa syötteen kohteet järjestettynä sortFeedItems :in mukaan."
+#: plugin.py:175
+msgid "I already have a command in this plugin named %s."
+msgstr "Minulla on jo komento %s tässä lisä-osassa."
 
-#: plugin.py:388
+#: plugin.py:181
+msgid "I already have a feed with that URL named %s."
+msgstr "Minulla on jo syöte nimeltä %s."
+
+#: plugin.py:346
 msgid ""
 "<name> <url>\n"
 "\n"
@@ -198,7 +211,7 @@ msgstr ""
 "        URL osoitteesta..\n"
 "        "
 
-#: plugin.py:399
+#: plugin.py:359
 msgid ""
 "<name>\n"
 "\n"
@@ -212,11 +225,11 @@ msgstr ""
 "        lisäosasta.\n"
 "        "
 
-#: plugin.py:405
+#: plugin.py:366
 msgid "That's not a valid RSS feed command name."
 msgstr "Tuo ei ole kelvollinen RSS sylte komento nimi."
 
-#: plugin.py:416
+#: plugin.py:375
 msgid ""
 "[<channel>]\n"
 "\n"
@@ -231,11 +244,11 @@ msgstr ""
 "            vaadittu vain jos viestiä ei lähetetä kanavalla itsellään.\n"
 "            "
 
-#: plugin.py:423
+#: plugin.py:382
 msgid "I am currently not announcing any feeds."
 msgstr "Minä en tällä hetkellä kuuluta yhtään syötettä."
 
-#: plugin.py:428
+#: plugin.py:387
 msgid ""
 "[<channel>] <name|url> [<name|url> ...]\n"
 "\n"
@@ -257,7 +270,7 @@ msgstr ""
 "            viestiä ei lähetetä kanavalla itsellään.\n"
 "            "
 
-#: plugin.py:446
+#: plugin.py:409
 msgid ""
 "[<channel>] <name|url> [<name|url> ...]\n"
 "\n"
@@ -279,9 +292,10 @@ msgstr ""
 "            ei lähetetä kanavalla itsellään.\n"
 "            "
 
-#: plugin.py:464
+#: plugin.py:427
+#, fuzzy
 msgid ""
-"<url> [<number of headlines>]\n"
+"<name|url> [<number of headlines>]\n"
 "\n"
 "        Gets the title components of the given RSS feed.\n"
 "        If <number of headlines> is given, return only that many headlines.\n"
@@ -294,11 +308,11 @@ msgstr ""
 "otsikkoa.\n"
 "        "
 
-#: plugin.py:477
+#: plugin.py:443
 msgid "Couldn't get RSS feed."
 msgstr "RSS syötettä ei pystytty hakemaan."
 
-#: plugin.py:492
+#: plugin.py:457
 msgid ""
 "<url|feed>\n"
 "\n"
@@ -312,10 +326,64 @@ msgstr ""
 "        URL, kuvauksen, ja viimeisen päivityksen, jos saatavilla.\n"
 "        "
 
-#: plugin.py:505
+#: plugin.py:472
 msgid "I couldn't retrieve that RSS feed."
 msgstr "En voinut noutaa tuota RSS syötettä."
 
-#: plugin.py:518
+#: plugin.py:480
+#, fuzzy
+msgid "time unavailable"
+msgstr "aika ei ole saatavilla"
+
+#: plugin.py:481 plugin.py:482 plugin.py:483
+msgid "unavailable"
+msgstr "ei saatavilla"
+
+#: plugin.py:485
 msgid "Title: %s;  URL: %u;  Description: %s;  Last updated: %s."
 msgstr "Otsikko: %s;  URL: %u;  Kuvaus: %s;  Viimeeksi päivitetty: %s."
+
+#~ msgid ""
+#~ "Determines whether the bot will bold the title of the feed when\n"
+#~ "    it announces news."
+#~ msgstr "Määrittää korostetaanko syötteen otsikko uutisia kuuluttaessa."
+
+#~ msgid ""
+#~ "Determines what\n"
+#~ "    prefix is prepended (if any) to the news item announcements made in "
+#~ "the\n"
+#~ "    channel."
+#~ msgstr ""
+#~ "Määrittää kanavalla tehtyihin uutiskuulutuksiin liitettävän etuliitteen "
+#~ "(jos mikään)."
+
+#~ msgid "News from "
+#~ msgstr "Uutisia kohteesta "
+
+#~ msgid ": "
+#~ msgstr ": "
+
+#~ msgid ""
+#~ "Determines what\n"
+#~ "    suffix is appended to the feed name in a news item."
+#~ msgstr "Määrittää uutissyötteen nimeen liitettävän jälkiliitteen."
+
+#~ msgid ""
+#~ "Determines whether the bot will list the link\n"
+#~ "    along with the title of the feed when the rss command is called.\n"
+#~ "    supybot.plugins.RSS.announce.showLinks affects whether links will be\n"
+#~ "    listed when a feed is automatically announced."
+#~ msgstr ""
+#~ "Määrittää luetteleeko botti linkin\n"
+#~ "    syötteen otsikon kanssa, kun rss komentoa kutsutaan.\n"
+#~ "    supybot.plugins.RSS.announce.showLinks vaikuttaa luetellaanko\n"
+#~ "    linkit, kun syöte on kuulutettu automaattisesti."
+
+#~ msgid ""
+#~ "Determines whether the bot will list the link\n"
+#~ "    along with the title of the feed when a feed is automatically\n"
+#~ "    announced."
+#~ msgstr ""
+#~ "Määrittää luetteleeko botti linkin\n"
+#~ "    syötteen otsikon kautta, kun syöte kuulutetaan\n"
+#~ "    automaattisesti."
diff --git a/plugins/RSS/messages.pot b/plugins/RSS/messages.pot
index 203591fb6..3afdab018 100644
--- a/plugins/RSS/messages.pot
+++ b/plugins/RSS/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-22 16:34+EET\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,108 +20,107 @@ msgstr ""
 msgid "Valid values include 'asInFeed', 'oldestFirst', 'newestFirst'."
 msgstr ""
 
-#: config.py:54
+#: config.py:55
 msgid ""
-"Determines whether the bot will bold the title of the feed when\n"
-"    it announces news."
+"Determines what feeds should be accessible as\n"
+"    commands."
 msgstr ""
 
-#: config.py:57
+#: config.py:62
 msgid ""
 "Determines what string is\n"
 "    used to separate headlines in new feeds."
 msgstr ""
 
-#: config.py:60
+#: config.py:65
+msgid "$date: $title <$link>"
+msgstr ""
+
+#: config.py:65
 msgid ""
-"Determines what\n"
-"    prefix is prepended (if any) to the news item announcements made in the\n"
-"    channel."
+"The format the bot\n"
+"    will use for displaying headlines of a RSS feed that is triggered\n"
+"    manually. In addition to fields defined by feedparser ($published\n"
+"    (the entry date), $title, $link, $description, $id, etc.), the following\n"
+"    variables can be used: $feed_name, $date (parsed date, as defined in\n"
+"    supybot.reply.format.time)"
 msgstr ""
 
-#: config.py:60
-msgid "News from "
+#: config.py:72
+msgid "News from $feed_name: $title <$link>"
 msgstr ""
 
-#: config.py:64
-msgid ": "
-msgstr ""
-
-#: config.py:64
+#: config.py:73
 msgid ""
-"Determines what\n"
-"    suffix is appended to the feed name in a news item."
+"The format the bot will use for displaying headlines of a RSS feed\n"
+"    that is announced. See supybot.plugins.RSS.format for the available\n"
+"    variables."
 msgstr ""
 
-#: config.py:67
+#: config.py:81
 msgid ""
 "Determines which RSS feeds\n"
 "    should be announced in the channel; valid input is a list of strings\n"
 "    (either registered RSS feeds or RSS feed URLs) separated by spaces."
 msgstr ""
 
-#: config.py:71
+#: config.py:85
 msgid ""
 "Indicates how many seconds the bot will\n"
 "    wait between retrieving RSS feeds; requests made within this period will\n"
 "    return cached results."
 msgstr ""
 
-#: config.py:75
+#: config.py:89
 msgid ""
 "Determines whether feed items should be\n"
 "    sorted by their update timestamp or kept in the same order as they appear\n"
 "    in a feed."
 msgstr ""
 
-#: config.py:83
-msgid ""
-"Determines what feeds should be accessible as\n"
-"    commands."
-msgstr ""
-
-#: config.py:86
-msgid ""
-"Determines whether the bot will list the link\n"
-"    along with the title of the feed when the rss command is called.\n"
-"    supybot.plugins.RSS.announce.showLinks affects whether links will be\n"
-"    listed when a feed is automatically announced."
-msgstr ""
-
-#: config.py:97
+#: config.py:96
 msgid ""
 "Indicates how many headlines an rss feed\n"
 "    will output by default, if no number is provided."
 msgstr ""
 
-#: config.py:100
+#: config.py:99
 msgid ""
 "Indicates how many headlines an rss feed\n"
 "    will output when it is first added to announce for a channel."
 msgstr ""
 
-#: config.py:103
+#: config.py:102
 msgid ""
 "Space separated list of \n"
 "    strings, lets you filter headlines to those containing one or more items\n"
 "    in this whitelist."
 msgstr ""
 
-#: config.py:107
+#: config.py:106
 msgid ""
 "Space separated list of \n"
 "    strings, lets you filter headlines to those not containing any items\n"
 "    in this blacklist."
 msgstr ""
 
-#: config.py:113
+#: plugin.py:91
 msgid ""
-"Determines whether the bot will list the link\n"
-"    along with the title of the feed when a feed is automatically\n"
-"    announced."
+"[<number of headlines>]\n"
+"\n"
+"        Reports the titles for %s at the RSS feed %u.  If\n"
+"        <number of headlines> is given, returns only that many headlines.\n"
+"        RSS feeds are only looked up every supybot.plugins.RSS.waitPeriod\n"
+"        seconds, which defaults to 1800 (30 minutes) since that's what most\n"
+"        websites prefer."
 msgstr ""
 
-#: plugin.py:57
+#: plugin.py:106
+#, docstring
+msgid "Return feed items, sorted according to sortFeedItems."
+msgstr ""
+
+#: plugin.py:130
 #, docstring
 msgid ""
 "This plugin is useful both for announcing updates to RSS feeds in a\n"
@@ -130,12 +129,15 @@ msgid ""
 "    command to determine what feeds should be announced in a given channel."
 msgstr ""
 
-#: plugin.py:335
-#, docstring
-msgid "Return feed items, sorted according to sortFeedItems."
+#: plugin.py:175
+msgid "I already have a command in this plugin named %s."
 msgstr ""
 
-#: plugin.py:388
+#: plugin.py:181
+msgid "I already have a feed with that URL named %s."
+msgstr ""
+
+#: plugin.py:346
 #, docstring
 msgid ""
 "<name> <url>\n"
@@ -145,7 +147,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:399
+#: plugin.py:359
 #, docstring
 msgid ""
 "<name>\n"
@@ -155,11 +157,11 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:405
+#: plugin.py:366
 msgid "That's not a valid RSS feed command name."
 msgstr ""
 
-#: plugin.py:416
+#: plugin.py:375
 #, docstring
 msgid ""
 "[<channel>]\n"
@@ -169,11 +171,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: plugin.py:423
+#: plugin.py:382
 msgid "I am currently not announcing any feeds."
 msgstr ""
 
-#: plugin.py:428
+#: plugin.py:387
 #, docstring
 msgid ""
 "[<channel>] <name|url> [<name|url> ...]\n"
@@ -185,7 +187,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: plugin.py:446
+#: plugin.py:409
 #, docstring
 msgid ""
 "[<channel>] <name|url> [<name|url> ...]\n"
@@ -197,21 +199,21 @@ msgid ""
 "            "
 msgstr ""
 
-#: plugin.py:464
+#: plugin.py:427
 #, docstring
 msgid ""
-"<url> [<number of headlines>]\n"
+"<name|url> [<number of headlines>]\n"
 "\n"
 "        Gets the title components of the given RSS feed.\n"
 "        If <number of headlines> is given, return only that many headlines.\n"
 "        "
 msgstr ""
 
-#: plugin.py:477
+#: plugin.py:443
 msgid "Couldn't get RSS feed."
 msgstr ""
 
-#: plugin.py:492
+#: plugin.py:457
 #, docstring
 msgid ""
 "<url|feed>\n"
@@ -221,11 +223,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:505
+#: plugin.py:472
 msgid "I couldn't retrieve that RSS feed."
 msgstr ""
 
-#: plugin.py:518
+#: plugin.py:480
+msgid "time unavailable"
+msgstr ""
+
+#: plugin.py:481 plugin.py:482 plugin.py:483
+msgid "unavailable"
+msgstr ""
+
+#: plugin.py:485
 msgid "Title: %s;  URL: %u;  Description: %s;  Last updated: %s."
 msgstr ""
 
diff --git a/plugins/Web/locales/fi.po b/plugins/Web/locales/fi.po
index cdf9f5e36..9185bf55b 100644
--- a/plugins/Web/locales/fi.po
+++ b/plugins/Web/locales/fi.po
@@ -1,12 +1,12 @@
 # Web plugin in Limnoria.
 # Copyright (C) 2011 Limnoria
-# Mikaela Suomalainen <mikaela.suomalainen@outlook.com>, 2011.
+# Mikaela Suomalainen <mikaela.suomalainen@outlook.com>, 2011-2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-03-22 12:41+EET\n"
-"PO-Revision-Date: 2014-03-22 13:05+0200\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
+"PO-Revision-Date: 2014-08-01 19:50+0200\n"
 "Last-Translator: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -74,14 +74,14 @@ msgstr ""
 "vastaukset."
 
 #: plugin.py:98
-msgid "Page is too big."
-msgstr "Sivu on liian suuri."
+msgid "Page is too big or the server took too much time to answer the request."
+msgstr "Sivu on liian suuri tai palvelin vastasi pyyntöön liian hitaasti."
 
-#: plugin.py:106
+#: plugin.py:107
 msgid "Display a nice error instead of \"An error has occurred\"."
 msgstr "Näytä kiva virheilmoitus ilmoitukset \"Virhe on tapahtunut\" sijaan."
 
-#: plugin.py:116
+#: plugin.py:117
 msgid "Add the help for \"@help Web\" here."
 msgstr "Lisää ohje komennolle \"@help Web\" tähän."
 
@@ -225,6 +225,9 @@ msgstr ""
 "Tämä komento on poistettu käytöstä (supybot.plugins.Web.fetch.maximum on "
 "asetettu arvoon 0)."
 
+#~ msgid "Page is too big."
+#~ msgstr "Sivu on liian suuri."
+
 #~ msgid ""
 #~ "<url>\n"
 #~ "\n"
diff --git a/plugins/Web/messages.pot b/plugins/Web/messages.pot
index 60631d9d5..725086aa9 100644
--- a/plugins/Web/messages.pot
+++ b/plugins/Web/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-22 16:34+EET\n"
+"POT-Creation-Date: 2014-08-01 19:48+EEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,15 +55,15 @@ msgid ""
 msgstr ""
 
 #: plugin.py:98
-msgid "Page is too big."
+msgid "Page is too big or the server took too much time to answer the request."
 msgstr ""
 
-#: plugin.py:106
+#: plugin.py:107
 #, docstring
 msgid "Display a nice error instead of \"An error has occurred\"."
 msgstr ""
 
-#: plugin.py:116
+#: plugin.py:117
 #, docstring
 msgid "Add the help for \"@help Web\" here."
 msgstr ""