Update .po files.

12 files changed, 2112 insertions, 1028 deletions

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 0e1776ac6..2b9e93187 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: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-04-02 19:10-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,16 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/lib/sndfile_content.cc:70
+#: src/lib/sndfile_content.cc:59
+msgid "%1 [audio]"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:170
+msgid "%1 [movie]"
+msgstr ""
+
+#: src/lib/moving_image_content.cc:58
+msgid "%1 [moving images]"
+msgstr ""
+
+#: src/lib/still_image_content.cc:52
+#, fuzzy
+msgid "%1 [still]"
+msgstr "imagen fija"
+
+#: src/lib/sndfile_content.cc:80
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:193
+#: src/lib/ffmpeg_content.cc:205
 #, fuzzy
 msgid "%1 frames; %2 frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/video_content.cc:131
+#: src/lib/video_content.cc:134
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -66,12 +83,13 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Publicidad"
 
-#: src/lib/job.cc:72
+#: src/lib/job.cc:75
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
-#: src/lib/analyse_audio_job.cc:53
-msgid "Analyse audio of %1"
+#: src/lib/analyse_audio_job.cc:48
+#, fuzzy
+msgid "Analyse audio"
 msgstr "Analizar audio de %1"
 
 #: src/lib/scaler.cc:64
@@ -86,7 +104,7 @@ msgstr "Bicúbico"
 msgid "Bilinear"
 msgstr "Bilineal"
 
-#: src/lib/job.cc:320
+#: src/lib/job.cc:350
 msgid "Cancelled"
 msgstr ""
 
@@ -94,10 +112,15 @@ msgstr ""
 msgid "Cannot handle pixel format %1 during %2"
 msgstr ""
 
-#: src/lib/util.cc:700
+#: src/lib/util.cc:743
 msgid "Centre"
 msgstr ""
 
+#: src/lib/util.cc:766
+#, fuzzy
+msgid "Content and DCP have the same rate.\n"
+msgstr "La fuente y el DCP tienen la misma velocidad.\n"
+
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
@@ -110,15 +133,29 @@ 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/film.cc:917
+#, fuzzy
+msgid "Could not find DCP to make KDM for"
+msgstr "no se encontró el decodificador de audio"
+
+#: src/lib/job.cc:95
+#, fuzzy
+msgid "Could not open %1"
+msgstr "no se pudo abrir el fichero para lectura"
+
 #: src/lib/scp_dcp_job.cc:175
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
+#: src/lib/film.cc:927
+msgid "Could not read DCP to make KDM for"
+msgstr ""
+
 #: src/lib/scp_dcp_job.cc:145
 msgid "Could not start SCP session (%1)"
 msgstr "No se pudo iniciar la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:187
+#: src/lib/scp_dcp_job.cc:189
 msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
@@ -126,19 +163,22 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Desentrelazado por interpolación cúbica"
 
-#: src/lib/util.cc:723
-msgid "DCP and source have the same rate.\n"
-msgstr "La fuente y el DCP tienen la misma velocidad.\n"
-
-#: src/lib/util.cc:733
+#: src/lib/util.cc:776
 #, fuzzy
-msgid "DCP will run at %1%% of the source speed.\n"
+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:726
-msgid "DCP will use every other frame of the source.\n"
+#: src/lib/util.cc:769
+#, fuzzy
+msgid "DCP will use every other frame of the content.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\n"
 
+#: src/lib/job.cc:96
+msgid ""
+"DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
+"an unexpected format."
+msgstr ""
+
 #: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
 #: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
 msgid "De-blocking"
@@ -158,15 +198,16 @@ msgstr "Deringing filter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:728
-msgid "Each source frame will be doubled in the DCP.\n"
+#: src/lib/util.cc:771
+#, fuzzy
+msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
-#: src/lib/job.cc:318
+#: src/lib/job.cc:348
 msgid "Error (%1)"
 msgstr "Error (%1)"
 
-#: src/lib/examine_content_job.cc:45
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Examinar contenido"
 
@@ -230,11 +271,7 @@ msgstr "Horizontal deblocking filter"
 msgid "Horizontal deblocking filter A"
 msgstr "Horizontal deblocking filter A"
 
-#: src/lib/imagemagick_content.cc:50
-msgid "Image: %1"
-msgstr ""
-
-#: src/lib/job.cc:96 src/lib/job.cc:105
+#: src/lib/job.cc:109 src/lib/job.cc:118
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -250,15 +287,15 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:698
+#: src/lib/util.cc:741
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:702
+#: src/lib/util.cc:745
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/util.cc:701
+#: src/lib/util.cc:744
 msgid "Lfe (sub)"
 msgstr ""
 
@@ -279,20 +316,20 @@ msgstr "Median deinterlacer"
 msgid "Misc"
 msgstr "Miscelánea"
 
+#: src/lib/film.cc:919
+msgid "More than one possible DCP to make KDM for"
+msgstr ""
+
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/ffmpeg_content.cc:181
-msgid "Movie: %1"
-msgstr ""
-
 #: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
 #: src/lib/filter.cc:91
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:346
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
@@ -312,11 +349,11 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:742
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:703
+#: src/lib/util.cc:746
 msgid "Right surround"
 msgstr ""
 
@@ -336,11 +373,6 @@ msgstr "Cortometraje"
 msgid "Sinc"
 msgstr "Sinc"
 
-#: src/lib/sndfile_content.cc:57
-#, fuzzy
-msgid "Sound file: %1"
-msgstr "no se pudo abrir el fichero para lectura"
-
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -361,7 +393,7 @@ msgstr "Temporal noise reducer"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:78
+#: src/lib/job.cc:81
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -369,7 +401,7 @@ msgstr ""
 "En el dispositivo donde se encuentra la película queda poco espacio. Libere "
 "espacio en el disco y pruebe de nuevo."
 
-#: src/lib/film.cc:364
+#: src/lib/film.cc:366
 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 "
@@ -388,11 +420,11 @@ msgstr "Codificar %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:104
+#: src/lib/job.cc:117
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:264
+#: src/lib/ffmpeg_decoder.cc:276
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
@@ -400,6 +432,10 @@ msgstr "Formato de audio desconocido (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
+#: src/lib/colour_conversion.cc:141
+msgid "Untitled"
+msgstr ""
+
 #: src/lib/filter.cc:69
 msgid "Vertical deblocking filter"
 msgstr "Vertical deblocking filter"
@@ -420,7 +456,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:273
+#: src/lib/film.cc:271
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
@@ -428,7 +464,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:494
+#: src/lib/util.cc:543
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -436,12 +472,12 @@ msgstr "tiempo de conexión agotado"
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:269
+#: src/lib/film.cc:267
 #, fuzzy
 msgid "container"
 msgstr "contenido"
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:275
 msgid "content type"
 msgstr "tipo de contenido"
 
@@ -462,7 +498,7 @@ msgstr "no se encontró el decodificador de audio"
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/ffmpeg_decoder.cc:498
+#: src/lib/ffmpeg_decoder.cc:521
 msgid "could not find subtitle decoder"
 msgstr "no se pudo encontrar decodificador de subtítutlos"
 
@@ -480,16 +516,21 @@ msgstr "no se pudo abrir el fichero para lectura"
 msgid "could not open file %1"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/dcp_video_frame.cc:263
+#: src/lib/dcp_video_frame.cc:336
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/exceptions.cc:44
+#: src/lib/dcp_video_frame.cc:342
+#, fuzzy
+msgid "could not read encoded data"
+msgstr "no se encontró el decodificador de audio"
+
+#: src/lib/exceptions.cc:42
 #, fuzzy
 msgid "could not read from file %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/resampler.cc:76 src/lib/resampler.cc:96
+#: src/lib/resampler.cc:80 src/lib/resampler.cc:99
 msgid "could not run sample-rate converter"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
@@ -501,32 +542,40 @@ msgstr "no se pudo abrir la sesión SCP (%1)"
 msgid "could not start SSH session"
 msgstr "no se pudo abrir la sesión SSH"
 
-#: src/lib/exceptions.cc:50
+#: src/lib/exceptions.cc:48
 #, fuzzy
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/moving_image_examiner.cc:82
+msgid "first frame in moving image directory is number %1"
+msgstr ""
+
+#: src/lib/transcode_job.cc:95
 msgid "frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/util.cc:146
+#: src/lib/transcode_job.cc:98
+msgid "hashing"
+msgstr ""
+
+#: src/lib/util.cc:145
 msgid "hour"
 msgstr "hora"
 
-#: src/lib/util.cc:143 src/lib/util.cc:148
+#: src/lib/util.cc:142 src/lib/util.cc:147
 msgid "hours"
 msgstr "horas"
 
-#: src/lib/util.cc:153
+#: src/lib/util.cc:152
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:154
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:621
+#: src/lib/util.cc:664
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -534,28 +583,48 @@ msgstr "falta la clave %1 en el par clave-valor"
 msgid "missing required setting %1"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:530
+#: src/lib/ffmpeg_decoder.cc:553
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:232 src/lib/film.cc:281
+#: src/lib/film.cc:232 src/lib/film.cc:279
 msgid "name"
 msgstr "nombre"
 
-#: src/lib/ffmpeg_decoder.cc:545
+#: src/lib/ffmpeg_decoder.cc:568
 msgid "non-bitmap subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
+#: src/lib/moving_image_examiner.cc:78
+msgid "only %1 file(s) found in moving image directory"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:313
+#: src/lib/job.cc:343
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/util.cc:158
+#: src/lib/config.cc:72
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/lib/config.cc:73
+msgid "sRGB non-linearised"
+msgstr ""
+
+#: src/lib/util.cc:157
 msgid "seconds"
 msgstr "segundos"
 
+#: src/lib/moving_image_examiner.cc:86
+msgid "there are %1 images in the directory but the last one is number %2"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Sound file: %1"
+#~ msgstr "no se pudo abrir el fichero para lectura"
+
 #~ msgid "1.66 within Flat"
 #~ msgstr "1.66 en Flat"
 
@@ -603,12 +672,6 @@ msgstr "segundos"
 #~ msgid "no still image files found"
 #~ msgstr "no se encuentran imágenes fijas"
 
-#~ msgid "sRGB"
-#~ msgstr "sRGB"
-
-#~ msgid "still"
-#~ msgstr "imagen fija"
-
 #~ msgid "video"
 #~ msgstr "vídeo"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index d13472546..45d2b57cb 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: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-07-16 23:11+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,15 +16,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/sndfile_content.cc:70
+#: src/lib/sndfile_content.cc:59
+msgid "%1 [audio]"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:170
+msgid "%1 [movie]"
+msgstr ""
+
+#: src/lib/moving_image_content.cc:58
+msgid "%1 [moving images]"
+msgstr ""
+
+#: src/lib/still_image_content.cc:52
+#, fuzzy
+msgid "%1 [still]"
+msgstr "fixe"
+
+#: src/lib/sndfile_content.cc:80
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 canaux, %2kHz, %3 samples"
 
-#: src/lib/ffmpeg_content.cc:193
+#: src/lib/ffmpeg_content.cc:205
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 images ; %2 images par seconde"
 
-#: src/lib/video_content.cc:131
+#: src/lib/video_content.cc:134
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -64,12 +81,13 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Advertisement"
 
-#: src/lib/job.cc:72
+#: src/lib/job.cc:75
 msgid "An error occurred whilst handling the file %1."
 msgstr "Une erreur s'est produite lors du traitement du fichier %1."
 
-#: src/lib/analyse_audio_job.cc:53
-msgid "Analyse audio of %1"
+#: src/lib/analyse_audio_job.cc:48
+#, fuzzy
+msgid "Analyse audio"
 msgstr "Analyse du son de %1"
 
 #: src/lib/scaler.cc:64
@@ -84,7 +102,7 @@ msgstr "Bicubique"
 msgid "Bilinear"
 msgstr "Bilinéaire"
 
-#: src/lib/job.cc:320
+#: src/lib/job.cc:350
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -92,10 +110,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:700
+#: src/lib/util.cc:743
 msgid "Centre"
 msgstr "Centre"
 
+#: src/lib/util.cc:766
+#, fuzzy
+msgid "Content and DCP have the same rate.\n"
+msgstr "Le DCP et la source ont les mêmes cadences.\n"
+
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
 msgstr "Copier le DCP dans le TMS"
@@ -108,15 +131,29 @@ 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/film.cc:917
+#, fuzzy
+msgid "Could not find DCP to make KDM for"
+msgstr "décodeur audio introuvable"
+
+#: src/lib/job.cc:95
+#, fuzzy
+msgid "Could not open %1"
+msgstr "lecture du fichier (%1) impossible"
+
 #: src/lib/scp_dcp_job.cc:175
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
+#: src/lib/film.cc:927
+msgid "Could not read DCP to make KDM for"
+msgstr ""
+
 #: src/lib/scp_dcp_job.cc:145
 msgid "Could not start SCP session (%1)"
 msgstr "Démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:187
+#: src/lib/scp_dcp_job.cc:189
 msgid "Could not write to remote file (%1)"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
@@ -124,37 +161,30 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Désentrelacement cubique interpolé"
 
-#: src/lib/util.cc:723
-msgid "DCP and source have the same rate.\n"
-msgstr "Le DCP et la source ont les mêmes cadences.\n"
-
-#: src/lib/util.cc:733
+#: src/lib/util.cc:776
 #, fuzzy
-msgid "DCP will run at %1%% of the source speed.\n"
+msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "La cadence du DCP sera %1%% par rapport à la source.\n"
 
-#: src/lib/util.cc:726
-msgid "DCP will use every other frame of the source.\n"
+#: src/lib/util.cc:769
+#, fuzzy
+msgid "DCP will use every other frame of the content.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
 
-#: src/lib/filter.cc:68
-#: src/lib/filter.cc:69
-#: src/lib/filter.cc:70
-#: src/lib/filter.cc:71
-#: src/lib/filter.cc:72
-#: src/lib/filter.cc:73
+#: src/lib/job.cc:96
+msgid ""
+"DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
+"an unexpected format."
+msgstr ""
+
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
+#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
 msgid "De-blocking"
 msgstr "De-bloc"
 
-#: src/lib/filter.cc:75
-#: src/lib/filter.cc:76
-#: src/lib/filter.cc:77
-#: src/lib/filter.cc:78
-#: src/lib/filter.cc:79
-#: src/lib/filter.cc:80
-#: src/lib/filter.cc:81
-#: src/lib/filter.cc:82
-#: src/lib/filter.cc:83
+#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
+#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
+#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
@@ -166,15 +196,16 @@ msgstr "Filtre anti bourdonnement"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:728
-msgid "Each source frame will be doubled in the DCP.\n"
+#: src/lib/util.cc:771
+#, fuzzy
+msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 
-#: src/lib/job.cc:318
+#: src/lib/job.cc:348
 msgid "Error (%1)"
 msgstr "Erreur (%1)"
 
-#: src/lib/examine_content_job.cc:45
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Examen du contenu"
 
@@ -238,14 +269,13 @@ msgstr "Filtre dé-bloc horizontal"
 msgid "Horizontal deblocking filter A"
 msgstr "Filtre dé-bloc horizontal"
 
-#: src/lib/imagemagick_content.cc:50
-msgid "Image: %1"
-msgstr "Image : %1"
-
-#: src/lib/job.cc:96
-#: src/lib/job.cc:105
-msgid "It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
-msgstr "Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic (carl@dcpomatic.com)"
+#: src/lib/job.cc:109 src/lib/job.cc:118
+msgid ""
+"It is not known what caused this error.  The best idea is to report the "
+"problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
+msgstr ""
+"Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
+"(carl@dcpomatic.com)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
@@ -255,15 +285,15 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:698
+#: src/lib/util.cc:741
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:702
+#: src/lib/util.cc:745
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:701
+#: src/lib/util.cc:744
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -279,30 +309,25 @@ msgstr "Désentrelaceur linéaire interpolé"
 msgid "Median deinterlacer"
 msgstr "Désentrelaceur médian"
 
-#: src/lib/filter.cc:74
-#: src/lib/filter.cc:85
-#: src/lib/filter.cc:86
-#: src/lib/filter.cc:87
-#: src/lib/filter.cc:90
+#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
+#: src/lib/filter.cc:87 src/lib/filter.cc:90
 msgid "Misc"
 msgstr "Divers"
 
+#: src/lib/film.cc:919
+msgid "More than one possible DCP to make KDM for"
+msgstr ""
+
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
-#: src/lib/ffmpeg_content.cc:181
-msgid "Movie: %1"
-msgstr "Film : %1"
-
-#: src/lib/filter.cc:84
-#: src/lib/filter.cc:88
-#: src/lib/filter.cc:89
+#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
 #: src/lib/filter.cc:91
 msgid "Noise reduction"
 msgstr "Réduction de bruit"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:346
 msgid "OK (ran for %1)"
 msgstr "OK (processus %1)"
 
@@ -322,11 +347,11 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:742
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:703
+#: src/lib/util.cc:746
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -346,10 +371,6 @@ msgstr "Short"
 msgid "Sinc"
 msgstr "Sinc"
 
-#: src/lib/sndfile_content.cc:57
-msgid "Sound file: %1"
-msgstr "Fichier son : %1"
-
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -370,13 +391,23 @@ msgstr "Réduction de bruit temporel"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:78
-msgid "The drive that the film is stored on is low in disc space.  Free some more space and try again."
-msgstr "Le disque contenant le film est plein. Libérez de l'espace et essayez à nouveau."
+#: src/lib/job.cc:81
+msgid ""
+"The drive that the film is stored on is low in disc space.  Free some more "
+"space and try again."
+msgstr ""
+"Le disque contenant le film est plein. Libérez de l'espace et essayez à "
+"nouveau."
 
