Update and merge po files.

12 files changed, 1942 insertions, 1396 deletions

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 7a07645b7..9b1d86008 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+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,56 +17,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/lib/transcode_job.cc:87
+#: src/lib/sndfile_content.cc:70
+msgid "%1 channels, %2kHz, %3 samples"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:193
+#, fuzzy
+msgid "%1 frames; %2 frames per second"
+msgstr "fotogramas por segundo"
+
+#: src/lib/video_content.cc:131
+msgid "%1x%2 pixels (%3:1)"
+msgstr ""
+
+#: src/lib/transcode_job.cc:81
 msgid "0%"
 msgstr "0%"
 
-#: src/lib/format.cc:75
+#: src/lib/ratio.cc:47
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/format.cc:83
+#: src/lib/ratio.cc:50
 msgid "1.375"
 msgstr "1.375"
 
-#: src/lib/format.cc:95
+#: src/lib/ratio.cc:51
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/format.cc:99
-msgid "1.66 within Flat"
-msgstr "1.66 en Flat"
-
-#: src/lib/format.cc:107
+#: src/lib/ratio.cc:52
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/format.cc:103
-msgid "16:9 within Flat"
-msgstr "16:9 en Flat"
-
-#: src/lib/format.cc:115
-#, fuzzy
-msgid "16:9 within Scope"
-msgstr "16:9 en Flat"
-
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "reducción de ruido 3D"
 
-#: src/lib/format.cc:79
+#: src/lib/ratio.cc:48
 msgid "4:3"
 msgstr ""
 
-#: src/lib/format.cc:87
-msgid "4:3 within Flat"
-msgstr "4:3 en Flat"
-
-#: src/lib/ab_transcode_job.cc:50
-msgid "A/B transcode %1"
-msgstr "Codificación A/B %1"
-
-#: src/lib/format.cc:91
+#: src/lib/ratio.cc:49
 msgid "Academy"
 msgstr "Academy"
 
@@ -74,11 +66,11 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Publicidad"
 
-#: src/lib/job.cc:73
+#: src/lib/job.cc:72
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
-#: src/lib/analyse_audio_job.cc:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio of %1"
 msgstr "Analizar audio de %1"
 
@@ -94,7 +86,7 @@ msgstr "Bicúbico"
 msgid "Bilinear"
 msgstr "Bilineal"
 
-#: src/lib/job.cc:318
+#: src/lib/job.cc:320
 msgid "Cancelled"
 msgstr ""
 
@@ -102,12 +94,7 @@ msgstr ""
 msgid "Cannot handle pixel format %1 during %2"
 msgstr ""
 
-#: src/lib/encoder.cc:101
-msgid "Cannot resample audio as libswresample is not present"
-msgstr ""
-"No se puede redimensionar el sonido porque no se encuentra libswresample"
-
-#: src/lib/util.cc:982
+#: src/lib/util.cc:700
 msgid "Centre"
 msgstr ""
 
@@ -139,16 +126,16 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Desentrelazado por interpolación cúbica"
 
-#: src/lib/util.cc:1057
+#: 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:1067
+#: src/lib/util.cc:733
 #, fuzzy
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente.\n"
 
-#: src/lib/util.cc:1060
+#: src/lib/util.cc:726
 msgid "DCP will use every other frame of the source.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\n"
 
@@ -171,22 +158,18 @@ msgstr "Deringing filter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1062
+#: src/lib/util.cc:728
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:318
 msgid "Error (%1)"
 msgstr "Error (%1)"
 
-#: src/lib/examine_content_job.cc:55
+#: src/lib/examine_content_job.cc:45
 msgid "Examine content"
 msgstr "Examinar contenido"
 
-#: src/lib/examine_content_job.cc:58
-msgid "Examine content of %1"
-msgstr "Examinar contenido de %1"
-
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
 msgstr "Experimental horizontal deblocking filter 1"
@@ -215,19 +198,15 @@ msgstr "Bilineal rápido"
 msgid "Feature"
 msgstr "Película"
 
-#: src/lib/format.cc:111
+#: src/lib/ratio.cc:53
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:127
-msgid "Flat without stretch"
-msgstr "Flat sin deformación"
-
 #: src/lib/filter.cc:85
 msgid "Force quantizer"
 msgstr "Force quantizer"
 
-#: src/lib/format.cc:123
+#: src/lib/ratio.cc:55
 msgid "Full frame"
 msgstr ""
 
@@ -251,7 +230,11 @@ msgstr "Horizontal deblocking filter"
 msgid "Horizontal deblocking filter A"
 msgstr "Horizontal deblocking filter A"
 
-#: src/lib/job.cc:97 src/lib/job.cc:106
+#: src/lib/imagemagick_content.cc:50
+msgid "Image: %1"
+msgstr ""
+
+#: 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 (dcpomatic@carlh.net)"
@@ -267,15 +250,15 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:980
+#: src/lib/util.cc:698
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:984
+#: src/lib/util.cc:702
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/util.cc:983
+#: src/lib/util.cc:701
 msgid "Lfe (sub)"
 msgstr ""
 
@@ -300,12 +283,16 @@ msgstr "Miscelánea"
 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:314
+#: src/lib/job.cc:316
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
@@ -325,15 +312,11 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/util.cc:535
-msgid "Rec 709"
-msgstr "Rec 709"
-
-#: src/lib/util.cc:981
+#: src/lib/util.cc:699
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:985
+#: src/lib/util.cc:703
 msgid "Right surround"
 msgstr ""
 
@@ -341,14 +324,10 @@ msgstr ""
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
-#: src/lib/format.cc:119
+#: src/lib/ratio.cc:54
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:131
-msgid "Scope without stretch"
-msgstr "Scope sin deformación"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Short"
 msgstr "Cortometraje"
@@ -357,6 +336,11 @@ 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"
@@ -377,7 +361,7 @@ msgstr "Temporal noise reducer"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:79
+#: 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."
@@ -385,11 +369,18 @@ 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
+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 ""
+
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:54
+#: src/lib/transcode_job.cc:50
 msgid "Transcode %1"
 msgstr "Codificar %1"
 
@@ -397,11 +388,11 @@ msgstr "Codificar %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:105
+#: src/lib/job.cc:104
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:387
+#: src/lib/ffmpeg_decoder.cc:264
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
@@ -429,11 +420,15 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:300
+#: src/lib/film.cc:273
+msgid "You must add some content to the DCP before creating it"
+msgstr ""
+
+#: src/lib/film.cc:232
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:576
+#: src/lib/util.cc:494
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -441,11 +436,12 @@ msgstr "tiempo de conexión agotado"
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:337
-msgid "content"
+#: src/lib/film.cc:269
+#, fuzzy
+msgid "container"
 msgstr "contenido"
 
-#: src/lib/film.cc:341
+#: src/lib/film.cc:277
 msgid "content type"
 msgstr "tipo de contenido"
 
@@ -458,32 +454,33 @@ msgstr "copiando %1"
 msgid "could not create file %1"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/ffmpeg_decoder.cc:186
+#: src/lib/ffmpeg.cc:128
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
 
-#: src/lib/ffmpeg_decoder.cc:113
+#: src/lib/ffmpeg.cc:76
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/ffmpeg_decoder.cc:205
+#: src/lib/ffmpeg_decoder.cc:498
 msgid "could not find subtitle decoder"
 msgstr "no se pudo encontrar decodificador de subtítutlos"
 
-#: src/lib/ffmpeg_decoder.cc:164
+#: src/lib/ffmpeg.cc:107
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
-#: src/lib/sndfile_decoder.cc:67
-msgid "could not open external audio file for reading"
-msgstr "no se pudo leer el fichero externo  de audio"
+#: src/lib/sndfile_decoder.cc:45
+#, fuzzy
+msgid "could not open audio file for reading"
+msgstr "no se pudo abrir el fichero para lectura"
 
 #: src/lib/exceptions.cc:29
 #, fuzzy
 msgid "could not open file %1"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/dcp_video_frame.cc:388
+#: src/lib/dcp_video_frame.cc:263
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
@@ -492,7 +489,7 @@ msgstr "no se pudo abrir el fichero para lectura"
 msgid "could not read from file %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/encoder.cc:137 src/lib/encoder.cc:318
+#: src/lib/resampler.cc:76 src/lib/resampler.cc:96
 msgid "could not run sample-rate converter"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
@@ -509,39 +506,27 @@ msgstr "no se pudo abrir la sesión SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/sndfile_decoder.cc:89
-msgid "external audio files have differing lengths"
-msgstr "los ficheros externos de sonido tienen duraciones diferentes"
-
-#: src/lib/sndfile_decoder.cc:71
-msgid "external audio files must be mono"
-msgstr "los ficheros externos de sonido deben ser mono"
-
-#: src/lib/film.cc:333
-msgid "format"
-msgstr "formato"
-
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/util.cc:134
+#: src/lib/util.cc:146
 msgid "hour"
 msgstr "hora"
 
-#: src/lib/util.cc:131 src/lib/util.cc:136
+#: src/lib/util.cc:143 src/lib/util.cc:148
 msgid "hours"
 msgstr "horas"
 
-#: src/lib/util.cc:141
+#: src/lib/util.cc:153
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:143
+#: src/lib/util.cc:155
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:719
+#: src/lib/util.cc:621
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -549,43 +534,83 @@ msgstr "falta la clave %1 en el par clave-valor"
 msgid "missing required setting %1"
 msgstr ""
 
-#: src/lib/subtitle.cc:52
+#: src/lib/ffmpeg_decoder.cc:530
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:300 src/lib/film.cc:345
+#: src/lib/film.cc:232 src/lib/film.cc:281
 msgid "name"
 msgstr "nombre"
 
-#: src/lib/imagemagick_decoder.cc:60
-msgid "no still image files found"
-msgstr "no se encuentran imágenes fijas"
-
-#: src/lib/subtitle.cc:58
+#: src/lib/ffmpeg_decoder.cc:545
 msgid "non-bitmap subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:311
+#: src/lib/job.cc:313
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/util.cc:533
-msgid "sRGB"
-msgstr "sRGB"
-
-#: src/lib/util.cc:146
+#: src/lib/util.cc:158
 msgid "seconds"
 msgstr "segundos"
 
-#: src/lib/film.cc:311
-msgid "still"
-msgstr "imagen fija"
+#~ msgid "1.66 within Flat"
+#~ msgstr "1.66 en Flat"
+
+#~ msgid "16:9 within Flat"
+#~ msgstr "16:9 en Flat"
+
+#, fuzzy
+#~ msgid "16:9 within Scope"
+#~ msgstr "16:9 en Flat"
+
+#~ msgid "4:3 within Flat"
+#~ msgstr "4:3 en Flat"
+
+#~ msgid "A/B transcode %1"
+#~ msgstr "Codificación A/B %1"
+
+#~ msgid "Cannot resample audio as libswresample is not present"
+#~ msgstr ""
+#~ "No se puede redimensionar el sonido porque no se encuentra libswresample"
+
+#~ msgid "Examine content of %1"
+#~ msgstr "Examinar contenido de %1"
+
+#~ msgid "Flat without stretch"
+#~ msgstr "Flat sin deformación"
+
+#~ msgid "Rec 709"
+#~ msgstr "Rec 709"
+
+#~ msgid "Scope without stretch"
+#~ msgstr "Scope sin deformación"
+
+#~ msgid "could not open external audio file for reading"
+#~ msgstr "no se pudo leer el fichero externo  de audio"
+
+#~ msgid "external audio files have differing lengths"
+#~ msgstr "los ficheros externos de sonido tienen duraciones diferentes"
+
+#~ msgid "external audio files must be mono"
+#~ msgstr "los ficheros externos de sonido deben ser mono"
+
+#~ msgid "format"
+#~ msgstr "formato"
+
+#~ msgid "no still image files found"
+#~ msgstr "no se encuentran imágenes fijas"
+
+#~ msgid "sRGB"
+#~ msgstr "sRGB"
+
+#~ msgid "still"
+#~ msgstr "imagen fija"
 
-#: src/lib/film.cc:311
-msgid "video"
-msgstr "vídeo"
+#~ msgid "video"
+#~ msgstr "vídeo"
 
 #~ msgid "1.33"
 #~ msgstr "1.33"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index f68631bbd..a9200ac7d 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+0100\n"
 "PO-Revision-Date: 2013-05-21 10:30+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,56 +16,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/transcode_job.cc:87
+#: src/lib/sndfile_content.cc:70
+msgid "%1 channels, %2kHz, %3 samples"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:193
+#, fuzzy
+msgid "%1 frames; %2 frames per second"
+msgstr "images par seconde"
+
+#: src/lib/video_content.cc:131
+msgid "%1x%2 pixels (%3:1)"
+msgstr ""
+
+#: src/lib/transcode_job.cc:81
 msgid "0%"
 msgstr "0%"
 
-#: src/lib/format.cc:75
+#: src/lib/ratio.cc:47
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/format.cc:83
+#: src/lib/ratio.cc:50
 msgid "1.375"
 msgstr "1.375"
 
-#: src/lib/format.cc:95
+#: src/lib/ratio.cc:51
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/format.cc:99
-msgid "1.66 within Flat"
-msgstr "1.66 dans Flat"
-
-#: src/lib/format.cc:107
+#: src/lib/ratio.cc:52
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/format.cc:103
-msgid "16:9 within Flat"
-msgstr "16:9 dans Flat"
-
-#: src/lib/format.cc:115
-#, fuzzy
-msgid "16:9 within Scope"
-msgstr "16:9 dans Scope"
-
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "Débruitage 3D"
 
-#: src/lib/format.cc:79
+#: src/lib/ratio.cc:48
 msgid "4:3"
 msgstr "4:3"
 
-#: src/lib/format.cc:87
-msgid "4:3 within Flat"
-msgstr "4:3 dans Flat"
-
-#: src/lib/ab_transcode_job.cc:50
-msgid "A/B transcode %1"
-msgstr "Transcodage A/B %1"
-
-#: src/lib/format.cc:91
+#: src/lib/ratio.cc:49
 msgid "Academy"
 msgstr "Academy"
 
@@ -73,11 +65,11 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Advertisement"
 
-#: src/lib/job.cc:73
+#: src/lib/job.cc:72
 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:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio of %1"
 msgstr "Analyse du son de %1"
 
@@ -93,7 +85,7 @@ msgstr "Bicubique"
 msgid "Bilinear"
 msgstr "Bilinéaire"
 
-#: src/lib/job.cc:318
+#: src/lib/job.cc:320
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -101,11 +93,7 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/encoder.cc:101
-msgid "Cannot resample audio as libswresample is not present"
-msgstr "Ré-échantillonnage du son impossible : libswresample est absent"
-
-#: src/lib/util.cc:982
+#: src/lib/util.cc:700
 msgid "Centre"
 msgstr "Centre"
 
@@ -137,16 +125,16 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Désentrelacement cubique interpolé"
 
-#: src/lib/util.cc:1057
+#: 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:1067
+#: src/lib/util.cc:733
 #, fuzzy
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "La cadence du DCP sera %1%% par rapport à la source.\n"
 
-#: src/lib/util.cc:1060
+#: src/lib/util.cc:726
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
 
@@ -169,22 +157,18 @@ msgstr "Filtre anti bourdonnement"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1062
+#: src/lib/util.cc:728
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:318
 msgid "Error (%1)"
 msgstr "Erreur (%1)"
 
-#: src/lib/examine_content_job.cc:55
+#: src/lib/examine_content_job.cc:45
 msgid "Examine content"
 msgstr "Examen du contenu"
 
-#: src/lib/examine_content_job.cc:58
-msgid "Examine content of %1"
-msgstr "Examen du contenu de %1"
-
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
 msgstr "Filtre dé-bloc horizontal 1"
@@ -213,19 +197,15 @@ msgstr "Bilinéaire rapide"
 msgid "Feature"
 msgstr "Feature"
 
-#: src/lib/format.cc:111
+#: src/lib/ratio.cc:53
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:127
-msgid "Flat without stretch"
-msgstr "Flat sans déformation"
-
 #: src/lib/filter.cc:85
 msgid "Force quantizer"
 msgstr "Forcer la quantification"
 
-#: src/lib/format.cc:123
+#: src/lib/ratio.cc:55
 msgid "Full frame"
 msgstr ""
 
@@ -249,10 +229,17 @@ msgstr "Filtre dé-bloc horizontal"
 msgid "Horizontal deblocking filter A"
 msgstr "Filtre dé-bloc horizontal"
 
-#: src/lib/job.cc:97
-#: src/lib/job.cc:106
-msgid "It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
-msgstr "Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic (dcpomatic@carlh.net)"
+#: src/lib/imagemagick_content.cc:50
+msgid "Image: %1"
+msgstr ""
+
+#: 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 (dcpomatic@carlh.net)"
+msgstr ""
+"Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
+"(dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
@@ -262,15 +249,15 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:980
+#: src/lib/util.cc:698
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:984
+#: src/lib/util.cc:702
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:983
+#: src/lib/util.cc:701
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -295,12 +282,16 @@ msgstr "Divers"
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
+#: 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 "Réduction de bruit"
 
-#: src/lib/job.cc:314
+#: src/lib/job.cc:316
 msgid "OK (ran for %1)"
 msgstr "OK (processus %1)"
 
@@ -320,15 +311,11 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/util.cc:535
-msgid "Rec 709"
-msgstr "Rec 709"
-
-#: src/lib/util.cc:981
+#: src/lib/util.cc:699
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:985
+#: src/lib/util.cc:703
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -336,14 +323,10 @@ msgstr "Arrière droite"
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
-#: src/lib/format.cc:119
+#: src/lib/ratio.cc:54
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:131
-msgid "Scope without stretch"
-msgstr "Scope sans déformation"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Short"
 msgstr "Short"
@@ -352,6 +335,11 @@ msgstr "Short"
 msgid "Sinc"
 msgstr "Sinc"
 
+#: src/lib/sndfile_content.cc:57
+#, fuzzy
+msgid "Sound file: %1"
+msgstr "lecture du fichier (%1) impossible"
+
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -372,7 +360,7 @@ msgstr "Réduction de bruit temporel"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:79
+#: 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."
@@ -380,11 +368,18 @@ 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 ""
+
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:54
+#: src/lib/transcode_job.cc:50
 msgid "Transcode %1"
 msgstr "Transcodage %1"
 
