po merge.

6 files changed, 260 insertions, 258 deletions

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 8fab60408..c517d5946 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-09-08 23:05+0100\n"
 "PO-Revision-Date: 2014-07-13 02:32+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "%1 Kanäle, %2kHz, %3 samples"
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 Bilder; %2 Bilder pro Sekunde"
 
-#: src/lib/video_content.cc:213
+#: src/lib/video_content.cc:211
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixel (%3:1)"
 
@@ -98,15 +98,15 @@ msgstr "Abgebrochen"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:786
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:81
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Überprüfe bestehende Bilddateien"
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:471
 msgid "Computing audio digest"
 msgstr "Tonübersicht berechnen"
 
@@ -114,7 +114,7 @@ msgstr "Tonübersicht berechnen"
 msgid "Computing digest"
 msgstr "Zusammenfassung berechnen"
 
-#: src/lib/writer.cc:466
+#: src/lib/writer.cc:467
 msgid "Computing image digest"
 msgstr "Bildübersicht berechnen"
 
@@ -131,19 +131,19 @@ msgid "Content to be joined must have the same audio gain."
 msgstr ""
 "Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden."
 
-#: src/lib/video_content.cc:148
+#: src/lib/video_content.cc:146
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Zu verbindende Inhalte müssen die gleiche Farbumwandlung verwenden."
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:138
 msgid "Content to be joined must have the same crop."
 msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:126
 msgid "Content to be joined must have the same picture size."
 msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
 
-#: src/lib/video_content.cc:144
+#: src/lib/video_content.cc:142
 msgid "Content to be joined must have the same scale setting."
 msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
 
@@ -163,11 +163,11 @@ msgstr ""
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:130
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
 
-#: src/lib/video_content.cc:136
+#: src/lib/video_content.cc:134
 msgid "Content to be joined must have the same video frame type."
 msgstr "Zu verbindende Inhalte müssen den gleichen Bildtyp (z.B. 2D) haben."
 
@@ -192,8 +192,9 @@ msgstr "Keine Verbindung zu Server %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
 
-#: src/lib/image_proxy.cc:127
-msgid "Could not decode image file"
+#: src/lib/image_proxy.cc:147
+#, fuzzy
+msgid "Could not decode image file (%1)"
 msgstr "Bilddatei konnte nicht dekodiert werden"
 
 #: src/lib/job.cc:90
@@ -204,7 +205,7 @@ msgstr "%1 konnte nicht geöffnet werden."
 msgid "Could not open %1 to send"
 msgstr "%1 konnte nicht zum Senden geöffnet werden"
 
-#: src/lib/internet.cc:72
+#: src/lib/internet.cc:74
 msgid "Could not open downloaded ZIP file"
 msgstr "Heruntergeladene ZIP Datei kann nicht geöffnet werden."
 
@@ -242,7 +243,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
-#: src/lib/config.cc:440
+#: src/lib/config.cc:436
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -272,7 +273,7 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 und CP750"
 
-#: src/lib/internet.cc:65
+#: src/lib/internet.cc:67
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Herunterladen fehlgeschlagen (%1/%2 Fehler %3)"
 
@@ -288,7 +289,7 @@ msgstr "Jedes Bild der Quelle wird %1 mal im DCP wiederholt.\n"
 msgid "Email KDMs for %1"
 msgstr "Email KDMs für %1"
 
-#: src/lib/writer.cc:124
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "Kodiere Bilddaten"
 
@@ -328,7 +329,7 @@ msgstr "Gauss Filter"
 msgid "Gradient debander"
 msgstr "Gradient Glätter"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:790
 msgid "Hearing impaired"
 msgstr "HI"
 
@@ -344,7 +345,7 @@ msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Bitte schicken Sie eine Nachricht an "
 "den DCP-o-matic Autor (carl@dcpomatic.com)."
 
-#: src/lib/config.cc:196
+#: src/lib/config.cc:199
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM Zustellung: $CPL_NAME"
 
@@ -356,23 +357,23 @@ msgstr "Kernel De-Interlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:784
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:792
 msgid "Left centre"
 msgstr "Center links"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:794
 msgid "Left rear surround"
 msgstr "Surround hinten links"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:788
 msgid "Left surround"
 msgstr "Surround links"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:787
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
@@ -384,11 +385,11 @@ msgstr "Verschiedenes"
 msgid "Motion compensating deinterlacer"
 msgstr "Bewegungskompensierender De-Interlacer"
 