-#: src/lib/film.cc:364
-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 create a new Film, re-add your content and set it up again.  Sorry!"
-msgstr "Ce projet a été créé avec une ancienne version de DCP-o-matic, chargement impossible. Créez un nouveau projet, ajoutez du contenu et  reparamétrez. Désolé !"
+#: src/lib/film.cc:366
+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 "
+"create a new Film, re-add your content and set it up again.  Sorry!"
+msgstr ""
+"Ce projet a été créé avec une ancienne version de DCP-o-matic, chargement "
+"impossible. Créez un nouveau projet, ajoutez du contenu et  reparamétrez. "
+"Désolé !"
 
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
@@ -390,11 +421,11 @@ msgstr "Transcodage %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:104
+#: src/lib/job.cc:117
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/lib/ffmpeg_decoder.cc:264
+#: src/lib/ffmpeg_decoder.cc:276
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Échantillonnage audio (%1) inconnu"
 
@@ -402,6 +433,10 @@ msgstr "Échantillonnage audio (%1) inconnu"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Adoucissement et flou Gaussien"
 
+#: src/lib/colour_conversion.cc:141
+msgid "Untitled"
+msgstr ""
+
 #: src/lib/filter.cc:69
 msgid "Vertical deblocking filter"
 msgstr "Filtre dé-bloc vertical"
@@ -422,7 +457,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:273
+#: src/lib/film.cc:271
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
@@ -430,7 +465,7 @@ msgstr "Ajoutez un contenu pour créer le DCP"
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:494
+#: src/lib/util.cc:543
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -438,12 +473,12 @@ msgstr "temps de connexion expiré"
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:269
+#: src/lib/film.cc:267
 #, fuzzy
 msgid "container"
 msgstr "contenu"
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:275
 msgid "content type"
 msgstr "type de contenu"
 
@@ -463,7 +498,7 @@ msgstr "décodeur audio introuvable"
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:498
+#: src/lib/ffmpeg_decoder.cc:521
 msgid "could not find subtitle decoder"
 msgstr "décodeur de sous-titre introuvable"
 
@@ -480,16 +515,20 @@ msgstr "lecture du fichier impossible"
 msgid "could not open file %1"
 msgstr "lecture du fichier (%1) impossible"
 
-#: src/lib/dcp_video_frame.cc:263
+#: src/lib/dcp_video_frame.cc:336
 msgid "could not open file for reading"
 msgstr "lecture du fichier impossible"
 
-#: src/lib/exceptions.cc:44
+#: src/lib/dcp_video_frame.cc:342
+#, fuzzy
+msgid "could not read encoded data"
+msgstr "décodeur audio introuvable"
+
+#: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
 msgstr "lecture du fichier impossible %1 (%2)"
 
-#: src/lib/resampler.cc:76
-#: src/lib/resampler.cc:96
+#: src/lib/resampler.cc:80 src/lib/resampler.cc:99
 msgid "could not run sample-rate converter"
 msgstr "conversion de la fréquence d'échantillonnage impossible"
 
@@ -501,32 +540,39 @@ msgstr "démarrage de session SCP (%1) impossible"
 msgid "could not start SSH session"
 msgstr "démarrage de session SSH impossible"
 
-#: src/lib/exceptions.cc:50
+#: src/lib/exceptions.cc:48
 msgid "could not write to file %1 (%2)"
 msgstr "Écriture vers fichier distant (%1) impossible (%2)"
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/moving_image_examiner.cc:82
+msgid "first frame in moving image directory is number %1"
+msgstr ""
+
+#: src/lib/transcode_job.cc:95
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/util.cc:146
+#: src/lib/transcode_job.cc:98
+msgid "hashing"
+msgstr ""
+
+#: src/lib/util.cc:145
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:143
-#: src/lib/util.cc:148
+#: src/lib/util.cc:142 src/lib/util.cc:147
 msgid "hours"
 msgstr "heures"
 
-#: src/lib/util.cc:153
+#: src/lib/util.cc:152
 msgid "minute"
 msgstr "minute"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:154
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:621
+#: src/lib/util.cc:664
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -534,29 +580,53 @@ msgstr "clé %1 non sélectionnée"
 msgid "missing required setting %1"
 msgstr "paramètre %1 manquant"
 
-#: src/lib/ffmpeg_decoder.cc:530
+#: src/lib/ffmpeg_decoder.cc:553
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:232
-#: src/lib/film.cc:281
+#: src/lib/film.cc:232 src/lib/film.cc:279
 msgid "name"
 msgstr "nom"
 
-#: src/lib/ffmpeg_decoder.cc:545
+#: src/lib/ffmpeg_decoder.cc:568
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sous-titres non-bitmap non supportés actuellement"
 
+#: src/lib/moving_image_examiner.cc:78
+msgid "only %1 file(s) found in moving image directory"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:313
+#: src/lib/job.cc:343
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/util.cc:158
+#: src/lib/config.cc:72
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/lib/config.cc:73
+msgid "sRGB non-linearised"
+msgstr ""
+
+#: src/lib/util.cc:157
 msgid "seconds"
 msgstr "secondes"
 
+#: src/lib/moving_image_examiner.cc:86
+msgid "there are %1 images in the directory but the last one is number %2"
+msgstr ""
+
+#~ msgid "Image: %1"
+#~ msgstr "Image : %1"
+
+#~ msgid "Movie: %1"
+#~ msgstr "Film : %1"
+
+#~ msgid "Sound file: %1"
+#~ msgstr "Fichier son : %1"
+
 #~ msgid "1.66 within Flat"
 #~ msgstr "1.66 dans Flat"
 
@@ -603,12 +673,6 @@ msgstr "secondes"
 #~ msgid "no still image files found"
 #~ msgstr "aucune image fixe trouvée"
 
-#~ msgid "sRGB"
-#~ msgstr "sRGB"
-
-#~ msgid "still"
-#~ msgstr "fixe"
-
 #~ msgid "video"
 #~ msgstr "vidéo"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 53a34e020..b3768b58a 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: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-04-28 10:26+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,16 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/lib/sndfile_content.cc:70
+#: src/lib/sndfile_content.cc:59
+msgid "%1 [audio]"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:170
+msgid "%1 [movie]"
+msgstr ""
+
+#: src/lib/moving_image_content.cc:58
+msgid "%1 [moving images]"
+msgstr ""
+
+#: src/lib/still_image_content.cc:52
+#, fuzzy
+msgid "%1 [still]"
+msgstr "ancora"
+
+#: src/lib/sndfile_content.cc:80
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:193
+#: src/lib/ffmpeg_content.cc:205
 #, fuzzy
 msgid "%1 frames; %2 frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/video_content.cc:131
+#: src/lib/video_content.cc:134
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -66,12 +83,13 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Pubblicità"
 
-#: src/lib/job.cc:72
+#: src/lib/job.cc:75
 msgid "An error occurred whilst handling the file %1."
 msgstr "Errore durante l'elaborazione del file %1."
 
-#: src/lib/analyse_audio_job.cc:53
-msgid "Analyse audio of %1"
+#: src/lib/analyse_audio_job.cc:48
+#, fuzzy
+msgid "Analyse audio"
 msgstr "Analizzo l'audio di %1"
 
 #: src/lib/scaler.cc:64
@@ -86,7 +104,7 @@ msgstr "Bicubica"
 msgid "Bilinear"
 msgstr "Bilineare"
 
-#: src/lib/job.cc:320
+#: src/lib/job.cc:350
 msgid "Cancelled"
 msgstr "Cancellato"
 
@@ -94,10 +112,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:700
+#: src/lib/util.cc:743
 msgid "Centre"
 msgstr "Centro"
 
+#: src/lib/util.cc:766
+#, fuzzy
+msgid "Content and DCP have the same rate.\n"
+msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
+
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
 msgstr "Copia del DCP al TMS"
@@ -110,15 +133,29 @@ 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/film.cc:917
+#, fuzzy
+msgid "Could not find DCP to make KDM for"
+msgstr "non riesco a trovare il decoder audio"
+
+#: src/lib/job.cc:95
+#, fuzzy
+msgid "Could not open %1"
+msgstr "non riesco ad aprire %1"
+
 #: src/lib/scp_dcp_job.cc:175
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
+#: src/lib/film.cc:927
+msgid "Could not read DCP to make KDM for"
+msgstr ""
+
 #: src/lib/scp_dcp_job.cc:145
 msgid "Could not start SCP session (%1)"
 msgstr "Non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:187
+#: src/lib/scp_dcp_job.cc:189
 msgid "Could not write to remote file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
@@ -126,18 +163,22 @@ msgstr "Non posso scrivere il file remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Deinterlacciatore cubico interpolato"
 
-#: src/lib/util.cc:723
-msgid "DCP and source have the same rate.\n"
-msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
-
-#: src/lib/util.cc:733
-msgid "DCP will run at %1%% of the source speed.\n"
+#: src/lib/util.cc:776
+#, 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:726
-msgid "DCP will use every other frame of the source.\n"
+#: src/lib/util.cc:769
+#, fuzzy
+msgid "DCP will use every other frame of the content.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
 
+#: src/lib/job.cc:96
+msgid ""
+"DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
+"an unexpected format."
+msgstr ""
+
 #: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
 #: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
 msgid "De-blocking"
@@ -157,15 +198,16 @@ msgstr "Filtro deringing"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:728
-msgid "Each source frame will be doubled in the DCP.\n"
+#: src/lib/util.cc:771
+#, fuzzy
+msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà raddoppiato nel DCP.\n"
 
-#: src/lib/job.cc:318
+#: src/lib/job.cc:348
 msgid "Error (%1)"
 msgstr "Errore (%1)"
 
-#: src/lib/examine_content_job.cc:45
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Esamino il contenuto"
 
@@ -229,11 +271,7 @@ msgstr "Filtro sblocco orizzontale"
 msgid "Horizontal deblocking filter A"
 msgstr "Filtro A sblocco orizzontale"
 
-#: src/lib/imagemagick_content.cc:50
-msgid "Image: %1"
-msgstr ""
-
-#: src/lib/job.cc:96 src/lib/job.cc:105
+#: src/lib/job.cc:109 src/lib/job.cc:118
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -249,15 +287,15 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:698
+#: src/lib/util.cc:741
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:702
+#: src/lib/util.cc:745
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:701
+#: src/lib/util.cc:744
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -278,20 +316,20 @@ msgstr "Deinterlacciatore mediano"
 msgid "Misc"
 msgstr "Varie"
 
+#: src/lib/film.cc:919
+msgid "More than one possible DCP to make KDM for"
+msgstr ""
+
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
 msgstr "Dinterlacciatore compensativo di movimento"
 
-#: src/lib/ffmpeg_content.cc:181
-msgid "Movie: %1"
-msgstr ""
-
 #: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
 #: src/lib/filter.cc:91
 msgid "Noise reduction"
 msgstr "Riduzione del rumore"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:346
 msgid "OK (ran for %1)"
 msgstr "OK (eseguito in %1)"
 
@@ -311,11 +349,11 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:742
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:703
+#: src/lib/util.cc:746
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -335,11 +373,6 @@ msgstr "Corto"
 msgid "Sinc"
 msgstr "Sinc"
 
-#: src/lib/sndfile_content.cc:57
-#, fuzzy
-msgid "Sound file: %1"
-msgstr "non riesco ad aprire %1"
-
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -360,7 +393,7 @@ msgstr "Riduttore temporale di rumore"
 msgid "Test"
 msgstr "Prova"
 
-#: src/lib/job.cc:78
+#: src/lib/job.cc:81
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -368,7 +401,7 @@ msgstr ""
 "Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
 "altro spazio e riprovare."
 
-#: src/lib/film.cc:364
+#: src/lib/film.cc:366
 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 "
@@ -387,11 +420,11 @@ msgstr "Transcodifica %1"
 msgid "Transitional"
 msgstr "Di transizione"
 
-#: src/lib/job.cc:104
+#: src/lib/job.cc:117
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: src/lib/ffmpeg_decoder.cc:264
+#: src/lib/ffmpeg_decoder.cc:276
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato di campionamento audio non riconosciuto (%1)"
 
@@ -399,6 +432,10 @@ 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:141
+msgid "Untitled"
+msgstr ""
+
 #: src/lib/filter.cc:69
 msgid "Vertical deblocking filter"
 msgstr "Filtro di sblocco verticale"
@@ -419,7 +456,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:273
+#: src/lib/film.cc:271
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
@@ -427,7 +464,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:494
+#: src/lib/util.cc:543
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -435,12 +472,12 @@ msgstr "connessione scaduta"
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:269
+#: src/lib/film.cc:267
 #, fuzzy
 msgid "container"
 msgstr "contenuto"
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:275
 msgid "content type"
 msgstr "tipo di contenuto"
 
@@ -460,7 +497,7 @@ msgstr "non riesco a trovare il decoder audio"
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/ffmpeg_decoder.cc:498
+#: src/lib/ffmpeg_decoder.cc:521
 msgid "could not find subtitle decoder"
 msgstr "non riesco a trovare il decoder dei sottotitoli"
 
@@ -477,15 +514,20 @@ msgstr "non riesco ad aprire il file per leggerlo"
 msgid "could not open file %1"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/dcp_video_frame.cc:263
+#: src/lib/dcp_video_frame.cc:336
 msgid "could not open file for reading"
 msgstr "non riesco ad aprire il file per leggerlo"
 
-#: src/lib/exceptions.cc:44
+#: src/lib/dcp_video_frame.cc:342
+#, fuzzy
+msgid "could not read encoded data"
+msgstr "non riesco a trovare il decoder audio"
+
+#: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
 msgstr "non posso leggere dal file %1 (%2)"
 
-#: src/lib/resampler.cc:76 src/lib/resampler.cc:96
+#: src/lib/resampler.cc:80 src/lib/resampler.cc:99
 msgid "could not run sample-rate converter"
 msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 
@@ -497,31 +539,39 @@ msgstr "non posso avviare la sessione SCP (%1)"
 msgid "could not start SSH session"
 msgstr "non posso avviare la sessione SSH"
 
-#: src/lib/exceptions.cc:50
+#: src/lib/exceptions.cc:48
 msgid "could not write to file %1 (%2)"
 msgstr "non posso scrivere il file (%1)"
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/moving_image_examiner.cc:82
+msgid "first frame in moving image directory is number %1"
+msgstr ""
+
+#: src/lib/transcode_job.cc:95
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/util.cc:146
+#: src/lib/transcode_job.cc:98
+msgid "hashing"
+msgstr ""
+
+#: src/lib/util.cc:145
 msgid "hour"
 msgstr "ora"
 
-#: src/lib/util.cc:143 src/lib/util.cc:148
+#: src/lib/util.cc:142 src/lib/util.cc:147
 msgid "hours"
 msgstr "ore"
 
-#: src/lib/util.cc:153
+#: src/lib/util.cc:152
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:154
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:621
+#: src/lib/util.cc:664
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -529,28 +579,48 @@ msgstr "persa la chiave %1 tra i valori chiave"
 msgid "missing required setting %1"
 msgstr "persa la regolazione richiesta %1"
 
-#: src/lib/ffmpeg_decoder.cc:530
+#: src/lib/ffmpeg_decoder.cc:553
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:232 src/lib/film.cc:281
+#: src/lib/film.cc:232 src/lib/film.cc:279
 msgid "name"
 msgstr "nome"
 
-#: src/lib/ffmpeg_decoder.cc:545
+#: src/lib/ffmpeg_decoder.cc:568
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sottotitoli non-bitmap non ancora supportati"
 
+#: src/lib/moving_image_examiner.cc:78
+msgid "only %1 file(s) found in moving image directory"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:313
+#: src/lib/job.cc:343
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/util.cc:158
+#: src/lib/config.cc:72
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/lib/config.cc:73
+msgid "sRGB non-linearised"
+msgstr ""
+
+#: src/lib/util.cc:157
 msgid "seconds"
 msgstr "secondi"
 
+#: src/lib/moving_image_examiner.cc:86
+msgid "there are %1 images in the directory but the last one is number %2"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Sound file: %1"
+#~ msgstr "non riesco ad aprire %1"
+
 #~ msgid "1.66 within Flat"
 #~ msgstr "1.66 all'interno di Flat"
 
@@ -596,12 +666,6 @@ msgstr "secondi"
 #~ msgid "no still image files found"
 #~ msgstr "file immagini statiche non trovati"
 
-#~ msgid "sRGB"
-#~ msgstr "sRGB"
-
-#~ msgid "still"
-#~ msgstr "ancora"
-
 #~ msgid "video"
 #~ msgstr "video"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 13989e58e..cf40fbf95 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: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-04-10 15:35+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,16 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/lib/sndfile_content.cc:70
+#: src/lib/sndfile_content.cc:59
+msgid "%1 [audio]"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:170
+msgid "%1 [movie]"
+msgstr ""
+
+#: src/lib/moving_image_content.cc:58
+msgid "%1 [moving images]"
+msgstr ""
+
+#: src/lib/still_image_content.cc:52
+#, fuzzy
+msgid "%1 [still]"
+msgstr "stillbild"
+
+#: src/lib/sndfile_content.cc:80
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:193
+#: src/lib/ffmpeg_content.cc:205
 #, fuzzy
 msgid "%1 frames; %2 frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/video_content.cc:131
+#: src/lib/video_content.cc:134
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -66,12 +83,13 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Reklam"
 
-#: src/lib/job.cc:72
+#: src/lib/job.cc:75
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ett fel inträffade vid hantering av filen %1"
 
-#: src/lib/analyse_audio_job.cc:53
-msgid "Analyse audio of %1"
+#: src/lib/analyse_audio_job.cc:48
+#, fuzzy
+msgid "Analyse audio"
 msgstr "Analysera %1s audio"
 
 #: src/lib/scaler.cc:64