@@ -392,11 +387,11 @@ msgstr "Transcodage %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:105
+#: src/lib/job.cc:104
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/lib/ffmpeg_decoder.cc:387
+#: src/lib/ffmpeg_decoder.cc:264
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Échantillonnage audio (%1) inconnu"
 
@@ -424,11 +419,15 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:300
+#: src/lib/film.cc:273
+msgid "You must add some content to the DCP before creating it"
+msgstr ""
+
+#: src/lib/film.cc:232
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:576
+#: src/lib/util.cc:494
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -436,11 +435,12 @@ msgstr "temps de connexion expiré"
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:337
-msgid "content"
+#: src/lib/film.cc:269
+#, fuzzy
+msgid "container"
 msgstr "contenu"
 
-#: src/lib/film.cc:341
+#: src/lib/film.cc:277
 msgid "content type"
 msgstr "type de contenu"
 
@@ -452,31 +452,32 @@ msgstr "copie de %1"
 msgid "could not create file %1"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/ffmpeg_decoder.cc:186
+#: src/lib/ffmpeg.cc:128
 msgid "could not find audio decoder"
 msgstr "décodeur audio introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:113
+#: src/lib/ffmpeg.cc:76
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:205
+#: src/lib/ffmpeg_decoder.cc:498
 msgid "could not find subtitle decoder"
 msgstr "décodeur de sous-titre introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:164
+#: src/lib/ffmpeg.cc:107
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
-#: src/lib/sndfile_decoder.cc:67
-msgid "could not open external audio file for reading"
-msgstr "lecture du fichier audio externe impossible"
+#: src/lib/sndfile_decoder.cc:45
+#, fuzzy
+msgid "could not open audio file for reading"
+msgstr "lecture du fichier impossible"
 
 #: src/lib/exceptions.cc:29
 msgid "could not open file %1"
 msgstr "lecture du fichier (%1) impossible"
 
-#: src/lib/dcp_video_frame.cc:388
+#: src/lib/dcp_video_frame.cc:263
 msgid "could not open file for reading"
 msgstr "lecture du fichier impossible"
 
@@ -484,7 +485,7 @@ msgstr "lecture du fichier impossible"
 msgid "could not read from file %1 (%2)"
 msgstr "lecture du fichier impossible %1 (%2)"
 
-#: src/lib/encoder.cc:137 src/lib/encoder.cc:318
+#: src/lib/resampler.cc:76 src/lib/resampler.cc:96
 msgid "could not run sample-rate converter"
 msgstr "conversion de la fréquence d'échantillonnage impossible"
 
@@ -500,39 +501,27 @@ msgstr "démarrage de session SSH impossible"
 msgid "could not write to file %1 (%2)"
 msgstr "Écriture vers fichier distant (%1) impossible (%2)"
 
-#: src/lib/sndfile_decoder.cc:89
-msgid "external audio files have differing lengths"
-msgstr "Les fichiers audio externes ont des durées différentes"
-
-#: src/lib/sndfile_decoder.cc:71
-msgid "external audio files must be mono"
-msgstr "les fichiers audio externes doivent être en mono"
-
-#: src/lib/film.cc:333
-msgid "format"
-msgstr "format"
-
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/util.cc:134
+#: src/lib/util.cc:146
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:131 src/lib/util.cc:136
+#: src/lib/util.cc:143 src/lib/util.cc:148
 msgid "hours"
 msgstr "heures"
 
-#: src/lib/util.cc:141
+#: src/lib/util.cc:153
 msgid "minute"
 msgstr "minute"
 
-#: src/lib/util.cc:143
+#: src/lib/util.cc:155
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:719
+#: src/lib/util.cc:621
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -540,43 +529,82 @@ msgstr "clé %1 non sélectionnée"
 msgid "missing required setting %1"
 msgstr "paramètre %1 manquant"
 
-#: src/lib/subtitle.cc:52
+#: src/lib/ffmpeg_decoder.cc:530
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:300 src/lib/film.cc:345
+#: src/lib/film.cc:232 src/lib/film.cc:281
 msgid "name"
 msgstr "nom"
 
-#: src/lib/imagemagick_decoder.cc:60
-msgid "no still image files found"
-msgstr "aucune image fixe trouvée"
-
-#: src/lib/subtitle.cc:58
+#: src/lib/ffmpeg_decoder.cc:545
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sous-titres non-bitmap non supportés actuellement"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:311
+#: src/lib/job.cc:313
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/util.cc:533
-msgid "sRGB"
-msgstr "sRGB"
-
-#: src/lib/util.cc:146
+#: src/lib/util.cc:158
 msgid "seconds"
 msgstr "secondes"
 
-#: src/lib/film.cc:311
-msgid "still"
-msgstr "fixe"
+#~ msgid "1.66 within Flat"
+#~ msgstr "1.66 dans Flat"
+
+#~ msgid "16:9 within Flat"
+#~ msgstr "16:9 dans Flat"
+
+#, fuzzy
+#~ msgid "16:9 within Scope"
+#~ msgstr "16:9 dans Scope"
+
+#~ msgid "4:3 within Flat"
+#~ msgstr "4:3 dans Flat"
+
+#~ msgid "A/B transcode %1"
+#~ msgstr "Transcodage A/B %1"
+
+#~ msgid "Cannot resample audio as libswresample is not present"
+#~ msgstr "Ré-échantillonnage du son impossible : libswresample est absent"
+
+#~ msgid "Examine content of %1"
+#~ msgstr "Examen du contenu de %1"
+
+#~ msgid "Flat without stretch"
+#~ msgstr "Flat sans déformation"
+
+#~ msgid "Rec 709"
+#~ msgstr "Rec 709"
+
+#~ msgid "Scope without stretch"
+#~ msgstr "Scope sans déformation"
+
+#~ msgid "could not open external audio file for reading"
+#~ msgstr "lecture du fichier audio externe impossible"
+
+#~ msgid "external audio files have differing lengths"
+#~ msgstr "Les fichiers audio externes ont des durées différentes"
+
+#~ msgid "external audio files must be mono"
+#~ msgstr "les fichiers audio externes doivent être en mono"
+
+#~ msgid "format"
+#~ msgstr "format"
+
+#~ msgid "no still image files found"
+#~ msgstr "aucune image fixe trouvée"
+
+#~ msgid "sRGB"
+#~ msgstr "sRGB"
+
+#~ msgid "still"
+#~ msgstr "fixe"
 
-#: src/lib/film.cc:311
-msgid "video"
-msgstr "vidéo"
+#~ msgid "video"
+#~ msgstr "vidéo"
 
 #~ msgid "1.33"
 #~ msgstr "1.33"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 0ddfa7721..36cf3afb6 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+0100\n"
 "PO-Revision-Date: 2013-04-28 10:26+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,55 +17,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/lib/transcode_job.cc:87
+#: src/lib/sndfile_content.cc:70
+msgid "%1 channels, %2kHz, %3 samples"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:193
+#, fuzzy
+msgid "%1 frames; %2 frames per second"
+msgstr "fotogrammi al secondo"
+
+#: src/lib/video_content.cc:131
+msgid "%1x%2 pixels (%3:1)"
+msgstr ""
+
+#: src/lib/transcode_job.cc:81
 msgid "0%"
 msgstr "0%"
 
-#: src/lib/format.cc:75
+#: src/lib/ratio.cc:47
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/format.cc:83
+#: src/lib/ratio.cc:50
 msgid "1.375"
 msgstr "1.375"
 
-#: src/lib/format.cc:95
+#: src/lib/ratio.cc:51
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/format.cc:99
-msgid "1.66 within Flat"
-msgstr "1.66 all'interno di Flat"
-
-#: src/lib/format.cc:107
+#: src/lib/ratio.cc:52
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/format.cc:103
-msgid "16:9 within Flat"
-msgstr "16:9 all'interno di Flat"
-
-#: src/lib/format.cc:115
-msgid "16:9 within Scope"
-msgstr "16:9 all'interno di Scope"
-
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "Riduttore di rumore 3D"
 
-#: src/lib/format.cc:79
+#: src/lib/ratio.cc:48
 msgid "4:3"
 msgstr "4:3"
 
-#: src/lib/format.cc:87
-msgid "4:3 within Flat"
-msgstr "4:3 all'interno di  Flat"
-
-#: src/lib/ab_transcode_job.cc:50
-msgid "A/B transcode %1"
-msgstr "Transcodifica A/B %1"
-
-#: src/lib/format.cc:91
+#: src/lib/ratio.cc:49
 msgid "Academy"
 msgstr "Academy"
 
@@ -73,11 +66,11 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Pubblicità"
 
-#: src/lib/job.cc:73
+#: src/lib/job.cc:72
 msgid "An error occurred whilst handling the file %1."
 msgstr "Errore durante l'elaborazione del file %1."
 
-#: src/lib/analyse_audio_job.cc:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio of %1"
 msgstr "Analizzo l'audio di %1"
 
@@ -93,7 +86,7 @@ msgstr "Bicubica"
 msgid "Bilinear"
 msgstr "Bilineare"
 
-#: src/lib/job.cc:318
+#: src/lib/job.cc:320
 msgid "Cancelled"
 msgstr "Cancellato"
 
@@ -101,11 +94,7 @@ msgstr "Cancellato"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
-#: src/lib/encoder.cc:101
-msgid "Cannot resample audio as libswresample is not present"
-msgstr "Non posso ricampionare l'audio perchè libswresample non è presente"
-
-#: src/lib/util.cc:982
+#: src/lib/util.cc:700
 msgid "Centre"
 msgstr "Centro"
 
@@ -137,15 +126,15 @@ msgstr "Non posso scrivere il file remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Deinterlacciatore cubico interpolato"
 
-#: src/lib/util.cc:1057
+#: 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:1067
+#: src/lib/util.cc:733
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "Il DCP andrà al %1%% della velocità del sorgente.\n"
 
-#: src/lib/util.cc:1060
+#: src/lib/util.cc:726
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
 
@@ -168,22 +157,18 @@ msgstr "Filtro deringing"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1062
+#: src/lib/util.cc:728
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà raddoppiato nel DCP.\n"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:318
 msgid "Error (%1)"
 msgstr "Errore (%1)"
 
-#: src/lib/examine_content_job.cc:55
+#: src/lib/examine_content_job.cc:45
 msgid "Examine content"
 msgstr "Esamino il contenuto"
 
-#: src/lib/examine_content_job.cc:58
-msgid "Examine content of %1"
-msgstr "Esamino il contenuto di %1"
-
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
 msgstr "Filtro di sblocco sperimentale orizzontale 1"
@@ -212,19 +197,15 @@ msgstr "Bilineare rapida"
 msgid "Feature"
 msgstr "Caratteristica"
 
-#: src/lib/format.cc:111
+#: src/lib/ratio.cc:53
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:127
-msgid "Flat without stretch"
-msgstr "Flat senza stiramento"
-
 #: src/lib/filter.cc:85
 msgid "Force quantizer"
 msgstr "Forza quantizzatore"
 
-#: src/lib/format.cc:123
+#: src/lib/ratio.cc:55
 msgid "Full frame"
 msgstr ""
 
@@ -248,7 +229,11 @@ msgstr "Filtro sblocco orizzontale"
 msgid "Horizontal deblocking filter A"
 msgstr "Filtro A sblocco orizzontale"
 
-#: src/lib/job.cc:97 src/lib/job.cc:106
+#: src/lib/imagemagick_content.cc:50
+msgid "Image: %1"
+msgstr ""
+
+#: 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 (dcpomatic@carlh.net)"
@@ -264,15 +249,15 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:980
+#: src/lib/util.cc:698
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:984
+#: src/lib/util.cc:702
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:983
+#: src/lib/util.cc:701
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -297,12 +282,16 @@ msgstr "Varie"
 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:314
+#: src/lib/job.cc:316
 msgid "OK (ran for %1)"
 msgstr "OK (eseguito in %1)"
 
@@ -322,15 +311,11 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/util.cc:535
-msgid "Rec 709"
-msgstr "Rec 709"
-
-#: src/lib/util.cc:981
+#: src/lib/util.cc:699
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:985
+#: src/lib/util.cc:703
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -338,14 +323,10 @@ msgstr "Surround destro"
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
-#: src/lib/format.cc:119
+#: src/lib/ratio.cc:54
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:131
-msgid "Scope without stretch"
-msgstr "Scope senza stiramento"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Short"
 msgstr "Corto"
@@ -354,6 +335,11 @@ 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"
@@ -374,7 +360,7 @@ msgstr "Riduttore temporale di rumore"
 msgid "Test"
 msgstr "Prova"
 
-#: src/lib/job.cc:79
+#: 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."
@@ -382,11 +368,18 @@ msgstr ""
 "Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
 "altro spazio e riprovare."
 
+#: 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 ""
+
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
 msgstr "Prossimamente"
 
-#: src/lib/transcode_job.cc:54
+#: src/lib/transcode_job.cc:50
 msgid "Transcode %1"
 msgstr "Transcodifica %1"
 
@@ -394,11 +387,11 @@ msgstr "Transcodifica %1"
 msgid "Transitional"
 msgstr "Di transizione"
 
-#: src/lib/job.cc:105
+#: src/lib/job.cc:104
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: src/lib/ffmpeg_decoder.cc:387
+#: src/lib/ffmpeg_decoder.cc:264
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato di campionamento audio non riconosciuto (%1)"
 
@@ -426,11 +419,15 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:300
+#: src/lib/film.cc:273
+msgid "You must add some content to the DCP before creating it"
+msgstr ""
+
+#: src/lib/film.cc:232
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:576
+#: src/lib/util.cc:494
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -438,11 +435,12 @@ msgstr "connessione scaduta"
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:337
-msgid "content"
+#: src/lib/film.cc:269
+#, fuzzy
+msgid "container"
 msgstr "contenuto"
 
-#: src/lib/film.cc:341
+#: src/lib/film.cc:277
 msgid "content type"
 msgstr "tipo di contenuto"
 
@@ -454,31 +452,32 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg_decoder.cc:186
+#: src/lib/ffmpeg.cc:128
 msgid "could not find audio decoder"
 msgstr "non riesco a trovare il decoder audio"
 
-#: src/lib/ffmpeg_decoder.cc:113
+#: src/lib/ffmpeg.cc:76
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/ffmpeg_decoder.cc:205
+#: src/lib/ffmpeg_decoder.cc:498
 msgid "could not find subtitle decoder"
 msgstr "non riesco a trovare il decoder dei sottotitoli"
 
-#: src/lib/ffmpeg_decoder.cc:164
+#: src/lib/ffmpeg.cc:107
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
-#: src/lib/sndfile_decoder.cc:67
-msgid "could not open external audio file for reading"
-msgstr "non riesco ad aprire il file dell'audio esterno per leggerlo"
+#: src/lib/sndfile_decoder.cc:45
+#, fuzzy
+msgid "could not open audio file for reading"
+msgstr "non riesco ad aprire il file per leggerlo"
 
 #: src/lib/exceptions.cc:29
 msgid "could not open file %1"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/dcp_video_frame.cc:388
+#: src/lib/dcp_video_frame.cc:263
 msgid "could not open file for reading"
 msgstr "non riesco ad aprire il file per leggerlo"
 
@@ -486,7 +485,7 @@ msgstr "non riesco ad aprire il file per leggerlo"
 msgid "could not read from file %1 (%2)"
 msgstr "non posso leggere dal file %1 (%2)"
 
-#: src/lib/encoder.cc:137 src/lib/encoder.cc:318
+#: src/lib/resampler.cc:76 src/lib/resampler.cc:96
 msgid "could not run sample-rate converter"
 msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 
@@ -502,39 +501,27 @@ msgstr "non posso avviare la sessione SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "non posso scrivere il file (%1)"
 
-#: src/lib/sndfile_decoder.cc:89
-msgid "external audio files have differing lengths"
-msgstr "i files dell'audio esterno hanno durata diversa"
-
-#: src/lib/sndfile_decoder.cc:71
-msgid "external audio files must be mono"
-msgstr "i files dell'audio esterno devono essere mono"
-
-#: src/lib/film.cc:333
-msgid "format"
-msgstr "formato"
-
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/util.cc:134
+#: src/lib/util.cc:146
 msgid "hour"
 msgstr "ora"
 
-#: src/lib/util.cc:131 src/lib/util.cc:136
+#: src/lib/util.cc:143 src/lib/util.cc:148
 msgid "hours"
 msgstr "ore"
 
-#: src/lib/util.cc:141
+#: src/lib/util.cc:153
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:143
+#: src/lib/util.cc:155
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:719
+#: src/lib/util.cc:621
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -542,43 +529,81 @@ msgstr "persa la chiave %1 tra i valori chiave"
 msgid "missing required setting %1"
 msgstr "persa la regolazione richiesta %1"
 
-#: src/lib/subtitle.cc:52
+#: src/lib/ffmpeg_decoder.cc:530
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:300 src/lib/film.cc:345
+#: src/lib/film.cc:232 src/lib/film.cc:281
 msgid "name"
 msgstr "nome"
 
-#: src/lib/imagemagick_decoder.cc:60
-msgid "no still image files found"
-msgstr "file immagini statiche non trovati"
-
-#: src/lib/subtitle.cc:58
+#: src/lib/ffmpeg_decoder.cc:545
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sottotitoli non-bitmap non ancora supportati"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:311
+#: src/lib/job.cc:313
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/util.cc:533
-msgid "sRGB"
-msgstr "sRGB"
-
-#: src/lib/util.cc:146
+#: src/lib/util.cc:158
 msgid "seconds"
 msgstr "secondi"
 
