diff --git a/plugins/Todo/locale/fi.po b/plugins/Todo/locale/fi.po
new file mode 100644
index 000000000..815db16a8
--- /dev/null
+++ b/plugins/Todo/locale/fi.po
@@ -0,0 +1,159 @@
+# Todo plugin in Limnoria.
+# Copyright (C) 2011 Limnoria
+# Mika Suomalainen <mika.henrik.mainio@hotmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2011-08-10 11:28+CEST\n"
+"PO-Revision-Date: 2011-10-26 10:32+0200\n"
+"Last-Translator: Mika Suomalainen <mika.henrik.mainio@hotmail.com>\n"
+"Language-Team: \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"
+
+#: config.py:50
+msgid ""
+"Determines whether users can read the\n"
+"    todo-list of another user."
+msgstr "Määrittää voivatko käyttäjät lukea muiden käyttäjien\n"
+"    tehtävälistoja."
+
+#: plugin.py:135
+msgid ""
+"[<username>] [<task id>]\n"
+"\n"
+"        Retrieves a task for the given task id.  If no task id is given, it\n"
+"        will return a list of task ids that that user has added to their todo\n"
+"        list.\n"
+"        "
+msgstr "[<käyttäjätunnus>] [<tehtävän ID]\n"
+"\n"
+"        Palauttaa annetun ID:n tehtävän.  Jos tehtävän ID ei ole annettu, se\n"
+"        palauttaa listan tehtävien ID:istä, jotka se käyttäjä on lisännyt tehtävä\n"
+"        listaansa.\n"
+"        "
+
+#: plugin.py:146
+msgid "You are not allowed to see other users todo-list."
+msgstr "Sinulla ei ole oikeutta katsoa toisten käyttäjien tehtävälistoja."
+
+#: plugin.py:153
+msgid "#%i: %s"
+msgstr "#%i %s"
+
+#: plugin.py:158
+msgid "%s for %s: %L"
+msgstr "%s %s:lle: %L"
+
+#: plugin.py:162
+msgid "That user has no tasks in their todo list."
+msgstr "Tuolla käyttäjällä ei ole tehtäviä tehtävälistallaan."
+
+#: plugin.py:164
+msgid "You have no tasks in your todo list."
+msgstr "Sinulla ei ole tehtäviä tehtävälistallasi."
+
+#: plugin.py:171
+msgid "Active"
+msgstr "Aktiivinen"
+
+#: plugin.py:173
+msgid "Inactive"
+msgstr "Epä-aktiivinen"
+
+#: plugin.py:175
+msgid ", priority: %i"
+msgstr "tärkeysaste %i"
+
+#: plugin.py:178
+msgid "%s todo for %s: %s (Added at %s)"
+msgstr "%s tehtävä %s:lle: %s (Lisätty %s)"
+
+#: plugin.py:182
+#: plugin.py:263
+#: plugin.py:277
+msgid "task id"
+msgstr "tehtävä ID"
+
+#: plugin.py:187
+msgid ""
+"[--priority=<num>] <text>\n"
+"\n"
+"        Adds <text> as a task in your own personal todo list.  The optional\n"
+"        priority argument allows you to set a task as a high or low priority.\n"
+"        Any integer is valid.\n"
+"        "
+msgstr "[--priority=<numero>] <teksti>\n"
+"\n"
+"        Lisää <tekstin> tehtävänä sinun omalle henkilökohtaiselle tehtävälistallesi.  Vaihtoehtoinen\n"
+"        priority(=tärkeysaste) sallii sinun asettaa tehtävän korkealle tai matalalle tärkeysasteelle.\n"
+"        Mikä tahansa kokonaisluku on kelvollinen.\n"
+"        "
+
+#: plugin.py:198
+msgid "(Todo #%i added)"
+msgstr "Tehtävä %i lisätty"
+
+#: plugin.py:204
+msgid ""
+"<task id> [<task id> ...]\n"
+"\n"
+"        Removes <task id> from your personal todo list.\n"
+"        "
+msgstr "<tehtävä ID> [<tehtävä ID> ...]\n"
+"\n"
+"        Poistaa <tehtävä ID(:eet)> henkilökohtaiselta tehtävälistaltasi.\n"
+"        "
+
+#: plugin.py:215
+msgid "Task %i could not be removed either because that id doesn't exist or it has been removed already."
+msgstr "Tehtävää %i ei voitu poistaa, koska se ei ollut olemassa tai se on jo poistettu."
+
+#: plugin.py:219
+msgid "No tasks were removed because the following tasks could not be removed: %L."
+msgstr "Tehtäviä ei poistettu, koska seuraavia tehtäviä ei voitu poistaa: %L."
+
+#: plugin.py:229
+msgid ""
+"[--{regexp} <value>] [<glob> <glob> ...]\n"
+"\n"
+"        Searches your todos for tasks matching <glob>.  If --regexp is given,\n"
+"        its associated value is taken as a regexp and matched against the\n"
+"        tasks.\n"
+"        "
+msgstr "[--{regexp} <arvo>] [<glob> <glob> ...]\n"
+"\n"
+"        Etsii <globiin> täsmääviä tehtävia tehtävälistaltasi.  Jos --regexp on annettu,\n"
+"        sen liitetty arvo otetaan säännölliseksi lausekkeeksi ja sitä täsmätään\n"
+"        tehtäviin.\n"
+"        "
+
+#: plugin.py:249
+msgid "No tasks matched that query."
+msgstr "Yksikään tehtävä ei täsmännyt tuohon hakuun."
+
+#: plugin.py:255
+msgid ""
+"<id> <priority>\n"
+"\n"
+"        Sets the priority of the todo with the given id to the specified value.\n"
+"        "
+msgstr "<ID> <tärkeysaste>\n"
+"\n"
+"        Asettaa tehtävän ID tärkeysasteen annetulle arvolle.\n"
+"        "
+
+#: plugin.py:269
+msgid ""
+"<task id> <regexp>\n"
+"\n"
+"        Modify the task with the given id using the supplied regexp.\n"
+"        "
+msgstr "<tehtävän ID> <säännöllinen lauseke>\n"
+"\n"
+"        Muokkaa tehtävää annetulla ID:llä käyttäen annettua säännöllistä lauseketta.\n"
+"        "
+
diff --git a/plugins/Topic/locale/fi.po b/plugins/Topic/locale/fi.po
new file mode 100644
index 000000000..51ce067b5
--- /dev/null
+++ b/plugins/Topic/locale/fi.po
@@ -0,0 +1,343 @@
+# Topic plugin in Limnoria.
+# Copyright (C) 2011
+# FIRST AUTHOR <mika.henrik.mainio@hotmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2011-02-26 09:49+CET\n"
+"PO-Revision-Date: 2011-10-26 11:01+0200\n"
+"Last-Translator: Mika Suomalainen <mika.henrik.mainio@hotmail.com>\n"
+"Language-Team: \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"
+
+#: config.py:45
+msgid "Value must include $topic, otherwise the actual topic would be left out."
+msgstr "Arvon täytyy sisältää $topic, muutoin itse aihe jätettäisiin pois."
+
+#: config.py:50
+msgid ""
+"Determines what separator is\n"
+"    used between individually added topics in the channel topic."
+msgstr ""
+
+#: config.py:53
+msgid ""
+"Determines what format is used to add\n"
+"    topics in the topic.  All the standard substitutes apply, in addition to\n"
+"    \"$topic\" for the topic itself."
+msgstr ""
+
+#: config.py:57
+msgid ""
+"Determines whether the bot will recognize the\n"
+"    TOPICLEN value sent to it by the server and thus refuse to send TOPICs\n"
+"    longer than the TOPICLEN.  These topics are likely to be truncated by the\n"
+"    server anyway, so this defaults to True."
+msgstr ""
+
+#: config.py:62
+msgid ""
+"Determines what the default topic for the channel\n"
+"    is.  This is used by the default command to set this topic."
+msgstr ""
+
+#: config.py:66
+msgid ""
+"Determines the number of previous\n"
+"    topics to keep around in case the undo command is called."
+msgstr ""
+
+#: config.py:69
+msgid ""
+"Determines the\n"
+"    capabilities required (if any) to make any topic changes,\n"
+"    (everything except for read-only operations). Use 'channel,capab' for\n"
+"    channel-level capabilities.\n"
+"    Note that absence of an explicit anticapability means user has\n"
+"    capability."
+msgstr ""
+
+#: plugin.py:57
+msgid "I'm not currently in %s."
+msgstr ""
+
+#: plugin.py:61
+msgid "I can't change the topic, I'm not opped and %s is +t."
+msgstr ""
+
+#: plugin.py:68
+msgid "The topic must not include %q."
+msgstr ""
+
+#: plugin.py:79
+msgid "topic number"
+msgstr ""
+
+#: plugin.py:92
+msgid "There are no topics in %s."
+msgstr ""
+
+#: plugin.py:200
+msgid "That topic is too long for this server (maximum length: %i; this topic: %i)."
+msgstr ""
+
+#: plugin.py:213
+msgid ""
+"Check if the user has any of the required capabilities to manage\n"
+"        the channel topic.\n"
+"\n"
+"        The list of required capabilities is in requireManageCapability\n"
+"        channel config.\n"
+"\n"
+"        Also allow if the user is a chanop. Since he can change the topic\n"
+"        manually anyway.\n"
+"        "
+msgstr ""
+
+#: plugin.py:265
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Returns the topic for <channel>.  <channel> is only necessary if the\n"
+"        message isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:276
+msgid ""
+"[<channel>] <topic>\n"
+"\n"
+"        Adds <topic> to the topics for <channel>.  <channel> is only necessary\n"
+"        if the message isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:291
+msgid ""
+"[<channel>] <topic>\n"
+"\n"
+"        Adds <topic> to the topics for <channel>.  If the topic is too long\n"
+"        for the server, topics will be popped until there is enough room.\n"
+"        <channel> is only necessary if the message isn't sent in the channel\n"
+"        itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:308
+msgid ""
+"[<channel>] <number> <topic>\n"
+"\n"
+"        Replaces topic <number> with <topic>.\n"
+"        "
+msgstr ""
+
+#: plugin.py:322
+msgid ""
+"[<channel>] <topic>\n"
+"\n"
+"        Adds <topic> to the topics for <channel> at the beginning of the topics\n"
+"        currently on <channel>.  <channel> is only necessary if the message\n"
+"        isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:338
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Shuffles the topics in <channel>.  <channel> is only necessary if the\n"
+"        message isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:348
+msgid "I can't shuffle 1 or fewer topics."
+msgstr ""
+
+#: plugin.py:360
+msgid ""
+"[<channel>] <number> [<number> ...]\n"
+"\n"
+"        Reorders the topics from <channel> in the order of the specified\n"
+"        <number> arguments.  <number> is a one-based index into the topics.\n"
+"        <channel> is only necessary if the message isn't sent in the channel\n"
+"        itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:373
+msgid "I cannot reorder 1 or fewer topics."
+msgstr ""
+
+#: plugin.py:375
+msgid "All topic numbers must be specified."
+msgstr ""
+
+#: plugin.py:377
+msgid "Duplicate topic numbers cannot be specified."
+msgstr ""
+
+#: plugin.py:385
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Returns a list of the topics in <channel>, prefixed by their indexes.\n"
+"        Mostly useful for topic reordering.  <channel> is only necessary if the\n"
+"        message isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:394
+msgid "%i: %s"
+msgstr ""
+
+#: plugin.py:401
+msgid ""
+"[<channel>] <number>\n"
+"\n"
+"        Returns topic number <number> from <channel>.  <number> is a one-based\n"
+"        index into the topics.  <channel> is only necessary if the message\n"
+"        isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:416
+msgid ""
+"[<channel>] <number> <regexp>\n"
+"\n"
+"        Changes the topic number <number> on <channel> according to the regular\n"
+"        expression <regexp>.  <number> is the one-based index into the topics;\n"
+"        <regexp> is a regular expression of the form\n"
+"        s/regexp/replacement/flags.  <channel> is only necessary if the message\n"
+"        isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:434
+msgid ""
+"[<channel>] [<number>] <topic>\n"
+"\n"
+"        Sets the topic <number> to be <text>.  If no <number> is given, this\n"
+"        sets the entire topic.  <channel> is only necessary if the message\n"
+"        isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:455
+msgid ""
+"[<channel>] <number>\n"
+"\n"
+"        Removes topic <number> from the topic for <channel>  Topics are\n"
+"        numbered starting from 1; you can also use negative indexes to refer\n"
+"        to topics starting the from the end of the topic.  <channel> is only\n"
+"        necessary if the message isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:472
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Locks the topic (sets the mode +t) in <channel>.  <channel> is only\n"
+"        necessary if the message isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:482
+msgid "lock the topic"
+msgstr ""
+
+#: plugin.py:486
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Unlocks the topic (sets the mode -t) in <channel>.  <channel> is only\n"
+"        necessary if the message isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:496
+msgid "unlock the topic"
+msgstr ""
+
+#: plugin.py:500
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Restores the topic to the last topic set by the bot.  <channel> is only\n"
+"        necessary if the message isn't sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:511
+msgid "I haven't yet set the topic in %s."
+msgstr ""
+
+#: plugin.py:519
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Restores the topic to the one previous to the last topic command that\n"
+"        set it.  <channel> is only necessary if the message isn't sent in the\n"
+"        channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:533
+msgid "There are no more undos for %s."
+msgstr ""
+
+#: plugin.py:538
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Undoes the last undo.  <channel> is only necessary if the message isn't\n"
+"        sent in the channel itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:550
+msgid "There are no redos for %s."
+msgstr ""
+
+#: plugin.py:555
+msgid ""
+"[<channel>] <first topic number> <second topic number>\n"
+"\n"
+"        Swaps the order of the first topic number and the second topic number.\n"
+"        <channel> is only necessary if the message isn't sent in the channel\n"
+"        itself.\n"
+"        "
+msgstr ""
+
+#: plugin.py:566
+msgid "I refuse to swap the same topic with itself."
+msgstr ""
+
+#: plugin.py:576
+msgid ""
+"[<channel>]\n"
+"\n"
+"        Sets the topic in <channel> to the default topic for <channel>.  The\n"
+"        default topic for a channel may be configured via the configuration\n"
+"        variable supybot.plugins.Topic.default.\n"
+"        "
+msgstr ""
+
+#: plugin.py:589
+msgid "There is no default topic configured for %s."
+msgstr ""
+
+#: plugin.py:595
+msgid ""
+"[<channel>] <separator>\n"
+"\n"
+"        Sets the topic separator for <channel> to <separator>  Converts the\n"
+"        current topic appropriately.\n"
+"        "
+msgstr ""
+