Merge master.

26 files changed, 2844 insertions, 2044 deletions

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 04f4a350e..f853d2ce2 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,34 +7,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
-"PO-Revision-Date: 2014-01-14 19:45+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-21 03:55+0100\n"
+"Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/sndfile_content.cc:62
+#: src/lib/sndfile_content.cc:61
 msgid "%1 [audio]"
 msgstr "%1 [Ton]"
 
-#: src/lib/ffmpeg_content.cc:207
+#: src/lib/ffmpeg_content.cc:211
 msgid "%1 [movie]"
 msgstr "%1 [Film]"
 
-#: src/lib/sndfile_content.cc:83
+#: src/lib/sndfile_content.cc:82
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 Kanäle, %2kHz, %3 samples"
 
-#: src/lib/ffmpeg_content.cc:242
+#: src/lib/ffmpeg_content.cc:246
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 Bilder; %2 Bilder pro Sekunde"
 
-#: src/lib/video_content.cc:205
+#: src/lib/video_content.cc:206
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixel (%3:1)"
 
@@ -72,7 +72,7 @@ msgstr "Werbung"
 
 #: src/lib/job.cc:71
 msgid "An error occurred whilst handling the file %1."
-msgstr "Beim bearbeiten der Datei %1 trat ein Fehler auf."
+msgstr "Beim Bearbeiten der Datei %1 trat ein Fehler auf."
 
 #: src/lib/analyse_audio_job.cc:48
 msgid "Analyse audio"
@@ -88,7 +88,7 @@ msgstr "Bi-Kubisch"
 
 #: src/lib/scaler.cc:69
 msgid "Bilinear"
-msgstr "Bi-Liniar"
+msgstr "Bi-Linear"
 
 #: src/lib/job.cc:322
 msgid "Cancelled"
@@ -96,131 +96,132 @@ msgstr "Abgebrochen"
 
 #: src/lib/exceptions.cc:60
 msgid "Cannot handle pixel format %1 during %2"
-msgstr "Cannot handle pixel format %1 during %2"
+msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:751
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:77
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Überprüfe bestehende Bilddateien"
 
-#: src/lib/writer.cc:460
+#: src/lib/writer.cc:464
 msgid "Computing audio digest"
-msgstr "Ton berechnen"
+msgstr "Tonübersicht berechnen"
 
-#: src/lib/image_content.cc:104
+#: src/lib/image_content.cc:105
 msgid "Computing digest"
-msgstr "Teil berechnen"
+msgstr "Zusammenfassung berechnen"
 
-#: src/lib/writer.cc:456
+#: src/lib/writer.cc:460
 msgid "Computing image digest"
-msgstr "Bild berechnen"
+msgstr "Bildübersicht berechnen"
 
-#: src/lib/util.cc:838
+#: src/lib/frame_rate_change.cc:78
 msgid "Content and DCP have the same rate.\n"
-msgstr "Inhalt und DCP haben die selbe Rate.\n"
+msgstr "Quelle und DCP haben dieselbe Bildrate. Gut ;-)\n"
 
-#: src/lib/audio_content.cc:82
+#: src/lib/audio_content.cc:83
 msgid "Content to be joined must have the same audio delay."
-msgstr "Zusammengesetzter Inhalt muss die gleiche Tonverzögerung haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Tonverzögerung verwenden."
 
-#: src/lib/audio_content.cc:78
+#: src/lib/audio_content.cc:79
 msgid "Content to be joined must have the same audio gain."
-msgstr "Zusammengesetzter Inhalt muss den gleichen Tonpegel haben."
+msgstr ""
+"Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden."
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:144
 msgid "Content to be joined must have the same colour conversion."
-msgstr "Zusammengesetzter Inhalt muss die gleiche Farbumwandlung haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Farbumwandlung verwenden."
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:136
 msgid "Content to be joined must have the same crop."
-msgstr "Zusammengesetzter Inhalt muss das gleiche Beschneiden haben."
+msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
 
-#: src/lib/video_content.cc:120
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same picture size."
-msgstr "Zusammengesetzter Inhalt muss die gleiche Bildgröße haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
 
-#: src/lib/video_content.cc:136
-#, fuzzy
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same scale setting."
-msgstr "Zusammengesetzter Inhalt muss das geliche Verhältnis haben"
+msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
 
-#: src/lib/subtitle_content.cc:74
-#, fuzzy
+#: src/lib/subtitle_content.cc:73
 msgid "Content to be joined must have the same subtitle X offset."
-msgstr "Zusammengesetzter Inhalt muss den gleichen Untertitelversatz haben."
+msgstr ""
+"Zu verbindende Inhalte müssen den gleichen horizontalen Untertitelversatz "
+"verwenden."
 
-#: src/lib/subtitle_content.cc:78
-#, fuzzy
+#: src/lib/subtitle_content.cc:77
 msgid "Content to be joined must have the same subtitle Y offset."
-msgstr "Zusammengesetzter Inhalt muss den gleichen Untertitelversatz haben."
+msgstr ""
+"Zu verbindende Inhalte müssen den gleichen vertikalen Untertitelversatz "
+"verwenden."
 
-#: src/lib/subtitle_content.cc:82
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle scale."
-msgstr "Zusammengesetzter Inhalt muss die gleiche Untertitelgröße haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
 
-#: src/lib/video_content.cc:124
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame rate."
-msgstr "Zusammengesetzter Inhalt muss die gleiche Bildrate haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same video frame type."
-msgstr "Zusammengesetzter Inhalt muss die gleiche Bildart (z.B. 2D) haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Bildart (z.B. 2D) haben."
 
-#: src/lib/ffmpeg_content.cc:112
+#: src/lib/ffmpeg_content.cc:116
 msgid "Content to be joined must use the same audio stream."
-msgstr "Zusammengesetzter Inhalt muss die gleiche Tonspur haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Tonspurart verwenden."
 
-#: src/lib/ffmpeg_content.cc:108
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same subtitle stream."
-msgstr "Zusammengesetzter Inhalt muss die gleiche Untertitelspur haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelspur verwenden."
 
-#: src/lib/scp_dcp_job.cc:110
+#: src/lib/scp_dcp_job.cc:112
 msgid "Copy DCP to TMS"
 msgstr "DCP zu TMS übertragen"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/scp_dcp_job.cc:137
 msgid "Could not connect to server %1 (%2)"
 msgstr "Keine Verbindung zu Server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:157
+#: src/lib/scp_dcp_job.cc:159
 msgid "Could not create remote directory %1 (%2)"
-msgstr "Konnte nicht Remote Ordner %1 (%2) erstellen."
+msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
+
+#: src/lib/image_proxy.cc:128
+msgid "Could not decode image file"
+msgstr "Bilddatei konnte nicht dekodiert werden"
 
 #: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "%1 konnte nicht geöffnet werden."
 
-#: src/lib/scp_dcp_job.cc:182
+#: src/lib/scp_dcp_job.cc:184
 msgid "Could not open %1 to send"
-msgstr "%1 konnte nicht zum senden geöffnet werden"
+msgstr "%1 konnte nicht zum Senden geöffnet werden"
 
 #: src/lib/internet.cc:72
-#, fuzzy
 msgid "Could not open downloaded ZIP file"
-msgstr "Datei %1 kann nicht geöffnet werden."
-
-#: src/lib/film.cc:990
-msgid "Could not read DCP to make KDM for"
-msgstr "DCP konnte nicht zur Schlüsselerstellung geöffnet werden"
+msgstr "Heruntergeladene ZIP Datei kann nicht geöffnet werden."
 
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:154
 msgid "Could not start SCP session (%1)"
 msgstr "SCP Session (%1) konnte nicht gestartet werden"
 
-#: src/lib/scp_dcp_job.cc:196
+#: src/lib/scp_dcp_job.cc:198
 msgid "Could not write to remote file (%1)"
-msgstr "Remote Datei (%1) kann nicht gespeichert werden"
+msgstr "Entfernte Datei (%1) konnte nicht gespeichert werden"
 
-#: src/lib/util.cc:850
+#: src/lib/frame_rate_change.cc:90
 msgid "DCP will run at %1%% of the content speed.\n"
-msgstr "DCP läuft mit %1% der Orginal Geschwindigkeit.\n"
+msgstr "DCP läuft mit %1% der Original Geschwindigkeit der Quelle.\n"
 
-#: src/lib/util.cc:841
+#: src/lib/frame_rate_change.cc:81
 msgid "DCP will use every other frame of the content.\n"
-msgstr "DCP benutzt jedes ungerade Bild des Inhalts.\n"
+msgstr "DCP verwendet nur jedes zweite Bild des Quelle.\n"
 
 #: src/lib/job.cc:91
 msgid ""
@@ -230,16 +231,17 @@ msgstr ""
 "DCP-o-matic konnte die Datei %1 nicht öffnen. Vielleicht existiert sie nicht "
 "oder ist in einem unerwarteten Format."
 
-#: src/lib/ffmpeg_content.cc:89
+#: src/lib/ffmpeg_content.cc:93
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
+"DCP-o-matic unterstützt den `%1' filter nicht mehr, er wird deaktiviert."
 
 #: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
-#: src/lib/config.cc:69
+#: src/lib/config.cc:71
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -252,7 +254,7 @@ msgid ""
 msgstr ""
 "Sehr geehrter Vorführer,\n"
 "\n"
-"Anbei finden Sie den KDM für den Film $CPL_NAME.\n"
+"Anbei finden Sie die KDM für den Film $CPL_NAME.\n"
 "\n"
 "Der Schlüssel ist vom $START_TIME bis zum $END_TIME gültig.\n"
 "\n"
@@ -265,23 +267,23 @@ msgstr "Dolby CP650 und CP750"
 
 #: src/lib/internet.cc:65
 msgid "Download failed (%1/%2 error %3)"
-msgstr ""
+msgstr "Herunterladen fehlgeschlagen (%1/%2 Fehler %3)"
 
-#: src/lib/util.cc:843
+#: src/lib/frame_rate_change.cc:83
 msgid "Each content frame will be doubled in the DCP.\n"
-msgstr "Jedes Bild des Inhalts wird im DCP verdoppelt.\n"
+msgstr "Jedes Bild der Quelle wird im DCP verdoppelt.\n"
 
-#: src/lib/util.cc:845
+#: src/lib/frame_rate_change.cc:85
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
-msgstr "Jedes Bild des Inhalts wird %1 mal im DCP wiederholt.\n"
+msgstr "Jedes Bild der Quelle wird %1 mal im DCP wiederholt.\n"
 
 #: src/lib/send_kdm_email_job.cc:50
 msgid "Email KDMs for %1"
 msgstr "Email KDMs für %1"
 
-#: src/lib/writer.cc:120
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
-msgstr "Bilddaten bearbeiten"
+msgstr "Kodiere Bilddaten"
 
 #: src/lib/job.cc:320
 msgid "Error (%1)"
@@ -291,7 +293,7 @@ msgstr "Fehler (%1)"
 msgid "Examine content"
 msgstr "Inhalt wird überprüft"
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:147
 msgid "Failed to authenticate with server (%1)"
 msgstr "Authentifizierung mit Server (%1) fehlgeschlagen"
 
@@ -301,7 +303,7 @@ msgstr "Schneller Bilinearer Filter"
 
 #: src/lib/dcp_content_type.cc:44
 msgid "Feature"
-msgstr "Feature"
+msgstr "Hauptfilm"
 
 #: src/lib/ratio.cc:41
 msgid "Flat"
@@ -317,24 +319,23 @@ msgstr "Gauss Filter"
 
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
-msgstr "Gradient Debander"
+msgstr "Gradient Glätter"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:755
 msgid "Hearing impaired"
-msgstr ""
+msgstr "HI"
 
 #: src/lib/filter.cc:71
 msgid "High quality 3D denoiser"
-msgstr "3D Rauschunterdrückung Hoher Qualität"
+msgstr "3D Rauschunterdrückung hoher Qualität"
 
 #: src/lib/job.cc:111 src/lib/job.cc:121
-#, fuzzy
 msgid ""
 "It is not known what caused this error.  Please report the problem to the "
 "DCP-o-matic author (carl@dcpomatic.com)."
 msgstr ""
-"Dieser Fehler ist nicht bekannt. Am besten den Fehler an die DCP-o-matic "
-"Mailliste (carl@dcpomatic.com) schicken."
+"Ein unbekannter Fehler ist aufgetreten. Bitte schicken Sie eine Nachricht an "
+"den DCP-o-matic Autor (carl@dcpomatic.com)."
 
 #: src/lib/filter.cc:66
 msgid "Kernel deinterlacer"
@@ -344,24 +345,23 @@ msgstr "Kernel De-Interlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:800
+#: src/lib/util.cc:749
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:808
+#: src/lib/util.cc:757
 msgid "Left centre"
-msgstr ""
+msgstr "Center links"
 
-#: src/lib/util.cc:810
-#, fuzzy
+#: src/lib/util.cc:759
 msgid "Left rear surround"
-msgstr "Links Surround"
+msgstr "Surround hinten links"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:753
 msgid "Left surround"
-msgstr "Links Surround"
+msgstr "Surround links"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:752
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
@@ -371,19 +371,19 @@ msgstr "Verschiedenes"
 
 #: src/lib/filter.cc:65
 msgid "Motion compensating deinterlacer"
-msgstr "Kompensierender Bewegungsde-interlacer"
+msgstr "Bewegungskompensierender De-Interlacer"
 
-#: src/lib/video_content.cc:449
+#: src/lib/video_content.cc:476
 msgid "No scale"
-msgstr ""
+msgstr "Unskaliert"
 
-#: src/lib/video_content.cc:446
+#: src/lib/video_content.cc:473
 msgid "No stretch"
-msgstr ""
+msgstr "Nicht verzerrt"
 
-#: src/lib/image_content.cc:49
+#: src/lib/image_content.cc:50
 msgid "No valid image files were found in the folder."
-msgstr ""
+msgstr "Keine gültigen Bilddaten gefunden."
 
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
@@ -393,56 +393,59 @@ msgstr "Rauschunterdrückung"
 msgid "OK (ran for %1)"
 msgstr "OK (Dauer %1)"
 
-#: src/lib/content.cc:100
+#: src/lib/content.cc:102
 msgid "Only the first piece of content to be joined can have a start trim."
-msgstr "Nur der erste Teil des Inhalts kann einen Anfangsschnitt haben."
+msgstr ""
+"Nur das erste Segment der zu verbindenden Inhalte kann vom Anfang her "
+"beschnitten werden."
 
-#: src/lib/content.cc:104
+#: src/lib/content.cc:106
 msgid "Only the last piece of content to be joined can have an end trim."
-msgstr "Nur das letzte Teil des Inhalts kann einen Endschnitt haben."
+msgstr ""
+"Nur das letzte Segment der zu verbindenden Inhalte kann vom Ende her "
+"beschnitten werden."
 
 #: src/lib/job.cc:103
 msgid "Out of memory"
-msgstr ""
+msgstr "Zuwenig Speicher"
 
 #: src/lib/filter.cc:73
 msgid "Overcomplete wavelet denoiser"
-msgstr "Overcomplete wavelet denoiser"
+msgstr "Überbestimmte Wavelet Entrauschung"
 
 #: src/lib/dcp_content_type.cc:51
 msgid "Policy"
-msgstr "Policy"
+msgstr "Vorschrift"
 
 #: src/lib/dcp_content_type.cc:52
 msgid "Public Service Announcement"
-msgstr "Werbung"
+msgstr "Hinweis"
 
 #: src/lib/dcp_content_type.cc:49
 msgid "Rating"
-msgstr "Rating"
+msgstr "Freigabehinweis"
 
-#: src/lib/config.cc:84 src/lib/config.cc:168
+#: src/lib/config.cc:87 src/lib/config.cc:174
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:750
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:809
+#: src/lib/util.cc:758
 msgid "Right centre"
-msgstr ""
+msgstr "Center rechts"
 
-#: src/lib/util.cc:811
-#, fuzzy
+#: src/lib/util.cc:760
 msgid "Right rear surround"
-msgstr "Rechts Surround"
+msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:754
 msgid "Right surround"
-msgstr "Rechts Surround"
+msgstr "Surround rechts"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:142
 msgid "SSH error (%1)"
 msgstr "SSH Fehler (%1)"
 
@@ -479,24 +482,23 @@ msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
 msgstr ""
-"Das Laufwer auf dem der Film gespeichert werden soll hat zu wenig Freien "
-"Speicher. Bitte Speicher freigeben und nochmals versuchen."
+"Das Laufwerk, auf dem der Film gespeichert werden soll, hat zu wenig freien "
+"Speicher. Bitte Speicher freigeben und nochmal versuchen."
 
 #: src/lib/job.cc:103
 msgid "There was not enough memory to do this."
-msgstr ""
+msgstr "Zu wenig Speicher für diese Operation."
 
-#: src/lib/film.cc:406
-#, fuzzy
+#: src/lib/film.cc:412
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
 msgstr ""
-"Dieser Film wurde mit einer alten DCP-o-matic Version erstellt und kann "
-"leider nicht in dieser Version geladen werden. Sie müssen den Film neu "
-"erstellen. Entschuldigung !"
+"Dieser Film wurde bereits mit einer neueren DCP-o-matic Version erstellt und "
+"kann leider nicht mit dieser älteren Version geladen werden. Sie müssen den "
+"Film neu erstellen. Sorry!"
 
-#: src/lib/film.cc:398
+#: src/lib/film.cc:404
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -504,45 +506,49 @@ msgid ""
 msgstr ""
 "Dieser Film wurde mit einer alten DCP-o-matic Version erstellt und kann "
 "leider nicht in dieser Version geladen werden. Sie müssen den Film neu "
-"erstellen. Entschuldigung !"
+"erstellen. Sorry!"
 
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:50
+#: src/lib/transcode_job.cc:53
 msgid "Transcode %1"
-msgstr "Wandle %1 um."
+msgstr "Wandle %1 um"
 
 #: src/lib/dcp_content_type.cc:48
 msgid "Transitional"
-msgstr "Übergang"
+msgstr "Überleitung"
 
 #: src/lib/internet.cc:77
 msgid "Unexpected ZIP file contents"
-msgstr ""
+msgstr "Ungültiger ZIP Inhalt"
+
+#: src/lib/image_proxy.cc:172
+msgid "Unexpected image type received by server"
+msgstr "Ungültiges Bildformat vom Server erhalten"
 
 #: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/lib/ffmpeg_decoder.cc:291
+#: src/lib/ffmpeg_decoder.cc:295
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Ton Sample Format (%1) nicht erkannt."
 
 #: src/lib/filter.cc:69
 msgid "Unsharp mask and Gaussian blur"
-msgstr "Maske mit Gausscher Unschärfe"
+msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
 
-#: src/lib/colour_conversion.cc:145
+#: src/lib/colour_conversion.cc:140
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/lib/util.cc:807
+#: src/lib/util.cc:756
 msgid "Visually impaired"
-msgstr ""
+msgstr "VI"
 
-#: src/lib/scp_dcp_job.cc:102
+#: src/lib/scp_dcp_job.cc:104
 msgid "Waiting"
 msgstr "Warte..."
 
@@ -552,121 +558,121 @@ msgstr "X"
 
 #: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
-msgstr "Noch ein anderer De-Interlacer"
+msgstr "Und ein weiterer De-Interlacer..."
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:309
 msgid "You must add some content to the DCP before creating it"
-msgstr "Sie müssen einen Inhalt hinzufügen bevor Sie ein DCP erstellen können."
+msgstr "Sie müssen erst Inhalte hinzufügen bevor Sie ein DCP erstellen können!"
 
-#: src/lib/image_content.cc:72
+#: src/lib/image_content.cc:73
 msgid "[moving images]"
 msgstr "[Bewegte Bilder]"
 
-#: src/lib/image_content.cc:70
+#: src/lib/image_content.cc:71
 msgid "[still]"
 msgstr "[Standbild]"
 
-#: src/lib/film.cc:247
+#: src/lib/film.cc:257
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
-#: src/lib/util.cc:581
+#: src/lib/util.cc:530
 msgid "connect timed out"
 msgstr "Zeit zur Verbindung abgelaufen"
 
-#: src/lib/scp_dcp_job.cc:126
+#: src/lib/scp_dcp_job.cc:128
 msgid "connecting"
 msgstr "verbinde..."
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:305
 msgid "container"
-msgstr "Container"
+msgstr "Containerformat"
 
-#: src/lib/film.cc:303
+#: src/lib/film.cc:313
 msgid "content type"
-msgstr "Inhalt Typ"
+msgstr "Inhaltsbeschreibung"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:177
 msgid "copying %1"
 msgstr "kopiere %1"
 
 #: src/lib/exceptions.cc:36
 msgid "could not create file %1"
-msgstr "Datei %1 kann nicht erstellt werden."
+msgstr "Datei %1 konnte nicht erstellt werden."
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:177
 msgid "could not find audio decoder"
-msgstr "Kein Ton Decoder gefunden."
+msgstr "Ton Dekoder nicht gefunden."
 
-#: src/lib/ffmpeg.cc:105
+#: src/lib/ffmpeg.cc:106
 msgid "could not find stream information"
 msgstr "Keine Spur-Information gefunden"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:156
 msgid "could not find video decoder"
-msgstr "Bild-Decoder nicht gefunden"
+msgstr "Bild-Dekoder nicht gefunden"
 
-#: src/lib/writer.cc:424
+#: src/lib/writer.cc:428
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
 
 #: src/lib/sndfile_decoder.cc:56
 msgid "could not open audio file for reading"
-msgstr "Tondatei kann nicht zum lesen geöffnet werden."
+msgstr "Tondatei kann nicht zum Lesen geöffnet werden."
 
 #: src/lib/exceptions.cc:29
 msgid "could not open file %1"
-msgstr "Datei %1 kann nicht geöffnet werden."
+msgstr "Datei %1 konnte nicht geöffnet werden."
 
-#: src/lib/dcp_video_frame.cc:352
+#: src/lib/dcp_video_frame.cc:334
 msgid "could not open file for reading"
-msgstr "Datei konnte nicht zum lesen geöffnet werden."
+msgstr "Datei konnte nicht zum Lesen geöffnet werden."
 
-#: src/lib/dcp_video_frame.cc:358
+#: src/lib/dcp_video_frame.cc:340
 msgid "could not read encoded data"
-msgstr "Encodier Daten nicht gefunden."
+msgstr "Kodierte Daten nicht gefunden."
 
 #: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
-msgstr "Datei %1 kann nicht gelesen werden (%2)"
+msgstr "Datei %1 konnte nicht gelesen werden (%2)"
 
-#: src/lib/resampler.cc:102
+#: src/lib/resampler.cc:98
 msgid "could not run sample-rate converter"
-msgstr "Sample-Rate kann nicht gewandelt werden"
+msgstr "Sample-Rate konnte nicht gewandelt werden"
 
-#: src/lib/resampler.cc:83
+#: src/lib/resampler.cc:79
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
-msgstr "Sample Rate für %1 samples kann nicht gewandelt werden (%2)(%3)"
+msgstr "Sample-Rate für %1 samples konnte nicht gewandelt werden (%2)(%3)"
 
-#: src/lib/scp_dcp_job.cc:87
+#: src/lib/scp_dcp_job.cc:89
 msgid "could not start SCP session (%1)"
-msgstr "SCP Session kann nicht gestartet werden (%1)"
+msgstr "SCP Session konnte nicht gestartet werden (%1)"
 
-#: src/lib/scp_dcp_job.cc:53
+#: src/lib/scp_dcp_job.cc:55
 msgid "could not start SSH session"
-msgstr "SSH Session kann nicht gestartet werden"
+msgstr "SSH Session konnte nicht gestartet werden"
 
 #: src/lib/exceptions.cc:48
 msgid "could not write to file %1 (%2)"
-msgstr "Datei %1 kann nicht geschrieben werden (%2)"
+msgstr "Datei %1 konnte nicht geschrieben werden (%2)"
 
-#: src/lib/util.cc:601
+#: src/lib/util.cc:550
 msgid "error during async_accept (%1)"
 msgstr "error during async_accept (%1)"
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:526
 msgid "error during async_connect (%1)"
 msgstr "error during async_connect (%1)"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:599
 msgid "error during async_read (%1)"
 msgstr "error during async_read (%1)"
 
-#: src/lib/util.cc:622
+#: src/lib/util.cc:571
 msgid "error during async_write (%1)"
 msgstr "error during async_write (%1)"
 
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:103
 msgid "frames per second"
 msgstr "Bilder pro Sekunde"
 
@@ -686,7 +692,7 @@ msgstr "Minute"
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/lib/util.cc:722
+#: src/lib/util.cc:671
 msgid "missing key %1 in key-value set"
 msgstr "Key %1 in Key-value set fehlt"
 
@@ -694,19 +700,19 @@ msgstr "Key %1 in Key-value set fehlt"
 msgid "missing required setting %1"
 msgstr "Benötigte Einstellung %1 fehlt"
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:88
 msgid "moving"
 msgstr "wird verschoben"
 
-#: src/lib/ffmpeg_decoder.cc:575
+#: src/lib/ffmpeg_decoder.cc:591
 msgid "multi-part subtitles not yet supported"
-msgstr "Multi-Part Untertitel noch nicht unterstützt"
+msgstr "Mehr-Segment Untertitel werden noch nicht unterstützt"
 
-#: src/lib/film.cc:247 src/lib/film.cc:307
+#: src/lib/film.cc:257 src/lib/film.cc:317
 msgid "name"
 msgstr "Name"
 
-#: src/lib/ffmpeg_decoder.cc:590
+#: src/lib/ffmpeg_decoder.cc:606
 msgid "non-bitmap subtitles not yet supported"
 msgstr "Nur Bitmap Untertitel werden unterstützt"
 
@@ -716,11 +722,11 @@ msgstr "Nur Bitmap Untertitel werden unterstützt"
 msgid "remaining"
 msgstr "verbleibend"
 
-#: src/lib/config.cc:82 src/lib/video_content.cc:174
+#: src/lib/config.cc:85 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:83
+#: src/lib/config.cc:86
 msgid "sRGB non-linearised"
 msgstr "sRGB nicht linearisiert"
 
@@ -728,7 +734,7 @@ msgstr "sRGB nicht linearisiert"
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:86
 msgid "still"
 msgstr "Standbild"
 
@@ -736,6 +742,9 @@ msgstr "Standbild"
 msgid "unknown"
 msgstr "unbekannt"
 
+#~ msgid "Could not read DCP to make KDM for"
+#~ msgstr "DCP konnte nicht zur Schlüsselerstellung geöffnet werden"
+
 #~ msgid "Cubic interpolating deinterlacer"
 #~ msgstr "Kubisch interpolierender Deinterlacer"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 73b17d6af..6f93bba55 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-04-20 10:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.4\n"
 
-#: src/lib/sndfile_content.cc:62
+#: src/lib/sndfile_content.cc:61
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:207
+#: src/lib/ffmpeg_content.cc:211
 msgid "%1 [movie]"
 msgstr "%1 [película]"
 
-#: src/lib/sndfile_content.cc:83
+#: src/lib/sndfile_content.cc:82
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 canales, %2kHz, %3 muestras"
 
-#: src/lib/ffmpeg_content.cc:242
+#: src/lib/ffmpeg_content.cc:246
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 imágenes; %2 imágenes per second"
 
-#: src/lib/video_content.cc:205
+#: src/lib/video_content.cc:206
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -97,101 +97,106 @@ msgstr "Cancelado"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "No se puede usar el formato de pixel %1 para %2"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:751
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:77
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Comprobando las imágenes existentes"
 
-#: src/lib/writer.cc:460
+#: src/lib/writer.cc:464
 msgid "Computing audio digest"
 msgstr "Calculando la firma resumen del audio"
 
-#: src/lib/image_content.cc:104
+#: src/lib/image_content.cc:105
 msgid "Computing digest"
 msgstr "Calculando la firma resumen"
 
-#: src/lib/writer.cc:456
+#: src/lib/writer.cc:460
 msgid "Computing image digest"
 msgstr "Calculando la firma resumen de imagen"
 
-#: src/lib/util.cc:838
+#: src/lib/frame_rate_change.cc:78
 msgid "Content and DCP have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/audio_content.cc:82
+#: src/lib/audio_content.cc:83
 msgid "Content to be joined must have the same audio delay."
 msgstr "Para unir contenido debe tener el mismo retardo de audio."
 
-#: src/lib/audio_content.cc:78
+#: src/lib/audio_content.cc:79
 msgid "Content to be joined must have the same audio gain."
 msgstr "Para unir contenido debe tener la misma ganancia de audio."
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:144
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Para unir contenido debe tener la misma conversión de color."
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:136
 msgid "Content to be joined must have the same crop."
 msgstr "Para unir contenido debe tener el mismo recorte."
 
-#: src/lib/video_content.cc:120
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same picture size."
 msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
-#: src/lib/video_content.cc:136
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same scale setting."
 msgstr "Para unir contenido debe tener la misma redimensión."
 
-#: src/lib/subtitle_content.cc:74
+#: src/lib/subtitle_content.cc:73
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Para unir contenido debe tener el mismo desplazamiento de subtítulo en X."
 
-#: src/lib/subtitle_content.cc:78
+#: src/lib/subtitle_content.cc:77
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Para unir contenido debe tener el mismo desplazamiento de subtítulo en Y."
 
-#: src/lib/subtitle_content.cc:82
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Para unir contenido debe tener el mismo tamaño de subtítulo."
 
-#: src/lib/video_content.cc:124
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Para unir contenido debe tener la misma velocidad de imagen."
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same video frame type."
 msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
-#: src/lib/ffmpeg_content.cc:112
+#: src/lib/ffmpeg_content.cc:116
 msgid "Content to be joined must use the same audio stream."
 msgstr "Para unir contenido debe usar el mismo tipo de audio."
 
-#: src/lib/ffmpeg_content.cc:108
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
 
-#: src/lib/scp_dcp_job.cc:110
+#: src/lib/scp_dcp_job.cc:112
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/scp_dcp_job.cc:137
 msgid "Could not connect to server %1 (%2)"
 msgstr "No se pudo conectar al servidor %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:157
+#: src/lib/scp_dcp_job.cc:159
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
+#: src/lib/image_proxy.cc:128
+#, fuzzy
+msgid "Could not decode image file"
+msgstr "No se pudo crear el fichero (%1)"
+
 #: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "No se pudo abrir %1"
 
-#: src/lib/scp_dcp_job.cc:182
+#: src/lib/scp_dcp_job.cc:184
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
@@ -199,23 +204,19 @@ msgstr "No se pudo abrir %1 para enviar"
 msgid "Could not open downloaded ZIP file"
 msgstr "No se puedo abrir el fichero ZIP descargado"
 
-#: src/lib/film.cc:990
-msgid "Could not read DCP to make KDM for"
-msgstr "No se pudo leer el DCP para hacer el KDM"
-
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:154
 msgid "Could not start SCP session (%1)"
 msgstr "No se pudo iniciar la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:196
+#: src/lib/scp_dcp_job.cc:198
 msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/util.cc:850
+#: src/lib/frame_rate_change.cc:90
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente.\n"
 
-#: src/lib/util.cc:841
+#: src/lib/frame_rate_change.cc:81
 msgid "DCP will use every other frame of the content.\n"
 msgstr "El DCP usará imágenes alternas de la fuente.\n"
 
@@ -227,7 +228,7 @@ msgstr ""
 "DCP-o-matic no pudo abrir el fichero %1. Quizás no existe o está en un "
 "formato inesperado."
 
-#: src/lib/ffmpeg_content.cc:89
+#: src/lib/ffmpeg_content.cc:93
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
@@ -236,7 +237,7 @@ msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
-#: src/lib/config.cc:69
+#: src/lib/config.cc:71
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -264,11 +265,11 @@ msgstr "Dolby CP650 and CP750"
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Descarga fallida (%1/%2 error %3)"
 
-#: src/lib/util.cc:843
+#: src/lib/frame_rate_change.cc:83
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada imagen en el DCP.\n"
 
-#: src/lib/util.cc:845
+#: src/lib/frame_rate_change.cc:85
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Cada imagen será repetida otras %1 veces en el DCP.\n"
 
@@ -276,7 +277,7 @@ msgstr "Cada imagen será repetida otras %1 veces en el DCP.\n"
 msgid "Email KDMs for %1"
 msgstr "Enviar por email las KDM para %1"
 
-#: src/lib/writer.cc:120
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "Codificando imagen"
 
@@ -288,7 +289,7 @@ msgstr "Error (%1)"
 msgid "Examine content"
 msgstr "Examinar contenido"
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:147
 msgid "Failed to authenticate with server (%1)"
 msgstr "Fallo al identificarse con el servidor (%1)"
 
@@ -316,7 +317,7 @@ msgstr "Gaussiano"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:755
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -341,23 +342,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:800
+#: src/lib/util.cc:749
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:808
+#: src/lib/util.cc:757
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:810
+#: src/lib/util.cc:759
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:753
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:752
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
@@ -369,15 +370,15 @@ msgstr "Miscelánea"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content.cc:449
+#: src/lib/video_content.cc:476
 msgid "No scale"
 msgstr "No redimensionar"
 
-#: src/lib/video_content.cc:446
+#: src/lib/video_content.cc:473
 msgid "No stretch"
 msgstr "Sin deformación"
 
-#: src/lib/image_content.cc:49
+#: src/lib/image_content.cc:50
 msgid "No valid image files were found in the folder."
 msgstr ""
 
@@ -389,12 +390,12 @@ msgstr "Reducción de ruido"
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
-#: src/lib/content.cc:100
+#: src/lib/content.cc:102
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 "Solo la primera pieza a ser unida puede tener un recorte en su comienzo."
 