-#: src/lib/film.cc:311
-msgid "still"
-msgstr "ancora"
+#~ msgid "1.66 within Flat"
+#~ msgstr "1.66 all'interno di Flat"
+
+#~ msgid "16:9 within Flat"
+#~ msgstr "16:9 all'interno di Flat"
+
+#~ msgid "16:9 within Scope"
+#~ msgstr "16:9 all'interno di Scope"
+
+#~ msgid "4:3 within Flat"
+#~ msgstr "4:3 all'interno di  Flat"
+
+#~ msgid "A/B transcode %1"
+#~ msgstr "Transcodifica A/B %1"
+
+#~ msgid "Cannot resample audio as libswresample is not present"
+#~ msgstr "Non posso ricampionare l'audio perchè libswresample non è presente"
+
+#~ msgid "Examine content of %1"
+#~ msgstr "Esamino il contenuto di %1"
+
+#~ msgid "Flat without stretch"
+#~ msgstr "Flat senza stiramento"
+
+#~ msgid "Rec 709"
+#~ msgstr "Rec 709"
+
+#~ msgid "Scope without stretch"
+#~ msgstr "Scope senza stiramento"
+
+#~ msgid "could not open external audio file for reading"
+#~ msgstr "non riesco ad aprire il file dell'audio esterno per leggerlo"
+
+#~ msgid "external audio files have differing lengths"
+#~ msgstr "i files dell'audio esterno hanno durata diversa"
+
+#~ msgid "external audio files must be mono"
+#~ msgstr "i files dell'audio esterno devono essere mono"
+
+#~ msgid "format"
+#~ msgstr "formato"
+
+#~ msgid "no still image files found"
+#~ msgstr "file immagini statiche non trovati"
+
+#~ msgid "sRGB"
+#~ msgstr "sRGB"
+
+#~ msgid "still"
+#~ msgstr "ancora"
 
-#: src/lib/film.cc:311
-msgid "video"
-msgstr "video"
+#~ msgid "video"
+#~ msgstr "video"
 
 #~ msgid "1.33"
 #~ msgstr "1.33"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index c1c62ca41..f559350a1 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+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,55 +17,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/lib/transcode_job.cc:87
+#: src/lib/sndfile_content.cc:70
+msgid "%1 channels, %2kHz, %3 samples"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:193
+#, fuzzy
+msgid "%1 frames; %2 frames per second"
+msgstr "bilder per sekund"
+
+#: src/lib/video_content.cc:131
+msgid "%1x%2 pixels (%3:1)"
+msgstr ""
+
+#: src/lib/transcode_job.cc:81
 msgid "0%"
 msgstr "0%"
 
-#: src/lib/format.cc:75
+#: src/lib/ratio.cc:47
 msgid "1.19"
 msgstr "1,19"
 
-#: src/lib/format.cc:83
+#: src/lib/ratio.cc:50
 msgid "1.375"
 msgstr "1,375"
 
-#: src/lib/format.cc:95
+#: src/lib/ratio.cc:51
 msgid "1.66"
 msgstr "1,66"
 
-#: src/lib/format.cc:99
-msgid "1.66 within Flat"
-msgstr "1,66 innanför Flat"
-
-#: src/lib/format.cc:107
+#: src/lib/ratio.cc:52
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/format.cc:103
-msgid "16:9 within Flat"
-msgstr "16:9 innanför Flat"
-
-#: src/lib/format.cc:115
-msgid "16:9 within Scope"
-msgstr "16:9 innanför Scope"
-
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "3D brusreducering"
 
-#: src/lib/format.cc:79
+#: src/lib/ratio.cc:48
 msgid "4:3"
 msgstr ""
 
-#: src/lib/format.cc:87
-msgid "4:3 within Flat"
-msgstr "4:3 innanför Flat"
-
-#: src/lib/ab_transcode_job.cc:50
-msgid "A/B transcode %1"
-msgstr "A/B konvertera %1"
-
-#: src/lib/format.cc:91
+#: src/lib/ratio.cc:49
 msgid "Academy"
 msgstr "Academy"
 
@@ -73,11 +66,11 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Reklam"
 
-#: src/lib/job.cc:73
+#: src/lib/job.cc:72
 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:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio of %1"
 msgstr "Analysera %1s audio"
 
@@ -93,7 +86,7 @@ msgstr "Bikubisk"
 msgid "Bilinear"
 msgstr "Bilinjär"
 
-#: src/lib/job.cc:318
+#: src/lib/job.cc:320
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -101,12 +94,7 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/encoder.cc:101
-msgid "Cannot resample audio as libswresample is not present"
-msgstr ""
-"Kan inte omsampla ljudet eftersom libswresample inte finns tillgängligt"
-
-#: src/lib/util.cc:982
+#: src/lib/util.cc:700
 msgid "Centre"
 msgstr "Mitt"
 
@@ -138,15 +126,15 @@ msgstr "Kunde inte skriva till fjärrfil (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Kubiskt interpolerande avflätare"
 
-#: src/lib/util.cc:1057
+#: 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:1067
+#: src/lib/util.cc:733
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "DCP kommer att köras på %1%% av källans hastighet.\n"
 
-#: src/lib/util.cc:1060
+#: src/lib/util.cc:726
 msgid "DCP will use every other frame of the source.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
 
@@ -169,22 +157,18 @@ msgstr "Avringningsfilter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1062
+#: src/lib/util.cc:728
 msgid "Each source 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:316
+#: src/lib/job.cc:318
 msgid "Error (%1)"
 msgstr "Fel (%1)"
 
-#: src/lib/examine_content_job.cc:55
+#: src/lib/examine_content_job.cc:45
 msgid "Examine content"
 msgstr "Undersök innehållet"
 
-#: src/lib/examine_content_job.cc:58
-msgid "Examine content of %1"
-msgstr "Undersök innehållet i %1"
-
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
 msgstr "Experimentellt filter för horisontal kantighetsutjämning 1"
@@ -213,19 +197,15 @@ msgstr "Snabb bilinjär"
 msgid "Feature"
 msgstr "Långfilm"
 
-#: src/lib/format.cc:111
+#: src/lib/ratio.cc:53
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:127
-msgid "Flat without stretch"
-msgstr "Flat utan utsträckning"
-
 #: src/lib/filter.cc:85
 msgid "Force quantizer"
 msgstr "Tvinga kvantiserare"
 
-#: src/lib/format.cc:123
+#: src/lib/ratio.cc:55
 msgid "Full frame"
 msgstr ""
 
@@ -249,7 +229,11 @@ msgstr "Filter för horisontal kantighetsutjämning"
 msgid "Horizontal deblocking filter A"
 msgstr "Filter för horisontal kantighetsutjämning A"
 
-#: src/lib/job.cc:97 src/lib/job.cc:106
+#: src/lib/imagemagick_content.cc:50
+msgid "Image: %1"
+msgstr ""
+
+#: 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 (dcpomatic@carlh.net)"
@@ -265,15 +249,15 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:980
+#: src/lib/util.cc:698
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:984
+#: src/lib/util.cc:702
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:983
+#: src/lib/util.cc:701
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -298,12 +282,16 @@ msgstr "Diverse"
 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:314
+#: src/lib/job.cc:316
 msgid "OK (ran for %1)"
 msgstr "OK (kördes %1)"
 
@@ -323,15 +311,11 @@ msgstr "Offentligt Servicemeddelande"
 msgid "Rating"
 msgstr "Klassificeringsklipp"
 
-#: src/lib/util.cc:535
-msgid "Rec 709"
-msgstr "Rec 709"
-
-#: src/lib/util.cc:981
+#: src/lib/util.cc:699
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:985
+#: src/lib/util.cc:703
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -339,14 +323,10 @@ msgstr "Höger surround"
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
-#: src/lib/format.cc:119
+#: src/lib/ratio.cc:54
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:131
-msgid "Scope without stretch"
-msgstr "Scope utan utsträckning"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Short"
 msgstr "Kortfilm"
@@ -355,6 +335,11 @@ 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"
@@ -375,7 +360,7 @@ msgstr "Temporal brusreducering"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:79
+#: 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."
@@ -383,11 +368,18 @@ 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
+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 ""
+
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:54
+#: src/lib/transcode_job.cc:50
 msgid "Transcode %1"
 msgstr "Konvertera %1"
 
@@ -395,12 +387,12 @@ msgstr "Konvertera %1"
 msgid "Transitional"
 msgstr "Övergångsklipp"
 
-#: src/lib/job.cc:105
+#: src/lib/job.cc:104
 msgid "Unknown error"
 msgstr "Okänt fel"
 
 # Svengelska
-#: src/lib/ffmpeg_decoder.cc:387
+#: src/lib/ffmpeg_decoder.cc:264
 #, fuzzy
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Okänt audio-sampelformat (%1)"
@@ -430,12 +422,16 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:300
+#: src/lib/film.cc:273
+msgid "You must add some content to the DCP before creating it"
+msgstr ""
+
+#: src/lib/film.cc:232
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:576
+#: src/lib/util.cc:494
 #, fuzzy
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
@@ -444,11 +440,12 @@ msgstr "uppkopplingen tajmade ur"
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:337
-msgid "content"
+#: src/lib/film.cc:269
+#, fuzzy
+msgid "container"
 msgstr "innehåll"
 
-#: src/lib/film.cc:341
+#: src/lib/film.cc:277
 msgid "content type"
 msgstr "innehållstyp"
 
@@ -460,31 +457,32 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg_decoder.cc:186
+#: src/lib/ffmpeg.cc:128
 msgid "could not find audio decoder"
 msgstr "kunde inte hitta audio-avkodare"
 
-#: src/lib/ffmpeg_decoder.cc:113
+#: src/lib/ffmpeg.cc:76
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/ffmpeg_decoder.cc:205
+#: src/lib/ffmpeg_decoder.cc:498
 msgid "could not find subtitle decoder"
 msgstr "kunde inte hitta undertext-avkodare"
 
-#: src/lib/ffmpeg_decoder.cc:164
+#: src/lib/ffmpeg.cc:107
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
-#: src/lib/sndfile_decoder.cc:67
-msgid "could not open external audio file for reading"
-msgstr "kunde inte öppna extern audio-fil för läsning"
+#: src/lib/sndfile_decoder.cc:45
+#, fuzzy
+msgid "could not open audio file for reading"
+msgstr "kunde inte öppna fil för läsning"
 
 #: src/lib/exceptions.cc:29
 msgid "could not open file %1"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/dcp_video_frame.cc:388
+#: src/lib/dcp_video_frame.cc:263
 msgid "could not open file for reading"
 msgstr "kunde inte öppna fil för läsning"
 
@@ -492,7 +490,7 @@ msgstr "kunde inte öppna fil för läsning"
 msgid "could not read from file %1 (%2)"
 msgstr "kunde inte läsa från fil %1 (%2)"
 
-#: src/lib/encoder.cc:137 src/lib/encoder.cc:318
+#: src/lib/resampler.cc:76 src/lib/resampler.cc:96
 msgid "could not run sample-rate converter"
 msgstr "kunde inte köra sampelhastighetskonverteraren"
 
@@ -508,39 +506,27 @@ msgstr "kunde inte starta SSH-session"
 msgid "could not write to file %1 (%2)"
 msgstr "kunde inte skriva till fil %1 (%2)"
 
-#: src/lib/sndfile_decoder.cc:89
-msgid "external audio files have differing lengths"
-msgstr "externa audio-filer har olika längder"
-
-#: src/lib/sndfile_decoder.cc:71
-msgid "external audio files must be mono"
-msgstr "externa audio-filer måste vara mono"
-
-#: src/lib/film.cc:333
-msgid "format"
-msgstr "format"
-
-#: src/lib/transcode_job.cc:100
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/util.cc:134
+#: src/lib/util.cc:146
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:131 src/lib/util.cc:136
+#: src/lib/util.cc:143 src/lib/util.cc:148
 msgid "hours"
 msgstr "timmar"
 
-#: src/lib/util.cc:141
+#: src/lib/util.cc:153
 msgid "minute"
 msgstr "minut"
 
-#: src/lib/util.cc:143
+#: src/lib/util.cc:155
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:719
+#: src/lib/util.cc:621
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -548,43 +534,82 @@ msgstr "saknad nyckel %1 i nyckel-värde grupp"
 msgid "missing required setting %1"
 msgstr "saknad nödvändig inställning %1"
 
-#: src/lib/subtitle.cc:52
+#: src/lib/ffmpeg_decoder.cc:530
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:300 src/lib/film.cc:345
+#: src/lib/film.cc:232 src/lib/film.cc:281
 msgid "name"
 msgstr "namn"
 
-#: src/lib/imagemagick_decoder.cc:60
-msgid "no still image files found"
-msgstr "inga stillbildsfiler hittade"
-
-#: src/lib/subtitle.cc:58
+#: src/lib/ffmpeg_decoder.cc:545
 msgid "non-bitmap subtitles not yet supported"
 msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:311
+#: src/lib/job.cc:313
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/util.cc:533
-msgid "sRGB"
-msgstr "sRGB"
-
-#: src/lib/util.cc:146
+#: src/lib/util.cc:158
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/lib/film.cc:311
-msgid "still"
-msgstr "stillbild"
+#~ msgid "1.66 within Flat"
+#~ msgstr "1,66 innanför Flat"
+
+#~ msgid "16:9 within Flat"
+#~ msgstr "16:9 innanför Flat"
+
+#~ msgid "16:9 within Scope"
+#~ msgstr "16:9 innanför Scope"
+
+#~ msgid "4:3 within Flat"
+#~ msgstr "4:3 innanför Flat"
+
+#~ msgid "A/B transcode %1"
+#~ msgstr "A/B konvertera %1"
+
+#~ msgid "Cannot resample audio as libswresample is not present"
+#~ msgstr ""
+#~ "Kan inte omsampla ljudet eftersom libswresample inte finns tillgängligt"
+
+#~ msgid "Examine content of %1"
+#~ msgstr "Undersök innehållet i %1"
+
+#~ msgid "Flat without stretch"
+#~ msgstr "Flat utan utsträckning"
+
+#~ msgid "Rec 709"
+#~ msgstr "Rec 709"
+
+#~ msgid "Scope without stretch"
+#~ msgstr "Scope utan utsträckning"
+
+#~ msgid "could not open external audio file for reading"
+#~ msgstr "kunde inte öppna extern audio-fil för läsning"
+
+#~ msgid "external audio files have differing lengths"
+#~ msgstr "externa audio-filer har olika längder"
+
+#~ msgid "external audio files must be mono"
+#~ msgstr "externa audio-filer måste vara mono"
+
+#~ msgid "format"
+#~ msgstr "format"
+
+#~ msgid "no still image files found"
+#~ msgstr "inga stillbildsfiler hittade"
+
+#~ msgid "sRGB"
+#~ msgstr "sRGB"
+
+#~ msgid "still"
+#~ msgstr "stillbild"
 
-#: src/lib/film.cc:311
-msgid "video"
-msgstr "video"
+#~ msgid "video"
+#~ msgstr "video"
 
 #~ msgid "1.33"
 #~ msgstr "1,33"
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 43c9b12f1..fb379ab33 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+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,125 +17,128 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:184
-msgid "&Analyse audio"
-msgstr "&Analizar audio"
+#: src/tools/dcpomatic.cc:309
+msgid "%1 already exists as a file, so you cannot use it for a new film."
+msgstr ""
 
-#: src/tools/dvdomatic.cc:195
+#: src/tools/dcpomatic.cc:196
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:169
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:193
+#: src/tools/dcpomatic.cc:194
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dvdomatic.cc:198
+#: src/tools/dcpomatic.cc:199
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dvdomatic.cc:197
+#: src/tools/dcpomatic.cc:198
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:183
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
-#: src/tools/dvdomatic.cc:162
+#: src/tools/dcpomatic.cc:159
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
+#: src/tools/dcpomatic.cc:176 src/tools/dcpomatic.cc:179
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
-#: src/tools/dvdomatic.cc:166
+#: src/tools/dcpomatic.cc:163
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dvdomatic.cc:164
+#: src/tools/dcpomatic.cc:171
+msgid "&Quit"
+msgstr "&Salir"
+
+#: src/tools/dcpomatic.cc:161
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dvdomatic.cc:181
+#: src/tools/dcpomatic.cc:184
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dvdomatic.cc:438
-msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-
-#: src/tools/dvdomatic.cc:190
+#: src/tools/dcpomatic.cc:191
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dvdomatic.cc:188
+#: src/tools/dcpomatic.cc:189
 #, fuzzy
-msgid "About DVD-o-matic"
+msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:520
+#: src/tools/dcpomatic.cc:479
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dvdomatic.cc:360
+#: src/tools/dcpomatic.cc:348
 #, 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:287 src/tools/dcpomatic.cc:410
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:490
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:75
+#: src/tools/dcpomatic.cc:77
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dvdomatic.cc:425
-msgid "Free, open-source DCP generation from almost anything."
-msgstr ""
-"Generación de DCP a partir de casi cualquier fuente, libre y de código "
-"abierto."
-
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:158
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:185
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dvdomatic.cc:78
+#: src/tools/dcpomatic.cc:76
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:340
+#: src/tools/dcpomatic.cc:327
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:299
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:345
+#: src/tools/dcpomatic.cc:332
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
 
-#~ msgid "&Quit"
-#~ msgstr "&Salir"
+#~ msgid "&Analyse audio"
+#~ msgstr "&Analizar audio"
+
+#~ 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 "Free, open-source DCP generation from almost anything."
+#~ msgstr ""
+#~ "Generación de DCP a partir de casi cualquier fuente, libre y de código "
+#~ "abierto."
 
 #, fuzzy
 #~ msgid "The directory %1 already exists."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index b9e39b392..95b9af8e8 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+0100\n"
 "PO-Revision-Date: 2013-05-10 14:09+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,117 +16,111 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/tools/dvdomatic.cc:184
-msgid "&Analyse audio"
-msgstr "&Analyser le son"
+#: src/tools/dcpomatic.cc:309
+msgid "%1 already exists as a file, so you cannot use it for a new film."
+msgstr ""
 
