diff --git a/calibre-plugin/translations/es.po b/calibre-plugin/translations/es.po
index 62b7532..b6ff39d 100644
--- a/calibre-plugin/translations/es.po
+++ b/calibre-plugin/translations/es.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR ORGANIZATION
 # 
 # Translators:
-# Adolfo Jayme Barrientos, 2014
+# Adolfo Jayme-Barrientos, 2014
 # dario hereñu <magallania@gmail.com>, 2015
 # Jellby <jellby@yahoo.com>, 2014-2016
 # Antonio Mireles <antonio@mirelesindependent.com>, 2016
diff --git a/calibre-plugin/translations/et.po b/calibre-plugin/translations/et.po
index a324f3b..7a7a67a 100644
--- a/calibre-plugin/translations/et.po
+++ b/calibre-plugin/translations/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
 "POT-Creation-Date: 2016-03-22 21:58+Central Daylight Time\n"
-"PO-Revision-Date: 2016-04-03 01:15+0000\n"
+"PO-Revision-Date: 2016-04-23 01:46+0000\n"
 "Last-Translator: Maidur\n"
 "Language-Team: Estonian (http://www.transifex.com/calibre/calibre-plugins/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr "Kontrolli juttude URLi muutumist?"
 msgid ""
 "Warn you if an update will change the URL of an existing book.\n"
 "fanfiction.net URLs will change from http to https silently."
-msgstr ""
+msgstr "Hoiata, kui uuendamine muudab olemasoleva raamatu URLi.\nSaidi fanfiction.net URLides pannakse http asemele https ilma küsimata."
 
 #: config.py:478
 msgid "Search EPUB text for Story URL?"
@@ -262,25 +262,25 @@ msgstr "Järeltöötluse valikud"
 
 #: config.py:487
 msgid "Mark added/updated books when finished?"
-msgstr ""
+msgstr "Märgi lisatud/uuendatud raamatud, kui valmis?"
 
 #: config.py:488
 msgid ""
 "Mark added/updated books when finished.  Use with option below.\n"
 "You can also manually search for 'marked:fff_success'.\n"
 "'marked:fff_failed' is also available, or search 'marked:fff' for both."
-msgstr ""
+msgstr "Kui valmis saab, märgi lisatud/uuendatud raamatud. Kasuta koos alloleva valikuga.\nVõid ka käsitsi otsida 'marked:fff_success'.\nsaadaval on ka 'marked:fff_failed', või mõlema jaoks otsi 'marked:fff'."
 
 #: config.py:492
 msgid "Show Marked books when finished?"
-msgstr ""
+msgstr "Näita märgitud raamatuid, kui valmis?"
 
 #: config.py:493
 msgid ""
 "Show Marked added/updated books only when finished.\n"
 "You can also manually search for 'marked:fff_success'.\n"
 "'marked:fff_failed' is also available, or search 'marked:fff' for both."
-msgstr ""
+msgstr "Kui valmis saab, näita ainult märgitud lisatud/uuendatud raamatuid.\nVõid ka käsitsi otsida 'marked:fff_success'.\nsaadaval on ka 'marked:fff_failed', või mõlema jaoks otsi 'marked:fff'."
 
 #: config.py:497
 msgid "Smarten Punctuation (EPUB only)"
@@ -324,7 +324,7 @@ msgstr "Võta URLid lõikelaualt?"
 
 #: config.py:530
 msgid "Prefill URLs from valid URLs in Clipboard when Adding New."
-msgstr ""
+msgstr "Uute lisamisel täida URLide väli kehtivate URLidega lõikelaualt."
 
 #: config.py:534
 msgid "Default to Update when books selected?"
@@ -334,7 +334,7 @@ msgstr "Vaikesättena uuenda, kui raamatud on valitud?"
 msgid ""
 "The top FanFicFare plugin button will start Update if\n"
 "books are selected.  If unchecked, it will always bring up 'Add New'."
-msgstr "FanFicFare'i ülemine plugina nupp käivitab raamatu uuendamise,\nkui raamatuid on valitud. Kui märgistamata, siis avab see alati akna 'Ava uus'."
+msgstr "FanFicFare'i ülemine plugina nupp käivitab raamatu uuendamise,\nkui raamatuid on valitud. Kui märgistamata, siis avab see alati akna 'Lisa uus'."
 
 #: config.py:539
 msgid "Keep 'Add New from URL(s)' dialog on top?"
