pot/merge.

21 files changed, 792 insertions, 841 deletions

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 76943e2cd..8c1c25eb4 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 15:29+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr "%1 [Ton]"
 
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
 msgid "%1 [movie]"
 msgstr "%1 [Film]"
 
@@ -62,7 +62,7 @@ msgstr "Werbung"
 msgid "An error occurred whilst handling the file %1."
 msgstr "Beim Bearbeiten der Datei %1 trat ein Fehler auf."
 
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
 msgid "Analyse audio"
 msgstr "Audio analysieren"
 
@@ -82,56 +82,60 @@ msgstr "Audioabtastrate wird auf %1kHz angepasst."
 msgid "Audio will not be resampled"
 msgstr "Audioabtastrate wird nicht verändert werden."
 
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
 msgid "BT709"
 msgstr ""
 
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
 msgid "C"
 msgstr ""
 
@@ -143,7 +147,7 @@ msgstr "Abgebrochen"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
 msgid "Centre"
 msgstr "Center"
 
@@ -151,19 +155,20 @@ msgstr "Center"
 msgid "Checking existing image data"
 msgstr "Überprüfe bestehende Bilddateien"
 
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
 msgid "Colourspace"
 msgstr ""
 
@@ -284,7 +289,7 @@ msgstr ""
 msgid "Could not decode image file (%1)"
 msgstr ""
 
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -420,7 +425,7 @@ msgstr ""
 msgid "Examine content"
 msgstr "Inhalt wird überprüft"
 
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
 msgid "FCC"
 msgstr ""
 
@@ -432,15 +437,15 @@ msgstr "Authentifizierung mit Server (%1) fehlgeschlagen"
 msgid "Feature"
 msgstr "Hauptfilm"
 
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
 msgid "Finding length"
 msgstr "Suche Länge"
 
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
 msgid "Finding subtitles"
 msgstr ""
 
@@ -452,11 +457,11 @@ msgstr "Flat"
 msgid "Full frame"
 msgstr "Ganzes Bild"
 
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -464,11 +469,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradient Glätter"
 
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
 msgid "Hearing impaired"
 msgstr "HI"
 
@@ -476,11 +481,11 @@ msgstr "HI"
 msgid "High quality 3D denoiser"
 msgstr "3D Rauschunterdrückung hoher Qualität"
 
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
 msgid "IEC61966-2-4"
 msgstr ""
 
@@ -488,10 +493,6 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
 #: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM Zustellung: $CPL_NAME"
@@ -500,58 +501,54 @@ msgstr "KDM Zustellung: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel De-Interlacer"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
 msgid "Left centre"
 msgstr "Center links"
 
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
 msgid "Left rear surround"
 msgstr "Surround hinten links"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
 msgid "Left surround"
 msgstr "Surround links"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
 msgid "Ls"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
 #: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
@@ -640,11 +637,11 @@ msgstr "Programmfehler bei %1:%2"
 msgid "Public Service Announcement"
 msgstr "Hinweis"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -652,7 +649,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Freigabehinweis"
 
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
 msgid "Rc"
 msgstr ""
 
@@ -664,36 +661,36 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
 msgid "Right centre"
 msgstr "Center rechts"
 
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
 msgid "Right rear surround"
 msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
 msgid "Right surround"
 msgstr "Surround rechts"
 
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
 msgid "Rs"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
 msgid "SMPTE 240M"
 msgstr ""
 
@@ -743,7 +740,7 @@ msgstr "Test"
 
 #: src/lib/dcp_examiner.cc:131
 msgid ""
-"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr ""
 
 #: src/lib/exceptions.cc:72
@@ -762,7 +759,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Zu wenig Speicher für diese Operation."
 
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -771,7 +768,7 @@ msgstr ""
 "kann leider nicht mit dieser älteren Version geladen werden. Sie müssen den "
 "Film neu erstellen. Sorry!"
 
-#: src/lib/film.cc:372
+#: 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 "
@@ -813,11 +810,11 @@ msgstr "Ton Sample Format (%1) nicht erkannt."
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
 
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
 msgid "Unspecified"
 msgstr ""
 
@@ -833,7 +830,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
 msgid "VI"
 msgstr ""
 
@@ -849,7 +846,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
 msgid "Visually impaired"
 msgstr "VI"
 
@@ -857,7 +854,7 @@ msgstr "VI"
 msgid "Waiting"
 msgstr "Warte..."
 
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
 msgid "YCOCG"
 msgstr ""
 
@@ -865,7 +862,7 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Und ein weiterer De-Interlacer..."
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
 msgid "You must add some content to the DCP before creating it"
 msgstr "Sie müssen erst Inhalte hinzufügen bevor Sie ein DCP erstellen können!"
 
@@ -881,7 +878,7 @@ msgstr "[Standbild]"
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
@@ -893,11 +890,11 @@ msgstr "Zeit für Verbindung abgelaufen"
 msgid "connecting"
 msgstr "verbinde..."
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
 msgid "container"
 msgstr "Containerformat"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
 msgid "content type"
 msgstr "Inhaltsbeschreibung"
 
@@ -1000,7 +997,7 @@ msgstr "wird verschoben"
 msgid "multi-part subtitles not yet supported"
 msgstr "Mehr-Segment Untertitel werden noch nicht unterstützt"
 
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
 msgid "name"
 msgstr "Name"
 
@@ -1027,7 +1024,7 @@ msgstr "sRGB"
 msgid "still"
 msgstr "Standbild"
 
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
 msgid "unknown"
 msgstr "unbekannt"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index def5016a9..bad92fe98 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 15:44+0100\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -25,7 +25,7 @@ msgstr "%1 [DCP]"
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
 msgid "%1 [movie]"
 msgstr "%1 [película]"
 
@@ -61,7 +61,7 @@ msgstr "Publicidad"
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
 msgid "Analyse audio"
 msgstr "Analizar audio"
 
@@ -81,56 +81,60 @@ msgstr "EL audio será remuestreado a %1kHz."
 msgid "Audio will not be resampled"
 msgstr "El audio no será remuestreado."
 
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
 msgid "BT709"
 msgstr ""
 
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
 msgid "C"
 msgstr ""
 
@@ -142,7 +146,7 @@ msgstr "Cancelado"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "No se puede usar el formato de pixel %1 para %2"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
 msgid "Centre"
 msgstr "Centro"
 
@@ -150,19 +154,20 @@ msgstr "Centro"
 msgid "Checking existing image data"
 msgstr "Comprobando las imágenes existentes"
 
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
 msgid "Colourspace"
 msgstr ""
 
@@ -281,7 +286,7 @@ msgstr ""
 msgid "Could not decode image file (%1)"
 msgstr "No se pudo descodificar el fichero de imagen (%1)"
 
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -416,7 +421,7 @@ msgstr "Error en el fichero SubRip: encontrado %1 cuando se esperaba %2"
 msgid "Examine content"
 msgstr "Examinar contenido"
 
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
 msgid "FCC"
 msgstr ""
 
@@ -428,15 +433,15 @@ msgstr "Fallo al identificarse con el servidor (%1)"
 msgid "Feature"
 msgstr "Película"
 
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
 msgid "Finding length"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
 msgid "Finding subtitles"
 msgstr ""
 
@@ -448,11 +453,11 @@ msgstr "Flat"
 msgid "Full frame"
 msgstr "Frame completo"
 
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -460,11 +465,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -472,11 +477,11 @@ msgstr "Sordos"
 msgid "High quality 3D denoiser"
 msgstr "Reductor de ruido 3D de alta calidad"
 
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
 msgid "IEC61966-2-4"
 msgstr ""
 
@@ -484,10 +489,6 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
 #: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envío de KDM: $CPL_NAME"
@@ -496,58 +497,54 @@ msgstr "Envío de KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
 msgid "Ls"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
 #: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr "Decodificación medio-lateral"
@@ -633,11 +630,11 @@ msgstr "Error de programación en %1:%2"
 msgid "Public Service Announcement"
 msgstr "Anuncio de servicio público"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -645,7 +642,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
 msgid "Rc"
 msgstr ""
 
@@ -657,36 +654,36 @@ msgstr ""
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
 msgid "Right surround"
 msgstr "Surround derecha"
 
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
 msgid "Rs"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
 msgid "SMPTE 240M"
 msgstr ""
 
@@ -735,8 +732,9 @@ msgid "Test"
 msgstr "Test"
 
 #: src/lib/dcp_examiner.cc:131
+#, fuzzy
 msgid ""
-"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr ""
 "La KDM no puede desencriptar el DCP. Puede que corresponda a un CPL "
 "incorrecto"
@@ -757,7 +755,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "No hubo suficiente memoria para hacer esto."
 
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -766,7 +764,7 @@ msgstr ""
 "desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
 "volver a añadir y configurar ton contenido. ¡Lo siento!"
 
-#: src/lib/film.cc:372
+#: 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 "
@@ -808,11 +806,11 @@ msgstr "Formato de audio desconocido (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
 msgid "Unspecified"
 msgstr ""
 
@@ -828,7 +826,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
 msgid "VI"
 msgstr ""
 
@@ -844,7 +842,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
 msgid "Visually impaired"
 msgstr "Ciegos"
 
@@ -852,7 +850,7 @@ msgstr "Ciegos"
 msgid "Waiting"
 msgstr "Esperando"
 
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
 msgid "YCOCG"
 msgstr ""
 
@@ -860,7 +858,7 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
@@ -876,7 +874,7 @@ msgstr "[imagen fija]"
 msgid "[subtitles]"
 msgstr "[subtítulos]"
 
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
@@ -888,11 +886,11 @@ msgstr "tiempo de conexión agotado"
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
 msgid "container"
 msgstr "continente"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
 msgid "content type"
 msgstr "tipo de contenido"
 