-#: src/tools/dvdomatic.cc:195
+#: src/tools/dcpomatic.cc:196
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:169
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:193
+#: src/tools/dcpomatic.cc:194
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dvdomatic.cc:198
+#: src/tools/dcpomatic.cc:199
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dvdomatic.cc:197
+#: src/tools/dcpomatic.cc:198
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:183
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
-#: src/tools/dvdomatic.cc:162
+#: src/tools/dcpomatic.cc:159
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
+#: src/tools/dcpomatic.cc:176 src/tools/dcpomatic.cc:179
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: src/tools/dvdomatic.cc:166
+#: src/tools/dcpomatic.cc:163
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dvdomatic.cc:164
+#: src/tools/dcpomatic.cc:171
+msgid "&Quit"
+msgstr "&Quitter"
+
+#: src/tools/dcpomatic.cc:161
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dvdomatic.cc:181
+#: src/tools/dcpomatic.cc:184
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: src/tools/dvdomatic.cc:438
-msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-
-#: src/tools/dvdomatic.cc:190
+#: src/tools/dcpomatic.cc:191
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dvdomatic.cc:188
+#: src/tools/dcpomatic.cc:189
 #, fuzzy
-msgid "About DVD-o-matic"
+msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:520
+#: src/tools/dcpomatic.cc:479
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %s (%s)"
 
-#: src/tools/dvdomatic.cc:360
+#: src/tools/dcpomatic.cc:348
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dvdomatic.cc:300 src/tools/dvdomatic.cc:431
-#: src/tools/dvdomatic.cc:524
-msgid "DVD-o-matic"
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:490
+#, fuzzy
+msgid "DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:79
+#: src/tools/dcpomatic.cc:77
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dvdomatic.cc:437
-msgid "Free, open-source DCP generation from almost anything."
-msgstr "Création de DCP libre et open-source à partir de presque tout."
-
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:158
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:185
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dvdomatic.cc:78
+#: src/tools/dcpomatic.cc:76
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dvdomatic.cc:340
+#: src/tools/dcpomatic.cc:327
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dvdomatic.cc:319
+#: 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/dvdomatic.cc:345
+#: src/tools/dcpomatic.cc:332
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -134,8 +128,18 @@ msgstr ""
 "Aucun dossier sélectionné. Selectionnez un dossier avant de cliquer sur "
 "Ouvrir"
 
-#~ msgid "&Quit"
-#~ msgstr "&Quitter"
+#~ msgid "&Analyse audio"
+#~ msgstr "&Analyser le son"
+
+#~ 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 "Free, open-source DCP generation from almost anything."
+#~ msgstr "Création de DCP libre et open-source à partir de presque tout."
 
 #, fuzzy
 #~ msgid "The directory %1 already exists."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 2f42c2d54..f32ce97db 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+0100\n"
 "PO-Revision-Date: 2013-04-28 10:31+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,122 +17,126 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:184
-msgid "&Analyse audio"
-msgstr "&Analizza audio"
+#: src/tools/dcpomatic.cc:309
+msgid "%1 already exists as a file, so you cannot use it for a new film."
+msgstr ""
 
-#: src/tools/dvdomatic.cc:195
+#: src/tools/dcpomatic.cc:196
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:169
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:193
+#: src/tools/dcpomatic.cc:194
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dvdomatic.cc:198
+#: src/tools/dcpomatic.cc:199
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dvdomatic.cc:197
+#: src/tools/dcpomatic.cc:198
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:183
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
-#: src/tools/dvdomatic.cc:162
+#: src/tools/dcpomatic.cc:159
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
+#: src/tools/dcpomatic.cc:176 src/tools/dcpomatic.cc:179
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: src/tools/dvdomatic.cc:166
+#: src/tools/dcpomatic.cc:163
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dvdomatic.cc:164
+#: src/tools/dcpomatic.cc:171
+msgid "&Quit"
+msgstr "&Esci"
+
+#: src/tools/dcpomatic.cc:161
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dvdomatic.cc:181
+#: src/tools/dcpomatic.cc:184
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dvdomatic.cc:438
-msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-
-#: src/tools/dvdomatic.cc:190
+#: src/tools/dcpomatic.cc:191
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dvdomatic.cc:188
+#: src/tools/dcpomatic.cc:189
 #, fuzzy
-msgid "About DVD-o-matic"
+msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:520
+#: src/tools/dcpomatic.cc:479
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dvdomatic.cc:360
+#: src/tools/dcpomatic.cc:348
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dvdomatic.cc:300 src/tools/dvdomatic.cc:431
-#: src/tools/dvdomatic.cc:524
-msgid "DVD-o-matic"
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:490
+#, fuzzy
+msgid "DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:79
+#: src/tools/dcpomatic.cc:77
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dvdomatic.cc:437
-msgid "Free, open-source DCP generation from almost anything."
-msgstr "Genera DCP da quasi tutto, free e open-source."
-
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:158
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:185
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dvdomatic.cc:78
+#: src/tools/dcpomatic.cc:76
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dvdomatic.cc:340
+#: src/tools/dcpomatic.cc:327
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:299
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:345
+#: src/tools/dcpomatic.cc:332
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
 
-#~ msgid "&Quit"
-#~ msgstr "&Esci"
+#~ msgid "&Analyse audio"
+#~ msgstr "&Analizza audio"
+
+#~ 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 "Free, open-source DCP generation from almost anything."
+#~ msgstr "Genera DCP da quasi tutto, free e open-source."
 
 #~ msgid "The directory %1 already exists."
 #~ msgstr "La directory %s esiste gia'."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 157b1fb19..a7a5f82e5 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+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,116 +17,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:184
-msgid "&Analyse audio"
-msgstr "&Analysera audio"
+#: src/tools/dcpomatic.cc:309
+msgid "%1 already exists as a file, so you cannot use it for a new film."
+msgstr ""
 
-#: src/tools/dvdomatic.cc:195
+#: src/tools/dcpomatic.cc:196
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:169
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:193
+#: src/tools/dcpomatic.cc:194
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dvdomatic.cc:198
+#: src/tools/dcpomatic.cc:199
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dvdomatic.cc:197
+#: src/tools/dcpomatic.cc:198
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:183
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
-#: src/tools/dvdomatic.cc:162
+#: src/tools/dcpomatic.cc:159
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
+#: src/tools/dcpomatic.cc:176 src/tools/dcpomatic.cc:179
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
-#: src/tools/dvdomatic.cc:166
+#: src/tools/dcpomatic.cc:163
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dvdomatic.cc:164
+#: src/tools/dcpomatic.cc:171
+msgid "&Quit"
+msgstr "&Avsluta"
+
+#: src/tools/dcpomatic.cc:161
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dvdomatic.cc:181
+#: src/tools/dcpomatic.cc:184
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dvdomatic.cc:438
-msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-
-#: src/tools/dvdomatic.cc:190
+#: src/tools/dcpomatic.cc:191
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dvdomatic.cc:188
+#: src/tools/dcpomatic.cc:189
 #, fuzzy
-msgid "About DVD-o-matic"
+msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:520
+#: src/tools/dcpomatic.cc:479
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dvdomatic.cc:360
+#: src/tools/dcpomatic.cc:348
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
-#: src/tools/dvdomatic.cc:506
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:490
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:79
+#: src/tools/dcpomatic.cc:77
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dvdomatic.cc:437
-msgid "Free, open-source DCP generation from almost anything."
-msgstr ""
-"Fri, öppen-källkodsprogramvara för DCP-generering från nästan vad som helst."
-
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:158
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:185
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dvdomatic.cc:78
+#: src/tools/dcpomatic.cc:76
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dvdomatic.cc:340
+#: src/tools/dcpomatic.cc:327
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:299
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:345
+#: src/tools/dcpomatic.cc:332
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -134,8 +126,20 @@ msgstr ""
 "Du har inte valt en folder. Se till att välja en folder innan du klickar på "
 "Öppna."
 
-#~ msgid "&Quit"
-#~ msgstr "&Avsluta"
+#~ msgid "&Analyse audio"
+#~ msgstr "&Analysera audio"
+
+#~ 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 "Free, open-source DCP generation from almost anything."
+#~ msgstr ""
+#~ "Fri, öppen-källkodsprogramvara för DCP-generering från nästan vad som "
+#~ "helst."
 
 #~ msgid "The directory %1 already exists."
 #~ msgstr "Katalogen %1 finns redan."
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 34646c2b7..08a1fde08 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+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,35 +17,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/wx/film_editor.cc:449
+#: src/wx/film_editor.cc:426 src/wx/film_editor.cc:435
 msgid "%"
 msgstr "%"
 
-#: src/wx/film_editor.cc:1276
+#: src/wx/about_dialog.cc:77
+msgid ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+
+#: src/wx/config_dialog.cc:96
+msgid "(restart DCP-o-matic to see language changes)"
+msgstr ""
+
+#: src/wx/film_editor.cc:1423
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/film_editor.cc:184
-msgid "A/B"
-msgstr "A/B"
-
-#: src/wx/config_dialog.cc:61
-msgid "A/B mode"
-msgstr ""
+#: src/wx/about_dialog.cc:30
+#, fuzzy
+msgid "About DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:299
 msgid "Add"
 msgstr "Añadir"
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77
+#: src/wx/film_editor.cc:317
+msgid "Add..."
+msgstr ""
+
+#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:343
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:385
+#: src/wx/film_editor.cc:379
 msgid "Audio Delay"
 msgstr "Retardo del audio"
 
-#: src/wx/film_editor.cc:373
+#: src/wx/film_editor.cc:367
 msgid "Audio Gain"
 msgstr "Ganancia del audio"
 
@@ -53,17 +63,17 @@ msgstr "Ganancia del audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
-#: src/wx/film_editor.cc:824
-#, c-format
-msgid "Audio will be resampled from %dHz to %dHz\n"
-msgstr ""
+#: src/wx/film_editor.cc:391
+#, fuzzy
+msgid "Audio Stream"
+msgstr "Retardo del audio"
 
 #: 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:292
+#: src/wx/film_editor.cc:264
 msgid "Bottom crop"
 msgstr "Recortar abajo"
 
@@ -75,11 +85,15 @@ msgstr "Explorar..."
 msgid "But I have to use fader"
 msgstr "pero tengo que usar el fader a"
 
-#: src/wx/film_editor.cc:378
+#: src/wx/audio_mapping_view.cc:192
+msgid "C"
+msgstr ""
+
+#: src/wx/film_editor.cc:376
 msgid "Calculate..."
 msgstr "Calcular..."
 
-#: src/wx/job_manager_view.cc:97
+#: src/wx/job_manager_view.cc:98
 msgid "Cancel"
 msgstr ""
 
@@ -87,19 +101,29 @@ msgstr ""
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/film_editor.cc:329
-msgid "Colour look-up table"
-msgstr "Tabla de referencia de colores"
+#: src/wx/film_editor.cc:1163
+msgid "Choose a file or files"
+msgstr ""
 
-#: src/wx/film_editor.cc:120
+#: src/wx/film_editor.cc:131
+#, fuzzy
+msgid "Container"
+msgstr "Contenido"
+
+#: src/wx/film_editor.cc:82
 msgid "Content"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:130
+#: src/wx/film_editor.cc:136
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: src/wx/film_viewer.cc:455
+#: src/wx/audio_mapping_view.cc:181
+#, fuzzy
+msgid "Content channel"
+msgstr "1 canal"
+
+#: src/wx/film_viewer.cc:326
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
@@ -109,26 +133,16 @@ msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "No se pudo crear el DCP: %s"
 
-#: src/wx/film_viewer.cc:128
-#, c-format
-msgid "Could not open content file (%s)"
-msgstr "No se pudo abrir el fichero (%s)"
-
-#: src/wx/film_editor.cc:513
-#, c-format
-msgid "Could not set content: %s"
-msgstr "No se pudo establecer el contenido: %s"
-
 #: src/wx/new_film_dialog.cc:48
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/config_dialog.cc:244
+#: src/wx/config_dialog.cc:260
 #, fuzzy
 msgid "Creator"
 msgstr "Crear en carpeta"
 
-#: src/wx/film_editor.cc:1371
+#: src/wx/film_editor.cc:1322
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr ""
@@ -137,50 +151,65 @@ msgstr ""
 msgid "DCI name"
 msgstr "Nombre DCI"
 
-#: src/wx/film_editor.cc:141
+#: src/wx/film_editor.cc:84
+msgid "DCP"
+msgstr ""
+
+#: src/wx/film_editor.cc:142
 msgid "DCP Frame Rate"
 msgstr "Velocidad DCP"
 
-#: src/wx/film_editor.cc:109
+#: src/wx/film_editor.cc:115
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
-#: src/wx/wx_util.cc:61
+#: 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:44
+#: src/wx/config_dialog.cc:46
 msgid "DCP-o-matic Preferences"
 msgstr "Preferencias DCP-o-matic"
 
-#: src/wx/config_dialog.cc:46
-#, fuzzy
-msgid "DVD-o-matic Preferences"
-msgstr "Preferencias DVD-o-matic"
-
-#: src/wx/audio_dialog.cc:101
+#: src/wx/audio_dialog.cc:97
 #, fuzzy, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %1"
 
-#: src/wx/config_dialog.cc:120
+#: src/wx/config_dialog.cc:123
 msgid "Default DCI name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:138
+#, fuzzy
+msgid "Default JPEG2000 bandwidth"
+msgstr "Ancho de banda JPEG2000"
+
+#: src/wx/config_dialog.cc:128
+#, fuzzy
+msgid "Default container"
+msgstr "Tipo de contenido"
+
+#: src/wx/config_dialog.cc:133
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:114
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:125
-msgid "Default format"
-msgstr ""
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Default duration of still images"
+msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:109
+#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:110
 msgid "Details..."
 msgstr "Detalles..."
 
@@ -188,16 +217,15 @@ msgstr "Detalles..."
 msgid "Disk space required"
 msgstr "Espacio requerido en disco"
 
-#: src/wx/film_editor.cc:191
+#: src/wx/imagemagick_content_dialog.cc:36
 msgid "Duration"
 msgstr "Duración"
 
-#: src/wx/config_dialog.cc:327
+#: src/wx/config_dialog.cc:301
 msgid "Edit"
 msgstr "Editar"
 
-#: src/wx/config_dialog.cc:121 src/wx/config_dialog.cc:282
-#: src/wx/film_editor.cc:312
+#: src/wx/config_dialog.cc:124 src/wx/film_editor.cc:288
 msgid "Edit..."
 msgstr "Editar..."
 
@@ -206,18 +234,10 @@ msgstr "Editar..."
 msgid "Encoding servers"
 msgstr "Servidores de codificación"
 
-#: src/wx/film_editor.cc:171
-msgid "End"
-msgstr "Fin"
-
 #: src/wx/dci_metadata_dialog.cc:53
 msgid "Facility (e.g. DLA)"
 msgstr "Compañía (ej. DLA)"
 
-#: src/wx/film_editor.cc:73
-msgid "Film"
-msgstr "Película"
-
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Propiedades de la película"
@@ -226,14 +246,10 @@ msgstr "Propiedades de la película"
 msgid "Film name"
 msgstr "Nombre de la película"
 
-#: src/wx/film_editor.cc:307 src/wx/filter_dialog.cc:32
+#: src/wx/film_editor.cc:284 src/wx/filter_dialog.cc:32
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/wx/film_editor.cc:272
-msgid "Format"
-msgstr "Formato"
-
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
 msgstr "Fotogramas"
@@ -242,11 +258,15 @@ msgstr "Fotogramas"
 msgid "Frames already encoded"
 msgstr "Fotogramas ya codificados"
 
+#: src/wx/about_dialog.cc:60
+msgid "Free, open-source DCP generation from almost anything."
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calculadora de ganancia"
 
-#: src/wx/properties_dialog.cc:59
+#: src/wx/properties_dialog.cc:56
 msgid "Gb"
 msgstr "Gb"
 
@@ -254,7 +274,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Nombre o dirección IP"
 
-#: src/wx/film_editor.cc:1280
+#: src/wx/film_editor.cc:1427
 msgid "Hz"
 msgstr "Hz"
 
@@ -262,27 +282,48 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:201 src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:217 src/wx/config_dialog.cc:288
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/config_dialog.cc:240
+#: src/wx/imagemagick_content_dialog.cc:29
+msgid "Image"
+msgstr ""
+
+#: src/wx/config_dialog.cc:256
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:339
+#: src/wx/film_editor.cc:158
 msgid "JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/film_editor.cc:277
+#: src/wx/audio_mapping_view.cc:184
+msgid "L"
+msgstr ""
+
+#: src/wx/film_editor.cc:249
 msgid "Left crop"
 msgstr "Recorte izquierda"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:460
 msgid "Length"
 msgstr "Longitud"
 
-#: src/wx/film_editor.cc:343
+#: src/wx/audio_mapping_view.cc:196
+msgid "Lfe"
+msgstr ""
+
+#: src/wx/film_editor.cc:330
+msgid "Loop everything"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:200
+#, fuzzy
+msgid "Ls"
+msgstr "s"
+
+#: src/wx/config_dialog.cc:141 src/wx/film_editor.cc:162
 msgid "MBps"
 msgstr "MBps"
 
@@ -298,7 +339,7 @@ msgstr ""
 msgid "My Documents"
 msgstr "Mis documentos"
 
-#: src/wx/film_editor.cc:104
+#: src/wx/film_editor.cc:110
 msgid "Name"
 msgstr "Nombre"
 
@@ -306,15 +347,11 @@ msgstr "Nombre"
 msgid "New Film"
 msgstr "Nueva película"
 
-#: src/wx/film_editor.cc:309 src/wx/film_editor.cc:671
+#: src/wx/film_editor.cc:286 src/wx/film_editor.cc:769
 msgid "None"
 msgstr "Ninguno"
 
-#: src/wx/film_editor.cc:135
-msgid "Original Frame Rate"
-msgstr "Velocidad original"
-
-#: src/wx/film_editor.cc:1360
+#: src/wx/film_editor.cc:1309
 #, c-format
 msgid "Original video is %dx%d (%.2f:1)\n"
 msgstr ""
@@ -323,33 +360,37 @@ msgstr ""
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/film_editor.cc:1392
+#: src/wx/film_editor.cc:1343
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr ""
 
-#: src/wx/config_dialog.cc:213
+#: src/wx/config_dialog.cc:229
 #, fuzzy
 msgid "Password"
 msgstr "Clave del TMS"
 