-#: src/lib/content.cc:104
+#: src/lib/content.cc:106
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Solo la última pieza a ser unida puede tener un recorte en su final."
 
@@ -418,27 +419,27 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/config.cc:84 src/lib/config.cc:168
+#: src/lib/config.cc:87 src/lib/config.cc:174
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:750
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:809
+#: src/lib/util.cc:758
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:811
+#: src/lib/util.cc:760
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:754
 msgid "Right surround"
 msgstr "Surround derecha"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:142
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
@@ -482,7 +483,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "No hubo suficiente memoria para hacer esto."
 
-#: src/lib/film.cc:406
+#: src/lib/film.cc:412
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -491,7 +492,7 @@ msgstr ""
 "desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
 "volver a añadir y configurar ton contenido. ¡Lo siento!"
 
-#: src/lib/film.cc:398
+#: src/lib/film.cc:404
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -505,7 +506,7 @@ msgstr ""
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:50
+#: src/lib/transcode_job.cc:53
 msgid "Transcode %1"
 msgstr "Codificar %1"
 
@@ -517,11 +518,15 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
+#: src/lib/image_proxy.cc:172
+msgid "Unexpected image type received by server"
+msgstr ""
+
 #: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:291
+#: src/lib/ffmpeg_decoder.cc:295
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
@@ -529,15 +534,15 @@ msgstr "Formato de audio desconocido (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
-#: src/lib/colour_conversion.cc:145
+#: src/lib/colour_conversion.cc:140
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/util.cc:807
+#: src/lib/util.cc:756
 msgid "Visually impaired"
 msgstr "Ciegos"
 
-#: src/lib/scp_dcp_job.cc:102
+#: src/lib/scp_dcp_job.cc:104
 msgid "Waiting"
 msgstr "Esperando"
 
@@ -549,39 +554,39 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:309
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
-#: src/lib/image_content.cc:72
+#: src/lib/image_content.cc:73
 msgid "[moving images]"
 msgstr "[imágenes en movimiento]"
 
-#: src/lib/image_content.cc:70
+#: src/lib/image_content.cc:71
 msgid "[still]"
 msgstr "[imagen fija]"
 
-#: src/lib/film.cc:247
+#: src/lib/film.cc:257
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:581
+#: src/lib/util.cc:530
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
-#: src/lib/scp_dcp_job.cc:126
+#: src/lib/scp_dcp_job.cc:128
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:305
 msgid "container"
 msgstr "continente"
 
-#: src/lib/film.cc:303
+#: src/lib/film.cc:313
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:177
 msgid "copying %1"
 msgstr "copiando %1"
 
@@ -589,19 +594,19 @@ msgstr "copiando %1"
 msgid "could not create file %1"
 msgstr "No se pudo crear el fichero (%1)"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:177
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
 
-#: src/lib/ffmpeg.cc:105
+#: src/lib/ffmpeg.cc:106
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:156
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
-#: src/lib/writer.cc:424
+#: src/lib/writer.cc:428
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "no s puedo mover el audio MXF en el DCP (%1)"
 
@@ -613,11 +618,11 @@ msgstr "no se pudo abrir el fichero de audio para lectura"
 msgid "could not open file %1"
 msgstr "no se pudo abrir el fichero %1"
 
-#: src/lib/dcp_video_frame.cc:352
+#: src/lib/dcp_video_frame.cc:334
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/dcp_video_frame.cc:358
+#: src/lib/dcp_video_frame.cc:340
 msgid "could not read encoded data"
 msgstr "no se pudo leer la información codificada"
 
@@ -625,19 +630,19 @@ msgstr "no se pudo leer la información codificada"
 msgid "could not read from file %1 (%2)"
 msgstr "No se pudo leer del fichero %1 (%2)"
 
-#: src/lib/resampler.cc:102
+#: src/lib/resampler.cc:98
 msgid "could not run sample-rate converter"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
-#: src/lib/resampler.cc:83
+#: src/lib/resampler.cc:79
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
-#: src/lib/scp_dcp_job.cc:87
+#: src/lib/scp_dcp_job.cc:89
 msgid "could not start SCP session (%1)"
 msgstr "no se pudo abrir la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:53
+#: src/lib/scp_dcp_job.cc:55
 msgid "could not start SSH session"
 msgstr "no se pudo abrir la sesión SSH"
 
@@ -645,23 +650,23 @@ msgstr "no se pudo abrir la sesión SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir en el fichero (%1)"
 
-#: src/lib/util.cc:601
+#: src/lib/util.cc:550
 msgid "error during async_accept (%1)"
 msgstr "error durante async_accept (%1)"
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:526
 msgid "error during async_connect (%1)"
 msgstr "error durante async_connect (%1)"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:599
 msgid "error during async_read (%1)"
 msgstr "error durante async_read (%1)"
 
-#: src/lib/util.cc:622
+#: src/lib/util.cc:571
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:103
 msgid "frames per second"
 msgstr "imágenes por segundo"
 
@@ -681,7 +686,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:722
+#: src/lib/util.cc:671
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -689,19 +694,19 @@ msgstr "falta la clave %1 en el par clave-valor"
 msgid "missing required setting %1"
 msgstr "falta una configuración obligatoria %1"
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:88
 msgid "moving"
 msgstr "moviendo"
 
-#: src/lib/ffmpeg_decoder.cc:575
+#: src/lib/ffmpeg_decoder.cc:591
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:247 src/lib/film.cc:307
+#: src/lib/film.cc:257 src/lib/film.cc:317
 msgid "name"
 msgstr "nombre"
 
-#: src/lib/ffmpeg_decoder.cc:590
+#: src/lib/ffmpeg_decoder.cc:606
 msgid "non-bitmap subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
@@ -711,11 +716,11 @@ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/config.cc:82 src/lib/video_content.cc:174
+#: src/lib/config.cc:85 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:83
+#: src/lib/config.cc:86
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
@@ -723,7 +728,7 @@ msgstr "sRGB no-lineal"
 msgid "seconds"
 msgstr "segundos"
 
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:86
 msgid "still"
 msgstr "imagen fija"
 
@@ -731,6 +736,9 @@ msgstr "imagen fija"
 msgid "unknown"
 msgstr "desconocido"
 
+#~ msgid "Could not read DCP to make KDM for"
+#~ msgstr "No se pudo leer el DCP para hacer el KDM"
+
 #~ msgid "Cubic interpolating deinterlacer"
 #~ msgstr "Desentrelazado por interpolación cúbica"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index d21b7ef1b..e9e67bf4f 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
-"PO-Revision-Date: 2014-04-18 22:51+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-20 15:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/lib/sndfile_content.cc:62
+#: src/lib/sndfile_content.cc:61
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:207
+#: src/lib/ffmpeg_content.cc:211
 msgid "%1 [movie]"
 msgstr "%1 [vidéo]"
 
-#: src/lib/sndfile_content.cc:83
+#: src/lib/sndfile_content.cc:82
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 canaux, %2kHz, %3 samples"
 
-#: src/lib/ffmpeg_content.cc:242
+#: src/lib/ffmpeg_content.cc:246
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 images ; %2 images par seconde"
 
-#: src/lib/video_content.cc:205
+#: src/lib/video_content.cc:206
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -97,105 +97,110 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:751
 msgid "Centre"
 msgstr "Centre"
 
-#: src/lib/writer.cc:77
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Recherche de données images existantes"
 
-#: src/lib/writer.cc:460
+#: src/lib/writer.cc:464
 msgid "Computing audio digest"
 msgstr "Fabrication rendu audio"
 
-#: src/lib/image_content.cc:104
+#: src/lib/image_content.cc:105
 msgid "Computing digest"
 msgstr "fabrication rendu"
 
-#: src/lib/writer.cc:456
+#: src/lib/writer.cc:460
 msgid "Computing image digest"
 msgstr "Fabrication rendu image"
 
-#: src/lib/util.cc:838
+#: src/lib/frame_rate_change.cc:78
 msgid "Content and DCP have the same rate.\n"
 msgstr "Le DCP et la source ont la même cadence image.\n"
 
-#: src/lib/audio_content.cc:82
+#: src/lib/audio_content.cc:83
 msgid "Content to be joined must have the same audio delay."
 msgstr "Le contenu à ajouter doit présenter le même délais audio"
 
-#: src/lib/audio_content.cc:78
+#: src/lib/audio_content.cc:79
 msgid "Content to be joined must have the same audio gain."
 msgstr "Le contenu à ajouter doit avoir le même gain audio"
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:144
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Le contenu à ajouter doit avoir le même type de conversion couleur"
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:136
 msgid "Content to be joined must have the same crop."
 msgstr ""
 "le contenu à ajouter doit avoir les mêmes valeurs de \"crop\" ou découpage"
 
-#: src/lib/video_content.cc:120
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same picture size."
 msgstr "Le contenu à ajouter doit avoir la même taille d'image"
 
-#: src/lib/video_content.cc:136
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same scale setting."
 msgstr ""
 "Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
 
-#: src/lib/subtitle_content.cc:74
+#: src/lib/subtitle_content.cc:73
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Le contenu à ajouter doit avoir le même positionnement horizontal des sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:78
+#: src/lib/subtitle_content.cc:77
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Le contenu à ajouter doit avoir le même positionnement vertical des sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:82
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre"
 
-#: src/lib/video_content.cc:124
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Le contenu à ajouter doit avoir la même cadence d'images"
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same video frame type."
 msgstr "Le contenu à ajouter doit avoir le même type de trame vidéo"
 
-#: src/lib/ffmpeg_content.cc:112
+#: src/lib/ffmpeg_content.cc:116
 msgid "Content to be joined must use the same audio stream."
 msgstr "Le contenu à ajouter doit avoir le même flux audio"
 
-#: src/lib/ffmpeg_content.cc:108
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Le contenu à ajouter doit avoir le même flux sous titre"
 
-#: src/lib/scp_dcp_job.cc:110
+#: src/lib/scp_dcp_job.cc:112
 msgid "Copy DCP to TMS"
 msgstr "Copier le DCP dans le TMS"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/scp_dcp_job.cc:137
 msgid "Could not connect to server %1 (%2)"
 msgstr "Connexion au serveur %1 (%2) impossible"
 
-#: src/lib/scp_dcp_job.cc:157
+#: src/lib/scp_dcp_job.cc:159
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Création du dossier distant %1 (%2) impossible"
 
+#: src/lib/image_proxy.cc:128
+#, fuzzy
+msgid "Could not decode image file"
+msgstr "Écriture vers fichier distant (%1) impossible"
+
 #: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "lecture du fichier %1 impossible"
 
-#: src/lib/scp_dcp_job.cc:182
+#: src/lib/scp_dcp_job.cc:184
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
@@ -203,23 +208,19 @@ msgstr "Ouverture de %1 pour envoi impossible"
 msgid "Could not open downloaded ZIP file"
 msgstr "Ouverture du fichier Zip impossible"
 
-#: src/lib/film.cc:990
-msgid "Could not read DCP to make KDM for"
-msgstr "DCP illisible pour fabrication de KDM"
-
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:154
 msgid "Could not start SCP session (%1)"
 msgstr "Démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:196
+#: src/lib/scp_dcp_job.cc:198
 msgid "Could not write to remote file (%1)"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/util.cc:850
+#: src/lib/frame_rate_change.cc:90
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "Le DCP sera lu à %1%% de la vitesse du contenu source.\n"
 
-#: src/lib/util.cc:841
+#: src/lib/frame_rate_change.cc:81
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
@@ -230,7 +231,7 @@ msgid ""
 "an unexpected format."
 msgstr "DCP-o-matic ne peut pas ouvrir le fichier %1"
 
-#: src/lib/ffmpeg_content.cc:89
+#: src/lib/ffmpeg_content.cc:93
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
@@ -239,7 +240,7 @@ msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
-#: src/lib/config.cc:69
+#: src/lib/config.cc:71
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -259,11 +260,11 @@ msgstr "Dolby CP650 et CP750"
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Echec de téléchargement (%1/%2 erreur %3)"
 
-#: src/lib/util.cc:843
+#: src/lib/frame_rate_change.cc:83
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Chaque image source sera doublée dans le DCP.\n"
 
-#: src/lib/util.cc:845
+#: src/lib/frame_rate_change.cc:85
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Chaque image source sera répetée %1 fois dans le DCP.\n"
 
@@ -271,7 +272,7 @@ msgstr "Chaque image source sera répetée %1 fois dans le DCP.\n"
 msgid "Email KDMs for %1"
 msgstr "Envoyer KDM par email pour %1"
 
-#: src/lib/writer.cc:120
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "encodage des données image"
 
@@ -283,7 +284,7 @@ msgstr "Erreur (%1)"
 msgid "Examine content"
 msgstr "Examen du contenu"
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:147
 msgid "Failed to authenticate with server (%1)"
 msgstr "L'authentification du serveur (%1) a échouée"
 
@@ -311,7 +312,7 @@ msgstr "Gaussien"
 msgid "Gradient debander"
 msgstr "Corrections des bandes du dégradé"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:755
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -320,13 +321,12 @@ msgid "High quality 3D denoiser"
 msgstr "Débruiteur 3D haute qualité"
 
 #: src/lib/job.cc:111 src/lib/job.cc:121
-#, fuzzy
 msgid ""
 "It is not known what caused this error.  Please report the problem to the "
 "DCP-o-matic author (carl@dcpomatic.com)."
 msgstr ""
-"Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
-"(carl@dcpomatic.com)"
+"Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
+"matic (carl@dcpomatic.com)"
 
 #: src/lib/filter.cc:66
 msgid "Kernel deinterlacer"
@@ -336,23 +336,23 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:800
+#: src/lib/util.cc:749
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:808
+#: src/lib/util.cc:757
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:810
+#: src/lib/util.cc:759
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:753
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:752
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -364,15 +364,15 @@ msgstr "Divers"
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
-#: src/lib/video_content.cc:449
+#: src/lib/video_content.cc:476
 msgid "No scale"
 msgstr "Pas de mise à l'échelle"
 
-#: src/lib/video_content.cc:446
+#: src/lib/video_content.cc:473
 msgid "No stretch"
 msgstr "Sans déformation"
 
-#: src/lib/image_content.cc:49
+#: src/lib/image_content.cc:50
 msgid "No valid image files were found in the folder."
 msgstr ""
 
@@ -384,11 +384,11 @@ msgstr "Réduction de bruit"
 msgid "OK (ran for %1)"
 msgstr "OK (processus %1)"
 
-#: src/lib/content.cc:100
+#: src/lib/content.cc:102
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr "Seul le premier contenu à ajouter peut avoir un coupure de début."
 
-#: src/lib/content.cc:104
+#: src/lib/content.cc:106
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Seul le dernier contenu à ajouter peut avoir une coupure en fin."
 
@@ -412,27 +412,27 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/config.cc:84 src/lib/config.cc:168
+#: src/lib/config.cc:87 src/lib/config.cc:174
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:750
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:809
+#: src/lib/util.cc:758
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:811
+#: src/lib/util.cc:760
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:754
 msgid "Right surround"
 msgstr "Arrière droite"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:142
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
@@ -476,7 +476,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Il n'y avait pas assez de mémoire pour faire cela."
 
-#: src/lib/film.cc:406
+#: src/lib/film.cc:412
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -484,7 +484,7 @@ msgstr ""
 "Ce film a été créé avec une nouvelle version de DCP-o-matic et il ne peut "
 "être ouvert dans cette version du programme. Désolé!"
 
-#: src/lib/film.cc:398
+#: src/lib/film.cc:404
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:50
+#: src/lib/transcode_job.cc:53
 msgid "Transcode %1"
 msgstr "Transcodage %1"
 
@@ -510,11 +510,15 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
+#: src/lib/image_proxy.cc:172
+msgid "Unexpected image type received by server"
+msgstr ""
+
 #: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/lib/ffmpeg_decoder.cc:291
+#: src/lib/ffmpeg_decoder.cc:295
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Échantillonnage audio (%1) inconnu"
 
@@ -522,15 +526,15 @@ msgstr "Échantillonnage audio (%1) inconnu"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Adoucissement et flou Gaussien"
 
-#: src/lib/colour_conversion.cc:145
+#: src/lib/colour_conversion.cc:140
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/lib/util.cc:807
+#: src/lib/util.cc:756
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
-#: src/lib/scp_dcp_job.cc:102
+#: src/lib/scp_dcp_job.cc:104
 msgid "Waiting"
 msgstr "En cours"
 
@@ -542,40 +546,39 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:309
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
-#: src/lib/image_content.cc:72
+#: src/lib/image_content.cc:73
 msgid "[moving images]"
 msgstr "[Déplacement d'images]"
 
-#: src/lib/image_content.cc:70
-#, fuzzy
+#: src/lib/image_content.cc:71
 msgid "[still]"
-msgstr "[fixe]"
+msgstr "[restant]"
 
-#: src/lib/film.cc:247
+#: src/lib/film.cc:257
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:581
+#: src/lib/util.cc:530
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
-#: src/lib/scp_dcp_job.cc:126
+#: src/lib/scp_dcp_job.cc:128
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:305
 msgid "container"
 msgstr "conteneur"
 
-#: src/lib/film.cc:303
+#: src/lib/film.cc:313
 msgid "content type"
 msgstr "type de contenu"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:177
 msgid "copying %1"
 msgstr "copie de %1"
 
@@ -583,19 +586,19 @@ msgstr "copie de %1"
 msgid "could not create file %1"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:177
 msgid "could not find audio decoder"
 msgstr "décodeur audio introuvable"
 
-#: src/lib/ffmpeg.cc:105
+#: src/lib/ffmpeg.cc:106
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:156
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
-#: src/lib/writer.cc:424
+#: src/lib/writer.cc:428
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
 
@@ -607,11 +610,11 @@ msgstr "lecture du fichier audio impossible"
 msgid "could not open file %1"
 msgstr "lecture du fichier (%1) impossible"
 
-#: src/lib/dcp_video_frame.cc:352
+#: src/lib/dcp_video_frame.cc:334
 msgid "could not open file for reading"
 msgstr "lecture du fichier impossible"
 
-#: src/lib/dcp_video_frame.cc:358
+#: src/lib/dcp_video_frame.cc:340
 msgid "could not read encoded data"
 msgstr "lecture des données encodées impossible"
 
@@ -619,21 +622,21 @@ msgstr "lecture des données encodées impossible"
 msgid "could not read from file %1 (%2)"
 msgstr "lecture du fichier impossible %1 (%2)"
 
-#: src/lib/resampler.cc:102
+#: src/lib/resampler.cc:98
 msgid "could not run sample-rate converter"
 msgstr "conversion de la fréquence d'échantillonnage impossible"
 
-#: src/lib/resampler.cc:83
+#: src/lib/resampler.cc:79
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr ""
 "n'a pas pu convertir la fréquence d'échantillonnage pour %1 échantillons "
 "(%2) (%3)"
 
-#: src/lib/scp_dcp_job.cc:87
+#: src/lib/scp_dcp_job.cc:89
 msgid "could not start SCP session (%1)"
 msgstr "démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:53
+#: src/lib/scp_dcp_job.cc:55
 msgid "could not start SSH session"
 msgstr "démarrage de session SSH impossible"
 
@@ -641,23 +644,23 @@ msgstr "démarrage de session SSH impossible"
 msgid "could not write to file %1 (%2)"
 msgstr "Écriture vers fichier distant (%1) impossible (%2)"
 
-#: src/lib/util.cc:601
+#: src/lib/util.cc:550
 msgid "error during async_accept (%1)"
 msgstr "erreur pendant async_accept (%1)"
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:526
 msgid "error during async_connect (%1)"
 msgstr "erreur pendant async_connect (%1)"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:599
 msgid "error during async_read (%1)"
 msgstr "erreur pendant async_read (%1)"
 
-#: src/lib/util.cc:622
+#: src/lib/util.cc:571
 msgid "error during async_write (%1)"
 msgstr "erreur pendant async_write (%1)"
 
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:103
 msgid "frames per second"
 msgstr "images par seconde"
 
@@ -677,7 +680,7 @@ msgstr "minute"
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:722
+#: src/lib/util.cc:671
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -685,19 +688,19 @@ msgstr "clé %1 non sélectionnée"
 msgid "missing required setting %1"
 msgstr "paramètre %1 manquant"
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:88
 msgid "moving"
 msgstr "déplacement"
 
-#: src/lib/ffmpeg_decoder.cc:575
+#: src/lib/ffmpeg_decoder.cc:591
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:247 src/lib/film.cc:307
+#: src/lib/film.cc:257 src/lib/film.cc:317
 msgid "name"
 msgstr "nom"
 
-#: src/lib/ffmpeg_decoder.cc:590
+#: src/lib/ffmpeg_decoder.cc:606
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sous-titres non-bitmap non supportés actuellement"
 
@@ -707,11 +710,11 @@ msgstr "sous-titres non-bitmap non supportés actuellement"
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/config.cc:82 src/lib/video_content.cc:174
+#: src/lib/config.cc:85 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:83
+#: src/lib/config.cc:86
 msgid "sRGB non-linearised"
 msgstr "sRGB non linéarisé"
 
@@ -719,15 +722,17 @@ msgstr "sRGB non linéarisé"
 msgid "seconds"
 msgstr "secondes"
 
-#: src/lib/image_content.cc:85
-#, fuzzy
+#: src/lib/image_content.cc:86
 msgid "still"
-msgstr "%1 [fixe]"
+msgstr "%1 [restant]"
 
 #: src/lib/ffmpeg_examiner.cc:168
 msgid "unknown"
 msgstr "Inconnu"
 
+#~ msgid "Could not read DCP to make KDM for"
+#~ msgstr "DCP illisible pour fabrication de KDM"
+
 #~ msgid "Cubic interpolating deinterlacer"
 #~ msgstr "Désentrelacement cubique interpolé"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index db80a1347..365360260 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/lib/sndfile_content.cc:62
+#: src/lib/sndfile_content.cc:61
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:207
+#: src/lib/ffmpeg_content.cc:211
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/sndfile_content.cc:83
+#: src/lib/sndfile_content.cc:82
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:242
+#: src/lib/ffmpeg_content.cc:246
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 fotogrammi; %2 fotogrammi al secondo"
 
-#: src/lib/video_content.cc:205
+#: src/lib/video_content.cc:206
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -98,104 +98,109 @@ msgstr "Cancellato"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:751
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:77
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:460
+#: src/lib/writer.cc:464
 msgid "Computing audio digest"
 msgstr ""
 
-#: src/lib/image_content.cc:104
+#: src/lib/image_content.cc:105
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:456
+#: src/lib/writer.cc:460
 msgid "Computing image digest"
 msgstr ""
 
-#: src/lib/util.cc:838
+#: src/lib/frame_rate_change.cc:78
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
-#: src/lib/audio_content.cc:82
+#: src/lib/audio_content.cc:83
 msgid "Content to be joined must have the same audio delay."
 msgstr ""
 
-#: src/lib/audio_content.cc:78
+#: src/lib/audio_content.cc:79
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:144
 msgid "Content to be joined must have the same colour conversion."
 msgstr ""
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:136
 msgid "Content to be joined must have the same crop."
 msgstr ""
 
-#: src/lib/video_content.cc:120
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/video_content.cc:136
+#: src/lib/video_content.cc:140
 #, fuzzy
 msgid "Content to be joined must have the same scale setting."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:74
+#: src/lib/subtitle_content.cc:73
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:78
+#: src/lib/subtitle_content.cc:77
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:82
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle scale."
 msgstr ""
 
-#: src/lib/video_content.cc:124
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame rate."
 msgstr ""
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:112
+#: src/lib/ffmpeg_content.cc:116
 msgid "Content to be joined must use the same audio stream."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:108
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same subtitle stream."
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:110
+#: src/lib/scp_dcp_job.cc:112
 msgid "Copy DCP to TMS"
 msgstr "Copia del DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/scp_dcp_job.cc:137
 msgid "Could not connect to server %1 (%2)"
 msgstr "Non posso connetermi al server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:157
+#: src/lib/scp_dcp_job.cc:159
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
+#: src/lib/image_proxy.cc:128
+#, fuzzy
+msgid "Could not decode image file"
+msgstr "Non posso scrivere il file remoto (%1)"
+
 #: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Non riesco ad aprire %1"
 
-#: src/lib/scp_dcp_job.cc:182
+#: src/lib/scp_dcp_job.cc:184
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
@@ -204,24 +209,20 @@ msgstr "Non posso aprire %1 da inviare"
 msgid "Could not open downloaded ZIP file"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/film.cc:990
-msgid "Could not read DCP to make KDM for"
-msgstr ""
-
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:154
 msgid "Could not start SCP session (%1)"
 msgstr "Non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:196
+#: src/lib/scp_dcp_job.cc:198
 msgid "Could not write to remote file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/util.cc:850
+#: src/lib/frame_rate_change.cc:90
 #, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "Il DCP andrà al %1%% della velocità del sorgente.\n"
 
-#: src/lib/util.cc:841
+#: src/lib/frame_rate_change.cc:81
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
@@ -234,7 +235,7 @@ msgstr ""
 "DCP-o-matic non può aprire il file %1. Non esiste oppure è in un formato non "
 "riconosciuto."
 
-#: src/lib/ffmpeg_content.cc:89
+#: src/lib/ffmpeg_content.cc:93
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
@@ -243,7 +244,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
-#: src/lib/config.cc:69
+#: src/lib/config.cc:71
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -272,11 +273,11 @@ msgstr "Dolby CP750"
 msgid "Download failed (%1/%2 error %3)"
 msgstr ""
 
-#: src/lib/util.cc:843
+#: src/lib/frame_rate_change.cc:83
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà duplicato nel DCP.\n"
 
-#: src/lib/util.cc:845
+#: src/lib/frame_rate_change.cc:85
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà ripetuto %1 volte nel DCP.\n"
 
@@ -284,7 +285,7 @@ msgstr "Ogni fotogramma del sorgente sarà ripetuto %1 volte nel DCP.\n"
 msgid "Email KDMs for %1"
 msgstr ""
 
-#: src/lib/writer.cc:120
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr ""
 
@@ -296,7 +297,7 @@ msgstr "Errore (%1)"
 msgid "Examine content"
 msgstr "Esamino il contenuto"
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:147
 msgid "Failed to authenticate with server (%1)"
 msgstr "Autenticazione col server fallita (%1) "
 
@@ -324,7 +325,7 @@ msgstr "Gaussiana"
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:755
 msgid "Hearing impaired"
 msgstr ""
 
@@ -349,24 +350,24 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:800
+#: src/lib/util.cc:749
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:808
+#: src/lib/util.cc:757
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:810
+#: src/lib/util.cc:759
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:753
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:752
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -378,16 +379,16 @@ msgstr "Varie"
 msgid "Motion compensating deinterlacer"
 msgstr "Dinterlacciatore con compensazione di movimento"
 
-#: src/lib/video_content.cc:449
+#: src/lib/video_content.cc:476
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content.cc:446
+#: src/lib/video_content.cc:473
 #, fuzzy
 msgid "No stretch"
 msgstr "Flat senza stiramento"
 
-#: src/lib/image_content.cc:49
+#: src/lib/image_content.cc:50
 msgid "No valid image files were found in the folder."
 msgstr ""
 
@@ -399,11 +400,11 @@ msgstr "Riduzione del rumore"
 msgid "OK (ran for %1)"
 msgstr "OK (eseguito in %1)"
 
-#: src/lib/content.cc:100
+#: src/lib/content.cc:102
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 
-#: src/lib/content.cc:104
+#: src/lib/content.cc:106
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 
@@ -427,29 +428,29 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/config.cc:84 src/lib/config.cc:168
+#: src/lib/config.cc:87 src/lib/config.cc:174
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:750
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:809
+#: src/lib/util.cc:758
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:811
+#: src/lib/util.cc:760
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Surround destro"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:754
 msgid "Right surround"
 msgstr "Surround destro"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:142
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
@@ -493,7 +494,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr ""
 
-#: src/lib/film.cc:406
+#: src/lib/film.cc:412
 #, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -504,7 +505,7 @@ msgstr ""
 "un nuovo film, ri-aggiungere i tuoi contenuti e configurarlo di nuovo. Ci "
 "dispiace!"
 
-#: src/lib/film.cc:398
+#: src/lib/film.cc:404
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -519,7 +520,7 @@ msgstr ""
 msgid "Trailer"
 msgstr "Prossimamente"
 
-#: src/lib/transcode_job.cc:50
+#: src/lib/transcode_job.cc:53
 msgid "Transcode %1"
 msgstr "Transcodifica %1"
 
@@ -531,11 +532,15 @@ msgstr "Di transizione"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
+#: src/lib/image_proxy.cc:172
+msgid "Unexpected image type received by server"
+msgstr ""
+
 #: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: src/lib/ffmpeg_decoder.cc:291
+#: src/lib/ffmpeg_decoder.cc:295
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato di campionamento audio non riconosciuto (%1)"
 
@@ -543,15 +548,15 @@ msgstr "Formato di campionamento audio non riconosciuto (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Maschera unsharp e sfocatura Gaussiana"
 
-#: src/lib/colour_conversion.cc:145
+#: src/lib/colour_conversion.cc:140
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/util.cc:807
+#: src/lib/util.cc:756
 msgid "Visually impaired"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:102
+#: src/lib/scp_dcp_job.cc:104
 msgid "Waiting"
 msgstr "Aspetta"
 
@@ -563,40 +568,40 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:309
 msgid "You must add some content to the DCP before creating it"
 msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
 
-#: src/lib/image_content.cc:72
+#: src/lib/image_content.cc:73
 msgid "[moving images]"
 msgstr ""
 
-#: src/lib/image_content.cc:70
+#: src/lib/image_content.cc:71
 #, fuzzy
 msgid "[still]"
 msgstr "ancora"
 
-#: src/lib/film.cc:247
+#: src/lib/film.cc:257
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:581
+#: src/lib/util.cc:530
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
-#: src/lib/scp_dcp_job.cc:126
+#: src/lib/scp_dcp_job.cc:128
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:305
 msgid "container"
 msgstr "contenitore"
 
-#: src/lib/film.cc:303
+#: src/lib/film.cc:313
 msgid "content type"
 msgstr "tipo di contenuto"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:177
 msgid "copying %1"
 msgstr "copia %1"
 
@@ -604,19 +609,19 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:177
 msgid "could not find audio decoder"
 msgstr "non riesco a trovare il decoder audio"
 
-#: src/lib/ffmpeg.cc:105
+#: src/lib/ffmpeg.cc:106
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:156
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
-#: src/lib/writer.cc:424
+#: src/lib/writer.cc:428
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr ""
 
@@ -628,11 +633,11 @@ msgstr "non riesco ad aprire il file in lettura"
 msgid "could not open file %1"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/dcp_video_frame.cc:352
+#: src/lib/dcp_video_frame.cc:334
 msgid "could not open file for reading"
 msgstr "non riesco ad aprire il file per leggerlo"
 
-#: src/lib/dcp_video_frame.cc:358
+#: src/lib/dcp_video_frame.cc:340
 #, fuzzy
 msgid "could not read encoded data"
 msgstr "non riesco a trovare il decoder audio"
@@ -641,20 +646,20 @@ msgstr "non riesco a trovare il decoder audio"
 msgid "could not read from file %1 (%2)"
 msgstr "non posso leggere dal file %1 (%2)"
 
-#: src/lib/resampler.cc:102
+#: src/lib/resampler.cc:98
 msgid "could not run sample-rate converter"
 msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 
-#: src/lib/resampler.cc:83
+#: src/lib/resampler.cc:79
 #, fuzzy
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 
-#: src/lib/scp_dcp_job.cc:87
+#: src/lib/scp_dcp_job.cc:89
 msgid "could not start SCP session (%1)"
 msgstr "non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:53
+#: src/lib/scp_dcp_job.cc:55
 msgid "could not start SSH session"
 msgstr "non posso avviare la sessione SSH"
 
@@ -662,23 +667,23 @@ msgstr "non posso avviare la sessione SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "non posso scrivere il file (%1)"
 
-#: src/lib/util.cc:601
+#: src/lib/util.cc:550
 msgid "error during async_accept (%1)"
 msgstr ""
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:526
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:599
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:622
+#: src/lib/util.cc:571
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:103
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
@@ -698,7 +703,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:722
+#: src/lib/util.cc:671
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -706,19 +711,19 @@ msgstr "persa la chiave %1 tra i valori chiave"
 msgid "missing required setting %1"
 msgstr "persa la regolazione richiesta %1"
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:88
 msgid "moving"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:575
+#: src/lib/ffmpeg_decoder.cc:591
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:247 src/lib/film.cc:307
+#: src/lib/film.cc:257 src/lib/film.cc:317
 msgid "name"
 msgstr "nome"
 
-#: src/lib/ffmpeg_decoder.cc:590
+#: src/lib/ffmpeg_decoder.cc:606
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sottotitoli non-bitmap non ancora supportati"
 
@@ -728,11 +733,11 @@ msgstr "sottotitoli non-bitmap non ancora supportati"
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/config.cc:82 src/lib/video_content.cc:174
+#: src/lib/config.cc:85 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:83
+#: src/lib/config.cc:86
 msgid "sRGB non-linearised"
 msgstr "sRGB non linearizzato"
 
@@ -740,7 +745,7 @@ msgstr "sRGB non linearizzato"
 msgid "seconds"
 msgstr "secondi"
 
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:86
 #, fuzzy
 msgid "still"
 msgstr "ancora"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 1b46fab65..eae118175 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-03-30 19:39+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -18,23 +18,23 @@ msgstr ""
 "X-Generator: Poedit 1.6.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/sndfile_content.cc:62