@@ -995,7 +993,7 @@ msgstr "moviendo"
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
 msgid "name"
 msgstr "nombre"
 
@@ -1022,7 +1020,7 @@ msgstr "sRGB"
 msgid "still"
 msgstr "imagen fija"
 
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
 msgid "unknown"
 msgstr "desconocido"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index b5653029f..6a1c245dc 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 14:41+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
 msgid "%1 [movie]"
 msgstr "%1 [vidéo]"
 
@@ -61,7 +61,7 @@ msgstr "Advertisement"
 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:52
+#: src/lib/analyse_audio_job.cc:54
 msgid "Analyse audio"
 msgstr "Analyse audio"
 
@@ -81,56 +81,60 @@ msgstr "Le son sera ré-échantillonné à %1kHz."
 msgid "Audio will not be resampled"
 msgstr "Le son ne sera pas ré-échantillonné."
 
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
 msgid "BT709"
 msgstr ""
 
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
 msgid "C"
 msgstr ""
 
@@ -142,7 +146,7 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
 msgid "Centre"
 msgstr "Centre"
 
@@ -150,19 +154,20 @@ msgstr "Centre"
 msgid "Checking existing image data"
 msgstr "Recherche de données images existantes"
 
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
 msgid "Colourspace"
 msgstr ""
 
@@ -283,7 +288,7 @@ msgstr ""
 msgid "Could not decode image file (%1)"
 msgstr ""
 
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -416,7 +421,7 @@ msgstr ""
 msgid "Examine content"
 msgstr "Examen du contenu"
 
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
 msgid "FCC"
 msgstr ""
 
@@ -428,15 +433,15 @@ msgstr "L'authentification du serveur (%1) a échouée"
 msgid "Feature"
 msgstr "Feature"
 
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
 msgid "Finding length"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
 msgid "Finding subtitles"
 msgstr ""
 
@@ -448,11 +453,11 @@ msgstr "Flat"
 msgid "Full frame"
 msgstr "Full frame"
 
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -460,11 +465,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Corrections des bandes par dégradé"
 
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -472,11 +477,11 @@ msgstr "Déficients Auditifs"
 msgid "High quality 3D denoiser"
 msgstr "Débruiteur 3D haute qualité"
 
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
 msgid "IEC61966-2-4"
 msgstr ""
 
@@ -484,10 +489,6 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr "Erreur indéterminée."
 
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
 #: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
@@ -496,58 +497,54 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr "Désentrelaceur noyau"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
 msgid "Ls"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
 #: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
@@ -632,11 +629,11 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Public Service Announcement"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -644,7 +641,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
 msgid "Rc"
 msgstr ""
 
@@ -656,36 +653,36 @@ msgstr ""
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
 msgid "Right surround"
 msgstr "Arrière droite"
 
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
 msgid "Rs"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
 msgid "SMPTE 240M"
 msgstr ""
 
@@ -735,7 +732,7 @@ msgstr "Test"
 
 #: src/lib/dcp_examiner.cc:131
 msgid ""
-"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr ""
 
 #: src/lib/exceptions.cc:72
@@ -754,7 +751,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Il n'y avait pas assez de mémoire pour faire cela."
 
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -762,7 +759,7 @@ msgstr ""
 "Ce film a été créé avec une nouvelle version de DCP-o-matic et il ne peut "
 "être ouvert dans cette version du programme. Désolé!"
 
-#: src/lib/film.cc:372
+#: 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 "
@@ -804,11 +801,11 @@ msgstr "Échantillonnage audio (%1) inconnu"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Adoucissement et flou Gaussien"
 
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
 msgid "Unspecified"
 msgstr ""
 
@@ -824,7 +821,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
 msgid "VI"
 msgstr ""
 
@@ -840,7 +837,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
@@ -848,7 +845,7 @@ msgstr "Déficients Visuels"
 msgid "Waiting"
 msgstr "En cours"
 
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
 msgid "YCOCG"
 msgstr ""
 
@@ -856,7 +853,7 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
@@ -872,7 +869,7 @@ msgstr "[restant]"
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
@@ -884,11 +881,11 @@ msgstr "temps de connexion expiré"
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
 msgid "container"
 msgstr "conteneur"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
 msgid "content type"
 msgstr "type de contenu"
 
@@ -993,7 +990,7 @@ msgstr "déplacement"
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
 msgid "name"
 msgstr "nom"
 
@@ -1020,7 +1017,7 @@ msgstr "sRGB"
 msgid "still"
 msgstr "%1 [restant]"
 
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
 msgid "unknown"
 msgstr "Inconnu"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index d9f804253..2634d2379 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 16:03+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
 msgid "%1 [movie]"
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr "Pubblicità"
 msgid "An error occurred whilst handling the file %1."
 msgstr "Errore durante l'elaborazione del file %1."
 
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
 msgid "Analyse audio"
 msgstr ""
 
@@ -81,56 +81,60 @@ msgstr "L'Audio sarà ricampionato a %1kHz"
 msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
 msgid "BT709"
 msgstr ""
 
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
 msgid "C"
 msgstr ""
 
@@ -142,7 +146,7 @@ msgstr "Cancellato"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
 msgid "Centre"
 msgstr "Centro"
 
@@ -150,19 +154,20 @@ msgstr "Centro"
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
 msgid "Colourspace"
 msgstr ""
 
@@ -280,7 +285,7 @@ msgstr ""
 msgid "Could not decode image file (%1)"
 msgstr ""
 
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -411,7 +416,7 @@ msgstr ""
 msgid "Examine content"
 msgstr "Esamino il contenuto"
 
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
 msgid "FCC"
 msgstr ""
 
@@ -423,15 +428,15 @@ msgstr "Autenticazione col server fallita (%1) "
 msgid "Feature"
 msgstr "Caratteristica"
 
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
 msgid "Finding length"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
 msgid "Finding subtitles"
 msgstr ""
 
@@ -443,11 +448,11 @@ msgstr "Flat"
 msgid "Full frame"
 msgstr "Schermo intero"
 
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -455,11 +460,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
 msgid "Hearing impaired"
 msgstr ""
 
@@ -467,11 +472,11 @@ msgstr ""
 msgid "High quality 3D denoiser"
 msgstr "Riduttore di rumore 3D di alta qualità"
 
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
 msgid "IEC61966-2-4"
 msgstr ""
 
@@ -479,10 +484,6 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
 #: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
@@ -491,58 +492,54 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr "Deinterlacciatore Kernel"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
 msgid "Left rear surround"
 msgstr ""
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
 msgid "Ls"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
 #: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
@@ -627,11 +624,11 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Annuncio di pubblico servizio"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -639,7 +636,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
 msgid "Rc"
 msgstr ""
 
@@ -651,36 +648,36 @@ msgstr ""
 msgid "Rec. 709"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
 msgid "Right rear surround"
 msgstr ""
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
 msgid "Right surround"
 msgstr "Surround destro"
 
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
 msgid "Rs"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
 msgid "SMPTE 240M"
 msgstr ""
 
@@ -730,7 +727,7 @@ msgstr "Prova"
 
 #: src/lib/dcp_examiner.cc:131
 msgid ""
-"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr ""
 
 #: src/lib/exceptions.cc:72
@@ -749,7 +746,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr ""
 
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
 #, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -760,7 +757,7 @@ msgstr ""
 "un nuovo film, ri-aggiungere i tuoi contenuti e configurarlo di nuovo. Ci "
 "dispiace!"
 
-#: src/lib/film.cc:372
+#: 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 "
@@ -803,11 +800,11 @@ msgstr "Formato di campionamento audio non riconosciuto (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Maschera unsharp e sfocatura Gaussiana"
 
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
 msgid "Unspecified"
 msgstr ""
 
@@ -823,7 +820,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
 msgid "VI"
 msgstr ""
 
@@ -840,7 +837,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
 msgid "Visually impaired"
 msgstr ""
 
@@ -848,7 +845,7 @@ msgstr ""
 msgid "Waiting"
 msgstr "Aspetta"
 
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
 msgid "YCOCG"
 msgstr ""
 
@@ -856,7 +853,7 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
 msgid "You must add some content to the DCP before creating it"
 msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
 
@@ -872,7 +869,7 @@ msgstr ""
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
@@ -884,11 +881,11 @@ msgstr "connessione scaduta"
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
 msgid "container"
 msgstr "contenitore"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
 msgid "content type"
 msgstr "tipo di contenuto"
 
@@ -991,7 +988,7 @@ msgstr ""
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
 msgid "name"
 msgstr "nome"
 
@@ -1018,7 +1015,7 @@ msgstr "sRGB"
 msgid "still"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
 msgid "unknown"
 msgstr ""
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 1aad17fde..188d03866 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 16:07+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
@@ -62,7 +62,7 @@ msgstr "Advertentie"
 msgid "An error occurred whilst handling the file %1."
 msgstr "Er is een fout opgetreden met bestand %1."
 
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
 msgid "Analyse audio"
 msgstr "Analyseer audio"
 
@@ -82,56 +82,60 @@ msgstr ""
 msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
 msgid "BT709"
 msgstr ""
 
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
 msgid "C"
 msgstr ""
 
@@ -143,7 +147,7 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
 msgid "Centre"
 msgstr "Midden"
 
@@ -151,19 +155,20 @@ msgstr "Midden"
 msgid "Checking existing image data"
 msgstr "Controleer bestaande videodata"
 
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
 msgid "Colourspace"
 msgstr ""
 
@@ -279,7 +284,7 @@ msgstr ""
 msgid "Could not decode image file (%1)"
 msgstr ""
 
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -413,7 +418,7 @@ msgstr ""
 msgid "Examine content"
 msgstr "Controleer content"
 
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
 msgid "FCC"
 msgstr ""
 