-#: src/wx/job_manager_view.cc:103 src/wx/job_manager_view.cc:188
+#: src/wx/job_manager_view.cc:104 src/wx/job_manager_view.cc:206
 msgid "Pause"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:59
 msgid "Peak"
 msgstr "Pico"
 
-#: src/wx/film_viewer.cc:58
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/wx/audio_plot.cc:111
+#: src/wx/audio_plot.cc:110
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/audio_mapping_view.cc:188
+msgid "R"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:60
 msgid "RMS"
 msgstr "RMS"
 
@@ -357,67 +398,60 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Clasificación (ej. 16)"
 
-#: src/wx/config_dialog.cc:278
-#, fuzzy
-msgid "Reference filters"
-msgstr "Filtros de referencia para A/B"
-
-#: src/wx/config_dialog.cc:267
-#, fuzzy
-msgid "Reference scaler"
-msgstr "Escalador de referencia para A/B"
-
-#: src/wx/config_dialog.cc:329
+#: src/wx/config_dialog.cc:303 src/wx/film_editor.cc:319
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/wx/job_manager_view.cc:191
+#: src/wx/job_manager_view.cc:209
 msgid "Resume"
 msgstr ""
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:254
 msgid "Right crop"
 msgstr "Recorte derecha"
 
-#: src/wx/job_manager_view.cc:126
+#: src/wx/audio_mapping_view.cc:204
+#, fuzzy
+msgid "Rs"
+msgstr "s"
+
+#: src/wx/job_manager_view.cc:128
 msgid "Running"
 msgstr "Ejecutando"
 
-#: src/wx/film_editor.cc:1384
+#: src/wx/film_editor.cc:269
+#, fuzzy
+msgid "Scale to"
+msgstr "Escalador"
+
+#: src/wx/film_editor.cc:1335
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr ""
 
-#: src/wx/film_editor.cc:319
+#: src/wx/film_editor.cc:167
 msgid "Scaler"
 msgstr "Escalador"
 
-#: src/wx/film_editor.cc:411
-msgid "Select Audio File"
-msgstr "Seleccionar fichero de audio"
-
-#: src/wx/film_editor.cc:121
-msgid "Select Content File"
-msgstr "Seleccionar fichero de contenido"
-
 #: src/wx/server_dialog.cc:25
 msgid "Server"
 msgstr "Servidor"
 
-#: src/wx/config_dialog.cc:87
+#: src/wx/config_dialog.cc:85
 msgid "Set language"
 msgstr ""
 
-#: src/wx/film_editor.cc:368
+#: src/wx/film_editor.cc:362
 msgid "Show Audio..."
 msgstr "Mostrar audio..."
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:70
 msgid "Smoothing"
 msgstr "Suavizado"
 
-#: src/wx/film_editor.cc:168
-msgid "Start"
+#: src/wx/film_editor.cc:457
+#, fuzzy
+msgid "Start time"
 msgstr "Inicio"
 
 #: src/wx/dci_metadata_dialog.cc:49
@@ -428,24 +462,33 @@ msgstr "Estudio (ej. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Idioma del subtítulo (ej. EN)"
 
-#: src/wx/film_editor.cc:436
+#: src/wx/film_editor.cc:422
 msgid "Subtitle Offset"
 msgstr "Desplazamiento del subtítulo"
 
-#: src/wx/film_editor.cc:445
+#: src/wx/film_editor.cc:431
 msgid "Subtitle Scale"
 msgstr "Escala del subtítulo"
 
-#: src/wx/film_editor.cc:79
+#: src/wx/film_editor.cc:439
+#, fuzzy
+msgid "Subtitle Stream"
+msgstr "Escala del subtítulo"
+
+#: src/wx/film_editor.cc:345
 msgid "Subtitles"
 msgstr "Subtítulos"
 
+#: src/wx/about_dialog.cc:120
+msgid "Supported by"
+msgstr ""
+
 #: src/wx/config_dialog.cc:59
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:205
+#: src/wx/config_dialog.cc:221
 #, fuzzy
 msgid "Target path"
 msgstr "Ruta en el TMS"
@@ -454,7 +497,7 @@ msgstr "Ruta en el TMS"
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
-#: src/wx/config_dialog.cc:318
+#: src/wx/config_dialog.cc:292
 msgid "Threads"
 msgstr "Hilos"
 
@@ -462,65 +505,70 @@ msgstr "Hilos"
 msgid "Threads to use"
 msgstr "Hilos a utilizar"
 
-#: src/wx/config_dialog.cc:106
+#: src/wx/config_dialog.cc:104
 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:141
+#: src/wx/audio_plot.cc:140
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/wx/film_editor.cc:287
-msgid "Top crop"
-msgstr "Recortar arriba"
+#: src/wx/timeline_dialog.cc:32
+#, fuzzy
+msgid "Timeline"
+msgstr "Tiempo"
 
-#: src/wx/film_editor.cc:166
-msgid "Trim frames"
-msgstr "Recortar fotogramas"
+#: src/wx/film_editor.cc:321
+msgid "Timeline..."
+msgstr ""
 
-#: src/wx/film_editor.cc:179
-#, fuzzy
-msgid "Trim method"
-msgstr "Recortar fotogramas"
+#: src/wx/film_editor.cc:347
+msgid "Timing"
+msgstr ""
 
-#: src/wx/film_editor.cc:125
-msgid "Trust content's header"
-msgstr "Confiar en la cabecera del contenido"
+#: src/wx/film_editor.cc:259
+msgid "Top crop"
+msgstr "Recortar arriba"
+
+#: src/wx/about_dialog.cc:99
+msgid "Translated by"
+msgstr ""
 
-#: src/wx/audio_dialog.cc:55
+#: src/wx/audio_dialog.cc:54
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/film_editor.cc:114
+#: src/wx/film_editor.cc:125
 msgid "Use DCI name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/film_editor.cc:145
+#: src/wx/film_editor.cc:146
 msgid "Use best"
 msgstr "Usar la mejor"
 
-#: src/wx/film_editor.cc:395
-msgid "Use content's audio"
-msgstr "Usar el audio del contenido"
-
-#: src/wx/film_editor.cc:405
-msgid "Use external audio"
-msgstr "Usar audio externo"
-
-#: src/wx/config_dialog.cc:209
+#: src/wx/config_dialog.cc:225
 #, fuzzy
 msgid "User name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/film_editor.cc:75
+#: src/wx/film_editor.cc:341
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/wx/film_editor.cc:428
+#: src/wx/film_editor.cc:417
 msgid "With Subtitles"
 msgstr "Con subtítulos"
 
-#: src/wx/film_editor.cc:1278
+#: src/wx/about_dialog.cc:90
+msgid "Written by"
+msgstr ""
+
+#: src/wx/timeline.cc:200
+#, fuzzy
+msgid "audio"
+msgstr "Audio"
+
+#: src/wx/film_editor.cc:1425
 msgid "channels"
 msgstr "canales"
 
@@ -528,39 +576,92 @@ msgstr "canales"
 msgid "counting..."
 msgstr "contando..."
 
-#: src/wx/film_editor.cc:377
+#: src/wx/film_editor.cc:372
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:212
-msgid "encode all frames and play the subset"
-msgstr ""
-
-#: src/wx/film_editor.cc:213
-msgid "encode only the subset"
-msgstr ""
-
-#: src/wx/film_editor.cc:694 src/wx/film_editor.cc:697
-msgid "frames"
-msgstr "fotogramas"
-
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:390
+#: src/wx/film_editor.cc:385
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/film_editor.cc:440
-msgid "pixels"
-msgstr ""
-
-#. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-#: src/wx/film_editor.cc:197
+#. / TRANSLATORS: this is an abbreviation for seconds, the unit of time
+#: src/wx/config_dialog.cc:112 src/wx/imagemagick_content_dialog.cc:41
 msgid "s"
 msgstr "s"
 
-#: src/wx/properties_dialog.cc:62 src/wx/properties_dialog.cc:63
-msgid "unknown"
-msgstr "desconocido"
+#: src/wx/film_editor.cc:334
+msgid "times"
+msgstr ""
+
+#: src/wx/timeline.cc:220
+#, fuzzy
+msgid "video"
+msgstr "Vídeo"
+
+#~ msgid "A/B"
+#~ msgstr "A/B"
+
+#~ msgid "Colour look-up table"
+#~ msgstr "Tabla de referencia de colores"
+
+#~ msgid "Could not open content file (%s)"
+#~ msgstr "No se pudo abrir el fichero (%s)"
+
+#~ msgid "Could not set content: %s"
+#~ msgstr "No se pudo establecer el contenido: %s"
+
+#, fuzzy
+#~ msgid "DVD-o-matic Preferences"
+#~ msgstr "Preferencias DVD-o-matic"
+
+#~ msgid "End"
+#~ msgstr "Fin"
+
+#~ msgid "Film"
+#~ msgstr "Película"
+
+#~ msgid "Format"
+#~ msgstr "Formato"
+
+#~ msgid "Original Frame Rate"
+#~ msgstr "Velocidad original"
+
+#, fuzzy
+#~ msgid "Reference filters"
+#~ msgstr "Filtros de referencia para A/B"
+
+#, fuzzy
+#~ msgid "Reference scaler"
+#~ msgstr "Escalador de referencia para A/B"
+
+#~ 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"
+
+#~ msgid "Trust content's header"
+#~ msgstr "Confiar en la cabecera del contenido"
+
+#~ msgid "Use content's audio"
+#~ msgstr "Usar el audio del contenido"
+
+#~ msgid "Use external audio"
+#~ msgstr "Usar audio externo"
+
+#~ msgid "frames"
+#~ msgstr "fotogramas"
+
+#~ msgid "unknown"
+#~ msgstr "desconocido"
 
 #~ msgid "TMS IP address"
 #~ msgstr "Dirección IP del TMS"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 3f150bb0e..a16dd0f87 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+0100\n"
 "PO-Revision-Date: 2013-05-10 14:19+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,40 +16,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/wx/film_editor.cc:449
+#: src/wx/film_editor.cc:426 src/wx/film_editor.cc:435
 msgid "%"
 msgstr "%"
 
-#: src/wx/config_dialog.cc:98
+#: src/wx/about_dialog.cc:77
+msgid ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+
+#: src/wx/config_dialog.cc:96
 #, fuzzy
-msgid "(restart DVD-o-matic to see language changes)"
+msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(redémarrez DCP-o-matic pour voir les changements de langue)"
 
-#: src/wx/film_editor.cc:1276
+#: src/wx/film_editor.cc:1423
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/film_editor.cc:184
-msgid "A/B"
-msgstr "A/B"
-
-#: src/wx/config_dialog.cc:61
-msgid "A/B mode"
-msgstr "A/B mode"
+#: src/wx/about_dialog.cc:30
+#, fuzzy
+msgid "About DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:299
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77
+#: src/wx/film_editor.cc:317
+msgid "Add..."
+msgstr ""
+
+#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:343
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:385
+#: src/wx/film_editor.cc:379
 msgid "Audio Delay"
 msgstr "Délai audio"
 
-#: src/wx/film_editor.cc:373
+#: src/wx/film_editor.cc:367
 msgid "Audio Gain"
 msgstr "Gain audio"
 
@@ -57,17 +63,17 @@ msgstr "Gain audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Langue audio (ex. FR)"
 
-#: src/wx/film_editor.cc:824
-#, c-format
-msgid "Audio will be resampled from %dHz to %dHz\n"
-msgstr "L'audio sera rééchantillonné de %dHz à %dHz\n"
+#: src/wx/film_editor.cc:391
+#, fuzzy
+msgid "Audio Stream"
+msgstr "Délai audio"
 
 #: 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:292
+#: src/wx/film_editor.cc:264
 msgid "Bottom crop"
 msgstr "Découpe bas"
 
@@ -79,11 +85,15 @@ msgstr "Parcourir..."
 msgid "But I have to use fader"
 msgstr "Je souhaite utiliser ce volume"
 
-#: src/wx/film_editor.cc:378
+#: src/wx/audio_mapping_view.cc:192
+msgid "C"
+msgstr ""
+
+#: src/wx/film_editor.cc:376
 msgid "Calculate..."
 msgstr "Calcul..."
 
-#: src/wx/job_manager_view.cc:97
+#: src/wx/job_manager_view.cc:98
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -91,19 +101,29 @@ msgstr "Annuler"
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/film_editor.cc:329
-msgid "Colour look-up table"
-msgstr "Espace colorimétrique"
+#: src/wx/film_editor.cc:1163
+msgid "Choose a file or files"
+msgstr ""
+
+#: src/wx/film_editor.cc:131
+#, fuzzy
+msgid "Container"
+msgstr "Contenu"
 
-#: src/wx/film_editor.cc:120
+#: src/wx/film_editor.cc:82
 msgid "Content"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:130
+#: src/wx/film_editor.cc:136
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#: src/wx/film_viewer.cc:455
+#: src/wx/audio_mapping_view.cc:181
+#, fuzzy
+msgid "Content channel"
+msgstr "1 canal"
+
+#: src/wx/film_viewer.cc:326
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
@@ -113,25 +133,15 @@ msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Impossible de créer le DCP : %s"
 
-#: src/wx/film_viewer.cc:128
-#, c-format
-msgid "Could not open content file (%s)"
-msgstr "Ouverture du contenu impossible (%s)"
-
-#: src/wx/film_editor.cc:513
-#, c-format
-msgid "Could not set content: %s"
-msgstr "Sélectionner du contenu impossible : %s"
-
 #: src/wx/new_film_dialog.cc:48
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
-#: src/wx/config_dialog.cc:244
+#: src/wx/config_dialog.cc:260
 msgid "Creator"
 msgstr "Créateur"
 
-#: src/wx/film_editor.cc:1371
+#: src/wx/film_editor.cc:1322
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Découpe de %dx%d (%.2f:1)\n"
@@ -140,49 +150,64 @@ msgstr "Découpe de %dx%d (%.2f:1)\n"
 msgid "DCI name"
 msgstr "Nom DCI"
 
-#: src/wx/film_editor.cc:141
+#: src/wx/film_editor.cc:84
+msgid "DCP"
+msgstr ""
+
+#: src/wx/film_editor.cc:142
 msgid "DCP Frame Rate"
 msgstr "Cadence image du DCP"
 
-#: src/wx/film_editor.cc:109
+#: src/wx/film_editor.cc:115
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
-#: src/wx/wx_util.cc:61
+#: src/wx/film_editor.cc:152
+#, fuzzy
+msgid "DCP audio channels"
+msgstr "canaux"
+
+#: 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:44
+#: src/wx/config_dialog.cc:46
 msgid "DCP-o-matic Preferences"
 msgstr "Préférences DCP-o-matic"
 
-#: src/wx/config_dialog.cc:46
-#, fuzzy
-msgid "DVD-o-matic Preferences"
-msgstr "Préférences de DCP-o-matic"
-
-#: src/wx/audio_dialog.cc:101
+#: src/wx/audio_dialog.cc:97
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:120
+#: src/wx/config_dialog.cc:123
 msgid "Default DCI name details"
 msgstr "Détails du nom DCI par défaut"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:138
+#, fuzzy
+msgid "Default JPEG2000 bandwidth"
+msgstr "Qualité JPEG2000"
+
+#: src/wx/config_dialog.cc:128
+#, fuzzy
+msgid "Default container"
+msgstr "Type de contenu par défaut"
+
+#: src/wx/config_dialog.cc:133
 msgid "Default content type"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:114
 msgid "Default directory for new films"
 msgstr "Dossier par défaut des nouveaux films"
 
-#: src/wx/config_dialog.cc:125
-msgid "Default format"
-msgstr "Format par défaut"
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Default duration of still images"
+msgstr "Dossier par défaut des nouveaux films"
 
-#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:109
+#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:110
 msgid "Details..."
 msgstr "Détails..."
 
@@ -190,16 +215,15 @@ msgstr "Détails..."
 msgid "Disk space required"
 msgstr "Espace disque requis"
 
-#: src/wx/film_editor.cc:191
+#: src/wx/imagemagick_content_dialog.cc:36
 msgid "Duration"
 msgstr "Durée"
 
-#: src/wx/config_dialog.cc:327
+#: src/wx/config_dialog.cc:301
 msgid "Edit"
 msgstr "Édition"
 
-#: src/wx/config_dialog.cc:121 src/wx/config_dialog.cc:282
-#: src/wx/film_editor.cc:312
+#: src/wx/config_dialog.cc:124 src/wx/film_editor.cc:288
 msgid "Edit..."
 msgstr "Éditer..."
 
@@ -208,18 +232,10 @@ msgstr "Éditer..."
 msgid "Encoding servers"
 msgstr "Serveurs d'encodage"
 
-#: src/wx/film_editor.cc:171
-msgid "End"
-msgstr "Fin"
-
 #: src/wx/dci_metadata_dialog.cc:53
 msgid "Facility (e.g. DLA)"
 msgstr "Laboratoire (ex. DLA)"
 
-#: src/wx/film_editor.cc:73
-msgid "Film"
-msgstr "Film"
-
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Propriétés du film"
@@ -228,14 +244,10 @@ msgstr "Propriétés du film"
 msgid "Film name"
 msgstr "Nom du Film"
 
-#: src/wx/film_editor.cc:307 src/wx/filter_dialog.cc:32
+#: src/wx/film_editor.cc:284 src/wx/filter_dialog.cc:32
 msgid "Filters"
 msgstr "Filtres"
 
-#: src/wx/film_editor.cc:272
-msgid "Format"
-msgstr "Format"
-
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
 msgstr "Images"
@@ -244,11 +256,15 @@ msgstr "Images"
 msgid "Frames already encoded"
 msgstr "Images déjà encodées"
 
+#: src/wx/about_dialog.cc:60
+msgid "Free, open-source DCP generation from almost anything."
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calculateur de gain"
 
-#: src/wx/properties_dialog.cc:59
+#: src/wx/properties_dialog.cc:56
 msgid "Gb"
 msgstr "Gb"
 
@@ -256,7 +272,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
-#: src/wx/film_editor.cc:1280
+#: src/wx/film_editor.cc:1427
 msgid "Hz"
 msgstr "Hz"
 
@@ -264,27 +280,48 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Je veux le jouer à ce volume"
 