+#: src/lib/sndfile_content.cc:61
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:207
+#: src/lib/ffmpeg_content.cc:211
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
-#: src/lib/sndfile_content.cc:83
+#: src/lib/sndfile_content.cc:82
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 kanalen, %2kHz, %3 samples"
 
-#: src/lib/ffmpeg_content.cc:242
+#: src/lib/ffmpeg_content.cc:246
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 frames; %2 frames per seconde"
 
-#: src/lib/video_content.cc:205
+#: src/lib/video_content.cc:206
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -98,99 +98,104 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:751
 msgid "Centre"
 msgstr "Midden"
 
-#: src/lib/writer.cc:77
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Controleer bestaande videodata"
 
-#: src/lib/writer.cc:460
+#: src/lib/writer.cc:464
 msgid "Computing audio digest"
 msgstr "Verwerk audio data"
 
-#: src/lib/image_content.cc:104
+#: src/lib/image_content.cc:105
 msgid "Computing digest"
 msgstr "Verwerken..."
 
-#: src/lib/writer.cc:456
+#: src/lib/writer.cc:460
 msgid "Computing image digest"
 msgstr "Verwerk video data"
 
-#: src/lib/util.cc:838
+#: src/lib/frame_rate_change.cc:78
 msgid "Content and DCP have the same rate.\n"
 msgstr "Inhoud en DCP hebben dezelfde framerate .\n"
 
-#: src/lib/audio_content.cc:82
+#: src/lib/audio_content.cc:83
 msgid "Content to be joined must have the same audio delay."
 msgstr "Toegevoegde bestanden moeten dezelfde audio vertraging hebben."
 
-#: src/lib/audio_content.cc:78
+#: src/lib/audio_content.cc:79
 msgid "Content to be joined must have the same audio gain."
 msgstr "Toegevoegde bestanden moeten dezelfde audio gain hebben."
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:144
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Toegevoegde bestanden moeten dezelfde kleurindeling hebben."
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:136
 msgid "Content to be joined must have the same crop."
 msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
 
-#: src/lib/video_content.cc:120
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same picture size."
 msgstr "Toegevoegde bestanden moeten dezelfde grootte hebben."
 
-#: src/lib/video_content.cc:136
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same scale setting."
 msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
 
-#: src/lib/subtitle_content.cc:74
+#: src/lib/subtitle_content.cc:73
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel X offset hebben."
 
-#: src/lib/subtitle_content.cc:78
+#: src/lib/subtitle_content.cc:77
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel Y offset hebben."
 
-#: src/lib/subtitle_content.cc:82
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
 
-#: src/lib/video_content.cc:124
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Toegevoegde bestanden moeten dezelfde video frame rate hebben."
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same video frame type."
 msgstr "Toegevoegde bestanden moeten dezelfde video formaat hebben."
 
-#: src/lib/ffmpeg_content.cc:112
+#: src/lib/ffmpeg_content.cc:116
 msgid "Content to be joined must use the same audio stream."
 msgstr "Toegevoegde bestanden moeten dezelfde audio stream gebruiken."
 
-#: src/lib/ffmpeg_content.cc:108
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel stream gebruiken."
 
-#: src/lib/scp_dcp_job.cc:110
+#: src/lib/scp_dcp_job.cc:112
 msgid "Copy DCP to TMS"
 msgstr "Kopieer DCP to TMS"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/scp_dcp_job.cc:137
 msgid "Could not connect to server %1 (%2)"
 msgstr "Kan niet verbinden met server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:157
+#: src/lib/scp_dcp_job.cc:159
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kan geen remote map maken %1 (%2)"
 
+#: src/lib/image_proxy.cc:128
+#, fuzzy
+msgid "Could not decode image file"
+msgstr "kan geen bestand maken %1"
+
 #: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Kan niet openen %1"
 
-#: src/lib/scp_dcp_job.cc:182
+#: src/lib/scp_dcp_job.cc:184
 msgid "Could not open %1 to send"
 msgstr "Kan niet openen %1 om te verzenden"
 
@@ -198,23 +203,19 @@ msgstr "Kan niet openen %1 om te verzenden"
 msgid "Could not open downloaded ZIP file"
 msgstr "Kan gedownloade ZIP bestand niet openen"
 
-#: src/lib/film.cc:990
-msgid "Could not read DCP to make KDM for"
-msgstr "Kan DCP niet lezen om KDM te maken"
-
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:154
 msgid "Could not start SCP session (%1)"
 msgstr "Kan SCP sessie niet starten (%1)"
 
-#: src/lib/scp_dcp_job.cc:196
+#: src/lib/scp_dcp_job.cc:198
 msgid "Could not write to remote file (%1)"
 msgstr "Kan niet schrijven naar bestand op FTP server"
 
-#: src/lib/util.cc:850
+#: src/lib/frame_rate_change.cc:90
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "DCP renderd met %1%% van de content framerate.\n"
 
-#: src/lib/util.cc:841
+#: src/lib/frame_rate_change.cc:81
 msgid "DCP will use every other frame of the content.\n"
 msgstr "DCP zal alleen elk ander frame van de content gebruiken.\n"
 
@@ -226,7 +227,7 @@ msgstr ""
 "DCP-o-matic kan bestand niet openen %1 . Misschien bestaat het niet of wordt "
 "het formaat niet ondersteund."
 
-#: src/lib/ffmpeg_content.cc:89
+#: src/lib/ffmpeg_content.cc:93
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
@@ -237,7 +238,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacing"
 
-#: src/lib/config.cc:69
+#: src/lib/config.cc:71
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -265,11 +266,11 @@ msgstr "Dolby CP650 and CP750"
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Fout met download(%1/%2 error %3)"
 
-#: src/lib/util.cc:843
+#: src/lib/frame_rate_change.cc:83
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Elk content frame zal verdubbeld worden de DCP.\n"
 
-#: src/lib/util.cc:845
+#: src/lib/frame_rate_change.cc:85
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Elk content frame zal %1  herhaald worden in de DCP.\n"
 
@@ -277,7 +278,7 @@ msgstr "Elk content frame zal %1  herhaald worden in de DCP.\n"
 msgid "Email KDMs for %1"
 msgstr "Email KDMs voor %1"
 
-#: src/lib/writer.cc:120
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "Encoding bestandsdata"
 
@@ -289,7 +290,7 @@ msgstr "Fout (%1)"
 msgid "Examine content"
 msgstr "Controleer content"
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:147
 msgid "Failed to authenticate with server (%1)"
 msgstr "Inlog fout met server (%1)"
 
@@ -317,7 +318,7 @@ msgstr "Gaussian"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:755
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -342,23 +343,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:800
+#: src/lib/util.cc:749
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:808
+#: src/lib/util.cc:757
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:810
+#: src/lib/util.cc:759
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:753
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:752
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -370,15 +371,15 @@ msgstr "Diverse"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content.cc:449
+#: src/lib/video_content.cc:476
 msgid "No scale"
 msgstr "Niet vergroten of verkleinen"
 
-#: src/lib/video_content.cc:446
+#: src/lib/video_content.cc:473
 msgid "No stretch"
 msgstr "Niet uitvullen"
 
-#: src/lib/image_content.cc:49
+#: src/lib/image_content.cc:50
 msgid "No valid image files were found in the folder."
 msgstr ""
 
@@ -390,13 +391,13 @@ msgstr "Ruis reductie"
 msgid "OK (ran for %1)"
 msgstr "OK (bezig.. %1)"
 
-#: src/lib/content.cc:100
+#: src/lib/content.cc:102
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 "Alleen het eerste deel van de toegevoegde content kan een start trim "
 "bevatten."
 
-#: src/lib/content.cc:104
+#: src/lib/content.cc:106
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 "Alleen het laatste deel van de toegevoegde content kan een eind trim "
@@ -422,27 +423,27 @@ msgstr "Publieke Service aankondiging"
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: src/lib/config.cc:84 src/lib/config.cc:168
+#: src/lib/config.cc:87 src/lib/config.cc:174
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:750
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:809
+#: src/lib/util.cc:758
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:811
+#: src/lib/util.cc:760
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:754
 msgid "Right surround"
 msgstr "Rechts surround"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:142
 msgid "SSH error (%1)"
 msgstr "SSH fout (%1)"
 
@@ -486,7 +487,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Er was niet genoeg geheugen om dit uit te voeren."
 
-#: src/lib/film.cc:406
+#: src/lib/film.cc:412
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -494,7 +495,7 @@ msgstr ""
 "Deze film is gemaakt met een nieuwere versie van DCP-o-matic en kan niet "
 "geopend worden. Sorry!"
 
-#: src/lib/film.cc:398
+#: src/lib/film.cc:404
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -508,7 +509,7 @@ msgstr ""
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:50
+#: src/lib/transcode_job.cc:53
 msgid "Transcode %1"
 msgstr "Omzetten %1"
 
@@ -520,11 +521,15 @@ msgstr "Bumper"
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
+#: src/lib/image_proxy.cc:172
+msgid "Unexpected image type received by server"
+msgstr ""
+
 #: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/lib/ffmpeg_decoder.cc:291
+#: src/lib/ffmpeg_decoder.cc:295
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Niet herkenbaar audio sample formaat (%1)"
 
@@ -532,15 +537,15 @@ msgstr "Niet herkenbaar audio sample formaat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Unsharp mask and Gaussian blur"
 
-#: src/lib/colour_conversion.cc:145
+#: src/lib/colour_conversion.cc:140
 msgid "Untitled"
 msgstr "Niet benoemd"
 
-#: src/lib/util.cc:807
+#: src/lib/util.cc:756
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
-#: src/lib/scp_dcp_job.cc:102
+#: src/lib/scp_dcp_job.cc:104
 msgid "Waiting"
 msgstr "Wachten"
 
@@ -552,39 +557,39 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:309
 msgid "You must add some content to the DCP before creating it"
 msgstr "U moet wat content toevoegen voor het maken van de DCP"
 
-#: src/lib/image_content.cc:72
+#: src/lib/image_content.cc:73
 msgid "[moving images]"
 msgstr "[bewegend beeld]"
 
-#: src/lib/image_content.cc:70
+#: src/lib/image_content.cc:71
 msgid "[still]"
 msgstr "[still]"
 
-#: src/lib/film.cc:247
+#: src/lib/film.cc:257
 msgid "cannot contain slashes"
 msgstr "er mag geen '\" gebruikt worden"
 
-#: src/lib/util.cc:581
+#: src/lib/util.cc:530
 msgid "connect timed out"
 msgstr "verbinding timeout"
 
-#: src/lib/scp_dcp_job.cc:126
+#: src/lib/scp_dcp_job.cc:128
 msgid "connecting"
 msgstr "verbinden"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:305
 msgid "container"
 msgstr "container"
 
-#: src/lib/film.cc:303
+#: src/lib/film.cc:313
 msgid "content type"
 msgstr "content type"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:177
 msgid "copying %1"
 msgstr "kopieeren %1"
 
@@ -592,19 +597,19 @@ msgstr "kopieeren %1"
 msgid "could not create file %1"
 msgstr "kan geen bestand maken %1"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:177
 msgid "could not find audio decoder"
 msgstr "kan geen audio decoder vinden"
 
-#: src/lib/ffmpeg.cc:105
+#: src/lib/ffmpeg.cc:106
 msgid "could not find stream information"
 msgstr "kan geen stream informatie vinden"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:156
 msgid "could not find video decoder"
 msgstr "kan geen videodecoder vinden"
 
-#: src/lib/writer.cc:424
+#: src/lib/writer.cc:428
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kan MXF audio niet plaatsen in DCP (%1)"
 
@@ -616,11 +621,11 @@ msgstr "kan audio bestand niet openen om te lezen"
 msgid "could not open file %1"
 msgstr "kan bestand niet openen %1"
 
-#: src/lib/dcp_video_frame.cc:352
+#: src/lib/dcp_video_frame.cc:334
 msgid "could not open file for reading"
 msgstr "kan bestand niet openen om te lezen"
 
-#: src/lib/dcp_video_frame.cc:358
+#: src/lib/dcp_video_frame.cc:340
 msgid "could not read encoded data"
 msgstr "kan encoded data niet lezen"
 
@@ -628,19 +633,19 @@ msgstr "kan encoded data niet lezen"
 msgid "could not read from file %1 (%2)"
 msgstr "kan bestand niet lezen %1 (%2)"
 
-#: src/lib/resampler.cc:102
+#: src/lib/resampler.cc:98
 msgid "could not run sample-rate converter"
 msgstr "kan sample-rate converter niet starten"
 
-#: src/lib/resampler.cc:83
+#: src/lib/resampler.cc:79
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "kan sample-rate converter niet starten gedurende %1 samples (%2) (%3)"
 
-#: src/lib/scp_dcp_job.cc:87
+#: src/lib/scp_dcp_job.cc:89
 msgid "could not start SCP session (%1)"
 msgstr "kan SCP sessie niet starten (%1)"
 
-#: src/lib/scp_dcp_job.cc:53
+#: src/lib/scp_dcp_job.cc:55
 msgid "could not start SSH session"
 msgstr "kan SSH sessie niet starten"
 
@@ -648,23 +653,23 @@ msgstr "kan SSH sessie niet starten"
 msgid "could not write to file %1 (%2)"
 msgstr "kan niet schrijven naar bestand %1 (%2)"
 
-#: src/lib/util.cc:601
+#: src/lib/util.cc:550
 msgid "error during async_accept (%1)"
 msgstr "fout met async_accepteren (FTP) (%1)"
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:526
 msgid "error during async_connect (%1)"
 msgstr "fout met async_verbinden (FTP) (%1)"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:599
 msgid "error during async_read (%1)"
 msgstr "fout met async_lezen (FTP) (%1)"
 
-#: src/lib/util.cc:622
+#: src/lib/util.cc:571
 msgid "error during async_write (%1)"
 msgstr "fout met async_schrijven (FTP) (%1)"
 
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:103
 msgid "frames per second"
 msgstr "frames per seconde"
 
@@ -684,7 +689,7 @@ msgstr "minuut"
 msgid "minutes"
 msgstr "minuten"
 
-#: src/lib/util.cc:722
+#: src/lib/util.cc:671
 msgid "missing key %1 in key-value set"
 msgstr "ontbrekende key %1 in key-value set"
 
@@ -692,19 +697,19 @@ msgstr "ontbrekende key %1 in key-value set"
 msgid "missing required setting %1"
 msgstr "ontbrekende verplichte setting %1"
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:88
 msgid "moving"
 msgstr "bewegend"
 
-#: src/lib/ffmpeg_decoder.cc:575
+#: src/lib/ffmpeg_decoder.cc:591
 msgid "multi-part subtitles not yet supported"
 msgstr "ondertitels met meerdere delen worden nog niet ondersteund."
 
-#: src/lib/film.cc:247 src/lib/film.cc:307
+#: src/lib/film.cc:257 src/lib/film.cc:317
 msgid "name"
 msgstr "naam"
 
-#: src/lib/ffmpeg_decoder.cc:590
+#: src/lib/ffmpeg_decoder.cc:606
 msgid "non-bitmap subtitles not yet supported"
 msgstr "non-bitmap ondertitels worden nog niet ondersteund"
 
@@ -714,11 +719,11 @@ msgstr "non-bitmap ondertitels worden nog niet ondersteund"
 msgid "remaining"
 msgstr "resterend"
 
-#: src/lib/config.cc:82 src/lib/video_content.cc:174
+#: src/lib/config.cc:85 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:83
+#: src/lib/config.cc:86
 msgid "sRGB non-linearised"
 msgstr "sRGB non-linearised"
 
@@ -726,10 +731,13 @@ msgstr "sRGB non-linearised"
 msgid "seconds"
 msgstr "secondes"
 
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:86
 msgid "still"
 msgstr "still"
 
 #: src/lib/ffmpeg_examiner.cc:168
 msgid "unknown"
 msgstr "onbekend"
+
+#~ msgid "Could not read DCP to make KDM for"
+#~ msgstr "Kan DCP niet lezen om KDM te maken"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 42efabedd..ef2c36d85 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/lib/sndfile_content.cc:62
+#: src/lib/sndfile_content.cc:61
 msgid "%1 [audio]"
 msgstr "%1 [ljud]"
 
-#: src/lib/ffmpeg_content.cc:207
+#: src/lib/ffmpeg_content.cc:211
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
-#: src/lib/sndfile_content.cc:83
+#: src/lib/sndfile_content.cc:82
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 kanaler, %2kHz, %3 sampel"
 
-#: src/lib/ffmpeg_content.cc:242
+#: src/lib/ffmpeg_content.cc:246
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 bilder; %2 bilder per sekund"
 
-#: src/lib/video_content.cc:205
+#: src/lib/video_content.cc:206
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixlar (%3:1)"
 
@@ -97,104 +97,109 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:751
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:77
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Kontrollerar befintligt bilddata"
 
-#: src/lib/writer.cc:460
+#: src/lib/writer.cc:464
 msgid "Computing audio digest"
 msgstr "Beräknar audiosammanfattning"
 
-#: src/lib/image_content.cc:104
+#: src/lib/image_content.cc:105
 msgid "Computing digest"
 msgstr "Beräknar sammanfattning"
 
-#: src/lib/writer.cc:456
+#: src/lib/writer.cc:460
 msgid "Computing image digest"
 msgstr "Beräknar bildsammanfattning"
 
-#: src/lib/util.cc:838
+#: src/lib/frame_rate_change.cc:78
 msgid "Content and DCP have the same rate.\n"
 msgstr "Källa och DCP har samma bildfrekvens.\n"
 
-#: src/lib/audio_content.cc:82
+#: src/lib/audio_content.cc:83
 msgid "Content to be joined must have the same audio delay."
 msgstr "Innehåll som ska sammanfogas måste använda samma audiofördröjning."
 
-#: src/lib/audio_content.cc:78
+#: src/lib/audio_content.cc:79
 msgid "Content to be joined must have the same audio gain."
 msgstr "Innehåll som ska sammanfogas måste använda samma audioförstärkning."
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:144
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Innehåll som ska sammanfogas måste använda samma färgkonvertering."
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:136
 msgid "Content to be joined must have the same crop."
 msgstr "Innehåll som ska sammanfogas måste använda samma beskärning."
 
-#: src/lib/video_content.cc:120
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same picture size."
 msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek."
 
-#: src/lib/video_content.cc:136
+#: src/lib/video_content.cc:140
 #, fuzzy
 msgid "Content to be joined must have the same scale setting."
 msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
 
-#: src/lib/subtitle_content.cc:74
+#: src/lib/subtitle_content.cc:73
 #, fuzzy
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
 
-#: src/lib/subtitle_content.cc:78
+#: src/lib/subtitle_content.cc:77
 #, fuzzy
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
 
-#: src/lib/subtitle_content.cc:82
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
 
-#: src/lib/video_content.cc:124
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Innehåll som ska sammanfogas måste använda samma videobildhastighet."
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same video frame type."
 msgstr "Innehåll som ska sammanfogas måste använda samma videobildtyp."
 
-#: src/lib/ffmpeg_content.cc:112
+#: src/lib/ffmpeg_content.cc:116
 msgid "Content to be joined must use the same audio stream."
 msgstr "Innehåll som ska sammanfogas måste använda samma audioström."
 
-#: src/lib/ffmpeg_content.cc:108
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Innehåll som ska sammanfogas måste använda samma undertextström."
 
-#: src/lib/scp_dcp_job.cc:110
+#: src/lib/scp_dcp_job.cc:112
 msgid "Copy DCP to TMS"
 msgstr "Kopiera DCP till TMS"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/scp_dcp_job.cc:137
 msgid "Could not connect to server %1 (%2)"
 msgstr "Kunde inte ansluta till server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:157
+#: src/lib/scp_dcp_job.cc:159
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 
+#: src/lib/image_proxy.cc:128
+#, fuzzy
+msgid "Could not decode image file"
+msgstr "kunde inte skapa fil %1"
+
 #: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Kunde inte öppna %1"
 
-#: src/lib/scp_dcp_job.cc:182
+#: src/lib/scp_dcp_job.cc:184
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
@@ -203,23 +208,19 @@ msgstr "Kunde inte öppna %1 för att skicka"
 msgid "Could not open downloaded ZIP file"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/film.cc:990
-msgid "Could not read DCP to make KDM for"
-msgstr "Kunde inte läsa DCP för att skapa KDM"
-
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:154
 msgid "Could not start SCP session (%1)"
 msgstr "Kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:196
+#: src/lib/scp_dcp_job.cc:198
 msgid "Could not write to remote file (%1)"
 msgstr "Kunde inte skriva till fjärrfil (%1)"
 
-#: src/lib/util.cc:850
+#: src/lib/frame_rate_change.cc:90
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "DCP kommer att köras på %1%% av källans hastighet.\n"
 
-#: src/lib/util.cc:841
+#: src/lib/frame_rate_change.cc:81
 msgid "DCP will use every other frame of the content.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
 
@@ -231,7 +232,7 @@ msgstr ""
 "DCP-o-matic kunde inte öppna filen %1. Saknas den, eller har den ett "
 "oförväntat format?"
 
-#: src/lib/ffmpeg_content.cc:89
+#: src/lib/ffmpeg_content.cc:93
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
@@ -241,7 +242,7 @@ msgid "De-interlacing"
 msgstr "Avflätning"
 
 # svåröversatt
-#: src/lib/config.cc:69
+#: src/lib/config.cc:71
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -267,11 +268,11 @@ msgstr "Dolby CP650 och CP750"
 msgid "Download failed (%1/%2 error %3)"
 msgstr ""
 
-#: src/lib/util.cc:843
+#: src/lib/frame_rate_change.cc:83
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Varje bild från källan kommer att användas två gånger i DCPn.\n"
 
-#: src/lib/util.cc:845
+#: src/lib/frame_rate_change.cc:85
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr ""
 "Varje bild från källan kommer att användas ytterligare %1 gång(er) i DCPn.\n"
@@ -280,7 +281,7 @@ msgstr ""
 msgid "Email KDMs for %1"
 msgstr "E-posta KDM:er för %1"
 
-#: src/lib/writer.cc:120
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "Kodar bild-data"
 
@@ -292,7 +293,7 @@ msgstr "Fel (%1)"
 msgid "Examine content"
 msgstr "Undersök innehållet"
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:147
 msgid "Failed to authenticate with server (%1)"
 msgstr "Misslyckades att autentisera med server (%1)"
 
@@ -320,7 +321,7 @@ msgstr "Gaussisk"
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:755
 msgid "Hearing impaired"
 msgstr ""
 
@@ -345,24 +346,24 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:800
+#: src/lib/util.cc:749
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:808
+#: src/lib/util.cc:757
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:810
+#: src/lib/util.cc:759
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:753
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:752
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -374,16 +375,16 @@ msgstr "Diverse"
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
 
-#: src/lib/video_content.cc:449
+#: src/lib/video_content.cc:476
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content.cc:446
+#: src/lib/video_content.cc:473
 #, fuzzy
 msgid "No stretch"
 msgstr "Flat utan utsträckning"
 
-#: src/lib/image_content.cc:49
+#: src/lib/image_content.cc:50
 msgid "No valid image files were found in the folder."
 msgstr ""
 
@@ -395,12 +396,12 @@ msgstr "Brusreducering"
 msgid "OK (ran for %1)"
 msgstr "OK (kördes %1)"
 
-#: src/lib/content.cc:100
+#: src/lib/content.cc:102
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 "Endast den första delen av innehållet som läggs ihop kan start-trimmas."
 
-#: src/lib/content.cc:104
+#: src/lib/content.cc:106
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Endast den sista delen av innehållet som läggs ihop kan slut-trimmas."
 
@@ -424,28 +425,28 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/config.cc:84 src/lib/config.cc:168
+#: src/lib/config.cc:87 src/lib/config.cc:174
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:750
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:809
+#: src/lib/util.cc:758
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:811
+#: src/lib/util.cc:760
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:754
 msgid "Right surround"
 msgstr "Höger surround"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:142
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
@@ -489,7 +490,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr ""
 
-#: src/lib/film.cc:406
+#: src/lib/film.cc:412
 #, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -499,7 +500,7 @@ msgstr ""
 "inte öppnas i denna version. Du måste skapa en ny Film, lägga till ditt "
 "innehåll och konfigurera allt igen. Ursäkta!"
 
-#: src/lib/film.cc:398
+#: src/lib/film.cc:404
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -513,7 +514,7 @@ msgstr ""
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:50
+#: src/lib/transcode_job.cc:53
 msgid "Transcode %1"
 msgstr "Konvertera %1"
 
@@ -525,12 +526,16 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
+#: src/lib/image_proxy.cc:172
+msgid "Unexpected image type received by server"
+msgstr ""
+
 #: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Okänt fel"
 
 # Svengelska
-#: src/lib/ffmpeg_decoder.cc:291
+#: src/lib/ffmpeg_decoder.cc:295
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Okänt audio-sampelformat (%1)"
 
@@ -538,15 +543,15 @@ msgstr "Okänt audio-sampelformat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Oskärpemask och Gaussisk suddighet"
 
-#: src/lib/colour_conversion.cc:145
+#: src/lib/colour_conversion.cc:140
 msgid "Untitled"
 msgstr "Utan titel"
 
-#: src/lib/util.cc:807
+#: src/lib/util.cc:756
 msgid "Visually impaired"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:102
+#: src/lib/scp_dcp_job.cc:104
 msgid "Waiting"
 msgstr "Väntar"
 
@@ -559,40 +564,40 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:309
 msgid "You must add some content to the DCP before creating it"
 msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
 
-#: src/lib/image_content.cc:72
+#: src/lib/image_content.cc:73
 msgid "[moving images]"
 msgstr "[rörliga bilder]"
 
-#: src/lib/image_content.cc:70
+#: src/lib/image_content.cc:71
 msgid "[still]"
 msgstr "[stillbild]"
 
-#: src/lib/film.cc:247
+#: src/lib/film.cc:257
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:581
+#: src/lib/util.cc:530
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
-#: src/lib/scp_dcp_job.cc:126
+#: src/lib/scp_dcp_job.cc:128
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:305
 msgid "container"
 msgstr "behållare"
 
-#: src/lib/film.cc:303
+#: src/lib/film.cc:313
 msgid "content type"
 msgstr "innehållstyp"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:177
 msgid "copying %1"
 msgstr "kopierar %1"
 
@@ -600,19 +605,19 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:177
 msgid "could not find audio decoder"
 msgstr "kunde inte hitta audio-avkodare"
 
-#: src/lib/ffmpeg.cc:105
+#: src/lib/ffmpeg.cc:106
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:156
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
-#: src/lib/writer.cc:424
+#: src/lib/writer.cc:428
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kunde inte flytta audio-MXF in i DCP:n (%1)"
 
@@ -624,11 +629,11 @@ msgstr "kunde inte öppna audio-fil för läsning"
 msgid "could not open file %1"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/dcp_video_frame.cc:352
+#: src/lib/dcp_video_frame.cc:334
 msgid "could not open file for reading"
 msgstr "kunde inte öppna fil för läsning"
 
-#: src/lib/dcp_video_frame.cc:358
+#: src/lib/dcp_video_frame.cc:340
 msgid "could not read encoded data"
 msgstr "kunde inte läsa kodat data"
 
@@ -636,20 +641,20 @@ msgstr "kunde inte läsa kodat data"
 msgid "could not read from file %1 (%2)"
 msgstr "kunde inte läsa från fil %1 (%2)"
 
-#: src/lib/resampler.cc:102
+#: src/lib/resampler.cc:98
 msgid "could not run sample-rate converter"
 msgstr "kunde inte köra sampelhastighetskonverteraren"
 
-#: src/lib/resampler.cc:83
+#: src/lib/resampler.cc:79
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr ""
 "kunde inte köra sampelhastighetskonverteraren under %1 sampel (%2) (%3)"
 
-#: src/lib/scp_dcp_job.cc:87
+#: src/lib/scp_dcp_job.cc:89
 msgid "could not start SCP session (%1)"
 msgstr "kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:53
+#: src/lib/scp_dcp_job.cc:55
 msgid "could not start SSH session"
 msgstr "kunde inte starta SSH-session"
 
@@ -657,23 +662,23 @@ msgstr "kunde inte starta SSH-session"
 msgid "could not write to file %1 (%2)"
 msgstr "kunde inte skriva till fil %1 (%2)"
 
-#: src/lib/util.cc:601
+#: src/lib/util.cc:550
 msgid "error during async_accept (%1)"
 msgstr "fel vid async_accept (%1)"
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:526
 msgid "error during async_connect (%1)"
 msgstr "fel vid async_connect (%1)"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:599
 msgid "error during async_read (%1)"
 msgstr "fel vid async_read (%1)"
 
-#: src/lib/util.cc:622
+#: src/lib/util.cc:571
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:103
 msgid "frames per second"
 msgstr "bilder per sekund"
 
@@ -693,7 +698,7 @@ msgstr "minut"
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:722
+#: src/lib/util.cc:671
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -702,19 +707,19 @@ msgid "missing required setting %1"
 msgstr "saknad nödvändig inställning %1"
 
 # Sammanhang?
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:88
 msgid "moving"
 msgstr "rörlig"
 
-#: src/lib/ffmpeg_decoder.cc:575
+#: src/lib/ffmpeg_decoder.cc:591
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:247 src/lib/film.cc:307
+#: src/lib/film.cc:257 src/lib/film.cc:317
 msgid "name"
 msgstr "namn"
 
-#: src/lib/ffmpeg_decoder.cc:590
+#: src/lib/ffmpeg_decoder.cc:606
 msgid "non-bitmap subtitles not yet supported"
 msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 
@@ -724,11 +729,11 @@ msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/config.cc:82 src/lib/video_content.cc:174
+#: src/lib/config.cc:85 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:83
+#: src/lib/config.cc:86
 msgid "sRGB non-linearised"
 msgstr "sRGB icke-linjär"
 
@@ -736,7 +741,7 @@ msgstr "sRGB icke-linjär"
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:86
 msgid "still"
 msgstr "stillbild"
 
@@ -744,6 +749,9 @@ msgstr "stillbild"
 msgid "unknown"
 msgstr "okänd"
 
+#~ msgid "Could not read DCP to make KDM for"
+#~ msgstr "Kunde inte läsa DCP för att skapa KDM"
+
 #~ msgid "Cubic interpolating deinterlacer"
 #~ msgstr "Kubiskt interpolerande avflätare"
 
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index b0bccdbcc..79eab5fb7 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
-"PO-Revision-Date: 2014-01-14 19:49+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-21 02:38+0100\n"
+"Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 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 benutzt "
@@ -26,57 +26,61 @@ msgstr ""
 
 #: src/tools/dcpomatic_batch.cc:49
 msgid "&Add Film..."
-msgstr ""
+msgstr "&Projekt hinzufügen"
+
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr "&Quelle"
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
-msgstr "%Ende"
+msgstr "&Ende"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Datei"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Aufgaben"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&DCP erstellen"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Öffnen..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Einstellungen..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Eigenschaften..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Speichern"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&DCP an TMS senden"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Werkzeuge"
 
@@ -84,110 +88,128 @@ msgstr "&Werkzeuge"
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Über"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Über DCP-o-matic"
 
 #: src/tools/dcpomatic_batch.cc:84
 msgid "Add Film..."
-msgstr ""
+msgstr "Projekt hinzufügen..."
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
+"Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
+"den Autor von DCP-o-matic (carl@dcpomatic.com)!"
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
-msgstr ""
+msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr "Medien der CPL sind nicht verschlüsselt worden."
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
-msgstr "Auf Updates überprüfen"
+msgstr "Auf Updates überprüfen..."
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Film %1 (%2) konnte nicht geladen werden"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Der Film konnte nicht bei %s (%s) geöffnet werden"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
-msgstr "DCP kann nicht gezeigt werden (Konqueror konnte nicht geladen werden)"
+msgstr ""
+"DCP kann nicht angezeigt werden (Konqueror konnte nicht gestartet werden)"
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
-msgstr "DCP Kann nicht gezeigt werden (Nautilus konnte nicht geladen werden)"
+msgstr "DCP kann nicht angezeigt werden (Nautilus konnte nicht geladen werden)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
 #: src/tools/dcpomatic_batch.cc:139 src/tools/dcpomatic_batch.cc:240
 msgid "DCP-o-matic Batch Converter"
-msgstr ""
+msgstr "DCP-o-matic Batch Converter"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Encoding Server..."
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
-msgstr "Film gewechselt"
+msgstr "Projekt gewechselt"
 
 #: src/tools/dcpomatic_batch.cc:145
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
+"Kostenlose Open-Source-Software zur DCP-Erstellung aus nahezu allen "
+"Quellformaten."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
-msgstr "Tips..."
+msgstr "Tipps..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "&KDM erstellen..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Neu..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "Z&eige DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
-msgstr "Änderungen des Films \"%s\" für dem Schließen speichern ?"
+msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
+
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr "Skalieren auf &Höhe DCI-Container"
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr "Skalieren auf &Breite DCI-Container"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
-msgstr "Zu öffnenden Film auswählen"
+msgstr "Zu öffnendes Projekt auswählen"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
 "using only has %.1f Gb available.  Do you want to continue anyway?"
 msgstr ""
-"Das DCP für diesen Film wird etwa %.1f GB groß. Auf dem ausgewählten "
-"Laufwerk sind aber nur %.1f GB frei. Möchten Sie trotzdem weitermachen ?"
+"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:782
+#: src/tools/dcpomatic.cc:804
 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:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
@@ -195,27 +217,30 @@ msgstr ""
 "Der Ordner %1 existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
 "benutzen ?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