@@ -425,15 +430,15 @@ msgstr "Inlog fout met server (%1)"
 msgid "Feature"
 msgstr "Kenmerken"
 
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
 msgid "Finding length"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
 msgid "Finding subtitles"
 msgstr ""
 
@@ -445,11 +450,11 @@ msgstr "Onbewerkt"
 msgid "Full frame"
 msgstr "Full frame"
 
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -457,11 +462,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -469,11 +474,11 @@ msgstr "Slechthorenden"
 msgid "High quality 3D denoiser"
 msgstr "High quality 3D denoiser"
 
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
 msgid "IEC61966-2-4"
 msgstr ""
 
@@ -481,10 +486,6 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
 #: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM levering: $CPL_NAME"
@@ -493,58 +494,54 @@ msgstr "KDM levering: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
 msgid "Ls"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
 #: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
@@ -633,11 +630,11 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Publieke Service aankondiging"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -645,7 +642,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
 msgid "Rc"
 msgstr ""
 
@@ -657,36 +654,36 @@ msgstr ""
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
 msgid "Right surround"
 msgstr "Rechts surround"
 
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
 msgid "Rs"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
 msgid "SMPTE 240M"
 msgstr ""
 
@@ -736,7 +733,7 @@ msgstr "Test"
 
 #: src/lib/dcp_examiner.cc:131
 msgid ""
-"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr ""
 
 #: src/lib/exceptions.cc:72
@@ -755,7 +752,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Er was niet genoeg geheugen om dit uit te voeren."
 
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -763,7 +760,7 @@ msgstr ""
 "Deze film is gemaakt met een nieuwere versie van DCP-o-matic en kan niet "
 "geopend worden. Sorry!"
 
-#: src/lib/film.cc:372
+#: 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 "
@@ -805,11 +802,11 @@ msgstr "Niet herkenbaar audio sample formaat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Unsharp mask and Gaussian blur"
 
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
 msgid "Unspecified"
 msgstr ""
 
@@ -825,7 +822,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
 msgid "VI"
 msgstr ""
 
@@ -841,7 +838,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
@@ -849,7 +846,7 @@ msgstr "Slechtzienden"
 msgid "Waiting"
 msgstr "Wachten"
 
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
 msgid "YCOCG"
 msgstr ""
 
@@ -857,7 +854,7 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
 msgid "You must add some content to the DCP before creating it"
 msgstr "U moet wat content toevoegen voor het maken van de DCP"
 
@@ -873,7 +870,7 @@ msgstr "[still]"
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
 msgid "cannot contain slashes"
 msgstr "er mag geen '\" gebruikt worden"
 
@@ -885,11 +882,11 @@ msgstr "verbinding timeout"
 msgid "connecting"
 msgstr "verbinden"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
 msgid "container"
 msgstr "container"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
 msgid "content type"
 msgstr "content type"
 
@@ -992,7 +989,7 @@ msgstr "bewegend"
 msgid "multi-part subtitles not yet supported"
 msgstr "ondertitels met meerdere delen worden nog niet ondersteund."
 
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
 msgid "name"
 msgstr "naam"
 
@@ -1019,7 +1016,7 @@ msgstr "sRGB"
 msgid "still"
 msgstr "still"
 
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
 msgid "unknown"
 msgstr "onbekend"
 
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 51e6407c4..fe6027971 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
@@ -23,7 +23,7 @@ msgstr "%1 [DCP]"
 msgid "%1 [audio]"
 msgstr "%1 [аудио]"
 
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
 msgid "%1 [movie]"
 msgstr "%1 [видео]"
 
@@ -59,7 +59,7 @@ msgstr "ADV (Реклама)"
 msgid "An error occurred whilst handling the file %1."
 msgstr "Возникла ошибка при обращении к файлу %1."
 
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
 msgid "Analyse audio"
 msgstr "Анализ аудио"
 
@@ -79,56 +79,60 @@ msgstr "Аудио будет ресэмплировано в %1кГц"
 msgid "Audio will not be resampled"
 msgstr "Аудио не будет ресэмплировано"
 
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
 msgid "BT709"
 msgstr ""
 
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
 msgid "BsL"
 msgstr "BsL"
 
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
 msgid "BsR"
 msgstr "BsR"
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
 msgid "C"
 msgstr "C"
 
@@ -141,7 +145,7 @@ msgstr "Отменено"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Невозможно обработать формат пикселя %1 во время %2"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
 msgid "Centre"
 msgstr "Центральный"
 
@@ -149,19 +153,20 @@ msgstr "Центральный"
 msgid "Checking existing image data"
 msgstr "Проверка данных изображения"
 
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
 msgid "Colourspace"
 msgstr ""
 
@@ -293,7 +298,7 @@ msgstr "Не удалось декодировать JPEG2000-файл(ы) %1 (%
 msgid "Could not decode image file (%1)"
 msgstr "Не удалось декодировать изображение (%1)"
 
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -430,7 +435,7 @@ msgstr ""
 msgid "Examine content"
 msgstr "Проверка контента"
 
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
 msgid "FCC"
 msgstr ""
 
@@ -442,15 +447,15 @@ msgstr "Ошибка аутентификации сервером (%1)"
 msgid "Feature"
 msgstr "FTR (Фильм)"
 
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
 msgid "Finding length"
 msgstr "Расчет длительности"
 
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
 #, fuzzy
 msgid "Finding subtitles"
 msgstr "Субтитры SubRip"
@@ -463,11 +468,11 @@ msgstr "Flat (1998x1080)"
 msgid "Full frame"
 msgstr "FULL (2048x1080)"
 
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -475,11 +480,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Разбиение градиента"
 
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
 msgid "Hearing impaired"
 msgstr "Для слабослышащих"
 
@@ -487,11 +492,11 @@ msgstr "Для слабослышащих"
 msgid "High quality 3D denoiser"
 msgstr "Высококачественный подавитель шума 3D"
 
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
 msgid "IEC61966-2-4"
 msgstr ""
 
@@ -499,10 +504,6 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr "Неизвестно, что вызвало эту ошибку."
 
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
 #: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Назначение KDM: $CPL_NAME"
@@ -511,58 +512,54 @@ msgstr "Назначение KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Деинтерлейсинг ядром"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
 msgid "L"
 msgstr "L"
 
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
 msgid "Lc"
 msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
 msgid "Left"
 msgstr "Левый"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
 msgid "Left centre"
 msgstr "Левый центральный"
 
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
 msgid "Left rear surround"
 msgstr "Левый тыловой surround"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
 msgid "Left surround"
 msgstr "Левый surround"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
 msgid "Lfe"
 msgstr "НЧ"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
 msgid "Lfe (sub)"
 msgstr "НЧ (sub)"
 
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
 msgid "Ls"
 msgstr "Ls"
 
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
 #: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr "Mid-side декодер"
@@ -647,11 +644,11 @@ msgstr "Ошибка програмиирования %1:%2"
 msgid "Public Service Announcement"
 msgstr "PSA (Социальная реклама)"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
 msgid "R"
 msgstr "R"
 
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -659,7 +656,7 @@ msgstr ""
 msgid "Rating"
 msgstr "RTG (Оценивающий признак)"
 
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
 msgid "Rc"
 msgstr "Rc"
 
@@ -671,36 +668,36 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
 msgid "Right"
 msgstr "Правый"
 
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
 msgid "Right centre"
 msgstr "Правый центральный"
 
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
 msgid "Right rear surround"
 msgstr "Правый тыловой surround"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
 msgid "Right surround"
 msgstr "Правый surround"
 
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
 msgid "Rs"
 msgstr "Rs"
 
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
 msgid "SMPTE 240M"
 msgstr ""
 
@@ -749,8 +746,9 @@ msgid "Test"
 msgstr "TST (Тестовый)"
 
 #: src/lib/dcp_examiner.cc:131
+#, fuzzy
 msgid ""
-"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr ""
 "Данный KDM не открывает DCP. Возможно он предназначен для другого CPL-файла"
 
@@ -770,7 +768,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Недостаточно памяти, чтобы сделать это."
 
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -778,7 +776,7 @@ msgstr ""
 "Проект создан более новой версией DCP-o-matic и не быть загружен этой "
 "версией. Извините!"
 
-#: src/lib/film.cc:372
+#: 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 "
@@ -820,11 +818,11 @@ msgstr "Нераспознанный формат аудио (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Маска понижения резкости и Гауссово размытие"
 
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
 msgid "Unspecified"
 msgstr ""
 
@@ -840,7 +838,7 @@ msgstr "Преобразовать Л"
 msgid "Upmix R"
 msgstr "Преобразовать П"
 
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
 msgid "VI"
 msgstr "VI"
 
@@ -858,7 +856,7 @@ msgstr "Расчет длительности"
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
 msgid "Visually impaired"
 msgstr "Для слабовидящих"
 
@@ -866,7 +864,7 @@ msgstr "Для слабовидящих"
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
 msgid "YCOCG"
 msgstr ""
 
@@ -874,7 +872,7 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Ещё один фильтр деинтерлейсинга"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
 msgid "You must add some content to the DCP before creating it"
 msgstr "Добавьте контент в проект прежде чем создавать DCP"
 
@@ -890,7 +888,7 @@ msgstr "[статичный]"
 msgid "[subtitles]"
 msgstr "[субтитры]"
 
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
 msgid "cannot contain slashes"
 msgstr "не может содержать разрезы"
 
@@ -902,11 +900,11 @@ msgstr "таймаут соединения"
 msgid "connecting"
 msgstr "соединение"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
 msgid "container"
 msgstr "контейнер"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
 msgid "content type"
 msgstr "тип контента"
 