@@ -86,7 +104,7 @@ msgstr "Bikubisk"
 msgid "Bilinear"
 msgstr "Bilinjär"
 
-#: src/lib/job.cc:320
+#: src/lib/job.cc:350
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -94,10 +112,15 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:700
+#: src/lib/util.cc:743
 msgid "Centre"
 msgstr "Mitt"
 
+#: src/lib/util.cc:766
+#, fuzzy
+msgid "Content and DCP have the same rate.\n"
+msgstr "DCP och källa har samma bildfrekvens.\n"
+
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
 msgstr "Kopiera DCP till TMS"
@@ -110,15 +133,29 @@ 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/film.cc:917
+#, fuzzy
+msgid "Could not find DCP to make KDM for"
+msgstr "kunde inte hitta audio-avkodare"
+
+#: src/lib/job.cc:95
+#, fuzzy
+msgid "Could not open %1"
+msgstr "kunde inte öppna fil %1"
+
 #: src/lib/scp_dcp_job.cc:175
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
+#: src/lib/film.cc:927
+msgid "Could not read DCP to make KDM for"
+msgstr ""
+
 #: src/lib/scp_dcp_job.cc:145
 msgid "Could not start SCP session (%1)"
 msgstr "Kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:187
+#: src/lib/scp_dcp_job.cc:189
 msgid "Could not write to remote file (%1)"
 msgstr "Kunde inte skriva till fjärrfil (%1)"
 
@@ -126,18 +163,22 @@ msgstr "Kunde inte skriva till fjärrfil (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Kubiskt interpolerande avflätare"
 
-#: src/lib/util.cc:723
-msgid "DCP and source have the same rate.\n"
-msgstr "DCP och källa har samma bildfrekvens.\n"
-
-#: src/lib/util.cc:733
-msgid "DCP will run at %1%% of the source speed.\n"
+#: src/lib/util.cc:776
+#, fuzzy
+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:726
-msgid "DCP will use every other frame of the source.\n"
+#: src/lib/util.cc:769
+#, fuzzy
+msgid "DCP will use every other frame of the content.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
 
+#: src/lib/job.cc:96
+msgid ""
+"DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
+"an unexpected format."
+msgstr ""
+
 #: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
 #: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
 msgid "De-blocking"
@@ -157,15 +198,16 @@ msgstr "Avringningsfilter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:728
-msgid "Each source frame will be doubled in the DCP.\n"
+#: src/lib/util.cc:771
+#, fuzzy
+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/job.cc:318
+#: src/lib/job.cc:348
 msgid "Error (%1)"
 msgstr "Fel (%1)"
 
-#: src/lib/examine_content_job.cc:45
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Undersök innehållet"
 
@@ -229,11 +271,7 @@ msgstr "Filter för horisontal kantighetsutjämning"
 msgid "Horizontal deblocking filter A"
 msgstr "Filter för horisontal kantighetsutjämning A"
 
-#: src/lib/imagemagick_content.cc:50
-msgid "Image: %1"
-msgstr ""
-
-#: src/lib/job.cc:96 src/lib/job.cc:105
+#: src/lib/job.cc:109 src/lib/job.cc:118
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -249,15 +287,15 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:698
+#: src/lib/util.cc:741
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:702
+#: src/lib/util.cc:745
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:701
+#: src/lib/util.cc:744
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -278,20 +316,20 @@ msgstr "Median-avflätare"
 msgid "Misc"
 msgstr "Diverse"
 
+#: src/lib/film.cc:919
+msgid "More than one possible DCP to make KDM for"
+msgstr ""
+
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
 
-#: src/lib/ffmpeg_content.cc:181
-msgid "Movie: %1"
-msgstr ""
-
 #: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
 #: src/lib/filter.cc:91
 msgid "Noise reduction"
 msgstr "Brusreducering"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:346
 msgid "OK (ran for %1)"
 msgstr "OK (kördes %1)"
 
@@ -311,11 +349,11 @@ msgstr "Offentligt Servicemeddelande"
 msgid "Rating"
 msgstr "Klassificeringsklipp"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:742
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:703
+#: src/lib/util.cc:746
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -335,11 +373,6 @@ msgstr "Kortfilm"
 msgid "Sinc"
 msgstr "Sinc"
 
-#: src/lib/sndfile_content.cc:57
-#, fuzzy
-msgid "Sound file: %1"
-msgstr "kunde inte öppna fil %1"
-
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -360,7 +393,7 @@ msgstr "Temporal brusreducering"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:78
+#: src/lib/job.cc:81
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -368,7 +401,7 @@ msgstr ""
 "Enheten som filmen lagras på har för lite ledigt utrymme. Frigör utrymme och "
 "försök igen."
 
-#: src/lib/film.cc:364
+#: src/lib/film.cc:366
 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 "
@@ -387,12 +420,12 @@ msgstr "Konvertera %1"
 msgid "Transitional"
 msgstr "Övergångsklipp"
 
-#: src/lib/job.cc:104
+#: src/lib/job.cc:117
 msgid "Unknown error"
 msgstr "Okänt fel"
 
 # Svengelska
-#: src/lib/ffmpeg_decoder.cc:264
+#: src/lib/ffmpeg_decoder.cc:276
 #, fuzzy
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Okänt audio-sampelformat (%1)"
@@ -401,6 +434,10 @@ msgstr "Okänt audio-sampelformat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Oskärpemask och Gaussisk suddighet"
 
+#: src/lib/colour_conversion.cc:141
+msgid "Untitled"
+msgstr ""
+
 #: src/lib/filter.cc:69
 msgid "Vertical deblocking filter"
 msgstr "Filter för vertikal kantighetsutjämning"
@@ -422,7 +459,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:273
+#: src/lib/film.cc:271
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
@@ -431,7 +468,7 @@ msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:494
+#: src/lib/util.cc:543
 #, fuzzy
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
@@ -440,12 +477,12 @@ msgstr "uppkopplingen tajmade ur"
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:269
+#: src/lib/film.cc:267
 #, fuzzy
 msgid "container"
 msgstr "innehåll"
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:275
 msgid "content type"
 msgstr "innehållstyp"
 
@@ -465,7 +502,7 @@ msgstr "kunde inte hitta audio-avkodare"
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/ffmpeg_decoder.cc:498
+#: src/lib/ffmpeg_decoder.cc:521
 msgid "could not find subtitle decoder"
 msgstr "kunde inte hitta undertext-avkodare"
 
@@ -482,15 +519,20 @@ msgstr "kunde inte öppna fil för läsning"
 msgid "could not open file %1"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/dcp_video_frame.cc:263
+#: src/lib/dcp_video_frame.cc:336
 msgid "could not open file for reading"
 msgstr "kunde inte öppna fil för läsning"
 
-#: src/lib/exceptions.cc:44
+#: src/lib/dcp_video_frame.cc:342
+#, fuzzy
+msgid "could not read encoded data"
+msgstr "kunde inte hitta audio-avkodare"
+
+#: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
 msgstr "kunde inte läsa från fil %1 (%2)"
 
-#: src/lib/resampler.cc:76 src/lib/resampler.cc:96
+#: src/lib/resampler.cc:80 src/lib/resampler.cc:99
 msgid "could not run sample-rate converter"
 msgstr "kunde inte köra sampelhastighetskonverteraren"
 
@@ -502,31 +544,39 @@ msgstr "kunde inte starta SCP-session (%1)"
 msgid "could not start SSH session"
 msgstr "kunde inte starta SSH-session"
 
-#: src/lib/exceptions.cc:50
+#: src/lib/exceptions.cc:48
 msgid "could not write to file %1 (%2)"
 msgstr "kunde inte skriva till fil %1 (%2)"
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/moving_image_examiner.cc:82
+msgid "first frame in moving image directory is number %1"
+msgstr ""
+
+#: src/lib/transcode_job.cc:95
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/util.cc:146
+#: src/lib/transcode_job.cc:98
+msgid "hashing"
+msgstr ""
+
+#: src/lib/util.cc:145
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:143 src/lib/util.cc:148
+#: src/lib/util.cc:142 src/lib/util.cc:147
 msgid "hours"
 msgstr "timmar"
 
-#: src/lib/util.cc:153
+#: src/lib/util.cc:152
 msgid "minute"
 msgstr "minut"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:154
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:621
+#: src/lib/util.cc:664
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -534,28 +584,48 @@ msgstr "saknad nyckel %1 i nyckel-värde grupp"
 msgid "missing required setting %1"
 msgstr "saknad nödvändig inställning %1"
 
-#: src/lib/ffmpeg_decoder.cc:530
+#: src/lib/ffmpeg_decoder.cc:553
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:232 src/lib/film.cc:281
+#: src/lib/film.cc:232 src/lib/film.cc:279
 msgid "name"
 msgstr "namn"
 
-#: src/lib/ffmpeg_decoder.cc:545
+#: src/lib/ffmpeg_decoder.cc:568
 msgid "non-bitmap subtitles not yet supported"
 msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 
+#: src/lib/moving_image_examiner.cc:78
+msgid "only %1 file(s) found in moving image directory"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:313
+#: src/lib/job.cc:343
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/util.cc:158
+#: src/lib/config.cc:72
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/lib/config.cc:73
+msgid "sRGB non-linearised"
+msgstr ""
+
+#: src/lib/util.cc:157
 msgid "seconds"
 msgstr "sekunder"
 
+#: src/lib/moving_image_examiner.cc:86
+msgid "there are %1 images in the directory but the last one is number %2"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Sound file: %1"
+#~ msgstr "kunde inte öppna fil %1"
+
 #~ msgid "1.66 within Flat"
 #~ msgstr "1,66 innanför Flat"
 
@@ -602,12 +672,6 @@ msgstr "sekunder"
 #~ msgid "no still image files found"
 #~ msgstr "inga stillbildsfiler hittade"
 
-#~ msgid "sRGB"
-#~ msgstr "sRGB"
-
-#~ msgid "still"
-#~ msgstr "stillbild"
-
 #~ msgid "video"
 #~ msgstr "video"
 
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index fb379ab33..870c35ae9 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-03-23 21:08-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,109 +17,129 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dcpomatic.cc:309
+#: src/tools/dcpomatic.cc:357
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:196
+#: src/tools/dcpomatic.cc:223
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:169
+#: src/tools/dcpomatic.cc:195
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:221
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:199
+#: src/tools/dcpomatic.cc:226
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:198
+#: src/tools/dcpomatic.cc:225
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:183
+#: src/tools/dcpomatic.cc:209
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
-#: src/tools/dcpomatic.cc:159
+#: src/tools/dcpomatic.cc:185
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dcpomatic.cc:176 src/tools/dcpomatic.cc:179
+#: src/tools/dcpomatic.cc:202 src/tools/dcpomatic.cc:205
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
-#: src/tools/dcpomatic.cc:163
+#: src/tools/dcpomatic.cc:189
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dcpomatic.cc:171
+#: src/tools/dcpomatic.cc:197
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:161
+#: src/tools/dcpomatic.cc:187
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:211
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:191
+#: src/tools/dcpomatic.cc:218
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:189
+#: src/tools/dcpomatic.cc:216
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:479
+#: src/tools/dcpomatic.cc:690
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dcpomatic.cc:348
+#: src/tools/dcpomatic.cc:396
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "No se pudo cargar la película en %s (%s)"
 
-#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:586
+msgid "Could not show DCP (could not run konqueror)"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:579
+msgid "Could not show DCP (could not run nautilus)"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:328 src/tools/dcpomatic.cc:701
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:77
+#: src/tools/dcpomatic.cc:86
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dcpomatic.cc:158
+#: src/tools/dcpomatic.cc:210
+msgid "Make &KDMs..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:184
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dcpomatic.cc:185
+#: src/tools/dcpomatic.cc:212
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:76
+#: src/tools/dcpomatic.cc:85
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:327
+#: src/tools/dcpomatic.cc:375
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic.cc:299
+#: src/tools/dcpomatic.cc:347
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:332
+#: src/tools/dcpomatic.cc:608
+msgid "There are unfinished jobs; are you sure you want to quit?"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:609
+msgid "Unfinished jobs"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:380
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 71bd1550e..361cdbe9a 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-07-16 23:13+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,109 +16,137 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/tools/dcpomatic.cc:309
+#: src/tools/dcpomatic.cc:357
 msgid "%1 already exists as a file, so you cannot use it for a new film."
-msgstr "Le fichier %1 existe déjà, vous ne pouvez l'utiliser pour un nouveau projet."
+msgstr ""
+"Le fichier %1 existe déjà, vous ne pouvez l'utiliser pour un nouveau projet."
 
-#: src/tools/dcpomatic.cc:196
+#: src/tools/dcpomatic.cc:223
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dcpomatic.cc:169
+#: src/tools/dcpomatic.cc:195
 msgid "&Exit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:221
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dcpomatic.cc:199
+#: src/tools/dcpomatic.cc:226
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dcpomatic.cc:198
+#: src/tools/dcpomatic.cc:225
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dcpomatic.cc:183
+#: src/tools/dcpomatic.cc:209
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
-#: src/tools/dcpomatic.cc:159
+#: src/tools/dcpomatic.cc:185
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dcpomatic.cc:176
-#: src/tools/dcpomatic.cc:179
+#: src/tools/dcpomatic.cc:202 src/tools/dcpomatic.cc:205
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: src/tools/dcpomatic.cc:163
+#: src/tools/dcpomatic.cc:189
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dcpomatic.cc:171
+#: src/tools/dcpomatic.cc:197
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:161
+#: src/tools/dcpomatic.cc:187
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:211
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: src/tools/dcpomatic.cc:191
+#: src/tools/dcpomatic.cc:218
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dcpomatic.cc:189
+#: src/tools/dcpomatic.cc:216
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:479
+#: src/tools/dcpomatic.cc:690
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:348
+#: src/tools/dcpomatic.cc:396
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:280
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:586
+msgid "Could not show DCP (could not run konqueror)"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:579
+msgid "Could not show DCP (could not run nautilus)"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:328 src/tools/dcpomatic.cc:701
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:77
+#: src/tools/dcpomatic.cc:86
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dcpomatic.cc:158
+#: src/tools/dcpomatic.cc:210
+msgid "Make &KDMs..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:184
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dcpomatic.cc:185
+#: src/tools/dcpomatic.cc:212
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dcpomatic.cc:76
+#: src/tools/dcpomatic.cc:85
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:327
+#: src/tools/dcpomatic.cc:375
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic.cc:299
-msgid "The directory %1 already exists and is not empty.  Are you sure you want to use it?"
-msgstr "Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
+#: src/tools/dcpomatic.cc:347
+msgid ""
+"The directory %1 already exists and is not empty.  Are you sure you want to "
+"use it?"
+msgstr ""
+"Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
 
-#: src/tools/dcpomatic.cc:332
-msgid "You did not select a folder.  Make sure that you select a folder before clicking Open."
-msgstr "Aucun dossier sélectionné. Selectionnez un dossier avant de cliquer sur Ouvrir"
+#: src/tools/dcpomatic.cc:608
+#, fuzzy
+msgid "There are unfinished jobs; are you sure you want to quit?"
+msgstr ""
+"Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
+
+#: src/tools/dcpomatic.cc:609
+msgid "Unfinished jobs"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:380
+msgid ""
+"You did not select a folder.  Make sure that you select a folder before "
+"clicking Open."
+msgstr ""
+"Aucun dossier sélectionné. Selectionnez un dossier avant de cliquer sur "
+"Ouvrir"
 
 #~ msgid "&Analyse audio"
 #~ msgstr "&Analyser le son"
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index f32ce97db..9e3db2cb4 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-04-28 10:31+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,109 +17,129 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dcpomatic.cc:309
+#: src/tools/dcpomatic.cc:357
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:196
+#: src/tools/dcpomatic.cc:223
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:169
+#: src/tools/dcpomatic.cc:195
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:221
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:199
+#: src/tools/dcpomatic.cc:226
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dcpomatic.cc:198
+#: src/tools/dcpomatic.cc:225
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dcpomatic.cc:183
+#: src/tools/dcpomatic.cc:209
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
-#: src/tools/dcpomatic.cc:159
+#: src/tools/dcpomatic.cc:185
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dcpomatic.cc:176 src/tools/dcpomatic.cc:179
+#: src/tools/dcpomatic.cc:202 src/tools/dcpomatic.cc:205
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: src/tools/dcpomatic.cc:163
+#: src/tools/dcpomatic.cc:189
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dcpomatic.cc:171
+#: src/tools/dcpomatic.cc:197
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:161
+#: src/tools/dcpomatic.cc:187
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:211
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:191
+#: src/tools/dcpomatic.cc:218
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:189
+#: src/tools/dcpomatic.cc:216
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:479
+#: src/tools/dcpomatic.cc:690
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dcpomatic.cc:348
+#: src/tools/dcpomatic.cc:396
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:586
+msgid "Could not show DCP (could not run konqueror)"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:579
+msgid "Could not show DCP (could not run nautilus)"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:328 src/tools/dcpomatic.cc:701
 #, fuzzy
 msgid "DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:77