-#: src/lib/video_content.cc:498
+#: src/lib/video_content_scale.cc:105
 msgid "No scale"
 msgstr "Unskaliert"
 
-#: src/lib/video_content.cc:495
+#: src/lib/video_content_scale.cc:102
 msgid "No stretch"
 msgstr "Nicht verzerrt"
 
@@ -436,23 +437,23 @@ msgstr "Hinweis"
 msgid "Rating"
 msgstr "Freigabehinweis"
 
-#: src/lib/config.cc:86 src/lib/config.cc:180
+#: src/lib/config.cc:86 src/lib/config.cc:183
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:785
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:793
 msgid "Right centre"
 msgstr "Center rechts"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:795
 msgid "Right rear surround"
 msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:789
 msgid "Right surround"
 msgstr "Surround rechts"
 
@@ -531,11 +532,11 @@ msgstr "Wandle %1 um"
 msgid "Transitional"
 msgstr "Überleitung"
 
-#: src/lib/internet.cc:77
+#: src/lib/internet.cc:79
 msgid "Unexpected ZIP file contents"
 msgstr "Ungültiger ZIP Inhalt"
 
-#: src/lib/image_proxy.cc:173
+#: src/lib/image_proxy.cc:193
 msgid "Unexpected image type received by server"
 msgstr "Ungültiges Bildformat vom Server erhalten"
 
@@ -555,7 +556,7 @@ msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:791
 msgid "Visually impaired"
 msgstr "VI"
 
@@ -587,7 +588,7 @@ msgstr "[Standbild]"
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
-#: src/lib/util.cc:558
+#: src/lib/util.cc:565
 msgid "connect timed out"
 msgstr "Zeit für Verbindung abgelaufen"
 
@@ -623,7 +624,7 @@ msgstr "Keine Spur-Information gefunden"
 msgid "could not find video decoder"
 msgstr "Bild-Dekoder nicht gefunden"
 
-#: src/lib/writer.cc:434
+#: src/lib/writer.cc:435
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
 
@@ -667,19 +668,19 @@ msgstr "SSH Session konnte nicht gestartet werden"
 msgid "could not write to file %1 (%2)"
 msgstr "Datei %1 konnte nicht geschrieben werden (%2)"
 
-#: src/lib/util.cc:578
+#: src/lib/util.cc:585
 msgid "error during async_accept (%1)"
 msgstr "error during async_accept (%1)"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:561
 msgid "error during async_connect (%1)"
 msgstr "error during async_connect (%1)"
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:634
 msgid "error during async_read (%1)"
 msgstr "error during async_read (%1)"
 
-#: src/lib/util.cc:599
+#: src/lib/util.cc:606
 msgid "error during async_write (%1)"
 msgstr "error during async_write (%1)"
 
@@ -703,7 +704,7 @@ msgstr "Minute"
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:706
 msgid "missing key %1 in key-value set"
 msgstr "Key %1 in Key-value set fehlt"
 
@@ -733,7 +734,7 @@ msgstr "Nur Bitmap Untertitel werden unterstützt"
 msgid "remaining"
 msgstr "verbleibend"
 
-#: src/lib/config.cc:84 src/lib/video_content.cc:181
+#: src/lib/config.cc:84 src/lib/video_content.cc:179
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 61eaa7390..800f9f972 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-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-09-08 23:05+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"
@@ -33,7 +33,7 @@ msgstr "%1 canales, %2kHz, %3 muestras"
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 imágenes; %2 imágenes per second"
 
-#: src/lib/video_content.cc:213
+#: src/lib/video_content.cc:211
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -97,15 +97,15 @@ 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:779
+#: src/lib/util.cc:786
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:81
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Comprobando las imágenes existentes"
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:471
 msgid "Computing audio digest"
 msgstr "Calculando la firma resumen del audio"
 
@@ -113,7 +113,7 @@ msgstr "Calculando la firma resumen del audio"
 msgid "Computing digest"
 msgstr "Calculando la firma resumen"
 
-#: src/lib/writer.cc:466
+#: src/lib/writer.cc:467
 msgid "Computing image digest"
 msgstr "Calculando la firma resumen de imagen"
 
@@ -129,19 +129,19 @@ msgstr "Para unir contenido debe tener el mismo retardo de audio."
 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:148