@@ -1010,7 +1008,7 @@ msgstr "последовательность"
 msgid "multi-part subtitles not yet supported"
 msgstr "субтитры из нескольких частей ещё не поддерживаются"
 
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
 msgid "name"
 msgstr "название"
 
@@ -1037,7 +1035,7 @@ msgstr "sRGB"
 msgid "still"
 msgstr "статичный"
 
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
 msgid "unknown"
 msgstr "неизвестно"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index b2fb4ffbc..6e263add8 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr "%1 [ljud]"
 
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
@@ -61,7 +61,7 @@ msgstr "Advertisement"
 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:52
+#: src/lib/analyse_audio_job.cc:54
 msgid "Analyse audio"
 msgstr "Analysera audio"
 
@@ -84,56 +84,60 @@ msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
 msgid "Audio will not be resampled"
 msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
 
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
 msgid "BT709"
 msgstr ""
 
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
 msgid "C"
 msgstr ""
 
@@ -145,7 +149,7 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
 msgid "Centre"
 msgstr "Center"
 
@@ -153,19 +157,20 @@ msgstr "Center"
 msgid "Checking existing image data"
 msgstr "Kontrollerar befintligt bilddata"
 
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
 msgid "Colourspace"
 msgstr ""
 
@@ -295,7 +300,7 @@ msgstr "kunde inte skapa fil %1"
 msgid "Could not decode image file (%1)"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -428,7 +433,7 @@ msgstr ""
 msgid "Examine content"
 msgstr "Undersök innehållet"
 
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
 msgid "FCC"
 msgstr ""
 
@@ -440,15 +445,15 @@ msgstr "Misslyckades att autentisera med server (%1)"
 msgid "Feature"
 msgstr "Feature"
 
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
 msgid "Finding length"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
 msgid "Finding subtitles"
 msgstr ""
 
@@ -460,11 +465,11 @@ msgstr "Flat"
 msgid "Full frame"
 msgstr "Full frame"
 
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -472,11 +477,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
 msgid "Hearing impaired"
 msgstr ""
 
@@ -484,11 +489,11 @@ msgstr ""
 msgid "High quality 3D denoiser"
 msgstr "Högkvalitets 3D-brusreducering"
 
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
 msgid "IEC61966-2-4"
 msgstr ""
 
@@ -496,10 +501,6 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
 #: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
@@ -508,60 +509,56 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr "Kernel-avflätare"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
 #, fuzzy
 msgid "Linear"
 msgstr "Bilinjär"
 
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
 msgid "Ls"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
 #: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
@@ -649,11 +646,11 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Public Service Announcement"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -661,7 +658,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
 msgid "Rc"
 msgstr ""
 
@@ -674,37 +671,37 @@ msgstr "Rec. 709"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
 msgid "Right surround"
 msgstr "Höger surround"
 
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
 msgid "Rs"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
 msgid "SMPTE 240M"
 msgstr ""
 
@@ -755,7 +752,7 @@ msgstr "Test"
 
 #: src/lib/dcp_examiner.cc:131
 msgid ""
-"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr ""
 
 #: src/lib/exceptions.cc:72
@@ -774,7 +771,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr ""
 
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
 #, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -784,7 +781,7 @@ msgstr ""
 "inte öppnas i denna version. Du måste skapa en ny Film, lägga till ditt "
 "innehåll och konfigurera allt igen. Ursäkta!"
 
-#: src/lib/film.cc:372
+#: 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 "
@@ -827,11 +824,11 @@ msgstr "Okänt audio-sampelformat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Oskärpemask och Gaussisk suddighet"
 
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
 msgid "Unspecified"
 msgstr ""
 
@@ -847,7 +844,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
 msgid "VI"
 msgstr ""
 
@@ -864,7 +861,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
 msgid "Visually impaired"
 msgstr ""
 
@@ -872,7 +869,7 @@ msgstr ""
 msgid "Waiting"
 msgstr "Väntar"
 
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
 msgid "YCOCG"
 msgstr ""
 
@@ -881,7 +878,7 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
 msgid "You must add some content to the DCP before creating it"
 msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
 
@@ -897,7 +894,7 @@ msgstr "[stillbild]"
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
@@ -910,11 +907,11 @@ msgstr "uppkopplingen tajmade ur"
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
 msgid "container"
 msgstr "behållare"
 
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
 msgid "content type"
 msgstr "innehållstyp"
 
@@ -1021,7 +1018,7 @@ msgstr "rörlig"
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
 msgid "name"
 msgstr "namn"
 
@@ -1048,7 +1045,7 @@ msgstr "sRGB"
 msgid "still"
 msgstr "stillbild"
 
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
 msgid "unknown"
 msgstr "okänd"
 
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index ab33c8b22..fb9c874b4 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 15:31+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index d0c75e5f1..e10af704e 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 15:44+0100\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index f53a5b921..f5676a28d 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 14:49+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index ee597001d..163175a84 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 16:05+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 815b86a52..c9eefaa46 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 16:08+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index 59e18e7ea..79fae3f93 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 8325e3135..821651f84 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index e21be1e92..867ef533f 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 15:36+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,12 +41,6 @@ msgstr "(Programm zum Ändern der Sprache neu starten)"
 msgid "-6dB"
 msgstr "-6dB"
 
-#. / TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
-#. / comes after it.
-#: src/wx/colour_conversion_editor.cc:188
-msgid "1 / "
-msgstr "1/"
-
 #: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
@@ -87,8 +81,6 @@ msgstr "3D Oben/Unten"
 msgid "4K"
 msgstr "4K"
 
-#. //trac.wxwidgets.org/ticket/13389
-#.
 #: src/wx/timing_panel.cc:118
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -196,7 +188,7 @@ msgstr ""
 msgid "Allow any DCP frame rate"
 msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)"
 
-#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:108
+#: src/wx/audio_dialog.cc:39 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:108
 msgid "Audio"
 msgstr "Ton"
 
@@ -264,7 +256,7 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL annotation text"
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:66
 msgid "Calculate..."
 msgstr "Berechne..."
 
@@ -297,7 +289,7 @@ msgstr "Kinokette"
 msgid "Channel gain"
 msgstr "Kanal Verstärkung (+/-)"
 
-#: src/wx/audio_dialog.cc:57 src/wx/dcp_panel.cc:678
+#: src/wx/audio_dialog.cc:61 src/wx/dcp_panel.cc:678
 msgid "Channels"
 msgstr "Kanäle"
 
@@ -370,7 +362,7 @@ msgstr "ISDCF Name kopieren"
 msgid "Copy..."
 msgstr "Kopieren..."
 
-#: src/wx/audio_dialog.cc:185
+#: src/wx/audio_dialog.cc:197
 msgid "Could not analyse audio."
 msgstr "Ton konnte nicht analysiert werden"
 
@@ -426,7 +418,7 @@ msgstr "DCP Verzeichnis"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:111
+#: src/wx/audio_dialog.cc:115
 msgid "DCP-o-matic audio"
 msgstr ""
 
@@ -474,7 +466,7 @@ msgstr "Standard 'issuer' (DCI)"
 msgid "Defaults"
 msgstr "Vorgaben"
 
-#: src/wx/audio_panel.cc:64
+#: src/wx/audio_panel.cc:70
 msgid "Delay"
 msgstr "Verzögerung (+/-)"
 
@@ -535,7 +527,7 @@ msgstr "Bearbeiten..."
 msgid "Email address for KDM delivery"
 msgstr "KDM Empfänger Email Adresse"
 
-#: src/wx/servers_list_dialog.cc:30
+#: src/wx/servers_list_dialog.cc:31
 msgid "Encoding Servers"
 msgstr "Encoding Server"
 
@@ -639,7 +631,7 @@ msgstr "Voll"
 msgid "Full length"
 msgstr "Gesamtlänge"
 
-#: src/wx/audio_panel.cc:49
+#: src/wx/audio_panel.cc:55
 msgid "Gain"
 msgstr "Verstärkung (+/-)"
 
@@ -668,7 +660,7 @@ msgstr ""
 msgid "Hints"
 msgstr "Tipps"
 
-#: src/wx/servers_list_dialog.cc:40
+#: src/wx/servers_list_dialog.cc:41
 msgid "Host"
 msgstr "Host"
 
@@ -910,14 +902,6 @@ msgstr ""
 msgid "Output"
 msgstr "Ausgabe"
 
-#: src/wx/colour_conversion_editor.cc:184
-msgid "Output gamma"
-msgstr "Ziel Gamma"
-
-#: src/wx/colour_conversion_editor.cc:182
-msgid "Output gamma correction"
-msgstr "Ziel-Gamma Anpassung"
-
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "DCP Paket Typ (z.B. OV)"
@@ -930,11 +914,11 @@ msgstr "Passwort"
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:75
+#: src/wx/audio_dialog.cc:79
 msgid "Peak"
 msgstr "Spitze"
 
-#: src/wx/audio_dialog.cc:248
+#: src/wx/audio_dialog.cc:270
 #, c-format
 msgid "Peak is %.2fdB at %s"
 msgstr "Spitzenwert ist %.2fdB bei %s"
@@ -953,7 +937,7 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:85
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Bitte warten; Ton wird analysiert..."
 
@@ -985,7 +969,7 @@ msgstr ""
 msgid "RGB to XYZ conversion"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:76
+#: src/wx/audio_dialog.cc:80
 msgid "RMS"
 msgstr "RMS"
 
@@ -1151,6 +1135,11 @@ msgstr ""
 msgid "Set language"
 msgstr "Sprache setzen"
 
+#: src/wx/audio_panel.cc:51
+#, fuzzy
+msgid "Show Audio..."
+msgstr "Ton anzeigen..."
+
 #: src/wx/dcp_panel.cc:693
 msgid "Show audio..."
 msgstr "Ton anzeigen..."