+#: src/tools/dcpomatic.cc:86
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dcpomatic.cc:158
+#: src/tools/dcpomatic.cc:210
+msgid "Make &KDMs..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:184
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dcpomatic.cc:185
+#: src/tools/dcpomatic.cc:212
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dcpomatic.cc:76
+#: src/tools/dcpomatic.cc:85
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:327
+#: src/tools/dcpomatic.cc:375
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dcpomatic.cc:299
+#: src/tools/dcpomatic.cc:347
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:332
+#: src/tools/dcpomatic.cc:608
+msgid "There are unfinished jobs; are you sure you want to quit?"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:609
+msgid "Unfinished jobs"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:380
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index a7a5f82e5..96c9dff8d 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-04-09 10:12+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,108 +17,128 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dcpomatic.cc:309
+#: src/tools/dcpomatic.cc:357
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:196
+#: src/tools/dcpomatic.cc:223
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dcpomatic.cc:169
+#: src/tools/dcpomatic.cc:195
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:221
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:199
+#: src/tools/dcpomatic.cc:226
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dcpomatic.cc:198
+#: src/tools/dcpomatic.cc:225
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dcpomatic.cc:183
+#: src/tools/dcpomatic.cc:209
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
-#: src/tools/dcpomatic.cc:159
+#: src/tools/dcpomatic.cc:185
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dcpomatic.cc:176 src/tools/dcpomatic.cc:179
+#: src/tools/dcpomatic.cc:202 src/tools/dcpomatic.cc:205
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
-#: src/tools/dcpomatic.cc:163
+#: src/tools/dcpomatic.cc:189
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dcpomatic.cc:171
+#: src/tools/dcpomatic.cc:197
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:161
+#: src/tools/dcpomatic.cc:187
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:211
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dcpomatic.cc:191
+#: src/tools/dcpomatic.cc:218
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:189
+#: src/tools/dcpomatic.cc:216
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:479
+#: src/tools/dcpomatic.cc:690
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:348
+#: src/tools/dcpomatic.cc:396
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:586
+msgid "Could not show DCP (could not run konqueror)"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:579
+msgid "Could not show DCP (could not run nautilus)"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:328 src/tools/dcpomatic.cc:701
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:77
+#: src/tools/dcpomatic.cc:86
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dcpomatic.cc:158
+#: src/tools/dcpomatic.cc:210
+msgid "Make &KDMs..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:184
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dcpomatic.cc:185
+#: src/tools/dcpomatic.cc:212
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dcpomatic.cc:76
+#: src/tools/dcpomatic.cc:85
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:327
+#: src/tools/dcpomatic.cc:375
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dcpomatic.cc:299
+#: src/tools/dcpomatic.cc:347
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:332
+#: src/tools/dcpomatic.cc:608
+msgid "There are unfinished jobs; are you sure you want to quit?"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:609
+msgid "Unfinished jobs"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:380
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 08a1fde08..3225f98e6 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-04-02 19:08-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/wx/film_editor.cc:426 src/wx/film_editor.cc:435
+#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
 msgid "%"
 msgstr "%"
 
@@ -26,54 +26,91 @@ msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:96
+#: src/wx/config_dialog.cc:106
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr ""
 
-#: src/wx/film_editor.cc:1423
+#: src/wx/colour_conversion_editor.cc:83
+msgid "1 / "
+msgstr ""
+
+#: src/wx/audio_panel.cc:269
 msgid "1 channel"
 msgstr "1 canal"
 
+#: src/wx/video_panel.cc:132
+msgid "2D"
+msgstr ""
+
+#: src/wx/film_editor.cc:212
+msgid "2K"
+msgstr ""
+
+#: src/wx/film_editor.cc:160
+msgid "3D"
+msgstr ""
+
+#: src/wx/video_panel.cc:133
+msgid "3D left/right"
+msgstr ""
+
+#: src/wx/film_editor.cc:213
+msgid "4K"
+msgstr ""
+
 #: src/wx/about_dialog.cc:30
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:299
-msgid "Add"
-msgstr "Añadir"
+#: src/wx/kdm_dialog.cc:63
+msgid "Add Cinema..."
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:70
+msgid "Add Screen..."
+msgstr ""
+
+#: src/wx/film_editor.cc:263
+msgid "Add file(s)..."
+msgstr ""
 
-#: src/wx/film_editor.cc:317
-msgid "Add..."
+#: src/wx/film_editor.cc:265
+msgid "Add folder..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:343
+#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:379
+#: src/wx/audio_panel.cc:63
 msgid "Audio Delay"
 msgstr "Retardo del audio"
 
-#: src/wx/film_editor.cc:367
+#: src/wx/audio_panel.cc:51
 msgid "Audio Gain"
 msgstr "Ganancia del audio"
 
-#: src/wx/dci_metadata_dialog.cc:33
+#: src/wx/dci_metadata_dialog.cc:39
 msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
-#: src/wx/film_editor.cc:391
+#: src/wx/audio_panel.cc:75
 #, fuzzy
 msgid "Audio Stream"
 msgstr "Retardo del audio"
 
+#: src/wx/film_editor.cc:155
+#, fuzzy
+msgid "Audio channels"
+msgstr "canales"
+
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Configuración erronea para %s (%s)"
 
-#: src/wx/film_editor.cc:264
+#: src/wx/video_panel.cc:70
 msgid "Bottom crop"
 msgstr "Recortar abajo"
 
@@ -85,45 +122,78 @@ msgstr "Explorar..."
 msgid "But I have to use fader"
 msgstr "pero tengo que usar el fader a"
 
-#: src/wx/audio_mapping_view.cc:192
+#: src/wx/audio_mapping_view.cc:191
 msgid "C"
 msgstr ""
 
-#: src/wx/film_editor.cc:376
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Calcular..."
 
-#: src/wx/job_manager_view.cc:98
+#: src/wx/job_manager_view.cc:63
 msgid "Cancel"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:43
+#: src/wx/audio_dialog.cc:44
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/film_editor.cc:1163
+#: src/wx/film_editor.cc:714
 msgid "Choose a file or files"
 msgstr ""
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:747
+#, fuzzy
+msgid "Choose a folder"
+msgstr "Crear en carpeta"
+
+#: src/wx/content_colour_conversion_dialog.cc:33
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:97
+msgid "Colour conversion"
+msgstr ""
+
+#: src/wx/config_dialog.cc:64
+msgid "Colour conversions"
+msgstr ""
+
+#: src/wx/film_editor.cc:130
 #, fuzzy
 msgid "Container"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:82
+#: src/wx/film_editor.cc:83
 msgid "Content"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:135
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: src/wx/audio_mapping_view.cc:181
+#: src/wx/audio_mapping_view.cc:180
 #, fuzzy
 msgid "Content channel"
 msgstr "1 canal"
 
-#: src/wx/film_viewer.cc:326
+#: src/wx/video_panel.cc:337
+#, c-format
+msgid "Content frame rate %.4f\n"
+msgstr ""
+
+#: src/wx/dci_metadata_dialog.cc:35
+#, fuzzy
+msgid "Content version"
+msgstr "Tipo de contenido"
+
+#: src/wx/video_panel.cc:295
+#, c-format
+msgid "Content video is %dx%d (%.2f:1)\n"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:132
+msgid "Could not analyse audio."
+msgstr ""
+
+#: src/wx/film_viewer.cc:347
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
@@ -137,79 +207,74 @@ msgstr "No se pudo crear el DCP: %s"
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:285
 #, fuzzy
 msgid "Creator"
 msgstr "Crear en carpeta"
 
-#: src/wx/film_editor.cc:1322
+#: src/wx/video_panel.cc:308
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:28
+#: src/wx/video_panel.cc:246
+msgid "Custom"
+msgstr ""
+
+#: src/wx/dci_metadata_dialog.cc:30
 msgid "DCI name"
 msgstr "Nombre DCI"
 
-#: src/wx/film_editor.cc:84
+#: src/wx/film_editor.cc:85
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:142
-msgid "DCP Frame Rate"
-msgstr "Velocidad DCP"
-
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:114
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
-#: src/wx/film_editor.cc:152
-#, fuzzy
-msgid "DCP audio channels"
-msgstr "canales"
-
 #: src/wx/about_dialog.cc:44 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:46
+#: src/wx/config_dialog.cc:53
 msgid "DCP-o-matic Preferences"
 msgstr "Preferencias DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:97
+#: src/wx/audio_dialog.cc:98
 #, fuzzy, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %1"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:142
 msgid "Default DCI name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:138
+#: src/wx/config_dialog.cc:155
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/config_dialog.cc:128
+#: src/wx/config_dialog.cc:146
 #, fuzzy
 msgid "Default container"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:150
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:134
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:126
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:110
+#: src/wx/film_editor.cc:126 src/wx/job_manager_view.cc:75
 msgid "Details..."
 msgstr "Detalles..."
 
@@ -217,24 +282,27 @@ msgstr "Detalles..."
 msgid "Disk space required"
 msgstr "Espacio requerido en disco"
 
-#: src/wx/imagemagick_content_dialog.cc:36
-msgid "Duration"
-msgstr "Duración"
+#: src/wx/kdm_dialog.cc:65
+#, fuzzy
+msgid "Edit Cinema..."
+msgstr "Editar..."
 
-#: src/wx/config_dialog.cc:301
-msgid "Edit"
-msgstr "Editar"
+#: src/wx/kdm_dialog.cc:72
+#, fuzzy
+msgid "Edit Screen..."
+msgstr "Editar..."
 
-#: src/wx/config_dialog.cc:124 src/wx/film_editor.cc:288
+#: src/wx/config_dialog.cc:143 src/wx/video_panel.cc:90
+#: src/wx/video_panel.cc:107
 msgid "Edit..."
 msgstr "Editar..."
 
-#: src/wx/config_dialog.cc:55
+#: src/wx/config_dialog.cc:62
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Servidores de codificación"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
 msgstr "Compañía (ej. DLA)"
 
@@ -246,10 +314,15 @@ msgstr "Propiedades de la película"
 msgid "Film name"
 msgstr "Nombre de la película"
 
-#: src/wx/film_editor.cc:284 src/wx/filter_dialog.cc:32
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:81
 msgid "Filters"
 msgstr "Filtros"
 
+#: src/wx/film_editor.cc:141
+#, fuzzy
+msgid "Frame Rate"
+msgstr "Velocidad DCP"
+
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
 msgstr "Fotogramas"
@@ -262,6 +335,14 @@ msgstr "Fotogramas ya codificados"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 
+#: src/wx/kdm_dialog.cc:82
+msgid "From"
+msgstr ""
+
+#: src/wx/config_dialog.cc:121
+msgid "From address for KDM emails"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calculadora de ganancia"
@@ -270,11 +351,11 @@ msgstr "Calculadora de ganancia"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/server_dialog.cc:36
+#: src/wx/server_dialog.cc:40
 msgid "Host name or IP address"
 msgstr "Nombre o dirección IP"
 
-#: src/wx/film_editor.cc:1427
+#: src/wx/audio_panel.cc:273
 msgid "Hz"
 msgstr "Hz"
 
@@ -282,56 +363,76 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:217 src/wx/config_dialog.cc:288
+#: src/wx/config_dialog.cc:242 src/wx/config_dialog.cc:314
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/imagemagick_content_dialog.cc:29
-msgid "Image"
+#: src/wx/colour_conversion_editor.cc:44
+msgid "Input gamma"
+msgstr ""
+
+#: src/wx/film_editor.cc:216
+msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:256
+#: src/wx/config_dialog.cc:281
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:158
+#: src/wx/film_editor.cc:170
 msgid "JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/audio_mapping_view.cc:184
+#: src/wx/config_dialog.cc:70
+msgid "KDM email"
+msgstr ""
+
+#: src/wx/film_editor.cc:277
+msgid "Keep video in sequence"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:183
 msgid "L"
 msgstr ""
 
-#: src/wx/film_editor.cc:249
+#: src/wx/video_panel.cc:55
 msgid "Left crop"
 msgstr "Recorte izquierda"
 
-#: src/wx/film_editor.cc:460
+#: src/wx/timing_panel.cc:40
 msgid "Length"
 msgstr "Longitud"
 
-#: src/wx/audio_mapping_view.cc:196
+#: src/wx/audio_mapping_view.cc:195
 msgid "Lfe"
 msgstr ""
 
-#: src/wx/film_editor.cc:330
-msgid "Loop everything"
+#: src/wx/colour_conversion_editor.cc:49
+msgid "Linearise input gamma curve for low values"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:200
+#: src/wx/audio_mapping_view.cc:199
 #, fuzzy
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:141 src/wx/film_editor.cc:162
+#: src/wx/config_dialog.cc:159 src/wx/film_editor.cc:174
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/config_dialog.cc:57
+#: src/wx/kdm_dialog.cc:44
+msgid "Make KDMs"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "Matrix"
+msgstr ""
+
+#: src/wx/config_dialog.cc:66
 msgid "Metadata"
 msgstr ""
 
-#: src/wx/config_dialog.cc:53
+#: src/wx/config_dialog.cc:60
 msgid "Miscellaneous"
 msgstr ""
 
@@ -339,7 +440,8 @@ msgstr ""
 msgid "My Documents"
 msgstr "Mis documentos"
 
-#: src/wx/film_editor.cc:110
+#: src/wx/config_dialog.cc:461 src/wx/film_editor.cc:109
+#: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nombre"
 
@@ -347,34 +449,38 @@ msgstr "Nombre"
 msgid "New Film"
 msgstr "Nueva película"
 
-#: src/wx/film_editor.cc:286 src/wx/film_editor.cc:769
+#: src/wx/video_panel.cc:88 src/wx/video_panel.cc:251
 msgid "None"
 msgstr "Ninguno"
 
-#: src/wx/film_editor.cc:1309
-#, c-format
-msgid "Original video is %dx%d (%.2f:1)\n"
+#: src/wx/config_dialog.cc:117
+#, fuzzy
+msgid "Outgoing mail server"
+msgstr "Servidores de codificación"
+
+#: src/wx/colour_conversion_editor.cc:78
+msgid "Output gamma"
 msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:57
+#: src/wx/dci_metadata_dialog.cc:63
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/film_editor.cc:1343
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr ""
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:254
 #, fuzzy
 msgid "Password"
 msgstr "Clave del TMS"
 
-#: src/wx/job_manager_view.cc:104 src/wx/job_manager_view.cc:206
+#: src/wx/job_manager_view.cc:69 src/wx/job_manager_view.cc:141
 msgid "Pause"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:59
+#: src/wx/audio_dialog.cc:60
 msgid "Peak"
 msgstr "Pico"
 
@@ -382,134 +488,177 @@ msgstr "Pico"
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/wx/audio_plot.cc:110
+#: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
 
-#: src/wx/audio_mapping_view.cc:188
+#: src/wx/timing_panel.cc:37
+msgid "Position"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:187
 msgid "R"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:61
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:45
+#: src/wx/dci_metadata_dialog.cc:51
 msgid "Rating (e.g. 15)"
 msgstr "Clasificación (ej. 16)"
 
-#: src/wx/config_dialog.cc:303 src/wx/film_editor.cc:319
+#: src/wx/content_menu.cc:41 src/wx/film_editor.cc:267
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/wx/job_manager_view.cc:209
+#: src/wx/kdm_dialog.cc:67
+#, fuzzy
+msgid "Remove Cinema"
+msgstr "Quitar"
+
+#: src/wx/kdm_dialog.cc:74
+#, fuzzy
+msgid "Remove Screen"
+msgstr "Quitar"
+
+#: src/wx/repeat_dialog.cc:33
+msgid "Repeat"
+msgstr ""
+
+#: src/wx/repeat_dialog.cc:24
+#, fuzzy
+msgid "Repeat Content"
+msgstr "Seleccionar fichero de contenido"
+
+#: src/wx/content_menu.cc:39
+msgid "Repeat..."
+msgstr ""
+
+#: src/wx/film_editor.cc:164
+msgid "Resolution"
+msgstr ""
+
+#: src/wx/job_manager_view.cc:144
 msgid "Resume"
 msgstr ""
 
-#: src/wx/film_editor.cc:254
+#: src/wx/video_panel.cc:60
 msgid "Right crop"
 msgstr "Recorte derecha"
 
-#: src/wx/audio_mapping_view.cc:204
+#: src/wx/audio_mapping_view.cc:203
 #, fuzzy
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/job_manager_view.cc:128
-msgid "Running"
-msgstr "Ejecutando"
+#: src/wx/film_editor.cc:215
+msgid "SMPTE"
+msgstr ""
 
-#: src/wx/film_editor.cc:269
+#: src/wx/video_panel.cc:75
 #, fuzzy
 msgid "Scale to"
 msgstr "Escalador"
 
-#: src/wx/film_editor.cc:1335
+#: src/wx/video_panel.cc:321
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr ""
 
-#: src/wx/film_editor.cc:167
+#: src/wx/film_editor.cc:184
 msgid "Scaler"
 msgstr "Escalador"
 
-#: src/wx/server_dialog.cc:25
+#: src/wx/screen_dialog.cc:86
+#, fuzzy
+msgid "Select Certificate File"
+msgstr "Seleccionar fichero de contenido"
+
+#: src/wx/kdm_dialog.cc:108
+msgid "Send by email"
+msgstr ""
+
+#: src/wx/server_dialog.cc:27
 msgid "Server"
 msgstr "Servidor"
 
-#: src/wx/config_dialog.cc:85
+#: src/wx/timecode.cc:65
+msgid "Set"
+msgstr ""
+
+#: src/wx/config_dialog.cc:96
 msgid "Set language"
 msgstr ""
 
-#: src/wx/film_editor.cc:362
+#: src/wx/audio_panel.cc:46
 msgid "Show Audio..."
 msgstr "Mostrar audio..."
 
-#: src/wx/audio_dialog.cc:70
+#: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
 msgstr "Suavizado"
 
-#: src/wx/film_editor.cc:457
-#, fuzzy
-msgid "Start time"
-msgstr "Inicio"
+#: src/wx/film_editor.cc:179
+msgid "Standard"
+msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:49
+#: src/wx/dci_metadata_dialog.cc:55
 msgid "Studio (e.g. TCF)"
 msgstr "Estudio (ej. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:37
+#: src/wx/dci_metadata_dialog.cc:43
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Idioma del subtítulo (ej. EN)"
 
-#: src/wx/film_editor.cc:422
+#: src/wx/subtitle_panel.cc:44
 msgid "Subtitle Offset"
 msgstr "Desplazamiento del subtítulo"
 