+#: src/lib/video_content.cc:146
 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:140
+#: src/lib/video_content.cc:138
 msgid "Content to be joined must have the same crop."
 msgstr "Para unir contenido debe tener el mismo recorte."
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:126
 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:144
+#: src/lib/video_content.cc:142
 msgid "Content to be joined must have the same scale setting."
 msgstr "Para unir contenido debe tener la misma redimensión."
 
@@ -159,11 +159,11 @@ msgstr ""
 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:132
+#: src/lib/video_content.cc:130
 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:136
+#: src/lib/video_content.cc:134
 msgid "Content to be joined must have the same video frame type."
 msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
@@ -187,9 +187,9 @@ msgstr "No se pudo conectar al servidor %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/image_proxy.cc:127
+#: src/lib/image_proxy.cc:147
 #, fuzzy
-msgid "Could not decode image file"
+msgid "Could not decode image file (%1)"
 msgstr "No se pudo crear el fichero (%1)"
 
 #: src/lib/job.cc:90
@@ -200,7 +200,7 @@ msgstr "No se pudo abrir %1"
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
-#: src/lib/internet.cc:72
+#: src/lib/internet.cc:74
 msgid "Could not open downloaded ZIP file"
 msgstr "No se puedo abrir el fichero ZIP descargado"
 
@@ -237,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:440
+#: src/lib/config.cc:436
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -265,7 +265,7 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 and CP750"
 
-#: src/lib/internet.cc:65
+#: src/lib/internet.cc:67
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Descarga fallida (%1/%2 error %3)"
 
@@ -281,7 +281,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:124
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "Codificando imagen"
 
@@ -321,7 +321,7 @@ msgstr "Gaussiano"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:790
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -338,7 +338,7 @@ msgstr ""
 "Error desconocido. La mejor idea es informar del problema a la lista de "
 "correo de DCP-o-matic (carl@dcpomatic.com)"
 
-#: src/lib/config.cc:196
+#: src/lib/config.cc:199
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -350,23 +350,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:784
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:792
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:794
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:788
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:787
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
@@ -378,11 +378,11 @@ msgstr "Miscelánea"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content.cc:498
+#: src/lib/video_content_scale.cc:105
 msgid "No scale"
 msgstr "No redimensionar"
 
-#: src/lib/video_content.cc:495
+#: src/lib/video_content_scale.cc:102
 msgid "No stretch"
 msgstr "Sin deformación"
 
@@ -427,23 +427,23 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/config.cc:86 src/lib/config.cc:180
+#: src/lib/config.cc:86 src/lib/config.cc:183
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:785
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:793
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:795
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:789
 msgid "Right surround"
 msgstr "Surround derecha"
 
@@ -522,11 +522,11 @@ msgstr "Codificar %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/internet.cc:77
+#: src/lib/internet.cc:79
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:173
+#: src/lib/image_proxy.cc:193
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -546,7 +546,7 @@ msgstr "Máscara de desenfoque Gaussiano"
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:791
 msgid "Visually impaired"
 msgstr "Ciegos"
 
@@ -578,7 +578,7 @@ msgstr "[imagen fija]"
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:558
+#: src/lib/util.cc:565
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -614,7 +614,7 @@ msgstr "no se pudo encontrar información del flujo"
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
-#: src/lib/writer.cc:434
+#: src/lib/writer.cc:435
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "no s puedo mover el audio MXF en el DCP (%1)"
 
@@ -658,19 +658,19 @@ 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:578
+#: src/lib/util.cc:585
 msgid "error during async_accept (%1)"
 msgstr "error durante async_accept (%1)"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:561
 msgid "error during async_connect (%1)"
 msgstr "error durante async_connect (%1)"
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:634
 msgid "error during async_read (%1)"
 msgstr "error durante async_read (%1)"
 
-#: src/lib/util.cc:599
+#: src/lib/util.cc:606
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
@@ -694,7 +694,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:706
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -724,7 +724,7 @@ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/config.cc:84 src/lib/video_content.cc:181
+#: src/lib/config.cc:84 src/lib/video_content.cc:179
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 816ed559e..55759baa3 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-09-08 23:05+0100\n"
 "PO-Revision-Date: 2014-07-14 12:04+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -33,7 +33,7 @@ msgstr "%1 canaux, %2kHz, %3 échantillons"
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 images ; %2 images par seconde"
 
