pot/merge.

author: Carl Hetherington <cth@carlh.net> 2017-05-25 09:56:03 +0100
committer: Carl Hetherington <cth@carlh.net> 2017-05-25 09:56:03 +0100
commit: 4aeccc93d513ffb86ec98f1fe6cb9d040ab66c7c (patch)
tree: 6f70836b67638b41de1f7e9528669b8e55386f57 /src/tools
parent: 96ed8c7717aec04c047d75c571f1a37c5d270fc8 (diff)
15 files changed, 1806 insertions, 1500 deletions
diff --git a/src/tools/po/cs_CZ.po b/src/tools/po/cs_CZ.po
index 54f5b6a31..590ec4077 100644
--- a/src/tools/po/cs_CZ.po
+++ b/src/tools/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2017-05-10 15:00+0200\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: Poedit 2.0.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM zapsat do %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDMs zapsat do %s"
@@ -32,71 +32,71 @@ msgstr "%d KDMs zapsat do %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Přidat film…\tCtrl-A"
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Obsah"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Upravit"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Konec"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Soubor"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Práce"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Vytvořit DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Otevřít…\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Nastavení…\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Ukončit"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Uložit\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Odeslat DCP do TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Nástroje"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "O"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "O DCP-o-matic"
 
@@ -104,7 +104,16 @@ msgstr "O DCP-o-matic"
 msgid "Add Film..."
 msgstr "Přidat film..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Přidat film..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -113,7 +122,7 @@ msgstr ""
 "Vyskytl se problém: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -122,17 +131,17 @@ msgstr ""
 "Vyskytl se problém: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Došlo k neznámé chybě na serveru DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Vyskytl se neznámy problém"
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -140,76 +149,81 @@ msgstr ""
 "Jste si jisti, že chcete obnovit předvolby na výchozí hodnoty? Tento krok "
 "nelze vrátit zpět."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Chybné nastavení pro %s (%s)."
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "CPL obsah není enkryptovaný."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Zkontrolovat aktualizace"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Zavřít bez uložení filmu"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Konvertor nebyl nalezen."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Nelze načíst film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, c-format
 msgid "Could not make DCP: %s."
 msgstr "Nemohu vytvořit DCP: %s."
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Nemohu otevřít film na %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Nemohu zobrazit DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Nemohu zobrazit DCP (nemohu spustit konvertor)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Nemohu spustit DCP (nemohu spustit nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr "Nemohu zapsat do souboru kina %s.  Vaše změny nebudou uloženy."
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 "Nemohu zapsat do konfiguračního souboru %s. Vaše změny nebudou uloženy."
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Vytvořit KDMs"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -221,62 +235,62 @@ msgstr "DCP-o-matic konvertor"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Encode Server"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KDM Creator"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr "Opravdu chcete přepsat stávající DCP %s?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Nezavírejte"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "Nezavírejte"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Zavřít bez uložení filmu"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Enkódovací servery…"
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Otevřít…\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "Soubor %s již existuje. Chcete soubor přepsat?"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Film byl změněn"
 
@@ -284,103 +298,107 @@ msgstr "Film byl změněn"
 msgid "Frames per second"
 msgstr "Snímků za sekundu"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Nápověda\tCtrl-H"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "KDM|Timing"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Vytvořit &KDM\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Vytvořit DCP v &batch konvertéri\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Vytvořit DKDM pro DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Správa šablon..."
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Nový...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Výstup"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Nahlásit problém..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Obnovit původní nastavení"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "Z&obrazit DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Uložit jako &šablonu…"
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Uložit změny do filmu před ukončením \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Uložit změny do filmu před ukončením \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Uložit film a zavřít"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Uložit film a zavřít"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Přizpůsobit na &výšku"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Přizpůsobit na &šířku"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Obrazovky"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Vybrat DKDM soubor"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Vybrat film k otevření"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Poslat KDM emailem"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -393,7 +411,7 @@ msgstr ""
 "polovinu místa, pokud souborový systém podporuje pevné odkazy, ale "
 "nepodporuje. Chcete pokračovat ?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -402,11 +420,11 @@ msgstr ""
 "DCP pro tento film bude zabírat alespoň %.1f Gb a disk, který momentálně "
 "používáte má jen %.1f Gb dostupných.  Chcete pokračovat?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matic download server je nedostupný."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -414,15 +432,15 @@ msgstr ""
 "Existující konfigurace se nepodařilo načíst. Místo toho budou použity "
 "výchozí hodnoty. To může chvíli trvat."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Žádné nové verze DCP-o-matic nejsou dostupné."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Ještě nejsou dokončené úlohy; chcete přestat?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -430,15 +448,15 @@ msgstr ""
 "Tento film byl vytvořený starší verzí DVD-o-matic a nemusí v této verzi "
 "fungovat správně. Prosím, zkontrolujte nastavení filmu."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Nedokončené úlohy"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Analýza videa..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -450,7 +468,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -460,7 +478,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -468,6 +486,9 @@ msgstr ""
 "Nebyla vybraná žádná složka. Ujistěte se, že jste vybrali složku před "
 "stiskem Otevřít."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr ""
 #~ "%1 již existuje jako soubor, takže ho nemůžete použít pro nový film."
diff --git a/src/tools/po/da_DK.po b/src/tools/po/da_DK.po
index 3e052293b..3f433fb72 100644
--- a/src/tools/po/da_DK.po
+++ b/src/tools/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2016-11-07 16:55+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -19,12 +19,12 @@ msgstr ""
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: R:/Servershares/AUPHOME/DCP-o-matic\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM skrevet til %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDMer skrevet til %s"
@@ -34,71 +34,71 @@ msgstr "%d KDMer skrevet til %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Tilføj film..."
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Indhold"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Rediger"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Afslut"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Hjælp"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Job"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Fremstil DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Åbn...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Indstillinger...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Afslut"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Gem\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Send DCP til TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Værktøjer"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
@@ -106,7 +106,16 @@ msgstr "Om DCP-o-matic"
 msgid "Add Film..."
 msgstr "Tilføj film..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Tilføj film..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -115,7 +124,7 @@ msgstr ""
 "Der opstod en fejl: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -124,17 +133,17 @@ msgstr ""
 "Der opstod en fejl: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "En ukendt fejl er opstået i DCP-o-matic serveren."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Der er sket en uhåndteret fejl."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -142,75 +151,80 @@ msgstr ""
 "Er du sikker på at du vil nulstille indstillingerne? Denne handling kan ikke "
 "annulleres."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Forkert indstilling af %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "CPL'ens indhold er ikke krypteret."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Søg efter opdateringer"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Afslut uden at gemme film"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Kunne ikke finde batch konverteringsprogram."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Kunne ikke indlæse film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "Kunne ikke fremstille DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunne ikke indlæse film ved %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Kunne ikke vise DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kunne ikke vise DCP (kunne ikke køre konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kunne ikke vise DCP (kunne ikke køre nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Dan KDMer"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -222,55 +236,55 @@ msgstr "DCP-o-matic Batch Konverter"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Kodningsserver"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KDM Generator"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Luk ikke"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "Luk ikke"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Afslut uden at gemme film"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Kodnings-servere..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Åbn...\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr ""
@@ -279,7 +293,7 @@ msgstr ""
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Film ændret"
 
@@ -287,103 +301,107 @@ msgstr "Film ændret"
 msgid "Frames per second"
 msgstr "Billeder pr. sekund"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Tips..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "Timing"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Fremstil &KDM'er...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Dan DCP i &batch konvertering\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Dan DKDM til DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Håndter skabeloner..."
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Ny...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Output"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Rapporter et problem..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Gendan standard indstillinger"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "V&is DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Gem som skabelon..."
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Gem ændringer til filmen \"%s\" før programmet lukkes?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Gem ændringer til filmen \"%s\" før programmet lukkes?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Gem film og luk"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Gem film og luk"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Skaler til &højde"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Skaler til &bredde"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Sale"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Vælg DKDM fil"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Vælg film der skal åbnes"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Send KDM emails"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -396,7 +414,7 @@ msgstr ""
 "halvt så megen plads hvis filsystemet understøttede hårde links, men det gør "
 "det ikke. Ønsker du alligevel at fortsætte?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -405,11 +423,11 @@ msgstr ""
 "DCP'en til denne film kommer til at fylde ca. %.1f GB, og disken du bruger "
 "har kun %.1f GB til rådighed.  Vil du fortsætte alligevel?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Kunne ikke få forbindelse til DCP-o-matic-serveren."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -417,15 +435,15 @@ msgstr ""
 "Kunne ikke indlæse indstillingerne og benytter i stedet "
 "standardindstillingerne. Det kan tage et lille stykke tid at klargøre."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Der er ingen nye versioner af DCP-o-matic tilgængelig."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Der er uafsluttede jobs. Er du sikker på, at du vil afslutte?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -434,15 +452,15 @@ msgstr ""
 "måske ikke indlæses korrekt i denne version. Sørg for at verificere filmens "
 "indstillinger."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Uafsluttede jobs"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Video bølgeform..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -454,7 +472,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -464,13 +482,16 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
 "Du valgte ikke en folder. Sørg for at vælge en folder før du klikker Åbn."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr ""
 #~ "%1 findes allerede som en fil, så du kan ikke bruge dette navn til en ny "
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index d01fe492f..f26f178c1 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2017-02-23 01:16+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: DCP-o-matic <carl@dcpomatic.com>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM geschrieben nach %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDMs geschrieben nach %s"
@@ -32,71 +32,71 @@ msgstr "%d KDMs geschrieben nach %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Projekt hinzufügen...\tCtrl-A"
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Schnellskalierung..."
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Ende"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Datei"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Aufgaben"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&DCP erstellen\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Öffnen...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Einstellungen...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Speichern\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&DCP an TMS senden"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Werkzeuge"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Über"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Über DCP-o-matic"
 
@@ -104,7 +104,16 @@ msgstr "Über DCP-o-matic"
 msgid "Add Film..."
 msgstr "Projekt hinzufügen..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Projekt hinzufügen..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -113,7 +122,7 @@ msgstr ""
 "Ein Fehler ist aufgetreten: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -122,94 +131,99 @@ msgstr ""
 "Ein Fehler ist aufgetreten: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Ein unbekannter Fehler ist beim J2C Kodierungsserver aufgetreten"
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
 msgstr "Voreinstellungen wirklich zurücksetzen?"
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Falscher Parameter für %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr ""
 "Medien der CPL sind bei der DCP-Erstellung nicht verschlüsselt worden. Nur "
 "für verschlüsselte CPLs können KDMs erstellt werden."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Auf Updates überprüfen..."
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Schließen ohne speichern"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Batchkonverter nicht gestartet!?"
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Film %1 (%2) konnte nicht geladen werden"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, c-format
 msgid "Could not make DCP: %s."
 msgstr "Konnte DCP nicht erstellen:  %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Der Film konnte nicht von %s geöffnet werden (%s)."
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Konnte DCP nicht anzeigen."
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 "DCP kann nicht angezeigt werden (Konqueror konnte nicht gestartet werden)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "DCP kann nicht angezeigt werden (Nautilus konnte nicht geladen werden)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Erzeuge KDM(s)"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -221,62 +235,62 @@ msgstr "DCP-o-matic Stapelkonvertierung"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic J2C Kodierungsserver"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KDM Verwaltung"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Nicht schließen"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "Nicht schließen"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Schließen ohne speichern"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Encoding Server..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Öffnen...\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "Die Datei %s existiert bereits. Überschreiben ?"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Projektdaten geändert!"
 
@@ -284,106 +298,110 @@ msgstr "Projektdaten geändert!"
 msgid "Frames per second"
 msgstr "Bilder pro Sekunde"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Hinweise/Warnungen...\tCtrl-H"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr ""
 "Zeitfenster beim Empfänger (nach UTC/GMT Offset/Zeitzone in "
 "Kinoeigenschaften!)"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "&KDM erstellen...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Sende Projekt an Batchkonverter\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "DKDM für DCP-o-matic erzeugen..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Projektvorlagen verwalten"
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Neu...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Ausgabe"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Problembericht senden..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Voreinstellungen zurücksetzen..."
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "Z&eige DCP Ordner"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Speichern als Projektvorlage..."
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Speichern und schließen"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Speichern und schließen"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Container vertikal füllen (evtl. Verzerrung und seitlicher Beschnitt!)"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr ""
 "Container horizontal füllen (evtl. Verzerrung und vertikaler Beschnitt!)"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Stammdaten Kinos und Leinwände"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "DKDM auswählen"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Zu öffnendes Projekt auswählen"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Sende KDM Emails"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -396,7 +414,7 @@ msgstr ""
 "Gbyte frei. Mit einem Dateisystem, das 'hard links' unterstützt würden Sie "
 "nur die Hälfte an Platz benötigen. Möchten Sie trotzdem weitermachen ?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -405,11 +423,11 @@ msgstr ""
 "Das DCP für diesen Film wird etwa %.1f Gbyte groß. Auf dem ausgewählten "
 "Laufwerk sind aber nur %.1f Gbyte frei. Möchten Sie trotzdem weitermachen ?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Der DCP-o-matic Download Server ist nicht erreichbar."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -417,17 +435,17 @@ msgstr ""
 "Die Programmeinstellungen konnten nicht geladen werden. Es werden "
 "Standardeinstellungen wiederhergestellt. Dies kann etwas länger dauern."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Es ist keine neue Version von DCP-o-matic verfügbar."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Manche Aufgaben sind nicht erledigt - sind Sie sicher, dass Sie Beenden "
 "wollen ?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -436,15 +454,15 @@ msgstr ""
 "worden und wird in dieser Programmversion möglicherweise nicht korrekt "
 "umgesetzt. Bitte prüfen Sie alle Projekteinstellungen sorgfältig!"
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Unerledigte Aufgaben"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Video Analyse..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -456,7 +474,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -466,12 +484,15 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr "Kein Ordner ausgewählt. Wählen Sie vor dem Öffnen einen Ordner aus."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr ""
 #~ "%1 existiert bereits als Datei, kann also nicht für einen neuen Film "
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 3cf0ec57a..c11b840de 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2016-09-01 17:31-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.8\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM guardada en %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDMs guardadas en %s"
@@ -32,71 +32,71 @@ msgstr "%d KDMs guardadas en %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Añadir película..."
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Contenido"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crear DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Abrir...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferencias...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Acerca de DVD-o-matic"
 
@@ -104,7 +104,16 @@ msgstr "Acerca de DVD-o-matic"
 msgid "Add Film..."
 msgstr "Añadir película..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Añadir película..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -113,7 +122,7 @@ msgstr ""
 "Ha ocurrido una excepción: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -122,17 +131,17 @@ msgstr ""
 "Ha ocurrido un error desconocido: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Un error desconocido ha ocurrido en el servidor de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Ha ocurrido un error desconocido."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -140,75 +149,80 @@ msgstr ""
 "¿Estás seguro de que quieres restaurar los valores por defecto? Esta acción "
 "no se puede deshacer."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Configuración errónea para %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "El contenido del CPL no está encriptado."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Cerrar sin guardar la película"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "No se puedo encontrar el convertidor por lotes."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "No se pudo crear el DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "No se pudo cargar la película en %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "No se pudo mostrar el DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilos)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Crear KDMs"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -220,55 +234,55 @@ msgstr "Convertidor por lotes DCP-o-matic"
 msgid "DCP-o-matic Encode Server"
 msgstr "Servidor de codificación DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "Generador de KDM DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "No cerrar"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "No cerrar"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Cerrar sin guardar la película"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Servidores de codificación..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Abrir...\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr ""
@@ -276,7 +290,7 @@ msgstr ""
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Película cambiada"
 
@@ -284,103 +298,107 @@ msgstr "Película cambiada"
 msgid "Frames per second"
 msgstr "Imágenes por segundo"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Pistas…"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "Tiempo"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Crear &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Crear DCP in &batch converter\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Producir un DKDM para DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Gestionar plantillas…"
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Nuevo...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Salida"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Comunicar un problema…"
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Restaurar las preferencias por defecto"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Guardar como &plantilla…"
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Guardar cambios de la película \"%s\" antes de cerrar?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Guardar cambios de la película \"%s\" antes de cerrar?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Guardar la película y cerrar"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Guardar la película y cerrar"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Redimensionar ajustando &altura"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Redimensionar ajustando &anchura"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Pantallas"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Selecciona el fichero DKDM"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Enviar los KDM por email"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -393,7 +411,7 @@ msgstr ""
 "disponibles. Necesitarías la mitad de espacio si el sistema de ficheros "
 "soportara enlaces duros, pero no es así. Quieres continuar de todas formas?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -403,11 +421,11 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -415,15 +433,15 @@ msgstr ""
 "La configuración existente no pudo cargarse. Los valores por defecto serán "
 "utilizados. Debería ser rápido."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Hay trabajos sin finalizar; ¿estás seguro de querer cerrar?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -432,15 +450,15 @@ msgstr ""
 "cargue correctamente en esta versión. Por favor revisa cuidadosamente las "
 "opciones."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Trabajos sin finalizar"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Forma de de onda del vídeo…"
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -452,7 +470,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -462,7 +480,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -470,6 +488,9 @@ msgstr ""
 "No has seleccionado una carpeta. Asegúrate de seleccionar una antes de "
 "pinchar sobre Abrir."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr ""
 #~ "%1 ya existe como fichero, no puedes usarlo para una nueva película."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index fcf0ea519..fc962c811 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2017-02-18 17:29+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM créée dans %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDMs créées dans %s"
@@ -31,71 +31,71 @@ msgstr "%d KDMs créées dans %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "& Ajouter Film ... Ctrl-A"
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Contenu"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Créer le DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Ouvrir...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Préférences...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Enregistrer\tCtrl+S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP au TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Outils"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "A propos"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
@@ -103,7 +103,16 @@ msgstr "À propos de DCP-o-matic"
 msgid "Add Film..."
 msgstr "Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Ajouter Film..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -112,7 +121,7 @@ msgstr ""
 "Erreur constatée: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -121,17 +130,17 @@ msgstr ""
 "Exception inconnue: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Erreur inconnue avec le server DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Exception inconnue"
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -139,75 +148,80 @@ msgstr ""
 "Etes vous certain de vouloir rétablir les préférences par défaut? Vous ne "
 "pourrez pas revenir en arrière."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Mauvais paramètres pour %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "Le contenu du CPL n'est pas crypté."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Recherche mises à jour"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Fermer sans sauvegarder le film"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Convertisseur par lots introuvable"
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, c-format
 msgid "Could not make DCP: %s."
 msgstr "N'a pas pu créer le DCP: %s."
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Ouverture du DCP impossible"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Créer les KDMs"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -219,62 +233,62 @@ msgstr "DCP-o-matic - Convertisseur par lots"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Serveur d'Encodage"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic Créateur de KDM"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Ne pas fermer"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "Ne pas fermer"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Fermer sans sauvegarder le film"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Serveurs d'encodage"
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Ouvrir...\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "Le fichier %s existe déjà. Etes-vous sûr de vouloir le remplacer ?"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Film changé"
 
@@ -282,103 +296,107 @@ msgstr "Film changé"
 msgid "Frames per second"
 msgstr "Images par seconde"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Conseils...\tCtrl-H"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "Durées"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Générer &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Produire le DCP dans le &Convertisseur par lot\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Créer DKDM pour DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Gérer les modèles..."
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Nouveau...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Sortie"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Signaler un problème"
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Rétablir préférences par défaut"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Enregistrer comme modèle"
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements dans le film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Enregistrer les changements dans le film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Enregistrer le film et fermer"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Enregistrer le film et fermer"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Adapter pour remplir &hauteur"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Adapter pour remplir largeur"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Ecrans"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Sélectionner le fichier DKDM"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Envoyer les e-mails de KDM"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -391,7 +409,7 @@ msgstr ""
 "votre système supportait les \"hard links\" mais ce n'est pas le cas. "
 "Souhaitez vous continuer quand-même?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -400,11 +418,11 @@ msgstr ""
 "Le DCP de ce film pèsera environ %.1f Go. Le disque que vous utilisez n'a "
 "que %.1f Go disponible(s). Souhaitez-vous continuer?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Le serveur de téléchargement de DCP-o-matic ne peut être contacté."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -412,15 +430,15 @@ msgstr ""
 "La configuration existante n'a pu être chargée. Les paramètres par défaut "
 "seront utilisés à la place. Cela peut prendre un peu de temps."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Pas de mise à jour disponible de DCP-o-matic pour l'instant."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Certaines tâches sont inachevées. Voulez-vous vraiment quitter ?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -429,15 +447,15 @@ msgstr ""
 "pas s'ouvrir correctement dans cette version. Veuillez vérifier tous les "
 "paramètres de réglages très attentivement."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Travaux incomplets"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Forme d'onde vidéo"
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -449,7 +467,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -459,7 +477,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -467,6 +485,9 @@ msgstr ""
 "Aucun dossier sélectionné. Sélectionnez un dossier avant de cliquer sur "
 "Ouvrir"
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr ""
 #~ "Le nom de fichier %1 existe déjà, vous ne pouvez l'utiliser pour un "
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 9e8f6b840..cce6f1e34 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2016-10-28 17:03+0200\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM scritta su %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDM scritte su %s"
@@ -32,71 +32,71 @@ msgstr "%d KDM scritte su %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Aggiungi Film..."
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Contenuto"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Elaborazioni"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crea DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Apri...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferenze...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Salva\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Strumenti"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Info su DVD-o-matic"
 
@@ -104,7 +104,16 @@ msgstr "Info su DVD-o-matic"
 msgid "Add Film..."
 msgstr "&Aggiungi film..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "&Aggiungi film..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -113,7 +122,7 @@ msgstr ""
 "Si è verificata un'eccezione: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -122,17 +131,17 @@ msgstr ""
 "Si è verificata un'eccezione: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Errore sconosciuto sul server di DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Si è verificata un'eccezione sconosciuta."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -140,75 +149,80 @@ msgstr ""
 "Sei sicuro di voler ripristinare le impostazioni ai valori predefiniti? "
 "Questa operazione non può essere annullata."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Parametro %s errato  (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "Il contenuto CPL non è criptato."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Controlla aggiornamenti"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Chiudi senza salvare il film"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Non trovo il convertitore batch."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "Non posso creare DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film a %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Impossibile visualizzare il DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Impossibile visualizzare il DCP (impossibile avviare konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Impossibile visualizzare il DCP (impossibile avviare nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Crea le KDM"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -220,62 +234,62 @@ msgstr "DCP-o-matic Convertitore batch"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Server per la Codifica"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic Creazione di KDM"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Non chiudere"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "Non chiudere"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Chiudi senza salvare il film"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Servers di codifica..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Apri...\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "La cartella %s esiste già e non è vuota.  Sei sicuro di volerla usare?"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Film modificato"
 
@@ -283,103 +297,107 @@ msgstr "Film modificato"
 msgid "Frames per second"
 msgstr "Frame al secondo"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Suggerimenti..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "KDM|Timing"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Crea &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Crea DCP in convertitore &batch\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Crea DKDM per DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Gestione template..."
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Nuovo...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Output"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Segnala un problema..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Ripristinare le impostazioni predefinite"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Salva come &template..."
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Salva il film e chiudi"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Salva il film e chiudi"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Adatta all'&altezza"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Adatta alla &larghezza"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Schermi"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Seleziona il file DKDM"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Invia email KDM"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -392,7 +410,7 @@ msgstr ""
 "spazio se il filesystem supportasse i collegamenti fisici, ma non è così. "
 "Vuoi continuare ugualmente?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -401,11 +419,11 @@ msgstr ""
 "Il DCP di questo film occupa %.1f Gb, ma il disco che stai usando dispone di "
 "%.1f Gb liberi.  Vuoi continuare ugualmente?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Il download server di DCP-o-matic non può essere contattato."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -413,15 +431,15 @@ msgstr ""
 "La configurazione esistente non è stata caricata. Verranno usati i valori "
 "predefiniti. Potrebbe impiegarci davvero poco."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Non ci sono nuove versioni di DCP-o-matic disponibili."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "C'è un processo in corso: sei sicuro di voler uscire?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -430,15 +448,15 @@ msgstr ""
 "potrebbe non essere caricato correttamente in questa versione. Per favore "
 "controlla attentamente le impostazioni del film."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Elaborazioni incomplete"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Forma d'onda video..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -450,7 +468,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -460,7 +478,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -468,6 +486,9 @@ msgstr ""
 "Non hai selezionato una cartella. Assicurati di selezionare una cartella "
 "prima di cliccare Apri."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
 
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 67969ce80..d55afb9f5 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2017-05-14 03:40+0200\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: Poedit 1.8.12\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM weggeschreven naar %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDM's weggeschreven naar %s"
@@ -32,71 +32,71 @@ msgstr "%d KDM's weggeschreven naar %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Voeg film toe...\tCtrl-A"
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Content"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Wijzig"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Stop"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Bestand"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Help"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Taken"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Maak DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Open...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Voorkeuren...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Stop"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Bewaar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Verzend DCP naar TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Tools"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Over"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Over DCP-o-matic"
 
@@ -104,7 +104,16 @@ msgstr "Over DCP-o-matic"
 msgid "Add Film..."
 msgstr "Voeg film toe..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Voeg film toe..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -113,7 +122,7 @@ msgstr ""
 "Er is een uitzondering opgetreden: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -122,17 +131,17 @@ msgstr ""
 "Er is een uitzondering opgetreden: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Er is een onbekende fout opgetreden bij de DCP-o-matic-server."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Er is een onbekende uitzondering opgetreden."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -140,58 +149,63 @@ msgstr ""
 "Weet u zeker dat u de voorkeuren naar hun standaardwaarden wilt herstellen?  "
 "Dit kan niet ongedaan gemaakt worden."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Verkeerde instelling voor %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "De inhoud van de CPL is niet versleuteld."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Controleer op updates"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Sluit zonder film te bewaren"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Kan Batch Converter niet vinden."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Kan film %1 niet laden (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, c-format
 msgid "Could not make DCP: %s."
 msgstr "Kan DCP niet maken: %s."
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kan film niet openen op %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Kan DCP niet tonen"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kan DCP niet tonen (kan konqueror niet starten)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kan DCP niet tonen (kan nautilus niet starten)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
@@ -199,7 +213,7 @@ msgstr ""
 "Kan niet naar cinemas-bestand schrijven op %s.  Uw wijzigingen zijn niet "
 "bewaard."
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
@@ -207,12 +221,12 @@ msgstr ""
 "Kan niet naar config-bestand schrijven op %s.  Uw wijzigingen zijn niet "
 "bewaard."
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Maak KDM's"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -224,59 +238,59 @@ msgstr "DCP-o-matic Batch Converter"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Encode Server"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KDM Creator"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr "Wilt u de bestaande DCP %s overschrijven?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Sluit niet"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Don't duplicate"
 msgstr "Dupliceer niet"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr "Dupliceer Film"
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr "Dupliceer en open..."
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Duplicate without saving film"
 msgstr "Dupliceer zonder film te bewaren"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr "Dupliceer..."
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Encodeer-servers..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 msgid "Export...\tCtrl-E"
 msgstr "Exporteer...\tCtrl-E"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "Bestand %s bestaat al.  Wilt u het overschrijven?"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Film is gewijzigd"
 
@@ -284,102 +298,106 @@ msgstr "Film is gewijzigd"
 msgid "Frames per second"
 msgstr "Frames per seconde"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Hints..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "Tijdvenster"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Maak &KDM's...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Maak DCP in Batch Converter\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Maak DKDM voor DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Beheer templates..."
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr "Nieuwe Film"
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Nieuw...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Output"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Meld een probleem..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Herstel standaardvoorkeuren"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "Toon DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Bewaar als &template..."
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Wijzigingen in film \"%s\" bewaren voor het sluiten?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Wijzigingen in film \"%s\" bewaren voor het dupliceren?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Bewaar film en sluit"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Save film and duplicate"
 msgstr "Bewaar film en dupliceer"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Maak passend in &hoogte"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Maak passend in &breedte"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Schermen"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Selecteer DKDM-bestand"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Kies film om te openen"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Verzend KDM e-mails"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -393,7 +411,7 @@ msgstr ""
 "bestandsysteem hard links zou ondersteunen, maar dat doet het niet.  Wilt u "
 "toch doorgaan?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -403,11 +421,11 @@ msgstr ""
 "schijf die gebruikt wordt heeft maar %.1f GB beschikbaar.  Wilt u toch "
 "doorgaan?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Kan geen verbinding maken met de DCP-o-matic download-server."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -415,15 +433,15 @@ msgstr ""
 "De bestaande configuratie kan niet geladen worden.  In plaats daarvan zullen "
 "standaardwaarden gebruikt worden.  Het aanmaken hiervan kan even duren."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Er zijn geen nieuwere versies van DCP-o-matic beschikbaar."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Er zijn nog onvoltooide taken; weet u zeker dat u wilt stoppen?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -432,15 +450,15 @@ msgstr ""
 "mogelijk niet goed in deze versie.  Controleer a.u.b. de instellingen van de "
 "film zorgvuldig."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Onvoltooide taken"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Video-golfvorm..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -460,7 +478,7 @@ msgstr ""
 "span> omdat verlies ervan uw DKDM's (en de DCP's die ze beschermen) "
 "nutteloos maakt."
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -477,10 +495,13 @@ msgstr ""
 "\"larger\">BACK-UPS GEMAAKT ZIJN</span> als u KDM's voor deze film wilt "
 "maken."
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
 "U heeft geen map geselecteerd.  Zorg ervoor dat er een map geselecteerd is "
 "voordat u op Open klikt."
+
+#~ msgid "CPL"
+#~ msgstr "CPL"
diff --git a/src/tools/po/pl_PL.po b/src/tools/po/pl_PL.po
index 74979ed5b..e25f1ef71 100644
--- a/src/tools/po/pl_PL.po
+++ b/src/tools/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2015-10-10 19:01+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr ""
@@ -34,71 +34,71 @@ msgstr ""
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Dodaj Film"
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Dopasuj"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Edycja"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Zamknij"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Plik"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Zadania"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Stwórz DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Otwórz\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferencje\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Zakończ"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Zapisz\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Wyślij DCP do TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Narzędzia"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Informacje"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "DCP-o-matic - informacje"
 
@@ -106,7 +106,16 @@ msgstr "DCP-o-matic - informacje"
 msgid "Add Film..."
 msgstr "Dodaj Film"
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Dodaj Film"
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -115,7 +124,7 @@ msgstr ""
 "Wystąpił błąd: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -124,92 +133,97 @@ msgstr ""
 "Wystąpił błąd: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Wystąpił nieznany błąd."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Nieprawidłowe ustawienia %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr ""
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "Zawartość CPL nie jest szyfrowana."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Uaktualnij program"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 #, fuzzy
 msgid "Could not find batch converter."
 msgstr "DCP-o-matic Konwersja Hurtowa"
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Nie można załadować filmu %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "Nie można stworzyć DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Nie można otworzyć filmu na %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Nie można pokazać DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Nie można pokazać DCP (nie można otworzyć konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Nie można pokazać DCP (nie można otworzyć nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -222,54 +236,54 @@ msgstr "DCP-o-matic Konwersja Hurtowa"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Konwersja Hurtowa"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 #, fuzzy
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Don't duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Duplicate without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Serwery kodujące"
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Otwórz\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr ""
@@ -278,7 +292,7 @@ msgstr ""
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Film został zmodyfikowany"
 
@@ -286,103 +300,107 @@ msgstr "Film został zmodyfikowany"
 msgid "Frames per second"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Wskazówki"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Stwórz &KDM\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Nowy\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Zgłoś błąd"
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Przywróć ustawienia domyślne"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "Pokaż DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Czy zapisać zmiany w  \"%s\" przed zakończeniem?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Czy zapisać zmiany w  \"%s\" przed zakończeniem?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Save film and duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Dopasuj do &wysokości"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Dopasuj do &szerokości"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 #, fuzzy
 msgid "Select DKDM file"
 msgstr "Wybierz film"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Wybierz film"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -395,7 +413,7 @@ msgstr ""
 "potrzebowałbyś tylko połowę z tej przestrzeni, ale niestety nie obsługuje. "
 "Czy chcesz kontynuować? "
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -404,26 +422,26 @@ msgstr ""
 "DCP dla tego filmu zajmie około %1f Gb, a na Twoim dysku zostało już tylko "
 "%1f Gb. Czy chcesz kontynuować?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Połączenie z serwerem DCP-o-matic nieudane."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Używasz najnowszej wersji DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Niektóre zadania jeszcze się nie ukończyły. Czy na pewno chcesz zakończyć?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -431,15 +449,15 @@ msgstr ""
 "Ten film został stworzony przy użyciu starej wersji DVD-o-matic i może nie "
 "zaimportować się poprawnie. Sprawdź dokładnie ustawienia filmu."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Nieukończone zadania"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Analiza pliku video"
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -451,7 +469,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -461,7 +479,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/pt_BR.po b/src/tools/po/pt_BR.po
index ad77d2cf4..75acda3ff 100644
--- a/src/tools/po/pt_BR.po
+++ b/src/tools/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2016-06-20 00:53-0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.8\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM salvo em %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDMs salvo em %s"
@@ -32,71 +32,71 @@ msgstr "%d KDMs salvo em %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Adicionar Filme..."
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Conteúdo"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Sair"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Arquivo"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Tarefas"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Fazer DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Abrir...\tCtrl+O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferências...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Sair"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Salvar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP para TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Ferramentas"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Sobre"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Sobre DCP-o-matic"
 
@@ -104,7 +104,16 @@ msgstr "Sobre DCP-o-matic"
 msgid "Add Film..."
 msgstr "Adicionar Filme..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Adicionar Filme..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -113,7 +122,7 @@ msgstr ""
 "Ocorreu um erro: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -122,17 +131,17 @@ msgstr ""
 "Ocorreu um erro: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Um erro deconhecido ocorreu com o servidor DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Ocorreu um erro desconhecido."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -140,75 +149,80 @@ msgstr ""
 "Tem certeza que deseja retornar as configurações aos seus valores originais? "
 "Esta ação não poderá ser desfeita."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Configuração errada para %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "Contéudo da CPL não encriptado."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Verificar atualizações"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Fechar sem salvar o filme"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Conversor em série não encontrado."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Não conseguiu carregar o filme %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "Não conseguiu criar o DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Não conseguiu abrir o filme em %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Não foi possível exibir o DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Não foi possível exibir o DCP (konqueror não rodou)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Não foi possível exibir o DCP (nautilus não rodou)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Criar KDMs"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -220,55 +234,55 @@ msgstr "Conversor em série DCP-o-matic"
 msgid "DCP-o-matic Encode Server"
 msgstr "Conversor em série DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "Criador de KDMs DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Não feche"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "Não feche"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Fechar sem salvar o filme"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Servidores de codificação..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Abrir...\tCtrl+O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr ""
@@ -276,7 +290,7 @@ msgstr ""
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Filme sofreu alterações"
 
@@ -284,103 +298,107 @@ msgstr "Filme sofreu alterações"
 msgid "Frames per second"
 msgstr "Quadros por segundo"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Dicas..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Fazer &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Fazer DCP no &conversor em série\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Fazer DKDM para o DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Novo...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Saída"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Avisar de um problema..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Restaurar preferências ao padrão"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "E&xibir DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvar alterações no filme \"%s\" antes de fechar?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Salvar alterações no filme \"%s\" antes de fechar?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Salvar filme e fechar"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Salvar filme e fechar"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Ajustar para caber na &altura"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Ajustar para caber na &largura"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Telas"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Selecione o filme para abrir"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Selecione o filme para abrir"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Enviar KDMs por email"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -393,7 +411,7 @@ msgstr ""
 "só de metade do espaço se o seu sistema de arquivos permitisse hard links, "
 "mas não permite. Quer continuar mesmo assim?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -403,25 +421,25 @@ msgstr ""
 "que você está usando tem apenas %.1f Gb disponíveis. Quer continuar mesmo "
 "assim?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "O servidor do DCP-o-matic não pode ser contactado."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Não há novas versões do DCP-o-matic disponíveis."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Há tarefas não concluídas; quer mesmo sair?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -430,15 +448,15 @@ msgstr ""
 "corretamente nessa versão. Por favor confira as configurações do filme com "
 "cuidado."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Tarefas inacabadas"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Waveform de video..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -450,7 +468,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -460,13 +478,16 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
 "Você não escolheu uma pasta. Selecione uma pasta antes de clicar em Abrir."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr ""
 #~ "%1 é um arquivo já existente, você não pode usá-lo para um novo filme."
diff --git a/src/tools/po/pt_PT.po b/src/tools/po/pt_PT.po
index f4234d5d2..73aad748b 100644
--- a/src/tools/po/pt_PT.po
+++ b/src/tools/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic PORTUGUESE (Portugal)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2016-03-19 13:01+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: Poedit 1.8.7.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr ""
@@ -33,71 +33,71 @@ msgstr ""
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Adicionar Filme..."
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Conteúdo"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Sair"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Ficheiro"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Trabalhos"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Criar DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferências...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Sair"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP para TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Ferramentas"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Sobre"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Sobre o DCP-o-matic"
 
@@ -105,7 +105,16 @@ msgstr "Sobre o DCP-o-matic"
 msgid "Add Film..."
 msgstr "Adicionar Filme..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Adicionar Filme..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -114,7 +123,7 @@ msgstr ""
 "Ocorreu uma excepção: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -123,91 +132,96 @@ msgstr ""
 "Ocorreu uma excepção: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Ocorreu uma excepção desconhecida."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Má configuração de %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr ""
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "O conteúdo do CPL não é encriptado."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Procurar actualizações"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Não foi possível encontrar o conversor de lote"
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Não foi possível carregar o filme %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Não foi possível abrir o filme em %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Não foi possível mostrar o DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Não foi possível mostrar o DCP (não foi possível executar o konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Não foi possível mostrar o DCP (não foi possível executar o nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -220,54 +234,54 @@ msgstr "DCP-o-matic Conversor de Lote"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Conversor de Lote"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 #, fuzzy
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Don't duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Duplicate without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Servidores de codificação..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr ""
@@ -276,7 +290,7 @@ msgstr ""
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Filme modificado"
 
@@ -284,103 +298,107 @@ msgstr "Filme modificado"
 msgid "Frames per second"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Sugestões..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Gerar &KDM...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Gerar DCP no &Conversor de Lote\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Gerar DKDM para DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Novo...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Comunicar um problema..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Restaurar predefinições"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "M&ostrar DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Guardar as modificação ao filme \"%s\" antes de fechar?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Guardar as modificação ao filme \"%s\" antes de fechar?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Save film and duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Redimensionar para caber na &altura"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Redimensionar para caber na &largura"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 #, fuzzy
 msgid "Select DKDM file"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -393,7 +411,7 @@ msgstr ""
 "do espaço se o sistema de ficheiros suportasse enlaces físicos, mas não "
 "suporta. Pretende continuar?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -402,25 +420,25 @@ msgstr ""
 "O DCP para este filme ocupará cerca de %.1f Gb, e o disco utilizado apenas "
 "dispõe de %.1f Gb. Pretende continuar?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "O servidor de descarga do DCP-o-matic não pode ser contactado."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Não há novas versões do DCP-o-matic disponíveis."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Há trabalhos não finalizados; tem a certeza que pretende sair?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -429,15 +447,15 @@ msgstr ""
 "carregar correctamente nesta versão. Por favor verifique as definições do "
 "filme cuidadosamente."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Trabalhos não finalizados"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Forma de onda de vídeo..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -449,7 +467,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -459,7 +477,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index b69db0edf..2e92df8ed 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2017-05-14 22:05+0300\n"
 "Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
 "Language-Team: Russian\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM-ключ записан в %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDM-ключи записаны в %s"
@@ -29,71 +29,71 @@ msgstr "%d KDM-ключи записаны в %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Добавить проект...\tCtrl-A"
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Контент"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Редактировать"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Выход"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Файл"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Помощь"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Задачи"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Сделать DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Открыть...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Настройки...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Выход"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Сохранить\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Отправить DCP на TMS (Theatre Management System)"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Инструменты"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "О программе"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "О программе DCP-o-matic"
 
@@ -101,7 +101,16 @@ msgstr "О программе DCP-o-matic"
 msgid "Add Film..."
 msgstr "Добавить проект..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Добавить проект..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -110,7 +119,7 @@ msgstr ""
 "Произошла ошибка: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -119,17 +128,17 @@ msgstr ""
 "Произошла ошибка: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "В сервере кодирования DCP-o-matic произошла неизвестная ошибка."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Произошла неизвестная ошибка."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -137,58 +146,63 @@ msgstr ""
 "Вы точно хотите сбросить настройки по умолчанию? Эту операцию нельзя "
 "отменить."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Неправильные настройки для %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "Содержимое CPL-файла не зашифровано."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Проверить обновления"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Закрыть без сохранения проекта"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Не удалось найти пакетный конвертер."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Не удалось загрузить проект %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, c-format
 msgid "Could not make DCP: %s."
 msgstr "Не удалось сделать DCP: %s."
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Не удалось открыть проект на %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Не удалось открыть каталог DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Не удалось открыть каталог DCP (не удалось запустить konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Не удалось открыть каталог DCP (не удалось запустить nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
@@ -196,7 +210,7 @@ msgstr ""
 "Не удалось записать в файл базы кинотеатров - %s. Ваши изменения не были "
 "сохранены."
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
@@ -204,12 +218,12 @@ msgstr ""
 "Не удалось записать в файл кионфгигурации - %s. Ваши изменения не были "
 "сохранены."
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Создать KDM-ключи"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -221,59 +235,59 @@ msgstr "Пакетный конвертер DCP-o-matic"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Сервер Кодирования"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic Создатель KDM-ключей"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM (Distribution KDM)"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr "Вы хотите перезаписать существующий DCP %s?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Не закрывать"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Don't duplicate"
 msgstr "Не дублировать"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr "Дублировать проект"
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr "Дублировать и открыть"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Duplicate without saving film"
 msgstr "Дублировать без сохранения проекта"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr "Дублировать..."
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Сервера кодирования..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 msgid "Export...\tCtrl-E"
 msgstr "Экспортировать...\tCtrl-E"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "Файл %s уже существует. Вы хотите перезаписать его?"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Проект изменен"
 
@@ -281,102 +295,106 @@ msgstr "Проект изменен"
 msgid "Frames per second"
 msgstr "Кадров в секунду"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Подсказки..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "KDM|Тайминг"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Сгенерировать &KDM...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Сделать DCP в пакетном конвертере"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Сгенерировать DKDM для DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Управление шаблонами..."
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr "Новый проект"
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Новый...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Вывод"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Сообщить об ошибке..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Сбросить настройки по умолчанию"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "Открыть папку DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Сохранить как &шаблон..."
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Сохранить изменения \"%s\" перед закрытием?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Сохранить изменения в проекте \"%s\" перед его дублированием?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Сохранить проект и закрыть"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Save film and duplicate"
 msgstr "Сохранить проект и дублировать"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Масштабировать по высоте"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Масштабировать по ширине"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Экраны"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Выберите DKDM-файл"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Выберите проект"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Отправить KDM-ключи по email"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -389,7 +407,7 @@ msgstr ""
 "если бы файловая система поддерживала жесткие ссылки, но она этого не умеет. "
 "Продолжить в любом случае?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -398,11 +416,11 @@ msgstr ""
 "DCP-пакет проекта займёт порядка %.1f ГБ, но на целевом диске у вас доступно "
 "только %.1f ГБ. Продолжить в любом случае?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matic не удалось связаться с сервером загрузки."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -410,15 +428,15 @@ msgstr ""
 "Ошибка загрузки существующей конфигурации. Будут использованы значения по-"
 "умолчанию. Это может занять немного времени."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Нет новых версий DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Есть незавершенные задачи! Вы точно хотите выйти?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -427,15 +445,15 @@ msgstr ""
 "загрузиться в новой версии. Пожалуйста, внимательно проверьте настройки "
 "проекта."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Незавершенные задачи"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "График видео..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -454,7 +472,7 @@ msgstr ""
 "КОПИЮ ЭТОГО ФАЙЛА</span>, т.к. если он будет утерян, ваши DKDM (и DCP, "
 "которые ими защищены) станут бесполезными."
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -471,7 +489,7 @@ msgstr ""
 "\">РЕЗЕРВНЫЕ КОПИИ</span> этих файлов, если вы хотите сделать KDM для "
 "данного проекта."
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -479,6 +497,9 @@ msgstr ""
 "Вы не выбрали папку. Убедитесь, что вы выбрали папку перед тем как нажать "
 "\"Открыть\"."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr ""
 #~ "%1 уже существует как файл, так что вы не можете использовать его для "
diff --git a/src/tools/po/sk_SK.po b/src/tools/po/sk_SK.po
index f8829c140..bad5ab83d 100644
--- a/src/tools/po/sk_SK.po
+++ b/src/tools/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2016-01-06 00:23+0100\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: Poedit 1.8.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr ""
@@ -33,71 +33,71 @@ msgstr ""
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Pridať film..."
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Obsah"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Upraviť"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Koniec"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Súbor"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Práce"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Vytvoriť DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Otvoriť...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Nastavenia...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Ukončiť"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Uložiť\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Odoslať DCP do TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Nástroje"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "O"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "O DCP-o-matic"
 
@@ -105,7 +105,16 @@ msgstr "O DCP-o-matic"
 msgid "Add Film..."
 msgstr "Pridať film..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Pridať film..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -114,7 +123,7 @@ msgstr ""
 "Vyskytol sa problém: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -123,91 +132,96 @@ msgstr ""
 "Vyskytol sa problém: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Vyskytol sa neznámy problém"
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Zlé nastavenia pre %s (%s)."
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr ""
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "CPL obsah nie je enkryptovaný."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Skontrolovať aktualizácie"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Konvertor nebol nájdený."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Nemôžem načítať film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "Nemôžem vytvoriť DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Nemôžem otvoriť film na %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Nemôžem zobraziť DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Nemôžem zobraziť DCP (nemôžem spustiť konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Nemôžem zobraziť DCP (nemôžem spustiť nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -220,61 +234,61 @@ msgstr "DCP-o-matic konvertor"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic konvertor"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 #, fuzzy
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Don't duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Duplicate without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Enkódovacie servre..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Otvoriť...\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "Priečinok %s už existuje a nie je prázdny. Chcete pokračovať ?"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Film bol zmenený"
 
@@ -282,103 +296,107 @@ msgstr "Film bol zmenený"
 msgid "Frames per second"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Nápoveda\tCtrl-H"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Vytvoriť &KDM\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Vytvoriť DCP v &batch konvertéri\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Vytvoriť DKDM pre DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Nový...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Nahlásiť problém..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Obnoviť pôvodné nastavenia"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "Z&obraziť DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Uložiť zmeny pred ukončením do filmu \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Uložiť zmeny pred ukončením do filmu \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 msgid "Save film and duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Prispôsobiť na &výšku"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Prispôsobiť na &šírku"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 #, fuzzy
 msgid "Select DKDM file"
 msgstr "Vybrať film na otvorenie"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Vybrať film na otvorenie"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -391,7 +409,7 @@ msgstr ""
 "polovicu miesta, ak súborový systém podporuje pevné odkazy, ale nepodporuje. "
 "Chcete pokračovať ?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -400,25 +418,25 @@ msgstr ""
 "DCP pre tento film bude zaberať aspoň %.1f Gb a disk, ktorý momentálne "
 "používate má len %.1f Gb dostupých.  Chete pokračovať ?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matic download server je nedostupný."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Žiadne nové verzie DCP-o-matic nie sú dostupné."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Ešte sú nie sú dokončené úlohy; chcete skončiť ?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -426,15 +444,15 @@ msgstr ""
 "Tento film bol vytvorený staršou verziou DVD-o-matic a nemusí v tejto verzií "
 "fungovať správne. Prosím, skontrolujte nastavenia filmu."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Nedokončené úlohy"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Analýza videa..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -446,7 +464,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -456,7 +474,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index b3414870a..5febe8a90 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2016-10-25 17:57+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM:en skriven till %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDM:er skrivna till %s"
@@ -32,71 +32,71 @@ msgstr "%d KDM:er skrivna till %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Lägg till Film..."
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Innehåll"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Skapa DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Öppna...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Inställningar...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Spara\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Verktyg"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
@@ -104,7 +104,16 @@ msgstr "Om DCP-o-matic"
 msgid "Add Film..."
 msgstr "Lägg till Film..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Lägg till Film..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -113,7 +122,7 @@ msgstr ""
 "Ett undantag inträffade: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -122,17 +131,17 @@ msgstr ""
 "Ett undantag inträffade: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Ett okänt fel har inträffat i DCP-o-matic servern."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Ett okänt undantag inträffade."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -140,75 +149,80 @@ msgstr ""
 "Är du säker att du vill återställa inställningarna till sina "
 "ursprungsvärden? Detta kan inte ångras."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Felaktig inställning för %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "CPL-innehållet är inte krypterat."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Leta efter uppdateringar"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Stäng utan att spara film"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Kunde inte hitta batchkonverteraren."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "Kunde inte skapa DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Kunde inte visa DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kunde inte visa DCP (kunde inte köra konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kunde inte visa DCP (kunde inte köra nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Skapa KDM:er"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -220,55 +234,55 @@ msgstr "DCP-o-matic Batchkonverterare"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Encode Server"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KDM-skapare"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Stäng inte"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "Stäng inte"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Stäng utan att spara film"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Kodningsservrar..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Öppna...\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr ""
@@ -277,7 +291,7 @@ msgstr ""
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Film ändrad"
 
@@ -285,103 +299,107 @@ msgstr "Film ändrad"
 msgid "Frames per second"
 msgstr "Bilder per sekund"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Råd...\tCtrl-H"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "Tajming"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Skapa &KDM:er...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Skapa DCP i batch-konverteraren\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Skapa DKDM för DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Hantera mallar..."
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Ny...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Output"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Rapportera ett problem..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Återställ ursprungliga inställningar"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Spara som &mall..."
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Spara film och avsluta"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Spara film och avsluta"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Skala för att rymma &höjd"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Skala för att rymma &bredd"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Salonger"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Välj DKDM-fil"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Skicka KDM e-brev"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -394,7 +412,7 @@ msgstr ""
 "utrymmet om filsystemet hade stöd för hårda länkar, vilket det inte har. "
 "Vill du fortsätta ändå?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -403,11 +421,11 @@ msgstr ""
 "DCP:n för denna film kommer att uppta ungefär %.1f Gb, och disken du "
 "använder har bara %.1f Gb ledigt. Vill du fortsätta ändå?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matics nedladdningsserver kunde inte kontaktas."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -415,15 +433,15 @@ msgstr ""
 "Den existerande konfigurationen kunde inte laddas. Standardvärden används "
 "istället. Detta kan ta en kort stund att skapa."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Det finns inga nya versioner av DCP-o-matic tillgängligt."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Det finns oasvlutade jobb; är du säker på att du vill avsluta?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -431,15 +449,15 @@ msgstr ""
 "Denna film skapades i en gammal version av DVD-o-matic och läses kanske in "
 "felaktigt i denna version. Vänligen kolla alla inställningar noggrant."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Oavslutade jobb"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Video vågform..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -451,7 +469,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -461,7 +479,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -469,6 +487,9 @@ msgstr ""
 "Du har inte valt en folder. Se till att välja en folder innan du klickar på "
 "Öppna."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
 
diff --git a/src/tools/po/uk_UA.po b/src/tools/po/uk_UA.po
index 1fd507f24..7ad91f0ad 100644
--- a/src/tools/po/uk_UA.po
+++ b/src/tools/po/uk_UA.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2017-01-18 12:18+0200\n"
 "Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
 "Language-Team: Ukrainian\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM-ключ записаний в %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDM-ключі записані в %s"
@@ -30,71 +30,71 @@ msgstr "%d KDM-ключі записані в %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Додати проект..."
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&Контент"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&Редагувати"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&Вихід"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&Файл"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&Допомога"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&Задачі"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Зробити DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&Відкрити...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Налаштування...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&Вихід"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&Зберегти\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&Відправити DCP на TMS (Theatre Management System)"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&Інструменти"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "Про программу"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "Про программу DCP-o-matic"
 
@@ -102,7 +102,16 @@ msgstr "Про программу DCP-o-matic"
 msgid "Add Film..."
 msgstr "Додати проект..."
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "Додати проект..."
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -111,7 +120,7 @@ msgstr ""
 "Виникла помилка: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -120,17 +129,17 @@ msgstr ""
 "Виникла помилка: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "В сервері кодування DCP-o-matic виникла невідома помилка."
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "Виникла невідома помилка."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
@@ -138,75 +147,80 @@ msgstr ""
 "Ви точно хочете відновити налаштування за замовчанням? Цю операцію не можна "
 "відмінити."
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Неправильні налаштування для %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "Зміст CPL-файла не зашифровано."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "Перевірити оновлення"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "Закрити без збереження проекту"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "Не вдалося знайти пакетний конвертер."
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "Не вдалося завантажити проект %1 (%2)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, fuzzy, c-format
 msgid "Could not make DCP: %s."
 msgstr "Не вдалося зробити DCP: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Не вдалося відкрити проект на %s (%s)"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "Не вдалося відкрити каталог DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Не вдалося відкрити каталог DCP (не вдалося запустити konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Не вдалося відкрити каталог DCP (не вдалося запустити nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "Створити KDM-ключі"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -218,62 +232,62 @@ msgstr "Пакетний конвертер DCP-o-matic"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Сервер Кодування"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic Створювач Ключів"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM (Distribution KDM)"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "Не закривати"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "Не закривати"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "Закрити без збереження проекту"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "Сервери кодування..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&Відкрити...\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "Файл %s вже існує. Ви хочете перезаписати його?"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "Проект змінено"
 
@@ -281,103 +295,107 @@ msgstr "Проект змінено"
 msgid "Frames per second"
 msgstr "Кадрів в секунду"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "Підказки..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "KDM|Timing"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Сгенерувати &KDM...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Зробити DCP у пакетному конвертері"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Сгенерувати DKDM для DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "Управління шаблонами..."
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "Новий...\tCtrl-N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "Вивід"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "Повідомити про помилку..."
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "Скинути налаштування за замовчуванням"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "Відкрити папку DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "Зберегти як &шаблон..."
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Зберегти зміни \"%s\" перед закриттям?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Зберегти зміни \"%s\" перед закриттям?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "Зберегти проект та закрити"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "Зберегти проект та закрити"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "Масштабувати за высотою"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "Масштабувати за шириною"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "Екрани"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "Оберіть DKDM-файл"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "Оберіть проект"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "Відправити KDM-ключі по email"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -390,7 +408,7 @@ msgstr ""
 "ваша файлова система підтримувала жорсткі жесткие посилання, але вона цього "
 "не вміє. Продовжити у будь якому випадку?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -399,11 +417,11 @@ msgstr ""
 "DCP-пакет проекту займе приблизно %.1f ГБ, але на цільовому диску у вас "
 "доступно тільки %.1f ГБ. Продовжити у будь якому випадку?"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matic не вдалося зв'язатися із сервером завантаження."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -411,15 +429,15 @@ msgstr ""
 "Помилка завантаження існуючої конфігурації. Будут використані значення за "
 "замовчанням. Це може зайняти деякий час."
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Немає нових версій DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Є незавершені задачі! Вы точно хочете вийти?"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -428,15 +446,15 @@ msgstr ""
 "загрузитися у новій версії. Будь ласка, уважно перевірте налаштування "
 "проекта."
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "Незавершені задачі"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "Графік відео..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -448,7 +466,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -458,7 +476,7 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -466,6 +484,9 @@ msgstr ""
 "Ви не обрали папку. Переконайтесь, що ви обрали папку перед тим як нажати "
 "\"Відкрити\"."
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr ""
 #~ "%1 вже існує як файл, тому ви не можете використовувати його для нового "
diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index e05e81c1c..47a4719a3 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 12:18+0100\n"
+"POT-Creation-Date: 2017-05-25 09:56+0100\n"
 "PO-Revision-Date: 2017-02-24 06:33+0800\n"
 "Last-Translator: Hanyuan\n"
 "Language-Team: Hanyuan\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d 导出KDM 到 %s"
 
-#: src/tools/dcpomatic_kdm.cc:338
+#: src/tools/dcpomatic_kdm.cc:348
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d 导出KDMs 到 %s"
@@ -33,71 +33,71 @@ msgstr "%d 导出KDMs 到 %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&添加工程"
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1031
 msgid "&Content"
 msgstr "&内容"
 
-#: src/tools/dcpomatic.cc:1028 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:268
+#: src/tools/dcpomatic.cc:1029 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_kdm.cc:249
 msgid "&Edit"
 msgstr "&编辑"
 
-#: src/tools/dcpomatic.cc:981 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_batch.cc:64
+#: src/tools/dcpomatic_kdm.cc:227
 msgid "&Exit"
 msgstr "&退出"
 
-#: src/tools/dcpomatic.cc:1026 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:266
+#: src/tools/dcpomatic.cc:1027 src/tools/dcpomatic_batch.cc:82
+#: src/tools/dcpomatic_kdm.cc:247
 msgid "&File"
 msgstr "&文件"
 
-#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:270
+#: src/tools/dcpomatic.cc:1034 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_kdm.cc:251
 msgid "&Help"
 msgstr "&帮助"
 
-#: src/tools/dcpomatic.cc:1031
+#: src/tools/dcpomatic.cc:1032
 msgid "&Jobs"
 msgstr "&创建"
 
-#: src/tools/dcpomatic.cc:998
+#: src/tools/dcpomatic.cc:999
 msgid "&Make DCP\tCtrl-M"
 msgstr "&创建 DCP\tCtrl+M"
 
-#: src/tools/dcpomatic.cc:966
+#: src/tools/dcpomatic.cc:967
 msgid "&Open...\tCtrl-O"
 msgstr "&打开...\tCtrl+O"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic.cc:990
+#: src/tools/dcpomatic.cc:988 src/tools/dcpomatic.cc:991
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:252 src/tools/dcpomatic_kdm.cc:255
+#: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_kdm.cc:236
 msgid "&Preferences...\tCtrl-P"
 msgstr "&设置....\tCtrl+P"
 
-#: src/tools/dcpomatic.cc:983 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:248
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic_batch.cc:66
+#: src/tools/dcpomatic_kdm.cc:229
 msgid "&Quit"
 msgstr "&退出"
 
-#: src/tools/dcpomatic.cc:968
+#: src/tools/dcpomatic.cc:969
 msgid "&Save\tCtrl-S"
 msgstr "&保存\tCtrl+S"
 
-#: src/tools/dcpomatic.cc:1006
+#: src/tools/dcpomatic.cc:1007
 msgid "&Send DCP to TMS"
 msgstr "&发送 DCP到TMS"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_batch.cc:86
+#: src/tools/dcpomatic.cc:1033 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&工具"
 
-#: src/tools/dcpomatic.cc:1022 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:262
+#: src/tools/dcpomatic.cc:1023 src/tools/dcpomatic_batch.cc:80
+#: src/tools/dcpomatic_kdm.cc:243
 msgid "About"
 msgstr "关于"
 
-#: src/tools/dcpomatic.cc:1020 src/tools/dcpomatic_kdm.cc:260
+#: src/tools/dcpomatic.cc:1021 src/tools/dcpomatic_kdm.cc:241
 msgid "About DCP-o-matic"
 msgstr "关于 DCP-o-matic"
 
@@ -105,7 +105,16 @@ msgstr "关于 DCP-o-matic"
 msgid "Add Film..."
 msgstr "添加工程"
 
-#: src/tools/dcpomatic.cc:1303 src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:154
+#, fuzzy
+msgid "Add folder..."
+msgstr "添加工程"
+
+#: src/tools/dcpomatic_kdm.cc:152
+msgid "Add..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1304 src/tools/dcpomatic_kdm.cc:600
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -114,7 +123,7 @@ msgstr ""
 "出现未知错误: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_kdm.cc:457
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_kdm.cc:609
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -123,91 +132,96 @@ msgstr ""
 "出现未知错误: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:306
+#: src/tools/dcpomatic_server.cc:311
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "DCP-o-matic 服务出现未知错误！"
 
-#: src/tools/dcpomatic.cc:688 src/tools/dcpomatic.cc:1317
-#: src/tools/dcpomatic_kdm.cc:349 src/tools/dcpomatic_kdm.cc:462
-#: src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic.cc:689 src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_kdm.cc:359 src/tools/dcpomatic_kdm.cc:614
+#: src/tools/dcpomatic_kdm.cc:623
 msgid "An unknown exception occurred."
 msgstr "出现未知错误."
 
-#: src/tools/dcpomatic.cc:511
+#: src/tools/dcpomatic.cc:512
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
 msgstr "确定要恢复默认设置？ 该操作不能撤销！"
 
-#: src/tools/dcpomatic.cc:578
+#: src/tools/dcpomatic.cc:579
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "配置错误 %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:171
-msgid "CPL"
-msgstr "CPL"
-
-#: src/tools/dcpomatic.cc:684 src/tools/dcpomatic_kdm.cc:345
+#: src/tools/dcpomatic.cc:685 src/tools/dcpomatic_kdm.cc:355
 msgid "CPL's content is not encrypted."
 msgstr "该CPL未加密."
 
-#: src/tools/dcpomatic.cc:1014
+#: src/tools/dcpomatic.cc:1015
 msgid "Check for updates"
 msgstr "检查更新"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Close without saving film"
 msgstr "关闭但不保存！"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:648
 msgid "Could not find batch converter."
 msgstr "找不到批量转换服务器！"
 
-#: src/tools/dcpomatic.cc:1231 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic.cc:1232 src/tools/dcpomatic_batch.cc:333
 msgid "Could not load film %1 (%2)"
 msgstr "无法加载工程 %s (%s)"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:581
 #, c-format
 msgid "Could not make DCP: %s."
 msgstr "DCP创建失败: %s"
 
-#: src/tools/dcpomatic.cc:368 src/tools/dcpomatic_batch.cc:139
+#: src/tools/dcpomatic.cc:369 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "无法在 %s (%s)打开工程"
 
-#: src/tools/dcpomatic.cc:767
+#: src/tools/dcpomatic_kdm.cc:414
+#, c-format
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:768
 msgid "Could not show DCP"
 msgstr "无法显示DCP"
 
-#: src/tools/dcpomatic.cc:758
+#: src/tools/dcpomatic.cc:759
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "无法显示DCP (无法运行konqueror)"
 
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:752
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "无法显示DCP (无法运行nautilus)"
 
-#: src/tools/dcpomatic.cc:1046
+#: src/tools/dcpomatic.cc:1047
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1058
+#: src/tools/dcpomatic.cc:1059
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:184
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "Create KDMs"
 msgstr "创建KDMs"
 
-#: src/tools/dcpomatic.cc:392 src/tools/dcpomatic.cc:1183
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:393 src/tools/dcpomatic.cc:1184
+#: src/tools/dcpomatic.cc:1220
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -219,62 +233,62 @@ msgstr "DCP-o-matic 批量转换"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic 编码服务器"
 
-#: src/tools/dcpomatic_kdm.cc:387 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:539 src/tools/dcpomatic_kdm.cc:575
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KMD 创建。"
 
-#: src/tools/dcpomatic_kdm.cc:166
+#: src/tools/dcpomatic_kdm.cc:143
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic.cc:565
+#: src/tools/dcpomatic.cc:566
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Don't close"
 msgstr "取消"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Don't duplicate"
 msgstr "取消"
 
-#: src/tools/dcpomatic.cc:455 src/tools/dcpomatic.cc:470
+#: src/tools/dcpomatic.cc:456 src/tools/dcpomatic.cc:471
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:972
+#: src/tools/dcpomatic.cc:973
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Duplicate without saving film"
 msgstr "关闭但不保存！"
 
-#: src/tools/dcpomatic.cc:971
+#: src/tools/dcpomatic.cc:972
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1012 src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic.cc:1013 src/tools/dcpomatic_batch.cc:77
 msgid "Encoding servers..."
 msgstr "查看编码服务器..."
 
-#: src/tools/dcpomatic.cc:1004
+#: src/tools/dcpomatic.cc:1005
 #, fuzzy
 msgid "Export...\tCtrl-E"
 msgstr "&打开...\tCtrl+O"
 
-#: src/tools/dcpomatic_kdm.cc:277
+#: src/tools/dcpomatic_kdm.cc:258
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "已存在文件 %s ，是否覆盖？"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:119 src/tools/dcpomatic.cc:152
+#: src/tools/dcpomatic.cc:120 src/tools/dcpomatic.cc:153
 msgid "Film changed"
 msgstr "工程已被编辑"
 
@@ -282,103 +296,107 @@ msgstr "工程已被编辑"
 msgid "Frames per second"
 msgstr "帧率"
 
-#: src/tools/dcpomatic.cc:1011
+#: src/tools/dcpomatic.cc:1012
 msgid "Hints..."
 msgstr "提示..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:137
 msgid "KDM|Timing"
 msgstr "KDM有效期"
 
-#: src/tools/dcpomatic.cc:1001
+#: src/tools/dcpomatic.cc:1002
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "制作 KDM \tCtrl+K"
 
-#: src/tools/dcpomatic.cc:999
+#: src/tools/dcpomatic.cc:1000
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "批量制作DCP\tCtrl+B"
 
-#: src/tools/dcpomatic.cc:1002
+#: src/tools/dcpomatic.cc:1003
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "制作DCP-o-matic的KDM"
 
-#: src/tools/dcpomatic.cc:1013
+#: src/tools/dcpomatic.cc:1014
 msgid "Manage templates..."
 msgstr "管理模板"
 
-#: src/tools/dcpomatic.cc:402
+#: src/tools/dcpomatic.cc:403
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:965
+#: src/tools/dcpomatic.cc:966
 msgid "New...\tCtrl-N"
 msgstr "新建工程\tCtrl+N"
 
-#: src/tools/dcpomatic_kdm.cc:177
+#: src/tools/dcpomatic_kdm.cc:163
 msgid "Output"
 msgstr "输出"
 
-#: src/tools/dcpomatic.cc:1024 src/tools/dcpomatic_kdm.cc:264
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Remove"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:245
 msgid "Report a problem..."
 msgstr "报告问题"
 
-#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic.cc:1016
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic.cc:1017
 msgid "Restore default preferences"
 msgstr "恢复默认设置"
 
-#: src/tools/dcpomatic.cc:1007
+#: src/tools/dcpomatic.cc:1008
 msgid "S&how DCP"
 msgstr "&查看DCP"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:971
 msgid "Save as &template..."
 msgstr "保存为模板"
 
-#: src/tools/dcpomatic.cc:116
+#: src/tools/dcpomatic.cc:117
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "是否保存 \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:150
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "是否保存 \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:124
+#: src/tools/dcpomatic.cc:125
 msgid "Save film and close"
 msgstr "保存并关闭"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:158
 #, fuzzy
 msgid "Save film and duplicate"
 msgstr "保存并关闭"
 
-#: src/tools/dcpomatic.cc:995
+#: src/tools/dcpomatic.cc:996
 msgid "Scale to fit &height"
 msgstr "缩放到合适高度"
 
-#: src/tools/dcpomatic.cc:994
+#: src/tools/dcpomatic.cc:995
 msgid "Scale to fit &width"
 msgstr "缩放到合适宽度"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:130
 msgid "Screens"
 msgstr "厅放映服务器"
 
-#: src/tools/dcpomatic_kdm.cc:77
+#: src/tools/dcpomatic_kdm.cc:403
 msgid "Select DKDM file"
 msgstr "选择DKDM文件"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:216
+#: src/tools/dcpomatic.cc:417 src/tools/dcpomatic_batch.cc:216
 msgid "Select film to open"
 msgstr "选择打开工程文件"
 
-#: src/tools/dcpomatic_kdm.cc:332
+#: src/tools/dcpomatic_kdm.cc:342
 msgid "Send KDM emails"
 msgstr "发送KDM电子邮件"
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:536
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -389,7 +407,7 @@ msgstr ""
 "创造该DCP包时大约需要缓存空间 %.1f Gb, 您当前可用磁盘空间只有 %.1f Gb.您是否"
 "仍然继续?"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:534
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -397,39 +415,39 @@ msgid ""
 msgstr ""
 "该DCP在创建中将占用约 %.1f Gb, 您正在使用的磁盘只有 %.1f Gb可用。你要继续吗？"
 
-#: src/tools/dcpomatic.cc:1116
+#: src/tools/dcpomatic.cc:1117
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "连接DCP-o-matic下载服务器失败."
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1351
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
 msgstr "现有配置文件损坏，系统将会使用默认的配置文件，请稍候。"
 
-#: src/tools/dcpomatic.cc:1118
+#: src/tools/dcpomatic.cc:1119
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "DCP-O-MATIC没有新的版本。"
 
-#: src/tools/dcpomatic.cc:838 src/tools/dcpomatic_batch.cc:158
+#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:158
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "有未完成的操作，确定退出吗？"
 
-#: src/tools/dcpomatic.cc:354
+#: src/tools/dcpomatic.cc:355
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr "老版本中创建的工程无法在高于创建版本中被打开，具体请参考设置！"
 
-#: src/tools/dcpomatic.cc:839 src/tools/dcpomatic_batch.cc:159
+#: src/tools/dcpomatic.cc:840 src/tools/dcpomatic_batch.cc:159
 msgid "Unfinished jobs"
 msgstr "未完成的进程"
 
-#: src/tools/dcpomatic.cc:1010
+#: src/tools/dcpomatic.cc:1011
 msgid "Video waveform..."
 msgstr "视频示波器..."
 
-#: src/tools/dcpomatic.cc:666
+#: src/tools/dcpomatic.cc:667
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -441,7 +459,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:555
+#: src/tools/dcpomatic.cc:556
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -451,12 +469,15 @@ msgid ""
 "\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:225
+#: src/tools/dcpomatic.cc:426 src/tools/dcpomatic_batch.cc:225
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr "您没有选择文件夹。请确保您单击打开之前，选择一个文件夹。"
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
 #~ msgid "%1 already exists as a file, so you cannot use it for a new film."
 #~ msgstr "%1文件已存在！"
author	Carl Hetherington <cth@carlh.net>	2017-05-25 09:56:03 +0100
committer	Carl Hetherington <cth@carlh.net>	2017-05-25 09:56:03 +0100
commit	4aeccc93d513ffb86ec98f1fe6cb9d040ab66c7c (patch)
tree	6f70836b67638b41de1f7e9528669b8e55386f57 /src/tools
parent	96ed8c7717aec04c047d75c571f1a37c5d270fc8 (diff)