diff --git a/__init__.py b/__init__.py
index 8cff317..d9e9b1d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -32,7 +32,7 @@ class EpubMergeBase(InterfaceActionBase):
     description         = _('UI plugin to concatenate multiple epubs into one.')
     supported_platforms = ['windows', 'osx', 'linux']
     author              = 'Jim Miller'
-    version             = (2, 0, 5)
+    version             = (2, 0, 6)
     minimum_calibre_version = (0, 8, 57)
 
     #: This field defines the GUI plugin class that contains all the code
diff --git a/pulltranslations.bat b/pulltranslations.bat
index c72e024..0cfea69 100644
--- a/pulltranslations.bat
+++ b/pulltranslations.bat
@@ -1,5 +1,5 @@
 set PYTHONIOENCODING=UTF-8
-c:\Python27\tx.exe pull --minimum-perc=80 -f -a
+c:\Python27\tx.exe pull --minimum-perc=25 -f -a
 
 cd translations
 for %%f in (*.po) do (
diff --git a/translations/README.md b/translations/README.md
new file mode 100644
index 0000000..431ce84
--- /dev/null
+++ b/translations/README.md
@@ -0,0 +1,6 @@
+# Translations
+
+If you're interested in helping provide translations for this project,
+please use the
+[Transifex](https://www.transifex.com/projects/p/calibre-plugins/resources/)
+website to add translations to this, or other calibre plugins that support it.
diff --git a/translations/ca.po b/translations/ca.po
new file mode 100644
index 0000000..4fdc383
--- /dev/null
+++ b/translations/ca.po
@@ -0,0 +1,387 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# 
+# Translators:
+# jmontane <joan@montane.cat>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: calibre-plugins\n"
+"POT-Creation-Date: 2015-04-16 11:21+Central Daylight Time\n"
+"PO-Revision-Date: 2015-04-17 08:27+0000\n"
+"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/calibre-plugins/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Generated-By: pygettext.py 1.5\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: __init__.py:32
+msgid "UI plugin to concatenate multiple epubs into one."
+msgstr "Interfície d'usuari per a fusionar diversos fitxers epub en un de sol,"
+
+#: config.py:148
+msgid "Basic"
+msgstr "Bàsic"
+
+#: config.py:151
+msgid "Custom Columns"
+msgstr "Columnes personalitzades"
+
+#: config.py:163
+msgid "Anthology"
+msgstr ""
+
+#: config.py:192
+msgid "These settings control the basic features of the plugin."
+msgstr "Aquestes preferències controles les funcions bàsiques del connector."
+
+#: config.py:197
+msgid "Insert Table of Contents entry for each title?"
+msgstr "Voleu inserir l'entrada de l'índex general per a cada títol?"
+
+#: config.py:198
+msgid ""
+"If set, a new TOC entry will be made for each title and\n"
+"it's existing TOC nested underneath it."
+msgstr ""
+
+#: config.py:203
+msgid "Flatten Table of Contents?"
+msgstr ""
+
+#: config.py:204
+msgid "Remove nesting and make TOC all on one level."
+msgstr ""
+
+#: config.py:208
+msgid "Include Books' Comments?"
+msgstr "Voleu incloure els comentaris del llibre?"
+
+#: config.py:209
+msgid ""
+"Include all the merged books' comments in the new book's comments.\n"
+"Default is a list of included titles only."
+msgstr ""
+
+#: config.py:214
+msgid "Keep UnMerge Metadata?"
+msgstr ""
+
+#: config.py:215
+msgid ""
+"If set, a copy of the original metadata for each merged book will\n"
+"be included, allowing for UnMerge.  This includes your calibre custom\n"
+"columns.  Leave off if you plan to distribute the epub to others."
+msgstr ""
+
+#: config.py:228
+msgid "Add tags to merged books:"
+msgstr "Afegeix etiquetes als llibres fusionats:"
+
+#: config.py:232
+msgid "Tags you enter here will be added to all new merged books"
+msgstr "Les etiquetes que entreu s'afegiran a tots els llibres fusionats nous"
+
+#: config.py:237
+msgid "Merged Book Word:"
+msgstr ""
+
+#: config.py:241
+msgid ""
+"Word use to describe merged books in default title and summary.\n"
+"Defaults back to Anthology if cleared.\n"
+"For people who don't like the word Anthology."
+msgstr ""
+
+#: config.py:249
+msgid ""
+"These controls aren't plugin settings as such, but convenience buttons for "
+"setting Keyboard shortcuts and getting all the EpubMerge confirmation "
+"dialogs back again."
+msgstr ""
+
+#: config.py:254
+msgid "Keyboard shortcuts..."
+msgstr "Dreceres de teclat..."
+
+#: config.py:255
+msgid "Edit the keyboard shortcuts associated with this plugin"
+msgstr "Edita les dreceres de teclat associades amb aquest connector"
+
+#: config.py:259
+msgid "Reset disabled &confirmation dialogs"
+msgstr ""
+
+#: config.py:260
+msgid "Reset all show me again dialogs for the EpubMerge plugin"
+msgstr ""
+
+#: config.py:264
+msgid "View library preferences..."
+msgstr "Mostra les preferències de la biblioteca..."
+
+#: config.py:265
+msgid "View data stored in the library database for this plugin"
+msgstr "Mostra les dades emmagatzemades a la base de dades de la bliblioteca per a aquest connector"
+
+#: config.py:280
+msgid "Done"
+msgstr "Fet"
+
+#: config.py:281
+msgid "Confirmation dialogs have all been reset"
+msgstr "Els quadres de diàleg s'han restaurat al valor predeterminat."
+
+#: config.py:297
+msgid "Take value from first source book"
+msgstr ""
+
+#: config.py:298
+msgid "Take value from last source book"
+msgstr ""
+
+#: config.py:299
+msgid "Add values from all source books"
+msgstr "Afegeix els valors de tots els llibres originals"
+
+#: config.py:300
+msgid "Average value from ALL source books"
+msgstr ""
+
+#: config.py:301
+msgid "Average value from source books with values"
+msgstr ""
+
+#: config.py:302
+msgid "True if true on all source books (and)"
+msgstr ""
+
+#: config.py:303
+msgid "True if true on any source books (or)"
+msgstr ""
+
+#: config.py:304
+msgid "Take newest value from source books"
+msgstr ""
+
+#: config.py:305
+msgid "Take oldest value from source books"
+msgstr ""
+
+#: config.py:306
+msgid "Include values from all source books"
+msgstr ""
+
+#: config.py:307
+msgid "Concatenate values from all source books"
+msgstr ""
+
+#: config.py:320
+msgid ""
+"If you have custom columns defined, they will be listed below.  Choose how "
+"you would like these columns handled."
+msgstr ""
+
+#: config.py:347
+msgid "Set this %s column on new merged books..."
+msgstr ""
+
+#: config.py:362
+msgid "How this column will be populated by default."
+msgstr ""
+
+#: dialogs.py:67
+msgid "Starting..."
+msgstr ""
+
+#: dialogs.py:68
+msgid "Working"
+msgstr ""
+
+#: dialogs.py:69
+msgid "Completed so far"
+msgstr ""
+
+#: dialogs.py:72
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: dialogs.py:116
+msgid "Starting Merge..."
+msgstr ""
+
+#: dialogs.py:174
+msgid "Move selected books up the list"
+msgstr ""
+
+#: dialogs.py:179
+msgid "Remove selected books from the list"
+msgstr ""
+
+#: dialogs.py:184
+msgid "Move selected books down the list"
+msgstr ""
+
+#: dialogs.py:223
+msgid "Author(s)"
+msgstr ""
+
+#: dialogs.py:223
+msgid "Series"
+msgstr "Sèrie"
+
+#: dialogs.py:223
+msgid "Title"
+msgstr "Títol"
+
+#: dialogs.py:272
+msgid "Are you sure you want to remove this book from the list?"
+msgstr ""
+
+#: dialogs.py:274
+msgid "Are you sure you want to remove the selected %d books from the list?"
+msgstr ""
+
+#: dialogs.py:356
+msgid "Add"
+msgstr "Afegeig"
+
+#: dialogs.py:360
+msgid "Overwrite"
+msgstr ""
+
+#: dialogs.py:363
+msgid "Discard"
+msgstr "Descarta"
+
+#: epubmerge_plugin.py:57
+msgid "EpubMerge"
+msgstr "EpubMerge"
+
+#: epubmerge_plugin.py:58
+msgid "Merge multiple EPUBs into one in a new book."
+msgstr "Fusiona diversos EPUB en un llibre nou."
+
+#: epubmerge_plugin.py:107 epubmerge_plugin.py:108
+msgid "&Merge Epubs"
+msgstr "&Fusiona els epub"
+
+#: epubmerge_plugin.py:111 epubmerge_plugin.py:112
+msgid "&UnMerge Epub"
+msgstr ""
+
+#: epubmerge_plugin.py:121
+msgid "&Configure Plugin"
+msgstr "&Configura el connector"
+
+#: epubmerge_plugin.py:123 epubmerge_plugin.py:124
+msgid "Configure EpubMerge"
+msgstr "Configura l'EpubMerge"
+
+#: epubmerge_plugin.py:164
+msgid "Select One Book"
+msgstr "Selecciona un llibre"
+
+#: epubmerge_plugin.py:165
+msgid "Please select exactly one book to UnMerge."
+msgstr ""
+
+#: epubmerge_plugin.py:175
+msgid "Cannot UnMerge Non-Epubs"
+msgstr ""
+
+#: epubmerge_plugin.py:176 epubmerge_plugin.py:188
+msgid ""
+"To UnMerge the source must be Epub(s) created by EpubMerge with Keep UnMerge"
+" Metadata enabled."
+msgstr ""
+
+#: epubmerge_plugin.py:187
+msgid "No UnMerge data found"
+msgstr ""
+
+#: epubmerge_plugin.py:206
+msgid ""
+"You already have a book <i>%s</i> by <i>%s</i>.  You may Add a new book of "
+"the same title, Overwrite the Epub in the existing book, or Discard this "
+"Epub."
+msgstr ""
+
+#: epubmerge_plugin.py:209
+msgid ""
+"You already have more than one book <i>%s</i> by <i>%s</i>.  You may Add a "
+"new book of the same title, or Discard this Epub."
+msgstr ""
+
+#: epubmerge_plugin.py:242 epubmerge_plugin.py:270
+msgid "Cannot Merge Epubs"
+msgstr ""
+
+#: epubmerge_plugin.py:243
+msgid "Less than 2 books selected."
+msgstr ""
+
+#: epubmerge_plugin.py:259
+msgid "Collecting EPUBs for merger..."
+msgstr ""
+
+#: epubmerge_plugin.py:260
+msgid "Get EPUBs for merge"
+msgstr ""
+
+#: epubmerge_plugin.py:261
+msgid "EPUBs collected"
+msgstr ""
+
+#: epubmerge_plugin.py:271
+msgid "%s books failed."
+msgstr ""
+
+#: epubmerge_plugin.py:276
+msgid "Order EPUBs to Merge"
+msgstr ""
+
+#: epubmerge_plugin.py:340
+msgid "%s by %s"
+msgstr "%s per %s"
+
+#: epubmerge_plugin.py:344
+msgid "%s containing:"
+msgstr ""
+
+#: epubmerge_plugin.py:513
+msgid ""
+"The book for the new Merged EPUB has been created and default metadata filled in.\n"
+"\n"
+"However, the EPUB will *not* be created until after you've reviewed, edited, and closed the metadata dialog that follows."
+msgstr ""
+
+#: epubmerge_plugin.py:529
+msgid ""
+"You're merging %s EPUBs totaling %s.  Calibre will be locked until the merge"
+" is finished."
+msgstr ""
+
+#: epubmerge_plugin.py:533
+msgid "Merging %s EPUBs..."
+msgstr ""
+
+#: epubmerge_plugin.py:559
+msgid ""
+"Merge finished, output in:\n"
+"%s"
+msgstr ""
+
+#: epubmerge_plugin.py:568
+msgid "Finished merging %s EPUBs."
+msgstr ""
+
+#: epubmerge_plugin.py:583 epubmerge_plugin.py:584 epubmerge_plugin.py:585
+msgid "Unknown"
+msgstr ""
+
+#: epubmerge_plugin.py:617
+msgid "%s by %s doesn't have an EPUB."
+msgstr ""
diff --git a/translations/de.po b/translations/de.po
index 7746cdd..d778e9d 100644
--- a/translations/de.po
+++ b/translations/de.po
@@ -3,13 +3,13 @@
 # 
 # Translators:
 # Armin Geller <armingeller@t-online.de>, 2014
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
-"POT-Creation-Date: 2014-12-27 13:15+Central Standard Time\n"
-"PO-Revision-Date: 2014-12-28 10:01+0000\n"
-"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
+"POT-Creation-Date: 2015-04-16 11:21+Central Daylight Time\n"
+"PO-Revision-Date: 2015-04-17 11:34+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/calibre-plugins/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: __init__.py:32
 msgid "UI plugin to concatenate multiple epubs into one."
-msgstr "UI Plugin zum Zusammenfügen mehrerer ePubs zu einer neuen Datei."
+msgstr "UI-Plugin zum Zusammenfügen mehrerer EPUBs zu einer neuen Datei."
 
 #: config.py:148
 msgid "Basic"
@@ -46,7 +46,7 @@ msgstr "Inhaltsverzeichnis für jeden Titel einfügen?"
 msgid ""
 "If set, a new TOC entry will be made for each title and\n"
 "it's existing TOC nested underneath it."
-msgstr "Wenn markiert wird für jeden Titel ein neuer Eintrag\nim Inhaltsverzeichnis angelegt, mit dem eigenen\nInhaltsverzeichnis eine Ebene darunter."
+msgstr "Wenn ausgewählt, wird für jeden Titel ein neuer Eintrag\nim Inhaltsverzeichnis angelegt, mit dem eigenen\nInhaltsverzeichnis eine Ebene darunter."
 
 #: config.py:203
 msgid "Flatten Table of Contents?"
@@ -54,7 +54,7 @@ msgstr "Inhaltsverzeichnis flach darstellen?"
 
 #: config.py:204
 msgid "Remove nesting and make TOC all on one level."
-msgstr "Schachtelung entfernen und Inhaltsverzeichnis\nin einer einzigen Ebene darstellen."
+msgstr "Schachtelung entfernen und Inhaltsverzeichnis in einer einzigen Ebene darstellen."
 
 #: config.py:208
 msgid "Include Books' Comments?"
@@ -75,26 +75,26 @@ msgid ""
 "If set, a copy of the original metadata for each merged book will\n"
 "be included, allowing for UnMerge.  This includes your calibre custom\n"
 "columns.  Leave off if you plan to distribute the epub to others."
-msgstr "Wenn markiert wird eine Kopie der originalen Metadaten jeden\nBuchs eingefügt, um ein Teilen zu ermöglichen. Dies schliesst\nIhre in calibre definierten Spalten ein. Aktivieren Sie diese\nOption nicht, wenn Sie das ePub weitergeben wollen."
+msgstr "Wenn ausgewählt, wird eine Kopie der originalen Metadaten jedem\nBuchs eingefügt, um ein Teilen zu ermöglichen. Dies schließt\nIhre in calibre definierten Spalten ein. Aktivieren Sie diese\nOption nicht, wenn Sie das EPUB weitergeben wollen."
 
 #: config.py:228
 msgid "Add tags to merged books:"
-msgstr "Schlagwörter für neue Bücher:"
+msgstr "Schlagwörter für neue Bücher hinzufügen:"
 
 #: config.py:232
 msgid "Tags you enter here will be added to all new merged books"
-msgstr "Hier angegebene Schlagwörter werden zu allen neuen Büchern hinzugefügt."
+msgstr "Hier angegebene Schlagwörter werden zu allen neuen zusammengeführten Büchern hinzugefügt."
 
 #: config.py:237
 msgid "Merged Book Word:"
-msgstr "Kommentar für neues Buch:"
+msgstr "Kommentar für zusammengeführtes Buch:"
 
 #: config.py:241
 msgid ""
 "Word use to describe merged books in default title and summary.\n"
 "Defaults back to Anthology if cleared.\n"
 "For people who don't like the word Anthology."
-msgstr "Name für Titel und Zusammenfassung neuer Bücher im Kommentar.\nWenn Sie nichts eingeben, wird 'Sammlung' benutzt."
+msgstr "Name für Titel und Zusammenfassung zusammengeführter Bücher im Kommentar.\nWenn Sie nichts eingeben, wird Sammlung benutzt."
 
 #: config.py:249
 msgid ""
@@ -113,19 +113,19 @@ msgstr "Bearbeiten Sie die Tastaturkürzel, die dieses Plugin verwendet."
 
 #: config.py:259
 msgid "Reset disabled &confirmation dialogs"
-msgstr "&Bestätigungsdialoge wiederherstellen"
+msgstr "Deaktivierte &Bestätigungsdialoge zurücksetzen"
 
 #: config.py:260
 msgid "Reset all show me again dialogs for the EpubMerge plugin"
-msgstr "Alle Bestätigungsdialoge für dieses Plugin zurücksetzen"
+msgstr "Alle Bestätigungsdialoge für das EpubMerge-Plugin zurücksetzen"
 
 #: config.py:264
 msgid "View library preferences..."
-msgstr "Einstellungen anzeigen..."
+msgstr "Bibliothekseinstellungen ansehen..."
 
 #: config.py:265
 msgid "View data stored in the library database for this plugin"
-msgstr "In der Bibliothek gespeicherte Daten des Plugins anzeigen"
+msgstr "In der Bibliothekdatenabnk gespeicherte Daten von diesem Plugin ansehen"
 
 #: config.py:280
 msgid "Done"
@@ -263,15 +263,15 @@ msgstr "EpubMerge"
 
 #: epubmerge_plugin.py:58
 msgid "Merge multiple EPUBs into one in a new book."
-msgstr "Mehrere ePubs zu einem neuen Buch zusammenfügen."
+msgstr "Mehrere EPUBs zu einem neuen Buch zusammenfügen."
 
 #: epubmerge_plugin.py:107 epubmerge_plugin.py:108
 msgid "&Merge Epubs"
-msgstr "ePubs &zusammenfügen"
+msgstr "EPUBs &zusammenfügen"
 
 #: epubmerge_plugin.py:111 epubmerge_plugin.py:112
 msgid "&UnMerge Epub"
-msgstr "ePubs &teilen"
+msgstr "EPUBs &teilen"
 
 #: epubmerge_plugin.py:121
 msgid "&Configure Plugin"
@@ -283,21 +283,21 @@ msgstr "EpubMerge konfigurieren"
 
 #: epubmerge_plugin.py:164
 msgid "Select One Book"
-msgstr "Wählen Sie EIN Buch"
+msgstr "Wählen Sie ein Buch"
 
 #: epubmerge_plugin.py:165
 msgid "Please select exactly one book to UnMerge."
-msgstr "Bitte wählen Sie genau EIN Buch zum Teilen aus."
+msgstr "Bitte wählen Sie genau ein Buch zum Teilen aus."
 
 #: epubmerge_plugin.py:175
 msgid "Cannot UnMerge Non-Epubs"
-msgstr "Kann keine Nicht-ePubs teilen"
+msgstr "Kann keine Nicht-EPUBs teilen"
 
 #: epubmerge_plugin.py:176 epubmerge_plugin.py:188
 msgid ""
 "To UnMerge the source must be Epub(s) created by EpubMerge with Keep UnMerge"
 " Metadata enabled."
-msgstr "Zum Teilen muss das Buch von EpubMerge mit der Option 'Teilen-Metadaten behalten' erzeugt sein."
+msgstr "Zum Teilen muss das EPUB(s) von EpubMerge mit der Option 'Teilen-Metadaten behalten' erzeugt sein."
 
 #: epubmerge_plugin.py:187
 msgid "No UnMerge data found"
@@ -308,27 +308,33 @@ msgid ""
 "You already have a book <i>%s</i> by <i>%s</i>.  You may Add a new book of "
 "the same title, Overwrite the Epub in the existing book, or Discard this "
 "Epub."
-msgstr "Es gibt schon ein Buch <i>%s</i> von <i>%s</i>. Sie können ein neues Buch mit dem gleichen Titel hinzufügen, das vorhandeneBuch überschreiben, oder das Buch verwrfen."
+msgstr "Es gibt schon ein Buch <i>%s</i> von <i>%s</i>. Sie können ein neues Buch mit dem gleichen Titel hinzufügen, das vorhandene EPUB überschreiben oder dieses EPUB verwerfen."
+
+#: epubmerge_plugin.py:209
+msgid ""
+"You already have more than one book <i>%s</i> by <i>%s</i>.  You may Add a "
+"new book of the same title, or Discard this Epub."
+msgstr "Sie haben bereits mehr als ein Buch <i>%s</i> von <i>%s</i>. Sie können ein neues Buch mit dem gleichen Titel hinzufügen oder dieses EPUB verwerfen."
 
 #: epubmerge_plugin.py:242 epubmerge_plugin.py:270
 msgid "Cannot Merge Epubs"
-msgstr "Kann ePubs nicht zusammenfügen"
+msgstr "Kann EPUBs nicht zusammenfügen"
 
 #: epubmerge_plugin.py:243
 msgid "Less than 2 books selected."
-msgstr "Weniger als 2 Bücher gewählt."
+msgstr "Weniger als 2 Bücher ausgewählt."
 
 #: epubmerge_plugin.py:259
 msgid "Collecting EPUBs for merger..."
-msgstr "Sammle Bücher zum Zusammenfügen..."
+msgstr "EPUBs zum Zusammenfügen werden gesammelt..."
 
 #: epubmerge_plugin.py:260
 msgid "Get EPUBs for merge"
-msgstr "Lese ePubs"
+msgstr "EPUBs zum Zusammenfügen holen"
 
 #: epubmerge_plugin.py:261
 msgid "EPUBs collected"
-msgstr "Gesammelte ePubs"
+msgstr "EPUBs gesammelt"
 
 #: epubmerge_plugin.py:271
 msgid "%s books failed."
@@ -336,47 +342,47 @@ msgstr "%s Bücher fehlgeschlagen."
 
 #: epubmerge_plugin.py:276
 msgid "Order EPUBs to Merge"
-msgstr "Sortiere ePubs zum Zusammenfügen"
+msgstr "EPUBs zum Zusammenfügen sortieren"
 
-#: epubmerge_plugin.py:333
+#: epubmerge_plugin.py:340
 msgid "%s by %s"
 msgstr "%s von %s"
 
-#: epubmerge_plugin.py:337
+#: epubmerge_plugin.py:344
 msgid "%s containing:"
 msgstr "%s enthält:"
 
-#: epubmerge_plugin.py:506
+#: epubmerge_plugin.py:513
 msgid ""
 "The book for the new Merged EPUB has been created and default metadata filled in.\n"
 "\n"
 "However, the EPUB will *not* be created until after you've reviewed, edited, and closed the metadata dialog that follows."
 msgstr "Das neue ePub wurde erzeugt und Default-Metadaten eingefügt.\n\nDas neue Buch wird *erst dann* erzeugt, wenn Sie den folgenden Metadaten-Dialog überprüft, bearbeitet und geschlossen haben."
 
-#: epubmerge_plugin.py:522
+#: epubmerge_plugin.py:529
 msgid ""
 "You're merging %s EPUBs totaling %s.  Calibre will be locked until the merge"
 " is finished."
 msgstr "Sie fügen %s ePubs zusammen, gesamt %s. Calibre wird bis zum Abschluss gesperrt."
 
-#: epubmerge_plugin.py:526
+#: epubmerge_plugin.py:533
 msgid "Merging %s EPUBs..."
-msgstr "Füge %s ePubs zusammen..."
+msgstr "%s EPUBs werden zusammengefügt..."
 
-#: epubmerge_plugin.py:552
+#: epubmerge_plugin.py:559
 msgid ""
 "Merge finished, output in:\n"
 "%s"
 msgstr "Aktion abgeschlossen, Ausgabe nach:\n%s"
 
-#: epubmerge_plugin.py:561
+#: epubmerge_plugin.py:568
 msgid "Finished merging %s EPUBs."
-msgstr "Zusammenfügen von %s ePubs beendet."
+msgstr "Zusammenfügen von %s EPUBs beendet."
 
-#: epubmerge_plugin.py:576 epubmerge_plugin.py:577 epubmerge_plugin.py:578
+#: epubmerge_plugin.py:583 epubmerge_plugin.py:584 epubmerge_plugin.py:585
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: epubmerge_plugin.py:608
+#: epubmerge_plugin.py:617
 msgid "%s by %s doesn't have an EPUB."
-msgstr "%s von %s hat kein ePub."
+msgstr "%s von %s hat kein EPUB."
diff --git a/translations/es.po b/translations/es.po
index 37f488c..f2b33e4 100644
--- a/translations/es.po
+++ b/translations/es.po
@@ -3,13 +3,13 @@
 # 
 # Translators:
 # Adolfo Jayme Barrientos, 2014
-# Jellby <jellby@yahoo.com>, 2014
+# Jellby <jellby@yahoo.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
-"POT-Creation-Date: 2014-12-27 13:15+Central Standard Time\n"
-"PO-Revision-Date: 2014-12-28 10:01+0000\n"
-"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
+"POT-Creation-Date: 2015-04-16 11:21+Central Daylight Time\n"
+"PO-Revision-Date: 2015-04-17 09:51+0000\n"
+"Last-Translator: Jellby <jellby@yahoo.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/calibre-plugins/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -310,6 +310,12 @@ msgid ""
 "Epub."
 msgstr "Ya tiene un libro <i>%s</i> por <i>%s</i>. Puede añadir un nuevo libro con el mismo título, reemplazar el epub en el libro existente o descartar este epub."
 
+#: epubmerge_plugin.py:209
+msgid ""
+"You already have more than one book <i>%s</i> by <i>%s</i>.  You may Add a "
+"new book of the same title, or Discard this Epub."
+msgstr "Ya tiene más de un libro <i>%s</i> de <i>%s</i>. Puede Añadir un nuevo libro con el mismo título o Descartar este Epub."
+
 #: epubmerge_plugin.py:242 epubmerge_plugin.py:270
 msgid "Cannot Merge Epubs"
 msgstr "No se pueden combinar los epubs"
@@ -338,45 +344,45 @@ msgstr "Fallaron %s libros."
 msgid "Order EPUBs to Merge"
 msgstr "Ordenar epubs para combinar"
 
-#: epubmerge_plugin.py:333
+#: epubmerge_plugin.py:340
 msgid "%s by %s"
 msgstr "%s por %s"
 
-#: epubmerge_plugin.py:337
+#: epubmerge_plugin.py:344
 msgid "%s containing:"
 msgstr "%s contiene:"
 
-#: epubmerge_plugin.py:506
+#: epubmerge_plugin.py:513
 msgid ""
 "The book for the new Merged EPUB has been created and default metadata filled in.\n"
 "\n"
 "However, the EPUB will *not* be created until after you've reviewed, edited, and closed the metadata dialog that follows."
 msgstr "El libro para el nuevo epub combinado se ha creado con los metadatos predeterminados.\n\nSin embargo, el archivo EPUB *no* se creará hasta que no haya revisado, editado y cerrado el diálogo de metadatos que sigue."
 
-#: epubmerge_plugin.py:522
+#: epubmerge_plugin.py:529
 msgid ""
 "You're merging %s EPUBs totaling %s.  Calibre will be locked until the merge"
 " is finished."
 msgstr "Va a combinar %s epubs con un total de %s. Calibre se bloqueará hasta que finalice la combinación."
 
-#: epubmerge_plugin.py:526
+#: epubmerge_plugin.py:533
 msgid "Merging %s EPUBs..."
 msgstr "Combinando %s archivos EPUB…"
 
-#: epubmerge_plugin.py:552
+#: epubmerge_plugin.py:559
 msgid ""
 "Merge finished, output in:\n"
 "%s"
 msgstr "Combinación finalizada, la salida está en:\n%s"
 
-#: epubmerge_plugin.py:561
+#: epubmerge_plugin.py:568
 msgid "Finished merging %s EPUBs."
 msgstr "Combinación de %s epubs finalizada."
 
-#: epubmerge_plugin.py:576 epubmerge_plugin.py:577 epubmerge_plugin.py:578
+#: epubmerge_plugin.py:583 epubmerge_plugin.py:584 epubmerge_plugin.py:585
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: epubmerge_plugin.py:608
+#: epubmerge_plugin.py:617
 msgid "%s by %s doesn't have an EPUB."
 msgstr "%s por %s no tiene un archivo EPUB."
diff --git a/translations/fr.po b/translations/fr.po
index 558ea77..32a6b61 100644
--- a/translations/fr.po
+++ b/translations/fr.po
@@ -2,13 +2,13 @@
 # Copyright (C) YEAR ORGANIZATION
 # 
 # Translators:
-# Ptitprince <leporello1791@gmail.com>, 2014
+# Ptitprince <leporello1791@gmail.com>, 2014-2015
 # JimmXinu <retiefjimm@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
-"POT-Creation-Date: 2014-12-27 13:15+Central Standard Time\n"
-"PO-Revision-Date: 2014-12-28 17:11+0000\n"
+"POT-Creation-Date: 2015-04-16 11:21+Central Daylight Time\n"
+"PO-Revision-Date: 2015-04-17 13:52+0000\n"
 "Last-Translator: Ptitprince <leporello1791@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/calibre-plugins/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -310,6 +310,12 @@ msgid ""
 "Epub."
 msgstr "Vous possédez déjà un livre <i>%s</i> par <i>%s</i>.  Vous pouvez Ajouter un nouveau livre du même fichier, You may Add a new book of the same title, Ecracer l'ePub dans le fichier existant ou  Abandonner cet ePub."
 
+#: epubmerge_plugin.py:209
+msgid ""
+"You already have more than one book <i>%s</i> by <i>%s</i>.  You may Add a "
+"new book of the same title, or Discard this Epub."
+msgstr "Vous avez déjà plus d'un livre <i>%s</i> par <i>%s</i>. Vous pouvez Ajouter un nouveau livre du même titre, ou  Écarter cet Epub."
+
 #: epubmerge_plugin.py:242 epubmerge_plugin.py:270
 msgid "Cannot Merge Epubs"
 msgstr "Ne peut fusionner les ePubs"
@@ -338,45 +344,45 @@ msgstr "%s livres echoués."
 msgid "Order EPUBs to Merge"
 msgstr "Ordre des Epubs à fusionner"
 
-#: epubmerge_plugin.py:333
+#: epubmerge_plugin.py:340
 msgid "%s by %s"
 msgstr "%s par %s"
 
-#: epubmerge_plugin.py:337
+#: epubmerge_plugin.py:344
 msgid "%s containing:"
 msgstr "%s contenant : "
 
-#: epubmerge_plugin.py:506
+#: epubmerge_plugin.py:513
 msgid ""
 "The book for the new Merged EPUB has been created and default metadata filled in.\n"
 "\n"
 "However, the EPUB will *not* be created until after you've reviewed, edited, and closed the metadata dialog that follows."
 msgstr "Le livre pour le nouvel ePub fusionné à été créé et les métadonnées mar défaut incorporées.\n\nCependant, l'ePub ne sera *pas* créé qu'après que vous ayez revu, édité et fermé la boîte dialogue de métadonnées qui suit."
 
-#: epubmerge_plugin.py:522
+#: epubmerge_plugin.py:529
 msgid ""
 "You're merging %s EPUBs totaling %s.  Calibre will be locked until the merge"
 " is finished."
 msgstr "Vous êtes occupé à fusionner %s ePubs totalisants %s. calibre sera verrouillé jusqu'à ce que la fusion soit terminée."
 
-#: epubmerge_plugin.py:526
+#: epubmerge_plugin.py:533
 msgid "Merging %s EPUBs..."
 msgstr "Fusionne %s ePubs..."
 
-#: epubmerge_plugin.py:552
+#: epubmerge_plugin.py:559
 msgid ""
 "Merge finished, output in:\n"
 "%s"
 msgstr "Fusion terminée, fichier de sortie dans : \n%s"
 
-#: epubmerge_plugin.py:561
+#: epubmerge_plugin.py:568
 msgid "Finished merging %s EPUBs."
 msgstr "Finition de la fusion de %s ePubs."
 
-#: epubmerge_plugin.py:576 epubmerge_plugin.py:577 epubmerge_plugin.py:578
+#: epubmerge_plugin.py:583 epubmerge_plugin.py:584 epubmerge_plugin.py:585
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: epubmerge_plugin.py:608
+#: epubmerge_plugin.py:617
 msgid "%s by %s doesn't have an EPUB."
 msgstr "%s par %s n'a pas d'ePub."
diff --git a/translations/nb.po b/translations/nb.po
new file mode 100644
index 0000000..b8c371e
--- /dev/null
+++ b/translations/nb.po
@@ -0,0 +1,387 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# 
+# Translators:
+# Kurt-Håkon Eilertsen <kurt@kheds.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: calibre-plugins\n"
+"POT-Creation-Date: 2015-04-16 11:21+Central Daylight Time\n"
+"PO-Revision-Date: 2015-04-17 08:27+0000\n"
+"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/calibre-plugins/language/nb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Generated-By: pygettext.py 1.5\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: __init__.py:32
+msgid "UI plugin to concatenate multiple epubs into one."
+msgstr ""
+
+#: config.py:148
+msgid "Basic"
+msgstr "Basis"
+
+#: config.py:151
+msgid "Custom Columns"
+msgstr "Egendefinert kolonne"
+
+#: config.py:163
+msgid "Anthology"
+msgstr "Publiserte samlinger"
+
+#: config.py:192
+msgid "These settings control the basic features of the plugin."
+msgstr ""
+
+#: config.py:197
+msgid "Insert Table of Contents entry for each title?"
+msgstr ""
+
+#: config.py:198
+msgid ""
+"If set, a new TOC entry will be made for each title and\n"
+"it's existing TOC nested underneath it."
+msgstr ""
+
+#: config.py:203
+msgid "Flatten Table of Contents?"
+msgstr ""
+
+#: config.py:204
+msgid "Remove nesting and make TOC all on one level."
+msgstr ""
+
+#: config.py:208
+msgid "Include Books' Comments?"
+msgstr "Inkluder Bøker's Kommentarer?"
+
+#: config.py:209
+msgid ""
+"Include all the merged books' comments in the new book's comments.\n"
+"Default is a list of included titles only."
+msgstr ""
+
+#: config.py:214
+msgid "Keep UnMerge Metadata?"
+msgstr ""
+
+#: config.py:215
+msgid ""
+"If set, a copy of the original metadata for each merged book will\n"
+"be included, allowing for UnMerge.  This includes your calibre custom\n"
+"columns.  Leave off if you plan to distribute the epub to others."
+msgstr ""
+
+#: config.py:228
+msgid "Add tags to merged books:"
+msgstr "Legg til merke til sammenkoblede bøker:"
+
+#: config.py:232
+msgid "Tags you enter here will be added to all new merged books"
+msgstr ""
+
+#: config.py:237
+msgid "Merged Book Word:"
+msgstr "Sammenkoblet bok ord:"
+
+#: config.py:241
+msgid ""
+"Word use to describe merged books in default title and summary.\n"
+"Defaults back to Anthology if cleared.\n"
+"For people who don't like the word Anthology."
+msgstr ""
+
+#: config.py:249
+msgid ""
+"These controls aren't plugin settings as such, but convenience buttons for "
+"setting Keyboard shortcuts and getting all the EpubMerge confirmation "
+"dialogs back again."
+msgstr ""
+
+#: config.py:254
+msgid "Keyboard shortcuts..."
+msgstr "Tastatur snarveier..."
+
+#: config.py:255
+msgid "Edit the keyboard shortcuts associated with this plugin"
+msgstr ""
+
+#: config.py:259
+msgid "Reset disabled &confirmation dialogs"
+msgstr ""
+
+#: config.py:260
+msgid "Reset all show me again dialogs for the EpubMerge plugin"
+msgstr ""
+
+#: config.py:264
+msgid "View library preferences..."
+msgstr ""
+
+#: config.py:265
+msgid "View data stored in the library database for this plugin"
+msgstr ""
+
+#: config.py:280
+msgid "Done"
+msgstr "Utført"
+
+#: config.py:281
+msgid "Confirmation dialogs have all been reset"
+msgstr ""
+
+#: config.py:297
+msgid "Take value from first source book"
+msgstr "Ta verdi fra første kildebok"
+
+#: config.py:298
+msgid "Take value from last source book"
+msgstr "Ta verdi fra siste kildebok"
+
+#: config.py:299
+msgid "Add values from all source books"
+msgstr "Legg til verdier fra alle kildebøker"
+
+#: config.py:300
+msgid "Average value from ALL source books"
+msgstr ""
+
+#: config.py:301
+msgid "Average value from source books with values"
+msgstr ""
+
+#: config.py:302
+msgid "True if true on all source books (and)"
+msgstr ""
+
+#: config.py:303
+msgid "True if true on any source books (or)"
+msgstr ""
+
+#: config.py:304
+msgid "Take newest value from source books"
+msgstr "Ta nyeste verdi fra kildebok"
+
+#: config.py:305
+msgid "Take oldest value from source books"
+msgstr "Ta eldste verdi fra kildebok"
+
+#: config.py:306
+msgid "Include values from all source books"
+msgstr "Inkluder verdier fra alle kildebøker"
+
+#: config.py:307
+msgid "Concatenate values from all source books"
+msgstr ""
+
+#: config.py:320
+msgid ""
+"If you have custom columns defined, they will be listed below.  Choose how "
+"you would like these columns handled."
+msgstr ""
+
+#: config.py:347
+msgid "Set this %s column on new merged books..."
+msgstr ""
+
+#: config.py:362
+msgid "How this column will be populated by default."
+msgstr ""
+
+#: dialogs.py:67
+msgid "Starting..."
+msgstr "Starter..."
+
+#: dialogs.py:68
+msgid "Working"
+msgstr "Arbeider"
+
+#: dialogs.py:69
+msgid "Completed so far"
+msgstr "Fullført så langt"
+
+#: dialogs.py:72
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: dialogs.py:116
+msgid "Starting Merge..."
+msgstr "Starter sammenkobling..."
+
+#: dialogs.py:174
+msgid "Move selected books up the list"
+msgstr "Flytt valgte bøker oppover i listen"
+
+#: dialogs.py:179
+msgid "Remove selected books from the list"
+msgstr "Fjern valgte bøker fra listen"
+
+#: dialogs.py:184
+msgid "Move selected books down the list"
+msgstr "Flytt valgte bøker nedover i listen"
+
+#: dialogs.py:223
+msgid "Author(s)"
+msgstr "Forfatter(e)"
+
+#: dialogs.py:223
+msgid "Series"
+msgstr "Serier"
+
+#: dialogs.py:223
+msgid "Title"
+msgstr "Tittel"
+
+#: dialogs.py:272
+msgid "Are you sure you want to remove this book from the list?"
+msgstr "Er du sikker på at du vil fjerne denne boken fra listen?"
+
+#: dialogs.py:274
+msgid "Are you sure you want to remove the selected %d books from the list?"
+msgstr "Er du sikker på at du vil fjerne de valgte %d bøkene fra listen?"
+
+#: dialogs.py:356
+msgid "Add"
+msgstr "Legg til"
+
+#: dialogs.py:360
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: dialogs.py:363
+msgid "Discard"
+msgstr "Forkast"
+
+#: epubmerge_plugin.py:57
+msgid "EpubMerge"
+msgstr ""
+
+#: epubmerge_plugin.py:58
+msgid "Merge multiple EPUBs into one in a new book."
+msgstr ""
+
+#: epubmerge_plugin.py:107 epubmerge_plugin.py:108
+msgid "&Merge Epubs"
+msgstr ""
+
+#: epubmerge_plugin.py:111 epubmerge_plugin.py:112
+msgid "&UnMerge Epub"
+msgstr ""
+
+#: epubmerge_plugin.py:121
+msgid "&Configure Plugin"
+msgstr ""
+
+#: epubmerge_plugin.py:123 epubmerge_plugin.py:124
+msgid "Configure EpubMerge"
+msgstr ""
+
+#: epubmerge_plugin.py:164
+msgid "Select One Book"
+msgstr "Velg en bok"
+
+#: epubmerge_plugin.py:165
+msgid "Please select exactly one book to UnMerge."
+msgstr ""
+
+#: epubmerge_plugin.py:175
+msgid "Cannot UnMerge Non-Epubs"
+msgstr ""
+
+#: epubmerge_plugin.py:176 epubmerge_plugin.py:188
+msgid ""
+"To UnMerge the source must be Epub(s) created by EpubMerge with Keep UnMerge"
+" Metadata enabled."
+msgstr ""
+
+#: epubmerge_plugin.py:187
+msgid "No UnMerge data found"
+msgstr ""
+
+#: epubmerge_plugin.py:206
+msgid ""
+"You already have a book <i>%s</i> by <i>%s</i>.  You may Add a new book of "
+"the same title, Overwrite the Epub in the existing book, or Discard this "
+"Epub."
+msgstr ""
+
+#: epubmerge_plugin.py:209
+msgid ""
+"You already have more than one book <i>%s</i> by <i>%s</i>.  You may Add a "
+"new book of the same title, or Discard this Epub."
+msgstr ""
+
+#: epubmerge_plugin.py:242 epubmerge_plugin.py:270
+msgid "Cannot Merge Epubs"
+msgstr ""
+
+#: epubmerge_plugin.py:243
+msgid "Less than 2 books selected."
+msgstr "Mindre enn 2 bøker er valgt."
+
+#: epubmerge_plugin.py:259
+msgid "Collecting EPUBs for merger..."
+msgstr ""
+
+#: epubmerge_plugin.py:260
+msgid "Get EPUBs for merge"
+msgstr ""
+
+#: epubmerge_plugin.py:261
+msgid "EPUBs collected"
+msgstr ""
+
+#: epubmerge_plugin.py:271
+msgid "%s books failed."
+msgstr "%s bøker feilet."
+
+#: epubmerge_plugin.py:276
+msgid "Order EPUBs to Merge"
+msgstr ""
+
+#: epubmerge_plugin.py:340
+msgid "%s by %s"
+msgstr "%s av %s"
+
+#: epubmerge_plugin.py:344
+msgid "%s containing:"
+msgstr "%s inneholder:"
+
+#: epubmerge_plugin.py:513
+msgid ""
+"The book for the new Merged EPUB has been created and default metadata filled in.\n"
+"\n"
+"However, the EPUB will *not* be created until after you've reviewed, edited, and closed the metadata dialog that follows."
+msgstr ""
+
+#: epubmerge_plugin.py:529
+msgid ""
+"You're merging %s EPUBs totaling %s.  Calibre will be locked until the merge"
+" is finished."
+msgstr ""
+
+#: epubmerge_plugin.py:533
+msgid "Merging %s EPUBs..."
+msgstr ""
+
+#: epubmerge_plugin.py:559
+msgid ""
+"Merge finished, output in:\n"
+"%s"
+msgstr ""
+
+#: epubmerge_plugin.py:568
+msgid "Finished merging %s EPUBs."
+msgstr ""
+
+#: epubmerge_plugin.py:583 epubmerge_plugin.py:584 epubmerge_plugin.py:585
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: epubmerge_plugin.py:617
+msgid "%s by %s doesn't have an EPUB."
+msgstr ""
diff --git a/translations/pt_BR.po b/translations/pt_BR.po
index 369445c..f43568c 100644
--- a/translations/pt_BR.po
+++ b/translations/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
-"POT-Creation-Date: 2014-12-27 13:15+Central Standard Time\n"
-"PO-Revision-Date: 2014-12-28 10:01+0000\n"
+"POT-Creation-Date: 2015-04-16 11:21+Central Daylight Time\n"
+"PO-Revision-Date: 2015-04-17 08:27+0000\n"
 "Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/calibre-plugins/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -309,6 +309,12 @@ msgid ""
 "Epub."
 msgstr "Você já tem um livro <i>%s</i> por <i>%s</i>.  Você pode adicionar um novo livro do mesmo título, substituir o Epub no livro existente, ou descartar este Epub."
 
+#: epubmerge_plugin.py:209
+msgid ""
+"You already have more than one book <i>%s</i> by <i>%s</i>.  You may Add a "
+"new book of the same title, or Discard this Epub."
+msgstr ""
+
 #: epubmerge_plugin.py:242 epubmerge_plugin.py:270
 msgid "Cannot Merge Epubs"
 msgstr "Não foi possível mesclar estes Epubs"
@@ -337,45 +343,45 @@ msgstr "%s livros falharam."
 msgid "Order EPUBs to Merge"
 msgstr "Ordem dos EPUBs para mesclagem"
 
-#: epubmerge_plugin.py:333
+#: epubmerge_plugin.py:340
 msgid "%s by %s"
 msgstr "%s por %s"
 
-#: epubmerge_plugin.py:337
+#: epubmerge_plugin.py:344
 msgid "%s containing:"
 msgstr "%s contendo:"
 
-#: epubmerge_plugin.py:506
+#: epubmerge_plugin.py:513
 msgid ""
 "The book for the new Merged EPUB has been created and default metadata filled in.\n"
 "\n"
 "However, the EPUB will *not* be created until after you've reviewed, edited, and closed the metadata dialog that follows."
 msgstr "O livro para o novo EPUB mesclado foi criado e preenchido com metadados padrão.\n\nContudo, o EPUB *não* vai ser criado até que você tenha revisado, editado, e fechado a janela de metadados a seguir."
 
-#: epubmerge_plugin.py:522
+#: epubmerge_plugin.py:529
 msgid ""
 "You're merging %s EPUBs totaling %s.  Calibre will be locked until the merge"
 " is finished."
 msgstr "Você está mesclando %s EPUBs, totalizando %s. O calibre será bloqueado até que a mesclagem seja concluída."
 
-#: epubmerge_plugin.py:526
+#: epubmerge_plugin.py:533
 msgid "Merging %s EPUBs..."
 msgstr "Mesclando %s EPUBs..."
 
-#: epubmerge_plugin.py:552
+#: epubmerge_plugin.py:559
 msgid ""
 "Merge finished, output in:\n"
 "%s"
 msgstr "Mesclagem concluída, saída em:\n%s"
 
-#: epubmerge_plugin.py:561
+#: epubmerge_plugin.py:568
 msgid "Finished merging %s EPUBs."
 msgstr "Concluída a mesclagem de %s EPUBs."
 
-#: epubmerge_plugin.py:576 epubmerge_plugin.py:577 epubmerge_plugin.py:578
+#: epubmerge_plugin.py:583 epubmerge_plugin.py:584 epubmerge_plugin.py:585
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: epubmerge_plugin.py:608
+#: epubmerge_plugin.py:617
 msgid "%s by %s doesn't have an EPUB."
 msgstr "%s por %s não tem um EPUB."
diff --git a/translations/sv.po b/translations/sv.po
index 964390b..dfb4406 100644
--- a/translations/sv.po
+++ b/translations/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
-"POT-Creation-Date: 2014-12-27 13:15+Central Standard Time\n"
-"PO-Revision-Date: 2014-12-28 10:01+0000\n"
+"POT-Creation-Date: 2015-04-16 11:21+Central Daylight Time\n"
+"PO-Revision-Date: 2015-04-17 08:27+0000\n"
 "Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/calibre-plugins/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -309,6 +309,12 @@ msgid ""
 "Epub."
 msgstr "Du har redan en bok <i>%s</i> av <i>%s</i>. Du kan lägga till en ny bok med samma titel, skriv över Epub i befintlig bok, eller släng denna Epub."
 
+#: epubmerge_plugin.py:209
+msgid ""
+"You already have more than one book <i>%s</i> by <i>%s</i>.  You may Add a "
+"new book of the same title, or Discard this Epub."
+msgstr ""
+
 #: epubmerge_plugin.py:242 epubmerge_plugin.py:270
 msgid "Cannot Merge Epubs"
 msgstr "Kan inte slå samman EPUB:ar"
@@ -337,45 +343,45 @@ msgstr "%s böcker misslyckades."
 msgid "Order EPUBs to Merge"
 msgstr "Beordra EPUB:ar att slås samman"
 
-#: epubmerge_plugin.py:333
+#: epubmerge_plugin.py:340
 msgid "%s by %s"
 msgstr "%s av %s"
 
-#: epubmerge_plugin.py:337
+#: epubmerge_plugin.py:344
 msgid "%s containing:"
 msgstr "%s innehåller:"
 
-#: epubmerge_plugin.py:506
+#: epubmerge_plugin.py:513
 msgid ""
 "The book for the new Merged EPUB has been created and default metadata filled in.\n"
 "\n"
 "However, the EPUB will *not* be created until after you've reviewed, edited, and closed the metadata dialog that follows."
 msgstr "Boken för den nya sammanslagna EPUB har skapats och standard metadata fylls in.\n\nMen EPUB kommer *inte* att skapas förrän du har granskat, redigerat, och stängt metadata dialogrutan som följer."
 
-#: epubmerge_plugin.py:522
+#: epubmerge_plugin.py:529
 msgid ""
 "You're merging %s EPUBs totaling %s.  Calibre will be locked until the merge"
 " is finished."
 msgstr "Du slår samman %s EPUBar totalt %s. Calibre kommer att vara låst till dess att sammanslagningen är klar."
 
-#: epubmerge_plugin.py:526
+#: epubmerge_plugin.py:533
 msgid "Merging %s EPUBs..."
 msgstr "Slår samman %s EPUB:ar..."
 
-#: epubmerge_plugin.py:552
+#: epubmerge_plugin.py:559
 msgid ""
 "Merge finished, output in:\n"
 "%s"
 msgstr "Sammanslagning klar, resultat i:\n%s"
 
-#: epubmerge_plugin.py:561
+#: epubmerge_plugin.py:568
 msgid "Finished merging %s EPUBs."
 msgstr "Klar med sammanslagning av %s EPUB:ar."
 
-#: epubmerge_plugin.py:576 epubmerge_plugin.py:577 epubmerge_plugin.py:578
+#: epubmerge_plugin.py:583 epubmerge_plugin.py:584 epubmerge_plugin.py:585
 msgid "Unknown"
 msgstr "Okänd"
 
-#: epubmerge_plugin.py:608
+#: epubmerge_plugin.py:617
 msgid "%s by %s doesn't have an EPUB."
 msgstr "%s av %s har inte en EPUB."
diff --git a/translations/uk.po b/translations/uk.po
index 7091d80..00c9deb 100644
--- a/translations/uk.po
+++ b/translations/uk.po
@@ -2,13 +2,13 @@
 # Copyright (C) YEAR ORGANIZATION
 # 
 # Translators:
-# Yuri Chornoivan <yurchor@ukr.net>, 2014
+# Yuri Chornoivan <yurchor@ukr.net>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
-"POT-Creation-Date: 2014-12-27 13:15+Central Standard Time\n"
-"PO-Revision-Date: 2014-12-28 10:01+0000\n"
-"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
+"POT-Creation-Date: 2015-04-16 11:21+Central Daylight Time\n"
+"PO-Revision-Date: 2015-04-17 14:53+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/calibre-plugins/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -309,6 +309,12 @@ msgid ""
 "Epub."
 msgstr "У вас вже є книга <i>%s</i>, <i>%s</i>. Ви можете додати нову книгу з тією самою назвою, перезаписати Epub у наявній книзі чи відкинути цей файл Epub."
 
+#: epubmerge_plugin.py:209
+msgid ""
+"You already have more than one book <i>%s</i> by <i>%s</i>.  You may Add a "
+"new book of the same title, or Discard this Epub."
+msgstr "У вас вже є декілька книг <i>%s</i>, <i>%s</i>. Ви можете додати нову книгу з тією самою назвою чи відкинути цей файл Epub."
+
 #: epubmerge_plugin.py:242 epubmerge_plugin.py:270
 msgid "Cannot Merge Epubs"
 msgstr "Не вдалося об’єднати Epub"
@@ -337,45 +343,45 @@ msgstr "Помилки для %s книг."
 msgid "Order EPUBs to Merge"
 msgstr "Порядок EPUB для об’єднання"
 
-#: epubmerge_plugin.py:333
+#: epubmerge_plugin.py:340
 msgid "%s by %s"
 msgstr "%s, %s"
 
-#: epubmerge_plugin.py:337
+#: epubmerge_plugin.py:344
 msgid "%s containing:"
 msgstr "%s містить:"
 
-#: epubmerge_plugin.py:506
+#: epubmerge_plugin.py:513
 msgid ""
 "The book for the new Merged EPUB has been created and default metadata filled in.\n"
 "\n"
 "However, the EPUB will *not* be created until after you've reviewed, edited, and closed the metadata dialog that follows."
 msgstr "Було створено книгу з новим об’єднаним EPUB і заповненими полями метаданих.\n\nВтім, EPUB *не* буде створено, доки ви не виконаєте рецензування, редагування та закриєте діалогове вікно метаданих, яке буде показано далі."
 
-#: epubmerge_plugin.py:522
+#: epubmerge_plugin.py:529
 msgid ""
 "You're merging %s EPUBs totaling %s.  Calibre will be locked until the merge"
 " is finished."
 msgstr "Ви об’єднуєте %s EPUB до %s. Роботу Calibre буде заблоковано, аж доки об’єднання не буде завершено."
 
-#: epubmerge_plugin.py:526
+#: epubmerge_plugin.py:533
 msgid "Merging %s EPUBs..."
 msgstr "Об’єднуємо EPUB %s…"
 
-#: epubmerge_plugin.py:552
+#: epubmerge_plugin.py:559
 msgid ""
 "Merge finished, output in:\n"
 "%s"
 msgstr "Об’єднання завершено, результат тут:\n%s"
 
-#: epubmerge_plugin.py:561
+#: epubmerge_plugin.py:568
 msgid "Finished merging %s EPUBs."
 msgstr "Об’єднання %s EPUB завершено."
 
-#: epubmerge_plugin.py:576 epubmerge_plugin.py:577 epubmerge_plugin.py:578
+#: epubmerge_plugin.py:583 epubmerge_plugin.py:584 epubmerge_plugin.py:585
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: epubmerge_plugin.py:608
+#: epubmerge_plugin.py:617
 msgid "%s by %s doesn't have an EPUB."
 msgstr "%s, %s не має версії у форматі EPUB."