-#: src/lib/video_content.cc:213
+#: src/lib/video_content.cc:211
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -97,15 +97,15 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:786
 msgid "Centre"
 msgstr "Centre"
 
-#: src/lib/writer.cc:81
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Recherche de données images existantes"
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:471
 msgid "Computing audio digest"
 msgstr "Fabrication rendu audio"
 
@@ -113,7 +113,7 @@ msgstr "Fabrication rendu audio"
 msgid "Computing digest"
 msgstr "fabrication rendu"
 
-#: src/lib/writer.cc:466
+#: src/lib/writer.cc:467
 msgid "Computing image digest"
 msgstr "Fabrication rendu image"
 
@@ -129,19 +129,19 @@ msgstr "Le contenu à ajouter doit présenter le même délais audio"
 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:148
+#: src/lib/video_content.cc:146
 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:140
+#: src/lib/video_content.cc:138
 msgid "Content to be joined must have the same crop."
 msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:126
 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:144
+#: src/lib/video_content.cc:142
 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"
@@ -162,11 +162,11 @@ msgstr ""
 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:132
+#: src/lib/video_content.cc:130
 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:136
+#: src/lib/video_content.cc:134
 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"
 
@@ -190,8 +190,9 @@ msgstr "Connexion au serveur %1 (%2) impossible"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Création du dossier distant %1 (%2) impossible"
 
-#: src/lib/image_proxy.cc:127
-msgid "Could not decode image file"
+#: src/lib/image_proxy.cc:147
+#, fuzzy
+msgid "Could not decode image file (%1)"
 msgstr "Impossible de décoder le ficher image"
 
 #: src/lib/job.cc:90
@@ -202,7 +203,7 @@ msgstr "lecture du fichier %1 impossible"
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
-#: src/lib/internet.cc:72
+#: src/lib/internet.cc:74
 msgid "Could not open downloaded ZIP file"
 msgstr "Ouverture du fichier Zip téléchargé impossible"
 
@@ -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:440
+#: src/lib/config.cc:436
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -269,7 +270,7 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 et CP750"
 
-#: src/lib/internet.cc:65
+#: src/lib/internet.cc:67
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Echec de téléchargement (%1/%2 erreur %3)"
 
@@ -285,7 +286,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:124
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "encodage des données image"
 
@@ -325,7 +326,7 @@ msgstr "Gaussien"
 msgid "Gradient debander"
 msgstr "Corrections des bandes par dégradé"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:790
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -341,7 +342,7 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)"
 
-#: src/lib/config.cc:196
+#: src/lib/config.cc:199
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -353,23 +354,23 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:784
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:792
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:794
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:788
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:787
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -381,11 +382,11 @@ msgstr "Divers"
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
-#: src/lib/video_content.cc:498
+#: src/lib/video_content_scale.cc:105
 msgid "No scale"
 msgstr "Pas de mise à l'échelle"
 
-#: src/lib/video_content.cc:495
+#: src/lib/video_content_scale.cc:102
 msgid "No stretch"
 msgstr "Sans déformation"
 
@@ -429,23 +430,23 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/config.cc:86 src/lib/config.cc:180
+#: src/lib/config.cc:86 src/lib/config.cc:183
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:785
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:793
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:795
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:789
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -523,11 +524,11 @@ msgstr "Transcodage %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/internet.cc:77
+#: src/lib/internet.cc:79
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
-#: src/lib/image_proxy.cc:173
+#: src/lib/image_proxy.cc:193
 msgid "Unexpected image type received by server"
 msgstr "Type d'image non conforme reçu par le serveur"
 
@@ -547,7 +548,7 @@ msgstr "Adoucissement et flou Gaussien"
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:791
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
@@ -579,7 +580,7 @@ msgstr "[restant]"
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:558
+#: src/lib/util.cc:565
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -615,7 +616,7 @@ msgstr "information du flux introuvable"
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
-#: src/lib/writer.cc:434
+#: src/lib/writer.cc:435
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
 
@@ -661,19 +662,19 @@ 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:578
+#: src/lib/util.cc:585
 msgid "error during async_accept (%1)"
 msgstr "erreur pendant async_accept (%1)"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:561
 msgid "error during async_connect (%1)"
 msgstr "erreur pendant async_connect (%1)"
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:634
 msgid "error during async_read (%1)"
 msgstr "erreur pendant async_read (%1)"
 