@@ -393,11 +393,11 @@ msgstr "Muuda loendit URLidest, millest FanFicFare automaatselt keeldub."
 
 #: config.py:572 config.py:646
 msgid "Add Reject URLs"
-msgstr ""
+msgstr "Lisa keeldutavaid URLe"
 
 #: config.py:573
 msgid "Add additional URLs to Reject as text."
-msgstr ""
+msgstr "Lisa keeldutavaid URLe teksti kujul."
 
 #: config.py:577
 msgid "Edit Reject Reasons List"
@@ -413,11 +413,11 @@ msgstr "Keeldu kinnitust küsimata?"
 
 #: config.py:583
 msgid "Always reject URLs on the Reject List without stopping and asking."
-msgstr ""
+msgstr "Alati keeldu keeldumiste loendis olevatest URLidest ilma peatumata ja kinnitust küsimata."
 
 #: config.py:620
 msgid "Edit Reject URLs List"
-msgstr ""
+msgstr "Muuda keeldutavate URLide loendit"
 
 #: config.py:634
 msgid "Reject Reasons"
@@ -425,11 +425,11 @@ msgstr "Keeldumise põhjused"
 
 #: config.py:635
 msgid "Customize Reject List Reasons"
-msgstr ""
+msgstr "Kohanda keeldumise põhjuseid"
 
 #: config.py:644
 msgid "Reason why I rejected it"
-msgstr ""
+msgstr "Põhjus, miks ma sellest keeldusin"
 
 #: config.py:644
 msgid "Title by Author"
@@ -450,14 +450,14 @@ msgstr ""
 
 #: config.py:650 dialogs.py:1102
 msgid "Add this reason to all URLs added:"
-msgstr ""
+msgstr "Lisa see põhjus kõikidele lisatavatele URLidele:"
 
 #: config.py:666
 msgid ""
 "These settings provide more detailed control over what metadata will be "
 "displayed inside the ebook as well as let you set %(isa)s and %(u)s/%(p)s "
 "for different sites."
-msgstr ""
+msgstr "Need valikud pakuvad üksikasjalikumat kontrolli e-raamatus näidatavate metaandmete üle, samuti lasevad määrata erinevatel saitidel sätted %(isa)s ja %(u)s/%(p)s."
 
 #: config.py:673
 msgid "personal.ini"
@@ -510,7 +510,7 @@ msgstr ""
 
 #: config.py:729
 msgid "Pass Calibre Columns into FanFicFare on Update/Overwrite"
-msgstr ""
+msgstr "Uuendamisel/Ülekirjutamisel edasta Calibre veerud FanFicFare'i"
 
 #: config.py:742
 msgid ""
@@ -541,7 +541,7 @@ msgstr "Näita faili personal.ini 'turvalist versiooni'"
 
 #: config.py:808
 msgid "Calibre Column Entry Names"
-msgstr ""
+msgstr "Calibre veergude kirjete nimed"
 
 #: config.py:809
 msgid "Label (entry_name)"
@@ -635,7 +635,7 @@ msgstr ""
 
 #: config.py:937
 msgid "Generate Calibre Cover:"
-msgstr ""
+msgstr "Loo Calibre kaanepilt:"
 
 #: config.py:964
 msgid "Plugin %(gc)s"
@@ -719,7 +719,7 @@ msgid ""
 "These settings provide integration with the %(cp)s Plugin.  %(cp)s can "
 "automatically update custom columns with page, word and reading level "
 "statistics.  You have to create and configure the columns in %(cp)s first."
-msgstr ""
+msgstr "Need sätted pakuvad lõimimist pluginaga %(cp)s.  %(cp)s suudab kohandatud veerge automaatselt uuendada lehekülgede, sõnade ja loetuse taseme statistikaga.  Kõigepealt pead need veerud pluginas %(cp)s looma ja seadistama."
 
 #: config.py:1102
 msgid ""
@@ -729,7 +729,7 @@ msgstr ""
 
 #: config.py:1108
 msgid "Which column and algorithm to use are configured in %(cp)s."
-msgstr ""
+msgstr "Kasutatav veerg ja algoritm on seadistatav pluginas %(cp)s."
 
 #: config.py:1118
 msgid ""