@@ -1159,7 +1148,7 @@ msgstr "Ton anzeigen..."
 msgid "Signed"
 msgstr "Signiert"
 
-#: src/wx/audio_dialog.cc:86
+#: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Glätten"
 
@@ -1253,7 +1242,7 @@ msgstr "Für diese Operation ist nicht genug freier Speicher verfügbar."
 msgid "This is not a valid CPL file"
 msgstr "Dies ist keine gültige CPL Datei"
 
-#: src/wx/servers_list_dialog.cc:48
+#: src/wx/servers_list_dialog.cc:49
 msgid "Threads"
 msgstr "Threads"
 
@@ -1265,7 +1254,7 @@ msgstr "Auf diesem Rechner zu benutzende CPU-Threads"
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:164
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Zeit"
 
@@ -1305,7 +1294,7 @@ msgstr "Schnitt vom Anfang"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:69 src/wx/config_dialog.cc:578
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:578
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Typ"
@@ -1471,7 +1460,7 @@ msgstr ""
 msgid "audio"
 msgstr "Ton"
 
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
 msgid "dB"
 msgstr "dB"
 
@@ -1491,7 +1480,7 @@ msgid "m"
 msgstr ""
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:362
+#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:362
 msgid "ms"
 msgstr "ms"
 
@@ -1528,6 +1517,15 @@ msgstr ""
 msgid "y"
 msgstr ""
 
+#~ msgid "1 / "
+#~ msgstr "1/"
+
+#~ msgid "Output gamma"
+#~ msgstr "Ziel Gamma"
+
+#~ msgid "Output gamma correction"
+#~ msgstr "Ziel-Gamma Anpassung"
+
 #~ msgid "Artwork by"
 #~ msgstr "Grafik von"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 0188a0660..dfed3e170 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 15:47+0100\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -40,12 +40,6 @@ msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 msgid "-6dB"
 msgstr "-6dB"
 
-#. / TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
-#. / comes after it.
-#: src/wx/colour_conversion_editor.cc:188
-msgid "1 / "
-msgstr "1 / "
-
 #: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
@@ -86,8 +80,6 @@ msgstr "3D arriba/abajo"
 msgid "4K"
 msgstr "4K"
 
-#. //trac.wxwidgets.org/ticket/13389
-#.
 #: src/wx/timing_panel.cc:118
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -183,7 +175,7 @@ msgstr ""
 msgid "Allow any DCP frame rate"
 msgstr "Permitir cualquier velocidad de DCP"
 
-#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:108
+#: src/wx/audio_dialog.cc:39 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:108
 msgid "Audio"
 msgstr "Audio"
 
@@ -248,7 +240,7 @@ msgstr "Identificador CPL"
 msgid "CPL annotation text"
 msgstr "Texto de anotación DCP"
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:66
 msgid "Calculate..."
 msgstr "Calcular..."
 
@@ -281,7 +273,7 @@ msgstr "Cadena"
 msgid "Channel gain"
 msgstr "Ganancia del canal"
 
-#: src/wx/audio_dialog.cc:57 src/wx/dcp_panel.cc:678
+#: src/wx/audio_dialog.cc:61 src/wx/dcp_panel.cc:678
 msgid "Channels"
 msgstr "Canales"
 
@@ -354,7 +346,7 @@ msgstr ""
 msgid "Copy..."
 msgstr "Copiar..."
 
-#: src/wx/audio_dialog.cc:185
+#: src/wx/audio_dialog.cc:197
 msgid "Could not analyse audio."
 msgstr "No se pudo analizar el audio."
 
@@ -410,7 +402,7 @@ msgstr "Carpeta DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:111
+#: src/wx/audio_dialog.cc:115
 msgid "DCP-o-matic audio"
 msgstr ""
 
@@ -458,7 +450,7 @@ msgstr "Emisor por defecto"
 msgid "Defaults"
 msgstr "Por defecto"
 
-#: src/wx/audio_panel.cc:64
+#: src/wx/audio_panel.cc:70
 msgid "Delay"
 msgstr "Retardo"
 
@@ -519,7 +511,7 @@ msgstr "Editar..."
 msgid "Email address for KDM delivery"
 msgstr "Remitente para los emails de KDM"
 
-#: src/wx/servers_list_dialog.cc:30
+#: src/wx/servers_list_dialog.cc:31
 msgid "Encoding Servers"
 msgstr "Servidores de codificación"
 
@@ -621,7 +613,7 @@ msgstr "Completo"
 msgid "Full length"
 msgstr "Duración completa"
 
-#: src/wx/audio_panel.cc:49
+#: src/wx/audio_panel.cc:55
 msgid "Gain"
 msgstr "Ganancia"
 
@@ -650,7 +642,7 @@ msgstr ""
 msgid "Hints"
 msgstr "Pistas"
 
-#: src/wx/servers_list_dialog.cc:40
+#: src/wx/servers_list_dialog.cc:41
 msgid "Host"
 msgstr "Host"
 
@@ -891,14 +883,6 @@ msgstr "Resaltar contenido"
 msgid "Output"
 msgstr "Salida"
 
-#: src/wx/colour_conversion_editor.cc:184
-msgid "Output gamma"
-msgstr "Gamma de salida"
-
-#: src/wx/colour_conversion_editor.cc:182
-msgid "Output gamma correction"
-msgstr ""
-
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
@@ -911,11 +895,11 @@ msgstr "Clave"
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:75
+#: src/wx/audio_dialog.cc:79
 msgid "Peak"
 msgstr "Pico"
 
-#: src/wx/audio_dialog.cc:248
+#: src/wx/audio_dialog.cc:270
 #, c-format
 msgid "Peak is %.2fdB at %s"
 msgstr ""
@@ -934,7 +918,7 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:85
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
 
@@ -966,7 +950,7 @@ msgstr ""
 msgid "RGB to XYZ conversion"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:76
+#: src/wx/audio_dialog.cc:80
 msgid "RMS"
 msgstr "RMS"
 
@@ -1132,6 +1116,10 @@ msgstr ""
 msgid "Set language"
 msgstr "Seleccionar idioma"
 
+#: src/wx/audio_panel.cc:51
+msgid "Show Audio..."
+msgstr ""
+
 #: src/wx/dcp_panel.cc:693
 msgid "Show audio..."
 msgstr ""
@@ -1140,7 +1128,7 @@ msgstr ""
 msgid "Signed"
 msgstr "Firmado"
 
-#: src/wx/audio_dialog.cc:86
+#: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Suavizado"
 
@@ -1233,7 +1221,7 @@ msgstr "No hay suficiente memoria para hacer eso."
 msgid "This is not a valid CPL file"
 msgstr "Este no es un fichero CPL válido"
 
-#: src/wx/servers_list_dialog.cc:48
+#: src/wx/servers_list_dialog.cc:49
 msgid "Threads"
 msgstr "Hilos"
 
@@ -1245,7 +1233,7 @@ msgstr "Hilos a utilizar para la codificación en esta máquina"
 msgid "Thumbprint"
 msgstr "Huella dactilar"
 
-#: src/wx/audio_plot.cc:164
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Tiempo"
 
@@ -1285,7 +1273,7 @@ msgstr "Recortar del inicio"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:69 src/wx/config_dialog.cc:578
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:578
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Tipo"
@@ -1451,7 +1439,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
 msgid "dB"
 msgstr "dB"
 
@@ -1471,7 +1459,7 @@ msgid "m"
 msgstr ""
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:362
+#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:362
 msgid "ms"
 msgstr "ms"
 
@@ -1508,6 +1496,12 @@ msgstr ""
 msgid "y"
 msgstr ""
 
+#~ msgid "1 / "
+#~ msgstr "1 / "
+
+#~ msgid "Output gamma"
+#~ msgstr "Gamma de salida"
+
 #~ msgid "Artwork by"
 #~ msgstr "Grafismo de"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index a68d5340d..66e53d27e 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 14:47+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -42,12 +42,6 @@ msgstr "(redémarrez DCP-o-matic pour appliquer le changement de langue)"
 msgid "-6dB"
 msgstr "-6dB"
 
-#. / TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
-#. / comes after it.
-#: src/wx/colour_conversion_editor.cc:188
-msgid "1 / "
-msgstr "1/"
-
 #: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
@@ -88,8 +82,6 @@ msgstr "3D dessus/dessous"
 msgid "4K"
 msgstr "4K"
 
-#. //trac.wxwidgets.org/ticket/13389
-#.
 #: src/wx/timing_panel.cc:118
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -190,7 +182,7 @@ msgstr ""
 msgid "Allow any DCP frame rate"
 msgstr "Autoriser toutes cadences"
 
-#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:108
+#: src/wx/audio_dialog.cc:39 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:108
 msgid "Audio"
 msgstr "Audio"
 
@@ -258,7 +250,7 @@ msgstr "Id du CPL"
 msgid "CPL annotation text"
 msgstr "Commentaire CPL"
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:66
 msgid "Calculate..."
 msgstr "Calcul..."
 
@@ -291,7 +283,7 @@ msgstr "Chaîne"
 msgid "Channel gain"
 msgstr "Gain Canal"
 
-#: src/wx/audio_dialog.cc:57 src/wx/dcp_panel.cc:678
+#: src/wx/audio_dialog.cc:61 src/wx/dcp_panel.cc:678
 msgid "Channels"
 msgstr "Canaux"
 
@@ -364,7 +356,7 @@ msgstr ""
 msgid "Copy..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:185
+#: src/wx/audio_dialog.cc:197
 msgid "Could not analyse audio."
 msgstr "Analyse du son impossible"
 
@@ -420,7 +412,7 @@ msgstr "Répertoire du DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:111
+#: src/wx/audio_dialog.cc:115
 msgid "DCP-o-matic audio"
 msgstr "Son DCP-o-matic"
 