-#: src/wx/config_dialog.cc:201 src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:217 src/wx/config_dialog.cc:288
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/config_dialog.cc:240
+#: src/wx/imagemagick_content_dialog.cc:29
+msgid "Image"
+msgstr ""
+
+#: src/wx/config_dialog.cc:256
 msgid "Issuer"
 msgstr "Emetteur"
 
-#: src/wx/film_editor.cc:339
+#: src/wx/film_editor.cc:158
 msgid "JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000"
 
-#: src/wx/film_editor.cc:277
+#: src/wx/audio_mapping_view.cc:184
+msgid "L"
+msgstr ""
+
+#: src/wx/film_editor.cc:249
 msgid "Left crop"
 msgstr "Découpe gauche"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:460
 msgid "Length"
 msgstr "Longueur / durée"
 
-#: src/wx/film_editor.cc:343
+#: src/wx/audio_mapping_view.cc:196
+msgid "Lfe"
+msgstr ""
+
+#: src/wx/film_editor.cc:330
+msgid "Loop everything"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:200
+#, fuzzy
+msgid "Ls"
+msgstr "s"
+
+#: src/wx/config_dialog.cc:141 src/wx/film_editor.cc:162
 msgid "MBps"
 msgstr "MBps"
 
@@ -300,7 +337,7 @@ msgstr "Divers"
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: src/wx/film_editor.cc:104
+#: src/wx/film_editor.cc:110
 msgid "Name"
 msgstr "Nom"
 
@@ -308,15 +345,11 @@ msgstr "Nom"
 msgid "New Film"
 msgstr "Nouveau Film"
 
-#: src/wx/film_editor.cc:309 src/wx/film_editor.cc:671
+#: src/wx/film_editor.cc:286 src/wx/film_editor.cc:769
 msgid "None"
 msgstr "Aucun"
 
-#: src/wx/film_editor.cc:135
-msgid "Original Frame Rate"
-msgstr "Cadence d'images originale"
-
-#: src/wx/film_editor.cc:1360
+#: 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"
@@ -325,32 +358,36 @@ msgstr "La vidéo originale est %dx%d (%.2f:1)\n"
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/film_editor.cc:1392
+#: src/wx/film_editor.cc:1343
 #, 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:213
+#: src/wx/config_dialog.cc:229
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/wx/job_manager_view.cc:103 src/wx/job_manager_view.cc:188
+#: src/wx/job_manager_view.cc:104 src/wx/job_manager_view.cc:206
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:59
 msgid "Peak"
 msgstr "Crête"
 
-#: src/wx/film_viewer.cc:58
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Lecture"
 
-#: src/wx/audio_plot.cc:111
+#: src/wx/audio_plot.cc:110
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/audio_mapping_view.cc:188
+msgid "R"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:60
 msgid "RMS"
 msgstr "RMS"
 
@@ -358,65 +395,60 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Rating (ex. 15)"
 
-#: src/wx/config_dialog.cc:278
-msgid "Reference filters"
-msgstr "Filtres de référence"
-
-#: src/wx/config_dialog.cc:267
-msgid "Reference scaler"
-msgstr "Échelle de référence"
-
-#: src/wx/config_dialog.cc:329
+#: src/wx/config_dialog.cc:303 src/wx/film_editor.cc:319
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/wx/job_manager_view.cc:191
+#: src/wx/job_manager_view.cc:209
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:254
 msgid "Right crop"
 msgstr "Découpe droite"
 
-#: src/wx/job_manager_view.cc:126
+#: src/wx/audio_mapping_view.cc:204
+#, fuzzy
+msgid "Rs"
+msgstr "s"
+
+#: src/wx/job_manager_view.cc:128
 msgid "Running"
 msgstr "Progression"
 
-#: src/wx/film_editor.cc:1384
+#: src/wx/film_editor.cc:269
+#, fuzzy
+msgid "Scale to"
+msgstr "Mise à l'échelle"
+
+#: src/wx/film_editor.cc:1335
 #, 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:319
+#: src/wx/film_editor.cc:167
 msgid "Scaler"
 msgstr "Mise à l'échelle"
 
-#: src/wx/film_editor.cc:411
-msgid "Select Audio File"
-msgstr "Sélectionner le fichier son"
-
-#: src/wx/film_editor.cc:121
-msgid "Select Content File"
-msgstr "Sélectionner le fichier vidéo"
-
 #: src/wx/server_dialog.cc:25
 msgid "Server"
 msgstr "Serveur"
 
-#: src/wx/config_dialog.cc:87
+#: src/wx/config_dialog.cc:85
 msgid "Set language"
 msgstr "Selectionnez la langue"
 
-#: src/wx/film_editor.cc:368
+#: src/wx/film_editor.cc:362
 msgid "Show Audio..."
 msgstr "Analyser le son..."
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:70
 msgid "Smoothing"
 msgstr "Lissage"
 
-#: src/wx/film_editor.cc:168
-msgid "Start"
+#: src/wx/film_editor.cc:457
+#, fuzzy
+msgid "Start time"
 msgstr "Début"
 
 #: src/wx/dci_metadata_dialog.cc:49
@@ -427,24 +459,33 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Langue de sous-titres (ex. FR)"
 
-#: src/wx/film_editor.cc:436
+#: src/wx/film_editor.cc:422
 msgid "Subtitle Offset"
 msgstr "Décalage du sous-titre"
 
-#: src/wx/film_editor.cc:445
+#: src/wx/film_editor.cc:431
 msgid "Subtitle Scale"
 msgstr "Taille du sous-titre"
 
-#: src/wx/film_editor.cc:79
+#: src/wx/film_editor.cc:439
+#, fuzzy
+msgid "Subtitle Stream"
+msgstr "Taille du sous-titre"
+
+#: src/wx/film_editor.cc:345
 msgid "Subtitles"
 msgstr "Sous-titres"
 
+#: src/wx/about_dialog.cc:120
+msgid "Supported by"
+msgstr ""
+
 #: src/wx/config_dialog.cc:59
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:205
+#: src/wx/config_dialog.cc:221
 msgid "Target path"
 msgstr "Chemin d'accès"
 
@@ -452,7 +493,7 @@ msgstr "Chemin d'accès"
 msgid "Territory (e.g. UK)"
 msgstr "Territoire (ex. FR)"
 
-#: src/wx/config_dialog.cc:318
+#: src/wx/config_dialog.cc:292
 msgid "Threads"
 msgstr "Processus"
 
@@ -460,63 +501,69 @@ msgstr "Processus"
 msgid "Threads to use"
 msgstr "Nombre de processus à utiliser"
 
-#: src/wx/config_dialog.cc:106
+#: src/wx/config_dialog.cc:104
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
-#: src/wx/audio_plot.cc:141
+#: src/wx/audio_plot.cc:140
 msgid "Time"
 msgstr "Durée"
 
-#: src/wx/film_editor.cc:287
-msgid "Top crop"
-msgstr "Découpe haut"
+#: src/wx/timeline_dialog.cc:32
+#, fuzzy
+msgid "Timeline"
+msgstr "Durée"
+
+#: src/wx/film_editor.cc:321
+msgid "Timeline..."
+msgstr ""
 
-#: src/wx/film_editor.cc:166
-msgid "Trim frames"
-msgstr "Images coupées"
+#: src/wx/film_editor.cc:347
+msgid "Timing"
+msgstr ""
 
-#: src/wx/film_editor.cc:179
-msgid "Trim method"
-msgstr "Méthod de découpage"
+#: src/wx/film_editor.cc:259
+msgid "Top crop"
+msgstr "Découpe haut"
 
-#: src/wx/film_editor.cc:125
-msgid "Trust content's header"
-msgstr "Faire confiance à l'en-tête"
+#: src/wx/about_dialog.cc:99
+msgid "Translated by"
+msgstr ""
 
-#: src/wx/audio_dialog.cc:55
+#: src/wx/audio_dialog.cc:54
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/film_editor.cc:114
+#: src/wx/film_editor.cc:125
 msgid "Use DCI name"
 msgstr "Utiliser le nom DCI"
 
-#: src/wx/film_editor.cc:145
+#: src/wx/film_editor.cc:146
 msgid "Use best"
 msgstr "Automatique"
 
-#: src/wx/film_editor.cc:395
-msgid "Use content's audio"
-msgstr "Utiliser le son intégré"
-
-#: src/wx/film_editor.cc:405
-msgid "Use external audio"
-msgstr "Utiliser une source audio externe"
-
-#: src/wx/config_dialog.cc:209
+#: src/wx/config_dialog.cc:225
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: src/wx/film_editor.cc:75
+#: src/wx/film_editor.cc:341
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/wx/film_editor.cc:428
+#: src/wx/film_editor.cc:417
 msgid "With Subtitles"
 msgstr "Avec sous-titres"
 
-#: src/wx/film_editor.cc:1278
+#: src/wx/about_dialog.cc:90
+msgid "Written by"
+msgstr ""
+
+#: src/wx/timeline.cc:200
+#, fuzzy
+msgid "audio"
+msgstr "Audio"
+
+#: src/wx/film_editor.cc:1425
 msgid "channels"
 msgstr "canaux"
 
@@ -524,39 +571,107 @@ msgstr "canaux"
 msgid "counting..."
 msgstr "calcul..."
 
-#: src/wx/film_editor.cc:377
+#: src/wx/film_editor.cc:372
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:212
-msgid "encode all frames and play the subset"
-msgstr "encoder toutes les images mais lire seulement la sélection"
-
-#: src/wx/film_editor.cc:213
-msgid "encode only the subset"
-msgstr "encoder seulement la sélection"
-
-#: src/wx/film_editor.cc:694 src/wx/film_editor.cc:697
-msgid "frames"
-msgstr "images"
-
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:390
+#: src/wx/film_editor.cc:385
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/film_editor.cc:440
-msgid "pixels"
-msgstr "pixels"
-
-#. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-#: src/wx/film_editor.cc:197
+#. / TRANSLATORS: this is an abbreviation for seconds, the unit of time
+#: src/wx/config_dialog.cc:112 src/wx/imagemagick_content_dialog.cc:41
 msgid "s"
 msgstr "s"
 
-#: src/wx/properties_dialog.cc:62 src/wx/properties_dialog.cc:63
-msgid "unknown"
-msgstr "inconnu"
+#: src/wx/film_editor.cc:334
+msgid "times"
+msgstr ""
+
+#: src/wx/timeline.cc:220
+#, fuzzy
+msgid "video"
+msgstr "Vidéo"
+
+#~ msgid "A/B"
+#~ msgstr "A/B"
+
+#~ msgid "A/B mode"
+#~ msgstr "A/B mode"
+
+#~ msgid "Audio will be resampled from %dHz to %dHz\n"
+#~ msgstr "L'audio sera rééchantillonné de %dHz à %dHz\n"
+
+#~ msgid "Colour look-up table"
+#~ msgstr "Espace colorimétrique"
+
+#~ msgid "Could not open content file (%s)"
+#~ msgstr "Ouverture du contenu impossible (%s)"
+
+#~ msgid "Could not set content: %s"
+#~ msgstr "Sélectionner du contenu impossible : %s"
+
+#, fuzzy
+#~ msgid "DVD-o-matic Preferences"
+#~ msgstr "Préférences de DCP-o-matic"
+
+#~ msgid "Default format"
+#~ msgstr "Format par défaut"
+
+#~ msgid "End"
+#~ msgstr "Fin"
+
+#~ msgid "Film"
+#~ msgstr "Film"
+
+#~ msgid "Format"
+#~ msgstr "Format"
+
+#~ msgid "Original Frame Rate"
+#~ msgstr "Cadence d'images originale"
+
+#~ msgid "Reference filters"
+#~ msgstr "Filtres de référence"
+
+#~ msgid "Reference scaler"
+#~ msgstr "Échelle de référence"
+
+#~ 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"
+
+#~ msgid "Trust content's header"
+#~ msgstr "Faire confiance à l'en-tête"
+
+#~ msgid "Use content's audio"
+#~ msgstr "Utiliser le son intégré"
+
+#~ msgid "Use external audio"
+#~ msgstr "Utiliser une source audio externe"
+
+#~ msgid "encode all frames and play the subset"
+#~ msgstr "encoder toutes les images mais lire seulement la sélection"
+
+#~ msgid "encode only the subset"
+#~ msgstr "encoder seulement la sélection"
+
+#~ msgid "frames"
+#~ msgstr "images"
+
+#~ msgid "pixels"
+#~ msgstr "pixels"
+
+#~ msgid "unknown"
+#~ msgstr "inconnu"
 
 #~ msgid "TMS IP address"
 #~ msgstr "Adresse IP du TMS"
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 92161172a..fd5b6502c 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+0100\n"
 "PO-Revision-Date: 2013-04-28 10:27+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,39 +17,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/wx/film_editor.cc:449
+#: src/wx/film_editor.cc:426 src/wx/film_editor.cc:435
 msgid "%"
 msgstr "%"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/about_dialog.cc:77
+msgid ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+
+#: src/wx/config_dialog.cc:96
 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:1276
+#: src/wx/film_editor.cc:1423
 msgid "1 channel"
 msgstr "1 canale"
 
-#: src/wx/film_editor.cc:184
-msgid "A/B"
-msgstr "A/B"
-
-#: src/wx/config_dialog.cc:61
-msgid "A/B mode"
-msgstr ""
+#: src/wx/about_dialog.cc:30
+#, fuzzy
+msgid "About DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:299
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77
+#: src/wx/film_editor.cc:317
+msgid "Add..."
+msgstr ""
+
+#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:343
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:385
+#: src/wx/film_editor.cc:379
 msgid "Audio Delay"
 msgstr "Ritardo dell'audio"
 
-#: src/wx/film_editor.cc:373
+#: src/wx/film_editor.cc:367
 msgid "Audio Gain"
 msgstr "Guadagno dell'audio"
 
@@ -57,17 +63,17 @@ msgstr "Guadagno dell'audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Lingua dell'audio (es. EN)"
 
-#: src/wx/film_editor.cc:824
-#, c-format
-msgid "Audio will be resampled from %dHz to %dHz\n"
-msgstr "L'Audio sarà ricampionato da %dHz a %dHz\n"
+#: src/wx/film_editor.cc:391
+#, fuzzy
+msgid "Audio Stream"
+msgstr "Ritardo dell'audio"
 
 #: 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:292
+#: src/wx/film_editor.cc:264
 msgid "Bottom crop"
 msgstr "Taglio in basso"
 
@@ -79,11 +85,15 @@ msgstr "Sfoglia..."
 msgid "But I have to use fader"
 msgstr "Ma dovrò riprodurre con il fader a"
 
-#: src/wx/film_editor.cc:378
+#: src/wx/audio_mapping_view.cc:192
+msgid "C"
+msgstr ""
+
+#: src/wx/film_editor.cc:376
 msgid "Calculate..."
 msgstr "Calcola..."
 
-#: src/wx/job_manager_view.cc:97
+#: src/wx/job_manager_view.cc:98
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -91,19 +101,29 @@ msgstr "Annulla"
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/film_editor.cc:329
-msgid "Colour look-up table"
-msgstr "Tabella per ricerca del colore"
+#: src/wx/film_editor.cc:1163
+msgid "Choose a file or files"
+msgstr ""
 
-#: src/wx/film_editor.cc:120
+#: src/wx/film_editor.cc:131
+#, fuzzy
+msgid "Container"
+msgstr "Contenuto"
+
+#: src/wx/film_editor.cc:82
 msgid "Content"
 msgstr "Contenuto"
 
-#: src/wx/film_editor.cc:130
+#: src/wx/film_editor.cc:136
 msgid "Content Type"
 msgstr "Tipo di contenuto"
 
-#: src/wx/film_viewer.cc:455
+#: src/wx/audio_mapping_view.cc:181
+#, fuzzy
+msgid "Content channel"
+msgstr "1 canale"
+
+#: src/wx/film_viewer.cc:326
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Non posso decodificare il video per guardarlo (%s)"
@@ -113,26 +133,16 @@ msgstr "Non posso decodificare il video per guardarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Non posso creare il DCP: %s"
 
-#: src/wx/film_viewer.cc:128
-#, c-format
-msgid "Could not open content file (%s)"
-msgstr "Non posso aprire il file del contenuto (%s)"
-
-#: src/wx/film_editor.cc:513
-#, c-format
-msgid "Could not set content: %s"
-msgstr "Non posso regolare il contenuto: %s"
-
 #: src/wx/new_film_dialog.cc:48
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
-#: src/wx/config_dialog.cc:244
+#: src/wx/config_dialog.cc:260
 #, fuzzy
 msgid "Creator"
 msgstr "Crea nella cartella"
 
-#: src/wx/film_editor.cc:1371
+#: src/wx/film_editor.cc:1322
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Tagliato da %dx%d (%.2f:1)\n"
@@ -141,50 +151,65 @@ msgstr "Tagliato da %dx%d (%.2f:1)\n"
 msgid "DCI name"
 msgstr "Nome del DCP"
 
-#: src/wx/film_editor.cc:141
+#: src/wx/film_editor.cc:84
+msgid "DCP"
+msgstr ""
+
+#: src/wx/film_editor.cc:142
 msgid "DCP Frame Rate"
 msgstr "Frequenza fotogrammi del DCP"
 
-#: src/wx/film_editor.cc:109
+#: src/wx/film_editor.cc:115
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
-#: src/wx/wx_util.cc:61
+#: 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:44
+#: src/wx/config_dialog.cc:46
 msgid "DCP-o-matic Preferences"
 msgstr "Preferenze DCP-o-matic"
 
-#: src/wx/config_dialog.cc:46
-#, fuzzy
-msgid "DVD-o-matic Preferences"
-msgstr "Preferenze DVD-o-matic"
-
-#: src/wx/audio_dialog.cc:101
+#: src/wx/audio_dialog.cc:97
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:120
+#: src/wx/config_dialog.cc:123
 msgid "Default DCI name details"
 msgstr "Dettagli del nome di default DCI"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:138