-msgstr "Es ist keine neue Version des DCP-o-matic verfügbar."
+msgstr "Es ist keine neue Version von DCP-o-matic verfügbar."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
-"Manche Aufgaben sind nicht erledigt; sind Sie sicher dass Sie Beenden "
+"Manche Aufgaben sind nicht erledigt - sind Sie sicher, dass Sie Beenden "
 "wollen ?"
 
-#: src/tools/dcpomatic.cc:145
+#: src/tools/dcpomatic.cc:141
 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 ""
+"Dieses Projekt ist mit einer alten Version von DCP-o-matic gespeichert "
+"worden und wird in dieser Programmversion möglicherweise nicht korrekt "
+"umgesetzt. Bitte prüfen Sie alle Projekteinstellungen sorgfältig!"
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Unerledigte Aufgaben"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index c62f3ff20..92d9a7853 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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-04-20 10:21-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.4\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 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."
 
@@ -25,55 +25,59 @@ msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
 msgid "&Add Film..."
 msgstr "&Añadir película..."
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Herramientas"
 
@@ -83,11 +87,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Acerca de DVD-o-matic"
 
@@ -95,39 +99,43 @@ msgstr "Acerca de DVD-o-matic"
 msgid "Add Film..."
 msgstr "Añadir película..."
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr "Ha ocurrido un error desconocido."
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, 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:538
+#: src/tools/dcpomatic.cc:530
 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:531
+#: src/tools/dcpomatic.cc:523
 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:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -135,11 +143,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "Convertidor por lotes DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Servidores de codificación..."
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Película cambiada"
 
@@ -149,32 +157,40 @@ msgstr ""
 "Generación libre y de código abierto de DCP a partir de casi cualquier "
 "fuente."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Pistas..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "Crear &KDMs..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, 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:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -184,26 +200,26 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 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:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 "El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 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:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 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:145
+#: src/tools/dcpomatic.cc:141
 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."
@@ -212,11 +228,11 @@ msgstr ""
 "cargue correctamente en esta versión. Por favor revisa cuidadosamente las "
 "opciones."
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Trabajos sin finalizar"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 41cde4f5a..832f409b9 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
-"PO-Revision-Date: 2014-04-18 22:54+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-20 15:57+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "Le fichier %1 existe déjà, vous ne pouvez l'utiliser pour un nouveau projet."
@@ -26,55 +26,59 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "&Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr "&Adaptation"
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Outils"
 
@@ -84,11 +88,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
@@ -96,39 +100,45 @@ msgstr "À propos de DCP-o-matic"
 msgid "Add Film..."
 msgstr "Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
+"Erreur indeterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
+"matic (carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr "Une exception inconnue est arrivée"
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr "Le contenu du DCP n'est pas crypté."
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Recherche mises à jour"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -136,11 +146,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic - Convertisseur Batch"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Serveurs d'encodage"
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Film changé"
 
@@ -148,32 +158,40 @@ msgstr "Film changé"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Création de DCP libre et open-source à partir de presque tout."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Avertissements..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "Générer &KDMs..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr "Adapter pour remplir la &hauteur"
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr "Adapter pour remplir la largeur"
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -182,26 +200,26 @@ msgstr ""
 "Le DCP de ce film prendra environ %.1f Go d'espace. Le disque que vous "
 "utilisez n'a que %.1f Go disponible(s). Souhaitez-vous continuer?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 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:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 "Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Aucune mise à jour disponible pour DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Il y a des tâches inachevées ; voulez-vous vraiment quitter ?"
 
-#: src/tools/dcpomatic.cc:145
+#: src/tools/dcpomatic.cc:141
 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."
@@ -210,11 +228,11 @@ msgstr ""
 "être ouvert correctement dans cette version. Veuillez vérifier les "
 "paramètres de réglages très attentivement."
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Travaux incomplets"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 465d32192..dc30ef04c 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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 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"
 
@@ -25,55 +25,59 @@ msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
 msgid "&Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Strumenti"
 
@@ -83,11 +87,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Su DVD-o-matic"
 
@@ -95,39 +99,43 @@ msgstr "Su DVD-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Controlla aggiornamenti"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -135,11 +143,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Film modificato"
 
@@ -147,32 +155,40 @@ msgstr "Film modificato"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Genera DCP da quasi tutto, free e open-source."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Suggerimenti..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -181,35 +197,35 @@ 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:782
+#: src/tools/dcpomatic.cc:804
 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:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 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:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 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:145
+#: src/tools/dcpomatic.cc:141
 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:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Processo in corso"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 0495207e6..5730dadad 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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-03-30 19:38+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "%1 Dit bestand bestaat al, hierdoor kunt u het niet gebruiken voor een "
@@ -28,55 +28,59 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "Open een DCP map"
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Edit"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Afsluiten"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Bestand"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Help"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Projecten"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Maak een DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Openen..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Voorkeuren..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Instellingen..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Afsluiten"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Opslaan"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Verstuur DCP naar TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Gereedschappen"
 
@@ -85,11 +89,11 @@ msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Over.."
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Over DCP-o-matic"
 
@@ -97,39 +101,43 @@ msgstr "Over DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Controleer op updates"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Kan film niet openen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kan film niet openen in  %s (%s)"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kan DCP niet vertonen (Kan Konqueror niet starten)"
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kan DCP niet vertonen (Kan Nautilus niet starten)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -137,11 +145,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Render servers..."
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Film is veranderd"
 
@@ -149,32 +157,40 @@ msgstr "Film is veranderd"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Tips"
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "Maak &KDMs..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Nieuw..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "S&hoe DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Bewaar veranderingen naar film \"%s\" voor afsluiten?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Kies een film om te openen"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -183,26 +199,26 @@ msgstr ""
 "De DCP voor deze film neemt ongeveer %.1f Gb in beslag, er is echter maar "
 "%.1f Gb beschikbaar.  Wilt u toch doorgaan?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "De verbinding met de DCP-o-matic download server is niet beschikbaar."
 
-#: src/tools/dcpomatic.cc:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "De map %1 bestaat al en is niet leeg. Wilt u deze toch gebruiken?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Er is geen nieuwere versie van DCP-o-matic beschikbaar."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Er zijn nog niet afgeronde projecten, weet u zeker dat u wilt afsluiten?"
 
-#: src/tools/dcpomatic.cc:145
+#: src/tools/dcpomatic.cc:141
 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."
@@ -210,11 +226,11 @@ msgstr ""
 "Deze film is gemaakt met een oude versie van DCP-o-matic en opent mogelijk "
 "niet goed in de huidige versie.  Controleer alle instellingen zorgvuldig."
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Niet afgemaakte projecten"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 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 901ad3179..bf69aafc9 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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 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."
 
@@ -25,55 +25,59 @@ msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
 msgid "&Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Verktyg"
 
@@ -83,11 +87,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
@@ -95,39 +99,43 @@ msgstr "Om DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Leta efter uppdateringar"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kunde inte visa DCP (kunde inte köra konqueror)"
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kunde inte visa DCP (kunde inte köra nautilus)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -135,11 +143,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Kodningsservrar..."
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Film ändrad"
 
@@ -148,32 +156,40 @@ msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 "Fri, öppen-källkodsprogramvara för DCP-generering från nästan vad som helst."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Råd..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "Skapa &KDM:er..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -182,11 +198,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:782
+#: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matics nedladdningsserver kunde inte kontaktas."
 
-#: src/tools/dcpomatic.cc:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
@@ -194,25 +210,25 @@ msgstr ""
 "Foldern %1 finns redan och är inte tom. Är du säker på att du vill använda "
 "den?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 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:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 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:145
+#: src/tools/dcpomatic.cc:141
 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:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Oavslutade jobb"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index dd80e94cb..21274cda2 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -105,6 +105,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	translated_by.Add (wxT ("Markus Raab"));
 	translated_by.Add (wxT ("Theo Kooijmans"));
 	translated_by.Add (wxT ("Max Aeschlimann"));
+	translated_by.Add (wxT ("Carsten Kurz"));
 	add_section (_("Translated by"), translated_by);
 
 	wxArrayString artwork_by;
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 26237db31..179d7db71 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -50,7 +50,7 @@ AudioPanel::AudioPanel (FilmEditor* e)
 	grid->Add (_show, wxGBPosition (r, 0));
 	++r;
 
-	add_label_to_grid_bag_sizer (grid, this, _("Audio Gain"), true, wxGBPosition (r, 0));
+	add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
 	_gain = new ContentSpinCtrlDouble<AudioContent> (
 		this,
 		new wxSpinCtrlDouble (this),
@@ -65,7 +65,7 @@ AudioPanel::AudioPanel (FilmEditor* e)
 	grid->Add (_gain_calculate_button, wxGBPosition (r, 3));
 	++r;
 
-	add_label_to_grid_bag_sizer (grid, this, _("Audio Delay"), true, wxGBPosition (r, 0));
+	add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
 	_delay = new ContentSpinCtrl<AudioContent> (
 		this,
 		new wxSpinCtrl (this),
@@ -79,7 +79,7 @@ AudioPanel::AudioPanel (FilmEditor* e)
 	add_label_to_grid_bag_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
 	++r;
 
-	add_label_to_grid_bag_sizer (grid, this, _("Audio Stream"), true, wxGBPosition (r, 0));
+	add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
 	_stream = new wxChoice (this, wxID_ANY);
 	grid->Add (_stream, wxGBPosition (r, 1));
 	_description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3));
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index b447e0eee..94ab0597b 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -107,25 +107,6 @@ public:
 		_num_local_encoding_threads = new wxSpinCtrl (panel);
 		table->Add (_num_local_encoding_threads, 1);
 
-		add_label_to_sizer (table, panel, _("Outgoing mail server"), true);
-		_mail_server = new wxTextCtrl (panel, wxID_ANY);
-		table->Add (_mail_server, 1, wxEXPAND | wxALL);
-		
-		add_label_to_sizer (table, panel, _("Mail user name"), true);
-		_mail_user = new wxTextCtrl (panel, wxID_ANY);
-		table->Add (_mail_user, 1, wxEXPAND | wxALL);
-		
-		add_label_to_sizer (table, panel, _("Mail password"), true);
-		_mail_password = new wxTextCtrl (panel, wxID_ANY);
-		table->Add (_mail_password, 1, wxEXPAND | wxALL);
-		
-		wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false);
-		plain->SetFont (font);
-		table->AddSpacer (0);
-		
-		add_label_to_sizer (table, panel, _("From address for KDM emails"), true);
-		_kdm_from = new wxTextCtrl (panel, wxID_ANY);
-		table->Add (_kdm_from, 1, wxEXPAND | wxALL);
 		
 		_check_for_updates = new wxCheckBox (panel, wxID_ANY, _("Check for updates on startup"));
 		table->Add (_check_for_updates, 1, wxEXPAND | wxALL);
@@ -164,14 +145,6 @@ public:
 		_num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
 		_num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this));
 
-		_mail_server->SetValue (std_to_wx (config->mail_server ()));
-		_mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_server_changed, this));
-		_mail_user->SetValue (std_to_wx (config->mail_user ()));
-		_mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_user_changed, this));
-		_mail_password->SetValue (std_to_wx (config->mail_password ()));
-		_mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_password_changed, this));
-		_kdm_from->SetValue (std_to_wx (config->kdm_from ()));
-		_kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::kdm_from_changed, this));
 		_check_for_updates->SetValue (config->check_for_updates ());
 		_check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this));
 		_check_for_test_updates->SetValue (config->check_for_test_updates ());
@@ -223,26 +196,6 @@ private:
 		}
 	}
 	
-	void mail_server_changed ()
-	{
-		Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ()));
-	}
-	
-	void mail_user_changed ()
-	{
-		Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ()));
-	}
-	
-	void mail_password_changed ()
-	{
-		Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ()));
-	}
-	
-	void kdm_from_changed ()
-	{
-		Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
-	}
-
 	void check_for_updates_changed ()
 	{
 		Config::instance()->set_check_for_updates (_check_for_updates->GetValue ());
@@ -261,10 +214,6 @@ private:
 	wxCheckBox* _set_language;
 	wxChoice* _language;
 	wxSpinCtrl* _num_local_encoding_threads;
-	wxTextCtrl* _mail_server;
-	wxTextCtrl* _mail_user;
-	wxTextCtrl* _mail_password;
-	wxTextCtrl* _kdm_from;
 	wxCheckBox* _check_for_updates;
 	wxCheckBox* _check_for_test_updates;
 };
@@ -698,22 +647,82 @@ public:
 #endif		
 		wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
 		panel->SetSizer (s);
+
+		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+		table->AddGrowableCol (1, 1);
+		s->Add (table, 1, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, _border);
+
+		add_label_to_sizer (table, panel, _("Outgoing mail server"), true);
+		_mail_server = new wxTextCtrl (panel, wxID_ANY);
+		table->Add (_mail_server, 1, wxEXPAND | wxALL);
 		
-		_kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
-		s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
+		add_label_to_sizer (table, panel, _("Mail user name"), true);
+		_mail_user = new wxTextCtrl (panel, wxID_ANY);
+		table->Add (_mail_user, 1, wxEXPAND | wxALL);
+		
+		add_label_to_sizer (table, panel, _("Mail password"), true);
+		_mail_password = new wxTextCtrl (panel, wxID_ANY);
+		table->Add (_mail_password, 1, wxEXPAND | wxALL);
+		
+		wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false);
+		wxFont font = plain->GetFont();
+		font.SetStyle (wxFONTSTYLE_ITALIC);
+		font.SetPointSize (font.GetPointSize() - 1);
+		plain->SetFont (font);
+		table->AddSpacer (0);
+		
+		add_label_to_sizer (table, panel, _("From address"), true);
+		_kdm_from = new wxTextCtrl (panel, wxID_ANY);
+		table->Add (_kdm_from, 1, wxEXPAND | wxALL);
 		
+		_kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
+		s->Add (_kdm_email, 1.5, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, _border);
+
+		Config* config = Config::instance ();
+		_mail_server->SetValue (std_to_wx (config->mail_server ()));
+		_mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this));
+		_mail_user->SetValue (std_to_wx (config->mail_user ()));
+		_mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this));
+		_mail_password->SetValue (std_to_wx (config->mail_password ()));
+		_mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this));
+		_kdm_from->SetValue (std_to_wx (config->kdm_from ()));
+		_kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this));
 		_kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this));
 		_kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
 
 		return panel;
 	}
 
-private:	
+private:
+	void mail_server_changed ()
+	{
+		Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ()));
+	}
+	
+	void mail_user_changed ()
+	{
+		Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ()));
+	}
+	
+	void mail_password_changed ()
+	{
+		Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ()));
+	}
+	
+	void kdm_from_changed ()
+	{
+		Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
+	}
+
 	void kdm_email_changed ()
 	{
 		Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
 	}
 
+	wxTextCtrl* _mail_server;
+	wxTextCtrl* _mail_user;
+	wxTextCtrl* _mail_password;
+	wxTextCtrl* _kdm_from;
 	wxTextCtrl* _kdm_email;
 };
 
@@ -736,10 +745,15 @@ public:
 		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
 		s->Add (table, 1, wxALL | wxEXPAND, _border);
-		
-		add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true);
-		_maximum_j2k_bandwidth = new wxSpinCtrl (panel);
-		table->Add (_maximum_j2k_bandwidth, 1);
+
+		{
+			add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true);
+			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+			_maximum_j2k_bandwidth = new wxSpinCtrl (panel);
+			s->Add (_maximum_j2k_bandwidth, 1);
+			add_label_to_sizer (s, panel, _("Mbit/s"), false);
+			table->Add (s, 1);
+		}
 
 		_allow_any_dcp_frame_rate = new wxCheckBox (panel, wxID_ANY, _("Allow any DCP frame rate"));
 		table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
@@ -754,7 +768,7 @@ public:
 		_log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
 		table->AddSpacer (0);
 		table->Add (_log_error, 1, wxEXPAND | wxALL);
-		_log_timing = new wxCheckBox (panel, wxID_ANY, _("Timing"));
+		_log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
 		table->AddSpacer (0);
 		table->Add (_log_timing, 1, wxEXPAND | wxALL);
 
@@ -828,10 +842,7 @@ create_config_dialog ()
 	wxSize ps = wxSize (480, -1);
 	int const border = 16;
 #else
-	/* We seem to need to specify height here, otherwise the general panel
-	   is too short (at least on Linux).
-	 */
-	wxSize ps = wxSize (-1, 400);
+	wxSize ps = wxSize (-1, -1);
 	int const border = 8;
 #endif
 	
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 42b8297f0..6750e0e98 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -96,7 +96,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
 
 
 	/* Sub-heading: Timing */
-	h = new wxStaticText (this, wxID_ANY, _("Timing"));
+	h = new wxStaticText (this, wxID_ANY, S_("KDM|Timing"));
 	h->SetFont (subheading_font);
 	vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 	
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index fcae1c83f..52e3a2cc4 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
-"PO-Revision-Date: 2014-01-14 20:00+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-21 04:06+0100\n"
+"Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
@@ -29,60 +29,63 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:121
 msgid "(password will be stored on disk in plaintext)"
-msgstr "(Passwort wird in Klartext gespeichert)"
+msgstr "(Passwort wird im Klartext gespeichert!)"
 
 #: src/wx/config_dialog.cc:98
 msgid "(restart DCP-o-matic to see language changes)"
-msgstr "(DCP-o-matic zum ändern der Sprache neu starten)"
+msgstr "(Programm zum Ändern der Sprache neu starten)"
 
-#: src/wx/audio_mapping_view.cc:135
-msgid "-3dB"
-msgstr "-3dB"
+#: src/wx/audio_mapping_view.cc:134
+msgid "-6dB"
+msgstr "-6dB"
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
 msgstr "1/"
 
-#: src/wx/audio_panel.cc:236
+#: src/wx/audio_panel.cc:238
 msgid "1 channel"
 msgstr "1 Kanal"
 
-#: src/wx/video_panel.cc:196
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/film_editor.cc:220
+#: src/wx/isdcf_metadata_dialog.cc:68
+msgid "2D version of content available in 3D"
+msgstr "2D Version eines Films, der auch in 3D verfügbar ist"
+
+#: src/wx/film_editor.cc:224
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/film_editor.cc:168
+#: src/wx/film_editor.cc:171
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:200
 msgid "3D alternate"
-msgstr ""
+msgstr "3D Sequentiell"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:201
 msgid "3D left only"
-msgstr ""
+msgstr "3D nur links"
 
-#: src/wx/video_panel.cc:197
+#: src/wx/video_panel.cc:198
 msgid "3D left/right"
 msgstr "3D Links/Rechts"
 
-#: src/wx/video_panel.cc:201
-#, fuzzy
+#: src/wx/video_panel.cc:202
 msgid "3D right only"
-msgstr "3D Links/Rechts"
+msgstr "3D nur rechts"
 
-#: src/wx/video_panel.cc:198
+#: src/wx/video_panel.cc:199
 msgid "3D top/bottom"
 msgstr "3D Oben/Unten"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:225
 msgid "4K"
 msgstr "4K"
 
@@ -94,19 +97,19 @@ msgstr "Es ist eine neue Version von DCP-o-matic verfügbar."
 msgid "About DCP-o-matic"
 msgstr "Über DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:79
 msgid "Add Cinema..."
 msgstr "Kino hinzufügen..."
 
-#: src/wx/kdm_dialog.cc:73
+#: src/wx/kdm_dialog.cc:86
 msgid "Add Screen..."
 msgstr "Saal hinzufügen..."
 
-#: src/wx/film_editor.cc:280
+#: src/wx/film_editor.cc:279
 msgid "Add file(s)..."
 msgstr "Datei(en) hinzufügen..."
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:281
 msgid "Add folder..."
 msgstr "Ordner hinzufügen..."
 
@@ -114,9 +117,13 @@ msgstr "Ordner hinzufügen..."
 msgid "Add..."
 msgstr "Hinzufügen..."
 
-#: src/wx/about_dialog.cc:108
+#: src/wx/config_dialog.cc:743
+msgid "Allow any DCP frame rate"
+msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)"
+
+#: src/wx/about_dialog.cc:109
 msgid "Artwork by"
-msgstr ""
+msgstr "Grafik von"
 
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
@@ -124,13 +131,13 @@ msgstr "Ton"
 
 #: src/wx/audio_panel.cc:67
 msgid "Audio Delay"
-msgstr "Ton Delay"
+msgstr "Verzögerung"
 
 #: src/wx/audio_panel.cc:52
 msgid "Audio Gain"
-msgstr "Lautstärke"
+msgstr "Verstärkung"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Ton Sprache (z.B. DE)"
 
@@ -138,24 +145,24 @@ msgstr "Ton Sprache (z.B. DE)"
 msgid "Audio Stream"
 msgstr "Tonspur"
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Ton Kanäle"
 
-#: src/wx/audio_mapping_view.cc:353
+#: src/wx/audio_mapping_view.cc:350
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
-"Der Ton von Kanal %d wird ohne Veränderung an das DCP Kanal %d weitergegeben."
+"Der Ton von Kanal %d wird ohne Veränderung an den DCP Kanal %d weitergegeben."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
 "%.1fdB."
 msgstr ""
-"Der Ton von Kanal %d wird wird an das DCP Kanal %d mit %.1fdB Pegel "
+"Der Ton von Kanal %d wird wird an den DCP Kanal %d mit %.1fdB Pegel "
 "weitergegeben."
 
 #: src/wx/job_wrapper.cc:38
@@ -163,30 +170,42 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Falsche Einstellung für %s (%s)"
 
-#: src/wx/video_panel.cc:120
+#: src/wx/video_panel.cc:121
 msgid "Bottom crop"
 msgstr "Unten beschneiden"
 
-#: src/wx/dir_picker_ctrl.cc:37
+#: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Durchsuchen..."
 
-#: src/wx/audio_mapping_view.cc:320
+#: src/wx/audio_mapping_view.cc:317
 msgid "BsL"
-msgstr ""
+msgstr "BsL"
 
-#: src/wx/audio_mapping_view.cc:324
+#: src/wx/audio_mapping_view.cc:321
 msgid "BsR"
-msgstr ""
+msgstr "BsR"
 
 #: src/wx/gain_calculator_dialog.cc:32
 msgid "But I have to use fader"
-msgstr "Aber ich muss diese Lautstärke benutzen"
+msgstr "Aber ich nutze gegenwärtig Faderstellung"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:285
 msgid "C"
 msgstr "C"
 
+#: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
+msgid "CPL"
+msgstr "CPL"
+
+#: src/wx/kdm_dialog.cc:143
+msgid "CPL ID"
+msgstr "CPL ID"
+
+#: src/wx/kdm_dialog.cc:146
+msgid "CPL annotation text"
+msgstr "CPL annotation text"
+
 #: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Berechne..."
@@ -196,64 +215,69 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #: src/wx/screen_dialog.cc:44
-#, fuzzy
 msgid "Certificate"
-msgstr "Zertifikat Datei auswählen"
+msgstr "Zertifikat"
 
 #: src/wx/dolby_certificate_dialog.cc:157
 #: src/wx/doremi_certificate_dialog.cc:67
-#, fuzzy
 msgid "Certificate downloaded"
-msgstr "Zertifikat Datei auswählen"
+msgstr "Zertifikat heruntergeladen"
+
+#: src/wx/isdcf_metadata_dialog.cc:65
+msgid "Chain"
+msgstr "Kinokette"
 
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
-msgstr "Kanal Pegel"
+msgstr "Kanal Verstärkung"
 
 #: src/wx/audio_dialog.cc:44
 msgid "Channels"
 msgstr "Kanäle"
 
-#: src/wx/config_dialog.cc:137
+#: src/wx/config_dialog.cc:133
 msgid "Check for testing updates as well as stable ones"
-msgstr "Überprüfung auf Updates auch für Test-Versionen."
+msgstr "Zeige bei Updateprüfung auch Test-Versionen an"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:129
 msgid "Check for updates on startup"
-msgstr "Beim Starten auf Updates überprüfen."
+msgstr "Beim Start auf Updates überprüfen."
 
 #: src/wx/content_menu.cc:182
 msgid "Choose a file"
 msgstr "Datei auswählen"
 
-#: src/wx/film_editor.cc:775
+#: src/wx/film_editor.cc:788
 msgid "Choose a file or files"
 msgstr "Eine oder mehrere Dateien auswählen"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:811
 msgid "Choose a folder"
 msgstr "Ordner wählen"
 
 #: src/wx/dolby_certificate_dialog.cc:43
-#, fuzzy
 msgid "Cinema"
-msgstr "Kino hinzufügen..."
+msgstr "Kino"
 
-#: src/wx/config_dialog.cc:561
-#, fuzzy
+#: src/wx/config_dialog.cc:547
 msgid "Colour Conversions"
 msgstr "Farbumwandlungen"
 
 #: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:162
 msgid "Colour conversion"
 msgstr "Farbumwandlung"
 
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Timing"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Container"
 
-#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:270 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Inhalt"
 
@@ -261,25 +285,25 @@ msgstr "Inhalt"
 msgid "Content Type"
 msgstr "Inhalt Typ"
 
-#: src/wx/video_panel.cc:331
+#: src/wx/video_panel.cc:332
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Inhalt Bildrate %4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:32
+#: src/wx/isdcf_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Inhalt Version"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:292
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Inhalt Video ist %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:136
+#: src/wx/audio_dialog.cc:151
 msgid "Could not analyse audio."
 msgstr "Ton konnte nicht analysiert werden"
 
-#: src/wx/film_viewer.cc:345
+#: src/wx/film_viewer.cc:346
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
@@ -289,28 +313,29 @@ msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
 msgid "Could not make DCP: %s"
 msgstr "DCP konnte nicht erstellt werden: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "In Ordner erstellen"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:304
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beschnitten zu %dx%d(%.2f:1)\n"
 
-#: src/wx/video_panel.cc:243
+#: src/wx/video_panel.cc:244
 msgid "Custom"
-msgstr "Eigen"
-
-#: src/wx/dci_metadata_dialog.cc:30
-msgid "DCI name"
-msgstr "DCI Name"
+msgstr "Eigene"
 
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
+#: src/wx/film_editor.cc:87
 msgid "DCP"
 msgstr "DCP"
 
@@ -318,6 +343,10 @@ msgstr "DCP"
 msgid "DCP Name"
 msgstr "DCP Name"
 
+#: src/wx/kdm_dialog.cc:140
+msgid "DCP directory"
+msgstr "DCP Verzeichnis"
+
 #: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
@@ -327,47 +356,45 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic Ton - %s"
 
-#: src/wx/config_dialog.cc:331
-msgid "Default DCI name details"
-msgstr "Standard DCI Name Details"
+#: src/wx/config_dialog.cc:317
+msgid "Default ISDCF name details"
+msgstr "Standard ISDCF Name Details"
 
-#: src/wx/config_dialog.cc:344
+#: src/wx/config_dialog.cc:330
 msgid "Default JPEG2000 bandwidth"
-msgstr "Standard JPEG2000 Bandbreite"
+msgstr "Standard JPEG2000 Datenrate"
 
-#: src/wx/config_dialog.cc:353
+#: src/wx/config_dialog.cc:339
 msgid "Default audio delay"
-msgstr "Standard Ton Delay"
+msgstr "Standard Ton Verzögerung"
 
-#: src/wx/config_dialog.cc:335
+#: src/wx/config_dialog.cc:321
 msgid "Default container"
 msgstr "Standard Container"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:325
 msgid "Default content type"
 msgstr "Standard Inhalt Typ"
 
-#: src/wx/config_dialog.cc:365
-#, fuzzy
+#: src/wx/config_dialog.cc:351
 msgid "Default creator"
-msgstr "Standard Container"
+msgstr "Standard 'creator' (DCI)"
 
-#: src/wx/config_dialog.cc:323
+#: src/wx/config_dialog.cc:309
 msgid "Default directory for new films"
-msgstr "Standard Ordner für neue Filme"
+msgstr "Standard Ordner für neue Projekte"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/config_dialog.cc:301
 msgid "Default duration of still images"
-msgstr "Standard Länge der Standbilder"
+msgstr "Standard Länge für Standbilder"
 
-#: src/wx/config_dialog.cc:361
-#, fuzzy
+#: src/wx/config_dialog.cc:347
 msgid "Default issuer"
-msgstr "Standards"
+msgstr "Standard 'issuer' (DCI)"
 
-#: src/wx/config_dialog.cc:294
+#: src/wx/config_dialog.cc:280
 msgid "Defaults"
-msgstr "Standards"
+msgstr "Vorgaben"
 
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
@@ -380,80 +407,82 @@ msgstr "Festplattenplatz benötigt"
 #: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
 #: src/wx/screen_dialog.cc:135
 msgid "Dolby"
-msgstr ""
+msgstr "Dolby"
 
 #: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
 #: src/wx/screen_dialog.cc:134
 msgid "Doremi"
-msgstr ""
+msgstr "Doremi"
 
 #: src/wx/doremi_certificate_dialog.cc:48
 msgid "Doremi serial numbers must have 6 digits"
-msgstr ""
+msgstr "Doremi Seriennummern müssen aus 6 Zahlen bestehen!"
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:287
 msgid "Down"
 msgstr "Nach unten"
 
 #: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
-#, fuzzy
 msgid "Download"
-msgstr "Nach unten"
+msgstr "Download"
 
 #: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
-msgstr ""
+msgstr "Lade Zertifikat"
 
 #: src/wx/dolby_certificate_dialog.cc:132
 #: src/wx/doremi_certificate_dialog.cc:52
 msgid "Downloading certificate"
-msgstr ""
+msgstr "Zertifikat wird heruntergeladen..."
 
-#: src/wx/kdm_dialog.cc:68
+#: src/wx/kdm_dialog.cc:81
 msgid "Edit Cinema..."
 msgstr "Kino bearbeiten..."
 
-#: src/wx/kdm_dialog.cc:75
+#: src/wx/kdm_dialog.cc:88
 msgid "Edit Screen..."
 msgstr "Saal bearbeiten..."
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
-#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
 #: src/wx/cinema_dialog.cc:31
 msgid "Email address for KDM delivery"
-msgstr "Email Adresse für KDM Zustellung"
+msgstr "Absender Email Adresse (KDM Zustellung)"
 
 #: src/wx/servers_list_dialog.cc:30
 msgid "Encoding Servers"
-msgstr "Encodier Server"
+msgstr "Enkodier Server"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:162
 msgid "Encrypted"
-msgstr "Verschlüsselt"
+msgstr "Verschlüsselt (-> KDM Erstellung)"
+
+#: src/wx/config_dialog.cc:753
+msgid "Errors"
+msgstr "Fehler"
 
-#: src/wx/dci_metadata_dialog.cc:50
+#: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Hersteller (z.B. DXL)"
 
 #: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
 #: src/wx/dolby_certificate_dialog.cc:106
-#, fuzzy
 msgid "Fetching..."
-msgstr "zähle..."
+msgstr "Zugriff..."
 
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
-msgstr "Film Eigenschaften"
+msgstr "Projekt Eigenschaften"
 
 #: src/wx/new_film_dialog.cc:37
 msgid "Film name"
-msgstr "Film Name"
+msgstr "Projekt Name"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:146
 msgid "Filters"
 msgstr "Filter"
 
@@ -475,40 +504,46 @@ msgstr "Bilder bereits bearbeitet"
 
 #: src/wx/about_dialog.cc:61
 msgid "Free, open-source DCP generation from almost anything."
-msgstr "Kostenlose open-source DCP Erstellung von fast allem."
+msgstr ""
+"Kostenlose Open-Source-Software zur DCP-Erstellung aus nahezu allen "
+"Quellformaten."
 
-#: src/wx/kdm_dialog.cc:85
+#: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "Von"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:125
 msgid "From address for KDM emails"
-msgstr "Absender Adresse für KDM Emails"
+msgstr "Absenderadresse (KDM Zustellung)"
 
-#: src/wx/audio_mapping_view.cc:134
+#: src/wx/audio_mapping_view.cc:133
 msgid "Full"
-msgstr "Ein"
+msgstr "Voll"
 
 #: src/wx/timing_panel.cc:43
 msgid "Full length"
-msgstr "Ganze Länge"
+msgstr "Gesamtlänge"
 
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
-msgstr "Lautstärken Rechner"
+msgstr "Fader Rechner"
 
 #: src/wx/audio_gain_dialog.cc:28
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
-msgstr "Pegel des Kanals %d im DCP Kanal %d"
+msgstr "Verstärkung des Kanals %d im DCP Kanal %d"
 
 #: src/wx/properties_dialog.cc:52
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/audio_mapping_view.cc:304
+#: src/wx/config_dialog.cc:748
+msgid "General"
+msgstr "Allgemein"
+
+#: src/wx/audio_mapping_view.cc:301
 msgid "HI"
-msgstr ""
+msgstr "HI"
 
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
@@ -522,60 +557,68 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Host Name oder IP-Adresse"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:242
 msgid "Hz"
 msgstr "Hz"
 
 #: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
-msgstr "Ich möchte bei dieser Lautstärke spielen"
+msgstr "Ich möchte bei dieser Faderstellung spielen"
 
-#: src/wx/config_dialog.cc:627
+#: src/wx/config_dialog.cc:613
 msgid "IP address"
 msgstr "IP Adresse"
 
-#: src/wx/config_dialog.cc:519
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "IP Adresse / Host Name"
 
+#: src/wx/isdcf_metadata_dialog.cc:30
+msgid "ISDCF name"
+msgstr "ISDCF Name"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr "Eingangs Gamma"
 
-#: src/wx/film_editor.cc:224
+#: src/wx/film_editor.cc:228
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/film_editor.cc:178
+#: src/wx/film_editor.cc:181
 msgid "JPEG2000 bandwidth"