@@ -927,11 +927,11 @@ msgstr "Ainult uus"
 msgid ""
 "Write to %s(%s) only for new\n"
 "books, not updates to existing books."
-msgstr ""
+msgstr "Kirjuta veergu %s(%s) ainult uute raamatute puhul,\nmitte olemasolevate raamatute uuendamisel."
 
 #: config.py:1330
 msgid "Allow %(ccset)s from %(pini)s to override"
-msgstr "Luba sättel %(ccset)s failis %(pini)s alistada"
+msgstr "Luba faili %(pini)s sättel %(ccset)s alistada"
 
 #: config.py:1331
 msgid ""
@@ -1025,7 +1025,7 @@ msgstr ""
 msgid ""
 "Write to %s only for new\n"
 "books, not updates to existing books."
-msgstr ""
+msgstr "Kirjuta veergu %s ainult uute raamatute puhul,\nmitte olemasolevate raamatute uuendamisel."
 
 #: config.py:1432
 msgid "Other Standard Column Options"
@@ -1044,7 +1044,7 @@ msgid ""
 "These settings will allow FanFicFare to fetch story URLs from your email "
 "account.  It will only look for story URLs in unread emails in the folder "
 "specified below."
-msgstr ""
+msgstr "Need sätted võimaldavad FanFicFarel juttude URLe hankida sinu e-posti kontolt. See otsib juttude URLe ainult allpool määratletud kaustas lugemata kirjadest."
 
 #: config.py:1460
 msgid "IMAP Server Name"
@@ -1357,7 +1357,7 @@ msgstr "Märge"
 
 #: dialogs.py:1028
 msgid "Select or Edit Reject Note."
-msgstr ""
+msgstr "Vali või muuda keeldumise märget."
 
 #: dialogs.py:1037
 msgid "Are you sure you want to remove this URL from the list?"
@@ -1365,17 +1365,17 @@ msgstr "Kas oled kindel, et tahad selle URLi loendist eemaldada?"
 
 #: dialogs.py:1039
 msgid "Are you sure you want to remove the %d selected URLs from the list?"
-msgstr "Kas oled kindel, et tahad %d valitud URL loendist eemaldada?"
+msgstr "Kas oled kindel, et tahad %d valitud URLi loendist eemaldada?"
 
 #: dialogs.py:1057
 msgid "List of Books to Reject"
-msgstr ""
+msgstr "Keeldutavate raamatute loend"
 
 #: dialogs.py:1070
 msgid ""
 "FFF will remember these URLs and display the note and offer to reject them "
 "if you try to download them again later."
-msgstr ""
+msgstr "FFF jätab need URLid meelde ning hilisemal nende allalaadimise uuesti proovimisel näitab märget ja pakub nendest keelduda."
 
 #: dialogs.py:1084
 msgid "Remove selected URLs from the list"
@@ -1445,7 +1445,7 @@ msgstr "FanFicFare"
 
 #: fff_plugin.py:132
 msgid "Download FanFiction stories from various web sites"
-msgstr "Laadi erinevatelt veebisaitidelt alla 'FanFiction'-jutte"
+msgstr "Laadi erinevatelt veebisaitidelt alla FanFiction-jutte"
 
 #: fff_plugin.py:293
 msgid "&Download from URLs"
@@ -1537,7 +1537,7 @@ msgstr "Seadme vaatest ei saa lugemisloendeid uuendada"
 
 #: fff_plugin.py:437
 msgid "No Selected Books to Update Reading Lists"
-msgstr ""
+msgstr "Lugemisloendite uuendamiseks pole raamatuid valitud"
 
 #: fff_plugin.py:447
 msgid "FanFicFare Email Settings are not configured."
@@ -1557,7 +1557,7 @@ msgstr "Lõpetati e-kirjast juttude URLide hankimine."
 
 #: fff_plugin.py:507
 msgid "(%d Story URLs Skipped, on Rejected URL List)"
-msgstr ""
+msgstr "(%d jutu URLi jäeti vahele, keeldutavate URLide loendis)"
 
 #: fff_plugin.py:508
 msgid "Get Story URLs from Email"
@@ -1581,7 +1581,7 @@ msgstr "Antud lehelt ei leitud jutu URLe."
 
 #: fff_plugin.py:558 fff_plugin.py:611
 msgid "No Selected Books to Get URLs From"