-#: src/lib/util.cc:599
+#: src/lib/util.cc:606
 msgid "error during async_write (%1)"
 msgstr "erreur pendant async_write (%1)"
 
@@ -697,7 +698,7 @@ msgstr "minute"
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:706
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 manquante dans le réglage"
 
@@ -727,7 +728,7 @@ msgstr "sous-titres non-bitmap non supportés actuellement"
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/config.cc:84 src/lib/video_content.cc:181
+#: src/lib/config.cc:84 src/lib/video_content.cc:179
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 15a0cbb83..75e6928c8 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-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-09-08 23:05+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 fotogrammi; %2 fotogrammi al secondo"
 
-#: src/lib/video_content.cc:213
+#: src/lib/video_content.cc:211
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -98,15 +98,15 @@ 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:779
+#: src/lib/util.cc:786
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:81
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:471
 msgid "Computing audio digest"
 msgstr ""
 
@@ -114,7 +114,7 @@ msgstr ""
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:466
+#: src/lib/writer.cc:467
 msgid "Computing image digest"
 msgstr ""
 
@@ -131,19 +131,19 @@ msgstr ""
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 
-#: src/lib/video_content.cc:148
+#: src/lib/video_content.cc:146
 msgid "Content to be joined must have the same colour conversion."
 msgstr ""
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:138
 msgid "Content to be joined must have the same crop."
 msgstr ""
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:126
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/video_content.cc:144
+#: src/lib/video_content.cc:142
 #, fuzzy
 msgid "Content to be joined must have the same scale setting."
 msgstr ""
@@ -163,11 +163,11 @@ msgstr ""
 msgid "Content to be joined must have the same subtitle scale."
 msgstr ""
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:130
 msgid "Content to be joined must have the same video frame rate."
 msgstr ""
 
-#: src/lib/video_content.cc:136
+#: src/lib/video_content.cc:134
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
@@ -191,9 +191,9 @@ msgstr "Non posso connetermi al server %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
-#: src/lib/image_proxy.cc:127
+#: src/lib/image_proxy.cc:147
 #, fuzzy
-msgid "Could not decode image file"
+msgid "Could not decode image file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
 #: src/lib/job.cc:90
@@ -204,7 +204,7 @@ msgstr "Non riesco ad aprire %1"
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
-#: src/lib/internet.cc:72
+#: src/lib/internet.cc:74
 #, fuzzy
 msgid "Could not open downloaded ZIP file"
 msgstr "non riesco ad aprire %1"
@@ -244,7 +244,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
-#: src/lib/config.cc:440
+#: src/lib/config.cc:436
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -273,7 +273,7 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/internet.cc:65
+#: src/lib/internet.cc:67
 msgid "Download failed (%1/%2 error %3)"
 msgstr ""
 
@@ -289,7 +289,7 @@ msgstr "Ogni fotogramma del sorgente sarà ripetuto %1 volte nel DCP.\n"
 msgid "Email KDMs for %1"
 msgstr ""
 
-#: src/lib/writer.cc:124
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr ""
 
@@ -329,7 +329,7 @@ msgstr "Gaussiana"
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:790
 msgid "Hearing impaired"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 "Non sappiamo cosa ha causato questo errore. La cosa migliore è inviare un "
 "report del problema alla mailing list di DCP-o-matic (carl@dcpomatic.com)"
 
-#: src/lib/config.cc:196
+#: src/lib/config.cc:199
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -358,24 +358,24 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:784
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:792
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:794
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:788
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:787
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -387,11 +387,11 @@ msgstr "Varie"
 msgid "Motion compensating deinterlacer"
 msgstr "Dinterlacciatore con compensazione di movimento"
 
-#: src/lib/video_content.cc:498
+#: src/lib/video_content_scale.cc:105
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content.cc:495
+#: src/lib/video_content_scale.cc:102
 #, fuzzy
 msgid "No stretch"
 msgstr "Flat senza stiramento"
@@ -436,25 +436,25 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/config.cc:86 src/lib/config.cc:180
+#: src/lib/config.cc:86 src/lib/config.cc:183
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:785
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:793
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:795
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Surround destro"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:789
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -536,11 +536,11 @@ msgstr "Transcodifica %1"
 msgid "Transitional"
 msgstr "Di transizione"
 
-#: src/lib/internet.cc:77
+#: src/lib/internet.cc:79
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:173
+#: src/lib/image_proxy.cc:193
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -560,7 +560,7 @@ msgstr "Maschera unsharp e sfocatura Gaussiana"
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:791
 msgid "Visually impaired"
 msgstr ""
 