+#, fuzzy
+msgid "Default JPEG2000 bandwidth"
+msgstr "Banda passante JPEG2000"
+
+#: src/wx/config_dialog.cc:128
+#, fuzzy
+msgid "Default container"
+msgstr "Tipo di contenuto"
+
+#: src/wx/config_dialog.cc:133
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo di contenuto"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:114
 msgid "Default directory for new films"
 msgstr "Directory di default per i nuovi films"
 
-#: src/wx/config_dialog.cc:125
-msgid "Default format"
-msgstr ""
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Default duration of still images"
+msgstr "Directory di default per i nuovi films"
 
-#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:109
+#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:110
 msgid "Details..."
 msgstr "Dettagli"
 
@@ -192,16 +217,15 @@ msgstr "Dettagli"
 msgid "Disk space required"
 msgstr "Spazio su disco rischiesto"
 
-#: src/wx/film_editor.cc:191
+#: src/wx/imagemagick_content_dialog.cc:36
 msgid "Duration"
 msgstr "Durata"
 
-#: src/wx/config_dialog.cc:327
+#: src/wx/config_dialog.cc:301
 msgid "Edit"
 msgstr "Modifica"
 
-#: src/wx/config_dialog.cc:121 src/wx/config_dialog.cc:282
-#: src/wx/film_editor.cc:312
+#: src/wx/config_dialog.cc:124 src/wx/film_editor.cc:288
 msgid "Edit..."
 msgstr "Modifica..."
 
@@ -210,18 +234,10 @@ msgstr "Modifica..."
 msgid "Encoding servers"
 msgstr "Servers di codifica"
 
-#: src/wx/film_editor.cc:171
-msgid "End"
-msgstr "Fine"
-
 #: src/wx/dci_metadata_dialog.cc:53
 msgid "Facility (e.g. DLA)"
 msgstr "Facility (es. DLA)"
 
-#: src/wx/film_editor.cc:73
-msgid "Film"
-msgstr "Film"
-
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Proprietà del film"
@@ -230,14 +246,10 @@ msgstr "Proprietà del film"
 msgid "Film name"
 msgstr "Nome del film"
 
-#: src/wx/film_editor.cc:307 src/wx/filter_dialog.cc:32
+#: src/wx/film_editor.cc:284 src/wx/filter_dialog.cc:32
 msgid "Filters"
 msgstr "Filtri"
 
-#: src/wx/film_editor.cc:272
-msgid "Format"
-msgstr "Formato"
-
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
 msgstr "Fotogrammi"
@@ -246,11 +258,15 @@ msgstr "Fotogrammi"
 msgid "Frames already encoded"
 msgstr "Fotogrammi già codificati"
 
+#: src/wx/about_dialog.cc:60
+msgid "Free, open-source DCP generation from almost anything."
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calcolatore del guadagno audio"
 
-#: src/wx/properties_dialog.cc:59
+#: src/wx/properties_dialog.cc:56
 msgid "Gb"
 msgstr "Gb"
 
@@ -258,7 +274,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
-#: src/wx/film_editor.cc:1280
+#: src/wx/film_editor.cc:1427
 msgid "Hz"
 msgstr "Hz"
 
@@ -266,27 +282,48 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/config_dialog.cc:201 src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:217 src/wx/config_dialog.cc:288
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/config_dialog.cc:240
+#: src/wx/imagemagick_content_dialog.cc:29
+msgid "Image"
+msgstr ""
+
+#: src/wx/config_dialog.cc:256
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:339
+#: src/wx/film_editor.cc:158
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/film_editor.cc:277
+#: src/wx/audio_mapping_view.cc:184
+msgid "L"
+msgstr ""
+
+#: src/wx/film_editor.cc:249
 msgid "Left crop"
 msgstr "Taglio a sinistra"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:460
 msgid "Length"
 msgstr "Lunghezza"
 
-#: src/wx/film_editor.cc:343
+#: src/wx/audio_mapping_view.cc:196
+msgid "Lfe"
+msgstr ""
+
+#: src/wx/film_editor.cc:330
+msgid "Loop everything"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:200
+#, fuzzy
+msgid "Ls"
+msgstr "s"
+
+#: src/wx/config_dialog.cc:141 src/wx/film_editor.cc:162
 msgid "MBps"
 msgstr "MBps"
 
@@ -302,7 +339,7 @@ msgstr ""
 msgid "My Documents"
 msgstr "Documenti"
 
-#: src/wx/film_editor.cc:104
+#: src/wx/film_editor.cc:110
 msgid "Name"
 msgstr "Nome"
 
@@ -310,15 +347,11 @@ msgstr "Nome"
 msgid "New Film"
 msgstr "Nuovo Film"
 
-#: src/wx/film_editor.cc:309 src/wx/film_editor.cc:671
+#: src/wx/film_editor.cc:286 src/wx/film_editor.cc:769
 msgid "None"
 msgstr "Nessuno"
 
-#: src/wx/film_editor.cc:135
-msgid "Original Frame Rate"
-msgstr "Frequenza fotogrammi originale"
-
-#: src/wx/film_editor.cc:1360
+#: 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"
@@ -327,33 +360,37 @@ msgstr "Il video originale è %dx%d (%.2f:1)\n"
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
-#: src/wx/film_editor.cc:1392
+#: src/wx/film_editor.cc:1343
 #, 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:213
+#: src/wx/config_dialog.cc:229
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
 
-#: src/wx/job_manager_view.cc:103 src/wx/job_manager_view.cc:188
+#: src/wx/job_manager_view.cc:104 src/wx/job_manager_view.cc:206
 msgid "Pause"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:59
 msgid "Peak"
 msgstr "Picco"
 
-#: src/wx/film_viewer.cc:58
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/wx/audio_plot.cc:111
+#: src/wx/audio_plot.cc:110
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/audio_mapping_view.cc:188
+msgid "R"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:60
 msgid "RMS"
 msgstr "RMS"
 
@@ -361,67 +398,60 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Classificazione (es. 15)"
 
-#: src/wx/config_dialog.cc:278
-#, fuzzy
-msgid "Reference filters"
-msgstr "Filtri di riferimento A/B"
-
-#: src/wx/config_dialog.cc:267
-#, fuzzy
-msgid "Reference scaler"
-msgstr "Scalatura di riferimento A/B"
-
-#: src/wx/config_dialog.cc:329
+#: src/wx/config_dialog.cc:303 src/wx/film_editor.cc:319
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/wx/job_manager_view.cc:191
+#: src/wx/job_manager_view.cc:209
 msgid "Resume"
 msgstr ""
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:254
 msgid "Right crop"
 msgstr "Taglio a destra"
 
-#: src/wx/job_manager_view.cc:126
+#: src/wx/audio_mapping_view.cc:204
+#, fuzzy
+msgid "Rs"
+msgstr "s"
+
+#: src/wx/job_manager_view.cc:128
 msgid "Running"
 msgstr "In corso"
 
-#: src/wx/film_editor.cc:1384
+#: src/wx/film_editor.cc:269
+#, fuzzy
+msgid "Scale to"
+msgstr "Scaler"
+
+#: src/wx/film_editor.cc:1335
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Scalato a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:319
+#: src/wx/film_editor.cc:167
 msgid "Scaler"
 msgstr "Scaler"
 
-#: src/wx/film_editor.cc:411
-msgid "Select Audio File"
-msgstr "Seleziona file audio"
-
-#: src/wx/film_editor.cc:121
-msgid "Select Content File"
-msgstr "Seleziona il file con il contenuto"
-
 #: src/wx/server_dialog.cc:25
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/config_dialog.cc:87
+#: src/wx/config_dialog.cc:85
 msgid "Set language"
 msgstr "Seleziona la lingua"
 
-#: src/wx/film_editor.cc:368
+#: src/wx/film_editor.cc:362
 msgid "Show Audio..."
 msgstr "Mostra Audio..."
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:70
 msgid "Smoothing"
 msgstr "Levigatura"
 
-#: src/wx/film_editor.cc:168
-msgid "Start"
+#: src/wx/film_editor.cc:457
+#, fuzzy
+msgid "Start time"
 msgstr "Inizio"
 
 #: src/wx/dci_metadata_dialog.cc:49
@@ -432,24 +462,33 @@ msgstr "Studio (es. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Lingua dei Sottotitoli (es. FR)"
 
-#: src/wx/film_editor.cc:436
+#: src/wx/film_editor.cc:422
 msgid "Subtitle Offset"
 msgstr "Sfalsamento dei Sottotitoli"
 
-#: src/wx/film_editor.cc:445
+#: src/wx/film_editor.cc:431
 msgid "Subtitle Scale"
 msgstr "Scala dei Sottotitoli"
 
-#: src/wx/film_editor.cc:79
+#: src/wx/film_editor.cc:439
+#, fuzzy
+msgid "Subtitle Stream"
+msgstr "Scala dei Sottotitoli"
+
+#: src/wx/film_editor.cc:345
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
+#: src/wx/about_dialog.cc:120
+msgid "Supported by"
+msgstr ""
+
 #: src/wx/config_dialog.cc:59
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:205
+#: src/wx/config_dialog.cc:221
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
@@ -458,7 +497,7 @@ msgstr "Percorso di destinazione del TMS"
 msgid "Territory (e.g. UK)"
 msgstr "Nazione (es. UK)"
 
-#: src/wx/config_dialog.cc:318
+#: src/wx/config_dialog.cc:292
 msgid "Threads"
 msgstr "Threads"
 
@@ -466,64 +505,70 @@ msgstr "Threads"
 msgid "Threads to use"
 msgstr "Threads da usare"
 
-#: src/wx/config_dialog.cc:106
+#: src/wx/config_dialog.cc:104
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
-#: src/wx/audio_plot.cc:141
+#: src/wx/audio_plot.cc:140
 msgid "Time"
 msgstr "Tempo"
 
-#: src/wx/film_editor.cc:287
-msgid "Top crop"
-msgstr "Taglio in alto"
+#: src/wx/timeline_dialog.cc:32
+#, fuzzy
+msgid "Timeline"
+msgstr "Tempo"
 
-#: src/wx/film_editor.cc:166
-msgid "Trim frames"
-msgstr "Taglia fotogrammi"
+#: src/wx/film_editor.cc:321
+msgid "Timeline..."
+msgstr ""
 
-#: src/wx/film_editor.cc:179
-msgid "Trim method"
-msgstr "Metodo di taglio"
+#: src/wx/film_editor.cc:347
+msgid "Timing"
+msgstr ""
 
-#: src/wx/film_editor.cc:125
-msgid "Trust content's header"
-msgstr "Conferma l'intestazione del contenuto"
+#: src/wx/film_editor.cc:259
+msgid "Top crop"
+msgstr "Taglio in alto"
 
-#: src/wx/audio_dialog.cc:55
+#: src/wx/about_dialog.cc:99
+msgid "Translated by"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:54
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/film_editor.cc:114
+#: src/wx/film_editor.cc:125
 msgid "Use DCI name"
 msgstr "Usa nome DCI"
 
-#: src/wx/film_editor.cc:145
+#: src/wx/film_editor.cc:146
 msgid "Use best"
 msgstr "Usa la migliore"
 
-#: src/wx/film_editor.cc:395
-msgid "Use content's audio"
-msgstr "Usa l'audio del contenuto"
-
-#: src/wx/film_editor.cc:405
-msgid "Use external audio"
-msgstr "Usa l'audio esterno"
-
-#: src/wx/config_dialog.cc:209
+#: src/wx/config_dialog.cc:225
 #, fuzzy
 msgid "User name"
 msgstr "Usa nome DCI"
 
-#: src/wx/film_editor.cc:75
+#: src/wx/film_editor.cc:341
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/film_editor.cc:428
+#: src/wx/film_editor.cc:417
 msgid "With Subtitles"
 msgstr "Con sottotitoli"
 
-#: src/wx/film_editor.cc:1278
+#: src/wx/about_dialog.cc:90
+msgid "Written by"
+msgstr ""
+
+#: src/wx/timeline.cc:200
+#, fuzzy
+msgid "audio"
+msgstr "Audio"
+
+#: src/wx/film_editor.cc:1425
 msgid "channels"
 msgstr "canali"
 
@@ -531,39 +576,103 @@ msgstr "canali"
 msgid "counting..."
 msgstr "conteggio..."
 
-#: src/wx/film_editor.cc:377
+#: src/wx/film_editor.cc:372
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:212
-msgid "encode all frames and play the subset"
-msgstr "Codifica tutti i fotogrammi e riproduci la selezione"
-
-#: src/wx/film_editor.cc:213
-msgid "encode only the subset"
-msgstr "codifica solo la selezione"
-
-#: src/wx/film_editor.cc:694 src/wx/film_editor.cc:697
-msgid "frames"
-msgstr "fotogrammi"
-
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:390
+#: src/wx/film_editor.cc:385
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/film_editor.cc:440
-msgid "pixels"
-msgstr "pizels"
-
-#. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-#: src/wx/film_editor.cc:197
+#. / TRANSLATORS: this is an abbreviation for seconds, the unit of time
+#: src/wx/config_dialog.cc:112 src/wx/imagemagick_content_dialog.cc:41
 msgid "s"
 msgstr "s"
 
-#: src/wx/properties_dialog.cc:62 src/wx/properties_dialog.cc:63
-msgid "unknown"
-msgstr "sconosciuto"
+#: src/wx/film_editor.cc:334
+msgid "times"
+msgstr ""
+
+#: src/wx/timeline.cc:220
+#, fuzzy
+msgid "video"
+msgstr "Video"
+
+#~ msgid "A/B"
+#~ msgstr "A/B"
+
+#~ msgid "Audio will be resampled from %dHz to %dHz\n"
+#~ msgstr "L'Audio sarà ricampionato da %dHz a %dHz\n"
+
+#~ msgid "Colour look-up table"
+#~ msgstr "Tabella per ricerca del colore"
+
+#~ msgid "Could not open content file (%s)"
+#~ msgstr "Non posso aprire il file del contenuto (%s)"
+
+#~ msgid "Could not set content: %s"
+#~ msgstr "Non posso regolare il contenuto: %s"
+
+#, fuzzy
+#~ msgid "DVD-o-matic Preferences"
+#~ msgstr "Preferenze DVD-o-matic"
+
+#~ msgid "End"
+#~ msgstr "Fine"
+
+#~ msgid "Film"
+#~ msgstr "Film"
+
+#~ msgid "Format"
+#~ msgstr "Formato"
+
+#~ msgid "Original Frame Rate"
+#~ msgstr "Frequenza fotogrammi originale"
+
+#, fuzzy
+#~ msgid "Reference filters"
+#~ msgstr "Filtri di riferimento A/B"
+
+#, fuzzy
+#~ msgid "Reference scaler"
+#~ msgstr "Scalatura di riferimento A/B"
+
+#~ 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"
+
+#~ msgid "Trust content's header"
+#~ msgstr "Conferma l'intestazione del contenuto"
+
+#~ msgid "Use content's audio"
+#~ msgstr "Usa l'audio del contenuto"
+
+#~ msgid "Use external audio"
+#~ msgstr "Usa l'audio esterno"
+
+#~ msgid "encode all frames and play the subset"
+#~ msgstr "Codifica tutti i fotogrammi e riproduci la selezione"
+
+#~ msgid "encode only the subset"
+#~ msgstr "codifica solo la selezione"
+
+#~ msgid "frames"
+#~ msgstr "fotogrammi"
+
+#~ msgid "pixels"
+#~ msgstr "pizels"
+
+#~ msgid "unknown"
+#~ msgstr "sconosciuto"
 
 #~ msgid "TMS IP address"
 #~ msgstr "Indirizzo IP del TMS"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 02df467ca..c86fcc8f8 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-06-04 23:59+0100\n"
+"POT-Creation-Date: 2013-07-15 22:07+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,39 +17,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/wx/film_editor.cc:449
+#: src/wx/film_editor.cc:426 src/wx/film_editor.cc:435
 msgid "%"
 msgstr "%"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/about_dialog.cc:77
+msgid ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+
+#: src/wx/config_dialog.cc:96
 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:1276
+#: src/wx/film_editor.cc:1423
 msgid "1 channel"
 msgstr "1 kanal"
 
-#: src/wx/film_editor.cc:184
-msgid "A/B"
-msgstr "A/B"
-
-#: src/wx/config_dialog.cc:61
-msgid "A/B mode"
-msgstr ""
+#: src/wx/about_dialog.cc:30
+#, fuzzy
+msgid "About DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:299
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77
+#: src/wx/film_editor.cc:317
+msgid "Add..."
+msgstr ""
+
+#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:343
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:385
+#: src/wx/film_editor.cc:379
 msgid "Audio Delay"
 msgstr "Audio Fördröjning"
 
-#: src/wx/film_editor.cc:373
+#: src/wx/film_editor.cc:367
 msgid "Audio Gain"
 msgstr "Audio Förstärkning"
 
@@ -57,17 +63,17 @@ msgstr "Audio Förstärkning"
 msgid "Audio Language (e.g. EN)"
 msgstr "Audio Språk (ex. SV)"
 
-#: src/wx/film_editor.cc:824
-#, c-format
-msgid "Audio will be resampled from %dHz to %dHz\n"
-msgstr "Audio kommer att samplas om från %dHz till %dHz\n"
+#: src/wx/film_editor.cc:391
+#, fuzzy
+msgid "Audio Stream"
+msgstr "Audio Fördröjning"
 
 #: 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:292
+#: src/wx/film_editor.cc:264
 msgid "Bottom crop"
 msgstr "Nedre beskärning"
 
@@ -79,11 +85,15 @@ msgstr "Bläddra..."
 msgid "But I have to use fader"
 msgstr "Men jag måste använda mixervolym"
 
-#: src/wx/film_editor.cc:378
+#: src/wx/audio_mapping_view.cc:192
+msgid "C"
+msgstr ""
+
+#: src/wx/film_editor.cc:376
 msgid "Calculate..."
 msgstr "Beräkna..."
 
-#: src/wx/job_manager_view.cc:97
+#: src/wx/job_manager_view.cc:98
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -91,19 +101,29 @@ msgstr "Avbryt"
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/film_editor.cc:329
-msgid "Colour look-up table"
-msgstr "Färguppslagningstabell"
+#: src/wx/film_editor.cc:1163
+msgid "Choose a file or files"
+msgstr ""
 