-#: src/wx/film_editor.cc:431
+#: src/wx/subtitle_panel.cc:53
 msgid "Subtitle Scale"
 msgstr "Escala del subtítulo"
 
-#: src/wx/film_editor.cc:439
+#: src/wx/subtitle_panel.cc:61
 #, fuzzy
 msgid "Subtitle Stream"
 msgstr "Escala del subtítulo"
 
-#: src/wx/film_editor.cc:345
+#: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:120
+#: src/wx/about_dialog.cc:124
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:59
+#: src/wx/config_dialog.cc:68
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:221
+#: src/wx/config_dialog.cc:246
 #, fuzzy
 msgid "Target path"
 msgstr "Ruta en el TMS"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:315
 msgid "Threads"
 msgstr "Hilos"
 
-#: src/wx/server_dialog.cc:40
+#: src/wx/server_dialog.cc:44
 msgid "Threads to use"
 msgstr "Hilos a utilizar"
 
-#: src/wx/config_dialog.cc:104
+#: src/wx/config_dialog.cc:113
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
-#: src/wx/audio_plot.cc:140
+#: src/wx/audio_plot.cc:148
 msgid "Time"
 msgstr "Tiempo"
 
@@ -518,15 +667,15 @@ msgstr "Tiempo"
 msgid "Timeline"
 msgstr "Tiempo"
 
-#: src/wx/film_editor.cc:321
+#: src/wx/film_editor.cc:269
 msgid "Timeline..."
 msgstr ""
 
-#: src/wx/film_editor.cc:347
+#: src/wx/timing_panel.cc:32
 msgid "Timing"
 msgstr ""
 
-#: src/wx/film_editor.cc:259
+#: src/wx/video_panel.cc:65
 msgid "Top crop"
 msgstr "Recortar arriba"
 
@@ -534,41 +683,64 @@ msgstr "Recortar arriba"
 msgid "Translated by"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:54
+#: src/wx/timing_panel.cc:46
+#, fuzzy
+msgid "Trim from end"
+msgstr "Recortar fotogramas"
+
+#: src/wx/timing_panel.cc:43
+#, fuzzy
+msgid "Trim from start"
+msgstr "Recortar fotogramas"
+
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:50
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/film_editor.cc:125
+#: src/wx/kdm_dialog.cc:88
+msgid "Until"
+msgstr ""
+
+#: src/wx/film_editor.cc:124
 msgid "Use DCI name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/film_editor.cc:145
 msgid "Use best"
 msgstr "Usar la mejor"
 
-#: src/wx/config_dialog.cc:225
+#: src/wx/content_colour_conversion_dialog.cc:41
+#, fuzzy
+msgid "Use preset"
+msgstr "Usar la mejor"
+
+#: src/wx/config_dialog.cc:250
 #, fuzzy
 msgid "User name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/film_editor.cc:341
+#: src/wx/video_panel.cc:43
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/wx/film_editor.cc:417
+#: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Con subtítulos"
 
+#: src/wx/kdm_dialog.cc:94
+msgid "Write to"
+msgstr ""
+
 #: src/wx/about_dialog.cc:90
 msgid "Written by"
 msgstr ""
 
-#: src/wx/timeline.cc:200
+#: src/wx/timeline.cc:209
 #, fuzzy
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:1425
+#: src/wx/audio_panel.cc:271
 msgid "channels"
 msgstr "canales"
 
@@ -576,29 +748,48 @@ msgstr "canales"
 msgid "counting..."
 msgstr "contando..."
 
-#: src/wx/film_editor.cc:372
+#: src/wx/audio_panel.cc:56
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:385
+#: src/wx/audio_panel.cc:69
 msgid "ms"
 msgstr "ms"
 
-#. / TRANSLATORS: this is an abbreviation for seconds, the unit of time
-#: src/wx/config_dialog.cc:112 src/wx/imagemagick_content_dialog.cc:41
+#: src/wx/config_dialog.cc:130
 msgid "s"
 msgstr "s"
 
-#: src/wx/film_editor.cc:334
+#: src/wx/timeline.cc:232
+msgid "still"
+msgstr ""
+
+#: src/wx/repeat_dialog.cc:37
 msgid "times"
 msgstr ""
 
-#: src/wx/timeline.cc:220
+#: src/wx/timeline.cc:230
 #, fuzzy
 msgid "video"
 msgstr "Vídeo"
 
+#~ msgid "Add"
+#~ msgstr "Añadir"
+
+#~ msgid "Duration"
+#~ msgstr "Duración"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Running"
+#~ msgstr "Ejecutando"
+
+#, fuzzy
+#~ msgid "Start time"
+#~ msgstr "Inicio"
+
 #~ msgid "A/B"
 #~ msgstr "A/B"
 
@@ -638,12 +829,6 @@ msgstr "Vídeo"
 #~ msgid "Select Audio File"
 #~ msgstr "Seleccionar fichero de audio"
 
-#~ msgid "Select Content File"
-#~ msgstr "Seleccionar fichero de contenido"
-
-#~ msgid "Trim frames"
-#~ msgstr "Recortar fotogramas"
-
 #, fuzzy
 #~ msgid "Trim method"
 #~ msgstr "Recortar fotogramas"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 1c0a02d4f..ad77c7cd7 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/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: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-07-16 23:21+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,62 +16,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/wx/film_editor.cc:426
-#: src/wx/film_editor.cc:435
+#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
 msgid "%"
 msgstr "%"
 
 #: src/wx/about_dialog.cc:77
-msgid "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-msgstr "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgid ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:96
+#: src/wx/config_dialog.cc:106
 msgid "(restart DCP-o-matic to see language changes)"
-msgstr "(redémarrez DCP-o-matic pour que les changements de langue prennent effet)"
+msgstr ""
+"(redémarrez DCP-o-matic pour que les changements de langue prennent effet)"
 
-#: src/wx/film_editor.cc:1423
+#: src/wx/colour_conversion_editor.cc:83
+msgid "1 / "
+msgstr ""
+
+#: src/wx/audio_panel.cc:269
 msgid "1 channel"
 msgstr "1 canal"
 
+#: src/wx/video_panel.cc:132
+msgid "2D"
+msgstr ""
+
+#: src/wx/film_editor.cc:212
+msgid "2K"
+msgstr ""
+
+#: src/wx/film_editor.cc:160
+msgid "3D"
+msgstr ""
+
+#: src/wx/video_panel.cc:133
+msgid "3D left/right"
+msgstr ""
+
+#: src/wx/film_editor.cc:213
+msgid "4K"
+msgstr ""
+
 #: src/wx/about_dialog.cc:30
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
-#: src/wx/config_dialog.cc:299
-msgid "Add"
-msgstr "Ajouter"
+#: src/wx/kdm_dialog.cc:63
+msgid "Add Cinema..."
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:70
+msgid "Add Screen..."
+msgstr ""
 
-#: src/wx/film_editor.cc:317
-msgid "Add..."
-msgstr "Ajouter..."
+#: src/wx/film_editor.cc:263
+msgid "Add file(s)..."
+msgstr ""
+
+#: src/wx/film_editor.cc:265
+msgid "Add folder..."
+msgstr ""
 
-#: src/wx/audio_dialog.cc:32
-#: src/wx/film_editor.cc:343
+#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:379
+#: src/wx/audio_panel.cc:63
 msgid "Audio Delay"
 msgstr "Délai audio"
 
-#: src/wx/film_editor.cc:367
+#: src/wx/audio_panel.cc:51
 msgid "Audio Gain"
 msgstr "Gain audio"
 
-#: src/wx/dci_metadata_dialog.cc:33
+#: src/wx/dci_metadata_dialog.cc:39
 msgid "Audio Language (e.g. EN)"
 msgstr "Langue audio (ex. FR)"
 
-#: src/wx/film_editor.cc:391
+#: src/wx/audio_panel.cc:75
 msgid "Audio Stream"
 msgstr "Flux audio"
 
+#: src/wx/film_editor.cc:155
+#, fuzzy
+msgid "Audio channels"
+msgstr "canaux audios du DCP"
+
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Mauvais paramètre pour %s (%s)"
 
-#: src/wx/film_editor.cc:264
+#: src/wx/video_panel.cc:70
 msgid "Bottom crop"
 msgstr "Découpe bas"
 
@@ -83,43 +121,76 @@ msgstr "Parcourir..."
 msgid "But I have to use fader"
 msgstr "Je souhaite utiliser ce volume"
 
-#: src/wx/audio_mapping_view.cc:192
+#: src/wx/audio_mapping_view.cc:191
 msgid "C"
 msgstr "C"
 
-#: src/wx/film_editor.cc:376
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Calcul..."
 
-#: src/wx/job_manager_view.cc:98
+#: src/wx/job_manager_view.cc:63
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/wx/audio_dialog.cc:43
+#: src/wx/audio_dialog.cc:44
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/film_editor.cc:1163
+#: src/wx/film_editor.cc:714
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:747
+#, fuzzy
+msgid "Choose a folder"
+msgstr "Choisissez un ou plusieurs fichiers"
+
+#: src/wx/content_colour_conversion_dialog.cc:33
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:97
+msgid "Colour conversion"
+msgstr ""
+
+#: src/wx/config_dialog.cc:64
+msgid "Colour conversions"
+msgstr ""
+
+#: src/wx/film_editor.cc:130
 msgid "Container"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:82
+#: src/wx/film_editor.cc:83
 msgid "Content"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:135
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#: src/wx/audio_mapping_view.cc:181
+#: src/wx/audio_mapping_view.cc:180
 msgid "Content channel"
 msgstr "Contenu audio"
 
-#: src/wx/film_viewer.cc:326
+#: src/wx/video_panel.cc:337
+#, c-format
+msgid "Content frame rate %.4f\n"
+msgstr ""
+
+#: src/wx/dci_metadata_dialog.cc:35
+#, fuzzy
+msgid "Content version"
+msgstr "Type de Contenu"
+
+#: src/wx/video_panel.cc:295
+#, fuzzy, c-format
+msgid "Content video is %dx%d (%.2f:1)\n"
+msgstr "La vidéo originale est %dx%d (%.2f:1)\n"
+
+#: src/wx/audio_dialog.cc:132
+msgid "Could not analyse audio."
+msgstr ""
+
+#: src/wx/film_viewer.cc:347
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
@@ -133,76 +204,69 @@ msgstr "Impossible de créer le DCP : %s"
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:285
 msgid "Creator"
 msgstr "Créateur"
 
-#: src/wx/film_editor.cc:1322
+#: src/wx/video_panel.cc:308
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Découpe de %dx%d (%.2f:1)\n"
 
-#: src/wx/dci_metadata_dialog.cc:28
+#: src/wx/video_panel.cc:246
+msgid "Custom"
+msgstr ""
+
+#: src/wx/dci_metadata_dialog.cc:30
 msgid "DCI name"
 msgstr "Nom DCI"
 
-#: src/wx/film_editor.cc:84
+#: src/wx/film_editor.cc:85
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:142
-msgid "DCP Frame Rate"
-msgstr "Cadence image du DCP"
-
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:114
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
-#: src/wx/film_editor.cc:152
-msgid "DCP audio channels"
-msgstr "canaux audios du DCP"
-
-#: src/wx/about_dialog.cc:44
-#: src/wx/wx_util.cc:87
-#: src/wx/wx_util.cc:95
+#: src/wx/about_dialog.cc:44 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:46
+#: src/wx/config_dialog.cc:53
 msgid "DCP-o-matic Preferences"
 msgstr "Préférences DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:97
+#: src/wx/audio_dialog.cc:98
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:142
 msgid "Default DCI name details"
 msgstr "Détails du nom DCI par défaut"
 
-#: src/wx/config_dialog.cc:138
+#: src/wx/config_dialog.cc:155
 msgid "Default JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 par défaut"
 
-#: src/wx/config_dialog.cc:128
+#: src/wx/config_dialog.cc:146
 msgid "Default container"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:150
 msgid "Default content type"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:134
 msgid "Default directory for new films"
 msgstr "Dossier par défaut des nouveaux films"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:126
 msgid "Default duration of still images"
 msgstr "Durée par défaut des images fixes"
 
-#: src/wx/film_editor.cc:127
-#: src/wx/job_manager_view.cc:110
+#: src/wx/film_editor.cc:126 src/wx/job_manager_view.cc:75
 msgid "Details..."
 msgstr "Détails..."
 
@@ -210,24 +274,26 @@ msgstr "Détails..."
 msgid "Disk space required"
 msgstr "Espace disque requis"
 
-#: src/wx/imagemagick_content_dialog.cc:36
-msgid "Duration"
-msgstr "Durée"
+#: src/wx/kdm_dialog.cc:65
+#, fuzzy
+msgid "Edit Cinema..."
+msgstr "Éditer..."
 
-#: src/wx/config_dialog.cc:301
-msgid "Edit"
-msgstr "Édition"
+#: src/wx/kdm_dialog.cc:72
+#, fuzzy
+msgid "Edit Screen..."
+msgstr "Éditer..."
 
-#: src/wx/config_dialog.cc:124
-#: src/wx/film_editor.cc:288
+#: src/wx/config_dialog.cc:143 src/wx/video_panel.cc:90
+#: src/wx/video_panel.cc:107
 msgid "Edit..."
 msgstr "Éditer..."
 
-#: src/wx/config_dialog.cc:55
+#: src/wx/config_dialog.cc:62
 msgid "Encoding servers"
 msgstr "Serveurs d'encodage"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
 msgstr "Laboratoire (ex. DLA)"
 
@@ -239,11 +305,15 @@ msgstr "Propriétés du film"
 msgid "Film name"
 msgstr "Nom du Film"
 
-#: src/wx/film_editor.cc:284
-#: src/wx/filter_dialog.cc:32
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:81
 msgid "Filters"
 msgstr "Filtres"
 
+#: src/wx/film_editor.cc:141
+#, fuzzy
+msgid "Frame Rate"
+msgstr "Cadence image du DCP"
+
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
 msgstr "Images"
@@ -256,6 +326,14 @@ msgstr "Images déjà encodées"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Création de DCP libre et gratuit depuis presque tout."
 
+#: src/wx/kdm_dialog.cc:82
+msgid "From"
+msgstr ""
+
+#: src/wx/config_dialog.cc:121
+msgid "From address for KDM emails"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calculateur de gain"
@@ -264,11 +342,11 @@ msgstr "Calculateur de gain"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/server_dialog.cc:36
+#: src/wx/server_dialog.cc:40
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
-#: src/wx/film_editor.cc:1427
+#: src/wx/audio_panel.cc:273
 msgid "Hz"
 msgstr "Hz"
 
@@ -276,57 +354,75 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Je veux le jouer à ce volume"
 
-#: src/wx/config_dialog.cc:217
-#: src/wx/config_dialog.cc:288
+#: src/wx/config_dialog.cc:242 src/wx/config_dialog.cc:314
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/imagemagick_content_dialog.cc:29
-msgid "Image"
-msgstr "Image"
+#: src/wx/colour_conversion_editor.cc:44
+msgid "Input gamma"
+msgstr ""
+
+#: src/wx/film_editor.cc:216
+msgid "Interop"
+msgstr ""
 
-#: src/wx/config_dialog.cc:256
+#: src/wx/config_dialog.cc:281
 msgid "Issuer"
 msgstr "Emetteur"
 
-#: src/wx/film_editor.cc:158
+#: src/wx/film_editor.cc:170
 msgid "JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000"
 
-#: src/wx/audio_mapping_view.cc:184
+#: src/wx/config_dialog.cc:70
+msgid "KDM email"
+msgstr ""
+
+#: src/wx/film_editor.cc:277
+msgid "Keep video in sequence"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:183
 msgid "L"
 msgstr "L"
 
-#: src/wx/film_editor.cc:249
+#: src/wx/video_panel.cc:55
 msgid "Left crop"
 msgstr "Découpe gauche"
 
-#: src/wx/film_editor.cc:460
+#: src/wx/timing_panel.cc:40
 msgid "Length"
 msgstr "Longueur / durée"
 
-#: src/wx/audio_mapping_view.cc:196
+#: src/wx/audio_mapping_view.cc:195
 msgid "Lfe"
 msgstr "Lfe"
 
-#: src/wx/film_editor.cc:330
-msgid "Loop everything"
-msgstr "Tout mettre en boucle"
+#: src/wx/colour_conversion_editor.cc:49
+msgid "Linearise input gamma curve for low values"
+msgstr ""
 
-#: src/wx/audio_mapping_view.cc:200
+#: src/wx/audio_mapping_view.cc:199
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/config_dialog.cc:141
-#: src/wx/film_editor.cc:162
+#: src/wx/config_dialog.cc:159 src/wx/film_editor.cc:174
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/config_dialog.cc:57
+#: src/wx/kdm_dialog.cc:44
+msgid "Make KDMs"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "Matrix"
+msgstr ""
+
+#: src/wx/config_dialog.cc:66
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: src/wx/config_dialog.cc:53
+#: src/wx/config_dialog.cc:60
 msgid "Miscellaneous"
 msgstr "Divers"
 
@@ -334,7 +430,8 @@ msgstr "Divers"
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: src/wx/film_editor.cc:110
+#: src/wx/config_dialog.cc:461 src/wx/film_editor.cc:109
+#: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nom"
 
@@ -342,35 +439,37 @@ msgstr "Nom"
 msgid "New Film"
 msgstr "Nouveau Film"
 
-#: src/wx/film_editor.cc:286
-#: src/wx/film_editor.cc:769
+#: src/wx/video_panel.cc:88 src/wx/video_panel.cc:251
 msgid "None"
 msgstr "Aucun"
 