@@ -593,7 +593,7 @@ msgstr "ancora"
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:558
+#: src/lib/util.cc:565
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -629,7 +629,7 @@ msgstr "non riesco a trovare informazioni sullo streaming"
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
-#: src/lib/writer.cc:434
+#: src/lib/writer.cc:435
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr ""
 
@@ -675,19 +675,19 @@ 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:578
+#: src/lib/util.cc:585
 msgid "error during async_accept (%1)"
 msgstr ""
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:561
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:634
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:599
+#: src/lib/util.cc:606
 msgid "error during async_write (%1)"
 msgstr ""
 
@@ -711,7 +711,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:706
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -741,7 +741,7 @@ msgstr "sottotitoli non-bitmap non ancora supportati"
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/config.cc:84 src/lib/video_content.cc:181
+#: src/lib/config.cc:84 src/lib/video_content.cc:179
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 802ecd46d..87b8e0b34 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-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-09-08 23:05+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"
@@ -34,7 +34,7 @@ msgstr "%1 kanalen, %2kHz, %3 samples"
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 frames; %2 frames per seconde"
 
-#: src/lib/video_content.cc:213
+#: src/lib/video_content.cc:211
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -98,15 +98,15 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:786
 msgid "Centre"
 msgstr "Midden"
 
-#: src/lib/writer.cc:81
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Controleer bestaande videodata"
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:471
 msgid "Computing audio digest"
 msgstr "Verwerk audio data"
 
@@ -114,7 +114,7 @@ msgstr "Verwerk audio data"
 msgid "Computing digest"
 msgstr "Verwerken..."
 
-#: src/lib/writer.cc:466
+#: src/lib/writer.cc:467
 msgid "Computing image digest"
 msgstr "Verwerk video data"
 
@@ -130,19 +130,19 @@ msgstr "Toegevoegde bestanden moeten dezelfde audio vertraging hebben."
 msgid "Content to be joined must have the same audio gain."
 msgstr "Toegevoegde bestanden moeten dezelfde audio gain hebben."
 
-#: src/lib/video_content.cc:148
+#: src/lib/video_content.cc:146
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Toegevoegde bestanden moeten dezelfde kleurindeling hebben."
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:138
 msgid "Content to be joined must have the same crop."
 msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:126
 msgid "Content to be joined must have the same picture size."
 msgstr "Toegevoegde bestanden moeten dezelfde grootte hebben."
 
-#: src/lib/video_content.cc:144
+#: src/lib/video_content.cc:142
 msgid "Content to be joined must have the same scale setting."
 msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
 
@@ -158,11 +158,11 @@ msgstr "Toegevoegde bestanden moeten dezelfde ondertitel Y offset hebben."
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:130
 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:136
+#: src/lib/video_content.cc:134
 msgid "Content to be joined must have the same video frame type."
 msgstr "Toegevoegde bestanden moeten dezelfde video formaat hebben."
 
@@ -186,9 +186,9 @@ msgstr "Kan niet verbinden met server %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kan geen remote map maken %1 (%2)"
 
-#: src/lib/image_proxy.cc:127
+#: src/lib/image_proxy.cc:147
 #, fuzzy
-msgid "Could not decode image file"
+msgid "Could not decode image file (%1)"
 msgstr "kan geen bestand maken %1"
 
 #: src/lib/job.cc:90
@@ -199,7 +199,7 @@ msgstr "Kan niet openen %1"
 msgid "Could not open %1 to send"
 msgstr "Kan niet openen %1 om te verzenden"
 
-#: src/lib/internet.cc:72
+#: src/lib/internet.cc:74
 msgid "Could not open downloaded ZIP file"
 msgstr "Kan gedownloade ZIP bestand niet openen"
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacing"
 
-#: src/lib/config.cc:440
+#: src/lib/config.cc:436
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -266,7 +266,7 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 and CP750"
 
-#: src/lib/internet.cc:65
+#: src/lib/internet.cc:67
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Fout met download(%1/%2 error %3)"
 
@@ -282,7 +282,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:124
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "Encoding bestandsdata"
 
@@ -322,7 +322,7 @@ msgstr "Gaussian"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:790
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -339,7 +339,7 @@ msgstr ""
 "Dit is een onbekende fout. U kunt deze het beste melden bij de DCP-o-matic "
 "mailing lijst (carl@dcpomatic.com)"
 