@@ -468,7 +460,7 @@ msgstr "Labo par défaut"
 msgid "Defaults"
 msgstr "Par défaut"
 
-#: src/wx/audio_panel.cc:64
+#: src/wx/audio_panel.cc:70
 msgid "Delay"
 msgstr "Délai"
 
@@ -529,7 +521,7 @@ msgstr "Éditer..."
 msgid "Email address for KDM delivery"
 msgstr "Adresse email pour l'envoi de KDM"
 
-#: src/wx/servers_list_dialog.cc:30
+#: src/wx/servers_list_dialog.cc:31
 msgid "Encoding Servers"
 msgstr "Serveurs Encodage"
 
@@ -631,7 +623,7 @@ msgstr "Plein"
 msgid "Full length"
 msgstr "Durée totale"
 
-#: src/wx/audio_panel.cc:49
+#: src/wx/audio_panel.cc:55
 msgid "Gain"
 msgstr "Gain"
 
@@ -660,7 +652,7 @@ msgstr ""
 msgid "Hints"
 msgstr "Conseils"
 
-#: src/wx/servers_list_dialog.cc:40
+#: src/wx/servers_list_dialog.cc:41
 msgid "Host"
 msgstr "Hôtes"
 
@@ -901,14 +893,6 @@ msgstr ""
 msgid "Output"
 msgstr "Sortie"
 
-#: src/wx/colour_conversion_editor.cc:184
-msgid "Output gamma"
-msgstr "Gamma de sortie"
-
-#: src/wx/colour_conversion_editor.cc:182
-msgid "Output gamma correction"
-msgstr "Correction Gamma de sortie"
-
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
@@ -921,11 +905,11 @@ msgstr "Mot de passe"
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:75
+#: src/wx/audio_dialog.cc:79
 msgid "Peak"
 msgstr "Crête"
 
-#: src/wx/audio_dialog.cc:248
+#: src/wx/audio_dialog.cc:270
 #, c-format
 msgid "Peak is %.2fdB at %s"
 msgstr ""
@@ -944,7 +928,7 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:85
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
 
@@ -976,7 +960,7 @@ msgstr "Propriétés..."
 msgid "RGB to XYZ conversion"
 msgstr "Conversion RGB vers XYZ"
 
-#: src/wx/audio_dialog.cc:76
+#: src/wx/audio_dialog.cc:80
 msgid "RMS"
 msgstr "RMS"
 
@@ -1142,6 +1126,10 @@ msgstr ""
 msgid "Set language"
 msgstr "Sélectionnez la langue"
 
+#: src/wx/audio_panel.cc:51
+msgid "Show Audio..."
+msgstr ""
+
 #: src/wx/dcp_panel.cc:693
 msgid "Show audio..."
 msgstr ""
@@ -1150,7 +1138,7 @@ msgstr ""
 msgid "Signed"
 msgstr "Signé"
 
-#: src/wx/audio_dialog.cc:86
+#: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Lissage"
 
@@ -1245,7 +1233,7 @@ msgstr "Il n'y a pas assez de mémoire pour faire cela."
 msgid "This is not a valid CPL file"
 msgstr "Ceci n'est pas un fichier CPL valide"
 
-#: src/wx/servers_list_dialog.cc:48
+#: src/wx/servers_list_dialog.cc:49
 msgid "Threads"
 msgstr "Processus"
 
@@ -1257,7 +1245,7 @@ msgstr "Nombre de processus à utiliser sur cet hôte"
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:164
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Durée"
 
@@ -1297,7 +1285,7 @@ msgstr "Rogner au début"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:69 src/wx/config_dialog.cc:578
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:578
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Type"
@@ -1463,7 +1451,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
 msgid "dB"
 msgstr "dB"
 
@@ -1483,7 +1471,7 @@ msgid "m"
 msgstr ""
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:362
+#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:362
 msgid "ms"
 msgstr "ms"
 
@@ -1520,6 +1508,15 @@ msgstr ""
 msgid "y"
 msgstr ""
 
+#~ msgid "1 / "
+#~ msgstr "1/"
+
+#~ msgid "Output gamma"
+#~ msgstr "Gamma de sortie"
+
+#~ msgid "Output gamma correction"
+#~ msgstr "Correction Gamma de sortie"
+
 #~ msgid "Artwork by"
 #~ msgstr "Thème par"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index bbeb93c31..879c666bb 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 16:06+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -40,12 +40,6 @@ msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 msgid "-6dB"
 msgstr ""
 
-#. / TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
-#. / comes after it.
-#: src/wx/colour_conversion_editor.cc:188
-msgid "1 / "
-msgstr ""
-
 #: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr ""
@@ -87,8 +81,6 @@ msgstr ""
 msgid "4K"
 msgstr ""
 
-#. //trac.wxwidgets.org/ticket/13389
-#.
 #: src/wx/timing_panel.cc:118
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -180,7 +172,7 @@ msgstr ""
 msgid "Allow any DCP frame rate"
 msgstr "Frequenza fotogrammi video"
 
-#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:108
+#: src/wx/audio_dialog.cc:39 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:108
 msgid "Audio"
 msgstr "Audio"
 
@@ -252,7 +244,7 @@ msgstr ""
 msgid "CPL annotation text"
 msgstr ""
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:66
 msgid "Calculate..."
 msgstr "Calcola..."
 
@@ -287,7 +279,7 @@ msgstr ""
 msgid "Channel gain"
 msgstr "Guadagno audio"
 
-#: src/wx/audio_dialog.cc:57 src/wx/dcp_panel.cc:678
+#: src/wx/audio_dialog.cc:61 src/wx/dcp_panel.cc:678
 msgid "Channels"
 msgstr "Canali"
 
@@ -363,7 +355,7 @@ msgstr ""
 msgid "Copy..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:185
+#: src/wx/audio_dialog.cc:197
 msgid "Could not analyse audio."
 msgstr "Non posso analizzare l'audio."
 
@@ -419,7 +411,7 @@ msgstr ""
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:111
+#: src/wx/audio_dialog.cc:115
 #, fuzzy
 msgid "DCP-o-matic audio"
 msgstr "Audio DCP-o-matic - %s"
@@ -471,7 +463,7 @@ msgstr "Predefiniti"
 msgid "Defaults"
 msgstr "Predefiniti"
 
-#: src/wx/audio_panel.cc:64
+#: src/wx/audio_panel.cc:70
 #, fuzzy
 msgid "Delay"
 msgstr "Ritardo dell'audio"
@@ -533,7 +525,7 @@ msgstr "Modifica..."
 msgid "Email address for KDM delivery"
 msgstr "Indirizzo email per consegna KDM"
 
-#: src/wx/servers_list_dialog.cc:30
+#: src/wx/servers_list_dialog.cc:31
 #, fuzzy
 msgid "Encoding Servers"
 msgstr "Servers di codifica"
@@ -640,7 +632,7 @@ msgstr ""
 msgid "Full length"
 msgstr ""
 
-#: src/wx/audio_panel.cc:49
+#: src/wx/audio_panel.cc:55
 msgid "Gain"
 msgstr ""
 
@@ -669,7 +661,7 @@ msgstr ""
 msgid "Hints"
 msgstr "Suggerimenti"
 
-#: src/wx/servers_list_dialog.cc:40
+#: src/wx/servers_list_dialog.cc:41
 msgid "Host"
 msgstr ""
 
@@ -923,15 +915,6 @@ msgstr "Molteplici sorgenti selezionate"
 msgid "Output"
 msgstr "Gamma in uscita"
 
-#: src/wx/colour_conversion_editor.cc:184
-msgid "Output gamma"
-msgstr "Gamma in uscita"
-
-#: src/wx/colour_conversion_editor.cc:182
-#, fuzzy
-msgid "Output gamma correction"
-msgstr "Gamma in uscita"
-
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
@@ -945,11 +928,11 @@ msgstr "Password del TMS"
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:75
+#: src/wx/audio_dialog.cc:79
 msgid "Peak"
 msgstr "Picco"
 
-#: src/wx/audio_dialog.cc:248
+#: src/wx/audio_dialog.cc:270
 #, c-format
 msgid "Peak is %.2fdB at %s"
 msgstr ""
@@ -968,7 +951,7 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:85
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
 
@@ -1002,7 +985,7 @@ msgstr "Proprietà del film"
 msgid "RGB to XYZ conversion"
 msgstr "Conversione colore"
 
-#: src/wx/audio_dialog.cc:76
+#: src/wx/audio_dialog.cc:80
 msgid "RMS"
 msgstr "RMS"
 
@@ -1174,6 +1157,11 @@ msgstr "Aggiungi File"
 msgid "Set language"
 msgstr "Seleziona la lingua"
 
+#: src/wx/audio_panel.cc:51
+#, fuzzy
+msgid "Show Audio..."
+msgstr "Mostra Audio..."
+
 #: src/wx/dcp_panel.cc:693
 #, fuzzy
 msgid "Show audio..."
@@ -1183,7 +1171,7 @@ msgstr "Mostra Audio..."
 msgid "Signed"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:86
+#: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Levigatura"
 
@@ -1280,7 +1268,7 @@ msgstr ""
 msgid "This is not a valid CPL file"
 msgstr ""
 
-#: src/wx/servers_list_dialog.cc:48
+#: src/wx/servers_list_dialog.cc:49
 msgid "Threads"
 msgstr "Threads"
 
@@ -1292,7 +1280,7 @@ msgstr "Threads da usare per codificare su questo host"
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:164
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Tempo"
 
@@ -1332,7 +1320,7 @@ msgstr "Taglia dall'inizio"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:69 src/wx/config_dialog.cc:578
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:578
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Tipo"
@@ -1499,7 +1487,7 @@ msgstr ""
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
 msgid "dB"
 msgstr "dB"
 