-#: src/wx/film_editor.cc:1309
-#, c-format
-msgid "Original video is %dx%d (%.2f:1)\n"
-msgstr "La vidéo originale est %dx%d (%.2f:1)\n"
+#: src/wx/config_dialog.cc:117
+#, fuzzy
+msgid "Outgoing mail server"
+msgstr "Serveurs d'encodage"
+
+#: src/wx/colour_conversion_editor.cc:78
+msgid "Output gamma"
+msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:57
+#: src/wx/dci_metadata_dialog.cc:63
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/film_editor.cc:1343
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Enveloppe noire de %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:254
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/wx/job_manager_view.cc:104
-#: src/wx/job_manager_view.cc:206
+#: src/wx/job_manager_view.cc:69 src/wx/job_manager_view.cc:141
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:59
+#: src/wx/audio_dialog.cc:60
 msgid "Peak"
 msgstr "Crête"
 
@@ -378,129 +477,172 @@ msgstr "Crête"
 msgid "Play"
 msgstr "Lecture"
 
-#: src/wx/audio_plot.cc:110
+#: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
 
-#: src/wx/audio_mapping_view.cc:188
+#: src/wx/timing_panel.cc:37
+msgid "Position"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:187
 msgid "R"
 msgstr "R"
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:61
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:45
+#: src/wx/dci_metadata_dialog.cc:51
 msgid "Rating (e.g. 15)"
 msgstr "Rating (ex. 15)"
 
-#: src/wx/config_dialog.cc:303
-#: src/wx/film_editor.cc:319
+#: src/wx/content_menu.cc:41 src/wx/film_editor.cc:267
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/wx/job_manager_view.cc:209
+#: src/wx/kdm_dialog.cc:67
+#, fuzzy
+msgid "Remove Cinema"
+msgstr "Supprimer"
+
+#: src/wx/kdm_dialog.cc:74
+#, fuzzy
+msgid "Remove Screen"
+msgstr "Supprimer"
+
+#: src/wx/repeat_dialog.cc:33
+msgid "Repeat"
+msgstr ""
+
+#: src/wx/repeat_dialog.cc:24
+#, fuzzy
+msgid "Repeat Content"
+msgstr "Sélectionner le fichier vidéo"
+
+#: src/wx/content_menu.cc:39
+msgid "Repeat..."
+msgstr ""
+
+#: src/wx/film_editor.cc:164
+msgid "Resolution"
+msgstr ""
+
+#: src/wx/job_manager_view.cc:144
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/wx/film_editor.cc:254
+#: src/wx/video_panel.cc:60
 msgid "Right crop"
 msgstr "Découpe droite"
 
-#: src/wx/audio_mapping_view.cc:204
+#: src/wx/audio_mapping_view.cc:203
 msgid "Rs"
 msgstr "Rs"
 
-#: src/wx/job_manager_view.cc:128
-msgid "Running"
-msgstr "Progression"
+#: src/wx/film_editor.cc:215
+msgid "SMPTE"
+msgstr ""
 
-#: src/wx/film_editor.cc:269
+#: src/wx/video_panel.cc:75
 msgid "Scale to"
 msgstr "Mise à l'échelle"
 
-#: src/wx/film_editor.cc:1335
+#: src/wx/video_panel.cc:321
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Mis à l'échelle de %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:167
+#: src/wx/film_editor.cc:184
 msgid "Scaler"
 msgstr "Mise à l'échelle"
 
-#: src/wx/server_dialog.cc:25
+#: src/wx/screen_dialog.cc:86
+#, fuzzy
+msgid "Select Certificate File"
+msgstr "Sélectionner le fichier vidéo"
+
+#: src/wx/kdm_dialog.cc:108
+msgid "Send by email"
+msgstr ""
+
+#: src/wx/server_dialog.cc:27
 msgid "Server"
 msgstr "Serveur"
 
-#: src/wx/config_dialog.cc:85
+#: src/wx/timecode.cc:65
+msgid "Set"
+msgstr ""
+
+#: src/wx/config_dialog.cc:96
 msgid "Set language"
 msgstr "Selectionnez la langue"
 
-#: src/wx/film_editor.cc:362
+#: src/wx/audio_panel.cc:46
 msgid "Show Audio..."
 msgstr "Analyser le son..."
 
-#: src/wx/audio_dialog.cc:70
+#: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
 msgstr "Lissage"
 
-#: src/wx/film_editor.cc:457
-msgid "Start time"
-msgstr "Début"
+#: src/wx/film_editor.cc:179
+msgid "Standard"
+msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:49
+#: src/wx/dci_metadata_dialog.cc:55
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:37
+#: src/wx/dci_metadata_dialog.cc:43
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Langue de sous-titres (ex. FR)"
 
-#: src/wx/film_editor.cc:422
+#: src/wx/subtitle_panel.cc:44
 msgid "Subtitle Offset"
 msgstr "Décalage du sous-titre"
 
-#: src/wx/film_editor.cc:431
+#: src/wx/subtitle_panel.cc:53
 msgid "Subtitle Scale"
 msgstr "Taille du sous-titre"
 
-#: src/wx/film_editor.cc:439
+#: src/wx/subtitle_panel.cc:61
 msgid "Subtitle Stream"
 msgstr "Flux de sous-titre"
 
-#: src/wx/film_editor.cc:345
+#: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:120
+#: src/wx/about_dialog.cc:124
 msgid "Supported by"
 msgstr "Soutenu par"
 
-#: src/wx/config_dialog.cc:59
+#: src/wx/config_dialog.cc:68
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:221
+#: src/wx/config_dialog.cc:246
 msgid "Target path"
 msgstr "Chemin d'accès"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Territory (e.g. UK)"
 msgstr "Territoire (ex. FR)"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:315
 msgid "Threads"
 msgstr "Processus"
 
-#: src/wx/server_dialog.cc:40
+#: src/wx/server_dialog.cc:44
 msgid "Threads to use"
 msgstr "Nombre de processus à utiliser"
 
-#: src/wx/config_dialog.cc:104
+#: src/wx/config_dialog.cc:113
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
-#: src/wx/audio_plot.cc:140
+#: src/wx/audio_plot.cc:148
 msgid "Time"
 msgstr "Durée"
 
@@ -508,15 +650,15 @@ msgstr "Durée"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:321
+#: src/wx/film_editor.cc:269
 msgid "Timeline..."
 msgstr "Timeline..."
 
-#: src/wx/film_editor.cc:347
+#: src/wx/timing_panel.cc:32
 msgid "Timing"
 msgstr ""
 
-#: src/wx/film_editor.cc:259
+#: src/wx/video_panel.cc:65
 msgid "Top crop"
 msgstr "Découpe haut"
 
@@ -524,39 +666,63 @@ msgstr "Découpe haut"
 msgid "Translated by"
 msgstr "Traduit par"
 
-#: src/wx/audio_dialog.cc:54
+#: src/wx/timing_panel.cc:46
+#, fuzzy
+msgid "Trim from end"
+msgstr "Images coupées"
+
+#: src/wx/timing_panel.cc:43
+#, fuzzy
+msgid "Trim from start"
+msgstr "Images coupées"
+
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:50
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/film_editor.cc:125
+#: src/wx/kdm_dialog.cc:88
+msgid "Until"
+msgstr ""
+
+#: src/wx/film_editor.cc:124
 msgid "Use DCI name"
 msgstr "Utiliser le nom DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/film_editor.cc:145
 msgid "Use best"
 msgstr "Automatique"
 
-#: src/wx/config_dialog.cc:225
+#: src/wx/content_colour_conversion_dialog.cc:41
+#, fuzzy
+msgid "Use preset"
+msgstr "Automatique"
+
+#: src/wx/config_dialog.cc:250
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: src/wx/film_editor.cc:341
+#: src/wx/video_panel.cc:43
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/wx/film_editor.cc:417
+#: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Avec sous-titres"
 
+#: src/wx/kdm_dialog.cc:94
+#, fuzzy
+msgid "Write to"
+msgstr "Développé par"
+
 #: src/wx/about_dialog.cc:90
 msgid "Written by"
 msgstr "Développé par"
 
-#: src/wx/timeline.cc:200
+#: src/wx/timeline.cc:209
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/film_editor.cc:1425
+#: src/wx/audio_panel.cc:271
 msgid "channels"
 msgstr "canaux"
 
@@ -564,29 +730,55 @@ msgstr "canaux"
 msgid "counting..."
 msgstr "calcul..."
 
-#: src/wx/film_editor.cc:372
+#: src/wx/audio_panel.cc:56
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:385
+#: src/wx/audio_panel.cc:69
 msgid "ms"
 msgstr "ms"
 
-#. / TRANSLATORS: this is an abbreviation for seconds, the unit of time
-#: src/wx/config_dialog.cc:112
-#: src/wx/imagemagick_content_dialog.cc:41
+#: src/wx/config_dialog.cc:130
 msgid "s"
 msgstr "s"
 
-#: src/wx/film_editor.cc:334
+#: src/wx/timeline.cc:232
+msgid "still"
+msgstr ""
+
+#: src/wx/repeat_dialog.cc:37
 msgid "times"
 msgstr ""
 
-#: src/wx/timeline.cc:220
+#: src/wx/timeline.cc:230
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Add"
+#~ msgstr "Ajouter"
+
+#~ msgid "Add..."
+#~ msgstr "Ajouter..."
+
+#~ msgid "Duration"
+#~ msgstr "Durée"
+
+#~ msgid "Edit"
+#~ msgstr "Édition"
+
+#~ msgid "Image"
+#~ msgstr "Image"
+
+#~ msgid "Loop everything"
+#~ msgstr "Tout mettre en boucle"
+
+#~ msgid "Running"
+#~ msgstr "Progression"
+
+#~ msgid "Start time"
+#~ msgstr "Début"
+
 #~ msgid "A/B"
 #~ msgstr "A/B"
 
@@ -633,12 +825,6 @@ msgstr "vidéo"
 #~ msgid "Select Audio File"
 #~ msgstr "Sélectionner le fichier son"
 
-#~ msgid "Select Content File"
-#~ msgstr "Sélectionner le fichier vidéo"
-
-#~ msgid "Trim frames"
-#~ msgstr "Images coupées"
-
 #~ msgid "Trim method"
 #~ msgstr "Méthod de découpage"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index fd5b6502c..f83ee4fe5 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-04-28 10:27+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/wx/film_editor.cc:426 src/wx/film_editor.cc:435
+#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
 msgid "%"
 msgstr "%"
 
@@ -26,54 +26,91 @@ msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:96
+#: src/wx/config_dialog.cc:106
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
-#: src/wx/film_editor.cc:1423
+#: src/wx/colour_conversion_editor.cc:83
+msgid "1 / "
+msgstr ""
+
+#: src/wx/audio_panel.cc:269
 msgid "1 channel"
 msgstr "1 canale"
 
+#: src/wx/video_panel.cc:132
+msgid "2D"
+msgstr ""
+
+#: src/wx/film_editor.cc:212
+msgid "2K"
+msgstr ""
+
+#: src/wx/film_editor.cc:160
+msgid "3D"
+msgstr ""
+
+#: src/wx/video_panel.cc:133
+msgid "3D left/right"
+msgstr ""
+
+#: src/wx/film_editor.cc:213
+msgid "4K"
+msgstr ""
+
 #: src/wx/about_dialog.cc:30
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:299
-msgid "Add"
-msgstr "Aggiungi"
+#: src/wx/kdm_dialog.cc:63
+msgid "Add Cinema..."
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:70
+msgid "Add Screen..."
+msgstr ""
+
+#: src/wx/film_editor.cc:263
+msgid "Add file(s)..."
+msgstr ""
 
-#: src/wx/film_editor.cc:317
-msgid "Add..."
+#: src/wx/film_editor.cc:265
+msgid "Add folder..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:343
+#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:379
+#: src/wx/audio_panel.cc:63
 msgid "Audio Delay"
 msgstr "Ritardo dell'audio"
 
-#: src/wx/film_editor.cc:367
+#: src/wx/audio_panel.cc:51
 msgid "Audio Gain"
 msgstr "Guadagno dell'audio"
 
-#: src/wx/dci_metadata_dialog.cc:33
+#: src/wx/dci_metadata_dialog.cc:39
 msgid "Audio Language (e.g. EN)"
 msgstr "Lingua dell'audio (es. EN)"
 
-#: src/wx/film_editor.cc:391
+#: src/wx/audio_panel.cc:75
 #, fuzzy
 msgid "Audio Stream"
 msgstr "Ritardo dell'audio"
 
+#: src/wx/film_editor.cc:155
+#, fuzzy
+msgid "Audio channels"
+msgstr "canali"
+
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Valore sbagliato per %s (%s)"
 
-#: src/wx/film_editor.cc:264
+#: src/wx/video_panel.cc:70
 msgid "Bottom crop"
 msgstr "Taglio in basso"
 
@@ -85,45 +122,78 @@ msgstr "Sfoglia..."
 msgid "But I have to use fader"
 msgstr "Ma dovrò riprodurre con il fader a"
 
-#: src/wx/audio_mapping_view.cc:192
+#: src/wx/audio_mapping_view.cc:191
 msgid "C"
 msgstr ""
 
-#: src/wx/film_editor.cc:376
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Calcola..."
 
-#: src/wx/job_manager_view.cc:98
+#: src/wx/job_manager_view.cc:63
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/wx/audio_dialog.cc:43
+#: src/wx/audio_dialog.cc:44
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/film_editor.cc:1163
+#: src/wx/film_editor.cc:714
 msgid "Choose a file or files"
 msgstr ""
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:747
+#, fuzzy
+msgid "Choose a folder"
+msgstr "Crea nella cartella"
+
+#: src/wx/content_colour_conversion_dialog.cc:33
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:97
+msgid "Colour conversion"
+msgstr ""
+
+#: src/wx/config_dialog.cc:64
+msgid "Colour conversions"
+msgstr ""
+
+#: src/wx/film_editor.cc:130
 #, fuzzy
 msgid "Container"
 msgstr "Contenuto"
 
-#: src/wx/film_editor.cc:82
+#: src/wx/film_editor.cc:83
 msgid "Content"
 msgstr "Contenuto"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:135
 msgid "Content Type"
 msgstr "Tipo di contenuto"
 
-#: src/wx/audio_mapping_view.cc:181
+#: src/wx/audio_mapping_view.cc:180
 #, fuzzy
 msgid "Content channel"
 msgstr "1 canale"
 
-#: src/wx/film_viewer.cc:326
+#: src/wx/video_panel.cc:337
+#, c-format
+msgid "Content frame rate %.4f\n"
+msgstr ""
+
+#: src/wx/dci_metadata_dialog.cc:35
+#, fuzzy
+msgid "Content version"
+msgstr "Tipo di contenuto"
+
+#: src/wx/video_panel.cc:295
+#, fuzzy, c-format
+msgid "Content video is %dx%d (%.2f:1)\n"
+msgstr "Il video originale è %dx%d (%.2f:1)\n"
+
+#: src/wx/audio_dialog.cc:132
+msgid "Could not analyse audio."
+msgstr ""
+
+#: src/wx/film_viewer.cc:347
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Non posso decodificare il video per guardarlo (%s)"
@@ -137,79 +207,74 @@ msgstr "Non posso creare il DCP: %s"
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:285
 #, fuzzy
 msgid "Creator"
 msgstr "Crea nella cartella"
 
-#: src/wx/film_editor.cc:1322
+#: src/wx/video_panel.cc:308
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Tagliato da %dx%d (%.2f:1)\n"
 
-#: src/wx/dci_metadata_dialog.cc:28
+#: src/wx/video_panel.cc:246
+msgid "Custom"
+msgstr ""
+
+#: src/wx/dci_metadata_dialog.cc:30
 msgid "DCI name"
 msgstr "Nome del DCP"
 
-#: src/wx/film_editor.cc:84
+#: src/wx/film_editor.cc:85
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:142
-msgid "DCP Frame Rate"
-msgstr "Frequenza fotogrammi del DCP"
-
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:114
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
-#: src/wx/film_editor.cc:152
-#, fuzzy
-msgid "DCP audio channels"
-msgstr "canali"
-
 #: src/wx/about_dialog.cc:44 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:46
+#: src/wx/config_dialog.cc:53
 msgid "DCP-o-matic Preferences"
 msgstr "Preferenze DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:97
+#: src/wx/audio_dialog.cc:98
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:142
 msgid "Default DCI name details"
 msgstr "Dettagli del nome di default DCI"
 
-#: src/wx/config_dialog.cc:138
+#: src/wx/config_dialog.cc:155
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:128
+#: src/wx/config_dialog.cc:146
 #, fuzzy
 msgid "Default container"
 msgstr "Tipo di contenuto"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:150
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo di contenuto"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:134
 msgid "Default directory for new films"
 msgstr "Directory di default per i nuovi films"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:126
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Directory di default per i nuovi films"
 
-#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:110
+#: src/wx/film_editor.cc:126 src/wx/job_manager_view.cc:75
 msgid "Details..."
 msgstr "Dettagli"
 
@@ -217,24 +282,27 @@ msgstr "Dettagli"
 msgid "Disk space required"
 msgstr "Spazio su disco rischiesto"
 
-#: src/wx/imagemagick_content_dialog.cc:36
-msgid "Duration"
-msgstr "Durata"
+#: src/wx/kdm_dialog.cc:65
+#, fuzzy
+msgid "Edit Cinema..."
+msgstr "Modifica..."
 
-#: src/wx/config_dialog.cc:301
-msgid "Edit"
-msgstr "Modifica"
+#: src/wx/kdm_dialog.cc:72
+#, fuzzy
+msgid "Edit Screen..."
+msgstr "Modifica..."
 
-#: src/wx/config_dialog.cc:124 src/wx/film_editor.cc:288
+#: src/wx/config_dialog.cc:143 src/wx/video_panel.cc:90
+#: src/wx/video_panel.cc:107
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: src/wx/config_dialog.cc:55
+#: src/wx/config_dialog.cc:62
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Servers di codifica"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
 msgstr "Facility (es. DLA)"
 