-msgstr ""
+msgstr "Pole valitud ühtki raamatut, millest URLe saada"
 
 #: fff_plugin.py:576
 msgid "Collecting URLs for stories..."
@@ -1682,7 +1682,7 @@ msgstr ""
 msgid ""
 "There are %d stories in the current anthology that are <b>not</b> going to "
 "be kept if you go ahead."
-msgstr ""
+msgstr "Praeguses antoloogias on %d juttu, mida <b>ei</b> jäeta alles, kui jätkad."
 
 #: fff_plugin.py:847
 msgid "Story URLs that will be removed:"
@@ -1730,11 +1730,11 @@ msgstr ""
 
 #: fff_plugin.py:957
 msgid "Started fetching metadata for %s stories."
-msgstr ""
+msgstr "Alustati %s jutu metaandmete hankimist."
 
 #: fff_plugin.py:971
 msgid "No valid story URLs entered."
-msgstr ""
+msgstr "Pole sisestatud ühtki kehtivat jutu URLi."
 
 #: fff_plugin.py:981 fff_plugin.py:987
 msgid "Reject URL?"
@@ -1742,7 +1742,7 @@ msgstr "Keeldu URList?"
 
 #: fff_plugin.py:988 fff_plugin.py:1006
 msgid "<b>%s</b> is on your Reject URL list:"
-msgstr ""
+msgstr "<b>%s</b> on sinu keeldutavate URLide loendis:"
 
 #: fff_plugin.py:990
 msgid "Click '<b>Yes</b>' to Reject."
@@ -1754,19 +1754,19 @@ msgstr "Ikkagi allalaadimiseks klõpsa '<b>Ei</b>'."
 
 #: fff_plugin.py:993
 msgid "Story on Reject URLs list (%s)."
-msgstr ""
+msgstr "Jutt on keeldutavate URLide loendis (%s)."
 
 #: fff_plugin.py:996
 msgid "Rejected"
-msgstr ""
+msgstr "Keelduti"
 
 #: fff_plugin.py:999
 msgid "Remove Reject URL?"
-msgstr ""
+msgstr "Eemaldada keeldutav URL?"
 
 #: fff_plugin.py:1005
 msgid "Remove URL from Reject List?"
-msgstr ""
+msgstr "Kas eemaldada URL keeldumiste loendist?"
 
 #: fff_plugin.py:1008
 msgid "Click '<b>Yes</b>' to remove it from the list,"
@@ -1796,7 +1796,7 @@ msgstr "Kas jätta jutt vahele?"
 
 #: fff_plugin.py:1157
 msgid "Skip Anthology Story?"
-msgstr "Kas jätta antoloogia jutt vahele="
+msgstr "Kas jätta antoloogia jutt vahele?"
 
 #: fff_plugin.py:1158
 msgid ""
@@ -1810,7 +1810,7 @@ msgstr "Vahelejätmiseks klõpsa '<b>Jah</b>'."
 
 #: fff_plugin.py:1162
 msgid "Story in Series Anthology(%s)."
-msgstr ""
+msgstr "Jutt antoloogia sarjas(%s)."
 
 #: fff_plugin.py:1168
 msgid "Skipped"
@@ -1846,7 +1846,7 @@ msgstr "Muuda jutu URLi?"
 msgid ""
 "<b>%s</b> by <b>%s</b> is already in your library with a different source "
 "URL:"
-msgstr ""
+msgstr "<b>%s</b>, autoriga <b>%s</b> on erineva lähte-URLiga sinu kogus juba olemas:"
 
 #: fff_plugin.py:1274
 msgid "In library: <a href=\"%(liburl)s\">%(liburl)s</a>"
@@ -1858,7 +1858,7 @@ msgstr "Uus URL: <a href=\"%(newurl)s\">%(newurl)s</a>"
 
 #: fff_plugin.py:1276
 msgid "Click '<b>Yes</b>' to update/overwrite book with new URL."
-msgstr ""
+msgstr "Raamatu uuendamiseks/ülekirjutamiseks uue URLiga klõpsa '<b>Jah</b>'."
 
 #: fff_plugin.py:1277
 msgid "Click '<b>No</b>' to skip updating/overwriting this book."
@@ -1872,17 +1872,17 @@ msgstr "Alla laadida uue raamatuna?"
 msgid ""
 "<b>%s</b> by <b>%s</b> is already in your library with a different source "
 "URL."