@@ -1519,7 +1507,7 @@ msgid "m"
 msgstr ""
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:362
+#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:362
 msgid "ms"
 msgstr "ms"
 
@@ -1558,6 +1546,13 @@ msgstr ""
 msgid "y"
 msgstr ""
 
+#~ msgid "Output gamma"
+#~ msgstr "Gamma in uscita"
+
+#, fuzzy
+#~ msgid "Output gamma correction"
+#~ msgstr "Gamma in uscita"
+
 #, fuzzy
 #~ msgid "Audio channels"
 #~ msgstr "canali"
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 2f436a53d..f75e70347 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 16:09+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -41,12 +41,6 @@ msgstr "(herstart DCP-o-matic voor taal wijziging)"
 msgid "-6dB"
 msgstr "-6dB"
 
-#. / TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
-#. / comes after it.
-#: src/wx/colour_conversion_editor.cc:188
-msgid "1 / "
-msgstr "1 / "
-
 #: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
@@ -87,8 +81,6 @@ msgstr "3D boven/beneden"
 msgid "4K"
 msgstr "4K"
 
-#. //trac.wxwidgets.org/ticket/13389
-#.
 #: src/wx/timing_panel.cc:118
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -184,7 +176,7 @@ msgstr ""
 msgid "Allow any DCP frame rate"
 msgstr "Sta om het welke frame rate toe in DCP"
 
-#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:108
+#: src/wx/audio_dialog.cc:39 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:108
 msgid "Audio"
 msgstr "Audio"
 
@@ -253,7 +245,7 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL opmerkingen tekst"
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:66
 msgid "Calculate..."
 msgstr "Bereken..."
 
@@ -286,7 +278,7 @@ msgstr "Ketting"
 msgid "Channel gain"
 msgstr "Kanaal versterking"
 
-#: src/wx/audio_dialog.cc:57 src/wx/dcp_panel.cc:678
+#: src/wx/audio_dialog.cc:61 src/wx/dcp_panel.cc:678
 msgid "Channels"
 msgstr "Kanalen"
 
@@ -359,7 +351,7 @@ msgstr ""
 msgid "Copy..."
 msgstr "Kopieer..."
 
-#: src/wx/audio_dialog.cc:185
+#: src/wx/audio_dialog.cc:197
 msgid "Could not analyse audio."
 msgstr "Kan audio niet analyseren"
 
@@ -415,7 +407,7 @@ msgstr "DCP map"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:111
+#: src/wx/audio_dialog.cc:115
 msgid "DCP-o-matic audio"
 msgstr ""
 
@@ -463,7 +455,7 @@ msgstr "Standaard uitgever"
 msgid "Defaults"
 msgstr "Standaard instellingen"
 
-#: src/wx/audio_panel.cc:64
+#: src/wx/audio_panel.cc:70
 msgid "Delay"
 msgstr "Vertraging"
 
@@ -524,7 +516,7 @@ msgstr "Edit..."
 msgid "Email address for KDM delivery"
 msgstr "Email adres voor KDM aflevering"
 
-#: src/wx/servers_list_dialog.cc:30
+#: src/wx/servers_list_dialog.cc:31
 msgid "Encoding Servers"
 msgstr "Encoding Servers"
 
@@ -626,7 +618,7 @@ msgstr "Volledig"
 msgid "Full length"
 msgstr "Volledige lengte"
 
-#: src/wx/audio_panel.cc:49
+#: src/wx/audio_panel.cc:55
 msgid "Gain"
 msgstr "Versterking"
 
@@ -655,7 +647,7 @@ msgstr ""
 msgid "Hints"
 msgstr "Tips"
 
-#: src/wx/servers_list_dialog.cc:40
+#: src/wx/servers_list_dialog.cc:41
 msgid "Host"
 msgstr "Host"
 
@@ -898,14 +890,6 @@ msgstr ""
 msgid "Output"
 msgstr "Output"
 
-#: src/wx/colour_conversion_editor.cc:184
-msgid "Output gamma"
-msgstr "Output gamma"
-
-#: src/wx/colour_conversion_editor.cc:182
-msgid "Output gamma correction"
-msgstr ""
-
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Package Type (e.g. OV)"
@@ -918,11 +902,11 @@ msgstr "Wachtwoord"
 msgid "Pause"
 msgstr "Pauze"
 
-#: src/wx/audio_dialog.cc:75
+#: src/wx/audio_dialog.cc:79
 msgid "Peak"
 msgstr "Piek"
 
-#: src/wx/audio_dialog.cc:248
+#: src/wx/audio_dialog.cc:270
 #, c-format
 msgid "Peak is %.2fdB at %s"
 msgstr ""
@@ -941,7 +925,7 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:85
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Een ogenblik geduld, het audio wordt geanalyseerd..."
 
@@ -973,7 +957,7 @@ msgstr ""
 msgid "RGB to XYZ conversion"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:76
+#: src/wx/audio_dialog.cc:80
 msgid "RMS"
 msgstr "RMS"
 
@@ -1139,6 +1123,10 @@ msgstr ""
 msgid "Set language"
 msgstr "Taal Instellen"
 
+#: src/wx/audio_panel.cc:51
+msgid "Show Audio..."
+msgstr ""
+
 #: src/wx/dcp_panel.cc:693
 msgid "Show audio..."
 msgstr ""
@@ -1147,7 +1135,7 @@ msgstr ""
 msgid "Signed"
 msgstr "Signed"
 
-#: src/wx/audio_dialog.cc:86
+#: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Smoothing"
 
@@ -1241,7 +1229,7 @@ msgstr "Er is niet genoeg geheugen om dat te doen."
 msgid "This is not a valid CPL file"
 msgstr "Dit is geen geldig CPL bestand"
 
-#: src/wx/servers_list_dialog.cc:48
+#: src/wx/servers_list_dialog.cc:49
 msgid "Threads"
 msgstr "CPU belasting"
 
@@ -1253,7 +1241,7 @@ msgstr "CPU cores beschikbaar voor encoding op deze host"
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:164
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Tijd"
 
@@ -1293,7 +1281,7 @@ msgstr "Trim vanaf begin"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:69 src/wx/config_dialog.cc:578
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:578
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Type"
@@ -1458,7 +1446,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
 msgid "dB"
 msgstr "dB"
 
@@ -1478,7 +1466,7 @@ msgid "m"
 msgstr ""
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:362
+#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:362
 msgid "ms"
 msgstr "ms"
 
@@ -1515,6 +1503,12 @@ msgstr ""
 msgid "y"
 msgstr ""
 
+#~ msgid "1 / "
+#~ msgstr "1 / "
+
+#~ msgid "Output gamma"
+#~ msgstr "Output gamma"
+
 #~ msgid "Artwork by"
 #~ msgstr "Artwork door"
 
diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index ba2edbf21..cda00842a 100644
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
@@ -40,12 +40,6 @@ msgstr "(перезапустите программу для изменения
 msgid "-6dB"
 msgstr "-6 дБ"
 
-#. / TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
-#. / comes after it.
-#: src/wx/colour_conversion_editor.cc:188
-msgid "1 / "
-msgstr "1 / "
-
 #: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
@@ -86,8 +80,6 @@ msgstr "3D верх/низ"
 msgid "4K"
 msgstr "4K"
 
-#. //trac.wxwidgets.org/ticket/13389
-#.
 #: src/wx/timing_panel.cc:118
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -188,7 +180,7 @@ msgstr ""
 msgid "Allow any DCP frame rate"
 msgstr "Разрешить любую частоту кадров DCP"
 
-#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:108
+#: src/wx/audio_dialog.cc:39 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:108
 msgid "Audio"
 msgstr "Аудио"
 
@@ -256,7 +248,7 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL аннотация"
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:66
 msgid "Calculate..."
 msgstr "Просчитать..."
 
@@ -289,7 +281,7 @@ msgstr "Цепочка"
 msgid "Channel gain"
 msgstr "Усиление канала"
 
-#: src/wx/audio_dialog.cc:57 src/wx/dcp_panel.cc:678
+#: src/wx/audio_dialog.cc:61 src/wx/dcp_panel.cc:678
 msgid "Channels"
 msgstr "Канала(ов)"
 
@@ -362,7 +354,7 @@ msgstr "Копировать в название"
 msgid "Copy..."
 msgstr "Копировать..."
 
-#: src/wx/audio_dialog.cc:185
+#: src/wx/audio_dialog.cc:197
 msgid "Could not analyse audio."
 msgstr "Не удалось проанализировать аудио."
 
@@ -418,7 +410,7 @@ msgstr "Папка DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:111
+#: src/wx/audio_dialog.cc:115
 msgid "DCP-o-matic audio"
 msgstr "Аудио DCP-o-matic"
 
@@ -466,7 +458,7 @@ msgstr "Стандартный издатель"
 msgid "Defaults"
 msgstr "Стандартные"
 
-#: src/wx/audio_panel.cc:64
+#: src/wx/audio_panel.cc:70
 msgid "Delay"
 msgstr "Задержка"
 
@@ -527,7 +519,7 @@ msgstr "Редактировать..."
 msgid "Email address for KDM delivery"
 msgstr "Email адрес для доставки ключей (KDM)"
 
-#: src/wx/servers_list_dialog.cc:30
+#: src/wx/servers_list_dialog.cc:31
 msgid "Encoding Servers"
 msgstr "Сервера кодирования"
 
@@ -631,7 +623,7 @@ msgstr "Full"
 msgid "Full length"
 msgstr "Полная длительность"
 
-#: src/wx/audio_panel.cc:49
+#: src/wx/audio_panel.cc:55
 msgid "Gain"
 msgstr "Усиление"
 