@@ -246,10 +314,15 @@ msgstr "Proprietà del film"
 msgid "Film name"
 msgstr "Nome del film"
 
-#: src/wx/film_editor.cc:284 src/wx/filter_dialog.cc:32
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:81
 msgid "Filters"
 msgstr "Filtri"
 
+#: src/wx/film_editor.cc:141
+#, fuzzy
+msgid "Frame Rate"
+msgstr "Frequenza fotogrammi del DCP"
+
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
 msgstr "Fotogrammi"
@@ -262,6 +335,14 @@ msgstr "Fotogrammi già codificati"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 
+#: src/wx/kdm_dialog.cc:82
+msgid "From"
+msgstr ""
+
+#: src/wx/config_dialog.cc:121
+msgid "From address for KDM emails"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calcolatore del guadagno audio"
@@ -270,11 +351,11 @@ msgstr "Calcolatore del guadagno audio"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/server_dialog.cc:36
+#: src/wx/server_dialog.cc:40
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
-#: src/wx/film_editor.cc:1427
+#: src/wx/audio_panel.cc:273
 msgid "Hz"
 msgstr "Hz"
 
@@ -282,56 +363,76 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/config_dialog.cc:217 src/wx/config_dialog.cc:288
+#: src/wx/config_dialog.cc:242 src/wx/config_dialog.cc:314
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/imagemagick_content_dialog.cc:29
-msgid "Image"
+#: src/wx/colour_conversion_editor.cc:44
+msgid "Input gamma"
+msgstr ""
+
+#: src/wx/film_editor.cc:216
+msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:256
+#: src/wx/config_dialog.cc:281
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:158
+#: src/wx/film_editor.cc:170
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/audio_mapping_view.cc:184
+#: src/wx/config_dialog.cc:70
+msgid "KDM email"
+msgstr ""
+
+#: src/wx/film_editor.cc:277
+msgid "Keep video in sequence"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:183
 msgid "L"
 msgstr ""
 
-#: src/wx/film_editor.cc:249
+#: src/wx/video_panel.cc:55
 msgid "Left crop"
 msgstr "Taglio a sinistra"
 
-#: src/wx/film_editor.cc:460
+#: src/wx/timing_panel.cc:40
 msgid "Length"
 msgstr "Lunghezza"
 
-#: src/wx/audio_mapping_view.cc:196
+#: src/wx/audio_mapping_view.cc:195
 msgid "Lfe"
 msgstr ""
 
-#: src/wx/film_editor.cc:330
-msgid "Loop everything"
+#: src/wx/colour_conversion_editor.cc:49
+msgid "Linearise input gamma curve for low values"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:200
+#: src/wx/audio_mapping_view.cc:199
 #, fuzzy
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:141 src/wx/film_editor.cc:162
+#: src/wx/config_dialog.cc:159 src/wx/film_editor.cc:174
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/config_dialog.cc:57
+#: src/wx/kdm_dialog.cc:44
+msgid "Make KDMs"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "Matrix"
+msgstr ""
+
+#: src/wx/config_dialog.cc:66
 msgid "Metadata"
 msgstr ""
 
-#: src/wx/config_dialog.cc:53
+#: src/wx/config_dialog.cc:60
 msgid "Miscellaneous"
 msgstr ""
 
@@ -339,7 +440,8 @@ msgstr ""
 msgid "My Documents"
 msgstr "Documenti"
 
-#: src/wx/film_editor.cc:110
+#: src/wx/config_dialog.cc:461 src/wx/film_editor.cc:109
+#: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nome"
 
@@ -347,34 +449,38 @@ msgstr "Nome"
 msgid "New Film"
 msgstr "Nuovo Film"
 
-#: src/wx/film_editor.cc:286 src/wx/film_editor.cc:769
+#: src/wx/video_panel.cc:88 src/wx/video_panel.cc:251
 msgid "None"
 msgstr "Nessuno"
 
-#: src/wx/film_editor.cc:1309
-#, c-format
-msgid "Original video is %dx%d (%.2f:1)\n"
-msgstr "Il video originale è %dx%d (%.2f:1)\n"
+#: src/wx/config_dialog.cc:117
+#, fuzzy
+msgid "Outgoing mail server"
+msgstr "Servers di codifica"
+
+#: src/wx/colour_conversion_editor.cc:78
+msgid "Output gamma"
+msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:57
+#: src/wx/dci_metadata_dialog.cc:63
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
-#: src/wx/film_editor.cc:1343
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Riempito con nero a %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:254
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
 
-#: src/wx/job_manager_view.cc:104 src/wx/job_manager_view.cc:206
+#: src/wx/job_manager_view.cc:69 src/wx/job_manager_view.cc:141
 msgid "Pause"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:59
+#: src/wx/audio_dialog.cc:60
 msgid "Peak"
 msgstr "Picco"
 
@@ -382,134 +488,177 @@ msgstr "Picco"
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/wx/audio_plot.cc:110
+#: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
 
-#: src/wx/audio_mapping_view.cc:188
+#: src/wx/timing_panel.cc:37
+msgid "Position"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:187
 msgid "R"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:61
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:45
+#: src/wx/dci_metadata_dialog.cc:51
 msgid "Rating (e.g. 15)"
 msgstr "Classificazione (es. 15)"
 
-#: src/wx/config_dialog.cc:303 src/wx/film_editor.cc:319
+#: src/wx/content_menu.cc:41 src/wx/film_editor.cc:267
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/wx/job_manager_view.cc:209
+#: src/wx/kdm_dialog.cc:67
+#, fuzzy
+msgid "Remove Cinema"
+msgstr "Rimuovi"
+
+#: src/wx/kdm_dialog.cc:74
+#, fuzzy
+msgid "Remove Screen"
+msgstr "Rimuovi"
+
+#: src/wx/repeat_dialog.cc:33
+msgid "Repeat"
+msgstr ""
+
+#: src/wx/repeat_dialog.cc:24
+#, fuzzy
+msgid "Repeat Content"
+msgstr "Seleziona il file con il contenuto"
+
+#: src/wx/content_menu.cc:39
+msgid "Repeat..."
+msgstr ""
+
+#: src/wx/film_editor.cc:164
+msgid "Resolution"
+msgstr ""
+
+#: src/wx/job_manager_view.cc:144
 msgid "Resume"
 msgstr ""
 
-#: src/wx/film_editor.cc:254
+#: src/wx/video_panel.cc:60
 msgid "Right crop"
 msgstr "Taglio a destra"
 
-#: src/wx/audio_mapping_view.cc:204
+#: src/wx/audio_mapping_view.cc:203
 #, fuzzy
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/job_manager_view.cc:128
-msgid "Running"
-msgstr "In corso"
+#: src/wx/film_editor.cc:215
+msgid "SMPTE"
+msgstr ""
 
-#: src/wx/film_editor.cc:269
+#: src/wx/video_panel.cc:75
 #, fuzzy
 msgid "Scale to"
 msgstr "Scaler"
 
-#: src/wx/film_editor.cc:1335
+#: src/wx/video_panel.cc:321
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Scalato a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:167
+#: src/wx/film_editor.cc:184
 msgid "Scaler"
 msgstr "Scaler"
 
-#: src/wx/server_dialog.cc:25
+#: src/wx/screen_dialog.cc:86
+#, fuzzy
+msgid "Select Certificate File"
+msgstr "Seleziona il file con il contenuto"
+
+#: src/wx/kdm_dialog.cc:108
+msgid "Send by email"
+msgstr ""
+
+#: src/wx/server_dialog.cc:27
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/config_dialog.cc:85
+#: src/wx/timecode.cc:65
+msgid "Set"
+msgstr ""
+
+#: src/wx/config_dialog.cc:96
 msgid "Set language"
 msgstr "Seleziona la lingua"
 
-#: src/wx/film_editor.cc:362
+#: src/wx/audio_panel.cc:46
 msgid "Show Audio..."
 msgstr "Mostra Audio..."
 
-#: src/wx/audio_dialog.cc:70
+#: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
 msgstr "Levigatura"
 
