Merge master.

6 files changed, 740 insertions, 697 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"