-#: src/lib/config.cc:196
+#: src/lib/config.cc:199
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -351,23 +351,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:784
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:792
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:794
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:788
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:787
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -379,11 +379,11 @@ msgstr "Diverse"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content.cc:498
+#: src/lib/video_content_scale.cc:105
 msgid "No scale"
 msgstr "Niet vergroten of verkleinen"
 
-#: src/lib/video_content.cc:495
+#: src/lib/video_content_scale.cc:102
 msgid "No stretch"
 msgstr "Niet uitvullen"
 
@@ -431,23 +431,23 @@ msgstr "Publieke Service aankondiging"
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: src/lib/config.cc:86 src/lib/config.cc:180
+#: src/lib/config.cc:86 src/lib/config.cc:183
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:785
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:793
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:795
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:789
 msgid "Right surround"
 msgstr "Rechts surround"
 
@@ -525,11 +525,11 @@ msgstr "Omzetten %1"
 msgid "Transitional"
 msgstr "Bumper"
 
-#: src/lib/internet.cc:77
+#: src/lib/internet.cc:79
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
-#: src/lib/image_proxy.cc:173
+#: src/lib/image_proxy.cc:193
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -549,7 +549,7 @@ msgstr "Unsharp mask and Gaussian blur"
 msgid "Untitled"
 msgstr "Niet benoemd"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:791
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
@@ -581,7 +581,7 @@ msgstr "[still]"
 msgid "cannot contain slashes"
 msgstr "er mag geen '\" gebruikt worden"
 
-#: src/lib/util.cc:558
+#: src/lib/util.cc:565
 msgid "connect timed out"
 msgstr "verbinding timeout"
 
@@ -617,7 +617,7 @@ msgstr "kan geen stream informatie vinden"
 msgid "could not find video decoder"
 msgstr "kan geen videodecoder vinden"
 
-#: src/lib/writer.cc:434
+#: src/lib/writer.cc:435
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kan MXF audio niet plaatsen in DCP (%1)"
 
@@ -661,19 +661,19 @@ 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:578
+#: src/lib/util.cc:585
 msgid "error during async_accept (%1)"
 msgstr "fout met async_accepteren (FTP) (%1)"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:561
 msgid "error during async_connect (%1)"
 msgstr "fout met async_verbinden (FTP) (%1)"
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:634
 msgid "error during async_read (%1)"
 msgstr "fout met async_lezen (FTP) (%1)"
 
-#: src/lib/util.cc:599
+#: src/lib/util.cc:606
 msgid "error during async_write (%1)"
 msgstr "fout met async_schrijven (FTP) (%1)"
 
@@ -697,7 +697,7 @@ msgstr "minuut"
 msgid "minutes"
 msgstr "minuten"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:706
 msgid "missing key %1 in key-value set"
 msgstr "ontbrekende key %1 in key-value set"
 
@@ -727,7 +727,7 @@ msgstr "non-bitmap ondertitels worden nog niet ondersteund"
 msgid "remaining"
 msgstr "resterend"
 
-#: src/lib/config.cc:84 src/lib/video_content.cc:181
+#: src/lib/config.cc:84 src/lib/video_content.cc:179
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 622319b3d..2b96dd2e2 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-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-09-08 23:05+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -33,7 +33,7 @@ msgstr "%1 kanaler, %2kHz, %3 sampel"
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 bilder; %2 bilder per sekund"
 
-#: src/lib/video_content.cc:213
+#: src/lib/video_content.cc:211
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixlar (%3:1)"
 
@@ -97,15 +97,15 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:786
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:81
+#: src/lib/writer.cc:82
 msgid "Checking existing image data"
 msgstr "Kontrollerar befintligt bilddata"
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:471
 msgid "Computing audio digest"
 msgstr "Beräknar audiosammanfattning"
 
@@ -113,7 +113,7 @@ msgstr "Beräknar audiosammanfattning"
 msgid "Computing digest"
 msgstr "Beräknar sammanfattning"
 
-#: src/lib/writer.cc:466
+#: src/lib/writer.cc:467
 msgid "Computing image digest"
 msgstr "Beräknar bildsammanfattning"
 
@@ -129,19 +129,19 @@ msgstr "Innehåll som ska sammanfogas måste använda samma audiofördröjning."
 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:148