-#: src/wx/film_editor.cc:457
-#, fuzzy
-msgid "Start time"
-msgstr "Inizio"
+#: src/wx/film_editor.cc:179
+msgid "Standard"
+msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:49
+#: src/wx/dci_metadata_dialog.cc:55
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (es. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:37
+#: src/wx/dci_metadata_dialog.cc:43
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Lingua dei Sottotitoli (es. FR)"
 
-#: src/wx/film_editor.cc:422
+#: src/wx/subtitle_panel.cc:44
 msgid "Subtitle Offset"
 msgstr "Sfalsamento dei Sottotitoli"
 
-#: src/wx/film_editor.cc:431
+#: src/wx/subtitle_panel.cc:53
 msgid "Subtitle Scale"
 msgstr "Scala dei Sottotitoli"
 
-#: src/wx/film_editor.cc:439
+#: src/wx/subtitle_panel.cc:61
 #, fuzzy
 msgid "Subtitle Stream"
 msgstr "Scala dei Sottotitoli"
 
-#: src/wx/film_editor.cc:345
+#: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:120
+#: src/wx/about_dialog.cc:124
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:59
+#: src/wx/config_dialog.cc:68
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:221
+#: src/wx/config_dialog.cc:246
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Territory (e.g. UK)"
 msgstr "Nazione (es. UK)"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:315
 msgid "Threads"
 msgstr "Threads"
 
-#: src/wx/server_dialog.cc:40
+#: src/wx/server_dialog.cc:44
 msgid "Threads to use"
 msgstr "Threads da usare"
 
-#: src/wx/config_dialog.cc:104
+#: src/wx/config_dialog.cc:113
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
-#: src/wx/audio_plot.cc:140
+#: src/wx/audio_plot.cc:148
 msgid "Time"
 msgstr "Tempo"
 
@@ -518,15 +667,15 @@ msgstr "Tempo"
 msgid "Timeline"
 msgstr "Tempo"
 
-#: src/wx/film_editor.cc:321
+#: src/wx/film_editor.cc:269
 msgid "Timeline..."
 msgstr ""
 
-#: src/wx/film_editor.cc:347
+#: src/wx/timing_panel.cc:32
 msgid "Timing"
 msgstr ""
 
-#: src/wx/film_editor.cc:259
+#: src/wx/video_panel.cc:65
 msgid "Top crop"
 msgstr "Taglio in alto"
 
@@ -534,41 +683,64 @@ msgstr "Taglio in alto"
 msgid "Translated by"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:54
+#: src/wx/timing_panel.cc:46
+#, fuzzy
+msgid "Trim from end"
+msgstr "Taglia fotogrammi"
+
+#: src/wx/timing_panel.cc:43
+#, fuzzy
+msgid "Trim from start"
+msgstr "Taglia fotogrammi"
+
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:50
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/film_editor.cc:125
+#: src/wx/kdm_dialog.cc:88
+msgid "Until"
+msgstr ""
+
+#: src/wx/film_editor.cc:124
 msgid "Use DCI name"
 msgstr "Usa nome DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/film_editor.cc:145
 msgid "Use best"
 msgstr "Usa la migliore"
 
-#: src/wx/config_dialog.cc:225
+#: src/wx/content_colour_conversion_dialog.cc:41
+#, fuzzy
+msgid "Use preset"
+msgstr "Usa la migliore"
+
+#: src/wx/config_dialog.cc:250
 #, fuzzy
 msgid "User name"
 msgstr "Usa nome DCI"
 
-#: src/wx/film_editor.cc:341
+#: src/wx/video_panel.cc:43
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/film_editor.cc:417
+#: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Con sottotitoli"
 
+#: src/wx/kdm_dialog.cc:94
+msgid "Write to"
+msgstr ""
+
 #: src/wx/about_dialog.cc:90
 msgid "Written by"
 msgstr ""
 
-#: src/wx/timeline.cc:200
+#: src/wx/timeline.cc:209
 #, fuzzy
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:1425
+#: src/wx/audio_panel.cc:271
 msgid "channels"
 msgstr "canali"
 
@@ -576,29 +748,48 @@ msgstr "canali"
 msgid "counting..."
 msgstr "conteggio..."
 
-#: src/wx/film_editor.cc:372
+#: src/wx/audio_panel.cc:56
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:385
+#: src/wx/audio_panel.cc:69
 msgid "ms"
 msgstr "ms"
 
-#. / TRANSLATORS: this is an abbreviation for seconds, the unit of time
-#: src/wx/config_dialog.cc:112 src/wx/imagemagick_content_dialog.cc:41
+#: src/wx/config_dialog.cc:130
 msgid "s"
 msgstr "s"
 
-#: src/wx/film_editor.cc:334
+#: src/wx/timeline.cc:232
+msgid "still"
+msgstr ""
+
+#: src/wx/repeat_dialog.cc:37
 msgid "times"
 msgstr ""
 
-#: src/wx/timeline.cc:220
+#: src/wx/timeline.cc:230
 #, fuzzy
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Duration"
+#~ msgstr "Durata"
+
+#~ msgid "Edit"
+#~ msgstr "Modifica"
+
+#~ msgid "Running"
+#~ msgstr "In corso"
+
+#, fuzzy
+#~ msgid "Start time"
+#~ msgstr "Inizio"
+
 #~ msgid "A/B"
 #~ msgstr "A/B"
 
@@ -641,12 +832,6 @@ msgstr "Video"
 #~ msgid "Select Audio File"
 #~ msgstr "Seleziona file audio"
 
-#~ msgid "Select Content File"
-#~ msgstr "Seleziona il file con il contenuto"
-
-#~ msgid "Trim frames"
-#~ msgstr "Taglia fotogrammi"
-
 #~ msgid "Trim method"
 #~ msgstr "Metodo di taglio"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index c86fcc8f8..d3b96dc5c 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-15 22:07+0100\n"
+"POT-Creation-Date: 2013-10-10 10:45+0100\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/wx/film_editor.cc:426 src/wx/film_editor.cc:435
+#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
 msgid "%"
 msgstr "%"
 
@@ -26,54 +26,91 @@ msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:96
+#: src/wx/config_dialog.cc:106
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
-#: src/wx/film_editor.cc:1423
+#: src/wx/colour_conversion_editor.cc:83
+msgid "1 / "
+msgstr ""
+
+#: src/wx/audio_panel.cc:269
 msgid "1 channel"
 msgstr "1 kanal"
 
+#: src/wx/video_panel.cc:132
+msgid "2D"
+msgstr ""
+
+#: src/wx/film_editor.cc:212
+msgid "2K"
+msgstr ""
+
+#: src/wx/film_editor.cc:160
+msgid "3D"
+msgstr ""
+
+#: src/wx/video_panel.cc:133
+msgid "3D left/right"
+msgstr ""
+
+#: src/wx/film_editor.cc:213
+msgid "4K"
+msgstr ""
+
 #: src/wx/about_dialog.cc:30
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:299
-msgid "Add"
-msgstr "Lägg till"
+#: src/wx/kdm_dialog.cc:63
+msgid "Add Cinema..."
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:70
+msgid "Add Screen..."
+msgstr ""
 
-#: src/wx/film_editor.cc:317
-msgid "Add..."
+#: src/wx/film_editor.cc:263
+msgid "Add file(s)..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:343
+#: src/wx/film_editor.cc:265
+msgid "Add folder..."
+msgstr ""
+
+#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:379
+#: src/wx/audio_panel.cc:63
 msgid "Audio Delay"
 msgstr "Audio Fördröjning"
 
-#: src/wx/film_editor.cc:367
+#: src/wx/audio_panel.cc:51
 msgid "Audio Gain"
 msgstr "Audio Förstärkning"
 
-#: src/wx/dci_metadata_dialog.cc:33
+#: src/wx/dci_metadata_dialog.cc:39
 msgid "Audio Language (e.g. EN)"
 msgstr "Audio Språk (ex. SV)"
 
-#: src/wx/film_editor.cc:391
+#: src/wx/audio_panel.cc:75
 #, fuzzy
 msgid "Audio Stream"
 msgstr "Audio Fördröjning"
 
+#: src/wx/film_editor.cc:155
+#, fuzzy
+msgid "Audio channels"
+msgstr "kanaler"
+
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Felaktig inställning för %s (%s)"
 
-#: src/wx/film_editor.cc:264
+#: src/wx/video_panel.cc:70
 msgid "Bottom crop"
 msgstr "Nedre beskärning"
 
@@ -85,45 +122,78 @@ msgstr "Bläddra..."
 msgid "But I have to use fader"
 msgstr "Men jag måste använda mixervolym"
 
-#: src/wx/audio_mapping_view.cc:192
+#: src/wx/audio_mapping_view.cc:191
 msgid "C"
 msgstr ""
 
-#: src/wx/film_editor.cc:376
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Beräkna..."
 
-#: src/wx/job_manager_view.cc:98
+#: src/wx/job_manager_view.cc:63
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/wx/audio_dialog.cc:43
+#: src/wx/audio_dialog.cc:44
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/film_editor.cc:1163
+#: src/wx/film_editor.cc:714
 msgid "Choose a file or files"
 msgstr ""
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:747
+#, fuzzy
+msgid "Choose a folder"
+msgstr "Skapa i katalog"
+
+#: src/wx/content_colour_conversion_dialog.cc:33
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:97
+msgid "Colour conversion"
+msgstr ""
+
+#: src/wx/config_dialog.cc:64
+msgid "Colour conversions"
+msgstr ""
+
+#: src/wx/film_editor.cc:130
 #, fuzzy
 msgid "Container"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:82
+#: src/wx/film_editor.cc:83
 msgid "Content"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:135
 msgid "Content Type"
 msgstr "Innehållstyp"
 
-#: src/wx/audio_mapping_view.cc:181
+#: src/wx/audio_mapping_view.cc:180
 #, fuzzy
 msgid "Content channel"
 msgstr "1 kanal"
 
-#: src/wx/film_viewer.cc:326
+#: src/wx/video_panel.cc:337
+#, c-format
+msgid "Content frame rate %.4f\n"
+msgstr ""
+
+#: src/wx/dci_metadata_dialog.cc:35
+#, fuzzy
+msgid "Content version"
+msgstr "Innehållstyp"
+
+#: src/wx/video_panel.cc:295
+#, fuzzy, c-format
+msgid "Content video is %dx%d (%.2f:1)\n"
+msgstr "Original-videon är %dx%d (%.2f:1)\n"
+
+#: src/wx/audio_dialog.cc:132
+msgid "Could not analyse audio."
+msgstr ""
+
+#: src/wx/film_viewer.cc:347
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kunde inte avkoda video för visning (%s)"
@@ -137,79 +207,74 @@ msgstr "Kunde inte skapa DCP: %s"
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:285
 #, fuzzy
 msgid "Creator"
 msgstr "Skapa i katalog"
 
-#: src/wx/film_editor.cc:1322
+#: src/wx/video_panel.cc:308
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beskuren till %dx%d (%.2f:1)\n"
 
-#: src/wx/dci_metadata_dialog.cc:28
+#: src/wx/video_panel.cc:246
+msgid "Custom"
+msgstr ""
+
+#: src/wx/dci_metadata_dialog.cc:30
 msgid "DCI name"
 msgstr "DCI namn"
 
-#: src/wx/film_editor.cc:84
+#: src/wx/film_editor.cc:85
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:142
-msgid "DCP Frame Rate"
-msgstr "DCP bildhastighet"
-
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:114
 msgid "DCP Name"
 msgstr "DCP Namn"
 
-#: src/wx/film_editor.cc:152
-#, fuzzy
-msgid "DCP audio channels"
-msgstr "kanaler"
-
 #: src/wx/about_dialog.cc:44 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:46
+#: src/wx/config_dialog.cc:53
 msgid "DCP-o-matic Preferences"
 msgstr "DCP-o-matic Inställningar"
 
-#: src/wx/audio_dialog.cc:97
+#: src/wx/audio_dialog.cc:98
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:142
 msgid "Default DCI name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:138
+#: src/wx/config_dialog.cc:155
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbredd"
 
-#: src/wx/config_dialog.cc:128
+#: src/wx/config_dialog.cc:146
 #, fuzzy
 msgid "Default container"
 msgstr "Innehållstyp"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:150
 #, fuzzy
 msgid "Default content type"
 msgstr "Innehållstyp"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:134
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:126
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:110
+#: src/wx/film_editor.cc:126 src/wx/job_manager_view.cc:75
 msgid "Details..."
 msgstr "Detaljer..."
 
@@ -217,24 +282,27 @@ msgstr "Detaljer..."
 msgid "Disk space required"
 msgstr "Diskutrymme som krävs"
 
-#: src/wx/imagemagick_content_dialog.cc:36
-msgid "Duration"
-msgstr "Längd"
+#: src/wx/kdm_dialog.cc:65
+#, fuzzy
+msgid "Edit Cinema..."
+msgstr "Redigera..."
 
-#: src/wx/config_dialog.cc:301
-msgid "Edit"
-msgstr "Redigera"
+#: src/wx/kdm_dialog.cc:72
+#, fuzzy
+msgid "Edit Screen..."
+msgstr "Redigera..."
 
-#: src/wx/config_dialog.cc:124 src/wx/film_editor.cc:288
+#: src/wx/config_dialog.cc:143 src/wx/video_panel.cc:90
+#: src/wx/video_panel.cc:107
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: src/wx/config_dialog.cc:55
+#: src/wx/config_dialog.cc:62
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Kodningsservrar"
 
-#: src/wx/dci_metadata_dialog.cc:53
+#: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
 msgstr "Företag (ex. DLA)"
 
@@ -246,10 +314,15 @@ msgstr "Film Egenskaper"
 msgid "Film name"
 msgstr "film namn"
 
-#: src/wx/film_editor.cc:284 src/wx/filter_dialog.cc:32
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:81
 msgid "Filters"
 msgstr "Filter"
 
+#: src/wx/film_editor.cc:141
+#, fuzzy
+msgid "Frame Rate"
+msgstr "DCP bildhastighet"
+
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
 msgstr "Bildrutor"
@@ -262,6 +335,14 @@ msgstr "Bildrutor redan kodade"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 
+#: src/wx/kdm_dialog.cc:82
+msgid "From"
+msgstr ""
+
+#: src/wx/config_dialog.cc:121
+msgid "From address for KDM emails"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Volym Kalkylator"
@@ -270,11 +351,11 @@ msgstr "Volym Kalkylator"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/server_dialog.cc:36
+#: src/wx/server_dialog.cc:40
 msgid "Host name or IP address"
 msgstr "Värd-namn eller IP-adress"
 
-#: src/wx/film_editor.cc:1427
+#: src/wx/audio_panel.cc:273
 msgid "Hz"
 msgstr "Hz"
 
@@ -282,56 +363,76 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Jag vill spela upp detta med mixervolym"
 
-#: src/wx/config_dialog.cc:217 src/wx/config_dialog.cc:288
+#: src/wx/config_dialog.cc:242 src/wx/config_dialog.cc:314
 msgid "IP address"
 msgstr "IP-adress"
 
-#: src/wx/imagemagick_content_dialog.cc:29
-msgid "Image"
+#: src/wx/colour_conversion_editor.cc:44
+msgid "Input gamma"
+msgstr ""
+
+#: src/wx/film_editor.cc:216
+msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:256
+#: src/wx/config_dialog.cc:281
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:158
+#: src/wx/film_editor.cc:170
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbredd"
 
-#: src/wx/audio_mapping_view.cc:184
+#: src/wx/config_dialog.cc:70
+msgid "KDM email"
+msgstr ""
+
+#: src/wx/film_editor.cc:277
+msgid "Keep video in sequence"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:183
 msgid "L"
 msgstr ""
 
-#: src/wx/film_editor.cc:249
+#: src/wx/video_panel.cc:55
 msgid "Left crop"
 msgstr "Vänster beskärning"
 
-#: src/wx/film_editor.cc:460
+#: src/wx/timing_panel.cc:40
 msgid "Length"
 msgstr "Längd"
 
-#: src/wx/audio_mapping_view.cc:196
+#: src/wx/audio_mapping_view.cc:195
 msgid "Lfe"
 msgstr ""
 
-#: src/wx/film_editor.cc:330
-msgid "Loop everything"
+#: src/wx/colour_conversion_editor.cc:49
+msgid "Linearise input gamma curve for low values"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:200
+#: src/wx/audio_mapping_view.cc:199
 #, fuzzy
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:141 src/wx/film_editor.cc:162
+#: src/wx/config_dialog.cc:159 src/wx/film_editor.cc:174
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/config_dialog.cc:57
+#: src/wx/kdm_dialog.cc:44
+msgid "Make KDMs"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "Matrix"
+msgstr ""
+
+#: src/wx/config_dialog.cc:66
 msgid "Metadata"
 msgstr ""
 
-#: src/wx/config_dialog.cc:53
+#: src/wx/config_dialog.cc:60
 msgid "Miscellaneous"
 msgstr ""
 
@@ -339,7 +440,8 @@ msgstr ""
 msgid "My Documents"
 msgstr "Mina Dokument"
 
-#: src/wx/film_editor.cc:110
+#: src/wx/config_dialog.cc:461 src/wx/film_editor.cc:109
+#: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Namn"
 
@@ -347,34 +449,38 @@ msgstr "Namn"
 msgid "New Film"
 msgstr "Ny Film"
 
-#: src/wx/film_editor.cc:286 src/wx/film_editor.cc:769
+#: src/wx/video_panel.cc:88 src/wx/video_panel.cc:251
 msgid "None"
 msgstr "Inget"
 
-#: src/wx/film_editor.cc:1309
-#, c-format
-msgid "Original video is %dx%d (%.2f:1)\n"
-msgstr "Original-videon är %dx%d (%.2f:1)\n"
+#: src/wx/config_dialog.cc:117
+#, fuzzy
+msgid "Outgoing mail server"
+msgstr "Kodningsservrar"
+
+#: src/wx/colour_conversion_editor.cc:78
+msgid "Output gamma"
+msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:57
+#: src/wx/dci_metadata_dialog.cc:63
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/film_editor.cc:1343
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:254
 #, fuzzy
 msgid "Password"
 msgstr "TMS lösenord"
 
-#: src/wx/job_manager_view.cc:104 src/wx/job_manager_view.cc:206
+#: src/wx/job_manager_view.cc:69 src/wx/job_manager_view.cc:141
 msgid "Pause"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:59
+#: src/wx/audio_dialog.cc:60
 msgid "Peak"
 msgstr "Topp"
 
@@ -382,134 +488,177 @@ msgstr "Topp"
 msgid "Play"
 msgstr "Spela"
 
-#: src/wx/audio_plot.cc:110
+#: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
 
-#: src/wx/audio_mapping_view.cc:188
+#: src/wx/timing_panel.cc:37
+msgid "Position"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:187
 msgid "R"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:61
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:45
+#: src/wx/dci_metadata_dialog.cc:51
 msgid "Rating (e.g. 15)"
 msgstr "Klassificering (ex. 15)"
 
-#: src/wx/config_dialog.cc:303 src/wx/film_editor.cc:319
+#: src/wx/content_menu.cc:41 src/wx/film_editor.cc:267
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/wx/job_manager_view.cc:209
+#: src/wx/kdm_dialog.cc:67
+#, fuzzy
+msgid "Remove Cinema"
+msgstr "Ta bort"
+
+#: src/wx/kdm_dialog.cc:74
+#, fuzzy
+msgid "Remove Screen"
+msgstr "Ta bort"
+
+#: src/wx/repeat_dialog.cc:33
+msgid "Repeat"
+msgstr ""
+
+#: src/wx/repeat_dialog.cc:24
+#, fuzzy
+msgid "Repeat Content"
+msgstr "Välj innehållsfil"
+
+#: src/wx/content_menu.cc:39
+msgid "Repeat..."
+msgstr ""
+
+#: src/wx/film_editor.cc:164
+msgid "Resolution"
+msgstr ""
+
+#: src/wx/job_manager_view.cc:144
 msgid "Resume"
 msgstr ""
 
-#: src/wx/film_editor.cc:254
+#: src/wx/video_panel.cc:60
 msgid "Right crop"
 msgstr "Höger beskärning"
 
-#: src/wx/audio_mapping_view.cc:204
+#: src/wx/audio_mapping_view.cc:203
 #, fuzzy
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/job_manager_view.cc:128
-msgid "Running"
-msgstr "Körs"
+#: src/wx/film_editor.cc:215
+msgid "SMPTE"
+msgstr ""
 
-#: src/wx/film_editor.cc:269
+#: src/wx/video_panel.cc:75
 #, fuzzy
 msgid "Scale to"
 msgstr "Omskalare"
 
-#: src/wx/film_editor.cc:1335
+#: src/wx/video_panel.cc:321
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skalad till %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:167
+#: src/wx/film_editor.cc:184
 msgid "Scaler"
 msgstr "Omskalare"
 
-#: src/wx/server_dialog.cc:25
+#: src/wx/screen_dialog.cc:86
+#, fuzzy
+msgid "Select Certificate File"
+msgstr "Välj innehållsfil"
+
+#: src/wx/kdm_dialog.cc:108
+msgid "Send by email"
+msgstr ""
+
+#: src/wx/server_dialog.cc:27
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/config_dialog.cc:85
+#: src/wx/timecode.cc:65
+msgid "Set"
+msgstr ""
+
+#: src/wx/config_dialog.cc:96
 msgid "Set language"
 msgstr "Välj språk"
 
-#: src/wx/film_editor.cc:362
+#: src/wx/audio_panel.cc:46
 msgid "Show Audio..."
 msgstr "Visa Audio..."
 
-#: src/wx/audio_dialog.cc:70
+#: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
 msgstr "Utjämning"
 
-#: src/wx/film_editor.cc:457
-#, fuzzy
-msgid "Start time"
-msgstr "Start"
+#: src/wx/film_editor.cc:179
+msgid "Standard"
+msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:49
+#: src/wx/dci_metadata_dialog.cc:55
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:37
+#: src/wx/dci_metadata_dialog.cc:43
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Undertextspråk (ex. SV)"
 
-#: src/wx/film_editor.cc:422
+#: src/wx/subtitle_panel.cc:44
 msgid "Subtitle Offset"
 msgstr "Undertext Förskjutning"
 
-#: src/wx/film_editor.cc:431
+#: src/wx/subtitle_panel.cc:53
 msgid "Subtitle Scale"
 msgstr "Undertext Skalning"
 
-#: src/wx/film_editor.cc:439
+#: src/wx/subtitle_panel.cc:61
 #, fuzzy
 msgid "Subtitle Stream"
 msgstr "Undertext Skalning"
 
-#: src/wx/film_editor.cc:345
+#: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:120
+#: src/wx/about_dialog.cc:124
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:59
+#: src/wx/config_dialog.cc:68
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:221
+#: src/wx/config_dialog.cc:246
 #, fuzzy
 msgid "Target path"
 msgstr "TMS målsökväg"
 
-#: src/wx/dci_metadata_dialog.cc:41
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Territory (e.g. UK)"
 msgstr "Område (ex. SV)"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:315
 msgid "Threads"
 msgstr "Trådar"
 
-#: src/wx/server_dialog.cc:40
+#: src/wx/server_dialog.cc:44
 msgid "Threads to use"
 msgstr "Antal trådar att använda"
 
-#: src/wx/config_dialog.cc:104
+#: src/wx/config_dialog.cc:113
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
-#: src/wx/audio_plot.cc:140
+#: src/wx/audio_plot.cc:148
 msgid "Time"
 msgstr "Tid"
 
@@ -518,15 +667,15 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tid"
 
-#: src/wx/film_editor.cc:321
+#: src/wx/film_editor.cc:269
 msgid "Timeline..."
 msgstr ""
 
-#: src/wx/film_editor.cc:347
+#: src/wx/timing_panel.cc:32
 msgid "Timing"
 msgstr ""
 
-#: src/wx/film_editor.cc:259
+#: src/wx/video_panel.cc:65
 msgid "Top crop"
 msgstr "Övre beskärning"
 
@@ -534,41 +683,64 @@ msgstr "Övre beskärning"
 msgid "Translated by"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:54
+#: src/wx/timing_panel.cc:46
+#, fuzzy
+msgid "Trim from end"
+msgstr "Skippa bilder"
+
+#: src/wx/timing_panel.cc:43
+#, fuzzy
+msgid "Trim from start"
+msgstr "Skippa bilder"
+
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:50
 msgid "Type"
 msgstr "Typ"
 
-#: src/wx/film_editor.cc:125
+#: src/wx/kdm_dialog.cc:88
+msgid "Until"
+msgstr ""
+
+#: src/wx/film_editor.cc:124
 msgid "Use DCI name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/film_editor.cc:145
 msgid "Use best"
 msgstr "Använd bästa"
 
-#: src/wx/config_dialog.cc:225
+#: src/wx/content_colour_conversion_dialog.cc:41
+#, fuzzy
+msgid "Use preset"
+msgstr "Använd bästa"
+
+#: src/wx/config_dialog.cc:250
 #, fuzzy
 msgid "User name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/film_editor.cc:341
+#: src/wx/video_panel.cc:43
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/film_editor.cc:417
+#: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
 msgstr "Med Undertexter"
 
+#: src/wx/kdm_dialog.cc:94
+msgid "Write to"
+msgstr ""
+
 #: src/wx/about_dialog.cc:90
 msgid "Written by"
 msgstr ""
 
-#: src/wx/timeline.cc:200
+#: src/wx/timeline.cc:209
 #, fuzzy
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:1425
+#: src/wx/audio_panel.cc:271
 msgid "channels"
 msgstr "kanaler"
 
@@ -576,29 +748,48 @@ msgstr "kanaler"
 msgid "counting..."
 msgstr "räknar..."
 
-#: src/wx/film_editor.cc:372
+#: src/wx/audio_panel.cc:56
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:385
+#: src/wx/audio_panel.cc:69
 msgid "ms"
 msgstr "ms"
 
-#. / TRANSLATORS: this is an abbreviation for seconds, the unit of time
-#: src/wx/config_dialog.cc:112 src/wx/imagemagick_content_dialog.cc:41
+#: src/wx/config_dialog.cc:130
 msgid "s"
 msgstr "s"
 
-#: src/wx/film_editor.cc:334
+#: src/wx/timeline.cc:232
+msgid "still"
+msgstr ""
+
+#: src/wx/repeat_dialog.cc:37
 msgid "times"
 msgstr ""
 
-#: src/wx/timeline.cc:220
+#: src/wx/timeline.cc:230
 #, fuzzy
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Duration"
+#~ msgstr "Längd"
+
+#~ msgid "Edit"
+#~ msgstr "Redigera"
+
+#~ msgid "Running"
+#~ msgstr "Körs"
+
+#, fuzzy
+#~ msgid "Start time"
+#~ msgstr "Start"
+
 #~ msgid "A/B"
 #~ msgstr "A/B"
 
@@ -641,12 +832,6 @@ msgstr "Video"
 #~ msgid "Select Audio File"
 #~ msgstr "Välj audiofil"
 
-#~ msgid "Select Content File"
-#~ msgstr "Välj innehållsfil"
-
-#~ msgid "Trim frames"
-#~ msgstr "Skippa bilder"
-
 #, fuzzy
 #~ msgid "Trim method"
 #~ msgstr "Skippa bilder"