-#: src/wx/film_editor.cc:120
+#: src/wx/film_editor.cc:131
+#, fuzzy
+msgid "Container"
+msgstr "Innehåll"
+
+#: src/wx/film_editor.cc:82
 msgid "Content"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:130
+#: src/wx/film_editor.cc:136
 msgid "Content Type"
 msgstr "Innehållstyp"
 
-#: src/wx/film_viewer.cc:455
+#: src/wx/audio_mapping_view.cc:181
+#, fuzzy
+msgid "Content channel"
+msgstr "1 kanal"
+
+#: src/wx/film_viewer.cc:326
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kunde inte avkoda video för visning (%s)"
@@ -113,26 +133,16 @@ msgstr "Kunde inte avkoda video för visning (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Kunde inte skapa DCP: %s"
 
-#: src/wx/film_viewer.cc:128
-#, c-format
-msgid "Could not open content file (%s)"
-msgstr "Kunde inte öppna innehållsfilen (%s)"
-
-#: src/wx/film_editor.cc:513
-#, c-format
-msgid "Could not set content: %s"
-msgstr "Kunde inte fastställa innehåll: %s"
-
 #: src/wx/new_film_dialog.cc:48
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
-#: src/wx/config_dialog.cc:244
+#: src/wx/config_dialog.cc:260
 #, fuzzy
 msgid "Creator"
 msgstr "Skapa i katalog"
 
-#: src/wx/film_editor.cc:1371
+#: src/wx/film_editor.cc:1322
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beskuren till %dx%d (%.2f:1)\n"
@@ -141,50 +151,65 @@ msgstr "Beskuren till %dx%d (%.2f:1)\n"
 msgid "DCI name"
 msgstr "DCI namn"
 
-#: src/wx/film_editor.cc:141
+#: src/wx/film_editor.cc:84
+msgid "DCP"
+msgstr ""
+
+#: src/wx/film_editor.cc:142
 msgid "DCP Frame Rate"
 msgstr "DCP bildhastighet"
 
-#: src/wx/film_editor.cc:109
+#: src/wx/film_editor.cc:115
 msgid "DCP Name"
 msgstr "DCP Namn"
 
-#: src/wx/wx_util.cc:61
+#: 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:44
+#: src/wx/config_dialog.cc:46
 msgid "DCP-o-matic Preferences"
 msgstr "DCP-o-matic Inställningar"
 
-#: src/wx/config_dialog.cc:46
-#, fuzzy
-msgid "DVD-o-matic Preferences"
-msgstr "DVD-o-matic Inställningar"
-
-#: src/wx/audio_dialog.cc:101
+#: src/wx/audio_dialog.cc:97
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:120
+#: src/wx/config_dialog.cc:123
 msgid "Default DCI name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:138
+#, fuzzy
+msgid "Default JPEG2000 bandwidth"
+msgstr "JPEG2000 bandbredd"
+
+#: src/wx/config_dialog.cc:128
+#, fuzzy
+msgid "Default container"
+msgstr "Innehållstyp"
+
+#: src/wx/config_dialog.cc:133
 #, fuzzy
 msgid "Default content type"
 msgstr "Innehållstyp"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:114
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:125
-msgid "Default format"
-msgstr ""
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Default duration of still images"
+msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:109
+#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:110
 msgid "Details..."
 msgstr "Detaljer..."
 
@@ -192,16 +217,15 @@ msgstr "Detaljer..."
 msgid "Disk space required"
 msgstr "Diskutrymme som krävs"
 
-#: src/wx/film_editor.cc:191
+#: src/wx/imagemagick_content_dialog.cc:36
 msgid "Duration"
 msgstr "Längd"
 
-#: src/wx/config_dialog.cc:327
+#: src/wx/config_dialog.cc:301
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/wx/config_dialog.cc:121 src/wx/config_dialog.cc:282
-#: src/wx/film_editor.cc:312
+#: src/wx/config_dialog.cc:124 src/wx/film_editor.cc:288
 msgid "Edit..."
 msgstr "Redigera..."
 
@@ -210,18 +234,10 @@ msgstr "Redigera..."
 msgid "Encoding servers"
 msgstr "Kodningsservrar"
 
-#: src/wx/film_editor.cc:171
-msgid "End"
-msgstr "Slut"
-
 #: src/wx/dci_metadata_dialog.cc:53
 msgid "Facility (e.g. DLA)"
 msgstr "Företag (ex. DLA)"
 
-#: src/wx/film_editor.cc:73
-msgid "Film"
-msgstr "Film"
-
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Film Egenskaper"
@@ -230,14 +246,10 @@ msgstr "Film Egenskaper"
 msgid "Film name"
 msgstr "film namn"
 
-#: src/wx/film_editor.cc:307 src/wx/filter_dialog.cc:32
+#: src/wx/film_editor.cc:284 src/wx/filter_dialog.cc:32
 msgid "Filters"
 msgstr "Filter"
 
-#: src/wx/film_editor.cc:272
-msgid "Format"
-msgstr "Format"
-
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
 msgstr "Bildrutor"
@@ -246,11 +258,15 @@ msgstr "Bildrutor"
 msgid "Frames already encoded"
 msgstr "Bildrutor redan kodade"
 
+#: src/wx/about_dialog.cc:60
+msgid "Free, open-source DCP generation from almost anything."
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Volym Kalkylator"
 
-#: src/wx/properties_dialog.cc:59
+#: src/wx/properties_dialog.cc:56
 msgid "Gb"
 msgstr "Gb"
 
@@ -258,7 +274,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Värd-namn eller IP-adress"
 
-#: src/wx/film_editor.cc:1280
+#: src/wx/film_editor.cc:1427
 msgid "Hz"
 msgstr "Hz"
 
@@ -266,27 +282,48 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Jag vill spela upp detta med mixervolym"
 
-#: src/wx/config_dialog.cc:201 src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:217 src/wx/config_dialog.cc:288
 msgid "IP address"
 msgstr "IP-adress"
 
-#: src/wx/config_dialog.cc:240
+#: src/wx/imagemagick_content_dialog.cc:29
+msgid "Image"
+msgstr ""
+
+#: src/wx/config_dialog.cc:256
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:339
+#: src/wx/film_editor.cc:158
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbredd"
 
-#: src/wx/film_editor.cc:277
+#: src/wx/audio_mapping_view.cc:184
+msgid "L"
+msgstr ""
+
+#: src/wx/film_editor.cc:249
 msgid "Left crop"
 msgstr "Vänster beskärning"
 
-#: src/wx/film_editor.cc:159
+#: src/wx/film_editor.cc:460
 msgid "Length"
 msgstr "Längd"
 
-#: src/wx/film_editor.cc:343
+#: src/wx/audio_mapping_view.cc:196
+msgid "Lfe"
+msgstr ""
+
+#: src/wx/film_editor.cc:330
+msgid "Loop everything"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:200
+#, fuzzy
+msgid "Ls"
+msgstr "s"
+
+#: src/wx/config_dialog.cc:141 src/wx/film_editor.cc:162
 msgid "MBps"
 msgstr "MBps"
 
@@ -302,7 +339,7 @@ msgstr ""
 msgid "My Documents"
 msgstr "Mina Dokument"
 
-#: src/wx/film_editor.cc:104
+#: src/wx/film_editor.cc:110
 msgid "Name"
 msgstr "Namn"
 
@@ -310,15 +347,11 @@ msgstr "Namn"
 msgid "New Film"
 msgstr "Ny Film"
 
-#: src/wx/film_editor.cc:309 src/wx/film_editor.cc:671
+#: src/wx/film_editor.cc:286 src/wx/film_editor.cc:769
 msgid "None"
 msgstr "Inget"
 
-#: src/wx/film_editor.cc:135
-msgid "Original Frame Rate"
-msgstr "Ursprunglig bildhastighet"
-
-#: src/wx/film_editor.cc:1360
+#: 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"
@@ -327,33 +360,37 @@ msgstr "Original-videon är %dx%d (%.2f:1)\n"
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/film_editor.cc:1392
+#: src/wx/film_editor.cc:1343
 #, 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:213
+#: src/wx/config_dialog.cc:229
 #, fuzzy
 msgid "Password"
 msgstr "TMS lösenord"
 
-#: src/wx/job_manager_view.cc:103 src/wx/job_manager_view.cc:188
+#: src/wx/job_manager_view.cc:104 src/wx/job_manager_view.cc:206
 msgid "Pause"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:59
 msgid "Peak"
 msgstr "Topp"
 
-#: src/wx/film_viewer.cc:58
+#: src/wx/film_viewer.cc:64
 msgid "Play"
 msgstr "Spela"
 
-#: src/wx/audio_plot.cc:111
+#: src/wx/audio_plot.cc:110
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/audio_mapping_view.cc:188
+msgid "R"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:60
 msgid "RMS"
 msgstr "RMS"
 
@@ -361,67 +398,60 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Klassificering (ex. 15)"
 
-#: src/wx/config_dialog.cc:278
-#, fuzzy
-msgid "Reference filters"
-msgstr "Referensfilter för A/B"
-
-#: src/wx/config_dialog.cc:267
-#, fuzzy
-msgid "Reference scaler"
-msgstr "Referensomskalare för A/B"
-
-#: src/wx/config_dialog.cc:329
+#: src/wx/config_dialog.cc:303 src/wx/film_editor.cc:319
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/wx/job_manager_view.cc:191
+#: src/wx/job_manager_view.cc:209
 msgid "Resume"
 msgstr ""
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:254
 msgid "Right crop"
 msgstr "Höger beskärning"
 
-#: src/wx/job_manager_view.cc:126
+#: src/wx/audio_mapping_view.cc:204
+#, fuzzy
+msgid "Rs"
+msgstr "s"
+
+#: src/wx/job_manager_view.cc:128
 msgid "Running"
 msgstr "Körs"
 
-#: src/wx/film_editor.cc:1384
+#: src/wx/film_editor.cc:269
+#, fuzzy
+msgid "Scale to"
+msgstr "Omskalare"
+
+#: src/wx/film_editor.cc:1335
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skalad till %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:319
+#: src/wx/film_editor.cc:167
 msgid "Scaler"
 msgstr "Omskalare"
 
-#: src/wx/film_editor.cc:411
-msgid "Select Audio File"
-msgstr "Välj audiofil"
-
-#: src/wx/film_editor.cc:121
-msgid "Select Content File"
-msgstr "Välj innehållsfil"
-
 #: src/wx/server_dialog.cc:25
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/config_dialog.cc:87
+#: src/wx/config_dialog.cc:85
 msgid "Set language"
 msgstr "Välj språk"
 
-#: src/wx/film_editor.cc:368
+#: src/wx/film_editor.cc:362
 msgid "Show Audio..."
 msgstr "Visa Audio..."
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:70
 msgid "Smoothing"
 msgstr "Utjämning"
 
-#: src/wx/film_editor.cc:168
-msgid "Start"
+#: src/wx/film_editor.cc:457
+#, fuzzy
+msgid "Start time"
 msgstr "Start"
 
 #: src/wx/dci_metadata_dialog.cc:49
@@ -432,24 +462,33 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Undertextspråk (ex. SV)"
 
-#: src/wx/film_editor.cc:436
+#: src/wx/film_editor.cc:422
 msgid "Subtitle Offset"
 msgstr "Undertext Förskjutning"
 
-#: src/wx/film_editor.cc:445
+#: src/wx/film_editor.cc:431
 msgid "Subtitle Scale"
 msgstr "Undertext Skalning"
 
-#: src/wx/film_editor.cc:79
+#: src/wx/film_editor.cc:439
+#, fuzzy
+msgid "Subtitle Stream"
+msgstr "Undertext Skalning"
+
+#: src/wx/film_editor.cc:345
 msgid "Subtitles"
 msgstr "Undertexter"
 
+#: src/wx/about_dialog.cc:120
+msgid "Supported by"
+msgstr ""
+
 #: src/wx/config_dialog.cc:59
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:205
+#: src/wx/config_dialog.cc:221
 #, fuzzy
 msgid "Target path"
 msgstr "TMS målsökväg"
@@ -458,7 +497,7 @@ msgstr "TMS målsökväg"
 msgid "Territory (e.g. UK)"
 msgstr "Område (ex. SV)"
 
-#: src/wx/config_dialog.cc:318
+#: src/wx/config_dialog.cc:292
 msgid "Threads"
 msgstr "Trådar"
 
@@ -466,65 +505,70 @@ msgstr "Trådar"
 msgid "Threads to use"
 msgstr "Antal trådar att använda"
 
-#: src/wx/config_dialog.cc:106
+#: src/wx/config_dialog.cc:104
 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:141
+#: src/wx/audio_plot.cc:140
 msgid "Time"
 msgstr "Tid"
 
-#: src/wx/film_editor.cc:287
-msgid "Top crop"
-msgstr "Övre beskärning"
+#: src/wx/timeline_dialog.cc:32
+#, fuzzy
+msgid "Timeline"
+msgstr "Tid"
 
-#: src/wx/film_editor.cc:166
-msgid "Trim frames"
-msgstr "Skippa bilder"
+#: src/wx/film_editor.cc:321
+msgid "Timeline..."
+msgstr ""
 
-#: src/wx/film_editor.cc:179
-#, fuzzy
-msgid "Trim method"
-msgstr "Skippa bilder"
+#: src/wx/film_editor.cc:347
+msgid "Timing"
+msgstr ""
 
-#: src/wx/film_editor.cc:125
-msgid "Trust content's header"
-msgstr "Lita på källans information"
+#: src/wx/film_editor.cc:259
+msgid "Top crop"
+msgstr "Övre beskärning"
 
-#: src/wx/audio_dialog.cc:55
+#: src/wx/about_dialog.cc:99
+msgid "Translated by"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:54
 msgid "Type"
 msgstr "Typ"
 
-#: src/wx/film_editor.cc:114
+#: src/wx/film_editor.cc:125
 msgid "Use DCI name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/film_editor.cc:145
+#: src/wx/film_editor.cc:146
 msgid "Use best"
 msgstr "Använd bästa"
 
-#: src/wx/film_editor.cc:395
-msgid "Use content's audio"
-msgstr "Använd innehållets audio"
-
-#: src/wx/film_editor.cc:405
-msgid "Use external audio"
-msgstr "Använd extern audio"
-
-#: src/wx/config_dialog.cc:209
+#: src/wx/config_dialog.cc:225
 #, fuzzy
 msgid "User name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/film_editor.cc:75
+#: src/wx/film_editor.cc:341
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/film_editor.cc:428
+#: src/wx/film_editor.cc:417
 msgid "With Subtitles"
 msgstr "Med Undertexter"
 
-#: src/wx/film_editor.cc:1278
+#: src/wx/about_dialog.cc:90
+msgid "Written by"
+msgstr ""
+
+#: src/wx/timeline.cc:200
+#, fuzzy
+msgid "audio"
+msgstr "Audio"
+
+#: src/wx/film_editor.cc:1425
 msgid "channels"
 msgstr "kanaler"
 
@@ -532,39 +576,98 @@ msgstr "kanaler"
 msgid "counting..."
 msgstr "räknar..."
 
-#: src/wx/film_editor.cc:377
+#: src/wx/film_editor.cc:372
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:212
-msgid "encode all frames and play the subset"
-msgstr ""
-
-#: src/wx/film_editor.cc:213
-msgid "encode only the subset"
-msgstr ""
-
-#: src/wx/film_editor.cc:694 src/wx/film_editor.cc:697
-msgid "frames"
-msgstr "bilder"
-
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:390
+#: src/wx/film_editor.cc:385
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/film_editor.cc:440
-msgid "pixels"
-msgstr "pixlar"
-
-#. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-#: src/wx/film_editor.cc:197
+#. / TRANSLATORS: this is an abbreviation for seconds, the unit of time
+#: src/wx/config_dialog.cc:112 src/wx/imagemagick_content_dialog.cc:41
 msgid "s"
 msgstr "s"
 
-#: src/wx/properties_dialog.cc:62 src/wx/properties_dialog.cc:63
-msgid "unknown"
-msgstr "okänt"
+#: src/wx/film_editor.cc:334
+msgid "times"
+msgstr ""
+
+#: src/wx/timeline.cc:220
+#, fuzzy
+msgid "video"
+msgstr "Video"
+
+#~ msgid "A/B"
+#~ msgstr "A/B"
+
+#~ msgid "Audio will be resampled from %dHz to %dHz\n"
+#~ msgstr "Audio kommer att samplas om från %dHz till %dHz\n"
+
+#~ msgid "Colour look-up table"
+#~ msgstr "Färguppslagningstabell"
+
+#~ msgid "Could not open content file (%s)"
+#~ msgstr "Kunde inte öppna innehållsfilen (%s)"
+
+#~ msgid "Could not set content: %s"
+#~ msgstr "Kunde inte fastställa innehåll: %s"
+
+#, fuzzy
+#~ msgid "DVD-o-matic Preferences"
+#~ msgstr "DVD-o-matic Inställningar"
+
+#~ msgid "End"
+#~ msgstr "Slut"
+
+#~ msgid "Film"
+#~ msgstr "Film"
+
+#~ msgid "Format"
+#~ msgstr "Format"
+
+#~ msgid "Original Frame Rate"
+#~ msgstr "Ursprunglig bildhastighet"
+
+#, fuzzy
+#~ msgid "Reference filters"
+#~ msgstr "Referensfilter för A/B"
+
+#, fuzzy
+#~ msgid "Reference scaler"
+#~ msgstr "Referensomskalare för A/B"
+
+#~ 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"
+
+#~ msgid "Trust content's header"
+#~ msgstr "Lita på källans information"
+
+#~ msgid "Use content's audio"
+#~ msgstr "Använd innehållets audio"
+
+#~ msgid "Use external audio"
+#~ msgstr "Använd extern audio"
+
+#~ msgid "frames"
+#~ msgstr "bilder"
+
+#~ msgid "pixels"
+#~ msgstr "pixlar"
+
+#~ msgid "unknown"
+#~ msgstr "okänt"
 
 #~ msgid "TMS IP address"
 #~ msgstr "TMS IP-adress"