+#: src/lib/video_content.cc:146
 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:140
+#: src/lib/video_content.cc:138
 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:128
+#: src/lib/video_content.cc:126
 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:144
+#: src/lib/video_content.cc:142
 #, 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."
@@ -162,11 +162,11 @@ msgstr ""
 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:132
+#: src/lib/video_content.cc:130
 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:136
+#: src/lib/video_content.cc:134
 msgid "Content to be joined must have the same video frame type."
 msgstr "Innehåll som ska sammanfogas måste använda samma videobildtyp."
 
@@ -190,9 +190,9 @@ msgstr "Kunde inte ansluta till server %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 
-#: src/lib/image_proxy.cc:127
+#: src/lib/image_proxy.cc:147
 #, fuzzy
-msgid "Could not decode image file"
+msgid "Could not decode image file (%1)"
 msgstr "kunde inte skapa fil %1"
 
 #: src/lib/job.cc:90
@@ -203,7 +203,7 @@ msgstr "Kunde inte öppna %1"
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
-#: src/lib/internet.cc:72
+#: src/lib/internet.cc:74
 #, fuzzy
 msgid "Could not open downloaded ZIP file"
 msgstr "kunde inte öppna fil %1"
@@ -242,7 +242,7 @@ msgid "De-interlacing"
 msgstr "Avflätning"
 
 # svåröversatt
-#: src/lib/config.cc:440
+#: src/lib/config.cc:436
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -268,7 +268,7 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 och CP750"
 
-#: src/lib/internet.cc:65
+#: src/lib/internet.cc:67
 msgid "Download failed (%1/%2 error %3)"
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Email KDMs for %1"
 msgstr "E-posta KDM:er för %1"
 
-#: src/lib/writer.cc:124
+#: src/lib/writer.cc:125
 msgid "Encoding image data"
 msgstr "Kodar bild-data"
 
@@ -325,7 +325,7 @@ msgstr "Gaussisk"
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:790
 msgid "Hearing impaired"
 msgstr ""
 
@@ -342,7 +342,7 @@ msgstr ""
 "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera "
 "problemet är till DCP-o-matics mejl-lista (carl@dcpomatic.com)"
 
-#: src/lib/config.cc:196
+#: src/lib/config.cc:199
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -354,24 +354,24 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:784
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:792
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:794
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:788
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:787
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -383,11 +383,11 @@ msgstr "Diverse"
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
 
-#: src/lib/video_content.cc:498
+#: src/lib/video_content_scale.cc:105
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content.cc:495
+#: src/lib/video_content_scale.cc:102
 #, fuzzy
 msgid "No stretch"
 msgstr "Flat utan utsträckning"
@@ -433,24 +433,24 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/config.cc:86 src/lib/config.cc:180
+#: src/lib/config.cc:86 src/lib/config.cc:183
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:785
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:793
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:795
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:789
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -530,11 +530,11 @@ msgstr "Konvertera %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/internet.cc:77
+#: src/lib/internet.cc:79
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:173
+#: src/lib/image_proxy.cc:193
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -555,7 +555,7 @@ msgstr "Oskärpemask och Gaussisk suddighet"
 msgid "Untitled"
 msgstr "Utan titel"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:791
 msgid "Visually impaired"
 msgstr ""
 
@@ -589,7 +589,7 @@ msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:558
+#: src/lib/util.cc:565
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
@@ -625,7 +625,7 @@ msgstr "kunde inte hitta information om strömmen"
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
-#: src/lib/writer.cc:434
+#: src/lib/writer.cc:435
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kunde inte flytta audio-MXF in i DCP:n (%1)"
 
@@ -670,19 +670,19 @@ 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:578
+#: src/lib/util.cc:585
 msgid "error during async_accept (%1)"
 msgstr "fel vid async_accept (%1)"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:561
 msgid "error during async_connect (%1)"
 msgstr "fel vid async_connect (%1)"
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:634
 msgid "error during async_read (%1)"
 msgstr "fel vid async_read (%1)"
 
-#: src/lib/util.cc:599
+#: src/lib/util.cc:606
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
@@ -706,7 +706,7 @@ msgstr "minut"
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:706
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -737,7 +737,7 @@ msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/config.cc:84 src/lib/video_content.cc:181
+#: src/lib/config.cc:84 src/lib/video_content.cc:179
 msgid "sRGB"
 msgstr "sRGB"