-msgstr "JPEG2000 Bandbreite"
+msgstr "JPEG2000 Datenrate"
 
 #: src/wx/content_menu.cc:51
 msgid "Join"
-msgstr "Mitmachen"
+msgstr "Verbinden"
 
-#: src/wx/config_dialog.cc:694
-#, fuzzy
+#: src/wx/config_dialog.cc:680
 msgid "KDM Email"
 msgstr "KDM Email"
 
-#: src/wx/film_editor.cc:298
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Timing"
+
+#: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
-msgstr "Bildreihenfolge behalten"
+msgstr "Bildreihenfolge beibehalten"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:277
 msgid "L"
 msgstr "L"
 
-#: src/wx/audio_mapping_view.cc:312
+#: src/wx/audio_mapping_view.cc:309
 msgid "Lc"
 msgstr "Lc"
 
-#: src/wx/video_panel.cc:87
+#: src/wx/video_panel.cc:88
 msgid "Left crop"
 msgstr "Links beschneiden"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/audio_mapping_view.cc:289
 msgid "Lfe"
 msgstr "LFE"
 
@@ -585,42 +628,49 @@ msgstr "Linearisiere Eingangs Gamma für niedrige Werte"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
-msgstr ""
+msgstr "Lade aus Datei..."
+
+#: src/wx/config_dialog.cc:747
+msgid "Log"
+msgstr "Log"
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "SL"
 
-#: src/wx/film_editor.cc:749
+#: src/wx/film_editor.cc:762
 msgid "MISSING: "
 msgstr "FEHLT:"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:117
 msgid "Mail password"
-msgstr "Mail Passwort"
+msgstr "Mail Passwort (KDM Zustellung)"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:113
 msgid "Mail user name"
-msgstr "Mail Benutzername"
+msgstr "Mail Benutzername/Login (KDM Zustellung)"
 
-#: src/wx/kdm_dialog.cc:47
+#: src/wx/kdm_dialog.cc:49
 msgid "Make KDMs"
 msgstr "KDMs erstellen"
 
+#: src/wx/isdcf_metadata_dialog.cc:71
+msgid "Mastered luminance (e.g. 4fl)"
+msgstr "Zielhelligkeit (z.B. '4fL' für 3D)"
+
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:109
-#, fuzzy
+#: src/wx/config_dialog.cc:739
 msgid "Maximum JPEG2000 bandwidth"
-msgstr "JPEG2000 Bandbreite"
+msgstr "Maximale JPEG2000 Datenrate(!)"
 
-#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
 msgid "Mbit/s"
-msgstr ""
+msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Mehrere Inhalte ausgewählt"
 
@@ -628,54 +678,59 @@ msgstr "Mehrere Inhalte ausgewählt"
 msgid "My Documents"
 msgstr "Meine Dokumente"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Name"
 
 #: src/wx/new_film_dialog.cc:35
 msgid "New Film"
-msgstr "Neuer Film"
+msgstr "Neues Projekt"
 
 #: src/wx/update_dialog.cc:36
 msgid "New versions of DCP-o-matic are available."
 msgstr "Eine neue Version von DCP-o-matic ist verfügbar."
 
-#: src/wx/audio_mapping_view.cc:351
+#: src/wx/audio_mapping_view.cc:348
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Der Ton von Kanal %d wird nicht an das DCP Kanal %d weitergegeben."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:153 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Kein"
 
-#: src/wx/audio_mapping_view.cc:133
+#: src/wx/audio_mapping_view.cc:132
 msgid "Off"
 msgstr "Aus"
 
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
-msgstr ""
+msgstr "Andere"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:109
 msgid "Outgoing mail server"
-msgstr "Ausgehender Mail Server"
+msgstr "Ausgehender/SMTP Mail Server (KDM Zustellung)"
+
+#: src/wx/kdm_dialog.cc:156
+msgid "Output"
+msgstr "Ausgabe"
 
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
-msgstr "Ausgangs Gamma"
+msgstr "Ziel Gamma"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
-msgstr "Paket Typ (e.g. OV)"
+msgstr "DCP Paket Typ (z.B. OV)"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:325
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Mit Schwarz gefüllt auf %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:639
+#: src/wx/config_dialog.cc:625
 msgid "Password"
 msgstr "Passwort"
 
@@ -687,7 +742,7 @@ msgstr "Pause"
 msgid "Peak"
 msgstr "Spitze"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Abspielen"
 
@@ -695,15 +750,19 @@ msgstr "Abspielen"
 msgid "Play length"
 msgstr "Abspiellänge"
 
-#: src/wx/audio_plot.cc:43
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Bitte warten; Ton wird analysiert..."
 
 #: src/wx/timing_panel.cc:40
 msgid "Position"
-msgstr "Position"
+msgstr "Startposition"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:59
+msgid "Pre-release"
+msgstr "Vorabversion"
+
+#: src/wx/audio_mapping_view.cc:281
 msgid "R"
 msgstr "R"
 
@@ -711,24 +770,28 @@ msgstr "R"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:44
+#: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
-msgstr "FSK (z.B. 12)"
+msgstr "Freigabe (z.B. FSK12)"
 
-#: src/wx/audio_mapping_view.cc:316
+#: src/wx/audio_mapping_view.cc:313
 msgid "Rc"
 msgstr "Rc"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:62
+msgid "Red band"
+msgstr "Red band (USA, für explizite Inhalte)"
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283
 #: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:83
 msgid "Remove Cinema"
 msgstr "Kino entfernen"
 
-#: src/wx/kdm_dialog.cc:77
+#: src/wx/kdm_dialog.cc:90
 msgid "Remove Screen"
 msgstr "Saal entfernen"
 
@@ -744,65 +807,77 @@ msgstr "Inhalt wiederholen"
 msgid "Repeat..."
 msgstr "Wiederhole..."
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Auflösung"
 
 #: src/wx/job_manager_view.cc:167
 msgid "Resume"
-msgstr "Neustart"
+msgstr "Weiter"
 
-#: src/wx/audio_mapping_view.cc:359
+#: src/wx/audio_mapping_view.cc:356
 msgid "Right click to change gain."
 msgstr "Rechtsklick für Pegeländerung"
 
-#: src/wx/video_panel.cc:98
+#: src/wx/video_panel.cc:99
 msgid "Right crop"
 msgstr "Rechts beschneiden"
 
-#: src/wx/audio_mapping_view.cc:300
+#: src/wx/audio_mapping_view.cc:297
 msgid "Rs"
 msgstr "SR"
 
-#: src/wx/film_editor.cc:223
+#: src/wx/film_editor.cc:227
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:131
+#: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Skaliere zu"
 
-#: src/wx/video_panel.cc:315
+#: src/wx/video_panel.cc:316
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skaliert auf %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:195
 msgid "Scaler"
 msgstr "Skalierer"
 
+#: src/wx/kdm_dialog.cc:60
+msgid "Screens"
+msgstr "Saal"
+
+#: src/wx/kdm_dialog.cc:515
+msgid "Select CPL XML file"
+msgstr "CPL XML Datei auswählen"
+
 #: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Zertifikat Datei auswählen"
 
-#: src/wx/kdm_dialog.cc:140
+#: src/wx/kdm_dialog.cc:175
 msgid "Send by email"
 msgstr "Per Email senden"
 
 #: src/wx/dolby_certificate_dialog.cc:47
 msgid "Serial number"
-msgstr ""
+msgstr "Seriennummer"
 
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
+#: src/wx/screen_dialog.cc:41
+#, fuzzy
+msgid "Server manufacturer"
+msgstr "Server Seriennummer"
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
-msgstr ""
+msgstr "Server Seriennummer"
 
-#: src/wx/config_dialog.cc:499
-#, fuzzy
+#: src/wx/config_dialog.cc:485
 msgid "Servers"
 msgstr "Server"
 
@@ -818,7 +893,7 @@ msgstr "Sprache setzen"
 msgid "Show Audio..."
 msgstr "Ton anzeigen..."
 
-#: src/wx/film_editor.cc:155
+#: src/wx/film_editor.cc:158
 msgid "Signed"
 msgstr "Signiert"
 
@@ -828,21 +903,21 @@ msgstr "Glätten"
 
 #: src/wx/timeline_dialog.cc:38
 msgid "Snap"