-msgstr ""
+msgstr "<b>%s</b>, autoriga <b>%s</b> on erineva lähte-URLiga sinu kogus juba olemas."
 
 #: fff_plugin.py:1288
 msgid ""
 "You chose not to update the existing book.  Do you want to add a new book "
 "for this URL?"
-msgstr ""
+msgstr "Sa otsustasid olemasolevat raamatut mitte uuendada. Kas tahad sellele URLile lisada uue raamatu?"
 
 #: fff_plugin.py:1290
 msgid "Click '<b>Yes</b>' to a new book with new URL."
-msgstr ""
+msgstr "Uue URLiga uue raamatu jaoks klõpsa '<b>Jah</b>'."
 
 #: fff_plugin.py:1291
 msgid "Click '<b>No</b>' to skip URL."
@@ -1890,7 +1890,7 @@ msgstr "URLi vahelejätmiseks klõpsa '<b>Ei</b>'."
 
 #: fff_plugin.py:1297
 msgid "Update declined by user due to differing story URL(%s)"
-msgstr ""
+msgstr "Kasutaja keeldus uuendamisest erineva jutu URLi tõttu(%s)"
 
 #: fff_plugin.py:1300
 msgid "Different URL"
@@ -1956,7 +1956,7 @@ msgstr "Viga metaandmete uuendamisel"
 msgid ""
 "An error has occurred while FanFicFare was updating calibre's metadata for "
 "<a href='%s'>%s</a>."
-msgstr ""
+msgstr "Esines viga, kui FanFicFare uuendas raamatul <a href='%s'>%s</a> calibre metaandmeid."
 
 #: fff_plugin.py:1540
 msgid "The ebook has been updated, but the metadata has not."
@@ -2014,7 +2014,7 @@ msgstr "%s raamatu ühendamine."
 
 #: fff_plugin.py:1767
 msgid "FanFicFare Adding/Updating books."
-msgstr ""
+msgstr "FanFicFare raamatute Lisamine/Uuendamine."
 
 #: fff_plugin.py:1774
 msgid "Updating calibre for FanFiction stories..."
@@ -2070,7 +2070,7 @@ msgstr ""
 
 #: fff_plugin.py:2238
 msgid "Same story already included."
-msgstr ""
+msgstr "Sama jutt on juba olemas."
 
 #: fff_plugin.py:2298
 msgid "No story URL found."
@@ -2110,7 +2110,7 @@ msgstr "FanFiction-juttude allalaadimine"
 
 #: jobs.py:91
 msgid "%d of %d stories finished downloading"
-msgstr ""
+msgstr "%d / %d jutu allalaadimine valmis"
 
 #: jobs.py:103
 msgid "Download Results:"
@@ -2130,7 +2130,7 @@ msgstr "Alustati allalaadimist..."
 
 #: jobs.py:230
 msgid "Download %s completed, %s chapters."
-msgstr ""
+msgstr "%s-faili allalaadimine valmis, %s peatükki."
 
 #: jobs.py:255
 msgid "Already contains %d chapters.  Reuse as is."
@@ -2138,4 +2138,4 @@ msgstr "Juba sisaldab %d peatükki.  Taaskasutatakse nagu on."
 
 #: jobs.py:278
 msgid "Update %s completed, added %s chapters for %s total."
-msgstr ""
+msgstr "%s-faili uuendamine valmis; lisati %s peatükki, nüüd on neid kokku %s."
diff --git a/calibre-plugin/translations/sv.po b/calibre-plugin/translations/sv.po
index 79b895f..7d29fff 100644
--- a/calibre-plugin/translations/sv.po
+++ b/calibre-plugin/translations/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
 "POT-Creation-Date: 2016-03-22 21:58+Central Daylight Time\n"
-"PO-Revision-Date: 2016-04-16 19:19+0000\n"
+"PO-Revision-Date: 2016-04-22 09:32+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/calibre/calibre-plugins/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -157,7 +157,7 @@ msgstr ""
 
 #: config.py:432
 msgid "Default Update EPUB Cover when Updating EPUB?"
-msgstr ""
+msgstr "Som standard uppdatera EPUB omslag vid uppdatering av EPUB?"
 
 #: config.py:433
 msgid ""