@@ -660,7 +652,7 @@ msgstr "Зеленая цветность"
 msgid "Hints"
 msgstr "Подсказки"
 
-#: src/wx/servers_list_dialog.cc:40
+#: src/wx/servers_list_dialog.cc:41
 msgid "Host"
 msgstr "Хост"
 
@@ -901,14 +893,6 @@ msgstr "Выделить контект"
 msgid "Output"
 msgstr "Вывод"
 
-#: src/wx/colour_conversion_editor.cc:184
-msgid "Output gamma"
-msgstr "Выходная гамма"
-
-#: src/wx/colour_conversion_editor.cc:182
-msgid "Output gamma correction"
-msgstr "Коррекция выходной гаммы"
-
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Тип пакета (напр. OV)"
@@ -921,11 +905,11 @@ msgstr "Пароль"
 msgid "Pause"
 msgstr "Пазуа"
 
-#: src/wx/audio_dialog.cc:75
+#: src/wx/audio_dialog.cc:79
 msgid "Peak"
 msgstr "Вершина"
 
-#: src/wx/audio_dialog.cc:248
+#: src/wx/audio_dialog.cc:270
 #, c-format
 msgid "Peak is %.2fdB at %s"
 msgstr "Пиковая громкость %.2fдБ на %s"
@@ -946,7 +930,7 @@ msgstr ""
 "Пожалуйста, введите контактный e-mail, чтобы мы могли связаться с вами по "
 "поводу вашей проблемы."
 
-#: src/wx/audio_plot.cc:85
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Пожалуйста подождите - аудио анализируется..."
 
@@ -978,7 +962,7 @@ msgstr "Свойства..."
 msgid "RGB to XYZ conversion"
 msgstr "Преобразование RGB в XYZ"
 
-#: src/wx/audio_dialog.cc:76
+#: src/wx/audio_dialog.cc:80
 msgid "RMS"
 msgstr "Rated Maximum Sinusoidal"
 
@@ -1144,6 +1128,11 @@ msgstr "Выбрать файл..."
 msgid "Set language"
 msgstr "Выбрать язык"
 
+#: src/wx/audio_panel.cc:51
+#, fuzzy
+msgid "Show Audio..."
+msgstr "Показать аудио..."
+
 #: src/wx/dcp_panel.cc:693
 msgid "Show audio..."
 msgstr "Показать аудио..."
@@ -1152,7 +1141,7 @@ msgstr "Показать аудио..."
 msgid "Signed"
 msgstr "Подписанный"
 
-#: src/wx/audio_dialog.cc:86
+#: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Сглаживание"
 
@@ -1246,7 +1235,7 @@ msgstr "Недостаточно памяти, чтобы сделать это.
 msgid "This is not a valid CPL file"
 msgstr "Это не правильный CPL файл"
 
-#: src/wx/servers_list_dialog.cc:48
+#: src/wx/servers_list_dialog.cc:49
 msgid "Threads"
 msgstr "Потоки"
 
@@ -1258,7 +1247,7 @@ msgstr "Кол-во потоков кодирования на хосте"
 msgid "Thumbprint"
 msgstr "Отпечаток"
 
-#: src/wx/audio_plot.cc:164
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Время"
 
@@ -1298,7 +1287,7 @@ msgstr "Обрезать с начала"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:69 src/wx/config_dialog.cc:578
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:578
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Тип"
@@ -1471,7 +1460,7 @@ msgstr ""
 msgid "audio"
 msgstr "аудио"
 
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
 msgid "dB"
 msgstr "дБ"
 
@@ -1491,7 +1480,7 @@ msgid "m"
 msgstr "м"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:362
+#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:362
 msgid "ms"
 msgstr "мс"
 
@@ -1528,6 +1517,15 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "1 / "
+#~ msgstr "1 / "
+
+#~ msgid "Output gamma"
+#~ msgstr "Выходная гамма"
+
+#~ msgid "Output gamma correction"
+#~ msgstr "Коррекция выходной гаммы"
+
 #~ msgid "Artwork by"
 #~ msgstr "Оформление"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 0d55adaf0..42c8040ce 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
 "PO-Revision-Date: 2015-07-06 16:12+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -40,12 +40,6 @@ msgstr "(starta om DCP-o-matic för att se språkändringar)"
 msgid "-6dB"
 msgstr ""
 
-#. / TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
-#. / comes after it.
-#: src/wx/colour_conversion_editor.cc:188
-msgid "1 / "
-msgstr "1 / "
-
 #: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
@@ -86,8 +80,6 @@ msgstr "3D top/bottom"
 msgid "4K"
 msgstr "4K"
 
-#. //trac.wxwidgets.org/ticket/13389
-#.
 #: src/wx/timing_panel.cc:118
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -176,7 +168,7 @@ msgstr ""
 msgid "Allow any DCP frame rate"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:108
+#: src/wx/audio_dialog.cc:39 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:108
 msgid "Audio"
 msgstr "Audio"
 
@@ -245,7 +237,7 @@ msgstr ""
 msgid "CPL annotation text"
 msgstr ""
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:66
 msgid "Calculate..."
 msgstr "Beräkna..."
 
@@ -278,7 +270,7 @@ msgstr ""
 msgid "Channel gain"
 msgstr "Kanalförstärkning"
 
-#: src/wx/audio_dialog.cc:57 src/wx/dcp_panel.cc:678
+#: src/wx/audio_dialog.cc:61 src/wx/dcp_panel.cc:678
 msgid "Channels"
 msgstr "Kanaler"
 
@@ -352,7 +344,7 @@ msgstr ""
 msgid "Copy..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:185
+#: src/wx/audio_dialog.cc:197
 msgid "Could not analyse audio."
 msgstr "Kunde inte analysera audio."
 
@@ -409,7 +401,7 @@ msgstr ""
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:111
+#: src/wx/audio_dialog.cc:115
 msgid "DCP-o-matic audio"
 msgstr ""
 
@@ -457,7 +449,7 @@ msgstr ""
 msgid "Defaults"
 msgstr "Standardval"
 
-#: src/wx/audio_panel.cc:64
+#: src/wx/audio_panel.cc:70
 msgid "Delay"
 msgstr ""
 
@@ -518,7 +510,7 @@ msgstr "Redigera..."
 msgid "Email address for KDM delivery"
 msgstr "Mejladress för KDM-leverans"
 
-#: src/wx/servers_list_dialog.cc:30
+#: src/wx/servers_list_dialog.cc:31
 msgid "Encoding Servers"
 msgstr "Kodningsservrar"
 
@@ -622,7 +614,7 @@ msgstr "Full"
 msgid "Full length"
 msgstr "Full längd"
 
-#: src/wx/audio_panel.cc:49
+#: src/wx/audio_panel.cc:55
 msgid "Gain"
 msgstr ""
 
@@ -651,7 +643,7 @@ msgstr ""
 msgid "Hints"
 msgstr "Råd"
 
-#: src/wx/servers_list_dialog.cc:40
+#: src/wx/servers_list_dialog.cc:41
 msgid "Host"
 msgstr "Dator"
 
@@ -898,14 +890,6 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: src/wx/colour_conversion_editor.cc:184
-msgid "Output gamma"
-msgstr "Utdata gamma"
-
-#: src/wx/colour_conversion_editor.cc:182
-msgid "Output gamma correction"
-msgstr ""
-
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
@@ -918,11 +902,11 @@ msgstr "Lösenord"
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:75
+#: src/wx/audio_dialog.cc:79
 msgid "Peak"
 msgstr "Topp"
 
-#: src/wx/audio_dialog.cc:248
+#: src/wx/audio_dialog.cc:270
 #, c-format
 msgid "Peak is %.2fdB at %s"
 msgstr ""
@@ -941,7 +925,7 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:85
+#: src/wx/audio_plot.cc:86
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
 
@@ -973,7 +957,7 @@ msgstr ""
 msgid "RGB to XYZ conversion"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:76
+#: src/wx/audio_dialog.cc:80
 msgid "RMS"
 msgstr "RMS"
 
@@ -1140,6 +1124,10 @@ msgstr ""
 msgid "Set language"
 msgstr "Välj språk"
 
+#: src/wx/audio_panel.cc:51
+msgid "Show Audio..."
+msgstr ""
+
 #: src/wx/dcp_panel.cc:693
 msgid "Show audio..."
 msgstr ""
@@ -1148,7 +1136,7 @@ msgstr ""
 msgid "Signed"
 msgstr "Signerad"
 
-#: src/wx/audio_dialog.cc:86
+#: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Utjämning"
 
@@ -1242,7 +1230,7 @@ msgstr ""
 msgid "This is not a valid CPL file"
 msgstr ""
 
-#: src/wx/servers_list_dialog.cc:48
+#: src/wx/servers_list_dialog.cc:49
 msgid "Threads"
 msgstr "Trådar"
 
@@ -1254,7 +1242,7 @@ msgstr "Antal trådar att använda vid kodning på denna maskin"
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:164
+#: src/wx/audio_plot.cc:165
 msgid "Time"
 msgstr "Tid"
 
@@ -1295,7 +1283,7 @@ msgstr "Trimma från start"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:69 src/wx/config_dialog.cc:578
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:578
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Typ"
@@ -1461,7 +1449,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
 msgid "dB"
 msgstr "dB"
 
@@ -1481,7 +1469,7 @@ msgid "m"
 msgstr ""
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:362
+#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:362
 msgid "ms"
 msgstr "ms"
 
@@ -1519,6 +1507,12 @@ msgstr ""
 msgid "y"
 msgstr ""
 
+#~ msgid "1 / "
+#~ msgstr "1 / "
+
+#~ msgid "Output gamma"
+#~ msgstr "Utdata gamma"
+
 #, fuzzy
 #~ msgid "Audio channels"
 #~ msgstr "kanaler"