-msgstr "Einschnappen"
+msgstr "Anschließen"
 
 #: src/wx/update_dialog.cc:43
 msgid "Stable version "
 msgstr "Stabile Version"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (z.B. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:38
+#: src/wx/isdcf_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Untertitel Sprache (z.B. EN)"
 
@@ -855,32 +930,34 @@ msgid "Subtitle Stream"
 msgstr "Untertitel Spur"
 
 #: src/wx/subtitle_panel.cc:44
-#, fuzzy
 msgid "Subtitle X Offset"
-msgstr "Untertitel Offset"
+msgstr "Untertitel X Offset"
 
 #: src/wx/subtitle_panel.cc:53
-#, fuzzy
 msgid "Subtitle Y Offset"
-msgstr "Untertitel Offset"
+msgstr "Untertitel Y Offset"
 
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:149
+#: src/wx/about_dialog.cc:152
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
-#: src/wx/config_dialog.cc:607
+#: src/wx/config_dialog.cc:593
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:631
+#: src/wx/config_dialog.cc:617
 msgid "Target path"
 msgstr "Zielpfad"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/isdcf_metadata_dialog.cc:56
+msgid "Temp version"
+msgstr "Test Version"
+
+#: src/wx/isdcf_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Gebiet (z.B. UK)"
 
@@ -888,10 +965,9 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:191
-#, fuzzy
+#: src/wx/about_dialog.cc:197
 msgid "Tested by"
-msgstr "Übersetzt von"
+msgstr "Getestet von"
 
 #: src/wx/content_menu.cc:223
 msgid ""
@@ -899,47 +975,52 @@ msgid ""
 "missing.  Either try again with the correct content file or remove the "
 "missing content."
 msgstr ""
-"Die angwählten Inhaltsdateien sind nicht die gleichen wie die Fehlenden. "
-"Entweder nochmals mit den richtigen Inhaltsdateien probieren oder fehlende "
+"Die ausgewählten Inhaltsdateien sind nicht die gleichen wie die Fehlenden. "
+"Entweder nochmals mit den richtigen Inhaltsdateien probieren oder Fehlende "
 "löschen."
 
 #: src/wx/hints_dialog.cc:97
 msgid "There are no hints: everything looks good!"
-msgstr "Keine Tipps: Alles sieht gut aus !"
+msgstr "Keine Warnungen: Alles sieht gut aus!"
 
-#: src/wx/film_viewer.cc:133
+#: src/wx/film_viewer.cc:134
 msgid "There is not enough free memory to do that."
-msgstr ""
+msgstr "Für diese Operation ist nicht genug freier Speicher verfügbar."
+
+#: src/wx/kdm_dialog.cc:537
+msgid "This is not a valid CPL file"
+msgstr "Dies ist keine gültige CPL Datei"
 
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
-msgstr "Kerne"
+msgstr "Threads"
 
 #: src/wx/config_dialog.cc:105
 msgid "Threads to use for encoding on this host"
-msgstr "Auf diesem Host zu benutzende Kerne"
+msgstr "Auf diesem Rechner zu benutzende CPU-Threads"
 
-#: src/wx/audio_plot.cc:168
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Zeit"
 
 #: src/wx/timeline_dialog.cc:32
 msgid "Timeline"
-msgstr "Zeitlinie"
+msgstr "Zeitleiste"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:289
 msgid "Timeline..."
-msgstr "Zeitlinie..."
+msgstr "Zeitleiste..."
 
 #: src/wx/timing_panel.cc:35
-msgid "Timing"
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Timing"
 
-#: src/wx/video_panel.cc:109
+#: src/wx/video_panel.cc:110
 msgid "Top crop"
 msgstr "Oben beschneiden"
 
-#: src/wx/about_dialog.cc:104
+#: src/wx/about_dialog.cc:105
 msgid "Translated by"
 msgstr "Übersetzt von"
 
@@ -951,24 +1032,23 @@ msgstr "Schnitt vom Ende"
 msgid "Trim from start"
 msgstr "Schnitt vom Anfang"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:75
 msgid "Type"
 msgstr "Typ"
 
 #: src/wx/dolby_certificate_dialog.cc:148
-#, fuzzy
 msgid "Unexpected certificate filename form"
-msgstr "Zertifikat Datei auswählen"
+msgstr "Ungültige Zertifikats-Datei"
 
 #: src/wx/screen_dialog.cc:62
 msgid "Unknown"
-msgstr ""
+msgstr "Unbekannt"
 
-#: src/wx/kdm_dialog.cc:93
+#: src/wx/kdm_dialog.cc:112
 msgid "Until"
 msgstr "Bis"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:285
 msgid "Up"
 msgstr "Nach oben"
 
@@ -977,14 +1057,14 @@ msgid "Update"
 msgstr "Update"
 
 #: src/wx/film_editor.cc:128
-msgid "Use DCI name"
-msgstr "DCI Name benutzen"
+msgid "Use ISDCF name"
+msgstr "ISDCF Name benutzen"
 
-#: src/wx/config_dialog.cc:515
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
-msgstr "Alle Server benutzen"
+msgstr "Alle verfügbaren Server im Subnetz benutzen"
 
-#: src/wx/film_editor.cc:149
+#: src/wx/film_editor.cc:152
 msgid "Use best"
 msgstr "Beste benutzen"
 
@@ -992,15 +1072,15 @@ msgstr "Beste benutzen"
 msgid "Use preset"
 msgstr "Preset benutzen"
 
-#: src/wx/config_dialog.cc:635
+#: src/wx/config_dialog.cc:621
 msgid "User name"
 msgstr "Benutzer Name"
 
-#: src/wx/audio_mapping_view.cc:308
+#: src/wx/audio_mapping_view.cc:305
 msgid "VI"
-msgstr ""
+msgstr "VI"
 
-#: src/wx/video_panel.cc:67
+#: src/wx/video_panel.cc:68
 msgid "Video"
 msgstr "Bild"
 
@@ -1008,13 +1088,17 @@ msgstr "Bild"
 msgid "Video frame rate"
 msgstr "Bildwiederholrate"
 
+#: src/wx/config_dialog.cc:750
+msgid "Warnings"
+msgstr "Warnungen"
+
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
-msgstr "Mit Untertitel"
+msgstr "Mit Untertitelung"
 
-#: src/wx/kdm_dialog.cc:127
+#: src/wx/kdm_dialog.cc:162
 msgid "Write to"
-msgstr "Schreiben"
+msgstr "Speichern nach"
 
 #: src/wx/about_dialog.cc:91
 msgid "Written by"
@@ -1035,16 +1119,16 @@ msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
 "projectors.  Use 24 or 48 frames per second to be on the safe side."
 msgstr ""
-"Ihre DCP Bildrate (%d fps) kann mit manchen (meist alten) Projektoren "
-"Probleme verursachen. Um auf der sicheren Seite zu seihen 24 oder 48 Bilder "
-"benutzen."
+"Ihre DCP Bildrate (%d fps) kann mit manchen (zumeist älteren) Projektoren "
+"Probleme verursachen. Um auf der sicheren Seite zu sein sollten Sie 24 oder "
+"48 Bilder/s benutzen."
 
 #: src/wx/hints_dialog.cc:66
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
 msgstr ""
-"Ihr DCP hat ein seltsame Anzahl an Tonkanälen. Das wird wahrscheinlich zu "
+"Ihr DCP hat eine ungerade Anzahl an Tonkanälen. Das wird wahrscheinlich zu "
 "Abspielproblemen führen."
 
 #: src/wx/hints_dialog.cc:70
@@ -1059,7 +1143,7 @@ msgstr ""
 msgid "audio"
 msgstr "Ton"
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:240
 msgid "channels"
 msgstr "Kanäle"
 
@@ -1072,11 +1156,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:319
+#: src/wx/config_dialog.cc:305
 msgid "s"
 msgstr "s"
 
@@ -1092,6 +1176,9 @@ msgstr "Zeiten"
 msgid "video"
 msgstr "Bild"
 
+#~ msgid "-3dB"
+#~ msgstr "-3dB"
+
 #~ msgid "Content channel"
 #~ msgstr "Inhalt Kanal"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index b767fd2d7..df5a134da 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-04-20 12:06-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:121
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(claves guardadas como texto plano en el disco)"
 
@@ -36,52 +36,57 @@ msgstr "(claves guardadas como texto plano en el disco)"
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 
-#: src/wx/audio_mapping_view.cc:135
-msgid "-3dB"
-msgstr "-3dB"
+#: src/wx/audio_mapping_view.cc:134
+msgid "-6dB"
+msgstr ""
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/audio_panel.cc:236
+#: src/wx/audio_panel.cc:238
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/video_panel.cc:196
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/film_editor.cc:220
+#: src/wx/isdcf_metadata_dialog.cc:68
+#, fuzzy
+msgid "2D version of content available in 3D"
+msgstr "Nuevas versiones disponibles de DCP-o-matic."
+
+#: src/wx/film_editor.cc:224
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/film_editor.cc:168
+#: src/wx/film_editor.cc:171
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:200
 msgid "3D alternate"
 msgstr "3D alterno"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:201
 msgid "3D left only"
 msgstr ""
 
-#: src/wx/video_panel.cc:197
+#: src/wx/video_panel.cc:198
 msgid "3D left/right"
 msgstr "3D izquierda/derecha"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:202
 #, fuzzy
 msgid "3D right only"
 msgstr "3D izquierda/derecha"
 
-#: src/wx/video_panel.cc:198
+#: src/wx/video_panel.cc:199
 msgid "3D top/bottom"
 msgstr "3D arriba/abajo"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:225
 msgid "4K"
 msgstr "4K"
 
@@ -93,19 +98,19 @@ msgstr "Una nueva versión de DCP-o-matic está disponible."
 msgid "About DCP-o-matic"
 msgstr "Acerca de DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:79
 msgid "Add Cinema..."
 msgstr "Añadir cine..."
 
-#: src/wx/kdm_dialog.cc:73
+#: src/wx/kdm_dialog.cc:86
 msgid "Add Screen..."
 msgstr "Añadir pantalla..."
 
-#: src/wx/film_editor.cc:280
+#: src/wx/film_editor.cc:279
 msgid "Add file(s)..."
 msgstr "Añadir fichero(s)..."
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:281
 msgid "Add folder..."
 msgstr "Añadir carpeta..."
 
@@ -113,7 +118,12 @@ msgstr "Añadir carpeta..."
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/wx/about_dialog.cc:108
+#: src/wx/config_dialog.cc:743
+#, fuzzy
+msgid "Allow any DCP frame rate"
+msgstr "Velocidad de imagen"
+
+#: src/wx/about_dialog.cc:109
 msgid "Artwork by"
 msgstr "Grafismo de"
 
@@ -129,7 +139,7 @@ msgstr "Retardo del audio"
 msgid "Audio Gain"
 msgstr "Ganancia del audio"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
@@ -137,17 +147,17 @@ msgstr "Idioma del audio (ej. ES)"
 msgid "Audio Stream"
 msgstr "Flujo de audio"
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Canales de audio"
 
-#: src/wx/audio_mapping_view.cc:353
+#: src/wx/audio_mapping_view.cc:350
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr "El audio del canal %d pasará al canal %d del DCP sin modificar."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -159,19 +169,19 @@ msgstr "El audio del canal %d pasará al canal %d del DCP con ganancia %.1fdB."
 msgid "Bad setting for %s (%s)"
 msgstr "Configuración erronea para %s (%s)"
 
-#: src/wx/video_panel.cc:120
+#: src/wx/video_panel.cc:121
 msgid "Bottom crop"
 msgstr "Recortar abajo"
 
-#: src/wx/dir_picker_ctrl.cc:37
+#: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Explorar..."
 
-#: src/wx/audio_mapping_view.cc:320
+#: src/wx/audio_mapping_view.cc:317
 msgid "BsL"
 msgstr "BsL"
 
-#: src/wx/audio_mapping_view.cc:324
+#: src/wx/audio_mapping_view.cc:321
 msgid "BsR"
 msgstr "BsR"
 
@@ -179,10 +189,23 @@ msgstr "BsR"
 msgid "But I have to use fader"
 msgstr "pero tengo que usar el fader a"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:285
 msgid "C"
 msgstr "C"
 
+#: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
+#, fuzzy
+msgid "CPL"
+msgstr "DCP"
+
+#: src/wx/kdm_dialog.cc:143
+msgid "CPL ID"
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:146
+msgid "CPL annotation text"
+msgstr ""
+
 #: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Calcular..."
@@ -200,6 +223,10 @@ msgstr "Certificado"
 msgid "Certificate downloaded"
 msgstr "Certificado descargado"
 
+#: src/wx/isdcf_metadata_dialog.cc:65
+msgid "Chain"
+msgstr ""
+
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
 msgstr "Ganancia del canal"
@@ -208,11 +235,11 @@ msgstr "Ganancia del canal"
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/config_dialog.cc:137
+#: src/wx/config_dialog.cc:133
 msgid "Check for testing updates as well as stable ones"
 msgstr "Buscar actualizaciones de prueba y estables"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:129
 msgid "Check for updates on startup"
 msgstr "Buscar actualizaciones al iniciar"
 
@@ -220,11 +247,11 @@ msgstr "Buscar actualizaciones al iniciar"
 msgid "Choose a file"
 msgstr "Elige un fichero"
 
-#: src/wx/film_editor.cc:775
+#: src/wx/film_editor.cc:788
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:811
 msgid "Choose a folder"
 msgstr "Elige una carpeta"
 
@@ -232,20 +259,25 @@ msgstr "Elige una carpeta"
 msgid "Cinema"
 msgstr "Cine"
 
-#: src/wx/config_dialog.cc:561
+#: src/wx/config_dialog.cc:547
 msgid "Colour Conversions"
 msgstr "Conversiones de color"
 
 #: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:162
 msgid "Colour conversion"
 msgstr "Conversión de color"
 
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Tiempo"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Continente"
 
-#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:270 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Contenido"
 
@@ -253,25 +285,25 @@ msgstr "Contenido"
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: src/wx/video_panel.cc:331
+#: src/wx/video_panel.cc:332
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Velocidad del contenido %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:32
+#: src/wx/isdcf_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Versión del contenido"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:292
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "El video es %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:136
+#: src/wx/audio_dialog.cc:151
 msgid "Could not analyse audio."
 msgstr "No se pudo analizar el audio."
 
-#: src/wx/film_viewer.cc:345
+#: src/wx/film_viewer.cc:346
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
@@ -281,6 +313,11 @@ msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "No se pudo crear el DCP: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "No se pudo abrir el fichero (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr "País"
@@ -289,20 +326,16 @@ msgstr "País"
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:304
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Recortado a %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:243
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/wx/dci_metadata_dialog.cc:30
-msgid "DCI name"
-msgstr "Nombre DCI"
-
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
+#: src/wx/film_editor.cc:87
 msgid "DCP"
 msgstr "DCP"
 
@@ -310,6 +343,10 @@ msgstr "DCP"
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
+#: src/wx/kdm_dialog.cc:140
+msgid "DCP directory"
+msgstr ""
+
 #: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
@@ -319,43 +356,44 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:331
-msgid "Default DCI name details"
+#: src/wx/config_dialog.cc:317
+#, fuzzy
+msgid "Default ISDCF name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:344
+#: src/wx/config_dialog.cc:330
 msgid "Default JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 por defecto"
 
-#: src/wx/config_dialog.cc:353
+#: src/wx/config_dialog.cc:339
 msgid "Default audio delay"
 msgstr "Retardo de audio por defecto"
 
-#: src/wx/config_dialog.cc:335
+#: src/wx/config_dialog.cc:321
 msgid "Default container"
 msgstr "Contenedor por defecto"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:325
 msgid "Default content type"
 msgstr "Tipo de contenido por defecto"
 
-#: src/wx/config_dialog.cc:365
+#: src/wx/config_dialog.cc:351
 msgid "Default creator"
 msgstr "Creador por defecto"
 
-#: src/wx/config_dialog.cc:323
+#: src/wx/config_dialog.cc:309
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/config_dialog.cc:301
 msgid "Default duration of still images"
 msgstr "Duración por defecto de las imágenes fijas"
 
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:347
 msgid "Default issuer"
 msgstr "Emisor por defecto"
 
-#: src/wx/config_dialog.cc:294
+#: src/wx/config_dialog.cc:280
 msgid "Defaults"
 msgstr "Por defecto"
 
@@ -381,7 +419,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Los números de serie de Doremi deben tener 6 cifras"
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:287
 msgid "Down"
 msgstr "Bajar"
 
@@ -398,16 +436,16 @@ msgstr "Descargar certificado"
 msgid "Downloading certificate"
 msgstr "Descargando certificado"
 
-#: src/wx/kdm_dialog.cc:68
+#: src/wx/kdm_dialog.cc:81
 msgid "Edit Cinema..."
 msgstr "Editar cine..."
 
-#: src/wx/kdm_dialog.cc:75
+#: src/wx/kdm_dialog.cc:88
 msgid "Edit Screen..."
 msgstr "Editar pantalla..."
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
-#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Editar..."
@@ -420,11 +458,15 @@ msgstr "Remitente para los emails de KDM"
 msgid "Encoding Servers"
 msgstr "Servidores de codificación"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:162
 msgid "Encrypted"
 msgstr "Encriptado"
 
-#: src/wx/dci_metadata_dialog.cc:50
+#: src/wx/config_dialog.cc:753
+msgid "Errors"
+msgstr ""
+
+#: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Compañía (ej. DLA)"
 
@@ -441,7 +483,7 @@ msgstr "Propiedades de la película"
 msgid "Film name"
 msgstr "Nombre de la película"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:146
 msgid "Filters"
 msgstr "Filtros"
 
@@ -466,15 +508,15 @@ msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 "Generación de DCP a partir de casi cualquier cosa, libre y de código abierto."
 
-#: src/wx/kdm_dialog.cc:85
+#: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "De"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:125
 msgid "From address for KDM emails"
 msgstr "Remitente para los emails de KDM"
 
-#: src/wx/audio_mapping_view.cc:134
+#: src/wx/audio_mapping_view.cc:133
 msgid "Full"
 msgstr "Completo"
 
@@ -495,7 +537,11 @@ msgstr "Ganancia del canal %d en el canal %d del DCP"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/audio_mapping_view.cc:304
+#: src/wx/config_dialog.cc:748
+msgid "General"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:301
 msgid "HI"
 msgstr "HI"
 
@@ -511,7 +557,7 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Nombre o dirección IP"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:242
 msgid "Hz"
 msgstr "Hz"
 
@@ -519,23 +565,28 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:627
+#: src/wx/config_dialog.cc:613
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/config_dialog.cc:519
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "Dirección IP / nombre"
 
+#: src/wx/isdcf_metadata_dialog.cc:30
+#, fuzzy
+msgid "ISDCF name"
+msgstr "Nombre DCI"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr "Gamma de entrada"
 
-#: src/wx/film_editor.cc:224
+#: src/wx/film_editor.cc:228
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/film_editor.cc:178
+#: src/wx/film_editor.cc:181
 msgid "JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
@@ -543,27 +594,32 @@ msgstr "Ancho de banda JPEG2000"
 msgid "Join"
 msgstr "Unir"
 
-#: src/wx/config_dialog.cc:694
+#: src/wx/config_dialog.cc:680
 msgid "KDM Email"
 msgstr "Email KDM"
 
-#: src/wx/film_editor.cc:298
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Tiempo"
+
+#: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Mantener el video secuencia"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:277
 msgid "L"
 msgstr "L"
 
-#: src/wx/audio_mapping_view.cc:312
+#: src/wx/audio_mapping_view.cc:309
 msgid "Lc"
 msgstr "Lc"
 
-#: src/wx/video_panel.cc:87
+#: src/wx/video_panel.cc:88
 msgid "Left crop"
 msgstr "Recorte izquierda"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/audio_mapping_view.cc:289
 msgid "Lfe"
 msgstr "Lfe"
 
@@ -575,39 +631,47 @@ msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 msgid "Load from file..."
 msgstr "Cargar de fichero..."
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/config_dialog.cc:747
+msgid "Log"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:749
+#: src/wx/film_editor.cc:762
 msgid "MISSING: "
 msgstr "FALTA:"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:117
 msgid "Mail password"
 msgstr "Clave del correo"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:113
 msgid "Mail user name"
 msgstr "Usuario del correo"
 
-#: src/wx/kdm_dialog.cc:47
+#: src/wx/kdm_dialog.cc:49
 msgid "Make KDMs"
 msgstr "Crear KDMs"
 
+#: src/wx/isdcf_metadata_dialog.cc:71
+msgid "Mastered luminance (e.g. 4fl)"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
 msgstr "Matriz"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:739
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 máximo"
 
-#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Varios contenidos seleccionados"
 
@@ -615,8 +679,9 @@ msgstr "Varios contenidos seleccionados"
 msgid "My Documents"
 msgstr "Mis documentos"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nombre"
 
@@ -628,16 +693,16 @@ msgstr "Nueva película"
 msgid "New versions of DCP-o-matic are available."
 msgstr "Nuevas versiones disponibles de DCP-o-matic."
 
-#: src/wx/audio_mapping_view.cc:351
+#: src/wx/audio_mapping_view.cc:348
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "No pasará audio del canal de origen %d al canal %d del DCP."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:153 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Ninguno"
 
-#: src/wx/audio_mapping_view.cc:133
+#: src/wx/audio_mapping_view.cc:132
 msgid "Off"
 msgstr "Off"
 
@@ -645,24 +710,29 @@ msgstr "Off"
 msgid "Other"
 msgstr "Otros"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:109
 msgid "Outgoing mail server"
 msgstr "Servidor de salida de correo"
 
+#: src/wx/kdm_dialog.cc:156
+#, fuzzy
+msgid "Output"
+msgstr "Gamma de salida"
+
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
 msgstr "Gamma de salida"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:325
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Completado con negro hasta %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:639
+#: src/wx/config_dialog.cc:625
 msgid "Password"
 msgstr "Clave"
 
@@ -674,7 +744,7 @@ msgstr "Pausa"
 msgid "Peak"
 msgstr "Pico"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Reproducir"
 
@@ -682,7 +752,7 @@ msgstr "Reproducir"
 msgid "Play length"
 msgstr "Duración"
 
-#: src/wx/audio_plot.cc:43
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
 
@@ -690,7 +760,11 @@ msgstr "Por favor espere, el audio está siendo analizado..."
 msgid "Position"
 msgstr "Posición"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:59
+msgid "Pre-release"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:281
 msgid "R"
 msgstr "R"
 
@@ -698,24 +772,28 @@ msgstr "R"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:44
+#: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Clasificación (ej. 16)"
 
-#: src/wx/audio_mapping_view.cc:316
+#: src/wx/audio_mapping_view.cc:313
 msgid "Rc"
 msgstr "Rc"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:62
+msgid "Red band"
+msgstr ""
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283
 #: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:83
 msgid "Remove Cinema"
 msgstr "Quitar cine"
 
-#: src/wx/kdm_dialog.cc:77
+#: src/wx/kdm_dialog.cc:90
 msgid "Remove Screen"
 msgstr "Quitar pantalla"
 
@@ -731,7 +809,7 @@ msgstr "Repetir contenido"
 msgid "Repeat..."
 msgstr "Repetir..."
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Resolución"
 
@@ -739,40 +817,50 @@ msgstr "Resolución"
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/wx/audio_mapping_view.cc:359
+#: src/wx/audio_mapping_view.cc:356
 msgid "Right click to change gain."
 msgstr "Click derecho para cambiar la ganancia."
 
-#: src/wx/video_panel.cc:98
+#: src/wx/video_panel.cc:99
 msgid "Right crop"
 msgstr "Recorte derecha"
 
-#: src/wx/audio_mapping_view.cc:300
+#: src/wx/audio_mapping_view.cc:297
 msgid "Rs"
 msgstr "Rs"
 
-#: src/wx/film_editor.cc:223
+#: src/wx/film_editor.cc:227
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:131
+#: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Redimensionar a"
 
-#: src/wx/video_panel.cc:315
+#: src/wx/video_panel.cc:316
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Redimensionado a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:195
 msgid "Scaler"
 msgstr "Escalador"
 
+#: src/wx/kdm_dialog.cc:60
+#, fuzzy
+msgid "Screens"
+msgstr "Añadir pantalla..."
+
+#: src/wx/kdm_dialog.cc:515
+#, fuzzy
+msgid "Select CPL XML file"
+msgstr "Seleccionar fichero de audio"
+
 #: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Seleccionar fichero de certificado"
 
-#: src/wx/kdm_dialog.cc:140
+#: src/wx/kdm_dialog.cc:175
 msgid "Send by email"
 msgstr "Enviar por email"
 
@@ -784,11 +872,16 @@ msgstr "Número de serie"
 msgid "Server"
 msgstr "Servidor"
 
+#: src/wx/screen_dialog.cc:41
+#, fuzzy
+msgid "Server manufacturer"
+msgstr "Número de serie del servidor"
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr "Número de serie del servidor"
 
-#: src/wx/config_dialog.cc:499
+#: src/wx/config_dialog.cc:485
 msgid "Servers"
 msgstr "Servidores"
 
@@ -804,7 +897,7 @@ msgstr "Seleccionar idioma"
 msgid "Show Audio..."
 msgstr "Mostrar audio..."
 
-#: src/wx/film_editor.cc:155
+#: src/wx/film_editor.cc:158
 msgid "Signed"
 msgstr "Firmado"
 
@@ -820,15 +913,15 @@ msgstr "Acoplar"
 msgid "Stable version "
 msgstr "Versión estable"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Standard"
 msgstr "Estandard"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Estudio (ej. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:38
+#: src/wx/isdcf_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Idioma del subtítulo (ej. EN)"
 
@@ -852,19 +945,24 @@ msgstr "Desplazamiento del subtítulo en Y"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:149
+#: src/wx/about_dialog.cc:152
 msgid "Supported by"
 msgstr "Soportado por"
 
-#: src/wx/config_dialog.cc:607
+#: src/wx/config_dialog.cc:593
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:631
+#: src/wx/config_dialog.cc:617
 msgid "Target path"
 msgstr "Ruta"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/isdcf_metadata_dialog.cc:56
+#, fuzzy
+msgid "Temp version"
+msgstr "Versión en prueba"
+
+#: src/wx/isdcf_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
@@ -872,7 +970,7 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:191
+#: src/wx/about_dialog.cc:197
 msgid "Tested by"
 msgstr "Comprobado por"
 
@@ -889,10 +987,14 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "No hay recomendaciones: ¡todo parece bien!"
 
-#: src/wx/film_viewer.cc:133
+#: src/wx/film_viewer.cc:134
 msgid "There is not enough free memory to do that."
 msgstr "No hay suficiente memoria para hacer eso."
 
+#: src/wx/kdm_dialog.cc:537
+msgid "This is not a valid CPL file"
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Hilos"
@@ -901,7 +1003,7 @@ msgstr "Hilos"
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
-#: src/wx/audio_plot.cc:168
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Tiempo"
 
@@ -909,19 +1011,20 @@ msgstr "Tiempo"
 msgid "Timeline"
 msgstr "Línea de tiempo"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:289
 msgid "Timeline..."
 msgstr "Linea de tiempo..."
 
 #: src/wx/timing_panel.cc:35
-msgid "Timing"
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Tiempo"
 
-#: src/wx/video_panel.cc:109
+#: src/wx/video_panel.cc:110
 msgid "Top crop"
 msgstr "Recortar arriba"
 
-#: src/wx/about_dialog.cc:104
+#: src/wx/about_dialog.cc:105
 msgid "Translated by"
 msgstr "Traducido por"
 
@@ -933,7 +1036,7 @@ msgstr "Recortar del final"
 msgid "Trim from start"
 msgstr "Recortar del inicio"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:75
 msgid "Type"
 msgstr "Tipo"
 
@@ -945,11 +1048,11 @@ msgstr "Nombre inesperado del fichero de certificado"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/wx/kdm_dialog.cc:93
+#: src/wx/kdm_dialog.cc:112
 msgid "Until"
 msgstr "Hasta"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:285
 msgid "Up"
 msgstr "Subir"
 
@@ -958,14 +1061,15 @@ msgid "Update"
 msgstr "Actualizar"
 
 #: src/wx/film_editor.cc:128
-msgid "Use DCI name"
+#, fuzzy
+msgid "Use ISDCF name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/config_dialog.cc:515
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Usar todos los servidores"
 
-#: src/wx/film_editor.cc:149
+#: src/wx/film_editor.cc:152
 msgid "Use best"
 msgstr "Usar la mejor"
 
@@ -973,15 +1077,15 @@ msgstr "Usar la mejor"
 msgid "Use preset"
 msgstr "Usar por defecto"
 
-#: src/wx/config_dialog.cc:635
+#: src/wx/config_dialog.cc:621
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: src/wx/audio_mapping_view.cc:308
+#: src/wx/audio_mapping_view.cc:305
 msgid "VI"
 msgstr "VI"
 
-#: src/wx/video_panel.cc:67
+#: src/wx/video_panel.cc:68
 msgid "Video"
 msgstr "Vídeo"
 
@@ -989,11 +1093,15 @@ msgstr "Vídeo"
 msgid "Video frame rate"
 msgstr "Velocidad de imagen"
 
+#: src/wx/config_dialog.cc:750
+msgid "Warnings"
+msgstr ""
+
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Con subtítulos"
 
-#: src/wx/kdm_dialog.cc:127
+#: src/wx/kdm_dialog.cc:162
 msgid "Write to"
 msgstr "Escribe a"
 
@@ -1040,7 +1148,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:240
 msgid "channels"
 msgstr "canales"
 
@@ -1053,11 +1161,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:319
+#: src/wx/config_dialog.cc:305
 msgid "s"
 msgstr "s"
 
@@ -1073,6 +1181,12 @@ msgstr "veces"
 msgid "video"
 msgstr "vídeo"
 
+#~ msgid "Timing"
+#~ msgstr "Tiempo"
+
+#~ msgid "-3dB"
+#~ msgstr "-3dB"
+
 #, fuzzy
 #~ msgid "Content channel"
 #~ msgstr "1 canal"
@@ -1128,9 +1242,6 @@ msgstr "vídeo"
 #~ msgid "Colour look-up table"
 #~ msgstr "Tabla de referencia de colores"
 
-#~ msgid "Could not open content file (%s)"
-#~ msgstr "No se pudo abrir el fichero (%s)"
-
 #~ msgid "Could not set content: %s"
 #~ msgstr "No se pudo establecer el contenido: %s"
 
@@ -1158,9 +1269,6 @@ msgstr "vídeo"
 #~ msgid "Reference scaler"
 #~ msgstr "Escalador de referencia para A/B"
 
-#~ msgid "Select Audio File"
-#~ msgstr "Seleccionar fichero de audio"
-
 #, fuzzy
 #~ msgid "Trim method"
 #~ msgstr "Recortar fotogramas"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 82a0aece6..f7c81d4dd 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
-"PO-Revision-Date: 2014-04-18 22:50+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-20 16:08+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -29,7 +29,7 @@ msgstr ""
 "(C) 2012-2014 par Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 "Laursen"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:121
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(le mot de passe sera enregistré sur le disque dur au format texte)"
 
@@ -37,52 +37,55 @@ msgstr "(le mot de passe sera enregistré sur le disque dur au format texte)"
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(redémarrez DCP-o-matic pour appliquer le changement de langue)"
 
-#: src/wx/audio_mapping_view.cc:135
-msgid "-3dB"
-msgstr "-3dB"
+#: src/wx/audio_mapping_view.cc:134
+msgid "-6dB"
+msgstr "-6dB"
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
 msgstr "1/"
 
-#: src/wx/audio_panel.cc:236
+#: src/wx/audio_panel.cc:238
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/video_panel.cc:196
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/film_editor.cc:220
+#: src/wx/isdcf_metadata_dialog.cc:68
+msgid "2D version of content available in 3D"
+msgstr "Version 2D d'un contenu aussi disponible en 3D"
+
+#: src/wx/film_editor.cc:224
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/film_editor.cc:168
+#: src/wx/film_editor.cc:171
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:200
 msgid "3D alternate"
 msgstr "3D alternatif"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:201
 msgid "3D left only"
-msgstr ""
+msgstr "3D gauche"
 
-#: src/wx/video_panel.cc:197
+#: src/wx/video_panel.cc:198
 msgid "3D left/right"
 msgstr "3D gauche/droite"
 
-#: src/wx/video_panel.cc:201
-#, fuzzy
+#: src/wx/video_panel.cc:202
 msgid "3D right only"
-msgstr "3D gauche/droite"
+msgstr "3D droite"
 
-#: src/wx/video_panel.cc:198
+#: src/wx/video_panel.cc:199
 msgid "3D top/bottom"
 msgstr "3D dessus/dessous"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:225
 msgid "4K"
 msgstr "4K"
 
@@ -94,19 +97,19 @@ msgstr "Une nouvelle version de DCP-o-matic est disponible"
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:79
 msgid "Add Cinema..."
 msgstr "Ajout cinéma"
 
-#: src/wx/kdm_dialog.cc:73
+#: src/wx/kdm_dialog.cc:86
 msgid "Add Screen..."
 msgstr "Ajout une salle"
 
-#: src/wx/film_editor.cc:280
+#: src/wx/film_editor.cc:279
 msgid "Add file(s)..."
 msgstr "Ajout fichier(s)..."
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:281
 msgid "Add folder..."
 msgstr "Ajout dossier..."
 
@@ -114,7 +117,11 @@ msgstr "Ajout dossier..."
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: src/wx/about_dialog.cc:108
+#: src/wx/config_dialog.cc:743
+msgid "Allow any DCP frame rate"
+msgstr "Autoriser toutes cadences"
+
+#: src/wx/about_dialog.cc:109
 msgid "Artwork by"
 msgstr "Thème par"
 
@@ -130,7 +137,7 @@ msgstr "Délai audio"
 msgid "Audio Gain"
 msgstr "Gain audio"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Langue audio (ex. FR)"
 
@@ -138,18 +145,18 @@ msgstr "Langue audio (ex. FR)"
 msgid "Audio Stream"
 msgstr "Flux audio"
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Canaux audios"
 
-#: src/wx/audio_mapping_view.cc:353
+#: src/wx/audio_mapping_view.cc:350
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
 "Le son du canal audio %d sera transféré au canal %d du DCP sans modification."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -163,19 +170,19 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Mauvais paramètre pour %s (%s)"
 
-#: src/wx/video_panel.cc:120
+#: src/wx/video_panel.cc:121
 msgid "Bottom crop"
 msgstr "Découpe bas"
 
-#: src/wx/dir_picker_ctrl.cc:37
+#: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Parcourir..."
 
-#: src/wx/audio_mapping_view.cc:320
+#: src/wx/audio_mapping_view.cc:317
 msgid "BsL"
 msgstr "Ar.G"
 
-#: src/wx/audio_mapping_view.cc:324
+#: src/wx/audio_mapping_view.cc:321
 msgid "BsR"
 msgstr "Ar.D"
 
@@ -183,10 +190,22 @@ msgstr "Ar.D"
 msgid "But I have to use fader"
 msgstr "Je souhaite utiliser ce volume"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:285
 msgid "C"
 msgstr "C"
 
+#: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
+msgid "CPL"
+msgstr "CPL"
+
+#: src/wx/kdm_dialog.cc:143
+msgid "CPL ID"
+msgstr "Id du CPL"
+
+#: src/wx/kdm_dialog.cc:146
+msgid "CPL annotation text"
+msgstr "Commentaire CPL"
+
 #: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Calcul..."
@@ -204,6 +223,10 @@ msgstr "Certificat"
 msgid "Certificate downloaded"
 msgstr "Certificat téléchargé"
 
+#: src/wx/isdcf_metadata_dialog.cc:65
+msgid "Chain"
+msgstr "Chaîne"
+
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
 msgstr "Gain Canal"
@@ -212,11 +235,11 @@ msgstr "Gain Canal"
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/config_dialog.cc:137
+#: src/wx/config_dialog.cc:133
 msgid "Check for testing updates as well as stable ones"
 msgstr "Recherche toutes mises à jour : test et stables."
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:129
 msgid "Check for updates on startup"
 msgstr "Recherche de mises à jour au démarrage."
 
@@ -224,11 +247,11 @@ msgstr "Recherche de mises à jour au démarrage."
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
-#: src/wx/film_editor.cc:775
+#: src/wx/film_editor.cc:788
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:811
 msgid "Choose a folder"
 msgstr "Choisissez un dossier"
 
@@ -236,20 +259,25 @@ msgstr "Choisissez un dossier"
 msgid "Cinema"
 msgstr "Cinéma"
 
-#: src/wx/config_dialog.cc:561
+#: src/wx/config_dialog.cc:547
 msgid "Colour Conversions"
 msgstr "Conversions Couleurs"
 
 #: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:162
 msgid "Colour conversion"
 msgstr "Espace Couleurs"
 
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Durée"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Format"
 
-#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:270 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Contenu"
 
@@ -257,25 +285,25 @@ msgstr "Contenu"
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#: src/wx/video_panel.cc:331
+#: src/wx/video_panel.cc:332
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Cadence du contenu %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:32
+#: src/wx/isdcf_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Version du contenu"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:292
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:136
+#: src/wx/audio_dialog.cc:151
 msgid "Could not analyse audio."
 msgstr "Analyse du son impossible"
 
-#: src/wx/film_viewer.cc:345
+#: src/wx/film_viewer.cc:346
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
@@ -285,6 +313,11 @@ msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Impossible de créer le DCP : %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Ouverture du contenu impossible (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr "Pays"
@@ -293,20 +326,16 @@ msgstr "Pays"
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:304
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Découpe de %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:243
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: src/wx/dci_metadata_dialog.cc:30
-msgid "DCI name"
-msgstr "Nom DCI"
-
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
+#: src/wx/film_editor.cc:87
 msgid "DCP"
 msgstr "DCP"
 
@@ -314,6 +343,10 @@ msgstr "DCP"
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
+#: src/wx/kdm_dialog.cc:140
+msgid "DCP directory"
+msgstr "Répertoire du DCP"
+
 #: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
@@ -323,43 +356,43 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:331
-msgid "Default DCI name details"
-msgstr "Détails du nom DCI par défaut"
+#: src/wx/config_dialog.cc:317
+msgid "Default ISDCF name details"
+msgstr "Nom ISDCF par défaut"
 
-#: src/wx/config_dialog.cc:344
+#: src/wx/config_dialog.cc:330
 msgid "Default JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 par défaut"
 
-#: src/wx/config_dialog.cc:353
+#: src/wx/config_dialog.cc:339
 msgid "Default audio delay"
 msgstr "Délais audio par défaut"
 
-#: src/wx/config_dialog.cc:335
+#: src/wx/config_dialog.cc:321
 msgid "Default container"
 msgstr "Format par défaut"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:325
 msgid "Default content type"
 msgstr "Catégorie par défaut"
 
-#: src/wx/config_dialog.cc:365
+#: src/wx/config_dialog.cc:351
 msgid "Default creator"
 msgstr "Créateur par défaut"
 
-#: src/wx/config_dialog.cc:323
+#: src/wx/config_dialog.cc:309
 msgid "Default directory for new films"
 msgstr "Dossier par défaut pour les DCP"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/config_dialog.cc:301
 msgid "Default duration of still images"
 msgstr "Durée par défaut des images fixes"
 
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:347
 msgid "Default issuer"
 msgstr "Labo par défaut"
 
-#: src/wx/config_dialog.cc:294
+#: src/wx/config_dialog.cc:280
 msgid "Defaults"
 msgstr "Par défaut"
 
@@ -385,7 +418,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Les numéros de série Doremi doivent être composés de 6 chiffres"
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:287
 msgid "Down"
 msgstr "Descendre"
 
@@ -402,16 +435,16 @@ msgstr "Téléchargement Certificat"
 msgid "Downloading certificate"
 msgstr "Téléchargement Certificat en cours"
 
-#: src/wx/kdm_dialog.cc:68
+#: src/wx/kdm_dialog.cc:81
 msgid "Edit Cinema..."
 msgstr "Éditer le cinéma"
 
-#: src/wx/kdm_dialog.cc:75
+#: src/wx/kdm_dialog.cc:88
 msgid "Edit Screen..."
 msgstr "Éditer la salle"
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
-#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Éditer..."
@@ -424,11 +457,15 @@ msgstr "Adresse email pour l'envoi de KDM"
 msgid "Encoding Servers"
 msgstr "Serveurs Encodage"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:162
 msgid "Encrypted"
 msgstr "Crypté"
 
-#: src/wx/dci_metadata_dialog.cc:50
+#: src/wx/config_dialog.cc:753
+msgid "Errors"
+msgstr "Erreurs"
+
+#: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Laboratoire (ex. DLA)"
 
@@ -445,7 +482,7 @@ msgstr "Propriétés du film"
 msgid "Film name"
 msgstr "Nom du Film"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:146
 msgid "Filters"
 msgstr "Filtres"
 
@@ -469,15 +506,15 @@ msgstr "Images déjà encodées"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Création de DCP libre et gratuit depuis presque tout."
 
-#: src/wx/kdm_dialog.cc:85
+#: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "À partir du"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:125
 msgid "From address for KDM emails"
 msgstr "Email expéditeur pour les envoi de KDM"
 
-#: src/wx/audio_mapping_view.cc:134
+#: src/wx/audio_mapping_view.cc:133
 msgid "Full"
 msgstr "Plein"
 
@@ -498,7 +535,11 @@ msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/audio_mapping_view.cc:304
+#: src/wx/config_dialog.cc:748
+msgid "General"
+msgstr "Général"
+
+#: src/wx/audio_mapping_view.cc:301
 msgid "HI"
 msgstr "HI"
 
@@ -514,7 +555,7 @@ msgstr "Hôtes"
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:242
 msgid "Hz"
 msgstr "Hz"
 
@@ -522,23 +563,27 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Je veux le jouer à ce volume"
 
-#: src/wx/config_dialog.cc:627
+#: src/wx/config_dialog.cc:613
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/config_dialog.cc:519
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "Adresse IP / Nom d'Hôte"
 
+#: src/wx/isdcf_metadata_dialog.cc:30
+msgid "ISDCF name"
+msgstr "Nom ISDCF"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr "Gamma entrée"
 
-#: src/wx/film_editor.cc:224
+#: src/wx/film_editor.cc:228
 msgid "Interop"
 msgstr "MXF-Interop"
 
-#: src/wx/film_editor.cc:178
+#: src/wx/film_editor.cc:181
 msgid "JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000"
 
@@ -546,27 +591,32 @@ msgstr "Qualité JPEG2000"
 msgid "Join"
 msgstr "Ajouter"
 
-#: src/wx/config_dialog.cc:694
+#: src/wx/config_dialog.cc:680
 msgid "KDM Email"
 msgstr "e-mail KDM"
 
-#: src/wx/film_editor.cc:298
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Durée"
+
+#: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Garder la vidéo"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:277
 msgid "L"
 msgstr "G"
 
-#: src/wx/audio_mapping_view.cc:312
+#: src/wx/audio_mapping_view.cc:309
 msgid "Lc"
 msgstr "CG"
 
-#: src/wx/video_panel.cc:87
+#: src/wx/video_panel.cc:88
 msgid "Left crop"
 msgstr "Découpe gauche"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/audio_mapping_view.cc:289
 msgid "Lfe"
 msgstr "BF"
 
@@ -578,39 +628,47 @@ msgstr "Lisser la courbe gamma d'entrée pour les bas niveaux"
 msgid "Load from file..."
 msgstr "Chargement depuis fichier..."
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/config_dialog.cc:747
+msgid "Log"
+msgstr "Rapport"
+
+#: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Sr.G"
 
-#: src/wx/film_editor.cc:749
+#: src/wx/film_editor.cc:762
 msgid "MISSING: "
 msgstr "MANQUANT:"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:117
 msgid "Mail password"
 msgstr "Mot de passe Mail"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:113
 msgid "Mail user name"
 msgstr "Nom Utilisateur Mail"
 
-#: src/wx/kdm_dialog.cc:47
+#: src/wx/kdm_dialog.cc:49
 msgid "Make KDMs"
 msgstr "Générer KDMs"
 
+#: src/wx/isdcf_metadata_dialog.cc:71
+msgid "Mastered luminance (e.g. 4fl)"
+msgstr "Luminance masterisée (ex: 4fl)"
+
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:739
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 Maxi"
 
-#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Contenus multiples sélectionnés"
 
@@ -618,8 +676,9 @@ msgstr "Contenus multiples sélectionnés"
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nom"
 
@@ -631,16 +690,16 @@ msgstr "Nouveau Film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "De nouvelles versions de DCP-o-matic sont disponibles."
 
-#: src/wx/audio_mapping_view.cc:351
+#: src/wx/audio_mapping_view.cc:348
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Aucun son ne passera du canal audio %d au canal %d du DCP."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:153 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Aucun"
 
-#: src/wx/audio_mapping_view.cc:133
+#: src/wx/audio_mapping_view.cc:132
 msgid "Off"
 msgstr "Eteint"
 
@@ -648,24 +707,28 @@ msgstr "Eteint"
 msgid "Other"
 msgstr "Autre"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:109
 msgid "Outgoing mail server"
 msgstr "Serveurs de messagerie sortante"
 
+#: src/wx/kdm_dialog.cc:156
+msgid "Output"
+msgstr "Sortie"
+
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
 msgstr "Gamma de sortie"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:325
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Enveloppe noire de %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:639
+#: src/wx/config_dialog.cc:625
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -677,7 +740,7 @@ msgstr "Pause"
 msgid "Peak"
 msgstr "Crête"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Lecture"
 
@@ -685,7 +748,7 @@ msgstr "Lecture"
 msgid "Play length"
 msgstr "Durée de lecture"
 
-#: src/wx/audio_plot.cc:43
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
 
@@ -693,7 +756,11 @@ msgstr "Merci de patienter ; analyse de la piste son..."
 msgid "Position"
 msgstr "Position"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:59
+msgid "Pre-release"
+msgstr "Avant sortie"
+
+#: src/wx/audio_mapping_view.cc:281
 msgid "R"
 msgstr "D"
 
@@ -701,24 +768,28 @@ msgstr "D"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:44
+#: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Rating (ex. 15)"
 
-#: src/wx/audio_mapping_view.cc:316
+#: src/wx/audio_mapping_view.cc:313
 msgid "Rc"
 msgstr "CD"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:62
+msgid "Red band"
+msgstr "Red Band"
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283
 #: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:83
 msgid "Remove Cinema"
 msgstr "Supprimer le cinéma"
 
-#: src/wx/kdm_dialog.cc:77
+#: src/wx/kdm_dialog.cc:90
 msgid "Remove Screen"
 msgstr "Supprimer la salle"
 
@@ -734,7 +805,7 @@ msgstr "Répéter le contenu"
 msgid "Repeat..."
 msgstr "Répéter..."
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Résolution"
 
@@ -742,40 +813,48 @@ msgstr "Résolution"
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/wx/audio_mapping_view.cc:359
+#: src/wx/audio_mapping_view.cc:356
 msgid "Right click to change gain."
 msgstr "Cliquez droit pour modifier le gain."
 
-#: src/wx/video_panel.cc:98
+#: src/wx/video_panel.cc:99
 msgid "Right crop"
 msgstr "Découpe droite"
 
-#: src/wx/audio_mapping_view.cc:300
+#: src/wx/audio_mapping_view.cc:297
 msgid "Rs"
 msgstr "Sr.D"
 
-#: src/wx/film_editor.cc:223
+#: src/wx/film_editor.cc:227
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:131
+#: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Mise à l'échelle"
 
-#: src/wx/video_panel.cc:315
+#: src/wx/video_panel.cc:316
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Mis à l'échelle de %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:195
 msgid "Scaler"
 msgstr "Mise à l'échelle"
 
+#: src/wx/kdm_dialog.cc:60
+msgid "Screens"
+msgstr "Ecrans"
+
+#: src/wx/kdm_dialog.cc:515
+msgid "Select CPL XML file"
+msgstr "Sélectionner le fichier CPL.xml"
+
 #: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Sélectionner le certificat"
 
-#: src/wx/kdm_dialog.cc:140
+#: src/wx/kdm_dialog.cc:175
 msgid "Send by email"
 msgstr "Envoyé par e-mail"
 
@@ -787,11 +866,16 @@ msgstr "Numéro de Série"
 msgid "Server"
 msgstr "Serveur"
 
+#: src/wx/screen_dialog.cc:41
+#, fuzzy
+msgid "Server manufacturer"
+msgstr "Numéro de Série du Serveur"
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr "Numéro de Série du Serveur"
 
-#: src/wx/config_dialog.cc:499
+#: src/wx/config_dialog.cc:485
 msgid "Servers"
 msgstr "Serveurs"
 
@@ -807,7 +891,7 @@ msgstr "Selectionnez la langue"
 msgid "Show Audio..."
 msgstr "Analyser le son..."
 
-#: src/wx/film_editor.cc:155
+#: src/wx/film_editor.cc:158
 msgid "Signed"
 msgstr "Signé"
 
@@ -823,15 +907,15 @@ msgstr "Echnager"
 msgid "Stable version "
 msgstr "Version Stable"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:38
+#: src/wx/isdcf_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Langue de sous-titres (ex. FR)"
 
@@ -855,19 +939,23 @@ msgstr "Position Verticale"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:149
+#: src/wx/about_dialog.cc:152
 msgid "Supported by"
 msgstr "Soutenu par"
 
-#: src/wx/config_dialog.cc:607
+#: src/wx/config_dialog.cc:593
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:631
+#: src/wx/config_dialog.cc:617
 msgid "Target path"
 msgstr "Chemin d'accès"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/isdcf_metadata_dialog.cc:56
+msgid "Temp version"
+msgstr "Version Temp"
+
+#: src/wx/isdcf_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Territoire (ex. FR)"
 
@@ -875,7 +963,7 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version Test"
 
-#: src/wx/about_dialog.cc:191
+#: src/wx/about_dialog.cc:197
 msgid "Tested by"
 msgstr "Testé par"
 
@@ -893,10 +981,14 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Il n'y a aucun avertissement: tout semble correct!"
 
-#: src/wx/film_viewer.cc:133
+#: src/wx/film_viewer.cc:134
 msgid "There is not enough free memory to do that."
 msgstr "Il n'y a pas assez de mémoire pour faire cela."
 
+#: src/wx/kdm_dialog.cc:537
+msgid "This is not a valid CPL file"
+msgstr "Ceci n'est pas un fichier CPL valide"
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Processus"
@@ -905,7 +997,7 @@ msgstr "Processus"
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
-#: src/wx/audio_plot.cc:168
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Durée"
 
@@ -913,19 +1005,20 @@ msgstr "Durée"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:289
 msgid "Timeline..."
 msgstr "Timeline..."
 
 #: src/wx/timing_panel.cc:35
-msgid "Timing"
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Durée"
 
-#: src/wx/video_panel.cc:109
+#: src/wx/video_panel.cc:110
 msgid "Top crop"
 msgstr "Découpe haut"
 
-#: src/wx/about_dialog.cc:104
+#: src/wx/about_dialog.cc:105
 msgid "Translated by"
 msgstr "Traduit par"
 
@@ -937,7 +1030,7 @@ msgstr "Exclure à la fin"
 msgid "Trim from start"
 msgstr "Exclure au début"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:75
 msgid "Type"
 msgstr "Type"
 
@@ -949,11 +1042,11 @@ msgstr "Nom de fichier certificat non conforme "
 msgid "Unknown"
 msgstr "inconnu."
 
-#: src/wx/kdm_dialog.cc:93
+#: src/wx/kdm_dialog.cc:112
 msgid "Until"
 msgstr "Jusqu'au"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:285
 msgid "Up"
 msgstr "Monter"
 
@@ -962,14 +1055,14 @@ msgid "Update"
 msgstr "Mise à jour."
 
 #: src/wx/film_editor.cc:128
-msgid "Use DCI name"
-msgstr "Utiliser le nom DCI"
+msgid "Use ISDCF name"
+msgstr "Utiliser le nom ISDCF"
 
-#: src/wx/config_dialog.cc:515
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Utiliser tous les serveurs."
 
-#: src/wx/film_editor.cc:149
+#: src/wx/film_editor.cc:152
 msgid "Use best"
 msgstr "Automatique"
 
@@ -977,15 +1070,15 @@ msgstr "Automatique"
 msgid "Use preset"
 msgstr "Utiliser le préréglage"
 
-#: src/wx/config_dialog.cc:635
+#: src/wx/config_dialog.cc:621
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: src/wx/audio_mapping_view.cc:308
+#: src/wx/audio_mapping_view.cc:305
 msgid "VI"
 msgstr "VI"
 
-#: src/wx/video_panel.cc:67
+#: src/wx/video_panel.cc:68
 msgid "Video"
 msgstr "Vidéo"
 
@@ -993,11 +1086,15 @@ msgstr "Vidéo"
 msgid "Video frame rate"
 msgstr "Cadence vidéo"
 
+#: src/wx/config_dialog.cc:750
+msgid "Warnings"
+msgstr "Avertissements"
+
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Avec sous-titres"
 
-#: src/wx/kdm_dialog.cc:127
+#: src/wx/kdm_dialog.cc:162
 msgid "Write to"
 msgstr "Ecrire à"
 
@@ -1044,7 +1141,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:240
 msgid "channels"
 msgstr "canaux"
 
@@ -1057,11 +1154,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:319
+#: src/wx/config_dialog.cc:305
 msgid "s"
 msgstr "s"
 
@@ -1077,6 +1174,12 @@ msgstr "fois"
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Timing"
+#~ msgstr "Durée"
+
+#~ msgid "-3dB"
+#~ msgstr "-3dB"
+
 #~ msgid "Content channel"
 #~ msgstr "Contenu audio"
 
@@ -1143,9 +1246,6 @@ msgstr "vidéo"
 #~ msgid "Colour look-up table"
 #~ msgstr "Espace colorimétrique"
 
-#~ msgid "Could not open content file (%s)"
-#~ msgstr "Ouverture du contenu impossible (%s)"
-
 #~ msgid "Could not set content: %s"
 #~ msgstr "Sélectionner du contenu impossible : %s"
 
@@ -1171,9 +1271,6 @@ msgstr "vidéo"
 #~ msgid "Reference scaler"
 #~ msgstr "Échelle de référence"
 
-#~ msgid "Select Audio File"
-#~ msgstr "Sélectionner le fichier son"
-
 #~ msgid "Trim method"
 #~ msgstr "Méthod de découpage"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index e4b9d4ff0..db7342be0 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -27,7 +27,7 @@ msgid ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:121
 msgid "(password will be stored on disk in plaintext)"
 msgstr ""
 
@@ -35,51 +35,56 @@ msgstr ""
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
-#: src/wx/audio_mapping_view.cc:135
-msgid "-3dB"
+#: src/wx/audio_mapping_view.cc:134
+msgid "-6dB"
 msgstr ""
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
 msgstr ""
 
-#: src/wx/audio_panel.cc:236
+#: src/wx/audio_panel.cc:238
 msgid "1 channel"
 msgstr "1 canale"
 
-#: src/wx/video_panel.cc:196
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:220
+#: src/wx/isdcf_metadata_dialog.cc:68
+#, fuzzy
+msgid "2D version of content available in 3D"
+msgstr "Una nuova versione di DCP-o-matic è disponibile."
+
+#: src/wx/film_editor.cc:224
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:168
+#: src/wx/film_editor.cc:171
 msgid "3D"
 msgstr ""
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:200
 msgid "3D alternate"
 msgstr ""
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:201
 msgid "3D left only"
 msgstr ""
 
-#: src/wx/video_panel.cc:197
+#: src/wx/video_panel.cc:198
 msgid "3D left/right"
 msgstr ""
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:202
 msgid "3D right only"
 msgstr ""
 
-#: src/wx/video_panel.cc:198
+#: src/wx/video_panel.cc:199
 msgid "3D top/bottom"
 msgstr ""
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:225
 msgid "4K"
 msgstr ""
 
@@ -91,19 +96,19 @@ msgstr "Una nuova versione di DCP-o-matic è disponibile"
 msgid "About DCP-o-matic"
 msgstr "Su DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:79
 msgid "Add Cinema..."
 msgstr "Aggiungi Cinema"
 
-#: src/wx/kdm_dialog.cc:73
+#: src/wx/kdm_dialog.cc:86
 msgid "Add Screen..."
 msgstr "Aggiungi Schermo"
 
-#: src/wx/film_editor.cc:280
+#: src/wx/film_editor.cc:279
 msgid "Add file(s)..."
 msgstr "Aggiungi File"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:281
 msgid "Add folder..."
 msgstr "Aggiungi cartella"
 
@@ -111,7 +116,12 @@ msgstr "Aggiungi cartella"
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: src/wx/about_dialog.cc:108
+#: src/wx/config_dialog.cc:743
+#, fuzzy
+msgid "Allow any DCP frame rate"
+msgstr "Frequenza fotogrammi video"
+
+#: src/wx/about_dialog.cc:109
 msgid "Artwork by"
 msgstr ""
 
@@ -127,7 +137,7 @@ msgstr "Ritardo dell'audio"
 msgid "Audio Gain"
 msgstr "Guadagno dell'audio"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Lingua dell'audio (es. EN)"
 
@@ -135,18 +145,18 @@ msgstr "Lingua dell'audio (es. EN)"
 msgid "Audio Stream"
 msgstr "Traccia Audio"
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Canali audio"
 
-#: src/wx/audio_mapping_view.cc:353
+#: src/wx/audio_mapping_view.cc:350
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
 "L' audio sarà trasferito dal canale %d sorgente al canale %d DCP inalterato."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -160,19 +170,19 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Valore sbagliato per %s (%s)"
 
-#: src/wx/video_panel.cc:120
+#: src/wx/video_panel.cc:121
 msgid "Bottom crop"
 msgstr "Taglio in basso"
 
-#: src/wx/dir_picker_ctrl.cc:37
+#: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Sfoglia..."
 
-#: src/wx/audio_mapping_view.cc:320
+#: src/wx/audio_mapping_view.cc:317
 msgid "BsL"
 msgstr "BsL"
 
-#: src/wx/audio_mapping_view.cc:324
+#: src/wx/audio_mapping_view.cc:321
 msgid "BsR"
 msgstr "BsR"
 
@@ -180,10 +190,22 @@ msgstr "BsR"
 msgid "But I have to use fader"
 msgstr "Ma dovrò riprodurre con il fader a"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:285
 msgid "C"
 msgstr "C"
 
+#: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
+msgid "CPL"
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:143
+msgid "CPL ID"
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:146
+msgid "CPL annotation text"
+msgstr ""
+
 #: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Calcola..."
@@ -203,6 +225,10 @@ msgstr "Seleziona il file del Certificato"
 msgid "Certificate downloaded"
 msgstr "Seleziona il file del Certificato"
 
+#: src/wx/isdcf_metadata_dialog.cc:65
+msgid "Chain"
+msgstr ""
+
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
 msgstr "Guadagno audio"
@@ -211,11 +237,11 @@ msgstr "Guadagno audio"
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/config_dialog.cc:137
+#: src/wx/config_dialog.cc:133
 msgid "Check for testing updates as well as stable ones"
 msgstr "Controlla per aggiornamenti test o stabili"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:129
 msgid "Check for updates on startup"
 msgstr "Controlla gli aggiornamentio alla partenza"
 
@@ -223,11 +249,11 @@ msgstr "Controlla gli aggiornamentio alla partenza"
 msgid "Choose a file"
 msgstr "Scegli un file"
 
-#: src/wx/film_editor.cc:775
+#: src/wx/film_editor.cc:788
 msgid "Choose a file or files"
 msgstr "Scegli uno o più file"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:811
 msgid "Choose a folder"
 msgstr "Scegli una cartella"
 
@@ -236,21 +262,25 @@ msgstr "Scegli una cartella"
 msgid "Cinema"
 msgstr "Aggiungi Cinema"
 
-#: src/wx/config_dialog.cc:561
+#: src/wx/config_dialog.cc:547
 #, fuzzy
 msgid "Colour Conversions"
 msgstr "Conversioni colore"
 
 #: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:162
 msgid "Colour conversion"
 msgstr "Conversione colore"
 
+#: src/wx/config_dialog.cc:756
+msgid "Config|Timing"
+msgstr ""
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Contenitore"
 
-#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:270 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Sorgente"
 
@@ -258,25 +288,25 @@ msgstr "Sorgente"
 msgid "Content Type"
 msgstr "Tipo di sorgente"
 
-#: src/wx/video_panel.cc:331
+#: src/wx/video_panel.cc:332
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Freq. fotogrammi sorgente %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:32
+#: src/wx/isdcf_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Tipo di sorgente"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:292
 #, fuzzy, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Il video originale è %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:136
+#: src/wx/audio_dialog.cc:151
 msgid "Could not analyse audio."
 msgstr "Non posso analizzare l'audio."
 
-#: src/wx/film_viewer.cc:345
+#: src/wx/film_viewer.cc:346
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Non posso decodificare il video per guardarlo (%s)"
@@ -286,6 +316,11 @@ msgstr "Non posso decodificare il video per guardarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Non posso creare il DCP: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Non posso aprire il file del contenuto (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr ""
@@ -294,20 +329,16 @@ msgstr ""
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:304
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Tagliato da %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:243
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:30
-msgid "DCI name"
-msgstr "Nome DCI"
-
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
+#: src/wx/film_editor.cc:87
 msgid "DCP"
 msgstr ""
 
@@ -315,6 +346,10 @@ msgstr ""
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
+#: src/wx/kdm_dialog.cc:140
+msgid "DCP directory"
+msgstr ""
+
 #: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
@@ -324,46 +359,47 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:331
-msgid "Default DCI name details"
+#: src/wx/config_dialog.cc:317
+#, fuzzy
+msgid "Default ISDCF name details"
 msgstr "Dettagli del nome DCI predefinito"
 
-#: src/wx/config_dialog.cc:344
+#: src/wx/config_dialog.cc:330
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:353
+#: src/wx/config_dialog.cc:339
 msgid "Default audio delay"
 msgstr "Ritardo audio predefinito"
 
-#: src/wx/config_dialog.cc:335
+#: src/wx/config_dialog.cc:321
 msgid "Default container"
 msgstr "Contenitore predefinito"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:325
 msgid "Default content type"
 msgstr "Tipo sorgente predefinito"
 
-#: src/wx/config_dialog.cc:365
+#: src/wx/config_dialog.cc:351
 #, fuzzy
 msgid "Default creator"
 msgstr "Contenitore predefinito"
 
-#: src/wx/config_dialog.cc:323
+#: src/wx/config_dialog.cc:309
 msgid "Default directory for new films"
 msgstr "Cartella predefinita per i nuovi films"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/config_dialog.cc:301
 msgid "Default duration of still images"
 msgstr "Durata predefinita immagini statiche"
 
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:347
 #, fuzzy
 msgid "Default issuer"
 msgstr "Predefiniti"
 
-#: src/wx/config_dialog.cc:294
+#: src/wx/config_dialog.cc:280
 msgid "Defaults"
 msgstr "Predefiniti"
 
@@ -389,7 +425,7 @@ msgstr ""
 msgid "Doremi serial numbers must have 6 digits"
 msgstr ""
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:287
 msgid "Down"
 msgstr ""
 
@@ -406,16 +442,16 @@ msgstr ""
 msgid "Downloading certificate"
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:68
+#: src/wx/kdm_dialog.cc:81
 msgid "Edit Cinema..."
 msgstr "Modifica Cinema..."
 
-#: src/wx/kdm_dialog.cc:75
+#: src/wx/kdm_dialog.cc:88
 msgid "Edit Screen..."
 msgstr "Modifica Schermo..."
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
-#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Modifica..."
@@ -429,11 +465,15 @@ msgstr "Indirizzo email per consegna KDM"
 msgid "Encoding Servers"
 msgstr "Servers di codifica"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:162
 msgid "Encrypted"
 msgstr "Criptato"
 
-#: src/wx/dci_metadata_dialog.cc:50
+#: src/wx/config_dialog.cc:753
+msgid "Errors"
+msgstr ""
+
+#: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Facility (es. DLA)"
 
@@ -451,7 +491,7 @@ msgstr "Proprietà del film"
 msgid "Film name"
 msgstr "Nome del film"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:146
 msgid "Filters"
 msgstr "Filtri"
 
@@ -475,15 +515,15 @@ msgstr "Fotogrammi già codificati"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:85
+#: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "Da"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:125
 msgid "From address for KDM emails"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:134
+#: src/wx/audio_mapping_view.cc:133
 msgid "Full"
 msgstr ""
 
@@ -504,7 +544,11 @@ msgstr "Guadagno per il canale sorgente %d nel canale DCP %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/audio_mapping_view.cc:304
+#: src/wx/config_dialog.cc:748
+msgid "General"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:301
 msgid "HI"
 msgstr "HI"
 
@@ -520,7 +564,7 @@ msgstr ""
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:242
 msgid "Hz"
 msgstr "Hz"
 
@@ -528,24 +572,29 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/config_dialog.cc:627
+#: src/wx/config_dialog.cc:613
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/config_dialog.cc:519
+#: src/wx/config_dialog.cc:505
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Indirizzo IP"
 
+#: src/wx/isdcf_metadata_dialog.cc:30
+#, fuzzy
+msgid "ISDCF name"
+msgstr "Nome DCI"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr ""
 
-#: src/wx/film_editor.cc:224
+#: src/wx/film_editor.cc:228
 msgid "Interop"
 msgstr ""
 
-#: src/wx/film_editor.cc:178
+#: src/wx/film_editor.cc:181
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
@@ -553,27 +602,31 @@ msgstr "Banda passante JPEG2000"
 msgid "Join"
 msgstr ""
 
-#: src/wx/config_dialog.cc:694
+#: src/wx/config_dialog.cc:680
 msgid "KDM Email"
 msgstr ""
 
-#: src/wx/film_editor.cc:298
+#: src/wx/kdm_dialog.cc:99
+msgid "KDM|Timing"
+msgstr ""
+
+#: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Tieni i video in sequenza"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:277
 msgid "L"
 msgstr "L"
 
-#: src/wx/audio_mapping_view.cc:312
+#: src/wx/audio_mapping_view.cc:309
 msgid "Lc"
 msgstr "Lc"
 
-#: src/wx/video_panel.cc:87
+#: src/wx/video_panel.cc:88
 msgid "Left crop"
 msgstr "Taglio a sinistra"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/audio_mapping_view.cc:289
 msgid "Lfe"
 msgstr "Lfe"
 
@@ -585,42 +638,50 @@ msgstr "Linearizza la curva del gamma in ingresso per piccoli valori"
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/config_dialog.cc:747
+msgid "Log"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:749
+#: src/wx/film_editor.cc:762
 msgid "MISSING: "
 msgstr "MANCANTE:"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:117
 #, fuzzy
 msgid "Mail password"
 msgstr "Password del TMS"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:113
 #, fuzzy
 msgid "Mail user name"
 msgstr "Nome utente del TMS"
 
-#: src/wx/kdm_dialog.cc:47
+#: src/wx/kdm_dialog.cc:49
 msgid "Make KDMs"
 msgstr "Crea KDM"
 
+#: src/wx/isdcf_metadata_dialog.cc:71
+msgid "Mastered luminance (e.g. 4fl)"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:739
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Molteplici sorgenti selezionate"
 
@@ -628,8 +689,9 @@ msgstr "Molteplici sorgenti selezionate"
 msgid "My Documents"
 msgstr "Documenti"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nome"
 
@@ -641,16 +703,16 @@ msgstr "Nuovo Film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "Una nuova versione di DCP-o-matic è disponibile."
 
-#: src/wx/audio_mapping_view.cc:351
+#: src/wx/audio_mapping_view.cc:348
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Nessun audio sarà passato dal canale %d sorgente al canale %d del DCP"
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:153 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Nessuno"
 
-#: src/wx/audio_mapping_view.cc:133
+#: src/wx/audio_mapping_view.cc:132
 msgid "Off"
 msgstr ""
 
@@ -658,24 +720,29 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:109
 msgid "Outgoing mail server"
 msgstr "Mail server posta in uscita"
 
+#: src/wx/kdm_dialog.cc:156
+#, fuzzy
+msgid "Output"
+msgstr "Gamma in uscita"
+
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
 msgstr "Gamma in uscita"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:325
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Riempito con nero a %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:639
+#: src/wx/config_dialog.cc:625
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
@@ -688,7 +755,7 @@ msgstr "Pausa"
 msgid "Peak"
 msgstr "Picco"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Riproduci"
 
@@ -696,7 +763,7 @@ msgstr "Riproduci"
 msgid "Play length"
 msgstr ""
 
-#: src/wx/audio_plot.cc:43
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
 
@@ -704,7 +771,11 @@ msgstr "Attendere prego; sto analizzando l'audio..."
 msgid "Position"
 msgstr "Posizione"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:59
+msgid "Pre-release"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:281
 msgid "R"
 msgstr "R"
 
@@ -712,24 +783,28 @@ msgstr "R"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:44
+#: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Classificazione (es. 15)"
 
-#: src/wx/audio_mapping_view.cc:316
+#: src/wx/audio_mapping_view.cc:313
 msgid "Rc"
 msgstr "Rc"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:62
+msgid "Red band"
+msgstr ""
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283
 #: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:83
 msgid "Remove Cinema"
 msgstr "Rimuovi Cinema"
 
-#: src/wx/kdm_dialog.cc:77
+#: src/wx/kdm_dialog.cc:90
 msgid "Remove Screen"
 msgstr "Rimuovi Schermo"
 
@@ -745,7 +820,7 @@ msgstr "Ripeti il contenuto"
 msgid "Repeat..."
 msgstr ""
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Risoluzione"
 
@@ -753,40 +828,50 @@ msgstr "Risoluzione"
 msgid "Resume"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:359
+#: src/wx/audio_mapping_view.cc:356
 msgid "Right click to change gain."
 msgstr "Clicca il tasto destro per cambiare guadagno."
 
-#: src/wx/video_panel.cc:98
+#: src/wx/video_panel.cc:99
 msgid "Right crop"
 msgstr "Taglio a destra"
 
-#: src/wx/audio_mapping_view.cc:300
+#: src/wx/audio_mapping_view.cc:297
 msgid "Rs"
 msgstr "Rs"
 
-#: src/wx/film_editor.cc:223
+#: src/wx/film_editor.cc:227
 msgid "SMPTE"
 msgstr ""
 
-#: src/wx/video_panel.cc:131
+#: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Scala a"
 
-#: src/wx/video_panel.cc:315
+#: src/wx/video_panel.cc:316
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Scalato a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:195
 msgid "Scaler"
 msgstr "Scaler"
 
+#: src/wx/kdm_dialog.cc:60
+#, fuzzy
+msgid "Screens"
+msgstr "Aggiungi Schermo"
+
+#: src/wx/kdm_dialog.cc:515
+#, fuzzy
+msgid "Select CPL XML file"
+msgstr "Seleziona file audio"
+
 #: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/kdm_dialog.cc:140
+#: src/wx/kdm_dialog.cc:175
 msgid "Send by email"
 msgstr "Manda per email"
 
@@ -798,11 +883,15 @@ msgstr ""
 msgid "Server"
 msgstr "Server"
 
+#: src/wx/screen_dialog.cc:41
+msgid "Server manufacturer"
+msgstr ""
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr ""
 
-#: src/wx/config_dialog.cc:499
+#: src/wx/config_dialog.cc:485
 #, fuzzy
 msgid "Servers"
 msgstr "Server"
@@ -819,7 +908,7 @@ msgstr "Seleziona la lingua"
 msgid "Show Audio..."
 msgstr "Mostra Audio..."
 
-#: src/wx/film_editor.cc:155
+#: src/wx/film_editor.cc:158
 msgid "Signed"
 msgstr ""
 
@@ -835,15 +924,15 @@ msgstr ""
 msgid "Stable version "
 msgstr "Versione stabile"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Standard"
 msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (es. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:38
+#: src/wx/isdcf_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Lingua dei Sottotitoli (es. FR)"
 
@@ -867,20 +956,25 @@ msgstr "Spostamento Y dei Sottotitoli"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:149
+#: src/wx/about_dialog.cc:152
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:607
+#: src/wx/config_dialog.cc:593
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:631
+#: src/wx/config_dialog.cc:617
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/isdcf_metadata_dialog.cc:56
+#, fuzzy
+msgid "Temp version"
+msgstr "Versione di test"
+
+#: src/wx/isdcf_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Nazione (es. UK)"
 
@@ -888,7 +982,7 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:191
+#: src/wx/about_dialog.cc:197
 msgid "Tested by"
 msgstr ""
 
@@ -905,10 +999,14 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Non ci sono suggerimenti: sembra tutto a posto!"
 
-#: src/wx/film_viewer.cc:133
+#: src/wx/film_viewer.cc:134
 msgid "There is not enough free memory to do that."
 msgstr ""
 
+#: src/wx/kdm_dialog.cc:537
+msgid "This is not a valid CPL file"
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Threads"
@@ -917,7 +1015,7 @@ msgstr "Threads"
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
-#: src/wx/audio_plot.cc:168
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Tempo"
 
@@ -925,19 +1023,19 @@ msgstr "Tempo"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:289
 msgid "Timeline..."
 msgstr ""
 
 #: src/wx/timing_panel.cc:35
-msgid "Timing"
+msgid "Timing|Timing"
 msgstr ""
 
-#: src/wx/video_panel.cc:109
+#: src/wx/video_panel.cc:110
 msgid "Top crop"
 msgstr "Taglio in alto"
 
-#: src/wx/about_dialog.cc:104
+#: src/wx/about_dialog.cc:105
 msgid "Translated by"
 msgstr ""
 
@@ -949,7 +1047,7 @@ msgstr "Taglia dalla fine"
 msgid "Trim from start"
 msgstr "Taglia dall'inizio"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:75
 msgid "Type"
 msgstr "Tipo"
 
@@ -963,11 +1061,11 @@ msgstr "Seleziona il file del Certificato"
 msgid "Unknown"
 msgstr "sconosciuto"
 
-#: src/wx/kdm_dialog.cc:93
+#: src/wx/kdm_dialog.cc:112
 msgid "Until"
 msgstr "Fino a"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:285
 msgid "Up"
 msgstr "Su"
 
@@ -976,14 +1074,15 @@ msgid "Update"
 msgstr "Aggiorna"
 
 #: src/wx/film_editor.cc:128
-msgid "Use DCI name"
+#, fuzzy
+msgid "Use ISDCF name"
 msgstr "Usa nome DCI"
 
-#: src/wx/config_dialog.cc:515
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Usa tutti i server"
 
-#: src/wx/film_editor.cc:149
+#: src/wx/film_editor.cc:152
 msgid "Use best"
 msgstr "Usa la migliore"
 
@@ -991,15 +1090,15 @@ msgstr "Usa la migliore"
 msgid "Use preset"
 msgstr "Usa predefinito"
 
-#: src/wx/config_dialog.cc:635
+#: src/wx/config_dialog.cc:621
 msgid "User name"
 msgstr "Nome utente"
 
-#: src/wx/audio_mapping_view.cc:308
+#: src/wx/audio_mapping_view.cc:305
 msgid "VI"
 msgstr "VI"
 
-#: src/wx/video_panel.cc:67
+#: src/wx/video_panel.cc:68
 msgid "Video"
 msgstr "Video"
 
@@ -1007,11 +1106,15 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "Frequenza fotogrammi video"
 
+#: src/wx/config_dialog.cc:750
+msgid "Warnings"
+msgstr ""
+
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Con sottotitoli"
 
-#: src/wx/kdm_dialog.cc:127
+#: src/wx/kdm_dialog.cc:162
 msgid "Write to"
 msgstr ""
 
@@ -1059,7 +1162,7 @@ msgstr ""
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:240
 msgid "channels"
 msgstr "canali"
 
@@ -1072,11 +1175,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:319
+#: src/wx/config_dialog.cc:305
 msgid "s"
 msgstr "s"
 
@@ -1144,9 +1247,6 @@ msgstr "Video"
 #~ msgid "Colour look-up table"
 #~ msgstr "Tabella per ricerca del colore"
 
-#~ msgid "Could not open content file (%s)"
-#~ msgstr "Non posso aprire il file del contenuto (%s)"
-
 #~ msgid "Could not set content: %s"
 #~ msgstr "Non posso regolare il contenuto: %s"
 
@@ -1174,9 +1274,6 @@ msgstr "Video"
 #~ msgid "Reference scaler"
 #~ msgstr "Scalatura di riferimento A/B"
 
-#~ msgid "Select Audio File"
-#~ msgstr "Seleziona file audio"
-
 #~ msgid "Trim method"
 #~ msgstr "Metodo di taglio"
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 3f62e4f1b..948511ddb 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-03-30 19:40+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:121
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(wachtwoord wordt opgeslagen op disk in leesbare tekst)"
 
@@ -37,52 +37,57 @@ msgstr "(wachtwoord wordt opgeslagen op disk in leesbare tekst)"
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(herstart DCP-o-matic voor taal wijziging)"
 
-#: src/wx/audio_mapping_view.cc:135
-msgid "-3dB"
-msgstr "-3dB"
+#: src/wx/audio_mapping_view.cc:134
+msgid "-6dB"
+msgstr ""
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/audio_panel.cc:236
+#: src/wx/audio_panel.cc:238
 msgid "1 channel"
 msgstr "1 channel"
 
-#: src/wx/video_panel.cc:196
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/film_editor.cc:220
+#: src/wx/isdcf_metadata_dialog.cc:68
+#, fuzzy
+msgid "2D version of content available in 3D"
+msgstr "Er zijn nieuwe versies van DCP -o- matic beschikbaar."
+
+#: src/wx/film_editor.cc:224
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/film_editor.cc:168
+#: src/wx/film_editor.cc:171
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:200
 msgid "3D alternate"
 msgstr "3D alternate"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:201
 msgid "3D left only"
 msgstr ""
 
-#: src/wx/video_panel.cc:197
+#: src/wx/video_panel.cc:198
 msgid "3D left/right"
 msgstr "3D links/rechts"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:202
 #, fuzzy
 msgid "3D right only"
 msgstr "3D links/rechts"
 
-#: src/wx/video_panel.cc:198
+#: src/wx/video_panel.cc:199
 msgid "3D top/bottom"
 msgstr "3D boven/beneden"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:225
 msgid "4K"
 msgstr "4K"
 
@@ -94,19 +99,19 @@ msgstr "Een nieuwe versie van DCP-o-matic is beschikbaar."
 msgid "About DCP-o-matic"
 msgstr "Over DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:79
 msgid "Add Cinema..."
 msgstr "Voeg Bioscoop toe..."
 
-#: src/wx/kdm_dialog.cc:73
+#: src/wx/kdm_dialog.cc:86
 msgid "Add Screen..."
 msgstr "Voeg Scherm toe..."
 
-#: src/wx/film_editor.cc:280
+#: src/wx/film_editor.cc:279
 msgid "Add file(s)..."
 msgstr "Voeg bestande(n) toe..."
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:281
 msgid "Add folder..."
 msgstr "Voeg map toe..."
 
@@ -114,7 +119,12 @@ msgstr "Voeg map toe..."
 msgid "Add..."
 msgstr "Toevoegen.."
 
-#: src/wx/about_dialog.cc:108
+#: src/wx/config_dialog.cc:743
+#, fuzzy
+msgid "Allow any DCP frame rate"
+msgstr "Video frame rate"
+
+#: src/wx/about_dialog.cc:109
 msgid "Artwork by"
 msgstr "Artwork door"
 
@@ -130,7 +140,7 @@ msgstr "Audio Delay"
 msgid "Audio Gain"
 msgstr "Audio Gain"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "AudioTaal (e.g. NL)"
 
@@ -138,11 +148,11 @@ msgstr "AudioTaal (e.g. NL)"
 msgid "Audio Stream"
 msgstr "Audio Stream"
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Audio kanalen"
 
-#: src/wx/audio_mapping_view.cc:353
+#: src/wx/audio_mapping_view.cc:350
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
@@ -150,7 +160,7 @@ msgstr ""
 "Audio van content kanaal  %d wordt onveranderd doorgestuurd naar DCP kanaal "
 "%d"
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -164,19 +174,19 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Verkeede instellingen voor %s (%s)"
 
-#: src/wx/video_panel.cc:120
+#: src/wx/video_panel.cc:121
 msgid "Bottom crop"
 msgstr "Bottom crop"
 
-#: src/wx/dir_picker_ctrl.cc:37
+#: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Verkennen..."
 
-#: src/wx/audio_mapping_view.cc:320
+#: src/wx/audio_mapping_view.cc:317
 msgid "BsL"
 msgstr "BsL"
 
-#: src/wx/audio_mapping_view.cc:324
+#: src/wx/audio_mapping_view.cc:321
 msgid "BsR"
 msgstr "BsR"
 
@@ -184,10 +194,23 @@ msgstr "BsR"
 msgid "But I have to use fader"
 msgstr "Maak ik gebruik een fader"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:285
 msgid "C"
 msgstr "C"
 
+#: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
+#, fuzzy
+msgid "CPL"
+msgstr "DCP"
+
+#: src/wx/kdm_dialog.cc:143
+msgid "CPL ID"
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:146
+msgid "CPL annotation text"
+msgstr ""
+
 #: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Bereken..."
@@ -206,6 +229,10 @@ msgstr "certificaat"
 msgid "Certificate downloaded"
 msgstr "certificaat"
 
+#: src/wx/isdcf_metadata_dialog.cc:65
+msgid "Chain"
+msgstr ""
+
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
 msgstr "Kanaal versterking"
@@ -214,11 +241,11 @@ msgstr "Kanaal versterking"
 msgid "Channels"
 msgstr "Kanalen"
 
-#: src/wx/config_dialog.cc:137
+#: src/wx/config_dialog.cc:133
 msgid "Check for testing updates as well as stable ones"
 msgstr "Selecteer voor Test updates en Stabiele versies "
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:129
 msgid "Check for updates on startup"
 msgstr "Selecteer voor updates controle bij startup"
 
@@ -226,11 +253,11 @@ msgstr "Selecteer voor updates controle bij startup"
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
-#: src/wx/film_editor.cc:775
+#: src/wx/film_editor.cc:788
 msgid "Choose a file or files"
 msgstr "Kies bestand(en)"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:811
 msgid "Choose a folder"
 msgstr "Kies map"
 
@@ -238,20 +265,25 @@ msgstr "Kies map"
 msgid "Cinema"
 msgstr "Bioscoop"
 
-#: src/wx/config_dialog.cc:561
+#: src/wx/config_dialog.cc:547
 msgid "Colour Conversions"
 msgstr "Colour Conversions"
 
 #: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:162
 msgid "Colour conversion"
 msgstr "Colour conversion"
 
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Timing"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Container"
 
-#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:270 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Content"
 
@@ -259,25 +291,25 @@ msgstr "Content"
 msgid "Content Type"
 msgstr "Content Type"
 
-#: src/wx/video_panel.cc:331
+#: src/wx/video_panel.cc:332
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Content frame rate %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:32
+#: src/wx/isdcf_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Content versie"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:292
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Content video is %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:136
+#: src/wx/audio_dialog.cc:151
 msgid "Could not analyse audio."
 msgstr "Kan audio niet analyseren"
 
-#: src/wx/film_viewer.cc:345
+#: src/wx/film_viewer.cc:346
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kan video niet decoderen voor preview (%s)"
@@ -287,6 +319,11 @@ msgstr "Kan video niet decoderen voor preview (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Kan geen DCP maken: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Kan video niet decoderen voor preview (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr "Land"
@@ -295,20 +332,16 @@ msgstr "Land"
 msgid "Create in folder"
 msgstr "Maak in map"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:304
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Cropped naar %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:243
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr "aangepast"
 
-#: src/wx/dci_metadata_dialog.cc:30
-msgid "DCI name"
-msgstr "DCI naam"
-
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
+#: src/wx/film_editor.cc:87
 msgid "DCP"
 msgstr "DCP"
 
@@ -316,6 +349,10 @@ msgstr "DCP"
 msgid "DCP Name"
 msgstr "DCP naam"
 
+#: src/wx/kdm_dialog.cc:140
+msgid "DCP directory"
+msgstr ""
+
 #: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
@@ -325,43 +362,44 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:331
-msgid "Default DCI name details"
+#: src/wx/config_dialog.cc:317
+#, fuzzy
+msgid "Default ISDCF name details"
 msgstr "Standaard DCI naam details"
 
-#: src/wx/config_dialog.cc:344
+#: src/wx/config_dialog.cc:330
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standaard JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:353
+#: src/wx/config_dialog.cc:339
 msgid "Default audio delay"
 msgstr "Standaard audio delay"
 
-#: src/wx/config_dialog.cc:335
+#: src/wx/config_dialog.cc:321
 msgid "Default container"
 msgstr "Standaard container"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:325
 msgid "Default content type"
 msgstr "Standaard content type"
 
-#: src/wx/config_dialog.cc:365
+#: src/wx/config_dialog.cc:351
 msgid "Default creator"
 msgstr "Standaard maker"
 
-#: src/wx/config_dialog.cc:323
+#: src/wx/config_dialog.cc:309
 msgid "Default directory for new films"
 msgstr "Standaard map voor nieuwe films"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/config_dialog.cc:301
 msgid "Default duration of still images"
 msgstr "Standaard lengte van stills"
 
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:347
 msgid "Default issuer"
 msgstr "Standaard uitgever"
 
-#: src/wx/config_dialog.cc:294
+#: src/wx/config_dialog.cc:280
 msgid "Defaults"
 msgstr "Standaard instellingen"
 
@@ -387,7 +425,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Doremi serial numbers moeten bestaan uit 6 digits"
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:287
 msgid "Down"
 msgstr "Naar beneden"
 
@@ -404,16 +442,16 @@ msgstr "Download certificaat"
 msgid "Downloading certificate"
 msgstr "Downloading certificaat"
 
-#: src/wx/kdm_dialog.cc:68
+#: src/wx/kdm_dialog.cc:81
 msgid "Edit Cinema..."
 msgstr "Edit Bioscoop"
 
-#: src/wx/kdm_dialog.cc:75
+#: src/wx/kdm_dialog.cc:88
 msgid "Edit Screen..."
 msgstr "Edit scherm"
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
-#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Edit..."
@@ -426,11 +464,15 @@ msgstr "Email adres voor KDM aflevering"
 msgid "Encoding Servers"
 msgstr "Encoding Servers"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:162
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: src/wx/dci_metadata_dialog.cc:50
+#: src/wx/config_dialog.cc:753
+msgid "Errors"
+msgstr ""
+
+#: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "faciliteit (e.g. DLA)"
 
@@ -447,7 +489,7 @@ msgstr "Film Instellingen"
 msgid "Film name"
 msgstr "Film naam"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:146
 msgid "Filters"
 msgstr "Filters"
 
@@ -471,15 +513,15 @@ msgstr "Frames zijn al omgezet"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Gratis, open-source DCP samensteller voor bijna alles."
 
-#: src/wx/kdm_dialog.cc:85
+#: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "Van"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:125
 msgid "From address for KDM emails"
 msgstr "Van adres voor KDM emails"
 
-#: src/wx/audio_mapping_view.cc:134
+#: src/wx/audio_mapping_view.cc:133
 msgid "Full"
 msgstr "Volledig"
 
@@ -500,7 +542,11 @@ msgstr "Gain voor content kanaal %d in DCP kanaal %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/audio_mapping_view.cc:304
+#: src/wx/config_dialog.cc:748
+msgid "General"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:301
 msgid "HI"
 msgstr "HI"
 
@@ -516,7 +562,7 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Host naam of IP address"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:242
 msgid "Hz"
 msgstr "Hz"
 
@@ -524,23 +570,28 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Ik wil dit afspelen met fader"
 
-#: src/wx/config_dialog.cc:627
+#: src/wx/config_dialog.cc:613
 msgid "IP address"
 msgstr "IP adres"
 
-#: src/wx/config_dialog.cc:519
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "IP adres / host naam"
 
+#: src/wx/isdcf_metadata_dialog.cc:30
+#, fuzzy
+msgid "ISDCF name"
+msgstr "DCI naam"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr "Input gamma"
 
-#: src/wx/film_editor.cc:224
+#: src/wx/film_editor.cc:228
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/film_editor.cc:178
+#: src/wx/film_editor.cc:181
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbreedte"
 
@@ -548,27 +599,32 @@ msgstr "JPEG2000 bandbreedte"
 msgid "Join"
 msgstr "Samenvoegen"
 
-#: src/wx/config_dialog.cc:694
+#: src/wx/config_dialog.cc:680
 msgid "KDM Email"
 msgstr "KDM Email"
 
-#: src/wx/film_editor.cc:298
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Timing"
+
+#: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Behoud video in tijdlijn"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:277
 msgid "L"
 msgstr "L"
 
-#: src/wx/audio_mapping_view.cc:312
+#: src/wx/audio_mapping_view.cc:309
 msgid "Lc"
 msgstr "Lc"
 
-#: src/wx/video_panel.cc:87
+#: src/wx/video_panel.cc:88
 msgid "Left crop"
 msgstr "Left crop"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/audio_mapping_view.cc:289
 msgid "Lfe"
 msgstr "Lfe"
 
@@ -580,39 +636,47 @@ msgstr "Linearise input gamma curve for low values"
 msgid "Load from file..."
 msgstr "Laad van bestand..."
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/config_dialog.cc:747
+msgid "Log"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:749
+#: src/wx/film_editor.cc:762
 msgid "MISSING: "
 msgstr "ONTBREEKT:"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:117
 msgid "Mail password"
 msgstr "Mail wachtwoord"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:113
 msgid "Mail user name"
 msgstr "Mail gebruikersnaam"
 
-#: src/wx/kdm_dialog.cc:47
+#: src/wx/kdm_dialog.cc:49
 msgid "Make KDMs"
 msgstr "Maak KDM's"
 
+#: src/wx/isdcf_metadata_dialog.cc:71
+msgid "Mastered luminance (e.g. 4fl)"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:739
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximum JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Meedere content geselecteerd"
 
@@ -620,8 +684,9 @@ msgstr "Meedere content geselecteerd"
 msgid "My Documents"
 msgstr "Mijn documenten"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Naam"
 
@@ -633,18 +698,18 @@ msgstr "Nieuwe Film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "Er zijn nieuwe versies van DCP -o- matic beschikbaar."
 
-#: src/wx/audio_mapping_view.cc:351
+#: src/wx/audio_mapping_view.cc:348
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr ""
 "Er wordt geen audio van het content kanaal %d doorgestuurd naar DCP kanaal "
 "%d."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:153 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Geen"
 
-#: src/wx/audio_mapping_view.cc:133
+#: src/wx/audio_mapping_view.cc:132
 msgid "Off"
 msgstr "Uit"
 
@@ -652,24 +717,29 @@ msgstr "Uit"
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:109
 msgid "Outgoing mail server"
 msgstr "Uitgaande mail server"
 
+#: src/wx/kdm_dialog.cc:156
+#, fuzzy
+msgid "Output"
+msgstr "Output gamma"
+
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
 msgstr "Output gamma"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Package Type (e.g. OV)"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:325
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Opgevuld met zwart tot %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:639
+#: src/wx/config_dialog.cc:625
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -681,7 +751,7 @@ msgstr "Pauze"
 msgid "Peak"
 msgstr "Piek"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Afspelen"
 
@@ -689,7 +759,7 @@ msgstr "Afspelen"
 msgid "Play length"
 msgstr "Afspeellengte"
 
-#: src/wx/audio_plot.cc:43
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Een ogenblik geduld, het audio wordt geanalyseerd..."
 
@@ -697,7 +767,11 @@ msgstr "Een ogenblik geduld, het audio wordt geanalyseerd..."
 msgid "Position"
 msgstr "Positie"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:59
+msgid "Pre-release"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:281
 msgid "R"
 msgstr "R"
 
@@ -705,24 +779,28 @@ msgstr "R"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:44
+#: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Beoordeling (e.g. 15)"
 
-#: src/wx/audio_mapping_view.cc:316
+#: src/wx/audio_mapping_view.cc:313
 msgid "Rc"
 msgstr "Rc"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:62
+msgid "Red band"
+msgstr ""
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283
 #: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Verwijder"
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:83
 msgid "Remove Cinema"
 msgstr "Verwijder Bioscoop"
 
-#: src/wx/kdm_dialog.cc:77
+#: src/wx/kdm_dialog.cc:90
 msgid "Remove Screen"
 msgstr "Verwijder Scherm"
 
@@ -738,7 +816,7 @@ msgstr "Herhaal content"
 msgid "Repeat..."
 msgstr "Herhaal..."
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Resolutie"
 
@@ -746,40 +824,49 @@ msgstr "Resolutie"
 msgid "Resume"
 msgstr "Vervolg"
 
-#: src/wx/audio_mapping_view.cc:359
+#: src/wx/audio_mapping_view.cc:356
 msgid "Right click to change gain."
 msgstr "Klik Rechtermuis om gain te veranderen"
 
-#: src/wx/video_panel.cc:98
+#: src/wx/video_panel.cc:99
 msgid "Right crop"
 msgstr "Right crop"
 
-#: src/wx/audio_mapping_view.cc:300
+#: src/wx/audio_mapping_view.cc:297
 msgid "Rs"
 msgstr "Rs"
 
-#: src/wx/film_editor.cc:223
+#: src/wx/film_editor.cc:227
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:131
+#: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Schaal tot"
 
-#: src/wx/video_panel.cc:315
+#: src/wx/video_panel.cc:316
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Geschaald naar %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:195
 msgid "Scaler"
 msgstr "Schaler"
 
+#: src/wx/kdm_dialog.cc:60
+#, fuzzy
+msgid "Screens"
+msgstr "Voeg Scherm toe..."
+
+#: src/wx/kdm_dialog.cc:515
+msgid "Select CPL XML file"
+msgstr ""
+
 #: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Selecteer Certificaat bestand"
 
-#: src/wx/kdm_dialog.cc:140
+#: src/wx/kdm_dialog.cc:175
 msgid "Send by email"
 msgstr "Stuur per Email"
 
@@ -791,11 +878,16 @@ msgstr "Serie nummer"
 msgid "Server"
 msgstr "Server"
 
+#: src/wx/screen_dialog.cc:41
+#, fuzzy
+msgid "Server manufacturer"
+msgstr "Server serie nummer"
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr "Server serie nummer"
 
-#: src/wx/config_dialog.cc:499
+#: src/wx/config_dialog.cc:485
 msgid "Servers"
 msgstr "Servers"
 
@@ -811,7 +903,7 @@ msgstr "Taal Instellen"
 msgid "Show Audio..."
 msgstr "Toon Audio..."
 
-#: src/wx/film_editor.cc:155
+#: src/wx/film_editor.cc:158
 msgid "Signed"
 msgstr "Signed"
 
@@ -827,15 +919,15 @@ msgstr "Snap"
 msgid "Stable version "
 msgstr "Stabiele versie"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Standard"
 msgstr "Standaard"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (e.g. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:38
+#: src/wx/isdcf_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Ondertitel Taal (vb  NL)"
 
@@ -859,19 +951,24 @@ msgstr "Ondertitel Y offset"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:149
+#: src/wx/about_dialog.cc:152
 msgid "Supported by"
 msgstr "Ondersteund door"
 
-#: src/wx/config_dialog.cc:607
+#: src/wx/config_dialog.cc:593
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:631
+#: src/wx/config_dialog.cc:617
 msgid "Target path"
 msgstr "Doel pad"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/isdcf_metadata_dialog.cc:56
+#, fuzzy
+msgid "Temp version"
+msgstr "Test Versie"
+
+#: src/wx/isdcf_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Grondgebied (vb NL)"
 
@@ -879,7 +976,7 @@ msgstr "Grondgebied (vb NL)"
 msgid "Test version "
 msgstr "Test Versie"
 
-#: src/wx/about_dialog.cc:191
+#: src/wx/about_dialog.cc:197
 msgid "Tested by"
 msgstr "Getest door"
 
@@ -897,10 +994,14 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Er zijn geen tips, alles lijkt goed!"
 
-#: src/wx/film_viewer.cc:133
+#: src/wx/film_viewer.cc:134
 msgid "There is not enough free memory to do that."
 msgstr "Er is niet genoeg geheugen om dat te doen."
 
+#: src/wx/kdm_dialog.cc:537
+msgid "This is not a valid CPL file"
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "CPU belasting"
@@ -909,7 +1010,7 @@ msgstr "CPU belasting"
 msgid "Threads to use for encoding on this host"
 msgstr "CPU cores beschikbaar voor encoding op deze host"
 
-#: src/wx/audio_plot.cc:168
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Tijd"
 
@@ -917,19 +1018,20 @@ msgstr "Tijd"
 msgid "Timeline"
 msgstr "Tijdlijn"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:289
 msgid "Timeline..."
 msgstr "Tijdlijn..."
 
 #: src/wx/timing_panel.cc:35
-msgid "Timing"
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Timing"
 
-#: src/wx/video_panel.cc:109
+#: src/wx/video_panel.cc:110
 msgid "Top crop"
 msgstr "Top crop"
 
-#: src/wx/about_dialog.cc:104
+#: src/wx/about_dialog.cc:105
 msgid "Translated by"
 msgstr "Vertaald door"
 
@@ -941,7 +1043,7 @@ msgstr "Trim vanaf einde"
 msgid "Trim from start"
 msgstr "Trim vanaf begin"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:75
 msgid "Type"
 msgstr "Type"
 
@@ -953,11 +1055,11 @@ msgstr "Onverwachte certificaat bestandsnaam vorm"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/wx/kdm_dialog.cc:93
+#: src/wx/kdm_dialog.cc:112
 msgid "Until"
 msgstr "Totdat"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:285
 msgid "Up"
 msgstr "Omhoog"
 
@@ -966,14 +1068,15 @@ msgid "Update"
 msgstr "Update"
 
 #: src/wx/film_editor.cc:128
-msgid "Use DCI name"
+#, fuzzy
+msgid "Use ISDCF name"
 msgstr "Gebruik DCI naam"
 
-#: src/wx/config_dialog.cc:515
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Gebruik alle servers"
 
-#: src/wx/film_editor.cc:149
+#: src/wx/film_editor.cc:152
 msgid "Use best"
 msgstr "Gebruik de beste"
 
@@ -981,15 +1084,15 @@ msgstr "Gebruik de beste"
 msgid "Use preset"
 msgstr "Gebruik preset"
 
-#: src/wx/config_dialog.cc:635
+#: src/wx/config_dialog.cc:621
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: src/wx/audio_mapping_view.cc:308
+#: src/wx/audio_mapping_view.cc:305
 msgid "VI"
 msgstr "VI"
 
-#: src/wx/video_panel.cc:67
+#: src/wx/video_panel.cc:68
 msgid "Video"
 msgstr "Video"
 
@@ -997,11 +1100,15 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "Video frame rate"
 
+#: src/wx/config_dialog.cc:750
+msgid "Warnings"
+msgstr ""
+
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Met ondertiteling"
 
-#: src/wx/kdm_dialog.cc:127
+#: src/wx/kdm_dialog.cc:162
 msgid "Write to"
 msgstr "Schrijf naar"
 
@@ -1047,7 +1154,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:240
 msgid "channels"
 msgstr "kanalen"
 
@@ -1060,11 +1167,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:319
+#: src/wx/config_dialog.cc:305
 msgid "s"
 msgstr "s"
 
@@ -1079,3 +1186,9 @@ msgstr "tijden"
 #: src/wx/timeline.cc:237
 msgid "video"
 msgstr "video"
+
+#~ msgid "Timing"
+#~ msgstr "Timing"
+
+#~ msgid "-3dB"
+#~ msgstr "-3dB"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index ecfd78013..68e193c02 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:121
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(lösenord sparas på disk i klartext)"
 
@@ -36,52 +36,57 @@ msgstr "(lösenord sparas på disk i klartext)"
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
-#: src/wx/audio_mapping_view.cc:135
-msgid "-3dB"
-msgstr "-3dB"
+#: src/wx/audio_mapping_view.cc:134
+msgid "-6dB"
+msgstr ""
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/audio_panel.cc:236
+#: src/wx/audio_panel.cc:238
 msgid "1 channel"
 msgstr "1 kanal"
 
-#: src/wx/video_panel.cc:196
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/film_editor.cc:220
+#: src/wx/isdcf_metadata_dialog.cc:68
+#, fuzzy
+msgid "2D version of content available in 3D"
+msgstr "Nya versioner av DCP-o-matic finns tillgängligt."
+
+#: src/wx/film_editor.cc:224
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/film_editor.cc:168
+#: src/wx/film_editor.cc:171
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:200
 msgid "3D alternate"
 msgstr ""
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:201
 msgid "3D left only"
 msgstr ""
 
-#: src/wx/video_panel.cc:197
+#: src/wx/video_panel.cc:198
 msgid "3D left/right"
 msgstr "3D left/right"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:202
 #, fuzzy
 msgid "3D right only"
 msgstr "3D left/right"
 
-#: src/wx/video_panel.cc:198
+#: src/wx/video_panel.cc:199
 msgid "3D top/bottom"
 msgstr "3D top/bottom"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:225
 msgid "4K"
 msgstr "4K"
 
@@ -93,19 +98,19 @@ msgstr "En ny version av DCP-o-matic finns tillgänglig."
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:79
 msgid "Add Cinema..."
 msgstr "Lägg till Cinema..."
 
-#: src/wx/kdm_dialog.cc:73
+#: src/wx/kdm_dialog.cc:86
 msgid "Add Screen..."
 msgstr "Lägg till Skärm..."
 
-#: src/wx/film_editor.cc:280
+#: src/wx/film_editor.cc:279
 msgid "Add file(s)..."
 msgstr "Lägg till fil(er)..."
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:281
 msgid "Add folder..."
 msgstr "Lägg till folder..."
 
@@ -113,7 +118,12 @@ msgstr "Lägg till folder..."
 msgid "Add..."
 msgstr "Lägg till..."
 
-#: src/wx/about_dialog.cc:108
+#: src/wx/config_dialog.cc:743
+#, fuzzy
+msgid "Allow any DCP frame rate"
+msgstr "bildhastighet"
+
+#: src/wx/about_dialog.cc:109
 msgid "Artwork by"
 msgstr ""
 
@@ -129,7 +139,7 @@ msgstr "Audio Fördröjning"
 msgid "Audio Gain"
 msgstr "Audio Förstärkning"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Audiospråk (ex. SV)"
 
@@ -137,11 +147,11 @@ msgstr "Audiospråk (ex. SV)"
 msgid "Audio Stream"
 msgstr "Audioström"
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Audio-kanaler"
 
-#: src/wx/audio_mapping_view.cc:353
+#: src/wx/audio_mapping_view.cc:350
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
@@ -149,7 +159,7 @@ msgstr ""
 "Audio kommer att överföras från innehållskanal %d till DCP-kanal %d "
 "oförändrad."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -163,19 +173,19 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Felaktig inställning för %s (%s)"
 
-#: src/wx/video_panel.cc:120
+#: src/wx/video_panel.cc:121
 msgid "Bottom crop"
 msgstr "Nedre beskärning"
 
-#: src/wx/dir_picker_ctrl.cc:37
+#: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Bläddra..."
 
-#: src/wx/audio_mapping_view.cc:320
+#: src/wx/audio_mapping_view.cc:317
 msgid "BsL"
 msgstr "BsL"
 
-#: src/wx/audio_mapping_view.cc:324
+#: src/wx/audio_mapping_view.cc:321
 msgid "BsR"
 msgstr "BsR"
 
@@ -183,10 +193,23 @@ msgstr "BsR"
 msgid "But I have to use fader"
 msgstr "Men jag måste använda mixervolym"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:285
 msgid "C"
 msgstr "C"
 
+#: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
+#, fuzzy
+msgid "CPL"
+msgstr "DCP"
+
+#: src/wx/kdm_dialog.cc:143
+msgid "CPL ID"
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:146
+msgid "CPL annotation text"
+msgstr ""
+
 #: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Beräkna..."
@@ -206,6 +229,10 @@ msgstr "Välj certifikatfil"
 msgid "Certificate downloaded"
 msgstr "Välj certifikatfil"
 
+#: src/wx/isdcf_metadata_dialog.cc:65
+msgid "Chain"
+msgstr ""
+
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
 msgstr "Kanalförstärkning"
@@ -214,11 +241,11 @@ msgstr "Kanalförstärkning"
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/config_dialog.cc:137
+#: src/wx/config_dialog.cc:133
 msgid "Check for testing updates as well as stable ones"
 msgstr "sök efter både test- och stabila uppdateringar"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:129
 msgid "Check for updates on startup"
 msgstr "Sök efter uppdateringar vid start"
 
@@ -226,11 +253,11 @@ msgstr "Sök efter uppdateringar vid start"
 msgid "Choose a file"
 msgstr "Välj en fil"
 
-#: src/wx/film_editor.cc:775
+#: src/wx/film_editor.cc:788
 msgid "Choose a file or files"
 msgstr "Välj en fil eller filer"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:811
 msgid "Choose a folder"
 msgstr "Välj en folder"
 
@@ -239,21 +266,27 @@ msgstr "Välj en folder"
 msgid "Cinema"
 msgstr "Lägg till Cinema..."
 
-#: src/wx/config_dialog.cc:561
+#: src/wx/config_dialog.cc:547
 #, fuzzy
 msgid "Colour Conversions"
 msgstr "Färgkonverteringar"
 
 #: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:162
 msgid "Colour conversion"
 msgstr "Färgkonvertering"
 
+# Svengelska
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Tajming"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Innehåll"
 
-#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:270 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Innehåll"
 
@@ -261,25 +294,25 @@ msgstr "Innehåll"
 msgid "Content Type"
 msgstr "Innehållstyp"
 
-#: src/wx/video_panel.cc:331
+#: src/wx/video_panel.cc:332
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Innehållets bildhastighet %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:32
+#: src/wx/isdcf_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Innehållsversion"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:292
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Original-videon är %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:136
+#: src/wx/audio_dialog.cc:151
 msgid "Could not analyse audio."
 msgstr "Kunde inte analysera audio."
 
-#: src/wx/film_viewer.cc:345
+#: src/wx/film_viewer.cc:346
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kunde inte avkoda video för visning (%s)"
@@ -289,6 +322,11 @@ msgstr "Kunde inte avkoda video för visning (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Kunde inte skapa DCP: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Kunde inte öppna innehållsfilen (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr ""
@@ -297,21 +335,17 @@ msgstr ""
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:304
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beskuren till %dx%d (%.2f:1)\n"
 
 # sammanhang?
-#: src/wx/video_panel.cc:243
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr "Special"
 
-#: src/wx/dci_metadata_dialog.cc:30
-msgid "DCI name"
-msgstr "DCI namn"
-
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
+#: src/wx/film_editor.cc:87
 msgid "DCP"
 msgstr "DCP"
 
@@ -319,6 +353,10 @@ msgstr "DCP"
 msgid "DCP Name"
 msgstr "DCP-namn"
 
+#: src/wx/kdm_dialog.cc:140
+msgid "DCP directory"
+msgstr ""
+
 #: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
@@ -328,45 +366,46 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:331
-msgid "Default DCI name details"
+#: src/wx/config_dialog.cc:317
+#, fuzzy
+msgid "Default ISDCF name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:344
+#: src/wx/config_dialog.cc:330
 msgid "Default JPEG2000 bandwidth"
 msgstr "Förvald JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:353
+#: src/wx/config_dialog.cc:339
 msgid "Default audio delay"
 msgstr "Förvald audiofördröjning"
 
-#: src/wx/config_dialog.cc:335
+#: src/wx/config_dialog.cc:321
 msgid "Default container"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:325
 msgid "Default content type"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:365
+#: src/wx/config_dialog.cc:351
 #, fuzzy
 msgid "Default creator"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:323
+#: src/wx/config_dialog.cc:309
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/config_dialog.cc:301
 msgid "Default duration of still images"
 msgstr "Förvald varaktighet på stillbilder"
 
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:347
 #, fuzzy
 msgid "Default issuer"
 msgstr "Standardval"
 
-#: src/wx/config_dialog.cc:294
+#: src/wx/config_dialog.cc:280
 msgid "Defaults"
 msgstr "Standardval"
 
@@ -392,7 +431,7 @@ msgstr ""
 msgid "Doremi serial numbers must have 6 digits"
 msgstr ""
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:287
 msgid "Down"
 msgstr "Ner"
 
@@ -410,16 +449,16 @@ msgstr ""
 msgid "Downloading certificate"
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:68
+#: src/wx/kdm_dialog.cc:81
 msgid "Edit Cinema..."
 msgstr "Redigera Cinema..."
 
-#: src/wx/kdm_dialog.cc:75
+#: src/wx/kdm_dialog.cc:88
 msgid "Edit Screen..."
 msgstr "Redigera Skärm..."
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
-#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Redigera..."
@@ -432,11 +471,15 @@ msgstr "Mejladress för KDM-leverans"
 msgid "Encoding Servers"
 msgstr "Kodningsservrar"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:162
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: src/wx/dci_metadata_dialog.cc:50
+#: src/wx/config_dialog.cc:753
+msgid "Errors"
+msgstr ""
+
+#: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Företag (ex. DLA)"
 
@@ -454,7 +497,7 @@ msgstr "Film Egenskaper"
 msgid "Film name"
 msgstr "Filmnamn"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:146
 msgid "Filters"
 msgstr "Filter"
 
@@ -479,15 +522,15 @@ msgid "Free, open-source DCP generation from almost anything."
 msgstr "Fri, öppen-källkods DCP-generering från nästan vad som helst."
 
 # Sammanhang?
-#: src/wx/kdm_dialog.cc:85
+#: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "Avsändare"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:125
 msgid "From address for KDM emails"
 msgstr "Avsändare för KDM-mejl"
 
-#: src/wx/audio_mapping_view.cc:134
+#: src/wx/audio_mapping_view.cc:133
 msgid "Full"
 msgstr "Full"
 
@@ -508,7 +551,11 @@ msgstr "Förstärkning för innehållskanal %d i DCP-kanal %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/audio_mapping_view.cc:304
+#: src/wx/config_dialog.cc:748
+msgid "General"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:301
 msgid "HI"
 msgstr "HI"
 
@@ -524,7 +571,7 @@ msgstr "Dator"
 msgid "Host name or IP address"
 msgstr "Datornamn eller IP-adress"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:242
 msgid "Hz"
 msgstr "Hz"
 
@@ -532,23 +579,28 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Jag vill spela upp detta med mixervolym"
 
-#: src/wx/config_dialog.cc:627
+#: src/wx/config_dialog.cc:613
 msgid "IP address"
 msgstr "IP-adress"
 
-#: src/wx/config_dialog.cc:519
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "IP-adress / datornamn"
 
+#: src/wx/isdcf_metadata_dialog.cc:30
+#, fuzzy
+msgid "ISDCF name"
+msgstr "DCI namn"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr "Indata gamma"
 
-#: src/wx/film_editor.cc:224
+#: src/wx/film_editor.cc:228
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/film_editor.cc:178
+#: src/wx/film_editor.cc:181
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000-bandbredd"
 
@@ -556,29 +608,35 @@ msgstr "JPEG2000-bandbredd"
 msgid "Join"
 msgstr "Anslut"
 
-#: src/wx/config_dialog.cc:694
+#: src/wx/config_dialog.cc:680
 #, fuzzy
 msgid "KDM Email"
 msgstr "KDM mejl"
 
+# Svengelska
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Tajming"
+
 # "sekvens" eller "ordning"?
-#: src/wx/film_editor.cc:298
+#: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Behåll video i sekvens"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:277
 msgid "L"
 msgstr "V"
 
-#: src/wx/audio_mapping_view.cc:312
+#: src/wx/audio_mapping_view.cc:309
 msgid "Lc"
 msgstr "Vc"
 
-#: src/wx/video_panel.cc:87
+#: src/wx/video_panel.cc:88
 msgid "Left crop"
 msgstr "Vänster beskärning"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/audio_mapping_view.cc:289
 msgid "Lfe"
 msgstr "Lfe"
 
@@ -590,41 +648,49 @@ msgstr "Linjärisera indatas gammakurva för låga värden"
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/config_dialog.cc:747
+msgid "Log"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Vs"
 
-#: src/wx/film_editor.cc:749
+#: src/wx/film_editor.cc:762
 msgid "MISSING: "
 msgstr "SAKNAS:"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:117
 msgid "Mail password"
 msgstr "Mejl-lösenord"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:113
 msgid "Mail user name"
 msgstr "Mejl-användarnamn"
 
-#: src/wx/kdm_dialog.cc:47
+#: src/wx/kdm_dialog.cc:49
 msgid "Make KDMs"
 msgstr "Skapa KDM:er"
 
+#: src/wx/isdcf_metadata_dialog.cc:71
+msgid "Mastered luminance (e.g. 4fl)"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
 msgstr "Matris"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:739
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr ""
 
 # Låter mysko
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Flera innehåll valda"
 
@@ -632,8 +698,9 @@ msgstr "Flera innehåll valda"
 msgid "My Documents"
 msgstr "Mina Dokument"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Namn"
 
@@ -645,18 +712,18 @@ msgstr "Ny Film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "Nya versioner av DCP-o-matic finns tillgängligt."
 
-#: src/wx/audio_mapping_view.cc:351
+#: src/wx/audio_mapping_view.cc:348
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr ""
 "Ingen audio kommer att överföras från innehållskanalen %d till DCP-kanalen "
 "%d."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:153 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Inget"
 
-#: src/wx/audio_mapping_view.cc:133
+#: src/wx/audio_mapping_view.cc:132
 msgid "Off"
 msgstr "Av"
 
@@ -664,24 +731,29 @@ msgstr "Av"
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:109
 msgid "Outgoing mail server"
 msgstr "Utgående mejlserver"
 
+#: src/wx/kdm_dialog.cc:156
+#, fuzzy
+msgid "Output"
+msgstr "Utdata gamma"
+
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
 msgstr "Utdata gamma"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:325
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:639
+#: src/wx/config_dialog.cc:625
 msgid "Password"
 msgstr "Lösenord"
 
@@ -693,7 +765,7 @@ msgstr "Pausa"
 msgid "Peak"
 msgstr "Topp"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Spela"
 
@@ -701,7 +773,7 @@ msgstr "Spela"
 msgid "Play length"
 msgstr "Spellängd"
 
-#: src/wx/audio_plot.cc:43
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
 
@@ -709,7 +781,11 @@ msgstr "Vänligen vänta; audio analyseras..."
 msgid "Position"
 msgstr "Position"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:59
+msgid "Pre-release"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:281
 msgid "R"
 msgstr "H"
 
@@ -717,25 +793,29 @@ msgstr "H"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:44
+#: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Klassificering (ex. 15)"
 
-#: src/wx/audio_mapping_view.cc:316
+#: src/wx/audio_mapping_view.cc:313
 msgid "Rc"
 msgstr "Hc"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/isdcf_metadata_dialog.cc:62
+msgid "Red band"
+msgstr ""
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283
 #: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Ta bort"
 
 # Sammanhang?
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:83
 msgid "Remove Cinema"
 msgstr "Ta bort Cinema"
 
-#: src/wx/kdm_dialog.cc:77
+#: src/wx/kdm_dialog.cc:90
 msgid "Remove Screen"
 msgstr "Ta bort Skärm"
 
@@ -751,7 +831,7 @@ msgstr "Repetera Innehåll"
 msgid "Repeat..."
 msgstr "Upprepa..."
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Upplösning"
 
@@ -759,40 +839,50 @@ msgstr "Upplösning"
 msgid "Resume"
 msgstr "Fortsätt"
 
-#: src/wx/audio_mapping_view.cc:359
+#: src/wx/audio_mapping_view.cc:356
 msgid "Right click to change gain."
 msgstr "Högerklicka för att ändra förstärkning."
 
-#: src/wx/video_panel.cc:98
+#: src/wx/video_panel.cc:99
 msgid "Right crop"
 msgstr "Höger beskärning"
 
-#: src/wx/audio_mapping_view.cc:300
+#: src/wx/audio_mapping_view.cc:297
 msgid "Rs"
 msgstr "Hs"
 
-#: src/wx/film_editor.cc:223
+#: src/wx/film_editor.cc:227
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:131
+#: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Skala om till"
 
-#: src/wx/video_panel.cc:315
+#: src/wx/video_panel.cc:316
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skalad till %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:195
 msgid "Scaler"
 msgstr "Omskalare"
 
+#: src/wx/kdm_dialog.cc:60
+#, fuzzy
+msgid "Screens"
+msgstr "Lägg till Skärm..."
+
+#: src/wx/kdm_dialog.cc:515
+#, fuzzy
+msgid "Select CPL XML file"
+msgstr "Välj audiofil"
+
 #: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Välj certifikatfil"
 
-#: src/wx/kdm_dialog.cc:140
+#: src/wx/kdm_dialog.cc:175
 msgid "Send by email"
 msgstr "Skicka med mejl"
 
@@ -804,11 +894,15 @@ msgstr ""
 msgid "Server"
 msgstr "Server"
 
+#: src/wx/screen_dialog.cc:41
+msgid "Server manufacturer"
+msgstr ""
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr ""
 
-#: src/wx/config_dialog.cc:499
+#: src/wx/config_dialog.cc:485
 #, fuzzy
 msgid "Servers"
 msgstr "Server"
@@ -825,7 +919,7 @@ msgstr "Välj språk"
 msgid "Show Audio..."
 msgstr "Visa Audio..."
 
-#: src/wx/film_editor.cc:155
+#: src/wx/film_editor.cc:158
 msgid "Signed"
 msgstr "Signerad"
 
@@ -842,15 +936,15 @@ msgstr "Snap"
 msgid "Stable version "
 msgstr "Stabil version"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:38
+#: src/wx/isdcf_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Undertextspråk (ex. SV)"
 
@@ -876,19 +970,24 @@ msgstr "Undertext Förskjutning"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:149
+#: src/wx/about_dialog.cc:152
 msgid "Supported by"
 msgstr "Stöd från"
 
-#: src/wx/config_dialog.cc:607
+#: src/wx/config_dialog.cc:593
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:631
+#: src/wx/config_dialog.cc:617
 msgid "Target path"
 msgstr "Målsökväg"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/isdcf_metadata_dialog.cc:56
+#, fuzzy
+msgid "Temp version"
+msgstr "Testversion"
+
+#: src/wx/isdcf_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Område (ex. SV)"
 
@@ -896,7 +995,7 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:191
+#: src/wx/about_dialog.cc:197
 #, fuzzy
 msgid "Tested by"
 msgstr "Översatt av"
@@ -914,10 +1013,14 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Det finns inga råd: allt verkar bra!"
 
-#: src/wx/film_viewer.cc:133
+#: src/wx/film_viewer.cc:134
 msgid "There is not enough free memory to do that."
 msgstr ""
 
+#: src/wx/kdm_dialog.cc:537
+msgid "This is not a valid CPL file"
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Trådar"
@@ -926,7 +1029,7 @@ msgstr "Trådar"
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
-#: src/wx/audio_plot.cc:168
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Tid"
 
@@ -934,20 +1037,21 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:289
 msgid "Timeline..."
 msgstr "Tidslinje..."
 
 # Svengelska
 #: src/wx/timing_panel.cc:35
-msgid "Timing"
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Tajming"
 
-#: src/wx/video_panel.cc:109
+#: src/wx/video_panel.cc:110
 msgid "Top crop"
 msgstr "Övre beskärning"
 
-#: src/wx/about_dialog.cc:104
+#: src/wx/about_dialog.cc:105
 msgid "Translated by"
 msgstr "Översatt av"
 
@@ -959,7 +1063,7 @@ msgstr "Trimma från slut"
 msgid "Trim from start"
 msgstr "Trimma från start"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:75
 msgid "Type"
 msgstr "Typ"
 
@@ -974,11 +1078,11 @@ msgid "Unknown"
 msgstr "okänt"
 
 # sammanhang?
-#: src/wx/kdm_dialog.cc:93
+#: src/wx/kdm_dialog.cc:112
 msgid "Until"
 msgstr "Tills"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:285
 msgid "Up"
 msgstr "Upp"
 
@@ -987,14 +1091,15 @@ msgid "Update"
 msgstr "Uppdatera"
 
 #: src/wx/film_editor.cc:128
-msgid "Use DCI name"
+#, fuzzy
+msgid "Use ISDCF name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/config_dialog.cc:515
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Använd alla servrar"
 
-#: src/wx/film_editor.cc:149
+#: src/wx/film_editor.cc:152
 msgid "Use best"
 msgstr "Använd bästa"
 
@@ -1002,15 +1107,15 @@ msgstr "Använd bästa"
 msgid "Use preset"
 msgstr "Använd förhandsinställning"
 
-#: src/wx/config_dialog.cc:635
+#: src/wx/config_dialog.cc:621
 msgid "User name"
 msgstr "Användarnamn"
 
-#: src/wx/audio_mapping_view.cc:308
+#: src/wx/audio_mapping_view.cc:305
 msgid "VI"
 msgstr "VI"
 
-#: src/wx/video_panel.cc:67
+#: src/wx/video_panel.cc:68
 msgid "Video"
 msgstr "Video"
 
@@ -1018,11 +1123,15 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "bildhastighet"
 
+#: src/wx/config_dialog.cc:750
+msgid "Warnings"
+msgstr ""
+
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Med Undertexter"
 
-#: src/wx/kdm_dialog.cc:127
+#: src/wx/kdm_dialog.cc:162
 msgid "Write to"
 msgstr "Skriv till"
 
@@ -1068,7 +1177,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:240
 msgid "channels"
 msgstr "kanaler"
 
@@ -1081,11 +1190,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:319
+#: src/wx/config_dialog.cc:305
 msgid "s"
 msgstr "s"
 
@@ -1102,6 +1211,13 @@ msgstr "tider"
 msgid "video"
 msgstr "video"
 
+# Svengelska
+#~ msgid "Timing"
+#~ msgstr "Tajming"
+
+#~ msgid "-3dB"
+#~ msgstr "-3dB"
+
 #~ msgid "Content channel"
 #~ msgstr "Innehållskanal"
 
@@ -1160,9 +1276,6 @@ msgstr "video"
 #~ msgid "Colour look-up table"
 #~ msgstr "Färguppslagningstabell"
 
-#~ msgid "Could not open content file (%s)"
-#~ msgstr "Kunde inte öppna innehållsfilen (%s)"
-
 #~ msgid "Could not set content: %s"
 #~ msgstr "Kunde inte fastställa innehåll: %s"
 
@@ -1190,9 +1303,6 @@ msgstr "video"
 #~ msgid "Reference scaler"
 #~ msgstr "Referensomskalare för A/B"
 
-#~ msgid "Select Audio File"
-#~ msgstr "Välj audiofil"
-
 #, fuzzy
 #~ msgid "Trim method"
 #~ msgstr "Skippa bilder"
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 0d46a46ec..6b58145eb 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -35,10 +35,10 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
 	: TableDialog (parent, std_to_wx (title), 2, true)
 	, _certificate (certificate)
 {
-	add ("Name", true);
+	add (_("Name"), true);
 	_name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
 
-	add ("Server manufacturer", true);
+	add (_("Server manufacturer"), true);
 	_manufacturer = add (new wxChoice (this, wxID_ANY));
 
 	add (_("Certificate"), true);
@@ -92,7 +92,7 @@ ScreenDialog::load_certificate (boost::filesystem::path file)
 		_certificate.reset (new dcp::Certificate (file));
 		_certificate_text->SetValue (_certificate->certificate ());
 	} catch (dcp::MiscError& e) {
-		error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
+		error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what()));
 	}
 }
 
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index cc0639b4c..9a4551193 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -31,7 +31,8 @@ using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 
 TimingPanel::TimingPanel (FilmEditor* e)
-	: FilmEditorPanel (e, _("Timing"))
+	/* horrid hack for apparent lack of context support with wxWidgets i18n code */
+	: FilmEditorPanel (e, S_("Timing|Timing"))
 {
 	wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
 	_sizer->Add (grid, 0, wxALL, 8);
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index aac35e97a..94a08f372 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -319,3 +319,21 @@ run_gui_loop ()
 		wxTheApp->Dispatch ();
 	}
 }
+
+/** @param s String of the form Context|String
+ *  @return translation, or String if no translation is available.
+ */
+wxString
+context_translation (wxString s)
+{
+	wxString t = wxGetTranslation (s);
+	if (t == s) {
+		/* No translation; strip the context */
+		int c = t.Find (wxT ("|"));
+		if (c != wxNOT_FOUND) {
+			t = t.Mid (c + 1);
+		}
+	}
+
+	return t;
+}
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 12a7115d5..6dfc0bf5c 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -17,6 +17,10 @@
 
 */
 
+/** @file src/wx/wx_util.h
+ *  @brief Some utility functions and classes.
+ */
+
 #ifndef DCPOMATIC_WX_UTIL_H
 #define DCPOMATIC_WX_UTIL_H
 
@@ -46,9 +50,11 @@ class wxGridBagSizer;
 #define DCPOMATIC_BUTTON_STACK_GAP 0
 #endif
 
-/** @file src/wx/wx_util.h
- *  @brief Some utility functions and classes.
+/** i18n macro to support strings like Context|String
+ *  so that `String' can be translated to different things
+ *  in different contexts.
  */
+#define S_(x) context_translation(x)
 
 extern void error_dialog (wxWindow *, wxString);
 extern bool confirm_dialog (wxWindow *, wxString);
@@ -58,6 +64,7 @@ extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();
 extern void run_gui_loop ();
+extern wxString context_translation (wxString);
 
 /** @class ThreadedStaticText
  *