pot/merge.

18 files changed, 4732 insertions, 3251 deletions

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index e77ee6bda..d817f4aa5 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-07-13 02:32+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,15 +18,15 @@ msgstr ""
 "X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/dcp_content.cc:106
+#: src/lib/dcp_content.cc:110
 msgid "%1 [DCP]"
 msgstr ""
 
-#: src/lib/sndfile_content.cc:64
+#: src/lib/sndfile_content.cc:66
 msgid "%1 [audio]"
 msgstr "%1 [Ton]"
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:192
 msgid "%1 [movie]"
 msgstr "%1 [Film]"
 
@@ -35,14 +35,10 @@ msgid "1.19"
 msgstr "1.19"
 
 #: src/lib/ratio.cc:38
-msgid "1.375"
-msgstr "1.375"
-
-#: src/lib/ratio.cc:39
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:39
 msgid "16:9"
 msgstr "16:9"
 
@@ -66,31 +62,35 @@ 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:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio"
 msgstr "Audio analysieren"
 
-#: src/lib/scaler.cc:65
-msgid "Area"
-msgstr "Bereich"
+#: src/lib/audio_content.cc:257
+msgid "Audio will be resampled from %1kHz to %2kHz"
+msgstr ""
+
+#: src/lib/audio_content.cc:259
+msgid "Audio will be resampled to %1kHz"
+msgstr ""
 
-#: src/lib/audio_content.cc:253
-msgid "Audio will be resampled from %1kHz to %2kHz."
+#: src/lib/audio_content.cc:248
+msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/audio_content.cc:255
-msgid "Audio will not be resampled."
+#: src/lib/film.cc:1228
+msgid "BsL"
 msgstr ""
 
-#: src/lib/scaler.cc:63
-msgid "Bicubic"
-msgstr "Bi-Kubisch"
+#: src/lib/film.cc:1229
+msgid "BsR"
+msgstr ""
 
-#: src/lib/scaler.cc:70
-msgid "Bilinear"
-msgstr "Bi-Linear"
+#: src/lib/film.cc:1220
+msgid "C"
+msgstr ""
 
-#: src/lib/job.cc:330
+#: src/lib/job.cc:335
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
@@ -98,23 +98,23 @@ msgstr "Abgebrochen"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
 
-#: src/lib/util.cc:647
+#: src/lib/util.cc:498
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:95
+#: src/lib/writer.cc:119
 msgid "Checking existing image data"
 msgstr "Überprüfe bestehende Bilddateien"
 
-#: src/lib/writer.cc:525
+#: src/lib/writer.cc:606
 msgid "Computing audio digest"
 msgstr "Tonübersicht berechnen"
 
-#: src/lib/content.cc:143
+#: src/lib/content.cc:135
 msgid "Computing digest"
 msgstr "Zusammenfassung berechnen"
 
-#: src/lib/writer.cc:521
+#: src/lib/writer.cc:602
 msgid "Computing image digest"
 msgstr "Bildübersicht berechnen"
 
@@ -122,20 +122,20 @@ msgstr "Bildübersicht berechnen"
 msgid "Content and DCP have the same rate.\n"
 msgstr "Quelle und DCP haben dieselbe Bildrate. Gut ;-)\n"
 
-#: src/lib/video_content.cc:565
+#: src/lib/video_content.cc:562
 msgid "Content frame rate"
 msgstr "Inhalt Bildrate"
 
-#: src/lib/subtitle_content.cc:115
+#: src/lib/subtitle_content.cc:117
 #, fuzzy
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
 
-#: src/lib/audio_content.cc:103
+#: src/lib/audio_content.cc:94
 msgid "Content to be joined must have the same audio delay."
 msgstr "Zu verbindende Inhalte müssen die gleiche Tonverzögerung verwenden."
 
-#: src/lib/audio_content.cc:99
+#: src/lib/audio_content.cc:90
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 "Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden."
@@ -161,24 +161,24 @@ msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
 msgid "Content to be joined must have the same scale setting."
 msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
 
-#: src/lib/subtitle_content.cc:119
+#: src/lib/subtitle_content.cc:121
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Zu verbindende Inhalte müssen den gleichen horizontalen Untertitelversatz "
 "verwenden."
 
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:129
 #, fuzzy
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
 
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:125
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Zu verbindende Inhalte müssen den gleichen vertikalen Untertitelversatz "
 "verwenden."
 
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:133
 #, fuzzy
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
@@ -191,21 +191,16 @@ msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
 msgid "Content to be joined must have the same video frame type."
 msgstr "Zu verbindende Inhalte müssen den gleichen Bildtyp (z.B. 2D) haben."
 
-#: src/lib/ffmpeg_content.cc:118
-msgid "Content to be joined must use the same audio stream."
-msgstr ""
-"Zu verbindende Inhalte müssen die gleiche Tonspurkonfiguration verwenden."
-
-#: src/lib/subtitle_content.cc:136 src/lib/subtitle_content.cc:144
+#: src/lib/subtitle_content.cc:138 src/lib/subtitle_content.cc:146
 #, fuzzy
 msgid "Content to be joined must use the same fonts."
 msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
 
-#: src/lib/ffmpeg_content.cc:114
+#: src/lib/ffmpeg_content.cc:109
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelspur verwenden."
 
-#: src/lib/video_content.cc:523
+#: src/lib/video_content.cc:511
 msgid "Content video is %1x%2"
 msgstr "Inhalt Video ist %1x%2"
 
@@ -213,20 +208,25 @@ msgstr "Inhalt Video ist %1x%2"
 msgid "Copy DCP to TMS"
 msgstr "DCP zu TMS übertragen"
 
-#: src/lib/scp_dcp_job.cc:130
+#: src/lib/scp_dcp_job.cc:136
 msgid "Could not connect to server %1 (%2)"
 msgstr "Keine Verbindung zu Server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:158
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
 
-#: src/lib/magick_image_proxy.cc:96
+#: src/lib/image_examiner.cc:61
+#, fuzzy
+msgid "Could not decode JPEG2000 file %1 (%2)"
+msgstr "Bilddatei konnte nicht dekodiert werden"
+
+#: src/lib/magick_image_proxy.cc:99
 #, fuzzy
 msgid "Could not decode image file (%1)"
 msgstr "Bilddatei konnte nicht dekodiert werden"
 
-#: src/lib/server_finder.cc:114
+#: src/lib/server_finder.cc:128
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -236,32 +236,32 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "%1 konnte nicht geöffnet werden."
 
-#: src/lib/scp_dcp_job.cc:177
+#: src/lib/scp_dcp_job.cc:183
 msgid "Could not open %1 to send"
 msgstr "%1 konnte nicht zum Senden geöffnet werden"
 
-#: src/lib/internet.cc:75
+#: src/lib/internet.cc:77
 msgid "Could not open downloaded ZIP file"
 msgstr "Heruntergeladene ZIP Datei kann nicht geöffnet werden."
 
-#: src/lib/dcp_subtitle.cc:57
+#: src/lib/dcp_subtitle.cc:49
 #, fuzzy
 msgid "Could not read subtitles"
 msgstr "Untertitel-Decoder nicht gefunden"
 
-#: src/lib/scp_dcp_job.cc:147
+#: src/lib/scp_dcp_job.cc:153
 msgid "Could not start SCP session (%1)"
 msgstr "SCP Session (%1) konnte nicht gestartet werden"
 
-#: src/lib/scp_dcp_job.cc:191
+#: src/lib/scp_dcp_job.cc:197
 msgid "Could not write to remote file (%1)"
 msgstr "Entfernte Datei (%1) konnte nicht gespeichert werden"
 
-#: src/lib/video_content.cc:534
+#: src/lib/video_content.cc:530
 msgid "Cropped to %1x%2"
 msgstr "Beschnitten zu %1x%2"
 
-#: src/lib/dcp_subtitle_content.cc:85
+#: src/lib/dcp_subtitle_content.cc:96
 msgid "DCP XML subtitles"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr ""
 "DCP-o-matic konnte die Datei %1 nicht öffnen. Vielleicht existiert sie nicht "
 "oder ist in einem unerwarteten Format."
 
-#: src/lib/ffmpeg_content.cc:95
+#: src/lib/ffmpeg_content.cc:90
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
@@ -291,7 +291,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
-#: src/lib/config.cc:426
+#: src/lib/config.cc:419
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -317,11 +317,15 @@ msgstr ""
 "Mit freundlichen Gruessen,\n"
 "DCP-o-matic"
 
+#: src/lib/video_content.cc:524
+msgid "Display aspect ratio"
+msgstr ""
+
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 und CP750"
 
-#: src/lib/internet.cc:68
+#: src/lib/internet.cc:70
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Herunterladen fehlgeschlagen (%1/%2 Fehler %3)"
 
@@ -341,11 +345,11 @@ msgstr "Email KDMs für %1"
 msgid "Email problem report for %1"
 msgstr ""
 
-#: src/lib/writer.cc:141
+#: src/lib/writer.cc:153
 msgid "Encoding image data"
 msgstr "Kodiere Bilddaten"
 
-#: src/lib/job.cc:328
+#: src/lib/job.cc:333
 msgid "Error (%1)"
 msgstr "Fehler (%1)"
 
@@ -353,39 +357,39 @@ msgstr "Fehler (%1)"
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/examine_content_job.cc:47
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Inhalt wird überprüft"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:146
 msgid "Failed to authenticate with server (%1)"
 msgstr "Authentifizierung mit Server (%1) fehlgeschlagen"
 
-#: src/lib/scaler.cc:71
-msgid "Fast Bilinear"
-msgstr "Schneller Bilinearer Filter"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Feature"
 msgstr "Hauptfilm"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ffmpeg_examiner.cc:76
+msgid "Finding length"
+msgstr ""
+
+#: src/lib/ratio.cc:40
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:42
 msgid "Full frame"
 msgstr "Ganzes Bild"
 
-#: src/lib/scaler.cc:66
-msgid "Gaussian"
-msgstr "Gauss Filter"
-
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradient Glätter"
 
-#: src/lib/util.cc:651
+#: src/lib/film.cc:1224
+msgid "HI"
+msgstr ""
+
+#: src/lib/util.cc:502
 msgid "Hearing impaired"
 msgstr "HI"
 
@@ -397,7 +401,7 @@ msgstr "3D Rauschunterdrückung hoher Qualität"
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:206
+#: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM Zustellung: $CPL_NAME"
 
@@ -405,31 +409,48 @@ msgstr "KDM Zustellung: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel De-Interlacer"
 
-#: src/lib/scaler.cc:67
-msgid "Lanczos"
-msgstr "Lanczos"
+#: src/lib/film.cc:1218
+msgid "L"
+msgstr ""
 
-#: src/lib/util.cc:645
+#: src/lib/film.cc:1226
+msgid "Lc"
+msgstr ""
+
+#: src/lib/util.cc:496
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:653
+#: src/lib/util.cc:504
 msgid "Left centre"
 msgstr "Center links"
 
-#: src/lib/util.cc:655
+#: src/lib/util.cc:506
 msgid "Left rear surround"
 msgstr "Surround hinten links"
 
-#: src/lib/util.cc:649
+#: src/lib/util.cc:500
 msgid "Left surround"
 msgstr "Surround links"
 
-#: src/lib/util.cc:648
+#: src/lib/film.cc:1221
+msgid "Lfe"
+msgstr ""
+
+#: src/lib/util.cc:499
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
-#: src/lib/mid_side_decoder.cc:31
+#: src/lib/film.cc:1222
+msgid "Ls"
+msgstr ""
+
+#. / TRANSLATORS: this is the name of the `mid' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:93
+msgid "Mid"
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
 
@@ -457,15 +478,15 @@ msgstr ""
 msgid "Motion compensating deinterlacer"
 msgstr "Bewegungskompensierender De-Interlacer"
 
-#: src/lib/video_content_scale.cc:106
+#: src/lib/video_content_scale.cc:108
 msgid "No scale"
 msgstr "Unskaliert"
 
-#: src/lib/video_content_scale.cc:103
+#: src/lib/video_content_scale.cc:105
 msgid "No stretch"
 msgstr "Nicht verzerrt"
 
-#: src/lib/image_content.cc:50
+#: src/lib/image_content.cc:59
 msgid "No valid image files were found in the folder."
 msgstr "Keine gültigen Bilddaten gefunden."
 
@@ -473,17 +494,17 @@ msgstr "Keine gültigen Bilddaten gefunden."
 msgid "Noise reduction"
 msgstr "Rauschunterdrückung"
 
-#: src/lib/job.cc:326
+#: src/lib/job.cc:331
 msgid "OK (ran for %1)"
 msgstr "OK (Dauer %1)"
 
-#: src/lib/content.cc:106
+#: src/lib/content.cc:104
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 "Nur das erste Segment der zu verbindenden Inhalte kann vom Anfang her "
 "beschnitten werden."
 
-#: src/lib/content.cc:110
+#: src/lib/content.cc:108
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 "Nur das letzte Segment der zu verbindenden Inhalte kann vom Ende her "
@@ -497,8 +518,13 @@ msgstr "Zuwenig Speicher"
 msgid "Overcomplete wavelet denoiser"
 msgstr "Überbestimmte Wavelet Entrauschung"
 
-#: src/lib/video_content.cc:558
-msgid "Padded with black to %1x%2"
+#: src/lib/colour_conversion.cc:264
+msgid "P3"
+msgstr ""
+
+#: src/lib/video_content.cc:554
+#, fuzzy
+msgid "Padded with black to fit container %1 (%2x%3)"
 msgstr "Mit Schwarz gefüllt auf %1x%2"
 
 #: src/lib/dcp_content_type.cc:52
@@ -513,39 +539,56 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Hinweis"
 
+#: src/lib/film.cc:1219
+msgid "R"
+msgstr ""
+
 #: src/lib/dcp_content_type.cc:50
 msgid "Rating"
 msgstr "Freigabehinweis"
 
-#: src/lib/config.cc:89 src/lib/config.cc:190
+#: src/lib/film.cc:1227
+msgid "Rc"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:262
+#, fuzzy
+msgid "Rec. 601"
+msgstr "Rec. 709"
+
+#: src/lib/colour_conversion.cc:263
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:646
+#: src/lib/util.cc:497
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:654
+#: src/lib/util.cc:505
 msgid "Right centre"
 msgstr "Center rechts"
 
-#: src/lib/util.cc:656
+#: src/lib/util.cc:507
 msgid "Right rear surround"
 msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:501
 msgid "Right surround"
 msgstr "Surround rechts"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/film.cc:1223
+msgid "Rs"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:141
 msgid "SSH error (%1)"
 msgstr "SSH Fehler (%1)"
 
-#: src/lib/video_content.cc:549
+#: src/lib/video_content.cc:545
 msgid "Scaled to %1x%2"
 msgstr "Skaliert auf %1x%2"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:41
 msgid "Scope"
 msgstr "Scope"
 
@@ -553,19 +596,20 @@ msgstr "Scope"
 msgid "Short"
 msgstr "Kurzfilm"
 
-#: src/lib/scaler.cc:68
-msgid "Sinc"
-msgstr "Sinc"
+#. / TRANSLATORS: this is the name of the `side' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:95
+msgid "Side"
+msgstr ""
 
-#: src/lib/scaler.cc:69
-msgid "Spline"
-msgstr "Spline"
+#: src/lib/audio_content.cc:252
+msgid "Some audio will be resampled to %1kHz"
+msgstr ""
 
-#: src/lib/upmixer_a.cc:42
+#: src/lib/upmixer_a.cc:45
 msgid "Stereo to 5.1 up-mixer A"
 msgstr ""
 
-#: src/lib/subrip_content.cc:77
+#: src/lib/subrip_content.cc:79
 msgid "SubRip subtitles"
 msgstr ""
 
@@ -581,7 +625,7 @@ msgstr "Telecine Filter"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/dcp_examiner.cc:133
+#: src/lib/dcp_examiner.cc:131
 msgid ""
 "The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
 msgstr ""
@@ -602,7 +646,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Zu wenig Speicher für diese Operation."
 
-#: src/lib/film.cc:427
+#: src/lib/film.cc:386
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -611,7 +655,7 @@ msgstr ""
 "kann leider nicht mit dieser älteren Version geladen werden. Sie müssen den "
 "Film neu erstellen. Sorry!"
 
-#: src/lib/film.cc:419
+#: src/lib/film.cc:378
 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 "
@@ -633,11 +677,11 @@ msgstr "Wandle %1 um"
 msgid "Transitional"
 msgstr "Überleitung"
 
-#: src/lib/internet.cc:80
+#: src/lib/internet.cc:82
 msgid "Unexpected ZIP file contents"
 msgstr "Ungültiger ZIP Inhalt"
 
-#: src/lib/image_proxy.cc:48
+#: src/lib/image_proxy.cc:47
 msgid "Unexpected image type received by server"
 msgstr "Ungültiges Bildformat vom Server erhalten"
 
@@ -645,7 +689,7 @@ msgstr "Ungültiges Bildformat vom Server erhalten"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/lib/ffmpeg_decoder.cc:277
+#: src/lib/ffmpeg_decoder.cc:282
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Ton Sample Format (%1) nicht erkannt."
 
@@ -653,11 +697,23 @@ msgstr "Ton Sample Format (%1) nicht erkannt."
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
 
-#: src/lib/colour_conversion.cc:182
+#: src/lib/colour_conversion.cc:220
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/lib/util.cc:652
+#: src/lib/upmixer_a.cc:128
+msgid "Upmix L"
+msgstr ""
+
+#: src/lib/upmixer_a.cc:129
+msgid "Upmix R"
+msgstr ""
+
+#: src/lib/film.cc:1225
+msgid "VI"
+msgstr ""
+
+#: src/lib/util.cc:503
 msgid "Visually impaired"
 msgstr "VI"
 
@@ -665,51 +721,47 @@ msgstr "VI"
 msgid "Waiting"
 msgstr "Warte..."
 
-#: src/lib/scaler.cc:64
-msgid "X"
-msgstr "X"
-
 #: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Und ein weiterer De-Interlacer..."
 
-#: src/lib/film.cc:324
+#: src/lib/film.cc:300
 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!"
 
-#: src/lib/image_content.cc:73
+#: src/lib/image_content.cc:87
 msgid "[moving images]"
 msgstr "[Bewegte Bilder]"
 
-#: src/lib/image_content.cc:71
+#: src/lib/image_content.cc:85
 msgid "[still]"
 msgstr "[Standbild]"
 
-#: src/lib/dcp_subtitle_content.cc:79 src/lib/subrip_content.cc:71
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:282
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
-#: src/lib/util.cc:524
+#: src/lib/dcpomatic_socket.cc:66
 msgid "connect timed out"
 msgstr "Zeit für Verbindung abgelaufen"
 
-#: src/lib/scp_dcp_job.cc:121
+#: src/lib/scp_dcp_job.cc:127
 msgid "connecting"
 msgstr "verbinde..."
 
-#: src/lib/film.cc:320
+#: src/lib/film.cc:296
 msgid "container"
 msgstr "Containerformat"
 
-#: src/lib/film.cc:328
+#: src/lib/film.cc:304
 msgid "content type"
 msgstr "Inhaltsbeschreibung"
 
-#: src/lib/scp_dcp_job.cc:170
+#: src/lib/scp_dcp_job.cc:176
 msgid "copying %1"
 msgstr "kopiere %1"
 
@@ -717,15 +769,16 @@ msgstr "kopiere %1"
 msgid "could not create file %1"
 msgstr "Datei %1 konnte nicht erstellt werden."
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:101
 msgid "could not find stream information"
 msgstr "Keine Spur-Information gefunden"
 
-#: src/lib/writer.cc:465
-msgid "could not move audio MXF into the DCP (%1)"
+#: src/lib/writer.cc:535
+#, fuzzy
+msgid "could not move audio asset into the DCP (%1)"
 msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
 
-#: src/lib/sndfile_decoder.cc:54
+#: src/lib/sndfile_base.cc:47
 msgid "could not open audio file for reading"
 msgstr "Tondatei kann nicht zum Lesen geöffnet werden."
 
@@ -733,13 +786,14 @@ msgstr "Tondatei kann nicht zum Lesen geöffnet werden."
 msgid "could not open file %1"
 msgstr "Datei %1 konnte nicht geöffnet werden."
 
-#: src/lib/encoded_data.cc:50
+#: src/lib/data.cc:55
 msgid "could not open file for reading"
 msgstr "Datei konnte nicht zum Lesen geöffnet werden."
 
-#: src/lib/encoded_data.cc:56
-msgid "could not read encoded data"
-msgstr "Kodierte Daten nicht gefunden."
+#: src/lib/data.cc:61
+#, fuzzy
+msgid "could not read from file"
+msgstr "Datei %1 konnte nicht gelesen werden (%2)"
 
 #: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
@@ -765,34 +819,30 @@ msgstr "SSH Session konnte nicht gestartet werden"
 msgid "could not write to file %1 (%2)"
 msgstr "Datei %1 konnte nicht geschrieben werden (%2)"
 
-#: src/lib/util.cc:544
-msgid "error during async_accept (%1)"
-msgstr "error during async_accept (%1)"
-
-#: src/lib/util.cc:520
+#: src/lib/dcpomatic_socket.cc:62
 msgid "error during async_connect (%1)"
 msgstr "error during async_connect (%1)"
 
-#: src/lib/util.cc:593
+#: src/lib/dcpomatic_socket.cc:115
 msgid "error during async_read (%1)"
 msgstr "error during async_read (%1)"
 
-#: src/lib/util.cc:565
+#: src/lib/dcpomatic_socket.cc:87
 msgid "error during async_write (%1)"
 msgstr "error during async_write (%1)"
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:96
+#: src/lib/transcode_job.cc:102
 msgid "fps"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:170 src/lib/util.cc:173
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -800,41 +850,85 @@ msgstr ""
 msgid "missing required setting %1"
 msgstr "Benötigte Einstellung %1 fehlt"
 
-#: src/lib/image_content.cc:88
+#: src/lib/image_content.cc:102
 msgid "moving"
 msgstr "wird verschoben"
 
-#: src/lib/ffmpeg_decoder.cc:444
+#: src/lib/ffmpeg_decoder.cc:449
 msgid "multi-part subtitles not yet supported"
 msgstr "Mehr-Segment Untertitel werden noch nicht unterstützt"
 
-#: src/lib/film.cc:277 src/lib/film.cc:332
+#: src/lib/film.cc:282 src/lib/film.cc:308
 msgid "name"
 msgstr "Name"
 
+#: src/lib/video_content.cc:520
+msgid "pixel aspect ratio"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:323
+#: src/lib/job.cc:328
 msgid "remaining"
 msgstr "verbleibend"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:184
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
-#: src/lib/config.cc:88 src/lib/config.cc:189
+#: src/lib/colour_conversion.cc:261
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/image_content.cc:86
+#: src/lib/image_content.cc:100
 msgid "still"
 msgstr "Standbild"
 
-#: src/lib/ffmpeg_examiner.cc:218
+#: src/lib/ffmpeg_examiner.cc:242
 msgid "unknown"
 msgstr "unbekannt"
 
+#~ msgid "1.375"
+#~ msgstr "1.375"
+
+#~ msgid "Area"
+#~ msgstr "Bereich"
+
+#~ msgid "Bicubic"
+#~ msgstr "Bi-Kubisch"
+
+#~ msgid "Bilinear"
+#~ msgstr "Bi-Linear"
+
+#~ msgid "Content to be joined must use the same audio stream."
+#~ msgstr ""
+#~ "Zu verbindende Inhalte müssen die gleiche Tonspurkonfiguration verwenden."
+
+#~ msgid "Fast Bilinear"
+#~ msgstr "Schneller Bilinearer Filter"
+
+#~ msgid "Gaussian"
+#~ msgstr "Gauss Filter"
+
+#~ msgid "Lanczos"
+#~ msgstr "Lanczos"
+
+#~ msgid "Sinc"
+#~ msgstr "Sinc"
+
+#~ msgid "Spline"
+#~ msgstr "Spline"
+
+#~ msgid "X"
+#~ msgstr "X"
+
+#~ msgid "could not read encoded data"
+#~ msgstr "Kodierte Daten nicht gefunden."
+
+#~ msgid "error during async_accept (%1)"
+#~ msgstr "error during async_accept (%1)"
+
 #~ msgid "%1 channels, %2kHz, %3 samples"
 #~ msgstr "%1 Kanäle, %2kHz, %3 samples"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index a1fad13a7..eb2167c53 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-10-24 16:11-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: src/lib/dcp_content.cc:106
+#: src/lib/dcp_content.cc:110
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/sndfile_content.cc:64
+#: src/lib/sndfile_content.cc:66
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:192
 msgid "%1 [movie]"
 msgstr "%1 [película]"
 
@@ -34,14 +34,10 @@ msgid "1.19"
 msgstr "1.19"
 
 #: src/lib/ratio.cc:38
-msgid "1.375"
-msgstr "1.375"
-
-#: src/lib/ratio.cc:39
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:39
 msgid "16:9"
 msgstr "16:9"
 
@@ -65,31 +61,35 @@ 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:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio"
 msgstr "Analizar audio"
 
-#: src/lib/scaler.cc:65
-msgid "Area"
-msgstr "Área"
+#: src/lib/audio_content.cc:257
+msgid "Audio will be resampled from %1kHz to %2kHz"
+msgstr ""
+
+#: src/lib/audio_content.cc:259
+msgid "Audio will be resampled to %1kHz"
+msgstr ""
 
-#: src/lib/audio_content.cc:253
-msgid "Audio will be resampled from %1kHz to %2kHz."
+#: src/lib/audio_content.cc:248
+msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/audio_content.cc:255
-msgid "Audio will not be resampled."
+#: src/lib/film.cc:1228
+msgid "BsL"
 msgstr ""
 
-#: src/lib/scaler.cc:63
-msgid "Bicubic"
-msgstr "Bicúbico"
+#: src/lib/film.cc:1229
+msgid "BsR"
+msgstr ""
 
-#: src/lib/scaler.cc:70
-msgid "Bilinear"
-msgstr "Bilineal"
+#: src/lib/film.cc:1220
+msgid "C"
+msgstr ""
 
-#: src/lib/job.cc:330
+#: src/lib/job.cc:335
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -97,23 +97,23 @@ 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:647
+#: src/lib/util.cc:498
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:95
+#: src/lib/writer.cc:119
 msgid "Checking existing image data"
 msgstr "Comprobando las imágenes existentes"
 
-#: src/lib/writer.cc:525
+#: src/lib/writer.cc:606
 msgid "Computing audio digest"
 msgstr "Calculando la firma resumen del audio"
 
-#: src/lib/content.cc:143
+#: src/lib/content.cc:135
 msgid "Computing digest"
 msgstr "Calculando la firma resumen"
 
-#: src/lib/writer.cc:521
+#: src/lib/writer.cc:602
 msgid "Computing image digest"
 msgstr "Calculando la firma resumen de imagen"
 
@@ -121,19 +121,19 @@ msgstr "Calculando la firma resumen de imagen"
 msgid "Content and DCP have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/video_content.cc:565
+#: src/lib/video_content.cc:562
 msgid "Content frame rate"
 msgstr "Velocidad del contenido"
 
-#: src/lib/subtitle_content.cc:115
+#: src/lib/subtitle_content.cc:117
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr "Para unir contenido debe tener la misma opción 'usar subtítulos'."
 
-#: src/lib/audio_content.cc:103
+#: src/lib/audio_content.cc:94
 msgid "Content to be joined must have the same audio delay."
 msgstr "Para unir contenido debe tener el mismo retardo de audio."
 
-#: src/lib/audio_content.cc:99
+#: src/lib/audio_content.cc:90
 msgid "Content to be joined must have the same audio gain."
 msgstr "Para unir contenido debe tener la misma ganancia de audio."
 
@@ -157,22 +157,22 @@ msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 msgid "Content to be joined must have the same scale setting."
 msgstr "Para unir contenido debe tener la misma redimensión."
 
-#: src/lib/subtitle_content.cc:119
+#: src/lib/subtitle_content.cc:121
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Para unir contenido debe tener el mismo desplazamiento de subtítulo en X."
 
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:129
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr ""
 "Para unir contenido debe tener la misma redimensión de subtítulo en  X."
 
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:125
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Para unir contenido debe tener el mismo desplazamiento de subtítulo en Y."
 
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:133
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Para unir contenido debe tener la misma redimensión de subtítulo en Y."
 
@@ -184,20 +184,16 @@ msgstr "Para unir contenido debe tener la misma velocidad de imagen."
 msgid "Content to be joined must have the same video frame type."
 msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
-#: src/lib/ffmpeg_content.cc:118
-msgid "Content to be joined must use the same audio stream."
-msgstr "Para unir contenido debe usar el mismo tipo de audio."
-
-#: src/lib/subtitle_content.cc:136 src/lib/subtitle_content.cc:144
+#: src/lib/subtitle_content.cc:138 src/lib/subtitle_content.cc:146
 #, fuzzy
 msgid "Content to be joined must use the same fonts."
 msgstr "Para unir contenido debe tener los mismos fundidos."
 
-#: src/lib/ffmpeg_content.cc:114
+#: src/lib/ffmpeg_content.cc:109
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
 
-#: src/lib/video_content.cc:523
+#: src/lib/video_content.cc:511
 msgid "Content video is %1x%2"
 msgstr "El video es %1x%2"
 
@@ -205,19 +201,24 @@ msgstr "El video es %1x%2"
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:130
+#: src/lib/scp_dcp_job.cc:136
 msgid "Could not connect to server %1 (%2)"
 msgstr "No se pudo conectar al servidor %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:158
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/magick_image_proxy.cc:96
+#: src/lib/image_examiner.cc:61
+#, fuzzy
+msgid "Could not decode JPEG2000 file %1 (%2)"
+msgstr "No se pudo descodificar el fichero de imagen (%1)"
+
+#: src/lib/magick_image_proxy.cc:99
 msgid "Could not decode image file (%1)"
 msgstr "No se pudo descodificar el fichero de imagen (%1)"
 
-#: src/lib/server_finder.cc:114
+#: src/lib/server_finder.cc:128
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -227,32 +228,32 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "No se pudo abrir %1"
 
-#: src/lib/scp_dcp_job.cc:177
+#: src/lib/scp_dcp_job.cc:183
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
-#: src/lib/internet.cc:75
+#: src/lib/internet.cc:77
 msgid "Could not open downloaded ZIP file"
 msgstr "No se puedo abrir el fichero ZIP descargado"
 
-#: src/lib/dcp_subtitle.cc:57
+#: src/lib/dcp_subtitle.cc:49
 #, fuzzy
 msgid "Could not read subtitles"
 msgstr "no se pudo encontrar decodificador de subtítutlos"
 
-#: src/lib/scp_dcp_job.cc:147
+#: src/lib/scp_dcp_job.cc:153
 msgid "Could not start SCP session (%1)"
 msgstr "No se pudo iniciar la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:191
+#: src/lib/scp_dcp_job.cc:197
 msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/video_content.cc:534
+#: src/lib/video_content.cc:530
 msgid "Cropped to %1x%2"
 msgstr "Recortado a %1x%2"
 
-#: src/lib/dcp_subtitle_content.cc:85
+#: src/lib/dcp_subtitle_content.cc:96
 msgid "DCP XML subtitles"
 msgstr "Subtítulos DCP XML"
 
@@ -272,7 +273,7 @@ msgstr ""
 "DCP-o-matic no pudo abrir el fichero %1. Quizás no existe o está en un "
 "formato inesperado."
 
-#: src/lib/ffmpeg_content.cc:95
+#: src/lib/ffmpeg_content.cc:90
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
@@ -281,7 +282,7 @@ msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
-#: src/lib/config.cc:426
+#: src/lib/config.cc:419
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -307,11 +308,15 @@ msgstr ""
 "Atentamente,\n"
 "DCP-o-matic"
 
+#: src/lib/video_content.cc:524
+msgid "Display aspect ratio"
+msgstr ""
+
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 and CP750"
 
-#: src/lib/internet.cc:68
+#: src/lib/internet.cc:70
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Descarga fallida (%1/%2 error %3)"
 
@@ -331,11 +336,11 @@ msgstr "Enviar por email las KDM para %1"
 msgid "Email problem report for %1"
 msgstr ""
 
-#: src/lib/writer.cc:141
+#: src/lib/writer.cc:153
 msgid "Encoding image data"
 msgstr "Codificando imagen"
 
-#: src/lib/job.cc:328
+#: src/lib/job.cc:333
 msgid "Error (%1)"
 msgstr "Error (%1)"
 
@@ -343,39 +348,39 @@ msgstr "Error (%1)"
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr "Error en el fichero SubRip: encontrado %1 cuando se esperaba %2"
 
-#: src/lib/examine_content_job.cc:47
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Examinar contenido"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:146
 msgid "Failed to authenticate with server (%1)"
 msgstr "Fallo al identificarse con el servidor (%1)"
 
-#: src/lib/scaler.cc:71
-msgid "Fast Bilinear"
-msgstr "Bilineal rápido"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Feature"
 msgstr "Película"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ffmpeg_examiner.cc:76
+msgid "Finding length"
+msgstr ""
+
+#: src/lib/ratio.cc:40
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:42
 msgid "Full frame"
 msgstr "Frame completo"
 
-#: src/lib/scaler.cc:66
-msgid "Gaussian"
-msgstr "Gaussiano"
-
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:651
+#: src/lib/film.cc:1224
+msgid "HI"
+msgstr ""
+
+#: src/lib/util.cc:502
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -387,7 +392,7 @@ msgstr "Reductor de ruido 3D de alta calidad"
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:206
+#: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envío de KDM: $CPL_NAME"
 
@@ -395,31 +400,48 @@ msgstr "Envío de KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
-#: src/lib/scaler.cc:67
-msgid "Lanczos"
-msgstr "Lanczos"
+#: src/lib/film.cc:1218
+msgid "L"
+msgstr ""
+
+#: src/lib/film.cc:1226
+msgid "Lc"
+msgstr ""
 
-#: src/lib/util.cc:645
+#: src/lib/util.cc:496
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:653
+#: src/lib/util.cc:504
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:655
+#: src/lib/util.cc:506
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:649
+#: src/lib/util.cc:500
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:648
+#: src/lib/film.cc:1221
+msgid "Lfe"
+msgstr ""
+
+#: src/lib/util.cc:499
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
-#: src/lib/mid_side_decoder.cc:31
+#: src/lib/film.cc:1222
+msgid "Ls"
+msgstr ""
+
+#. / TRANSLATORS: this is the name of the `mid' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:93
+msgid "Mid"
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr "Decodificación medio-lateral"
 
@@ -447,15 +469,15 @@ msgstr "El tamaño de los vídeos no coincide en el DCP"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content_scale.cc:106
+#: src/lib/video_content_scale.cc:108
 msgid "No scale"
 msgstr "No redimensionar"
 
-#: src/lib/video_content_scale.cc:103
+#: src/lib/video_content_scale.cc:105
 msgid "No stretch"
 msgstr "Sin deformación"
 
-#: src/lib/image_content.cc:50
+#: src/lib/image_content.cc:59
 msgid "No valid image files were found in the folder."
 msgstr "No se encontraron imágenes válidas en la carpeta."
 
@@ -463,16 +485,16 @@ msgstr "No se encontraron imágenes válidas en la carpeta."
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/job.cc:326
+#: src/lib/job.cc:331
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
-#: src/lib/content.cc:106
+#: src/lib/content.cc:104
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 "Solo la primera pieza a ser unida puede tener un recorte en su comienzo."
 
-#: src/lib/content.cc:110
+#: src/lib/content.cc:108
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Solo la última pieza a ser unida puede tener un recorte en su final."
 
@@ -484,8 +506,13 @@ msgstr "Falta de memoria"
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
 
-#: src/lib/video_content.cc:558
-msgid "Padded with black to %1x%2"
+#: src/lib/colour_conversion.cc:264
+msgid "P3"
+msgstr ""
+
+#: src/lib/video_content.cc:554
+#, fuzzy
+msgid "Padded with black to fit container %1 (%2x%3)"
 msgstr "Completado con negro hasta %1x%2"
 
 #: src/lib/dcp_content_type.cc:52
@@ -500,39 +527,56 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Anuncio de servicio público"
 
+#: src/lib/film.cc:1219
+msgid "R"
+msgstr ""
+
 #: src/lib/dcp_content_type.cc:50
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/config.cc:89 src/lib/config.cc:190
+#: src/lib/film.cc:1227
+msgid "Rc"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:262
+#, fuzzy
+msgid "Rec. 601"
+msgstr "Rec. 709"
+
+#: src/lib/colour_conversion.cc:263
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:646
+#: src/lib/util.cc:497
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:654
+#: src/lib/util.cc:505
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:656
+#: src/lib/util.cc:507
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:501
 msgid "Right surround"
 msgstr "Surround derecha"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/film.cc:1223
+msgid "Rs"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:141
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
-#: src/lib/video_content.cc:549
+#: src/lib/video_content.cc:545
 msgid "Scaled to %1x%2"
 msgstr "Redimensionado a %1x%2"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:41
 msgid "Scope"
 msgstr "Scope"
 
@@ -540,19 +584,20 @@ msgstr "Scope"
 msgid "Short"
 msgstr "Cortometraje"
 
-#: src/lib/scaler.cc:68
-msgid "Sinc"
-msgstr "Sinc"
+#. / TRANSLATORS: this is the name of the `side' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:95
+msgid "Side"
+msgstr ""
 
-#: src/lib/scaler.cc:69
-msgid "Spline"
-msgstr "Spline"
+#: src/lib/audio_content.cc:252
+msgid "Some audio will be resampled to %1kHz"
+msgstr ""
 
-#: src/lib/upmixer_a.cc:42
+#: src/lib/upmixer_a.cc:45
 msgid "Stereo to 5.1 up-mixer A"
 msgstr "Upmix de estéreo a 5.1 A"
 
-#: src/lib/subrip_content.cc:77
+#: src/lib/subrip_content.cc:79
 msgid "SubRip subtitles"
 msgstr "Subtítulos SubRip"
 
@@ -568,7 +613,7 @@ msgstr "Filtro telecine"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/dcp_examiner.cc:133
+#: src/lib/dcp_examiner.cc:131
 msgid ""
 "The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
 msgstr ""
@@ -591,7 +636,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "No hubo suficiente memoria para hacer esto."
 
-#: src/lib/film.cc:427
+#: src/lib/film.cc:386
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -600,7 +645,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:419
+#: src/lib/film.cc:378
 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 "
@@ -622,11 +667,11 @@ msgstr "Codificar %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/internet.cc:80
+#: src/lib/internet.cc:82
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:48
+#: src/lib/image_proxy.cc:47
 msgid "Unexpected image type received by server"
 msgstr "El servidor recibió un tipo de imagen inesperada"
 
@@ -634,7 +679,7 @@ msgstr "El servidor recibió un tipo de imagen inesperada"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:277
+#: src/lib/ffmpeg_decoder.cc:282
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
@@ -642,11 +687,23 @@ msgstr "Formato de audio desconocido (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
-#: src/lib/colour_conversion.cc:182
+#: src/lib/colour_conversion.cc:220
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/util.cc:652
+#: src/lib/upmixer_a.cc:128
+msgid "Upmix L"
+msgstr ""
+
+#: src/lib/upmixer_a.cc:129
+msgid "Upmix R"
+msgstr ""
+
+#: src/lib/film.cc:1225
+msgid "VI"
+msgstr ""
+
+#: src/lib/util.cc:503
 msgid "Visually impaired"
 msgstr "Ciegos"
 
@@ -654,51 +711,47 @@ msgstr "Ciegos"
 msgid "Waiting"
 msgstr "Esperando"
 
-#: src/lib/scaler.cc:64
-msgid "X"
-msgstr "X"
-
 #: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:324
+#: src/lib/film.cc:300
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
-#: src/lib/image_content.cc:73
+#: src/lib/image_content.cc:87
 msgid "[moving images]"
 msgstr "[imágenes en movimiento]"
 
-#: src/lib/image_content.cc:71
+#: src/lib/image_content.cc:85
 msgid "[still]"
 msgstr "[imagen fija]"
 
-#: src/lib/dcp_subtitle_content.cc:79 src/lib/subrip_content.cc:71
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
 msgid "[subtitles]"
 msgstr "[subtítulos]"
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:282
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:524
+#: src/lib/dcpomatic_socket.cc:66
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
-#: src/lib/scp_dcp_job.cc:121
+#: src/lib/scp_dcp_job.cc:127
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:320
+#: src/lib/film.cc:296
 msgid "container"
 msgstr "continente"
 
-#: src/lib/film.cc:328
+#: src/lib/film.cc:304
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: src/lib/scp_dcp_job.cc:170
+#: src/lib/scp_dcp_job.cc:176
 msgid "copying %1"
 msgstr "copiando %1"
 
@@ -706,15 +759,16 @@ msgstr "copiando %1"
 msgid "could not create file %1"
 msgstr "No se pudo crear el fichero (%1)"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:101
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/writer.cc:465
-msgid "could not move audio MXF into the DCP (%1)"
+#: src/lib/writer.cc:535
+#, fuzzy
+msgid "could not move audio asset into the DCP (%1)"
 msgstr "no s puedo mover el audio MXF en el DCP (%1)"
 
-#: src/lib/sndfile_decoder.cc:54
+#: src/lib/sndfile_base.cc:47
 msgid "could not open audio file for reading"
 msgstr "no se pudo abrir el fichero de audio para lectura"
 
@@ -722,13 +776,14 @@ msgstr "no se pudo abrir el fichero de audio para lectura"
 msgid "could not open file %1"
 msgstr "no se pudo abrir el fichero %1"
 
-#: src/lib/encoded_data.cc:50
+#: src/lib/data.cc:55
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/encoded_data.cc:56
-msgid "could not read encoded data"
-msgstr "no se pudo leer la información codificada"
+#: src/lib/data.cc:61
+#, fuzzy
+msgid "could not read from file"
+msgstr "No se pudo leer del fichero %1 (%2)"
 
 #: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
@@ -754,34 +809,30 @@ msgstr "no se pudo abrir la sesión SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir en el fichero (%1)"
 
-#: src/lib/util.cc:544
-msgid "error during async_accept (%1)"
-msgstr "error durante async_accept (%1)"
-
-#: src/lib/util.cc:520
+#: src/lib/dcpomatic_socket.cc:62
 msgid "error during async_connect (%1)"
 msgstr "error durante async_connect (%1)"
 
-#: src/lib/util.cc:593
+#: src/lib/dcpomatic_socket.cc:115
 msgid "error during async_read (%1)"
 msgstr "error durante async_read (%1)"
 
-#: src/lib/util.cc:565
+#: src/lib/dcpomatic_socket.cc:87
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:96
+#: src/lib/transcode_job.cc:102
 msgid "fps"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:170 src/lib/util.cc:173
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -789,41 +840,84 @@ msgstr ""
 msgid "missing required setting %1"
 msgstr "falta una configuración obligatoria %1"
 
-#: src/lib/image_content.cc:88
+#: src/lib/image_content.cc:102
 msgid "moving"
 msgstr "moviendo"
 
-#: src/lib/ffmpeg_decoder.cc:444
+#: src/lib/ffmpeg_decoder.cc:449
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:277 src/lib/film.cc:332
+#: src/lib/film.cc:282 src/lib/film.cc:308
 msgid "name"
 msgstr "nombre"
 
+#: src/lib/video_content.cc:520
+msgid "pixel aspect ratio"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:323
+#: src/lib/job.cc:328
 msgid "remaining"
 msgstr "pendiente"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:184
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
-#: src/lib/config.cc:88 src/lib/config.cc:189
+#: src/lib/colour_conversion.cc:261
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/image_content.cc:86
+#: src/lib/image_content.cc:100
 msgid "still"
 msgstr "imagen fija"
 
-#: src/lib/ffmpeg_examiner.cc:218
+#: src/lib/ffmpeg_examiner.cc:242
 msgid "unknown"
 msgstr "desconocido"
 
+#~ msgid "1.375"
+#~ msgstr "1.375"
+
+#~ msgid "Area"
+#~ msgstr "Área"
+
+#~ msgid "Bicubic"
+#~ msgstr "Bicúbico"
+
+#~ msgid "Bilinear"
+#~ msgstr "Bilineal"
+
+#~ msgid "Content to be joined must use the same audio stream."
+#~ msgstr "Para unir contenido debe usar el mismo tipo de audio."
+
+#~ msgid "Fast Bilinear"
+#~ msgstr "Bilineal rápido"
+
+#~ msgid "Gaussian"
+#~ msgstr "Gaussiano"
+
+#~ msgid "Lanczos"
+#~ msgstr "Lanczos"
+
+#~ msgid "Sinc"
+#~ msgstr "Sinc"
+
+#~ msgid "Spline"
+#~ msgstr "Spline"
+
+#~ msgid "X"
+#~ msgstr "X"
+
+#~ msgid "could not read encoded data"
+#~ msgstr "no se pudo leer la información codificada"
+
+#~ msgid "error during async_accept (%1)"
+#~ msgstr "error durante async_accept (%1)"
+
 #~ msgid "%1 channels, %2kHz, %3 samples"
 #~ msgstr "%1 canales, %2kHz, %3 muestras"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index b978b0980..e52b7a03f 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-07-14 12:04+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.6\n"
 
-#: src/lib/dcp_content.cc:106
+#: src/lib/dcp_content.cc:110
 msgid "%1 [DCP]"
 msgstr ""
 
-#: src/lib/sndfile_content.cc:64
+#: src/lib/sndfile_content.cc:66
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:192
 msgid "%1 [movie]"
 msgstr "%1 [vidéo]"
 
@@ -34,14 +34,10 @@ msgid "1.19"
 msgstr "1.19"
 
 #: src/lib/ratio.cc:38
-msgid "1.375"
-msgstr "1.375"
-
-#: src/lib/ratio.cc:39
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:39
 msgid "16:9"
 msgstr "16:9"
 
@@ -65,31 +61,38 @@ 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:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio"
 msgstr "Analyse audio"
 
-#: src/lib/scaler.cc:65
-msgid "Area"
-msgstr "Surface"
+#: src/lib/audio_content.cc:257
+#, fuzzy
+msgid "Audio will be resampled from %1kHz to %2kHz"
+msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
 
-#: src/lib/audio_content.cc:253
-msgid "Audio will be resampled from %1kHz to %2kHz."
+#: src/lib/audio_content.cc:259
+#, fuzzy
+msgid "Audio will be resampled to %1kHz"
 msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
 
-#: src/lib/audio_content.cc:255
-msgid "Audio will not be resampled."
+#: src/lib/audio_content.cc:248
+#, fuzzy
+msgid "Audio will not be resampled"
+msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
+
+#: src/lib/film.cc:1228
+msgid "BsL"
 msgstr ""
 
-#: src/lib/scaler.cc:63
-msgid "Bicubic"
-msgstr "Bicubique"
+#: src/lib/film.cc:1229
+msgid "BsR"
+msgstr ""
 
-#: src/lib/scaler.cc:70
-msgid "Bilinear"
-msgstr "Bilinéaire"
+#: src/lib/film.cc:1220
+msgid "C"
+msgstr ""
 
-#: src/lib/job.cc:330
+#: src/lib/job.cc:335
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -97,23 +100,23 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:647
+#: src/lib/util.cc:498
 msgid "Centre"
 msgstr "Centre"
 
-#: src/lib/writer.cc:95
+#: src/lib/writer.cc:119
 msgid "Checking existing image data"
 msgstr "Recherche de données images existantes"
 
-#: src/lib/writer.cc:525
+#: src/lib/writer.cc:606
 msgid "Computing audio digest"
 msgstr "Fabrication rendu audio"
 
-#: src/lib/content.cc:143
+#: src/lib/content.cc:135
 msgid "Computing digest"
 msgstr "fabrication rendu"
 
-#: src/lib/writer.cc:521
+#: src/lib/writer.cc:602
 msgid "Computing image digest"
 msgstr "Fabrication rendu image"
 
@@ -121,21 +124,21 @@ msgstr "Fabrication rendu image"
 msgid "Content and DCP have the same rate.\n"
 msgstr "Le DCP et la source ont la même cadence image.\n"
 
-#: src/lib/video_content.cc:565
+#: src/lib/video_content.cc:562
 msgid "Content frame rate"
 msgstr "Cadence du contenu"
 
-#: src/lib/subtitle_content.cc:115
+#: src/lib/subtitle_content.cc:117
 #, fuzzy
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr ""
 "Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
 
-#: src/lib/audio_content.cc:103
+#: src/lib/audio_content.cc:94
 msgid "Content to be joined must have the same audio delay."
 msgstr "Le contenu à ajouter doit présenter le même délais audio"
 
-#: src/lib/audio_content.cc:99
+#: src/lib/audio_content.cc:90
 msgid "Content to be joined must have the same audio gain."
 msgstr "Le contenu à ajouter doit avoir le même gain audio"
 
@@ -161,24 +164,24 @@ msgid "Content to be joined must have the same scale setting."
 msgstr ""
 "Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
 
-#: src/lib/subtitle_content.cc:119
+#: src/lib/subtitle_content.cc:121
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Le contenu à ajouter doit avoir le même positionnement horizontal des sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:129
 #, fuzzy
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre"
 
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:125
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Le contenu à ajouter doit avoir le même positionnement vertical des sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:133
 #, fuzzy
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre"
@@ -191,20 +194,16 @@ msgstr "Le contenu à ajouter doit avoir la même cadence d'images"
 msgid "Content to be joined must have the same video frame type."
 msgstr "Le contenu à ajouter doit avoir le même type de trame vidéo"
 
-#: src/lib/ffmpeg_content.cc:118
-msgid "Content to be joined must use the same audio stream."
-msgstr "Le contenu à ajouter doit avoir le même flux audio"
-
-#: src/lib/subtitle_content.cc:136 src/lib/subtitle_content.cc:144
+#: src/lib/subtitle_content.cc:138 src/lib/subtitle_content.cc:146
 #, fuzzy
 msgid "Content to be joined must use the same fonts."
 msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
 
-#: src/lib/ffmpeg_content.cc:114
+#: src/lib/ffmpeg_content.cc:109
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Le contenu à ajouter doit avoir le même flux sous titre"
 
-#: src/lib/video_content.cc:523
+#: src/lib/video_content.cc:511
 msgid "Content video is %1x%2"
 msgstr "Le contenu vidéo est %1x%2"
 
@@ -212,20 +211,25 @@ msgstr "Le contenu vidéo est %1x%2"
 msgid "Copy DCP to TMS"
 msgstr "Copier le DCP dans le TMS"
 
-#: src/lib/scp_dcp_job.cc:130
+#: src/lib/scp_dcp_job.cc:136
 msgid "Could not connect to server %1 (%2)"
 msgstr "Connexion au serveur %1 (%2) impossible"
 
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:158
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Création du dossier distant %1 (%2) impossible"
 
-#: src/lib/magick_image_proxy.cc:96
+#: src/lib/image_examiner.cc:61
+#, fuzzy
+msgid "Could not decode JPEG2000 file %1 (%2)"
+msgstr "Impossible de décoder le ficher image"
+
+#: src/lib/magick_image_proxy.cc:99
 #, fuzzy
 msgid "Could not decode image file (%1)"
 msgstr "Impossible de décoder le ficher image"
 
-#: src/lib/server_finder.cc:114
+#: src/lib/server_finder.cc:128
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -235,32 +239,32 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "lecture du fichier %1 impossible"
 
-#: src/lib/scp_dcp_job.cc:177
+#: src/lib/scp_dcp_job.cc:183
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
-#: src/lib/internet.cc:75
+#: src/lib/internet.cc:77
 msgid "Could not open downloaded ZIP file"
 msgstr "Ouverture du fichier Zip téléchargé impossible"
 
-#: src/lib/dcp_subtitle.cc:57
+#: src/lib/dcp_subtitle.cc:49
 #, fuzzy
 msgid "Could not read subtitles"
 msgstr "décodeur de sous-titre introuvable"
 
-#: src/lib/scp_dcp_job.cc:147
+#: src/lib/scp_dcp_job.cc:153
 msgid "Could not start SCP session (%1)"
 msgstr "Démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:191
+#: src/lib/scp_dcp_job.cc:197
 msgid "Could not write to remote file (%1)"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/video_content.cc:534
+#: src/lib/video_content.cc:530
 msgid "Cropped to %1x%2"
 msgstr "Rognage de %1x%2"
 
-#: src/lib/dcp_subtitle_content.cc:85
+#: src/lib/dcp_subtitle_content.cc:96
 msgid "DCP XML subtitles"
 msgstr ""
 
@@ -280,7 +284,7 @@ msgstr ""
 "DCP-o-matic ne peut pas ouvrir le fichier %1. Soit il n'existe pas, soit il "
 "n'est pas au bon format."
 
-#: src/lib/ffmpeg_content.cc:95
+#: src/lib/ffmpeg_content.cc:90
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
@@ -289,7 +293,7 @@ msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
-#: src/lib/config.cc:426
+#: src/lib/config.cc:419
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -315,11 +319,15 @@ msgstr ""
 "Cordialement,\n"
 "DCP-o-matic"
 
+#: src/lib/video_content.cc:524
+msgid "Display aspect ratio"
+msgstr ""
+
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 et CP750"
 
-#: src/lib/internet.cc:68
+#: src/lib/internet.cc:70
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Echec de téléchargement (%1/%2 erreur %3)"
 
@@ -339,11 +347,11 @@ msgstr "Envoyer KDM par email pour %1"
 msgid "Email problem report for %1"
 msgstr ""
 
-#: src/lib/writer.cc:141
+#: src/lib/writer.cc:153
 msgid "Encoding image data"
 msgstr "encodage des données image"
 
-#: src/lib/job.cc:328
+#: src/lib/job.cc:333
 msgid "Error (%1)"
 msgstr "Erreur (%1)"
 
@@ -351,39 +359,39 @@ msgstr "Erreur (%1)"
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/examine_content_job.cc:47
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Examen du contenu"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:146
 msgid "Failed to authenticate with server (%1)"
 msgstr "L'authentification du serveur (%1) a échouée"
 
-#: src/lib/scaler.cc:71
-msgid "Fast Bilinear"
-msgstr "Bilinéaire rapide"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Feature"
 msgstr "Feature"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ffmpeg_examiner.cc:76
+msgid "Finding length"
+msgstr ""
+
+#: src/lib/ratio.cc:40
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:42
 msgid "Full frame"
 msgstr "Full frame"
 
-#: src/lib/scaler.cc:66
-msgid "Gaussian"
-msgstr "Gaussien"
-
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Corrections des bandes par dégradé"
 
-#: src/lib/util.cc:651
+#: src/lib/film.cc:1224
+msgid "HI"
+msgstr ""
+
+#: src/lib/util.cc:502
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -395,7 +403,7 @@ msgstr "Débruiteur 3D haute qualité"
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:206
+#: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -403,31 +411,48 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr "Désentrelaceur noyau"
 
-#: src/lib/scaler.cc:67
-msgid "Lanczos"
-msgstr "Lanczos"
+#: src/lib/film.cc:1218
+msgid "L"
+msgstr ""
+
+#: src/lib/film.cc:1226
+msgid "Lc"
+msgstr ""
 
-#: src/lib/util.cc:645
+#: src/lib/util.cc:496
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:653
+#: src/lib/util.cc:504
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:655
+#: src/lib/util.cc:506
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:649
+#: src/lib/util.cc:500
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:648
+#: src/lib/film.cc:1221
+msgid "Lfe"
+msgstr ""
+
+#: src/lib/util.cc:499
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
-#: src/lib/mid_side_decoder.cc:31
+#: src/lib/film.cc:1222
+msgid "Ls"
+msgstr ""
+
+#. / TRANSLATORS: this is the name of the `mid' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:93
+msgid "Mid"
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
 
@@ -455,15 +480,15 @@ msgstr ""
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
-#: src/lib/video_content_scale.cc:106
+#: src/lib/video_content_scale.cc:108
 msgid "No scale"
 msgstr "Pas de mise à l'échelle"
 
-#: src/lib/video_content_scale.cc:103
+#: src/lib/video_content_scale.cc:105
 msgid "No stretch"
 msgstr "Sans déformation"
 
-#: src/lib/image_content.cc:50
+#: src/lib/image_content.cc:59
 msgid "No valid image files were found in the folder."
 msgstr "Aucun fichier image valide dans ce dossier."
 
@@ -471,15 +496,15 @@ msgstr "Aucun fichier image valide dans ce dossier."
 msgid "Noise reduction"
 msgstr "Réduction de bruit"
 
-#: src/lib/job.cc:326
+#: src/lib/job.cc:331
 msgid "OK (ran for %1)"
 msgstr "OK (processus %1)"
 
-#: src/lib/content.cc:106
+#: src/lib/content.cc:104
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr "Seul le premier contenu à ajouter peut être rogné au point d'entrée."
 
-#: src/lib/content.cc:110
+#: src/lib/content.cc:108
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Seul le dernier contenu à ajouter peut être rogné au point de sortie."
 
@@ -491,8 +516,13 @@ msgstr "Hors capacité mémoire"
 msgid "Overcomplete wavelet denoiser"
 msgstr "Réduction de bruit par ondelettes"
 
-#: src/lib/video_content.cc:558
-msgid "Padded with black to %1x%2"
+#: src/lib/colour_conversion.cc:264
+msgid "P3"
+msgstr ""
+
+#: src/lib/video_content.cc:554
+#, fuzzy
+msgid "Padded with black to fit container %1 (%2x%3)"
 msgstr "Enveloppe noire de %1x%2"
 
 #: src/lib/dcp_content_type.cc:52
@@ -507,39 +537,56 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Public Service Announcement"
 
+#: src/lib/film.cc:1219
+msgid "R"
+msgstr ""
+
 #: src/lib/dcp_content_type.cc:50
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/config.cc:89 src/lib/config.cc:190
+#: src/lib/film.cc:1227
+msgid "Rc"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:262
+#, fuzzy
+msgid "Rec. 601"
+msgstr "Rec. 709"
+
+#: src/lib/colour_conversion.cc:263
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:646
+#: src/lib/util.cc:497
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:654
+#: src/lib/util.cc:505
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:656
+#: src/lib/util.cc:507
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:501
 msgid "Right surround"
 msgstr "Arrière droite"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/film.cc:1223
+msgid "Rs"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:141
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
-#: src/lib/video_content.cc:549
+#: src/lib/video_content.cc:545
 msgid "Scaled to %1x%2"
 msgstr "Mis à l'échelle de %1x%2"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:41
 msgid "Scope"
 msgstr "Scope"
 
@@ -547,19 +594,21 @@ msgstr "Scope"
 msgid "Short"
 msgstr "Short"
 
-#: src/lib/scaler.cc:68
-msgid "Sinc"
-msgstr "Sinc"
+#. / TRANSLATORS: this is the name of the `side' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:95
+msgid "Side"
+msgstr ""
 
-#: src/lib/scaler.cc:69
-msgid "Spline"
-msgstr "Spline"
+#: src/lib/audio_content.cc:252
+#, fuzzy
+msgid "Some audio will be resampled to %1kHz"
+msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
 
-#: src/lib/upmixer_a.cc:42
+#: src/lib/upmixer_a.cc:45
 msgid "Stereo to 5.1 up-mixer A"
 msgstr ""
 
-#: src/lib/subrip_content.cc:77
+#: src/lib/subrip_content.cc:79
 msgid "SubRip subtitles"
 msgstr ""
 
@@ -575,7 +624,7 @@ msgstr "Filtre télécinéma"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/dcp_examiner.cc:133
+#: src/lib/dcp_examiner.cc:131
 msgid ""
 "The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
 msgstr ""
@@ -596,7 +645,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:427
+#: src/lib/film.cc:386
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -604,7 +653,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:419
+#: src/lib/film.cc:378
 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 "
@@ -626,11 +675,11 @@ msgstr "Transcodage %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/internet.cc:80
+#: src/lib/internet.cc:82
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
-#: src/lib/image_proxy.cc:48
+#: src/lib/image_proxy.cc:47
 msgid "Unexpected image type received by server"
 msgstr "Type d'image non conforme reçu par le serveur"
 
@@ -638,7 +687,7 @@ msgstr "Type d'image non conforme reçu par le serveur"
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/lib/ffmpeg_decoder.cc:277
+#: src/lib/ffmpeg_decoder.cc:282
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Échantillonnage audio (%1) inconnu"
 
@@ -646,11 +695,23 @@ msgstr "Échantillonnage audio (%1) inconnu"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Adoucissement et flou Gaussien"
 
-#: src/lib/colour_conversion.cc:182
+#: src/lib/colour_conversion.cc:220
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/lib/util.cc:652
+#: src/lib/upmixer_a.cc:128
+msgid "Upmix L"
+msgstr ""
+
+#: src/lib/upmixer_a.cc:129
+msgid "Upmix R"
+msgstr ""
+
+#: src/lib/film.cc:1225
+msgid "VI"
+msgstr ""
+
+#: src/lib/util.cc:503
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
@@ -658,51 +719,47 @@ msgstr "Déficients Visuels"
 msgid "Waiting"
 msgstr "En cours"
 
-#: src/lib/scaler.cc:64
-msgid "X"
-msgstr "X"
-
 #: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:324
+#: src/lib/film.cc:300
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
-#: src/lib/image_content.cc:73
+#: src/lib/image_content.cc:87
 msgid "[moving images]"
 msgstr "[Déplacement d'images]"
 
-#: src/lib/image_content.cc:71
+#: src/lib/image_content.cc:85
 msgid "[still]"
 msgstr "[restant]"
 
-#: src/lib/dcp_subtitle_content.cc:79 src/lib/subrip_content.cc:71
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:282
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:524
+#: src/lib/dcpomatic_socket.cc:66
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
-#: src/lib/scp_dcp_job.cc:121
+#: src/lib/scp_dcp_job.cc:127
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:320
+#: src/lib/film.cc:296
 msgid "container"
 msgstr "conteneur"
 
-#: src/lib/film.cc:328
+#: src/lib/film.cc:304
 msgid "content type"
 msgstr "type de contenu"
 
-#: src/lib/scp_dcp_job.cc:170
+#: src/lib/scp_dcp_job.cc:176
 msgid "copying %1"
 msgstr "copie de %1"
 
@@ -710,15 +767,16 @@ msgstr "copie de %1"
 msgid "could not create file %1"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:101
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/writer.cc:465
-msgid "could not move audio MXF into the DCP (%1)"
+#: src/lib/writer.cc:535
+#, fuzzy
+msgid "could not move audio asset into the DCP (%1)"
 msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
 
-#: src/lib/sndfile_decoder.cc:54
+#: src/lib/sndfile_base.cc:47
 msgid "could not open audio file for reading"
 msgstr "lecture du fichier audio impossible"
 
@@ -726,13 +784,14 @@ msgstr "lecture du fichier audio impossible"
 msgid "could not open file %1"
 msgstr "lecture du fichier (%1) impossible"
 
-#: src/lib/encoded_data.cc:50
+#: src/lib/data.cc:55
 msgid "could not open file for reading"
 msgstr "lecture du fichier impossible"
 
-#: src/lib/encoded_data.cc:56
-msgid "could not read encoded data"
-msgstr "lecture des données encodées impossible"
+#: src/lib/data.cc:61
+#, fuzzy
+msgid "could not read from file"
+msgstr "lecture du fichier impossible %1 (%2)"
 
 #: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
@@ -760,34 +819,30 @@ msgstr "démarrage de session SSH impossible"
 msgid "could not write to file %1 (%2)"
 msgstr "Écriture vers fichier distant (%1) impossible (%2)"
 
-#: src/lib/util.cc:544
-msgid "error during async_accept (%1)"
-msgstr "erreur pendant async_accept (%1)"
-
-#: src/lib/util.cc:520
+#: src/lib/dcpomatic_socket.cc:62
 msgid "error during async_connect (%1)"
 msgstr "erreur pendant async_connect (%1)"
 
-#: src/lib/util.cc:593
+#: src/lib/dcpomatic_socket.cc:115
 msgid "error during async_read (%1)"
 msgstr "erreur pendant async_read (%1)"
 
-#: src/lib/util.cc:565
+#: src/lib/dcpomatic_socket.cc:87
 msgid "error during async_write (%1)"
 msgstr "erreur pendant async_write (%1)"
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:96
+#: src/lib/transcode_job.cc:102
 msgid "fps"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:170 src/lib/util.cc:173
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -795,41 +850,84 @@ msgstr ""
 msgid "missing required setting %1"
 msgstr "paramètre %1 manquant"
 
-#: src/lib/image_content.cc:88
+#: src/lib/image_content.cc:102
 msgid "moving"
 msgstr "déplacement"
 
-#: src/lib/ffmpeg_decoder.cc:444
+#: src/lib/ffmpeg_decoder.cc:449
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:277 src/lib/film.cc:332
+#: src/lib/film.cc:282 src/lib/film.cc:308
 msgid "name"
 msgstr "nom"
 
+#: src/lib/video_content.cc:520
+msgid "pixel aspect ratio"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:323
+#: src/lib/job.cc:328
 msgid "remaining"
 msgstr "restant"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:184
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
-#: src/lib/config.cc:88 src/lib/config.cc:189
+#: src/lib/colour_conversion.cc:261
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/image_content.cc:86
+#: src/lib/image_content.cc:100
 msgid "still"
 msgstr "%1 [restant]"
 
-#: src/lib/ffmpeg_examiner.cc:218
+#: src/lib/ffmpeg_examiner.cc:242
 msgid "unknown"
 msgstr "Inconnu"
 
+#~ msgid "1.375"
+#~ msgstr "1.375"
+
+#~ msgid "Area"
+#~ msgstr "Surface"
+
+#~ msgid "Bicubic"
+#~ msgstr "Bicubique"
+
+#~ msgid "Bilinear"
+#~ msgstr "Bilinéaire"
+
+#~ msgid "Content to be joined must use the same audio stream."
+#~ msgstr "Le contenu à ajouter doit avoir le même flux audio"
+
+#~ msgid "Fast Bilinear"
+#~ msgstr "Bilinéaire rapide"
+
+#~ msgid "Gaussian"
+#~ msgstr "Gaussien"
+
+#~ msgid "Lanczos"
+#~ msgstr "Lanczos"
+
+#~ msgid "Sinc"
+#~ msgstr "Sinc"
+
+#~ msgid "Spline"
+#~ msgstr "Spline"
+
+#~ msgid "X"
+#~ msgstr "X"
+
+#~ msgid "could not read encoded data"
+#~ msgstr "lecture des données encodées impossible"
+
+#~ msgid "error during async_accept (%1)"
+#~ msgstr "erreur pendant async_accept (%1)"
+
 #~ msgid "%1 channels, %2kHz, %3 samples"
 #~ msgstr "%1 canaux, %2kHz, %3 échantillons"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 2367251f0..0f6be91c2 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/lib/dcp_content.cc:106
+#: src/lib/dcp_content.cc:110
 msgid "%1 [DCP]"
 msgstr ""
 
-#: src/lib/sndfile_content.cc:64
+#: src/lib/sndfile_content.cc:66
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:192
 msgid "%1 [movie]"
 msgstr ""
 
@@ -34,14 +34,10 @@ msgid "1.19"
 msgstr "1.19"
 
 #: src/lib/ratio.cc:38
-msgid "1.375"
-msgstr "1.375"
-
-#: src/lib/ratio.cc:39
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:39
 msgid "16:9"
 msgstr "16:9"
 
@@ -65,32 +61,39 @@ 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:49
+#: src/lib/analyse_audio_job.cc:53
 #, fuzzy
 msgid "Analyse audio"
 msgstr "Analizzo l'audio di %1"
 
-#: src/lib/scaler.cc:65
-msgid "Area"
-msgstr "Area"
+#: src/lib/audio_content.cc:257
+#, fuzzy
+msgid "Audio will be resampled from %1kHz to %2kHz"
+msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
 
-#: src/lib/audio_content.cc:253
-msgid "Audio will be resampled from %1kHz to %2kHz."
+#: src/lib/audio_content.cc:259
+#, fuzzy
+msgid "Audio will be resampled to %1kHz"
 msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
 
-#: src/lib/audio_content.cc:255
-msgid "Audio will not be resampled."
+#: src/lib/audio_content.cc:248
+#, fuzzy
+msgid "Audio will not be resampled"
+msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
+
+#: src/lib/film.cc:1228
+msgid "BsL"
 msgstr ""
 
-#: src/lib/scaler.cc:63
-msgid "Bicubic"
-msgstr "Bicubica"
+#: src/lib/film.cc:1229
+msgid "BsR"
+msgstr ""
 
-#: src/lib/scaler.cc:70
-msgid "Bilinear"
-msgstr "Bilineare"
+#: src/lib/film.cc:1220
+msgid "C"
+msgstr ""
 
-#: src/lib/job.cc:330
+#: src/lib/job.cc:335
 msgid "Cancelled"
 msgstr "Cancellato"
 
@@ -98,23 +101,23 @@ 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:647
+#: src/lib/util.cc:498
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:95
+#: src/lib/writer.cc:119
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:525
+#: src/lib/writer.cc:606
 msgid "Computing audio digest"
 msgstr ""
 
-#: src/lib/content.cc:143
+#: src/lib/content.cc:135
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:521
+#: src/lib/writer.cc:602
 msgid "Computing image digest"
 msgstr ""
 
@@ -123,22 +126,22 @@ msgstr ""
 msgid "Content and DCP have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
-#: src/lib/video_content.cc:565
+#: src/lib/video_content.cc:562
 #, fuzzy
 msgid "Content frame rate"
 msgstr "tipo di contenuto"
 
-#: src/lib/subtitle_content.cc:115
+#: src/lib/subtitle_content.cc:117
 #, fuzzy
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/audio_content.cc:103
+#: src/lib/audio_content.cc:94
 msgid "Content to be joined must have the same audio delay."
 msgstr ""
 
-#: src/lib/audio_content.cc:99
+#: src/lib/audio_content.cc:90
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 
@@ -166,23 +169,23 @@ msgid "Content to be joined must have the same scale setting."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:119
+#: src/lib/subtitle_content.cc:121
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:129
 #, fuzzy
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:125
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:133
 #, fuzzy
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr ""
@@ -196,21 +199,17 @@ msgstr ""
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:118
-msgid "Content to be joined must use the same audio stream."
-msgstr ""
-
-#: src/lib/subtitle_content.cc:136 src/lib/subtitle_content.cc:144
+#: src/lib/subtitle_content.cc:138 src/lib/subtitle_content.cc:146
 #, fuzzy
 msgid "Content to be joined must use the same fonts."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/ffmpeg_content.cc:114
+#: src/lib/ffmpeg_content.cc:109
 msgid "Content to be joined must use the same subtitle stream."
 msgstr ""
 
-#: src/lib/video_content.cc:523
+#: src/lib/video_content.cc:511
 msgid "Content video is %1x%2"
 msgstr "Il video originale è %1x%2"
 
@@ -218,20 +217,25 @@ msgstr "Il video originale è %1x%2"
 msgid "Copy DCP to TMS"
 msgstr "Copia del DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:130
+#: src/lib/scp_dcp_job.cc:136
 msgid "Could not connect to server %1 (%2)"
 msgstr "Non posso connetermi al server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:158
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
-#: src/lib/magick_image_proxy.cc:96
+#: src/lib/image_examiner.cc:61
+#, fuzzy
+msgid "Could not decode JPEG2000 file %1 (%2)"
+msgstr "Non posso scrivere il file remoto (%1)"
+
+#: src/lib/magick_image_proxy.cc:99
 #, fuzzy
 msgid "Could not decode image file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/server_finder.cc:114
+#: src/lib/server_finder.cc:128
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -241,33 +245,33 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "Non riesco ad aprire %1"
 
-#: src/lib/scp_dcp_job.cc:177
+#: src/lib/scp_dcp_job.cc:183
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
-#: src/lib/internet.cc:75
+#: src/lib/internet.cc:77
 #, fuzzy
 msgid "Could not open downloaded ZIP file"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/dcp_subtitle.cc:57
+#: src/lib/dcp_subtitle.cc:49
 #, fuzzy
 msgid "Could not read subtitles"
 msgstr "non riesco a trovare il decoder dei sottotitoli"
 
-#: src/lib/scp_dcp_job.cc:147
+#: src/lib/scp_dcp_job.cc:153
 msgid "Could not start SCP session (%1)"
 msgstr "Non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:191
+#: src/lib/scp_dcp_job.cc:197
 msgid "Could not write to remote file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/video_content.cc:534
+#: src/lib/video_content.cc:530
 msgid "Cropped to %1x%2"
 msgstr "Tagliato da %1x%2"
 
-#: src/lib/dcp_subtitle_content.cc:85
+#: src/lib/dcp_subtitle_content.cc:96
 msgid "DCP XML subtitles"
 msgstr ""
 
@@ -289,7 +293,7 @@ msgstr ""
 "DCP-o-matic non può aprire il file %1. Non esiste oppure è in un formato non "
 "riconosciuto."
 
-#: src/lib/ffmpeg_content.cc:95
+#: src/lib/ffmpeg_content.cc:90
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
@@ -298,7 +302,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
-#: src/lib/config.cc:426
+#: src/lib/config.cc:419
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -322,12 +326,16 @@ msgstr ""
 "Distinti saluti,\n"
 "DCP-o-matic"
 
+#: src/lib/video_content.cc:524
+msgid "Display aspect ratio"
+msgstr ""
+
 #: src/lib/dolby_cp750.cc:27
 #, fuzzy
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/internet.cc:68
+#: src/lib/internet.cc:70
 msgid "Download failed (%1/%2 error %3)"
 msgstr ""
 
@@ -347,11 +355,11 @@ msgstr ""
 msgid "Email problem report for %1"
 msgstr ""
 
-#: src/lib/writer.cc:141
+#: src/lib/writer.cc:153
 msgid "Encoding image data"
 msgstr ""
 
-#: src/lib/job.cc:328
+#: src/lib/job.cc:333
 msgid "Error (%1)"
 msgstr "Errore (%1)"
 
@@ -359,39 +367,39 @@ msgstr "Errore (%1)"
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/examine_content_job.cc:47
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Esamino il contenuto"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:146
 msgid "Failed to authenticate with server (%1)"
 msgstr "Autenticazione col server fallita (%1) "
 
-#: src/lib/scaler.cc:71
-msgid "Fast Bilinear"
-msgstr "Bilineare rapida"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Feature"
 msgstr "Caratteristica"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ffmpeg_examiner.cc:76
+msgid "Finding length"
+msgstr ""
+
+#: src/lib/ratio.cc:40
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:42
 msgid "Full frame"
 msgstr "Schermo intero"
 
-#: src/lib/scaler.cc:66
-msgid "Gaussian"
-msgstr "Gaussiana"
-
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/util.cc:651
+#: src/lib/film.cc:1224
+msgid "HI"
+msgstr ""
+
+#: src/lib/util.cc:502
 msgid "Hearing impaired"
 msgstr ""
 
@@ -403,7 +411,7 @@ msgstr "Riduttore di rumore 3D di alta qualità"
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:206
+#: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -411,32 +419,49 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr "Deinterlacciatore Kernel"
 
-#: src/lib/scaler.cc:67
-msgid "Lanczos"
-msgstr "Lanczos"
+#: src/lib/film.cc:1218
+msgid "L"
+msgstr ""
+
+#: src/lib/film.cc:1226
+msgid "Lc"
+msgstr ""
 
-#: src/lib/util.cc:645
+#: src/lib/util.cc:496
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:653
+#: src/lib/util.cc:504
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:655
+#: src/lib/util.cc:506
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:649
+#: src/lib/util.cc:500
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:648
+#: src/lib/film.cc:1221
+msgid "Lfe"
+msgstr ""
+
+#: src/lib/util.cc:499
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
-#: src/lib/mid_side_decoder.cc:31
+#: src/lib/film.cc:1222
+msgid "Ls"
+msgstr ""
+
+#. / TRANSLATORS: this is the name of the `mid' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:93
+msgid "Mid"
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
 
@@ -464,16 +489,16 @@ msgstr ""
 msgid "Motion compensating deinterlacer"
 msgstr "Dinterlacciatore con compensazione di movimento"
 
-#: src/lib/video_content_scale.cc:106
+#: src/lib/video_content_scale.cc:108
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content_scale.cc:103
+#: src/lib/video_content_scale.cc:105
 #, fuzzy
 msgid "No stretch"
 msgstr "Flat senza stiramento"
 
-#: src/lib/image_content.cc:50
+#: src/lib/image_content.cc:59
 msgid "No valid image files were found in the folder."
 msgstr ""
 
@@ -481,15 +506,15 @@ msgstr ""
 msgid "Noise reduction"
 msgstr "Riduzione del rumore"
 
-#: src/lib/job.cc:326
+#: src/lib/job.cc:331
 msgid "OK (ran for %1)"
 msgstr "OK (eseguito in %1)"
 
-#: src/lib/content.cc:106
+#: src/lib/content.cc:104
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 
-#: src/lib/content.cc:110
+#: src/lib/content.cc:108
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 
@@ -501,8 +526,13 @@ msgstr ""
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
 
-#: src/lib/video_content.cc:558
-msgid "Padded with black to %1x%2"
+#: src/lib/colour_conversion.cc:264
+msgid "P3"
+msgstr ""
+
+#: src/lib/video_content.cc:554
+#, fuzzy
+msgid "Padded with black to fit container %1 (%2x%3)"
 msgstr "Riempito con nero a %1x%2"
 
 #: src/lib/dcp_content_type.cc:52
@@ -517,41 +547,58 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Annuncio di pubblico servizio"
 
+#: src/lib/film.cc:1219
+msgid "R"
+msgstr ""
+
 #: src/lib/dcp_content_type.cc:50
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/config.cc:89 src/lib/config.cc:190
+#: src/lib/film.cc:1227
+msgid "Rc"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:262
+#, fuzzy
+msgid "Rec. 601"
+msgstr "Rec 709"
+
+#: src/lib/colour_conversion.cc:263
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:646
+#: src/lib/util.cc:497
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:654
+#: src/lib/util.cc:505
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:656
+#: src/lib/util.cc:507
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Surround destro"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:501
 msgid "Right surround"
 msgstr "Surround destro"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/film.cc:1223
+msgid "Rs"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:141
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
-#: src/lib/video_content.cc:549
+#: src/lib/video_content.cc:545
 msgid "Scaled to %1x%2"
 msgstr "Scalato a %1x%2"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:41
 msgid "Scope"
 msgstr "Scope"
 
@@ -559,19 +606,21 @@ msgstr "Scope"
 msgid "Short"
 msgstr "Corto"
 
-#: src/lib/scaler.cc:68
-msgid "Sinc"
-msgstr "Sinc"
+#. / TRANSLATORS: this is the name of the `side' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:95
+msgid "Side"
+msgstr ""
 
-#: src/lib/scaler.cc:69
-msgid "Spline"
-msgstr "Spline"
+#: src/lib/audio_content.cc:252
+#, fuzzy
+msgid "Some audio will be resampled to %1kHz"
+msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
 
-#: src/lib/upmixer_a.cc:42
+#: src/lib/upmixer_a.cc:45
 msgid "Stereo to 5.1 up-mixer A"
 msgstr ""
 
-#: src/lib/subrip_content.cc:77
+#: src/lib/subrip_content.cc:79
 msgid "SubRip subtitles"
 msgstr ""
 
@@ -587,7 +636,7 @@ msgstr "Filtro telecinema"
 msgid "Test"
 msgstr "Prova"
 
-#: src/lib/dcp_examiner.cc:133
+#: src/lib/dcp_examiner.cc:131
 msgid ""
 "The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
 msgstr ""
@@ -608,7 +657,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr ""
 
-#: src/lib/film.cc:427
+#: src/lib/film.cc:386
 #, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -619,7 +668,7 @@ msgstr ""
 "un nuovo film, ri-aggiungere i tuoi contenuti e configurarlo di nuovo. Ci "
 "dispiace!"
 
-#: src/lib/film.cc:419
+#: src/lib/film.cc:378
 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 "
@@ -642,11 +691,11 @@ msgstr "Transcodifica %1"
 msgid "Transitional"
 msgstr "Di transizione"
 
-#: src/lib/internet.cc:80
+#: src/lib/internet.cc:82
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:48
+#: src/lib/image_proxy.cc:47
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -654,7 +703,7 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: src/lib/ffmpeg_decoder.cc:277
+#: src/lib/ffmpeg_decoder.cc:282
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato di campionamento audio non riconosciuto (%1)"
 
@@ -662,11 +711,23 @@ msgstr "Formato di campionamento audio non riconosciuto (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Maschera unsharp e sfocatura Gaussiana"
 
-#: src/lib/colour_conversion.cc:182
+#: src/lib/colour_conversion.cc:220
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/util.cc:652
+#: src/lib/upmixer_a.cc:128
+msgid "Upmix L"
+msgstr ""
+
+#: src/lib/upmixer_a.cc:129
+msgid "Upmix R"
+msgstr ""
+
+#: src/lib/film.cc:1225
+msgid "VI"
+msgstr ""
+
+#: src/lib/util.cc:503
 msgid "Visually impaired"
 msgstr ""
 
@@ -674,52 +735,48 @@ msgstr ""
 msgid "Waiting"
 msgstr "Aspetta"
 
-#: src/lib/scaler.cc:64
-msgid "X"
-msgstr "X"
-
 #: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:324
+#: src/lib/film.cc:300
 msgid "You must add some content to the DCP before creating it"
 msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
 
-#: src/lib/image_content.cc:73
+#: src/lib/image_content.cc:87
 msgid "[moving images]"
 msgstr ""
 
-#: src/lib/image_content.cc:71
+#: src/lib/image_content.cc:85
 #, fuzzy
 msgid "[still]"
 msgstr "ancora"
 
-#: src/lib/dcp_subtitle_content.cc:79 src/lib/subrip_content.cc:71
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:282
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:524
+#: src/lib/dcpomatic_socket.cc:66
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
-#: src/lib/scp_dcp_job.cc:121
+#: src/lib/scp_dcp_job.cc:127
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:320
+#: src/lib/film.cc:296
 msgid "container"
 msgstr "contenitore"
 
-#: src/lib/film.cc:328
+#: src/lib/film.cc:304
 msgid "content type"
 msgstr "tipo di contenuto"
 
-#: src/lib/scp_dcp_job.cc:170
+#: src/lib/scp_dcp_job.cc:176
 msgid "copying %1"
 msgstr "copia %1"
 
@@ -727,15 +784,16 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:101
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/writer.cc:465
-msgid "could not move audio MXF into the DCP (%1)"
-msgstr ""
+#: src/lib/writer.cc:535
+#, fuzzy
+msgid "could not move audio asset into the DCP (%1)"
+msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/sndfile_decoder.cc:54
+#: src/lib/sndfile_base.cc:47
 msgid "could not open audio file for reading"
 msgstr "non riesco ad aprire il file in lettura"
 
@@ -743,14 +801,14 @@ msgstr "non riesco ad aprire il file in lettura"
 msgid "could not open file %1"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/encoded_data.cc:50
+#: src/lib/data.cc:55
 msgid "could not open file for reading"
 msgstr "non riesco ad aprire il file per leggerlo"
 
-#: src/lib/encoded_data.cc:56
+#: src/lib/data.cc:61
 #, fuzzy
-msgid "could not read encoded data"
-msgstr "non riesco a trovare il decoder audio"
+msgid "could not read from file"
+msgstr "non posso leggere dal file %1 (%2)"
 
 #: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
@@ -777,34 +835,30 @@ msgstr "non posso avviare la sessione SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "non posso scrivere il file (%1)"
 
-#: src/lib/util.cc:544
-msgid "error during async_accept (%1)"
-msgstr ""
-
-#: src/lib/util.cc:520
+#: src/lib/dcpomatic_socket.cc:62
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:593
+#: src/lib/dcpomatic_socket.cc:115
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:565
+#: src/lib/dcpomatic_socket.cc:87
 msgid "error during async_write (%1)"
 msgstr ""
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:96
+#: src/lib/transcode_job.cc:102
 msgid "fps"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:170 src/lib/util.cc:173
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -812,43 +866,81 @@ msgstr ""
 msgid "missing required setting %1"
 msgstr "persa la regolazione richiesta %1"
 
-#: src/lib/image_content.cc:88
+#: src/lib/image_content.cc:102
 msgid "moving"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:444
+#: src/lib/ffmpeg_decoder.cc:449
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:277 src/lib/film.cc:332
+#: src/lib/film.cc:282 src/lib/film.cc:308
 msgid "name"
 msgstr "nome"
 
+#: src/lib/video_content.cc:520
+msgid "pixel aspect ratio"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:323
+#: src/lib/job.cc:328
 msgid "remaining"
 msgstr "restano"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:184
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
-#: src/lib/config.cc:88 src/lib/config.cc:189
+#: src/lib/colour_conversion.cc:261
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/image_content.cc:86
+#: src/lib/image_content.cc:100
 #, fuzzy
 msgid "still"
 msgstr "ancora"
 
-#: src/lib/ffmpeg_examiner.cc:218
+#: src/lib/ffmpeg_examiner.cc:242
 #, fuzzy
 msgid "unknown"
 msgstr "Errore sconosciuto"
 
+#~ msgid "1.375"
+#~ msgstr "1.375"
+
+#~ msgid "Area"
+#~ msgstr "Area"
+
+#~ msgid "Bicubic"
+#~ msgstr "Bicubica"
+
+#~ msgid "Bilinear"
+#~ msgstr "Bilineare"
+
+#~ msgid "Fast Bilinear"
+#~ msgstr "Bilineare rapida"
+
+#~ msgid "Gaussian"
+#~ msgstr "Gaussiana"
+
+#~ msgid "Lanczos"
+#~ msgstr "Lanczos"
+
+#~ msgid "Sinc"
+#~ msgstr "Sinc"
+
+#~ msgid "Spline"
+#~ msgstr "Spline"
+
+#~ msgid "X"
+#~ msgstr "X"
+
+#, fuzzy
+#~ msgid "could not read encoded data"
+#~ msgstr "non riesco a trovare il decoder audio"
+
 #~ msgid "%1 frames; %2 frames per second"
 #~ msgstr "%1 fotogrammi; %2 fotogrammi al secondo"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index b4acd89b5..169bf8193 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-09-04 20:34+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -18,15 +18,15 @@ msgstr ""
 "X-Generator: Poedit 1.6.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/dcp_content.cc:106
+#: src/lib/dcp_content.cc:110
 msgid "%1 [DCP]"
 msgstr ""
 
-#: src/lib/sndfile_content.cc:64
+#: src/lib/sndfile_content.cc:66
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:192
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
@@ -35,14 +35,10 @@ msgid "1.19"
 msgstr "1.19"
 
 #: src/lib/ratio.cc:38
-msgid "1.375"
-msgstr "1.375"
-
-#: src/lib/ratio.cc:39
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:39
 msgid "16:9"
 msgstr "16:9"
 
@@ -66,31 +62,35 @@ 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:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio"
 msgstr "Analyseer audio"
 
-#: src/lib/scaler.cc:65
-msgid "Area"
-msgstr "Gebied"
+#: src/lib/audio_content.cc:257
+msgid "Audio will be resampled from %1kHz to %2kHz"
+msgstr ""
 
-#: src/lib/audio_content.cc:253
-msgid "Audio will be resampled from %1kHz to %2kHz."
+#: src/lib/audio_content.cc:259
+msgid "Audio will be resampled to %1kHz"
 msgstr ""
 
-#: src/lib/audio_content.cc:255
-msgid "Audio will not be resampled."
+#: src/lib/audio_content.cc:248
+msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/scaler.cc:63
-msgid "Bicubic"
-msgstr "Bicubic"
+#: src/lib/film.cc:1228
+msgid "BsL"
+msgstr ""
 
-#: src/lib/scaler.cc:70
-msgid "Bilinear"
-msgstr "Bilinear"
+#: src/lib/film.cc:1229
+msgid "BsR"
+msgstr ""
+
+#: src/lib/film.cc:1220
+msgid "C"
+msgstr ""
 
-#: src/lib/job.cc:330
+#: src/lib/job.cc:335
 msgid "Cancelled"
 msgstr "Afgebroken"
 
@@ -98,23 +98,23 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:647
+#: src/lib/util.cc:498
 msgid "Centre"
 msgstr "Midden"
 
-#: src/lib/writer.cc:95
+#: src/lib/writer.cc:119
 msgid "Checking existing image data"
 msgstr "Controleer bestaande videodata"
 
-#: src/lib/writer.cc:525
+#: src/lib/writer.cc:606
 msgid "Computing audio digest"
 msgstr "Verwerk audio data"
 
-#: src/lib/content.cc:143
+#: src/lib/content.cc:135
 msgid "Computing digest"
 msgstr "Verwerken..."
 
-#: src/lib/writer.cc:521
+#: src/lib/writer.cc:602
 msgid "Computing image digest"
 msgstr "Verwerk video data"
 
@@ -122,20 +122,20 @@ msgstr "Verwerk video data"
 msgid "Content and DCP have the same rate.\n"
 msgstr "Inhoud en DCP hebben dezelfde framerate .\n"
 
-#: src/lib/video_content.cc:565
+#: src/lib/video_content.cc:562
 msgid "Content frame rate"
 msgstr "Content frame rate"
 
-#: src/lib/subtitle_content.cc:115
+#: src/lib/subtitle_content.cc:117
 #, fuzzy
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
 
-#: src/lib/audio_content.cc:103
+#: src/lib/audio_content.cc:94
 msgid "Content to be joined must have the same audio delay."
 msgstr "Toegevoegde bestanden moeten dezelfde audio vertraging hebben."
 
-#: src/lib/audio_content.cc:99
+#: src/lib/audio_content.cc:90
 msgid "Content to be joined must have the same audio gain."
 msgstr "Toegevoegde bestanden moeten dezelfde audio gain hebben."
 
@@ -160,20 +160,20 @@ msgstr "Toegevoegde bestanden moeten dezelfde grootte hebben."
 msgid "Content to be joined must have the same scale setting."
 msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
 
-#: src/lib/subtitle_content.cc:119
+#: src/lib/subtitle_content.cc:121
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel X offset hebben."
 
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:129
 #, fuzzy
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
 
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:125
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel Y offset hebben."
 
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:133
 #, fuzzy
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
@@ -186,20 +186,16 @@ msgstr "Toegevoegde bestanden moeten dezelfde video frame rate hebben."
 msgid "Content to be joined must have the same video frame type."
 msgstr "Toegevoegde bestanden moeten dezelfde video formaat hebben."
 
-#: src/lib/ffmpeg_content.cc:118
-msgid "Content to be joined must use the same audio stream."
-msgstr "Toegevoegde bestanden moeten dezelfde audio stream gebruiken."
-
-#: src/lib/subtitle_content.cc:136 src/lib/subtitle_content.cc:144
+#: src/lib/subtitle_content.cc:138 src/lib/subtitle_content.cc:146
 #, fuzzy
 msgid "Content to be joined must use the same fonts."
 msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
 
-#: src/lib/ffmpeg_content.cc:114
+#: src/lib/ffmpeg_content.cc:109
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel stream gebruiken."
 
-#: src/lib/video_content.cc:523
+#: src/lib/video_content.cc:511
 msgid "Content video is %1x%2"
 msgstr "Content video is %1x%2"
 
@@ -207,20 +203,25 @@ msgstr "Content video is %1x%2"
 msgid "Copy DCP to TMS"
 msgstr "Kopieer DCP to TMS"
 
-#: src/lib/scp_dcp_job.cc:130
+#: src/lib/scp_dcp_job.cc:136
 msgid "Could not connect to server %1 (%2)"
 msgstr "Kan niet verbinden met server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:158
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kan geen remote map maken %1 (%2)"
 
-#: src/lib/magick_image_proxy.cc:96
+#: src/lib/image_examiner.cc:61
+#, fuzzy
+msgid "Could not decode JPEG2000 file %1 (%2)"
+msgstr "Kan beeldbestand niet decoderen"
+
+#: src/lib/magick_image_proxy.cc:99
 #, fuzzy
 msgid "Could not decode image file (%1)"
 msgstr "Kan beeldbestand niet decoderen"
 
-#: src/lib/server_finder.cc:114
+#: src/lib/server_finder.cc:128
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -230,32 +231,32 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "Kan niet openen %1"
 
-#: src/lib/scp_dcp_job.cc:177
+#: src/lib/scp_dcp_job.cc:183
 msgid "Could not open %1 to send"
 msgstr "Kan niet openen %1 om te verzenden"
 
-#: src/lib/internet.cc:75
+#: src/lib/internet.cc:77
 msgid "Could not open downloaded ZIP file"
 msgstr "Kan gedownloade ZIP bestand niet openen"
 
-#: src/lib/dcp_subtitle.cc:57
+#: src/lib/dcp_subtitle.cc:49
 #, fuzzy
 msgid "Could not read subtitles"
 msgstr "kan geen bestand maken %1"
 
-#: src/lib/scp_dcp_job.cc:147
+#: src/lib/scp_dcp_job.cc:153
 msgid "Could not start SCP session (%1)"
 msgstr "Kan SCP sessie niet starten (%1)"
 
-#: src/lib/scp_dcp_job.cc:191
+#: src/lib/scp_dcp_job.cc:197
 msgid "Could not write to remote file (%1)"
 msgstr "Kan niet schrijven naar bestand op FTP server"
 
-#: src/lib/video_content.cc:534
+#: src/lib/video_content.cc:530
 msgid "Cropped to %1x%2"
 msgstr "Cropped naar %1x%2"
 
-#: src/lib/dcp_subtitle_content.cc:85
+#: src/lib/dcp_subtitle_content.cc:96
 msgid "DCP XML subtitles"
 msgstr ""
 
@@ -275,7 +276,7 @@ msgstr ""
 "DCP-o-matic kan bestand niet openen %1 . Misschien bestaat het niet of wordt "
 "het formaat niet ondersteund."
 
-#: src/lib/ffmpeg_content.cc:95
+#: src/lib/ffmpeg_content.cc:90
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
@@ -286,7 +287,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacing"
 
-#: src/lib/config.cc:426
+#: src/lib/config.cc:419
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -311,11 +312,15 @@ msgstr ""
 "Met vriendelijke groet,\n"
 "DCP-o-matic"
 
+#: src/lib/video_content.cc:524
+msgid "Display aspect ratio"
+msgstr ""
+
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 and CP750"
 
-#: src/lib/internet.cc:68
+#: src/lib/internet.cc:70
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Fout met download(%1/%2 error %3)"
 
@@ -335,11 +340,11 @@ msgstr "Email KDMs voor %1"
 msgid "Email problem report for %1"
 msgstr ""
 
-#: src/lib/writer.cc:141
+#: src/lib/writer.cc:153
 msgid "Encoding image data"
 msgstr "Encoding bestandsdata"
 
-#: src/lib/job.cc:328
+#: src/lib/job.cc:333
 msgid "Error (%1)"
 msgstr "Fout (%1)"
 
@@ -347,39 +352,39 @@ msgstr "Fout (%1)"
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/examine_content_job.cc:47
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Controleer content"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:146
 msgid "Failed to authenticate with server (%1)"
 msgstr "Inlog fout met server (%1)"
 
-#: src/lib/scaler.cc:71
-msgid "Fast Bilinear"
-msgstr "Fast Bilinear"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Feature"
 msgstr "Kenmerken"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ffmpeg_examiner.cc:76
+msgid "Finding length"
+msgstr ""
+
+#: src/lib/ratio.cc:40
 msgid "Flat"
 msgstr "Onbewerkt"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:42
 msgid "Full frame"
 msgstr "Full frame"
 
-#: src/lib/scaler.cc:66
-msgid "Gaussian"
-msgstr "Gaussian"
-
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:651
+#: src/lib/film.cc:1224
+msgid "HI"
+msgstr ""
+
+#: src/lib/util.cc:502
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -391,7 +396,7 @@ msgstr "High quality 3D denoiser"
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:206
+#: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM levering: $CPL_NAME"
 
@@ -399,31 +404,48 @@ msgstr "KDM levering: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
-#: src/lib/scaler.cc:67
-msgid "Lanczos"
-msgstr "Lanczos"
+#: src/lib/film.cc:1218
+msgid "L"
+msgstr ""
 
-#: src/lib/util.cc:645
+#: src/lib/film.cc:1226
+msgid "Lc"
+msgstr ""
+
+#: src/lib/util.cc:496
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:653
+#: src/lib/util.cc:504
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:655
+#: src/lib/util.cc:506
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:649
+#: src/lib/util.cc:500
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/util.cc:648
+#: src/lib/film.cc:1221
+msgid "Lfe"
+msgstr ""
+
+#: src/lib/util.cc:499
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
-#: src/lib/mid_side_decoder.cc:31
+#: src/lib/film.cc:1222
+msgid "Ls"
+msgstr ""
+
+#. / TRANSLATORS: this is the name of the `mid' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:93
+msgid "Mid"
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
 
@@ -451,15 +473,15 @@ msgstr ""
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content_scale.cc:106
+#: src/lib/video_content_scale.cc:108
 msgid "No scale"
 msgstr "Niet vergroten of verkleinen"
 
-#: src/lib/video_content_scale.cc:103
+#: src/lib/video_content_scale.cc:105
 msgid "No stretch"
 msgstr "Niet uitvullen"
 
-#: src/lib/image_content.cc:50
+#: src/lib/image_content.cc:59
 msgid "No valid image files were found in the folder."
 msgstr "Geen geldige beeldbestanden gevonden in deze map."
 
@@ -467,17 +489,17 @@ msgstr "Geen geldige beeldbestanden gevonden in deze map."
 msgid "Noise reduction"
 msgstr "Ruis reductie"
 
-#: src/lib/job.cc:326
+#: src/lib/job.cc:331
 msgid "OK (ran for %1)"
 msgstr "OK (bezig.. %1)"
 
-#: src/lib/content.cc:106
+#: src/lib/content.cc:104
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 "Alleen het eerste deel van de toegevoegde content kan een start trim "
 "bevatten."
 
-#: src/lib/content.cc:110
+#: src/lib/content.cc:108
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 "Alleen het laatste deel van de toegevoegde content kan een eind trim "
@@ -491,8 +513,13 @@ msgstr "Te weinig geheugen"
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
 
-#: src/lib/video_content.cc:558
-msgid "Padded with black to %1x%2"
+#: src/lib/colour_conversion.cc:264
+msgid "P3"
+msgstr ""
+
+#: src/lib/video_content.cc:554
+#, fuzzy
+msgid "Padded with black to fit container %1 (%2x%3)"
 msgstr "Opgevuld met zwart tot %1x%2"
 
 #: src/lib/dcp_content_type.cc:52
@@ -507,39 +534,56 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Publieke Service aankondiging"
 
+#: src/lib/film.cc:1219
+msgid "R"
+msgstr ""
+
 #: src/lib/dcp_content_type.cc:50
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: src/lib/config.cc:89 src/lib/config.cc:190
+#: src/lib/film.cc:1227
+msgid "Rc"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:262
+#, fuzzy
+msgid "Rec. 601"
+msgstr "Rec. 709"
+
+#: src/lib/colour_conversion.cc:263
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:646
+#: src/lib/util.cc:497
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:654
+#: src/lib/util.cc:505
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:656
+#: src/lib/util.cc:507
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:501
 msgid "Right surround"
 msgstr "Rechts surround"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/film.cc:1223
+msgid "Rs"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:141
 msgid "SSH error (%1)"
 msgstr "SSH fout (%1)"
 
-#: src/lib/video_content.cc:549
+#: src/lib/video_content.cc:545
 msgid "Scaled to %1x%2"
 msgstr "Geschaald naar %1x%2"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:41
 msgid "Scope"
 msgstr "Gebied"
 
@@ -547,19 +591,20 @@ msgstr "Gebied"
 msgid "Short"
 msgstr "Korte film"
 
-#: src/lib/scaler.cc:68
-msgid "Sinc"
-msgstr "Sinc"
+#. / TRANSLATORS: this is the name of the `side' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:95
+msgid "Side"
+msgstr ""
 
-#: src/lib/scaler.cc:69
-msgid "Spline"
-msgstr "Spline"
+#: src/lib/audio_content.cc:252
+msgid "Some audio will be resampled to %1kHz"
+msgstr ""
 
-#: src/lib/upmixer_a.cc:42
+#: src/lib/upmixer_a.cc:45
 msgid "Stereo to 5.1 up-mixer A"
 msgstr ""
 
-#: src/lib/subrip_content.cc:77
+#: src/lib/subrip_content.cc:79
 msgid "SubRip subtitles"
 msgstr ""
 
@@ -575,7 +620,7 @@ msgstr "Telecine filter"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/dcp_examiner.cc:133
+#: src/lib/dcp_examiner.cc:131
 msgid ""
 "The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
 msgstr ""
@@ -596,7 +641,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:427
+#: src/lib/film.cc:386
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -604,7 +649,7 @@ msgstr ""
 "Deze film is gemaakt met een nieuwere versie van DCP-o-matic en kan niet "
 "geopend worden. Sorry!"
 
-#: src/lib/film.cc:419
+#: src/lib/film.cc:378
 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 "
@@ -626,11 +671,11 @@ msgstr "Omzetten %1"
 msgid "Transitional"
 msgstr "Bumper"
 
-#: src/lib/internet.cc:80
+#: src/lib/internet.cc:82
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
-#: src/lib/image_proxy.cc:48
+#: src/lib/image_proxy.cc:47
 msgid "Unexpected image type received by server"
 msgstr "Onverwacht beeldtype ontvangen door server"
 
@@ -638,7 +683,7 @@ msgstr "Onverwacht beeldtype ontvangen door server"
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/lib/ffmpeg_decoder.cc:277
+#: src/lib/ffmpeg_decoder.cc:282
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Niet herkenbaar audio sample formaat (%1)"
 
@@ -646,11 +691,23 @@ msgstr "Niet herkenbaar audio sample formaat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Unsharp mask and Gaussian blur"
 
-#: src/lib/colour_conversion.cc:182
+#: src/lib/colour_conversion.cc:220
 msgid "Untitled"
 msgstr "Niet benoemd"
 
-#: src/lib/util.cc:652
+#: src/lib/upmixer_a.cc:128
+msgid "Upmix L"
+msgstr ""
+
+#: src/lib/upmixer_a.cc:129
+msgid "Upmix R"
+msgstr ""
+
+#: src/lib/film.cc:1225
+msgid "VI"
+msgstr ""
+
+#: src/lib/util.cc:503
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
@@ -658,51 +715,47 @@ msgstr "Slechtzienden"
 msgid "Waiting"
 msgstr "Wachten"
 
-#: src/lib/scaler.cc:64
-msgid "X"
-msgstr "X"
-
 #: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:324
+#: src/lib/film.cc:300
 msgid "You must add some content to the DCP before creating it"
 msgstr "U moet wat content toevoegen voor het maken van de DCP"
 
-#: src/lib/image_content.cc:73
+#: src/lib/image_content.cc:87
 msgid "[moving images]"
 msgstr "[bewegend beeld]"
 
-#: src/lib/image_content.cc:71
+#: src/lib/image_content.cc:85
 msgid "[still]"
 msgstr "[still]"
 
-#: src/lib/dcp_subtitle_content.cc:79 src/lib/subrip_content.cc:71
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:282
 msgid "cannot contain slashes"
 msgstr "er mag geen '\" gebruikt worden"
 
-#: src/lib/util.cc:524
+#: src/lib/dcpomatic_socket.cc:66
 msgid "connect timed out"
 msgstr "verbinding timeout"
 
-#: src/lib/scp_dcp_job.cc:121
+#: src/lib/scp_dcp_job.cc:127
 msgid "connecting"
 msgstr "verbinden"
 
-#: src/lib/film.cc:320
+#: src/lib/film.cc:296
 msgid "container"
 msgstr "container"
 
-#: src/lib/film.cc:328
+#: src/lib/film.cc:304
 msgid "content type"
 msgstr "content type"
 
-#: src/lib/scp_dcp_job.cc:170
+#: src/lib/scp_dcp_job.cc:176
 msgid "copying %1"
 msgstr "kopieeren %1"
 
@@ -710,15 +763,16 @@ msgstr "kopieeren %1"
 msgid "could not create file %1"
 msgstr "kan geen bestand maken %1"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:101
 msgid "could not find stream information"
 msgstr "kan geen stream informatie vinden"
 
-#: src/lib/writer.cc:465
-msgid "could not move audio MXF into the DCP (%1)"
+#: src/lib/writer.cc:535
+#, fuzzy
+msgid "could not move audio asset into the DCP (%1)"
 msgstr "kan MXF audio niet plaatsen in DCP (%1)"
 
-#: src/lib/sndfile_decoder.cc:54
+#: src/lib/sndfile_base.cc:47
 msgid "could not open audio file for reading"
 msgstr "kan audio bestand niet openen om te lezen"
 
@@ -726,13 +780,14 @@ msgstr "kan audio bestand niet openen om te lezen"
 msgid "could not open file %1"
 msgstr "kan bestand niet openen %1"
 
-#: src/lib/encoded_data.cc:50
+#: src/lib/data.cc:55
 msgid "could not open file for reading"
 msgstr "kan bestand niet openen om te lezen"
 
-#: src/lib/encoded_data.cc:56
-msgid "could not read encoded data"
-msgstr "kan encoded data niet lezen"
+#: src/lib/data.cc:61
+#, fuzzy
+msgid "could not read from file"
+msgstr "kan bestand niet lezen %1 (%2)"
 
 #: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
@@ -758,34 +813,30 @@ msgstr "kan SSH sessie niet starten"
 msgid "could not write to file %1 (%2)"
 msgstr "kan niet schrijven naar bestand %1 (%2)"
 
-#: src/lib/util.cc:544
-msgid "error during async_accept (%1)"
-msgstr "fout met async_accepteren (FTP) (%1)"
-
-#: src/lib/util.cc:520
+#: src/lib/dcpomatic_socket.cc:62
 msgid "error during async_connect (%1)"
 msgstr "fout met async_verbinden (FTP) (%1)"
 
-#: src/lib/util.cc:593
+#: src/lib/dcpomatic_socket.cc:115
 msgid "error during async_read (%1)"
 msgstr "fout met async_lezen (FTP) (%1)"
 
-#: src/lib/util.cc:565
+#: src/lib/dcpomatic_socket.cc:87
 msgid "error during async_write (%1)"
 msgstr "fout met async_schrijven (FTP) (%1)"
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:96
+#: src/lib/transcode_job.cc:102
 msgid "fps"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:170 src/lib/util.cc:173
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -793,41 +844,84 @@ msgstr ""
 msgid "missing required setting %1"
 msgstr "ontbrekende verplichte setting %1"
 
-#: src/lib/image_content.cc:88
+#: src/lib/image_content.cc:102
 msgid "moving"
 msgstr "bewegend"
 
-#: src/lib/ffmpeg_decoder.cc:444
+#: src/lib/ffmpeg_decoder.cc:449
 msgid "multi-part subtitles not yet supported"
 msgstr "ondertitels met meerdere delen worden nog niet ondersteund."
 
-#: src/lib/film.cc:277 src/lib/film.cc:332
+#: src/lib/film.cc:282 src/lib/film.cc:308
 msgid "name"
 msgstr "naam"
 
+#: src/lib/video_content.cc:520
+msgid "pixel aspect ratio"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:323
+#: src/lib/job.cc:328
 msgid "remaining"
 msgstr "resterend"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:184
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
-#: src/lib/config.cc:88 src/lib/config.cc:189
+#: src/lib/colour_conversion.cc:261
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/image_content.cc:86
+#: src/lib/image_content.cc:100
 msgid "still"
 msgstr "still"
 
-#: src/lib/ffmpeg_examiner.cc:218
+#: src/lib/ffmpeg_examiner.cc:242
 msgid "unknown"
 msgstr "onbekend"
 
+#~ msgid "1.375"
+#~ msgstr "1.375"
+
+#~ msgid "Area"
+#~ msgstr "Gebied"
+
+#~ msgid "Bicubic"
+#~ msgstr "Bicubic"
+
+#~ msgid "Bilinear"
+#~ msgstr "Bilinear"
+
+#~ msgid "Content to be joined must use the same audio stream."
+#~ msgstr "Toegevoegde bestanden moeten dezelfde audio stream gebruiken."
+
+#~ msgid "Fast Bilinear"
+#~ msgstr "Fast Bilinear"
+
+#~ msgid "Gaussian"
+#~ msgstr "Gaussian"
+
+#~ msgid "Lanczos"
+#~ msgstr "Lanczos"
+
+#~ msgid "Sinc"
+#~ msgstr "Sinc"
+
+#~ msgid "Spline"
+#~ msgstr "Spline"
+
+#~ msgid "X"
+#~ msgstr "X"
+
+#~ msgid "could not read encoded data"
+#~ msgstr "kan encoded data niet lezen"
+
+#~ msgid "error during async_accept (%1)"
+#~ msgstr "fout met async_accepteren (FTP) (%1)"
+
 #~ msgid "%1 channels, %2kHz, %3 samples"
 #~ msgstr "%1 kanalen, %2kHz, %3 samples"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 0bfe05f8b..878d0a549 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/lib/dcp_content.cc:106
+#: src/lib/dcp_content.cc:110
 msgid "%1 [DCP]"
 msgstr ""
 
-#: src/lib/sndfile_content.cc:64
+#: src/lib/sndfile_content.cc:66
 msgid "%1 [audio]"
 msgstr "%1 [ljud]"
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:192
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
@@ -34,14 +34,10 @@ msgid "1.19"
 msgstr "1,19"
 
 #: src/lib/ratio.cc:38
-msgid "1.375"
-msgstr "1,375"
-
-#: src/lib/ratio.cc:39
 msgid "1.66"
 msgstr "1,66"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:39
 msgid "16:9"
 msgstr "16:9"
 
@@ -65,31 +61,38 @@ 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:49
+#: src/lib/analyse_audio_job.cc:53
 msgid "Analyse audio"
 msgstr "Analysera audio"
 
-#: src/lib/scaler.cc:65
-msgid "Area"
-msgstr "Yta"
+#: src/lib/audio_content.cc:257
+#, fuzzy
+msgid "Audio will be resampled from %1kHz to %2kHz"
+msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
 
-#: src/lib/audio_content.cc:253
-msgid "Audio will be resampled from %1kHz to %2kHz."
+#: src/lib/audio_content.cc:259
+#, fuzzy
+msgid "Audio will be resampled to %1kHz"
 msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
 
-#: src/lib/audio_content.cc:255
-msgid "Audio will not be resampled."
+#: src/lib/audio_content.cc:248
+#, fuzzy
+msgid "Audio will not be resampled"
+msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
+
+#: src/lib/film.cc:1228
+msgid "BsL"
 msgstr ""
 
-#: src/lib/scaler.cc:63
-msgid "Bicubic"
-msgstr "Bikubisk"
+#: src/lib/film.cc:1229
+msgid "BsR"
+msgstr ""
 
-#: src/lib/scaler.cc:70
-msgid "Bilinear"
-msgstr "Bilinjär"
+#: src/lib/film.cc:1220
+msgid "C"
+msgstr ""
 
-#: src/lib/job.cc:330
+#: src/lib/job.cc:335
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -97,23 +100,23 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:647
+#: src/lib/util.cc:498
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:95
+#: src/lib/writer.cc:119
 msgid "Checking existing image data"
 msgstr "Kontrollerar befintligt bilddata"
 
-#: src/lib/writer.cc:525
+#: src/lib/writer.cc:606
 msgid "Computing audio digest"
 msgstr "Beräknar audiosammanfattning"
 
-#: src/lib/content.cc:143
+#: src/lib/content.cc:135
 msgid "Computing digest"
 msgstr "Beräknar sammanfattning"
 
-#: src/lib/writer.cc:521
+#: src/lib/writer.cc:602
 msgid "Computing image digest"
 msgstr "Beräknar bildsammanfattning"
 
@@ -121,21 +124,21 @@ msgstr "Beräknar bildsammanfattning"
 msgid "Content and DCP have the same rate.\n"
 msgstr "Källa och DCP har samma bildfrekvens.\n"
 
-#: src/lib/video_content.cc:565
+#: src/lib/video_content.cc:562
 #, fuzzy
 msgid "Content frame rate"
 msgstr "Innehållets bildhastighet"
 
-#: src/lib/subtitle_content.cc:115
+#: src/lib/subtitle_content.cc:117
 #, fuzzy
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
 
-#: src/lib/audio_content.cc:103
+#: src/lib/audio_content.cc:94
 msgid "Content to be joined must have the same audio delay."
 msgstr "Innehåll som ska sammanfogas måste använda samma audiofördröjning."
 
-#: src/lib/audio_content.cc:99
+#: src/lib/audio_content.cc:90
 msgid "Content to be joined must have the same audio gain."
 msgstr "Innehåll som ska sammanfogas måste använda samma audioförstärkning."
 
@@ -161,24 +164,24 @@ msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek."
 msgid "Content to be joined must have the same scale setting."
 msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
 
-#: src/lib/subtitle_content.cc:119
+#: src/lib/subtitle_content.cc:121
 #, fuzzy
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
 
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:129
 #, fuzzy
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
 
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:125
 #, fuzzy
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
 
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:133
 #, fuzzy
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
@@ -191,20 +194,16 @@ msgstr "Innehåll som ska sammanfogas måste använda samma videobildhastighet."
 msgid "Content to be joined must have the same video frame type."
 msgstr "Innehåll som ska sammanfogas måste använda samma videobildtyp."
 
-#: src/lib/ffmpeg_content.cc:118
-msgid "Content to be joined must use the same audio stream."
-msgstr "Innehåll som ska sammanfogas måste använda samma audioström."
-
-#: src/lib/subtitle_content.cc:136 src/lib/subtitle_content.cc:144
+#: src/lib/subtitle_content.cc:138 src/lib/subtitle_content.cc:146
 #, fuzzy
 msgid "Content to be joined must use the same fonts."
 msgstr "Innehåll som ska sammanfogas måste använda samma beskärning."
 
-#: src/lib/ffmpeg_content.cc:114
+#: src/lib/ffmpeg_content.cc:109
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Innehåll som ska sammanfogas måste använda samma undertextström."
 
-#: src/lib/video_content.cc:523
+#: src/lib/video_content.cc:511
 msgid "Content video is %1x%2"
 msgstr "Original-videon är %1x%2"
 
@@ -212,20 +211,25 @@ msgstr "Original-videon är %1x%2"
 msgid "Copy DCP to TMS"
 msgstr "Kopiera DCP till TMS"
 
-#: src/lib/scp_dcp_job.cc:130
+#: src/lib/scp_dcp_job.cc:136
 msgid "Could not connect to server %1 (%2)"
 msgstr "Kunde inte ansluta till server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:152
+#: src/lib/scp_dcp_job.cc:158
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 
-#: src/lib/magick_image_proxy.cc:96
+#: src/lib/image_examiner.cc:61
+#, fuzzy
+msgid "Could not decode JPEG2000 file %1 (%2)"
+msgstr "kunde inte skapa fil %1"
+
+#: src/lib/magick_image_proxy.cc:99
 #, fuzzy
 msgid "Could not decode image file (%1)"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/server_finder.cc:114
+#: src/lib/server_finder.cc:128
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -235,33 +239,33 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "Kunde inte öppna %1"
 
-#: src/lib/scp_dcp_job.cc:177
+#: src/lib/scp_dcp_job.cc:183
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
-#: src/lib/internet.cc:75
+#: src/lib/internet.cc:77
 #, fuzzy
 msgid "Could not open downloaded ZIP file"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/dcp_subtitle.cc:57
+#: src/lib/dcp_subtitle.cc:49
 #, fuzzy
 msgid "Could not read subtitles"
 msgstr "kunde inte hitta undertext-avkodare"
 
-#: src/lib/scp_dcp_job.cc:147
+#: src/lib/scp_dcp_job.cc:153
 msgid "Could not start SCP session (%1)"
 msgstr "Kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:191
+#: src/lib/scp_dcp_job.cc:197
 msgid "Could not write to remote file (%1)"
 msgstr "Kunde inte skriva till fjärrfil (%1)"
 
-#: src/lib/video_content.cc:534
+#: src/lib/video_content.cc:530
 msgid "Cropped to %1x%2"
 msgstr "Beskuren till %1x%2"
 
-#: src/lib/dcp_subtitle_content.cc:85
+#: src/lib/dcp_subtitle_content.cc:96
 msgid "DCP XML subtitles"
 msgstr ""
 
@@ -281,7 +285,7 @@ msgstr ""
 "DCP-o-matic kunde inte öppna filen %1. Saknas den, eller har den ett "
 "oförväntat format?"
 
-#: src/lib/ffmpeg_content.cc:95
+#: src/lib/ffmpeg_content.cc:90
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
@@ -291,7 +295,7 @@ msgid "De-interlacing"
 msgstr "Avflätning"
 
 # svåröversatt
-#: src/lib/config.cc:426
+#: src/lib/config.cc:419
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -313,11 +317,15 @@ msgstr ""
 "Vänliga hälsningar,\n"
 "DCP-o-matic"
 
+#: src/lib/video_content.cc:524
+msgid "Display aspect ratio"
+msgstr ""
+
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 och CP750"
 
-#: src/lib/internet.cc:68
+#: src/lib/internet.cc:70
 msgid "Download failed (%1/%2 error %3)"
 msgstr ""
 
@@ -338,11 +346,11 @@ msgstr "E-posta KDM:er för %1"
 msgid "Email problem report for %1"
 msgstr ""
 
-#: src/lib/writer.cc:141
+#: src/lib/writer.cc:153
 msgid "Encoding image data"
 msgstr "Kodar bild-data"
 
-#: src/lib/job.cc:328
+#: src/lib/job.cc:333
 msgid "Error (%1)"
 msgstr "Fel (%1)"
 
@@ -350,39 +358,39 @@ msgstr "Fel (%1)"
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/examine_content_job.cc:47
+#: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Undersök innehållet"
 
-#: src/lib/scp_dcp_job.cc:140
+#: src/lib/scp_dcp_job.cc:146
 msgid "Failed to authenticate with server (%1)"
 msgstr "Misslyckades att autentisera med server (%1)"
 
-#: src/lib/scaler.cc:71
-msgid "Fast Bilinear"
-msgstr "Snabb bilinjär"
-
 #: src/lib/dcp_content_type.cc:45
 msgid "Feature"
 msgstr "Feature"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ffmpeg_examiner.cc:76
+msgid "Finding length"
+msgstr ""
+
+#: src/lib/ratio.cc:40
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:42
 msgid "Full frame"
 msgstr "Full frame"
 
-#: src/lib/scaler.cc:66
-msgid "Gaussian"
-msgstr "Gaussisk"
-
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/util.cc:651
+#: src/lib/film.cc:1224
+msgid "HI"
+msgstr ""
+
+#: src/lib/util.cc:502
 msgid "Hearing impaired"
 msgstr ""
 
@@ -394,7 +402,7 @@ msgstr "Högkvalitets 3D-brusreducering"
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:206
+#: src/lib/config.cc:197
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -402,32 +410,49 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr "Kernel-avflätare"
 
-#: src/lib/scaler.cc:67
-msgid "Lanczos"
-msgstr "Lanczos"
+#: src/lib/film.cc:1218
+msgid "L"
+msgstr ""
+
+#: src/lib/film.cc:1226
+msgid "Lc"
+msgstr ""
 
-#: src/lib/util.cc:645
+#: src/lib/util.cc:496
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:653
+#: src/lib/util.cc:504
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:655
+#: src/lib/util.cc:506
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:649
+#: src/lib/util.cc:500
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:648
+#: src/lib/film.cc:1221
+msgid "Lfe"
+msgstr ""
+
+#: src/lib/util.cc:499
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
-#: src/lib/mid_side_decoder.cc:31
+#: src/lib/film.cc:1222
+msgid "Ls"
+msgstr ""
+
+#. / TRANSLATORS: this is the name of the `mid' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:93
+msgid "Mid"
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
 msgstr ""
 
@@ -455,16 +480,16 @@ msgstr ""
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
 
-#: src/lib/video_content_scale.cc:106
+#: src/lib/video_content_scale.cc:108
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content_scale.cc:103
+#: src/lib/video_content_scale.cc:105
 #, fuzzy
 msgid "No stretch"
 msgstr "Flat utan utsträckning"
 
-#: src/lib/image_content.cc:50
+#: src/lib/image_content.cc:59
 msgid "No valid image files were found in the folder."
 msgstr ""
 
@@ -472,16 +497,16 @@ msgstr ""
 msgid "Noise reduction"
 msgstr "Brusreducering"
 
-#: src/lib/job.cc:326
+#: src/lib/job.cc:331
 msgid "OK (ran for %1)"
 msgstr "OK (kördes %1)"
 
-#: src/lib/content.cc:106
+#: src/lib/content.cc:104
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 "Endast den första delen av innehållet som läggs ihop kan start-trimmas."
 
-#: src/lib/content.cc:110
+#: src/lib/content.cc:108
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Endast den sista delen av innehållet som läggs ihop kan slut-trimmas."
 
@@ -493,8 +518,13 @@ msgstr ""
 msgid "Overcomplete wavelet denoiser"
 msgstr "Överkomplett wavelet-brusreducering"
 
-#: src/lib/video_content.cc:558
-msgid "Padded with black to %1x%2"
+#: src/lib/colour_conversion.cc:264
+msgid "P3"
+msgstr ""
+
+#: src/lib/video_content.cc:554
+#, fuzzy
+msgid "Padded with black to fit container %1 (%2x%3)"
 msgstr "Svarta kanter tillagda för %1x%2"
 
 #: src/lib/dcp_content_type.cc:52
@@ -509,40 +539,57 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Public Service Announcement"
 
+#: src/lib/film.cc:1219
+msgid "R"
+msgstr ""
+
 #: src/lib/dcp_content_type.cc:50
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/config.cc:89 src/lib/config.cc:190
+#: src/lib/film.cc:1227
+msgid "Rc"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:262
+#, fuzzy
+msgid "Rec. 601"
+msgstr "Rec. 709"
+
+#: src/lib/colour_conversion.cc:263
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:646
+#: src/lib/util.cc:497
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:654
+#: src/lib/util.cc:505
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:656
+#: src/lib/util.cc:507
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:501
 msgid "Right surround"
 msgstr "Höger surround"
 
-#: src/lib/scp_dcp_job.cc:135
+#: src/lib/film.cc:1223
+msgid "Rs"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:141
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
-#: src/lib/video_content.cc:549
+#: src/lib/video_content.cc:545
 msgid "Scaled to %1x%2"
 msgstr "Skalad till %1x%2"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:41
 msgid "Scope"
 msgstr "Scope"
 
@@ -550,19 +597,21 @@ msgstr "Scope"
 msgid "Short"
 msgstr "Short"
 
-#: src/lib/scaler.cc:68
-msgid "Sinc"
-msgstr "Sinc"
+#. / TRANSLATORS: this is the name of the `side' channel for mid-side decoding
+#: src/lib/mid_side_decoder.cc:95
+msgid "Side"
+msgstr ""
 
-#: src/lib/scaler.cc:69
-msgid "Spline"
-msgstr "Spline"
+#: src/lib/audio_content.cc:252
+#, fuzzy
+msgid "Some audio will be resampled to %1kHz"
+msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
 
-#: src/lib/upmixer_a.cc:42
+#: src/lib/upmixer_a.cc:45
 msgid "Stereo to 5.1 up-mixer A"
 msgstr ""
 
-#: src/lib/subrip_content.cc:77
+#: src/lib/subrip_content.cc:79
 msgid "SubRip subtitles"
 msgstr ""
 
@@ -578,7 +627,7 @@ msgstr "Telecine-filter"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/dcp_examiner.cc:133
+#: src/lib/dcp_examiner.cc:131
 msgid ""
 "The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL"
 msgstr ""
@@ -599,7 +648,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr ""
 
-#: src/lib/film.cc:427
+#: src/lib/film.cc:386
 #, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -609,7 +658,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:419
+#: src/lib/film.cc:378
 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 "
@@ -631,11 +680,11 @@ msgstr "Konvertera %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/internet.cc:80
+#: src/lib/internet.cc:82
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:48
+#: src/lib/image_proxy.cc:47
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -644,7 +693,7 @@ msgid "Unknown error"
 msgstr "Okänt fel"
 
 # Svengelska
-#: src/lib/ffmpeg_decoder.cc:277
+#: src/lib/ffmpeg_decoder.cc:282
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Okänt audio-sampelformat (%1)"
 
@@ -652,11 +701,23 @@ msgstr "Okänt audio-sampelformat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Oskärpemask och Gaussisk suddighet"
 
-#: src/lib/colour_conversion.cc:182
+#: src/lib/colour_conversion.cc:220
 msgid "Untitled"
 msgstr "Utan titel"
 
-#: src/lib/util.cc:652
+#: src/lib/upmixer_a.cc:128
+msgid "Upmix L"
+msgstr ""
+
+#: src/lib/upmixer_a.cc:129
+msgid "Upmix R"
+msgstr ""
+
+#: src/lib/film.cc:1225
+msgid "VI"
+msgstr ""
+
+#: src/lib/util.cc:503
 msgid "Visually impaired"
 msgstr ""
 
@@ -664,53 +725,49 @@ msgstr ""
 msgid "Waiting"
 msgstr "Väntar"
 
-#: src/lib/scaler.cc:64
-msgid "X"
-msgstr "X"
-
 # Filtret heter så, ska ej översättas
 #: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:324
+#: src/lib/film.cc:300
 msgid "You must add some content to the DCP before creating it"
 msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
 
-#: src/lib/image_content.cc:73
+#: src/lib/image_content.cc:87
 msgid "[moving images]"
 msgstr "[rörliga bilder]"
 
-#: src/lib/image_content.cc:71
+#: src/lib/image_content.cc:85
 msgid "[still]"
 msgstr "[stillbild]"
 
-#: src/lib/dcp_subtitle_content.cc:79 src/lib/subrip_content.cc:71
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
 msgid "[subtitles]"
 msgstr ""
 
-#: src/lib/film.cc:277
+#: src/lib/film.cc:282
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:524
+#: src/lib/dcpomatic_socket.cc:66
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
-#: src/lib/scp_dcp_job.cc:121
+#: src/lib/scp_dcp_job.cc:127
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:320
+#: src/lib/film.cc:296
 msgid "container"
 msgstr "behållare"
 
-#: src/lib/film.cc:328
+#: src/lib/film.cc:304
 msgid "content type"
 msgstr "innehållstyp"
 
-#: src/lib/scp_dcp_job.cc:170
+#: src/lib/scp_dcp_job.cc:176
 msgid "copying %1"
 msgstr "kopierar %1"
 
@@ -718,15 +775,16 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:101
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/writer.cc:465
-msgid "could not move audio MXF into the DCP (%1)"
+#: src/lib/writer.cc:535
+#, fuzzy
+msgid "could not move audio asset into the DCP (%1)"
 msgstr "kunde inte flytta audio-MXF in i DCP:n (%1)"
 
-#: src/lib/sndfile_decoder.cc:54
+#: src/lib/sndfile_base.cc:47
 msgid "could not open audio file for reading"
 msgstr "kunde inte öppna audio-fil för läsning"
 
@@ -734,13 +792,14 @@ msgstr "kunde inte öppna audio-fil för läsning"
 msgid "could not open file %1"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/encoded_data.cc:50
+#: src/lib/data.cc:55
 msgid "could not open file for reading"
 msgstr "kunde inte öppna fil för läsning"
 
-#: src/lib/encoded_data.cc:56
-msgid "could not read encoded data"
-msgstr "kunde inte läsa kodat data"
+#: src/lib/data.cc:61
+#, fuzzy
+msgid "could not read from file"
+msgstr "kunde inte läsa från fil %1 (%2)"
 
 #: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
@@ -767,34 +826,30 @@ msgstr "kunde inte starta SSH-session"
 msgid "could not write to file %1 (%2)"
 msgstr "kunde inte skriva till fil %1 (%2)"
 
-#: src/lib/util.cc:544
-msgid "error during async_accept (%1)"
-msgstr "fel vid async_accept (%1)"
-
-#: src/lib/util.cc:520
+#: src/lib/dcpomatic_socket.cc:62
 msgid "error during async_connect (%1)"
 msgstr "fel vid async_connect (%1)"
 
-#: src/lib/util.cc:593
+#: src/lib/dcpomatic_socket.cc:115
 msgid "error during async_read (%1)"
 msgstr "fel vid async_read (%1)"
 
-#: src/lib/util.cc:565
+#: src/lib/dcpomatic_socket.cc:87
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:96
+#: src/lib/transcode_job.cc:102
 msgid "fps"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:170 src/lib/util.cc:173
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -803,41 +858,84 @@ msgid "missing required setting %1"
 msgstr "saknad nödvändig inställning %1"
 
 # Sammanhang?
-#: src/lib/image_content.cc:88
+#: src/lib/image_content.cc:102
 msgid "moving"
 msgstr "rörlig"
 
-#: src/lib/ffmpeg_decoder.cc:444
+#: src/lib/ffmpeg_decoder.cc:449
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:277 src/lib/film.cc:332
+#: src/lib/film.cc:282 src/lib/film.cc:308
 msgid "name"
 msgstr "namn"
 
+#: src/lib/video_content.cc:520
+msgid "pixel aspect ratio"
+msgstr ""
+
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:323
+#: src/lib/job.cc:328
 msgid "remaining"
 msgstr "återstående tid"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:184
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
-#: src/lib/config.cc:88 src/lib/config.cc:189
+#: src/lib/colour_conversion.cc:261
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/image_content.cc:86
+#: src/lib/image_content.cc:100
 msgid "still"
 msgstr "stillbild"
 
-#: src/lib/ffmpeg_examiner.cc:218
+#: src/lib/ffmpeg_examiner.cc:242
 msgid "unknown"
 msgstr "okänd"
 
+#~ msgid "1.375"
+#~ msgstr "1,375"
+
+#~ msgid "Area"
+#~ msgstr "Yta"
+
+#~ msgid "Bicubic"
+#~ msgstr "Bikubisk"
+
+#~ msgid "Bilinear"
+#~ msgstr "Bilinjär"
+
+#~ msgid "Content to be joined must use the same audio stream."
+#~ msgstr "Innehåll som ska sammanfogas måste använda samma audioström."
+
+#~ msgid "Fast Bilinear"
+#~ msgstr "Snabb bilinjär"
+
+#~ msgid "Gaussian"
+#~ msgstr "Gaussisk"
+
+#~ msgid "Lanczos"
+#~ msgstr "Lanczos"
+
+#~ msgid "Sinc"
+#~ msgstr "Sinc"
+
+#~ msgid "Spline"
+#~ msgstr "Spline"
+
+#~ msgid "X"
+#~ msgstr "X"
+
+#~ msgid "could not read encoded data"
+#~ msgstr "kunde inte läsa kodat data"
+
+#~ msgid "error during async_accept (%1)"
+#~ msgstr "fel vid async_accept (%1)"
+
 #~ msgid "%1 channels, %2kHz, %3 samples"
 #~ msgstr "%1 kanaler, %2kHz, %3 sampel"
 
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 233ca1155..34603aa5c 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-07-13 03:04+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic.cc:321
+#: src/tools/dcpomatic.cc:330
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "%1 existiert bereits als Datei, kann also nicht für einen neuen Film benutzt "
@@ -28,70 +28,70 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "&Projekt hinzufügen"
 
-#: src/tools/dcpomatic.cc:695
+#: src/tools/dcpomatic.cc:718
 msgid "&Content"
 msgstr "&Quelle..."
 
-#: src/tools/dcpomatic.cc:693
+#: src/tools/dcpomatic.cc:716
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
-#: src/tools/dcpomatic.cc:656
+#: src/tools/dcpomatic.cc:677
 msgid "&Exit"
 msgstr "&Ende"
 
-#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:714 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Datei"
 
-#: src/tools/dcpomatic.cc:698 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:721 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: src/tools/dcpomatic.cc:696
+#: src/tools/dcpomatic.cc:719
 msgid "&Jobs"
 msgstr "&Aufgaben"
 
-#: src/tools/dcpomatic.cc:673
+#: src/tools/dcpomatic.cc:694
 #, fuzzy
 msgid "&Make DCP\tCtrl-M"
 msgstr "&DCP erstellen\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:664
 #, fuzzy
 msgid "&Open...\tCtrl-O"
 msgstr "&Öffnen...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:662 src/tools/dcpomatic.cc:665
+#: src/tools/dcpomatic.cc:683 src/tools/dcpomatic.cc:686
 #, fuzzy
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Einstellungen...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:668
 msgid "&Properties..."
 msgstr "&Eigenschaften..."
 
-#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:679 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:666
 msgid "&Save\tCtrl-S"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:675
+#: src/tools/dcpomatic.cc:696
 msgid "&Send DCP to TMS"
 msgstr "&DCP an TMS senden"
 
-#: src/tools/dcpomatic.cc:697
+#: src/tools/dcpomatic.cc:720
 msgid "&Tools"
 msgstr "&Werkzeuge"
 
-#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:710 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Über"
 
-#: src/tools/dcpomatic.cc:685
+#: src/tools/dcpomatic.cc:708
 msgid "About DCP-o-matic"
 msgstr "Über DCP-o-matic"
 
@@ -99,67 +99,71 @@ msgstr "Über DCP-o-matic"
 msgid "Add Film..."
 msgstr "Projekt hinzufügen..."
 
-#: src/tools/dcpomatic.cc:867
+#: src/tools/dcpomatic.cc:898
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s in %s.\n"
 "\n"
-msgstr "Ein unbekannter Fehler ist aufgetreten: %s (%s).\n\n"
+msgstr ""
+"Ein unbekannter Fehler ist aufgetreten: %s (%s).\n"
+"\n"
 
-#: src/tools/dcpomatic.cc:869
+#: src/tools/dcpomatic.cc:900
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s.\n"
 "\n"
-msgstr "Ein unbekannter Fehler ist aufgetreten: %s (%s).\n\n"
+msgstr ""
+"Ein unbekannter Fehler ist aufgetreten: %s (%s).\n"
+"\n"
 
-#: src/tools/dcpomatic.cc:443 src/tools/dcpomatic.cc:871
-#: src/tools/dcpomatic.cc:880
+#: src/tools/dcpomatic.cc:464 src/tools/dcpomatic.cc:902
+#: src/tools/dcpomatic.cc:911
 msgid "An unknown exception occurred."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: src/tools/dcpomatic.cc:412
+#: src/tools/dcpomatic.cc:433
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:439
+#: src/tools/dcpomatic.cc:460
 msgid "CPL's content is not encrypted."
 msgstr "Medien der CPL sind nicht verschlüsselt worden."
 
-#: src/tools/dcpomatic.cc:681
+#: src/tools/dcpomatic.cc:702
 msgid "Check for updates"
 msgstr "Auf Updates überprüfen..."
 
-#: src/tools/dcpomatic.cc:806 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:837 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Film %1 (%2) konnte nicht geladen werden"
 
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:435
 #, fuzzy, c-format
 msgid "Could not make DCP: %s"
 msgstr "Der Film konnte nicht bei %s (%s) geöffnet werden"
 
-#: src/tools/dcpomatic.cc:272 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:281 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Der Film konnte nicht bei %s (%s) geöffnet werden"
 
-#: src/tools/dcpomatic.cc:499
+#: src/tools/dcpomatic.cc:520
 msgid "Could not show DCP"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:511
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 "DCP kann nicht angezeigt werden (Konqueror konnte nicht gestartet werden)"
 
-#: src/tools/dcpomatic.cc:483
+#: src/tools/dcpomatic.cc:504
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "DCP kann nicht angezeigt werden (Nautilus konnte nicht geladen werden)"
 
-#: src/tools/dcpomatic.cc:292 src/tools/dcpomatic.cc:761
-#: src/tools/dcpomatic.cc:797
+#: src/tools/dcpomatic.cc:301 src/tools/dcpomatic.cc:792
+#: src/tools/dcpomatic.cc:828
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -167,52 +171,68 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic Batch Converter"
 
-#: src/tools/dcpomatic.cc:680
+#: src/tools/dcpomatic.cc:701
 msgid "Encoding servers..."
 msgstr "Encoding Server..."
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:98
 msgid "Film changed"
 msgstr "Projekt gewechselt"
 
-#: src/tools/dcpomatic.cc:679
-msgid "Hints...\tCtrl-H"
+#: src/tools/dcpomatic.cc:700
+#, fuzzy
+msgid "Hints..."
 msgstr "Tipps...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:674
+#: src/tools/dcpomatic.cc:695
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "&KDM erstellen...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:663
 msgid "New...\tCtrl-N"
 msgstr "Neu...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:689
+#: src/tools/dcpomatic.cc:712
 msgid "Report a problem..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:676
+#: src/tools/dcpomatic.cc:704
+msgid "Restore default preferences"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:697
 msgid "S&how DCP"
 msgstr "Z&eige DCP"
 
-#: src/tools/dcpomatic.cc:90
+#: src/tools/dcpomatic.cc:94
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
 
-#: src/tools/dcpomatic.cc:670
+#: src/tools/dcpomatic.cc:691
 msgid "Scale to fit &height"
 msgstr "...skalieren auf &Höhe DCI-Container"
 
-#: src/tools/dcpomatic.cc:669
+#: src/tools/dcpomatic.cc:690
 msgid "Scale to fit &width"
 msgstr "...skalieren auf &Breite DCI-Container"
 
-#: src/tools/dcpomatic.cc:337 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Zu öffnendes Projekt auswählen"
 
-#: src/tools/dcpomatic.cc:400
+#: src/tools/dcpomatic.cc:419
+#, fuzzy, c-format
+msgid ""
+"The DCP and intermediate files for this film will take up about %.1f Gb, and "
+"the disk that you are using only has %.1f Gb available.  You would need half "
+"as much space if the filesystem supported hard links, but it does not.  Do "
+"you want to continue anyway?"
+msgstr ""
+"Das DCP für diesen Film wird etwa %.1f Gbyte groß. Auf dem ausgewählten "
+"Laufwerk sind aber nur %.1f Gbyte frei. Möchten Sie trotzdem weitermachen ?"
+
+#: src/tools/dcpomatic.cc:417
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -221,11 +241,11 @@ msgstr ""
 "Das DCP für diesen Film wird etwa %.1f Gbyte groß. Auf dem ausgewählten "
 "Laufwerk sind aber nur %.1f Gbyte frei. Möchten Sie trotzdem weitermachen ?"
 
-#: src/tools/dcpomatic.cc:918
+#: src/tools/dcpomatic.cc:937
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Der DCP-o-matic Download Server ist nicht erreichbar."
 
-#: src/tools/dcpomatic.cc:311
+#: src/tools/dcpomatic.cc:320
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
@@ -233,17 +253,17 @@ msgstr ""
 "Der Ordner %1 existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
 "benutzen ?"
 
-#: src/tools/dcpomatic.cc:913
+#: src/tools/dcpomatic.cc:941
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Es ist keine neue Version von DCP-o-matic verfügbar."
 
-#: src/tools/dcpomatic.cc:551 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:572 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Manche Aufgaben sind nicht erledigt - sind Sie sicher, dass Sie Beenden "
 "wollen ?"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:267
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -252,11 +272,11 @@ msgstr ""
 "worden und wird in dieser Programmversion möglicherweise nicht korrekt "
 "umgesetzt. Bitte prüfen Sie alle Projekteinstellungen sorgfältig!"
 
-#: src/tools/dcpomatic.cc:552 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:573 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Unerledigte Aufgaben"
 
-#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:355 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 3aaa4f017..03123e1c6 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-10-24 20:18-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: src/tools/dcpomatic.cc:321
+#: src/tools/dcpomatic.cc:330
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
 
@@ -25,67 +25,67 @@ msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
 msgid "&Add Film..."
 msgstr "&Añadir película..."
 
-#: src/tools/dcpomatic.cc:695
+#: src/tools/dcpomatic.cc:718
 msgid "&Content"
 msgstr "&Contenido"
 
-#: src/tools/dcpomatic.cc:693
+#: src/tools/dcpomatic.cc:716
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:656
+#: src/tools/dcpomatic.cc:677
 msgid "&Exit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:714 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:698 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:721 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:696
+#: src/tools/dcpomatic.cc:719
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:673
+#: src/tools/dcpomatic.cc:694
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crear DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:664
 msgid "&Open...\tCtrl-O"
 msgstr "&Abrir...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:662 src/tools/dcpomatic.cc:665
+#: src/tools/dcpomatic.cc:683 src/tools/dcpomatic.cc:686
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferencias...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:668
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:679 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:666
 msgid "&Save\tCtrl-S"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:675
+#: src/tools/dcpomatic.cc:696
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:697
+#: src/tools/dcpomatic.cc:720
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:710 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:685
+#: src/tools/dcpomatic.cc:708
 msgid "About DCP-o-matic"
 msgstr "Acerca de DVD-o-matic"
 
@@ -93,67 +93,71 @@ msgstr "Acerca de DVD-o-matic"
 msgid "Add Film..."
 msgstr "Añadir película..."
 
-#: src/tools/dcpomatic.cc:867
+#: src/tools/dcpomatic.cc:898
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s in %s.\n"
 "\n"
-msgstr "Ha ocurrido un error desconocido: %s (%s).\n\n"
+msgstr ""
+"Ha ocurrido un error desconocido: %s (%s).\n"
+"\n"
 
-#: src/tools/dcpomatic.cc:869
+#: src/tools/dcpomatic.cc:900
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s.\n"
 "\n"
-msgstr "Ha ocurrido un error desconocido: %s (%s).\n\n"
+msgstr ""
+"Ha ocurrido un error desconocido: %s (%s).\n"
+"\n"
 
-#: src/tools/dcpomatic.cc:443 src/tools/dcpomatic.cc:871
-#: src/tools/dcpomatic.cc:880
+#: src/tools/dcpomatic.cc:464 src/tools/dcpomatic.cc:902
+#: src/tools/dcpomatic.cc:911
 #, fuzzy
 msgid "An unknown exception occurred."
 msgstr "Ha ocurrido un error desconocido."
 
-#: src/tools/dcpomatic.cc:412
+#: src/tools/dcpomatic.cc:433
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:439
+#: src/tools/dcpomatic.cc:460
 msgid "CPL's content is not encrypted."
 msgstr "El contenido del CPL no está encriptado."
 
-#: src/tools/dcpomatic.cc:681
+#: src/tools/dcpomatic.cc:702
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
-#: src/tools/dcpomatic.cc:806 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:837 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:435
 #, fuzzy, c-format
 msgid "Could not make DCP: %s"
 msgstr "No se pudo cargar la película en %s (%s)"
 
-#: src/tools/dcpomatic.cc:272 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:281 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "No se pudo cargar la película en %s (%s)"
 
-#: src/tools/dcpomatic.cc:499
+#: src/tools/dcpomatic.cc:520
 msgid "Could not show DCP"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:511
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar konqueror)"
 
-#: src/tools/dcpomatic.cc:483
+#: src/tools/dcpomatic.cc:504
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilos)"
 
-#: src/tools/dcpomatic.cc:292 src/tools/dcpomatic.cc:761
-#: src/tools/dcpomatic.cc:797
+#: src/tools/dcpomatic.cc:301 src/tools/dcpomatic.cc:792
+#: src/tools/dcpomatic.cc:828
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -161,52 +165,69 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "Convertidor por lotes DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:680
+#: src/tools/dcpomatic.cc:701
 msgid "Encoding servers..."
 msgstr "Servidores de codificación..."
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:98
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dcpomatic.cc:679
-msgid "Hints...\tCtrl-H"
+#: src/tools/dcpomatic.cc:700
+#, fuzzy
+msgid "Hints..."
 msgstr "Pistas...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:674
+#: src/tools/dcpomatic.cc:695
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Crear &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:663
 msgid "New...\tCtrl-N"
 msgstr "Nuevo...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:689
+#: src/tools/dcpomatic.cc:712
 msgid "Report a problem..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:676
+#: src/tools/dcpomatic.cc:704
+msgid "Restore default preferences"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:697
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:90
+#: src/tools/dcpomatic.cc:94
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Guardar cambios de la película \"%s\" antes de cerrar?"
 
-#: src/tools/dcpomatic.cc:670
+#: src/tools/dcpomatic.cc:691
 msgid "Scale to fit &height"
 msgstr "Redimensionar ajustando &altura"
 
-#: src/tools/dcpomatic.cc:669
+#: src/tools/dcpomatic.cc:690
 msgid "Scale to fit &width"
 msgstr "Redimensionar ajustando &anchura"
 
-#: src/tools/dcpomatic.cc:337 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic.cc:400
+#: src/tools/dcpomatic.cc:419
+#, fuzzy, c-format
+msgid ""
+"The DCP and intermediate files for this film will take up about %.1f Gb, and "
+"the disk that you are using only has %.1f Gb available.  You would need half "
+"as much space if the filesystem supported hard links, but it does not.  Do "
+"you want to continue anyway?"
+msgstr ""
+"El DCP de esta película usará aproximadamente %.1f Gb, y el disco "
+"seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
+"formas?"
+
+#: src/tools/dcpomatic.cc:417
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -216,26 +237,26 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:918
+#: src/tools/dcpomatic.cc:937
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:311
+#: src/tools/dcpomatic.cc:320
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 "El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
 
-#: src/tools/dcpomatic.cc:913
+#: src/tools/dcpomatic.cc:941
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:551 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:572 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Hay trabajos sin finalizar; ¿estás seguro de querer cerrar?"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:267
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -244,11 +265,11 @@ msgstr ""
 "cargue correctamente en esta versión. Por favor revisa cuidadosamente las "
 "opciones."
 
-#: src/tools/dcpomatic.cc:552 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:573 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Trabajos sin finalizar"
 
-#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:355 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 2822f6656..59d654ad9 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-07-14 10:43+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.6\n"
 
-#: src/tools/dcpomatic.cc:321
+#: src/tools/dcpomatic.cc:330
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "Le fichier %1 existe déjà, vous ne pouvez l'utiliser pour un nouveau projet."
@@ -26,70 +26,70 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "&Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:695
+#: src/tools/dcpomatic.cc:718
 msgid "&Content"
 msgstr "&Contenu"
 
-#: src/tools/dcpomatic.cc:693
+#: src/tools/dcpomatic.cc:716
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dcpomatic.cc:656
+#: src/tools/dcpomatic.cc:677
 msgid "&Exit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:714 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dcpomatic.cc:698 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:721 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dcpomatic.cc:696
+#: src/tools/dcpomatic.cc:719
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dcpomatic.cc:673
+#: src/tools/dcpomatic.cc:694
 #, fuzzy
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Créer le DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:664
 #, fuzzy
 msgid "&Open...\tCtrl-O"
 msgstr "&Ouvrir...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:662 src/tools/dcpomatic.cc:665
+#: src/tools/dcpomatic.cc:683 src/tools/dcpomatic.cc:686
 #, fuzzy
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Préférences...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:668
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:679 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:666
 msgid "&Save\tCtrl-S"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:675
+#: src/tools/dcpomatic.cc:696
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP au TMS"
 
-#: src/tools/dcpomatic.cc:697
+#: src/tools/dcpomatic.cc:720
 msgid "&Tools"
 msgstr "&Outils"
 
-#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:710 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "A propos"
 
-#: src/tools/dcpomatic.cc:685
+#: src/tools/dcpomatic.cc:708
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
@@ -97,66 +97,70 @@ msgstr "À propos de DCP-o-matic"
 msgid "Add Film..."
 msgstr "Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:867
+#: src/tools/dcpomatic.cc:898
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s in %s.\n"
 "\n"
-msgstr "Exception inconnue: %s (%s).\n\n"
+msgstr ""
+"Exception inconnue: %s (%s).\n"
+"\n"
 
-#: src/tools/dcpomatic.cc:869
+#: src/tools/dcpomatic.cc:900
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s.\n"
 "\n"
-msgstr "Exception inconnue: %s (%s).\n\n"
+msgstr ""
+"Exception inconnue: %s (%s).\n"
+"\n"
 
-#: src/tools/dcpomatic.cc:443 src/tools/dcpomatic.cc:871
-#: src/tools/dcpomatic.cc:880
+#: src/tools/dcpomatic.cc:464 src/tools/dcpomatic.cc:902
+#: src/tools/dcpomatic.cc:911
 msgid "An unknown exception occurred."
 msgstr "Exception inconnue"
 
-#: src/tools/dcpomatic.cc:412
+#: src/tools/dcpomatic.cc:433
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:439
+#: src/tools/dcpomatic.cc:460
 msgid "CPL's content is not encrypted."
 msgstr "Le contenu du CPL n'est pas crypté."
 
-#: src/tools/dcpomatic.cc:681
+#: src/tools/dcpomatic.cc:702
 msgid "Check for updates"
 msgstr "Recherche mises à jour"
 
-#: src/tools/dcpomatic.cc:806 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:837 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:435
 #, fuzzy, c-format
 msgid "Could not make DCP: %s"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:272 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:281 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:499
+#: src/tools/dcpomatic.cc:520
 msgid "Could not show DCP"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:511
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
 
-#: src/tools/dcpomatic.cc:483
+#: src/tools/dcpomatic.cc:504
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
 
-#: src/tools/dcpomatic.cc:292 src/tools/dcpomatic.cc:761
-#: src/tools/dcpomatic.cc:797
+#: src/tools/dcpomatic.cc:301 src/tools/dcpomatic.cc:792
+#: src/tools/dcpomatic.cc:828
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -164,53 +168,68 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic - Convertisseur par lots"
 
-#: src/tools/dcpomatic.cc:680
+#: src/tools/dcpomatic.cc:701
 msgid "Encoding servers..."
 msgstr "Serveurs d'encodage"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:98
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dcpomatic.cc:679
+#: src/tools/dcpomatic.cc:700
 #, fuzzy
-msgid "Hints...\tCtrl-H"
+msgid "Hints..."
 msgstr "Conseils...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:674
+#: src/tools/dcpomatic.cc:695
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Générer &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:663
 msgid "New...\tCtrl-N"
 msgstr "Nouveau...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:689
+#: src/tools/dcpomatic.cc:712
 msgid "Report a problem..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:676
+#: src/tools/dcpomatic.cc:704
+msgid "Restore default preferences"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:697
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dcpomatic.cc:90
+#: src/tools/dcpomatic.cc:94
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:670
+#: src/tools/dcpomatic.cc:691
 msgid "Scale to fit &height"
 msgstr "Adapter pour remplir la &hauteur"
 
-#: src/tools/dcpomatic.cc:669
+#: src/tools/dcpomatic.cc:690
 msgid "Scale to fit &width"
 msgstr "Adapter pour remplir la largeur"
 
-#: src/tools/dcpomatic.cc:337 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic.cc:400
+#: src/tools/dcpomatic.cc:419
+#, fuzzy, c-format
+msgid ""
+"The DCP and intermediate files for this film will take up about %.1f Gb, and "
+"the disk that you are using only has %.1f Gb available.  You would need half "
+"as much space if the filesystem supported hard links, but it does not.  Do "
+"you want to continue anyway?"
+msgstr ""
+"Le DCP de ce film pèsera environ %.1f Go. Le disque que vous utilisez n'a "
+"que %.1f Go disponible(s). Souhaitez-vous continuer?"
+
+#: src/tools/dcpomatic.cc:417
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -219,26 +238,26 @@ msgstr ""
 "Le DCP de ce film pèsera environ %.1f Go. Le disque que vous utilisez n'a "
 "que %.1f Go disponible(s). Souhaitez-vous continuer?"
 
-#: src/tools/dcpomatic.cc:918
+#: src/tools/dcpomatic.cc:937
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Le serveur de téléchargement de DCP-o-matic ne peut être contacté."
 
-#: src/tools/dcpomatic.cc:311
+#: src/tools/dcpomatic.cc:320
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 "Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
 
-#: src/tools/dcpomatic.cc:913
+#: src/tools/dcpomatic.cc:941
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Aucune mise à jour disponible pour DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:551 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:572 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Il y a des tâches inachevées ; voulez-vous vraiment quitter ?"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:267
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -247,11 +266,11 @@ msgstr ""
 "être ouvert correctement dans cette version. Veuillez vérifier les "
 "paramètres de réglages très attentivement."
 
-#: src/tools/dcpomatic.cc:552 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:573 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Travaux incomplets"
 
-#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:355 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 93d33174d..5cf1be63d 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:321
+#: src/tools/dcpomatic.cc:330
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
 
@@ -25,67 +25,67 @@ msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
 msgid "&Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:695
+#: src/tools/dcpomatic.cc:718
 msgid "&Content"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:693
+#: src/tools/dcpomatic.cc:716
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:656
+#: src/tools/dcpomatic.cc:677
 msgid "&Exit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:714 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:698 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:721 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dcpomatic.cc:696
+#: src/tools/dcpomatic.cc:719
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dcpomatic.cc:673
+#: src/tools/dcpomatic.cc:694
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crea DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:664
 msgid "&Open...\tCtrl-O"
 msgstr "&Apri...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:662 src/tools/dcpomatic.cc:665
+#: src/tools/dcpomatic.cc:683 src/tools/dcpomatic.cc:686
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferenze...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:668
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:679 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:666
 msgid "&Save\tCtrl-S"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:675
+#: src/tools/dcpomatic.cc:696
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:697
+#: src/tools/dcpomatic.cc:720
 msgid "&Tools"
 msgstr "&Strumenti"
 
-#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:710 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:685
+#: src/tools/dcpomatic.cc:708
 msgid "About DCP-o-matic"
 msgstr "Su DVD-o-matic"
 
@@ -93,66 +93,66 @@ msgstr "Su DVD-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:867
+#: src/tools/dcpomatic.cc:898
 #, c-format
 msgid ""
 "An exception occurred: %s in %s.\n"
 "\n"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:869
+#: src/tools/dcpomatic.cc:900
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
 "\n"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:443 src/tools/dcpomatic.cc:871
-#: src/tools/dcpomatic.cc:880
+#: src/tools/dcpomatic.cc:464 src/tools/dcpomatic.cc:902
+#: src/tools/dcpomatic.cc:911
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:412
+#: src/tools/dcpomatic.cc:433
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:439
+#: src/tools/dcpomatic.cc:460
 msgid "CPL's content is not encrypted."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:681
+#: src/tools/dcpomatic.cc:702
 msgid "Check for updates"
 msgstr "Controlla aggiornamenti"
 
-#: src/tools/dcpomatic.cc:806 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:837 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:435
 #, fuzzy, c-format
 msgid "Could not make DCP: %s"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dcpomatic.cc:272 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:281 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dcpomatic.cc:499
+#: src/tools/dcpomatic.cc:520
 msgid "Could not show DCP"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:511
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:483
+#: src/tools/dcpomatic.cc:504
 msgid "Could not show DCP (could not run nautilus)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:292 src/tools/dcpomatic.cc:761
-#: src/tools/dcpomatic.cc:797
+#: src/tools/dcpomatic.cc:301 src/tools/dcpomatic.cc:792
+#: src/tools/dcpomatic.cc:828
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -160,52 +160,68 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:680
+#: src/tools/dcpomatic.cc:701
 msgid "Encoding servers..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:98
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dcpomatic.cc:679
-msgid "Hints...\tCtrl-H"
+#: src/tools/dcpomatic.cc:700
+#, fuzzy
+msgid "Hints..."
 msgstr "Suggerimenti...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:674
+#: src/tools/dcpomatic.cc:695
 msgid "Make &KDMs...\tCtrl-K"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:663
 msgid "New...\tCtrl-N"
 msgstr "Nuovo...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:689
+#: src/tools/dcpomatic.cc:712
 msgid "Report a problem..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:676
+#: src/tools/dcpomatic.cc:704
+msgid "Restore default preferences"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:697
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dcpomatic.cc:90
+#: src/tools/dcpomatic.cc:94
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:670
+#: src/tools/dcpomatic.cc:691
 msgid "Scale to fit &height"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:669
+#: src/tools/dcpomatic.cc:690
 msgid "Scale to fit &width"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:337 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dcpomatic.cc:400
+#: src/tools/dcpomatic.cc:419
+#, fuzzy, c-format
+msgid ""
+"The DCP and intermediate files for this film will take up about %.1f Gb, and "
+"the disk that you are using only has %.1f Gb available.  You would need half "
+"as much space if the filesystem supported hard links, but it does not.  Do "
+"you want to continue anyway?"
+msgstr ""
+"Il DCP di questo film occupa %.1f Gb, ma il disco che stai usando dispone di "
+"%.1f Gb liberi.  Vuoi continuare ugualmente?"
+
+#: src/tools/dcpomatic.cc:417
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -214,35 +230,35 @@ msgstr ""
 "Il DCP di questo film occupa %.1f Gb, ma il disco che stai usando dispone di "
 "%.1f Gb liberi.  Vuoi continuare ugualmente?"
 
-#: src/tools/dcpomatic.cc:918
+#: src/tools/dcpomatic.cc:937
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Il download server di DCP-o-matic non può essere contattato."
 
-#: src/tools/dcpomatic.cc:311
+#: src/tools/dcpomatic.cc:320
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
 
-#: src/tools/dcpomatic.cc:913
+#: src/tools/dcpomatic.cc:941
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Non ci sono nuove versioni di DCP-o-matic disponibili."
 
-#: src/tools/dcpomatic.cc:551 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:572 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "C'è un processo in corso: sei sicuro di voler uscire?"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:267
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:552 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:573 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Processo in corso"
 
-#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:355 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 7644dd036..d5fa8f426 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-09-04 20:29+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic.cc:321
+#: src/tools/dcpomatic.cc:330
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "%1 Dit bestand bestaat al, hierdoor kunt u het niet gebruiken voor een "
@@ -28,67 +28,67 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "Open een DCP map"
 
-#: src/tools/dcpomatic.cc:695
+#: src/tools/dcpomatic.cc:718
 msgid "&Content"
 msgstr "&Content"
 
-#: src/tools/dcpomatic.cc:693
+#: src/tools/dcpomatic.cc:716
 msgid "&Edit"
 msgstr "&Edit"
 
-#: src/tools/dcpomatic.cc:656
+#: src/tools/dcpomatic.cc:677
 msgid "&Exit"
 msgstr "&Afsluiten"
 
-#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:714 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Bestand"
 
-#: src/tools/dcpomatic.cc:698 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:721 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Help"
 
-#: src/tools/dcpomatic.cc:696
+#: src/tools/dcpomatic.cc:719
 msgid "&Jobs"
 msgstr "&Projecten"
 
-#: src/tools/dcpomatic.cc:673
+#: src/tools/dcpomatic.cc:694
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Maak een DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:664
 msgid "&Open...\tCtrl-O"
 msgstr "&Openen...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:662 src/tools/dcpomatic.cc:665
+#: src/tools/dcpomatic.cc:683 src/tools/dcpomatic.cc:686
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Voorkeuren...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:668
 msgid "&Properties..."
 msgstr "&Instellingen..."
 
-#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:679 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Afsluiten"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:666
 msgid "&Save\tCtrl-S"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:675
+#: src/tools/dcpomatic.cc:696
 msgid "&Send DCP to TMS"
 msgstr "&Verstuur DCP naar TMS"
 
-#: src/tools/dcpomatic.cc:697
+#: src/tools/dcpomatic.cc:720
 msgid "&Tools"
 msgstr "&Gereedschappen"
 
-#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:710 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Over.."
 
-#: src/tools/dcpomatic.cc:685
+#: src/tools/dcpomatic.cc:708
 msgid "About DCP-o-matic"
 msgstr "Over DCP-o-matic"
 
@@ -96,66 +96,70 @@ msgstr "Over DCP-o-matic"
 msgid "Add Film..."
 msgstr "Voeg Film Toe"
 
-#: src/tools/dcpomatic.cc:867
+#: src/tools/dcpomatic.cc:898
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s in %s.\n"
 "\n"
-msgstr "Er is een onbekende fout opgetreden: %s (%s).\n\n"
+msgstr ""
+"Er is een onbekende fout opgetreden: %s (%s).\n"
+"\n"
 
-#: src/tools/dcpomatic.cc:869
+#: src/tools/dcpomatic.cc:900
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s.\n"
 "\n"
-msgstr "Er is een onbekende fout opgetreden: %s (%s).\n\n"
+msgstr ""
+"Er is een onbekende fout opgetreden: %s (%s).\n"
+"\n"
 
-#: src/tools/dcpomatic.cc:443 src/tools/dcpomatic.cc:871
-#: src/tools/dcpomatic.cc:880
+#: src/tools/dcpomatic.cc:464 src/tools/dcpomatic.cc:902
+#: src/tools/dcpomatic.cc:911
 msgid "An unknown exception occurred."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: src/tools/dcpomatic.cc:412
+#: src/tools/dcpomatic.cc:433
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:439
+#: src/tools/dcpomatic.cc:460
 msgid "CPL's content is not encrypted."
 msgstr "De inhoud van de CPL is niet geëncrypteerd."
 
-#: src/tools/dcpomatic.cc:681
+#: src/tools/dcpomatic.cc:702
 msgid "Check for updates"
 msgstr "Controleer op updates"
 
-#: src/tools/dcpomatic.cc:806 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:837 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Kan film niet openen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:435
 #, fuzzy, c-format
 msgid "Could not make DCP: %s"
 msgstr "Kan film niet openen in  %s (%s)"
 
-#: src/tools/dcpomatic.cc:272 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:281 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kan film niet openen in  %s (%s)"
 
-#: src/tools/dcpomatic.cc:499
+#: src/tools/dcpomatic.cc:520
 msgid "Could not show DCP"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:511
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kan DCP niet vertonen (Kan Konqueror niet starten)"
 
-#: src/tools/dcpomatic.cc:483
+#: src/tools/dcpomatic.cc:504
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kan DCP niet vertonen (Kan Nautilus niet starten)"
 
-#: src/tools/dcpomatic.cc:292 src/tools/dcpomatic.cc:761
-#: src/tools/dcpomatic.cc:797
+#: src/tools/dcpomatic.cc:301 src/tools/dcpomatic.cc:792
+#: src/tools/dcpomatic.cc:828
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -163,52 +167,68 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic Bulk Omzetter"
 
-#: src/tools/dcpomatic.cc:680
+#: src/tools/dcpomatic.cc:701
 msgid "Encoding servers..."
 msgstr "Render servers..."
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:98
 msgid "Film changed"
 msgstr "Film is veranderd"
 
-#: src/tools/dcpomatic.cc:679
-msgid "Hints...\tCtrl-H"
+#: src/tools/dcpomatic.cc:700
+#, fuzzy
+msgid "Hints..."
 msgstr "Tips...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:674
+#: src/tools/dcpomatic.cc:695
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Maak &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:663
 msgid "New...\tCtrl-N"
 msgstr "Nieuw...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:689
+#: src/tools/dcpomatic.cc:712
 msgid "Report a problem..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:676
+#: src/tools/dcpomatic.cc:704
+msgid "Restore default preferences"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:697
 msgid "S&how DCP"
 msgstr "S&hoe DCP"
 
-#: src/tools/dcpomatic.cc:90
+#: src/tools/dcpomatic.cc:94
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Bewaar veranderingen naar film \"%s\" voor afsluiten?"
 
-#: src/tools/dcpomatic.cc:670
+#: src/tools/dcpomatic.cc:691
 msgid "Scale to fit &height"
 msgstr "Scaal naar &height"
 
-#: src/tools/dcpomatic.cc:669
+#: src/tools/dcpomatic.cc:690
 msgid "Scale to fit &width"
 msgstr "Schaal naar &width"
 
-#: src/tools/dcpomatic.cc:337 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Kies een film om te openen"
 
-#: src/tools/dcpomatic.cc:400
+#: src/tools/dcpomatic.cc:419
+#, fuzzy, c-format
+msgid ""
+"The DCP and intermediate files for this film will take up about %.1f Gb, and "
+"the disk that you are using only has %.1f Gb available.  You would need half "
+"as much space if the filesystem supported hard links, but it does not.  Do "
+"you want to continue anyway?"
+msgstr ""
+"De DCP voor deze film neemt ongeveer %.1f Gb in beslag, er is echter maar "
+"%.1f Gb beschikbaar.  Wilt u toch doorgaan?"
+
+#: src/tools/dcpomatic.cc:417
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -217,26 +237,26 @@ msgstr ""
 "De DCP voor deze film neemt ongeveer %.1f Gb in beslag, er is echter maar "
 "%.1f Gb beschikbaar.  Wilt u toch doorgaan?"
 
-#: src/tools/dcpomatic.cc:918
+#: src/tools/dcpomatic.cc:937
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "De verbinding met de DCP-o-matic download server is niet beschikbaar."
 
-#: src/tools/dcpomatic.cc:311
+#: src/tools/dcpomatic.cc:320
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "De map %1 bestaat al en is niet leeg. Wilt u deze toch gebruiken?"
 
-#: src/tools/dcpomatic.cc:913
+#: src/tools/dcpomatic.cc:941
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Er is geen nieuwere versie van DCP-o-matic beschikbaar."
 
-#: src/tools/dcpomatic.cc:551 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:572 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Er zijn nog niet afgeronde projecten, weet u zeker dat u wilt afsluiten?"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:267
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -244,11 +264,11 @@ msgstr ""
 "Deze film is gemaakt met een oude versie van DCP-o-matic en opent mogelijk "
 "niet goed in de huidige versie.  Controleer alle instellingen zorgvuldig."
 
-#: src/tools/dcpomatic.cc:552 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:573 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Niet afgemaakte projecten"
 
-#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:355 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index e9a337c6d..9a6c288c3 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-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:321
+#: src/tools/dcpomatic.cc:330
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
 
@@ -25,70 +25,70 @@ msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
 msgid "&Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:695
+#: src/tools/dcpomatic.cc:718
 msgid "&Content"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:693
+#: src/tools/dcpomatic.cc:716
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dcpomatic.cc:656
+#: src/tools/dcpomatic.cc:677
 msgid "&Exit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:714 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:698 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:721 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dcpomatic.cc:696
+#: src/tools/dcpomatic.cc:719
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dcpomatic.cc:673
+#: src/tools/dcpomatic.cc:694
 #, fuzzy
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Skapa DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:664
 #, fuzzy
 msgid "&Open...\tCtrl-O"
 msgstr "&Öppna...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:662 src/tools/dcpomatic.cc:665
+#: src/tools/dcpomatic.cc:683 src/tools/dcpomatic.cc:686
 #, fuzzy
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Inställningar...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:647
+#: src/tools/dcpomatic.cc:668
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:679 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:666
 msgid "&Save\tCtrl-S"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:675
+#: src/tools/dcpomatic.cc:696
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dcpomatic.cc:697
+#: src/tools/dcpomatic.cc:720
 msgid "&Tools"
 msgstr "&Verktyg"
 
-#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:710 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:685
+#: src/tools/dcpomatic.cc:708
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
@@ -96,66 +96,66 @@ msgstr "Om DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:867
+#: src/tools/dcpomatic.cc:898
 #, c-format
 msgid ""
 "An exception occurred: %s in %s.\n"
 "\n"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:869
+#: src/tools/dcpomatic.cc:900
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
 "\n"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:443 src/tools/dcpomatic.cc:871
-#: src/tools/dcpomatic.cc:880
+#: src/tools/dcpomatic.cc:464 src/tools/dcpomatic.cc:902
+#: src/tools/dcpomatic.cc:911
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:412
+#: src/tools/dcpomatic.cc:433
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:439
+#: src/tools/dcpomatic.cc:460
 msgid "CPL's content is not encrypted."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:681
+#: src/tools/dcpomatic.cc:702
 msgid "Check for updates"
 msgstr "Leta efter uppdateringar"
 
-#: src/tools/dcpomatic.cc:806 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:837 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:435
 #, fuzzy, c-format
 msgid "Could not make DCP: %s"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:272 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:281 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:499
+#: src/tools/dcpomatic.cc:520
 msgid "Could not show DCP"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:511
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kunde inte visa DCP (kunde inte köra konqueror)"
 
-#: src/tools/dcpomatic.cc:483
+#: src/tools/dcpomatic.cc:504
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kunde inte visa DCP (kunde inte köra nautilus)"
 
-#: src/tools/dcpomatic.cc:292 src/tools/dcpomatic.cc:761
-#: src/tools/dcpomatic.cc:797
+#: src/tools/dcpomatic.cc:301 src/tools/dcpomatic.cc:792
+#: src/tools/dcpomatic.cc:828
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -163,52 +163,68 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:680
+#: src/tools/dcpomatic.cc:701
 msgid "Encoding servers..."
 msgstr "Kodningsservrar..."
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:98
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dcpomatic.cc:679
-msgid "Hints...\tCtrl-H"
+#: src/tools/dcpomatic.cc:700
+#, fuzzy
+msgid "Hints..."
 msgstr "Råd...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:674
+#: src/tools/dcpomatic.cc:695
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Skapa &KDM:er...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:663
 msgid "New...\tCtrl-N"
 msgstr "Ny...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:689
+#: src/tools/dcpomatic.cc:712
 msgid "Report a problem..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:676
+#: src/tools/dcpomatic.cc:704
+msgid "Restore default preferences"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:697
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dcpomatic.cc:90
+#: src/tools/dcpomatic.cc:94
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:670
+#: src/tools/dcpomatic.cc:691
 msgid "Scale to fit &height"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:669
+#: src/tools/dcpomatic.cc:690
 msgid "Scale to fit &width"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:337 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dcpomatic.cc:400
+#: src/tools/dcpomatic.cc:419
+#, fuzzy, c-format
+msgid ""
+"The DCP and intermediate files for this film will take up about %.1f Gb, and "
+"the disk that you are using only has %.1f Gb available.  You would need half "
+"as much space if the filesystem supported hard links, but it does not.  Do "
+"you want to continue anyway?"
+msgstr ""
+"DCP:n för denna film kommer att uppta ungefär %.1f Gb, och disken du "
+"använder har bara %.1f Gb ledigt. Vill du fortsätta ändå?"
+
+#: src/tools/dcpomatic.cc:417
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -217,11 +233,11 @@ msgstr ""
 "DCP:n för denna film kommer att uppta ungefär %.1f Gb, och disken du "
 "använder har bara %.1f Gb ledigt. Vill du fortsätta ändå?"
 
-#: src/tools/dcpomatic.cc:918
+#: src/tools/dcpomatic.cc:937
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matics nedladdningsserver kunde inte kontaktas."
 
-#: src/tools/dcpomatic.cc:311
+#: src/tools/dcpomatic.cc:320
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
@@ -229,25 +245,25 @@ msgstr ""
 "Foldern %1 finns redan och är inte tom. Är du säker på att du vill använda "
 "den?"
 
-#: src/tools/dcpomatic.cc:913
+#: src/tools/dcpomatic.cc:941
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Det finns inga nya versioner av DCP-o-matic tillgängligt."
 
-#: src/tools/dcpomatic.cc:551 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:572 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Det finns oasvlutade jobb; är du säker på att du vill avsluta?"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:267
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:552 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:573 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Oavslutade jobb"
 
-#: src/tools/dcpomatic.cc:346 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:355 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index faa7e2ec9..1783d9c3e 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/wx/key_dialog.cc:44
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-07-13 03:08+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,11 +32,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:990
+#: src/wx/config_dialog.cc:984
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(Passwort wird im Klartext gespeichert!)"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:165
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(Programm zum Ändern der Sprache neu starten)"
 
@@ -45,11 +46,11 @@ 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:107
+#: src/wx/colour_conversion_editor.cc:188
 msgid "1 / "
 msgstr "1/"
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
 
@@ -57,46 +58,56 @@ msgstr "2D"
 msgid "2D version of content available in 3D"
 msgstr "2D Version eines Films, der auch in 3D verfügbar ist"
 
-#: src/wx/dcp_panel.cc:612
+#: src/wx/dcp_panel.cc:645
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:560
+#: src/wx/dcp_panel.cc:602
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:222
 msgid "3D alternate"
 msgstr "3D L/R sequentiell"
 
-#: src/wx/video_panel.cc:203
+#: src/wx/video_panel.cc:223
 msgid "3D left only"
 msgstr "3D nur links"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:220
 msgid "3D left/right"
 msgstr "3D Links/Rechts"
 
-#: src/wx/video_panel.cc:204
+#: src/wx/video_panel.cc:224
 msgid "3D right only"
 msgstr "3D nur rechts"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:221
 msgid "3D top/bottom"
 msgstr "3D Oben/Unten"
 
-#: src/wx/dcp_panel.cc:613
+#: src/wx/dcp_panel.cc:646
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/hints_dialog.cc:120
+#: src/wx/timing_panel.cc:109
+msgid ""
+"<i>Only change this if it the content's frame rate has been read incorrectly."
+"</i>"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "A"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:144
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/wx/update_dialog.cc:34
+#: src/wx/update_dialog.cc:35
 msgid "A new version of DCP-o-matic is available."
 msgstr "Es ist eine neue Version von DCP-o-matic verfügbar."
 
@@ -108,7 +119,7 @@ msgstr "Über DCP-o-matic"
 msgid "Add Cinema..."
 msgstr "Kino hinzufügen..."
 
-#: src/wx/content_menu.cc:57
+#: src/wx/content_menu.cc:62
 #, fuzzy
 msgid "Add KDM..."
 msgstr "Kino hinzufügen..."
@@ -117,35 +128,39 @@ msgstr "Kino hinzufügen..."
 msgid "Add Screen..."
 msgstr "Saal hinzufügen..."
 
-#: src/wx/content_panel.cc:74
+#: src/wx/content_panel.cc:79
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
 msgstr ""
 
-#: src/wx/content_panel.cc:69
+#: src/wx/content_panel.cc:74
 msgid "Add file(s)..."
 msgstr "Datei(en) hinzufügen..."
 
-#: src/wx/content_panel.cc:73
+#: src/wx/content_panel.cc:78
 #, fuzzy
 msgid "Add folder..."
 msgstr "Datei(en) hinzufügen..."
 
-#: src/wx/image_sequence_dialog.cc:27
+#: src/wx/image_sequence_dialog.cc:25
 #, fuzzy
 msgid "Add image sequence"
 msgstr "Lücken in Zeitleiste automatisch schließen"
 
-#: src/wx/content_panel.cc:70
+#: src/wx/content_panel.cc:75
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:584 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:594 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Hinzufügen..."
 
-#: src/wx/hints_dialog.cc:108
+#: src/wx/colour_conversion_editor.cc:159
+msgid "Adjust white point to"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:132
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -153,7 +168,7 @@ msgid ""
 "\"DCP\" tab."
 msgstr ""
 
-#: src/wx/hints_dialog.cc:102
+#: src/wx/hints_dialog.cc:126
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -161,15 +176,15 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1128
+#: src/wx/config_dialog.cc:1133
 msgid "Allow any DCP frame rate"
 msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)"
 
-#: src/wx/about_dialog.cc:115
+#: src/wx/about_dialog.cc:116
 msgid "Artwork by"
 msgstr "Grafik von"
 
-#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:93
+#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:104
 msgid "Audio"
 msgstr "Ton"
 
@@ -177,14 +192,19 @@ msgstr "Ton"
 msgid "Audio Language (e.g. EN)"
 msgstr "Ton Sprache (z.B. DE)"
 
-#: src/wx/audio_mapping_view.cc:358
+#: src/wx/content_properties_dialog.cc:61
+#, fuzzy
+msgid "Audio channels"
+msgstr "Kanäle"
+
+#: src/wx/audio_mapping_view.cc:314
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
 "Der Ton von Kanal %d wird ohne Veränderung an den DCP Kanal %d weitergegeben."
 
-#: src/wx/audio_mapping_view.cc:361
+#: src/wx/audio_mapping_view.cc:317
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -193,27 +213,29 @@ msgstr ""
 "Der Ton von Kanal %d wird wird an den DCP Kanal %d mit %.1fdB Pegel "
 "weitergegeben."
 
-#: src/wx/config_dialog.cc:1009
+#: src/wx/colour_conversion_editor.cc:70
+#, fuzzy
+msgid "B"
+msgstr "dB"
+
+#: src/wx/config_dialog.cc:1003
 msgid "BCC address"
 msgstr "BCC: Adresse"
 
-#: src/wx/video_panel.cc:125
-msgid "Bottom crop"
+#: src/wx/colour_conversion_editor.cc:126
+msgid "Blue chromaticity"
+msgstr ""
+
+#: src/wx/video_panel.cc:128
+#, fuzzy
+msgid "Bottom"
 msgstr "Unten beschneiden"
 
 #: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Durchsuchen..."
 
-#: src/wx/audio_mapping_view.cc:325
-msgid "BsL"
-msgstr "BsL"
-
-#: src/wx/audio_mapping_view.cc:329
-msgid "BsR"
-msgstr "BsR"
-
-#: src/wx/dcp_panel.cc:556
+#: src/wx/dcp_panel.cc:598
 msgid "Burn subtitles into image"
 msgstr ""
 
@@ -221,18 +243,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Aber ich nutze gegenwärtig Faderstellung"
 
-#: src/wx/image_sequence_dialog.cc:33
-msgid ""
-"By default DCP-o-matic will calculate digests (hashes) of your image files "
-"so that it knows if they change.  Turning this off will speed up import but "
-"you must not alter the image files after import or strange things may happen."
-msgstr ""
-
-#: src/wx/audio_mapping_view.cc:293
-msgid "C"
-msgstr "C"
-
-#: src/wx/config_dialog.cc:1005
+#: src/wx/config_dialog.cc:999
 msgid "CC address"
 msgstr "CC: Adresse"
 
@@ -248,16 +259,11 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL annotation text"
 
-#: src/wx/image_sequence_dialog.cc:31
-#, fuzzy
-msgid "Calculate digests"
-msgstr "Berechne..."
-
-#: src/wx/audio_panel.cc:66
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Berechne..."
 
-#: src/wx/job_manager_view.cc:66
+#: src/wx/job_manager_view.cc:59
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -265,16 +271,16 @@ msgstr "Abbrechen"
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: src/wx/config_dialog.cc:551
+#: src/wx/config_dialog.cc:561
 msgid "Certificate chain for signing DCPs and KDMs:"
 msgstr ""
 
-#: src/wx/dolby_certificate_dialog.cc:191
-#: src/wx/doremi_certificate_dialog.cc:103
+#: src/wx/dolby_certificate_dialog.cc:192
+#: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Zertifikat heruntergeladen"
 
-#: src/wx/config_dialog.cc:612
+#: src/wx/config_dialog.cc:620
 msgid "Certificate for decrypting DCPs"
 msgstr ""
 
@@ -286,31 +292,31 @@ msgstr "Kinokette"
 msgid "Channel gain"
 msgstr "Kanal Verstärkung (+/-)"
 
-#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:628
+#: src/wx/audio_dialog.cc:56 src/wx/dcp_panel.cc:662
 msgid "Channels"
 msgstr "Kanäle"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:180
 msgid "Check for testing updates as well as stable ones"
 msgstr "Zeige bei Updateprüfung auch Test-Versionen an"
 
-#: src/wx/config_dialog.cc:122
+#: src/wx/config_dialog.cc:176
 msgid "Check for updates on startup"
 msgstr "Beim Start auf Updates überprüfen."
 
-#: src/wx/content_menu.cc:198
+#: src/wx/content_menu.cc:244
 msgid "Choose a file"
 msgstr "Datei auswählen"
 
-#: src/wx/content_panel.cc:237
+#: src/wx/content_panel.cc:242
 msgid "Choose a file or files"
 msgstr "Eine oder mehrere Dateien auswählen"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:260
+#: src/wx/content_menu.cc:237 src/wx/content_panel.cc:264
 msgid "Choose a folder"
 msgstr "Ordner wählen"
 
-#: src/wx/fonts_dialog.cc:116
+#: src/wx/fonts_dialog.cc:120
 #, fuzzy
 msgid "Choose a font file"
 msgstr "Datei auswählen"
@@ -319,16 +325,12 @@ msgstr "Datei auswählen"
 msgid "Cinema"
 msgstr "Kino"
 
-#: src/wx/config_dialog.cc:491
-msgid "Colour Conversions"
-msgstr "Farbumwandlungen"
-
-#: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:172
+#: src/wx/content_colour_conversion_dialog.cc:35
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:181
 msgid "Colour conversion"
 msgstr "Farbumwandlung"
 
-#: src/wx/config_dialog.cc:1148
+#: src/wx/config_dialog.cc:1153
 msgid "Config|Timing"
 msgstr "Timing"
 
@@ -336,15 +338,20 @@ msgstr "Timing"
 msgid "Contact email"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:537
+#: src/wx/dcp_panel.cc:573
 msgid "Container"
 msgstr "Container"
 
-#: src/wx/audio_mapping_view.cc:278 src/wx/film_editor.cc:49
+#: src/wx/audio_mapping_view.cc:250 src/wx/film_editor.cc:49
 msgid "Content"
 msgstr "Inhalt"
 
-#: src/wx/dcp_panel.cc:84
+#: src/wx/content_properties_dialog.cc:34
+#, fuzzy
+msgid "Content Properties"
+msgstr "Projekt Eigenschaften"
+
+#: src/wx/dcp_panel.cc:95
 msgid "Content Type"
 msgstr "Inhalt Typ"
 
@@ -352,7 +359,7 @@ msgstr "Inhalt Typ"
 msgid "Content version"
 msgstr "Inhalt Version"
 
-#: src/wx/dcp_panel.cc:73
+#: src/wx/dcp_panel.cc:78
 msgid "Copy as name"
 msgstr ""
 
@@ -360,30 +367,30 @@ msgstr ""
 msgid "Copy..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:151
+#: src/wx/audio_dialog.cc:182
 msgid "Could not analyse audio."
 msgstr "Ton konnte nicht analysiert werden"
 
-#: src/wx/content_panel.cc:286
-msgid "Could not find a DCP in that folder."
+#: src/wx/content_panel.cc:290
+msgid "Could not find a DCP nor a set of images in that folder."
 msgstr ""
 
-#: src/wx/content_panel.cc:307
+#: src/wx/content_panel.cc:310
 msgid "Could not find any images in that folder"
 msgstr ""
 
-#: src/wx/film_viewer.cc:178
+#: src/wx/film_viewer.cc:181
 #, fuzzy, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Konnte die Zertifikatsdatei (%s) nicht lesen."
 
-#: src/wx/config_dialog.cc:675 src/wx/config_dialog.cc:770
-#: src/wx/config_dialog.cc:790 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:673 src/wx/config_dialog.cc:768
+#: src/wx/config_dialog.cc:788 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Konnte die Zertifikatsdatei (%s) nicht lesen."
 
-#: src/wx/config_dialog.cc:762 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:760 src/wx/config_dialog.cc:810
 #, fuzzy, c-format
 msgid "Could not read key file (%s)"
 msgstr "Konnte die Zertifikatsdatei (%s) nicht lesen."
@@ -396,7 +403,11 @@ msgstr "Land"
 msgid "Create in folder"
 msgstr "In Ordner erstellen"
 
-#: src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:91
+msgid "Crop"
+msgstr ""
+
+#: src/wx/video_panel.cc:190
 msgid "Custom"
 msgstr "Eigene"
 
@@ -404,10 +415,6 @@ msgstr "Eigene"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/dcp_panel.cc:79
-msgid "DCP Name"
-msgstr "DCP Name"
-
 #: src/wx/kdm_dialog.cc:140
 msgid "DCP directory"
 msgstr "DCP Verzeichnis"
@@ -416,52 +423,52 @@ msgstr "DCP Verzeichnis"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:98
-#, c-format
-msgid "DCP-o-matic audio - %s"
+#: src/wx/audio_dialog.cc:108
+#, fuzzy
+msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic Ton - %s"
 
-#: src/wx/config_dialog.cc:276
+#: src/wx/config_dialog.cc:330
 msgid "Default ISDCF name details"
 msgstr "Standard ISDCF Name Details"
 
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:343
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standard JPEG2000 Datenrate"
 
-#: src/wx/config_dialog.cc:298
+#: src/wx/config_dialog.cc:352
 msgid "Default audio delay"
 msgstr "Standard Ton Verzögerung (+/-)"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:334
 msgid "Default container"
 msgstr "Standard Container"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:338
 msgid "Default content type"
 msgstr "Standard Inhalt Typ"
 
-#: src/wx/config_dialog.cc:268
+#: src/wx/config_dialog.cc:322
 msgid "Default directory for new films"
 msgstr "Standard Ordner für neue Projekte"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:314
 msgid "Default duration of still images"
 msgstr "Standard Länge für Standbilder"
 
-#: src/wx/config_dialog.cc:306
+#: src/wx/config_dialog.cc:360
 msgid "Default issuer"
 msgstr "Standard 'issuer' (DCI)"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:296
 msgid "Defaults"
 msgstr "Vorgaben"
 
-#: src/wx/audio_panel.cc:70
+#: src/wx/audio_panel.cc:64
 msgid "Delay"
 msgstr "Verzögerung (+/-)"
 
-#: src/wx/dcp_panel.cc:71 src/wx/job_manager_view.cc:76
+#: src/wx/dcp_panel.cc:76 src/wx/job_manager_view.cc:69
 msgid "Details..."
 msgstr "Details..."
 
@@ -470,12 +477,12 @@ msgid "Disk space required"
 msgstr "Festplattenplatz benötigt"
 
 #: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
-#: src/wx/screen_dialog.cc:135
+#: src/wx/screen_dialog.cc:137
 msgid "Dolby"
 msgstr "Dolby"
 
 #: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
-#: src/wx/screen_dialog.cc:134
+#: src/wx/screen_dialog.cc:136
 msgid "Doremi"
 msgstr "Doremi"
 
@@ -483,11 +490,11 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Doremi Seriennummern müssen aus 6 Zahlen bestehen!"
 
-#: src/wx/content_panel.cc:85
+#: src/wx/content_panel.cc:90
 msgid "Down"
 msgstr "Nach unten"
 
-#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#: src/wx/download_certificate_dialog.cc:39 src/wx/screen_dialog.cc:47
 msgid "Download"
 msgstr "Download"
 
@@ -495,8 +502,8 @@ msgstr "Download"
 msgid "Download certificate"
 msgstr "Lade Zertifikat"
 
-#: src/wx/dolby_certificate_dialog.cc:157
-#: src/wx/doremi_certificate_dialog.cc:54
+#: src/wx/dolby_certificate_dialog.cc:158
+#: src/wx/doremi_certificate_dialog.cc:55
 msgid "Downloading certificate"
 msgstr "Zertifikat wird heruntergeladen..."
 
@@ -508,8 +515,8 @@ msgstr "Kino bearbeiten..."
 msgid "Edit Screen..."
 msgstr "Saal bearbeiten..."
 
-#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:277
-#: src/wx/video_panel.cc:168 src/wx/video_panel.cc:176
+#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:331
+#: src/wx/dcp_panel.cc:123 src/wx/video_panel.cc:174 src/wx/video_panel.cc:193
 #: src/wx/editable_list.h:66
 msgid "Edit..."
 msgstr "Bearbeiten..."
@@ -522,7 +529,7 @@ msgstr "KDM Empfänger Email Adresse"
 msgid "Encoding Servers"
 msgstr "Encoding Server"
 
-#: src/wx/dcp_panel.cc:99
+#: src/wx/dcp_panel.cc:110
 msgid "Encrypted"
 msgstr "Verschlüsselt (->für KDM Erstellung)"
 
@@ -530,11 +537,11 @@ msgstr "Verschlüsselt (->für KDM Erstellung)"
 msgid "End"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1146
+#: src/wx/config_dialog.cc:1151
 msgid "Errors"
 msgstr "Fehler"
 
-#: src/wx/config_dialog.cc:638
+#: src/wx/config_dialog.cc:636
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
@@ -542,11 +549,11 @@ msgstr ""
 msgid "Facility (e.g. DLA)"
 msgstr "Hersteller (z.B. DXL)"
 
-#: src/wx/video_panel.cc:138
+#: src/wx/video_panel.cc:141
 msgid "Fade in"
 msgstr ""
 
-#: src/wx/video_panel.cc:143
+#: src/wx/video_panel.cc:146
 msgid "Fade out"
 msgstr ""
 
@@ -556,6 +563,11 @@ msgstr ""
 msgid "Fetching..."
 msgstr "Zugriff..."
 
+#: src/wx/content_properties_dialog.cc:38
+#, fuzzy
+msgid "Filename"
+msgstr "Projekt Name"
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Projekt Eigenschaften"
@@ -564,19 +576,19 @@ msgstr "Projekt Eigenschaften"
 msgid "Film name"
 msgstr "Projekt Name"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:165
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:168
 msgid "Filters"
 msgstr "Filter"
 
-#: src/wx/content_menu.cc:55
+#: src/wx/content_menu.cc:59
 msgid "Find missing..."
 msgstr "Suche fehlende..."
 
-#: src/wx/fonts_dialog.cc:47
+#: src/wx/fonts_dialog.cc:48
 msgid "Font file"
 msgstr ""
 
-#: src/wx/fonts_dialog.cc:31
+#: src/wx/fonts_dialog.cc:32
 msgid "Fonts"
 msgstr ""
 
@@ -584,11 +596,11 @@ msgstr ""
 msgid "Fonts..."
 msgstr ""
 
-#: src/wx/dcp_panel.cc:543
+#: src/wx/dcp_panel.cc:584
 msgid "Frame Rate"
 msgstr "Bild Rate"
 
-#: src/wx/image_sequence_dialog.cc:29
+#: src/wx/image_sequence_dialog.cc:27
 #, fuzzy
 msgid "Frame rate"
 msgstr "Bild Rate"
@@ -597,12 +609,9 @@ msgstr "Bild Rate"
 msgid "Frames"
 msgstr "Bilder"
 
-#: src/wx/properties_dialog.cc:45
-msgid "Frames already encoded"
-msgstr "Bilder bereits bearbeitet"
-
 #: src/wx/about_dialog.cc:65
-msgid "Free, open-source DCP generation from almost anything."
+#, fuzzy
+msgid "Free, open-source DCP creation from almost anything."
 msgstr ""
 "Kostenlose Open-Source-Software zur DCP-Erstellung aus nahezu allen "
 "Quellformaten."
@@ -611,7 +620,7 @@ msgstr ""
 msgid "From"
 msgstr "Von"
 
-#: src/wx/config_dialog.cc:1001
+#: src/wx/config_dialog.cc:995
 msgid "From address"
 msgstr "Absenderadresse"
 
@@ -619,11 +628,11 @@ msgstr "Absenderadresse"
 msgid "Full"
 msgstr "Voll"
 
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:79
 msgid "Full length"
 msgstr "Gesamtlänge"
 
-#: src/wx/audio_panel.cc:55
+#: src/wx/audio_panel.cc:49
 msgid "Gain"
 msgstr "Verstärkung (+/-)"
 
@@ -636,19 +645,19 @@ msgstr "Fader Rechner"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Abschwächung des Kanals %d im DCP Kanal %d"
 
-#: src/wx/properties_dialog.cc:51
+#: src/wx/properties_dialog.cc:48
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:1142
+#: src/wx/config_dialog.cc:1147
 msgid "General"
 msgstr "Allgemein"
 
-#: src/wx/audio_mapping_view.cc:309
-msgid "HI"
-msgstr "HI"
+#: src/wx/colour_conversion_editor.cc:119
+msgid "Green chromaticity"
+msgstr ""
 
-#: src/wx/hints_dialog.cc:31
+#: src/wx/hints_dialog.cc:34
 msgid "Hints"
 msgstr "Tipps"
 
@@ -664,15 +673,15 @@ msgstr "Host Name oder IP-Adresse"
 msgid "I want to play this back at fader"
 msgstr "Ich möchte bei dieser Faderstellung spielen"
 
-#: src/wx/fonts_dialog.cc:39
+#: src/wx/fonts_dialog.cc:40
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:886
+#: src/wx/config_dialog.cc:882
 msgid "IP address"
 msgstr "IP Adresse"
 
-#: src/wx/config_dialog.cc:449
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "IP Adresse / Host Name"
 
@@ -680,27 +689,20 @@ msgstr "IP Adresse / Host Name"
 msgid "ISDCF name"
 msgstr "ISDCF Name"
 
-#: src/wx/colour_conversion_editor.cc:68
-msgid "Input A value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:73
-msgid "Input B value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:53
+#: src/wx/colour_conversion_editor.cc:54
 msgid "Input gamma"
 msgstr "Eingangs Gamma"
 
-#: src/wx/colour_conversion_editor.cc:58
-msgid "Input power"
-msgstr ""
+#: src/wx/colour_conversion_editor.cc:48
+#, fuzzy
+msgid "Input gamma correction"
+msgstr "Eingangs Gamma"
 
-#: src/wx/colour_conversion_editor.cc:63
-msgid "Input threshold"
+#: src/wx/colour_conversion_editor.cc:59
+msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:714
+#: src/wx/config_dialog.cc:712
 msgid "Intermediate"
 msgstr ""
 
@@ -708,19 +710,19 @@ msgstr ""
 msgid "Intermediate common name"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:123
+#: src/wx/dcp_panel.cc:150
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/dcp_panel.cc:570
+#: src/wx/dcp_panel.cc:612
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 Datenrate"
 
-#: src/wx/content_menu.cc:54
+#: src/wx/content_menu.cc:58
 msgid "Join"
 msgstr "Verbinden"
 
-#: src/wx/config_dialog.cc:953
+#: src/wx/config_dialog.cc:955
 msgid "KDM Email"
 msgstr "KDM Email"
 
@@ -736,24 +738,20 @@ msgstr "Zeitfenster"
 msgid "Keep video in sequence"
 msgstr "Lücken in Zeitleiste automatisch schließen"
 
-#: src/wx/config_dialog.cc:535
-msgid "Keys"
+#: src/wx/dcp_panel.cc:119 src/wx/key_dialog.cc:26 src/wx/key_dialog.cc:28
+msgid "Key"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:285
-msgid "L"
-msgstr "L"
+#: src/wx/config_dialog.cc:548
+msgid "Keys"
+msgstr ""
 
 #: src/wx/subtitle_panel.cc:89
 #, fuzzy
 msgid "Language"
 msgstr "Sprache setzen"
 
-#: src/wx/audio_mapping_view.cc:317
-msgid "Lc"
-msgstr "Lc"
-
-#: src/wx/config_dialog.cc:712
+#: src/wx/config_dialog.cc:710
 msgid "Leaf"
 msgstr ""
 
@@ -761,49 +759,43 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
-#: src/wx/video_panel.cc:93
-msgid "Left crop"
+#: src/wx/video_panel.cc:96
+#, fuzzy
+msgid "Left"
 msgstr "Links beschneiden"
 
-#: src/wx/audio_mapping_view.cc:297
-msgid "Lfe"
-msgstr "LFE"
-
-#: src/wx/colour_conversion_editor.cc:49
-msgid "Linearise input gamma curve for low values"
+#: src/wx/colour_conversion_editor.cc:50
+#, fuzzy
+msgid "Linearise input gamma curve for small values"
 msgstr "Linearisiere Eingangs Gamma für niedrige Werte"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
 msgstr "Lade aus Datei..."
 
-#: src/wx/config_dialog.cc:607 src/wx/config_dialog.cc:620
-#: src/wx/config_dialog.cc:633
+#: src/wx/config_dialog.cc:616 src/wx/config_dialog.cc:624
+#: src/wx/config_dialog.cc:632
 #, fuzzy
 msgid "Load..."
 msgstr "Hinzufügen..."
 
-#: src/wx/config_dialog.cc:1136
+#: src/wx/config_dialog.cc:1141
 msgid "Log"
 msgstr "Log"
 
-#: src/wx/config_dialog.cc:1133
+#: src/wx/config_dialog.cc:1138
 msgid "Log:"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:301
-msgid "Ls"
-msgstr "SL"
-
-#: src/wx/content_panel.cc:461
+#: src/wx/content_panel.cc:462 src/wx/content_panel.cc:491
 msgid "MISSING: "
 msgstr "FEHLT:"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:980
 msgid "Mail password"
 msgstr "Mail Passwort"
 
-#: src/wx/config_dialog.cc:982
+#: src/wx/config_dialog.cc:976
 msgid "Mail user name"
 msgstr "Mail/SMTP Server Benutzername/Login"
 
@@ -821,28 +813,28 @@ msgstr "Zertifikat Datei auswählen"
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr "Zielhelligkeit (z.B. '4fL' für 3D)"
 
-#: src/wx/colour_conversion_editor.cc:92
+#: src/wx/colour_conversion_editor.cc:109
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:1120
+#: src/wx/config_dialog.cc:1125
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximale JPEG2000 Datenrate (Vorsicht!)"
 
-#: src/wx/config_dialog.cc:293 src/wx/config_dialog.cc:1124
-#: src/wx/dcp_panel.cc:574
+#: src/wx/config_dialog.cc:347 src/wx/config_dialog.cc:1129
+#: src/wx/dcp_panel.cc:616
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/content_panel.cc:82
+#: src/wx/content_panel.cc:87
 msgid "Move the selected piece of content earlier in the film."
 msgstr ""
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:91
 msgid "Move the selected piece of content later in the film."
 msgstr ""
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:345
 msgid "Multiple content selected"
 msgstr "Mehrere Inhalte ausgewählt"
 
@@ -854,13 +846,12 @@ msgstr "Meine Dokumente"
 msgid "My problem is"
 msgstr ""
 
-#: src/wx/content_panel.cc:465
+#: src/wx/content_panel.cc:495
 msgid "NEEDS KDM: "
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:505
-#: src/wx/dcp_panel.cc:56 src/wx/preset_colour_conversion_dialog.cc:38
-#: src/wx/screen_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/dcp_panel.cc:61
+#: src/wx/preset_colour_conversion_dialog.cc:38 src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Name"
 
@@ -868,17 +859,17 @@ msgstr "Name"
 msgid "New Film"
 msgstr "Neues Projekt"
 
-#: src/wx/update_dialog.cc:36
+#: src/wx/update_dialog.cc:37
 msgid "New versions of DCP-o-matic are available."
 msgstr "Eine neue Version von DCP-o-matic ist verfügbar."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:312
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Der Ton von Kanal %d wird nicht an das DCP Kanal %d weitergegeben."
 
-#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:166
-#: src/wx/video_panel.cc:258 src/wx/video_panel.cc:267
+#: src/wx/dcp_panel.cc:672 src/wx/video_panel.cc:172 src/wx/video_panel.cc:186
+#: src/wx/video_panel.cc:289
 msgid "None"
 msgstr "Kein"
 
@@ -886,11 +877,11 @@ msgstr "Kein"
 msgid "Off"
 msgstr "Aus"
 
-#: src/wx/config_dialog.cc:1154
+#: src/wx/config_dialog.cc:1159
 msgid "Open console window"
 msgstr ""
 
-#: src/wx/content_panel.cc:90
+#: src/wx/content_panel.cc:95
 msgid "Open the timeline for the film."
 msgstr ""
 
@@ -906,11 +897,11 @@ msgstr ""
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:978
+#: src/wx/config_dialog.cc:972
 msgid "Outgoing mail server"
 msgstr "Ausgehender/SMTP Mail Server"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:62
 #, fuzzy
 msgid "Outline content"
 msgstr "Mehrere Inhalte ausgewählt"
@@ -919,31 +910,41 @@ msgstr "Mehrere Inhalte ausgewählt"
 msgid "Output"
 msgstr "Ausgabe"
 
-#: src/wx/colour_conversion_editor.cc:103
+#: src/wx/colour_conversion_editor.cc:184
 msgid "Output gamma"
 msgstr "Ziel Gamma"
 
+#: src/wx/colour_conversion_editor.cc:182
+#, fuzzy
+msgid "Output gamma correction"
+msgstr "Ziel Gamma"
+
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "DCP Paket Typ (z.B. OV)"
 
-#: src/wx/config_dialog.cc:898
+#: src/wx/config_dialog.cc:894
 msgid "Password"
 msgstr "Passwort"
 
-#: src/wx/job_manager_view.cc:71 src/wx/job_manager_view.cc:160
+#: src/wx/job_manager_view.cc:64 src/wx/job_manager_view.cc:133
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:74
 msgid "Peak"
 msgstr "Spitze"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/audio_dialog.cc:245
+#, c-format
+msgid "Peak is %.2fdB at %s"
+msgstr ""
+
+#: src/wx/film_viewer.cc:68
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/wx/timing_panel.cc:55
+#: src/wx/timing_panel.cc:88
 msgid "Play length"
 msgstr "Abspiellänge"
 
@@ -953,11 +954,11 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:86
+#: src/wx/audio_plot.cc:85
 msgid "Please wait; audio is being analysed..."
 msgstr "Bitte warten; Ton wird analysiert..."
 
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:76
 msgid "Position"
 msgstr "Startposition"
 
@@ -965,49 +966,67 @@ msgstr "Startposition"
 msgid "Pre-release"
 msgstr "Vorabversion"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:628
 msgid "Private key for decrypting DCPs"
 msgstr ""
 
-#: src/wx/config_dialog.cc:599
+#: src/wx/config_dialog.cc:610
 msgid "Private key for leaf certificate"
 msgstr ""
 
-#: src/wx/audio_panel.cc:89
-msgid "Process with"
+#: src/wx/dcp_panel.cc:670
+msgid "Processor"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:289
-msgid "R"
-msgstr "R"
+#: src/wx/content_menu.cc:60
+#, fuzzy
+msgid "Properties..."
+msgstr "Projekt Eigenschaften"
+
+#: src/wx/colour_conversion_editor.cc:105
+#, fuzzy
+msgid "RGB to XYZ conversion"
+msgstr "Farbumwandlung"
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/audio_dialog.cc:75
 msgid "RMS"
 msgstr "RMS"
 
+#: src/wx/key_dialog.cc:48
+msgid "Random"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Freigabe (z.B. FSK12)"
 
-#: src/wx/audio_mapping_view.cc:321
-msgid "Rc"
-msgstr "Rc"
-
-#: src/wx/content_menu.cc:56
+#: src/wx/content_menu.cc:61
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:595
+#: src/wx/config_dialog.cc:606
 #, fuzzy
 msgid "Re-make certificates..."
 msgstr "Lade Zertifikat"
 
+#: src/wx/colour_conversion_editor.cc:98
+msgid "Rec. 601"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:99
+msgid "Rec. 709"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:62
 msgid "Red band"
 msgstr "Red band (USA, für explizite Inhalte)"
 
-#: src/wx/config_dialog.cc:586 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:77 src/wx/editable_list.h:68
+#: src/wx/colour_conversion_editor.cc:112
+msgid "Red chromaticity"
+msgstr ""
+
+#: src/wx/config_dialog.cc:596 src/wx/content_menu.cc:64
+#: src/wx/content_panel.cc:82 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1019,7 +1038,7 @@ msgstr "Kino entfernen"
 msgid "Remove Screen"
 msgstr "Saal entfernen"
 
-#: src/wx/content_panel.cc:78
+#: src/wx/content_panel.cc:83
 msgid "Remove the selected piece of content from the film."
 msgstr ""
 
@@ -1031,7 +1050,7 @@ msgstr "Wiederholen"
 msgid "Repeat Content"
 msgstr "Inhalt wiederholen"
 
-#: src/wx/content_menu.cc:53
+#: src/wx/content_menu.cc:57
 msgid "Repeat..."
 msgstr "Wiederhole..."
 
@@ -1039,27 +1058,28 @@ msgstr "Wiederhole..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1016
+#: src/wx/config_dialog.cc:1010
 msgid "Reset to default text"
 msgstr "Auf Standardtext zurücksetzen"
 
-#: src/wx/dcp_panel.cc:564
+#: src/wx/dcp_panel.cc:606
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: src/wx/job_manager_view.cc:163
+#: src/wx/job_manager_view.cc:136
 msgid "Resume"
 msgstr "Weiter"
 
-#: src/wx/audio_mapping_view.cc:364
+#: src/wx/video_panel.cc:106
+#, fuzzy
+msgid "Right"
+msgstr "Rechts beschneiden"
+
+#: src/wx/audio_mapping_view.cc:320
 msgid "Right click to change gain."
 msgstr "Rechtsklick für Pegeländerung"
 
-#: src/wx/video_panel.cc:103
-msgid "Right crop"
-msgstr "Rechts beschneiden"
-
-#: src/wx/config_dialog.cc:710
+#: src/wx/config_dialog.cc:708
 msgid "Root"
 msgstr ""
 
@@ -1067,40 +1087,32 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:305
-msgid "Rs"
-msgstr "SR"
-
-#: src/wx/dcp_panel.cc:122
+#: src/wx/dcp_panel.cc:149
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:148
+#: src/wx/video_panel.cc:151
 msgid "Scale to"
 msgstr "Skaliere auf"
 
-#: src/wx/dcp_panel.cc:579
-msgid "Scaler"
-msgstr "Skalierverfahren"
-
 #: src/wx/kdm_dialog.cc:60
 msgid "Screens"
 msgstr "Saal"
 
-#: src/wx/kdm_dialog.cc:529
+#: src/wx/kdm_dialog.cc:531
 msgid "Select CPL XML file"
 msgstr "CPL XML Datei auswählen"
 
-#: src/wx/config_dialog.cc:666 src/wx/config_dialog.cc:782
-#: src/wx/config_dialog.cc:827 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:664 src/wx/config_dialog.cc:780
+#: src/wx/config_dialog.cc:825 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Zertifikat Datei auswählen"
 
-#: src/wx/content_menu.cc:266
+#: src/wx/content_menu.cc:312
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:756 src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:754 src/wx/config_dialog.cc:802
 #, fuzzy
 msgid "Select Key File"
 msgstr "Zertifikat Datei auswählen"
@@ -1129,32 +1141,33 @@ msgstr "Server Hersteller"
 msgid "Server serial number"
 msgstr "Server Seriennummer"
 
-#: src/wx/config_dialog.cc:431
+#: src/wx/config_dialog.cc:488
 msgid "Servers"
 msgstr "Encoding Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:64
+#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:97
 msgid "Set"
 msgstr "Setzen"
 
-#: src/wx/fonts_dialog.cc:57
+#: src/wx/fonts_dialog.cc:58
 #, fuzzy
 msgid "Set file..."
 msgstr "Datei(en) hinzufügen..."
 
-#: src/wx/config_dialog.cc:99
+#: src/wx/config_dialog.cc:153
 msgid "Set language"
 msgstr "Sprache setzen"
 
-#: src/wx/audio_panel.cc:51
-msgid "Show Audio..."
+#: src/wx/dcp_panel.cc:679
+#, fuzzy
+msgid "Show audio..."
 msgstr "Ton anzeigen..."
 
-#: src/wx/dcp_panel.cc:95
+#: src/wx/dcp_panel.cc:106
 msgid "Signed"
 msgstr "Signiert"
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:85
 msgid "Smoothing"
 msgstr "Glätten"
 
@@ -1162,11 +1175,11 @@ msgstr "Glätten"
 msgid "Snap"
 msgstr "Auf Objekte einrasten"
 
-#: src/wx/update_dialog.cc:43
+#: src/wx/update_dialog.cc:45
 msgid "Stable version "
 msgstr "Stabile Version"
 
-#: src/wx/dcp_panel.cc:103
+#: src/wx/dcp_panel.cc:129
 msgid "Standard"
 msgstr "Standard"
 
@@ -1174,7 +1187,7 @@ msgstr "Standard"
 msgid "Start"
 msgstr ""
 
-#: src/wx/audio_panel.cc:84 src/wx/subtitle_panel.cc:93
+#: src/wx/subtitle_panel.cc:93
 msgid "Stream"
 msgstr "Spur"
 
@@ -1182,7 +1195,7 @@ msgstr "Spur"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (z.B. TCF)"
 
-#: src/wx/config_dialog.cc:997
+#: src/wx/config_dialog.cc:991
 msgid "Subject"
 msgstr ""
 
@@ -1199,15 +1212,15 @@ msgstr "Untertitel Sprache (z.B. EN)"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:174
+#: src/wx/about_dialog.cc:187
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
-#: src/wx/config_dialog.cc:868
+#: src/wx/config_dialog.cc:865
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:890
+#: src/wx/config_dialog.cc:886
 msgid "Target path"
 msgstr "Zielpfad"
 
@@ -1219,15 +1232,15 @@ msgstr "Test Version"
 msgid "Territory (e.g. UK)"
 msgstr "Gebiet (z.B. UK)"
 
-#: src/wx/update_dialog.cc:48
+#: src/wx/update_dialog.cc:51
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:220
+#: src/wx/about_dialog.cc:235
 msgid "Tested by"
 msgstr "Getestet von"
 
-#: src/wx/content_menu.cc:252
+#: src/wx/content_menu.cc:298
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1237,15 +1250,15 @@ msgstr ""
 "Entweder nochmals mit den richtigen Inhaltsdateien probieren oder Fehlende "
 "löschen."
 
-#: src/wx/hints_dialog.cc:154
+#: src/wx/hints_dialog.cc:178
 msgid "There are no hints: everything looks good!"
 msgstr "Keine Warnungen: Alles sieht gut aus!"
 
-#: src/wx/film_viewer.cc:144
+#: src/wx/film_viewer.cc:143
 msgid "There is not enough free memory to do that."
 msgstr "Für diese Operation ist nicht genug freier Speicher verfügbar."
 
-#: src/wx/kdm_dialog.cc:554
+#: src/wx/kdm_dialog.cc:556
 msgid "This is not a valid CPL file"
 msgstr "Dies ist keine gültige CPL Datei"
 
@@ -1253,15 +1266,15 @@ msgstr "Dies ist keine gültige CPL Datei"
 msgid "Threads"
 msgstr "Threads"
 
-#: src/wx/config_dialog.cc:118
+#: src/wx/config_dialog.cc:172
 msgid "Threads to use for encoding on this host"
 msgstr "Auf diesem Rechner zu benutzende CPU-Threads"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:580
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:165
+#: src/wx/audio_plot.cc:164
 msgid "Time"
 msgstr "Zeit"
 
@@ -1269,36 +1282,36 @@ msgstr "Zeit"
 msgid "Timeline"
 msgstr "Zeitleiste"
 
-#: src/wx/content_panel.cc:89
+#: src/wx/content_panel.cc:94
 msgid "Timeline..."
 msgstr "Zeitleiste..."
 
-#: src/wx/timing_panel.cc:38
+#: src/wx/timing_panel.cc:37
 msgid "Timing|Timing"
 msgstr "Trimmen"
 
-#: src/wx/video_panel.cc:115
-msgid "Top crop"
-msgstr "Oben beschneiden"
+#: src/wx/video_panel.cc:118
+msgid "Top"
+msgstr ""
 
-#: src/wx/about_dialog.cc:111
+#: src/wx/about_dialog.cc:112
 msgid "Translated by"
 msgstr "Übersetzt von"
 
-#: src/wx/timing_panel.cc:52
+#: src/wx/timing_panel.cc:85
 msgid "Trim from end"
 msgstr "Schnitt vom Ende"
 
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:82
 msgid "Trim from start"
 msgstr "Schnitt vom Anfang"
 
-#: src/wx/audio_dialog.cc:55 src/wx/config_dialog.cc:562
-#: src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:68 src/wx/config_dialog.cc:572
+#: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Typ"
 
-#: src/wx/dolby_certificate_dialog.cc:182
+#: src/wx/dolby_certificate_dialog.cc:183
 msgid "Unexpected certificate filename form"
 msgstr "Ungültige Zertifikats-Datei"
 
@@ -1310,27 +1323,27 @@ msgstr "Unbekannt"
 msgid "Until"
 msgstr "Bis"
 
-#: src/wx/content_panel.cc:81
+#: src/wx/content_panel.cc:86
 msgid "Up"
 msgstr "Nach oben"
 
-#: src/wx/update_dialog.cc:27
+#: src/wx/update_dialog.cc:28
 msgid "Update"
 msgstr "Update"
 
-#: src/wx/dcp_panel.cc:66
+#: src/wx/dcp_panel.cc:71
 msgid "Use ISDCF name"
 msgstr "ISDCF Name benutzen"
 
-#: src/wx/config_dialog.cc:445
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Alle verfügbaren Server im Subnetz benutzen"
 
-#: src/wx/dcp_panel.cc:550
+#: src/wx/dcp_panel.cc:592
 msgid "Use best"
 msgstr "Beste benutzen"
 
-#: src/wx/content_colour_conversion_dialog.cc:42
+#: src/wx/content_colour_conversion_dialog.cc:43
 msgid "Use preset"
 msgstr "Preset benutzen"
 
@@ -1339,35 +1352,50 @@ msgstr "Preset benutzen"
 msgid "Use subtitles"
 msgstr "Untertitel"
 
-#: src/wx/config_dialog.cc:894
+#: src/wx/config_dialog.cc:890
 msgid "User name"
 msgstr "Benutzer Name"
 
-#: src/wx/audio_mapping_view.cc:313
-msgid "VI"
-msgstr "VI"
-
-#: src/wx/dcp_panel.cc:92 src/wx/video_panel.cc:70
+#: src/wx/dcp_panel.cc:103 src/wx/video_panel.cc:71
 msgid "Video"
 msgstr "Bild"
 
-#: src/wx/timing_panel.cc:60
+#: src/wx/content_properties_dialog.cc:51 src/wx/timing_panel.cc:93
 msgid "Video frame rate"
 msgstr "Bildwiederholrate"
 
+#: src/wx/content_properties_dialog.cc:43
+#, fuzzy
+msgid "Video length"
+msgstr "Gesamtlänge"
+
+#: src/wx/content_properties_dialog.cc:47
+#, fuzzy
+msgid "Video size"
+msgstr "Bild"
+
 #: src/wx/subtitle_panel.cc:97
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1144
+#: src/wx/config_dialog.cc:1149
 msgid "Warnings"
 msgstr "Warnungen"
 
+#: src/wx/colour_conversion_editor.cc:133
+#, fuzzy
+msgid "White point"
+msgstr "Speichern nach"
+
+#: src/wx/colour_conversion_editor.cc:157
+msgid "White point adjustment"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:172
 msgid "Write to"
 msgstr "Speichern nach"
 
-#: src/wx/about_dialog.cc:95
+#: src/wx/about_dialog.cc:96
 msgid "Written by"
 msgstr "Geschrieben von"
 
@@ -1389,13 +1417,22 @@ msgstr "Vertikale Verschiebung"
 msgid "Y Scale"
 msgstr "Größe"
 
-#: src/wx/hints_dialog.cc:147
+#: src/wx/colour_conversion_editor.cc:94
+#, fuzzy
+msgid "YUV to RGB conversion"
+msgstr "Farbumwandlung"
+
+#: src/wx/colour_conversion_editor.cc:96
+msgid "YUV to RGB matrix"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:171
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:133
+#: src/wx/hints_dialog.cc:157
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1404,7 +1441,16 @@ msgstr ""
 "Sie haben %d Dateien die wie VOB Dateien einer DVD aussehen. Sie sollten sie "
 "verbinden um einen sanften Übergang zwischen den Dateien zu haben."
 
-#: src/wx/hints_dialog.cc:114
+#: src/wx/hints_dialog.cc:92
+#, fuzzy
+msgid ""
+"You have specified a font file which is larger than 640kB.  This is very "
+"likely to cause problems on playback."
+msgstr ""
+"Ihr DCP hat eine ungerade Anzahl an Tonkanälen. Das wird wahrscheinlich zu "
+"Abspielproblemen führen."
+
+#: src/wx/hints_dialog.cc:138
 #, c-format
 msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
@@ -1414,7 +1460,7 @@ msgstr ""
 "Probleme verursachen. Um auf der sicheren Seite zu sein sollten Sie 24 oder "
 "48 Bilder/s benutzen."
 
-#: src/wx/hints_dialog.cc:72
+#: src/wx/hints_dialog.cc:97
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
@@ -1422,7 +1468,7 @@ msgstr ""
 "Ihr DCP hat eine ungerade Anzahl an Tonkanälen. Das wird wahrscheinlich zu "
 "Abspielproblemen führen."
 
-#: src/wx/hints_dialog.cc:76
+#: src/wx/hints_dialog.cc:101
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
@@ -1430,7 +1476,7 @@ msgstr ""
 "Ihr DCP hat weniger als 6 Audiokanäle. Das kann auf manchen Projektoren zu "
 "Problemen führen."
 
-#: src/wx/hints_dialog.cc:81
+#: src/wx/hints_dialog.cc:106
 #, fuzzy
 msgid ""
 "Your DCP has no audio channels.  This is likely to cause problems on "
@@ -1439,44 +1485,134 @@ msgstr ""
 "Ihr DCP hat eine ungerade Anzahl an Tonkanälen. Das wird wahrscheinlich zu "
 "Abspielproblemen führen."
 
-#: src/wx/timeline.cc:229
+#: src/wx/timeline_audio_content_view.cc:37
 msgid "audio"
 msgstr "Ton"
 
-#: src/wx/properties_dialog.cc:46
-msgid "counting..."
-msgstr "zähle..."
-
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
 msgid "dB"
 msgstr "dB"
 
+#. // TRANSLATORS: this is an abbreviation for "frames"
+#: src/wx/timing_panel.cc:68
+msgid "f"
+msgstr ""
+
+#: src/wx/content_properties_dialog.cc:52
+#, fuzzy
+msgid "frames per second"
+msgstr "Bilder bereits bearbeitet"
+
+#. // TRANSLATORS: this is an abbreviation for "hours"
+#: src/wx/timing_panel.cc:46
+msgid "h"
+msgstr ""
+
+#. // TRANSLATORS: this is an abbreviation for "minutes"
+#: src/wx/timing_panel.cc:54
+#, fuzzy
+msgid "m"
+msgstr "ms"
+
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:302
+#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:356
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:264
+#. // TRANSLATORS: this is an abbreviation for "seconds"
+#: src/wx/config_dialog.cc:318 src/wx/timing_panel.cc:61
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:258
+#: src/wx/timeline_video_content_view.cc:36
 msgid "still"
 msgstr "Standbild"
 
-#: src/wx/timeline.cc:289
+#: src/wx/timeline_subtitle_content_view.cc:35
 #, fuzzy
 msgid "subtitles"
 msgstr "Untertitel"
 
+#: src/wx/colour_conversion_editor.cc:64
+msgid "threshold"
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr "mal"
 
-#: src/wx/timeline.cc:260
+#: src/wx/timeline_video_content_view.cc:38
 msgid "video"
 msgstr "Bild"
 
+#: src/wx/content_properties_dialog.cc:44
+#, fuzzy
+msgid "video frames"
+msgstr "Bildwiederholrate"
+
+#: src/wx/colour_conversion_editor.cc:107
+msgid "x"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:108
+msgid "y"
+msgstr ""
+
+#~ msgid "BsL"
+#~ msgstr "BsL"
+
+#~ msgid "BsR"
+#~ msgstr "BsR"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Calculate digests"
+#~ msgstr "Berechne..."
+
+#~ msgid "Colour Conversions"
+#~ msgstr "Farbumwandlungen"
+
+#~ msgid "DCP Name"
+#~ msgstr "DCP Name"
+
+#~ msgid "HI"
+#~ msgstr "HI"
+
+#~ msgid "L"
+#~ msgstr "L"
+
+#~ msgid "Lc"
+#~ msgstr "Lc"
+
+#~ msgid "Lfe"
+#~ msgstr "LFE"
+
+#~ msgid "Ls"
+#~ msgstr "SL"
+
+#~ msgid "R"
+#~ msgstr "R"
+
+#~ msgid "Rc"
+#~ msgstr "Rc"
+
+#~ msgid "Rs"
+#~ msgstr "SR"
+
+#~ msgid "Scaler"
+#~ msgstr "Skalierverfahren"
+
+#~ msgid "Top crop"
+#~ msgstr "Oben beschneiden"
+
+#~ msgid "VI"
+#~ msgstr "VI"
+
+#~ msgid "counting..."
+#~ msgstr "zähle..."
+
 #~ msgid "Bad setting for %s (%s)"
 #~ msgstr "Falsche Einstellung für %s (%s)"
 
@@ -1489,9 +1625,6 @@ msgstr "Bild"
 #~ msgid "Hz"
 #~ msgstr "Hz"
 
-#~ msgid "channels"
-#~ msgstr "Kanäle"
-
 #~ msgid "Default creator"
 #~ msgstr "Standard 'creator' (DCI)"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 6113cbe19..394aed492 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/wx/key_dialog.cc:44
 msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-10-24 23:00-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -30,11 +31,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:990
+#: src/wx/config_dialog.cc:984
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(claves guardadas como texto plano en el disco)"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:165
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 
@@ -44,11 +45,11 @@ 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:107
+#: src/wx/colour_conversion_editor.cc:188
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
 
@@ -56,46 +57,56 @@ msgstr "2D"
 msgid "2D version of content available in 3D"
 msgstr "Versión 2D de contenido disponible en 3D"
 
-#: src/wx/dcp_panel.cc:612
+#: src/wx/dcp_panel.cc:645
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:560
+#: src/wx/dcp_panel.cc:602
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:222
 msgid "3D alternate"
 msgstr "3D alterno"
 
-#: src/wx/video_panel.cc:203
+#: src/wx/video_panel.cc:223
 msgid "3D left only"
 msgstr "3D sólo izquierda"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:220
 msgid "3D left/right"
 msgstr "3D izquierda/derecha"
 
-#: src/wx/video_panel.cc:204
+#: src/wx/video_panel.cc:224
 msgid "3D right only"
 msgstr "3D sólo derecha"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:221
 msgid "3D top/bottom"
 msgstr "3D arriba/abajo"
 
-#: src/wx/dcp_panel.cc:613
+#: src/wx/dcp_panel.cc:646
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/hints_dialog.cc:120
+#: src/wx/timing_panel.cc:109
+msgid ""
+"<i>Only change this if it the content's frame rate has been read incorrectly."
+"</i>"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "A"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:144
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/wx/update_dialog.cc:34
+#: src/wx/update_dialog.cc:35
 msgid "A new version of DCP-o-matic is available."
 msgstr "Una nueva versión de DCP-o-matic está disponible."
 
@@ -107,7 +118,7 @@ msgstr "Acerca de DCP-o-matic"
 msgid "Add Cinema..."
 msgstr "Añadir cine..."
 
-#: src/wx/content_menu.cc:57
+#: src/wx/content_menu.cc:62
 msgid "Add KDM..."
 msgstr "Añadir KDM..."
 
@@ -115,34 +126,38 @@ msgstr "Añadir KDM..."
 msgid "Add Screen..."
 msgstr "Añadir pantalla..."
 
-#: src/wx/content_panel.cc:74
+#: src/wx/content_panel.cc:79
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
 msgstr ""
 
-#: src/wx/content_panel.cc:69
+#: src/wx/content_panel.cc:74
 msgid "Add file(s)..."
 msgstr "Añadir fichero(s)..."
 
-#: src/wx/content_panel.cc:73
+#: src/wx/content_panel.cc:78
 msgid "Add folder..."
 msgstr "Añadir carpeta..."
 
-#: src/wx/image_sequence_dialog.cc:27
+#: src/wx/image_sequence_dialog.cc:25
 #, fuzzy
 msgid "Add image sequence"
 msgstr "Mantener el video secuencia"
 
-#: src/wx/content_panel.cc:70
+#: src/wx/content_panel.cc:75
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:584 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:594 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/wx/hints_dialog.cc:108
+#: src/wx/colour_conversion_editor.cc:159
+msgid "Adjust white point to"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:132
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -154,7 +169,7 @@ msgstr ""
 "Flat (1.85:1). Puede que prefieras seleccionar el contenedor DCP en Flat "
 "(1.85:1) en la pestaña \"DCP\"."
 
-#: src/wx/hints_dialog.cc:102
+#: src/wx/hints_dialog.cc:126
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -166,15 +181,15 @@ msgstr ""
 "Scope (2.39:1). Puede que prefieras seleccionar el contenedor DCP en Scope "
 "(2.39:1) en la pestaña \"DCP\"."
 
-#: src/wx/config_dialog.cc:1128
+#: src/wx/config_dialog.cc:1133
 msgid "Allow any DCP frame rate"
 msgstr "Permitir cualquier velocidad de DCP"
 
-#: src/wx/about_dialog.cc:115
+#: src/wx/about_dialog.cc:116
 msgid "Artwork by"
 msgstr "Grafismo de"
 
-#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:93
+#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:104
 msgid "Audio"
 msgstr "Audio"
 
@@ -182,40 +197,46 @@ msgstr "Audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
-#: src/wx/audio_mapping_view.cc:358
+#: src/wx/content_properties_dialog.cc:61
+msgid "Audio channels"
+msgstr "Canales de audio"
+
+#: src/wx/audio_mapping_view.cc:314
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr "El audio del canal %d pasará al canal %d del DCP sin modificar."
 
-#: src/wx/audio_mapping_view.cc:361
+#: src/wx/audio_mapping_view.cc:317
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
 "%.1fdB."
 msgstr "El audio del canal %d pasará al canal %d del DCP con ganancia %.1fdB."
 
-#: src/wx/config_dialog.cc:1009
+#: src/wx/colour_conversion_editor.cc:70
+#, fuzzy
+msgid "B"
+msgstr "dB"
+
+#: src/wx/config_dialog.cc:1003
 msgid "BCC address"
 msgstr "Dirección CCO"
 
-#: src/wx/video_panel.cc:125
-msgid "Bottom crop"
+#: src/wx/colour_conversion_editor.cc:126
+msgid "Blue chromaticity"
+msgstr ""
+
+#: src/wx/video_panel.cc:128
+#, fuzzy
+msgid "Bottom"
 msgstr "Recortar abajo"
 
 #: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Explorar..."
 
-#: src/wx/audio_mapping_view.cc:325
-msgid "BsL"
-msgstr "BsL"
-
-#: src/wx/audio_mapping_view.cc:329
-msgid "BsR"
-msgstr "BsR"
-
-#: src/wx/dcp_panel.cc:556
+#: src/wx/dcp_panel.cc:598
 msgid "Burn subtitles into image"
 msgstr "Grabar subtítulos en la imagen"
 
@@ -223,18 +244,7 @@ msgstr "Grabar subtítulos en la imagen"
 msgid "But I have to use fader"
 msgstr "pero tengo que usar el fader a"
 
-#: src/wx/image_sequence_dialog.cc:33
-msgid ""
-"By default DCP-o-matic will calculate digests (hashes) of your image files "
-"so that it knows if they change.  Turning this off will speed up import but "
-"you must not alter the image files after import or strange things may happen."
-msgstr ""
-
-#: src/wx/audio_mapping_view.cc:293
-msgid "C"
-msgstr "C"
-
-#: src/wx/config_dialog.cc:1005
+#: src/wx/config_dialog.cc:999
 msgid "CC address"
 msgstr "Dirección CC"
 
@@ -250,16 +260,11 @@ msgstr "Identificador CPL"
 msgid "CPL annotation text"
 msgstr "Texto de anotación DCP"
 
-#: src/wx/image_sequence_dialog.cc:31
-#, fuzzy
-msgid "Calculate digests"
-msgstr "Calcular..."
-
-#: src/wx/audio_panel.cc:66
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Calcular..."
 
-#: src/wx/job_manager_view.cc:66
+#: src/wx/job_manager_view.cc:59
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -267,16 +272,16 @@ msgstr "Cancelar"
 msgid "Certificate"
 msgstr "Certificado"
 
-#: src/wx/config_dialog.cc:551
+#: src/wx/config_dialog.cc:561
 msgid "Certificate chain for signing DCPs and KDMs:"
 msgstr "Cadena de certificados para firmar DCPs y KDMs:"
 
-#: src/wx/dolby_certificate_dialog.cc:191
-#: src/wx/doremi_certificate_dialog.cc:103
+#: src/wx/dolby_certificate_dialog.cc:192
+#: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Certificado descargado"
 
-#: src/wx/config_dialog.cc:612
+#: src/wx/config_dialog.cc:620
 msgid "Certificate for decrypting DCPs"
 msgstr "Certificado para desencriptar DCPs"
 
@@ -288,31 +293,31 @@ msgstr "Cadena"
 msgid "Channel gain"
 msgstr "Ganancia del canal"
 
-#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:628
+#: src/wx/audio_dialog.cc:56 src/wx/dcp_panel.cc:662
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:180
 msgid "Check for testing updates as well as stable ones"
 msgstr "Buscar actualizaciones de prueba y estables"
 
-#: src/wx/config_dialog.cc:122
+#: src/wx/config_dialog.cc:176
 msgid "Check for updates on startup"
 msgstr "Buscar actualizaciones al iniciar"
 
-#: src/wx/content_menu.cc:198
+#: src/wx/content_menu.cc:244
 msgid "Choose a file"
 msgstr "Elige un fichero"
 
-#: src/wx/content_panel.cc:237
+#: src/wx/content_panel.cc:242
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:260
+#: src/wx/content_menu.cc:237 src/wx/content_panel.cc:264
 msgid "Choose a folder"
 msgstr "Elige una carpeta"
 
-#: src/wx/fonts_dialog.cc:116
+#: src/wx/fonts_dialog.cc:120
 #, fuzzy
 msgid "Choose a font file"
 msgstr "Elige un fichero"
@@ -321,16 +326,12 @@ msgstr "Elige un fichero"
 msgid "Cinema"
 msgstr "Cine"
 
-#: src/wx/config_dialog.cc:491
-msgid "Colour Conversions"
-msgstr "Conversiones de color"
-
-#: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:172
+#: src/wx/content_colour_conversion_dialog.cc:35
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:181
 msgid "Colour conversion"
 msgstr "Conversión de color"
 
-#: src/wx/config_dialog.cc:1148
+#: src/wx/config_dialog.cc:1153
 msgid "Config|Timing"
 msgstr "Configuración|Tiempo"
 
@@ -338,15 +339,20 @@ msgstr "Configuración|Tiempo"
 msgid "Contact email"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:537
+#: src/wx/dcp_panel.cc:573
 msgid "Container"
 msgstr "Continente"
 
-#: src/wx/audio_mapping_view.cc:278 src/wx/film_editor.cc:49
+#: src/wx/audio_mapping_view.cc:250 src/wx/film_editor.cc:49
 msgid "Content"
 msgstr "Contenido"
 
-#: src/wx/dcp_panel.cc:84
+#: src/wx/content_properties_dialog.cc:34
+#, fuzzy
+msgid "Content Properties"
+msgstr "Propiedades de la película"
+
+#: src/wx/dcp_panel.cc:95
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
@@ -354,7 +360,7 @@ msgstr "Tipo de contenido"
 msgid "Content version"
 msgstr "Versión del contenido"
 
-#: src/wx/dcp_panel.cc:73
+#: src/wx/dcp_panel.cc:78
 msgid "Copy as name"
 msgstr ""
 
@@ -362,32 +368,32 @@ msgstr ""
 msgid "Copy..."
 msgstr "Copiar..."
 
-#: src/wx/audio_dialog.cc:151
+#: src/wx/audio_dialog.cc:182
 msgid "Could not analyse audio."
 msgstr "No se pudo analizar el audio."
 
-#: src/wx/content_panel.cc:286
+#: src/wx/content_panel.cc:290
 #, fuzzy
-msgid "Could not find a DCP in that folder."
+msgid "Could not find a DCP nor a set of images in that folder."
 msgstr "No se pudieron encontrar imágenes ni un DCP en esta carpeta"
 
-#: src/wx/content_panel.cc:307
+#: src/wx/content_panel.cc:310
 #, fuzzy
 msgid "Could not find any images in that folder"
 msgstr "No se pudieron encontrar imágenes ni un DCP en esta carpeta"
 
-#: src/wx/film_viewer.cc:178
+#: src/wx/film_viewer.cc:181
 #, fuzzy, c-format
 msgid "Could not get video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
 
-#: src/wx/config_dialog.cc:675 src/wx/config_dialog.cc:770
-#: src/wx/config_dialog.cc:790 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:673 src/wx/config_dialog.cc:768
+#: src/wx/config_dialog.cc:788 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "No se pudo leer el fichero de certificado (%s)"
 
-#: src/wx/config_dialog.cc:762 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:760 src/wx/config_dialog.cc:810
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr "No se pudo leer el fichero de llave (%s)"
@@ -400,7 +406,11 @@ msgstr "País"
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:91
+msgid "Crop"
+msgstr ""
+
+#: src/wx/video_panel.cc:190
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -408,10 +418,6 @@ msgstr "Personalizado"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/dcp_panel.cc:79
-msgid "DCP Name"
-msgstr "Nombre DCP"
-
 #: src/wx/kdm_dialog.cc:140
 msgid "DCP directory"
 msgstr "Carpeta DCP"
@@ -420,52 +426,52 @@ msgstr "Carpeta DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:98
-#, c-format
-msgid "DCP-o-matic audio - %s"
+#: src/wx/audio_dialog.cc:108
+#, fuzzy
+msgid "DCP-o-matic audio"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:276
+#: src/wx/config_dialog.cc:330
 msgid "Default ISDCF name details"
 msgstr "Detalles por defecto del nombre ISDCF"
 
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:343
 msgid "Default JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 por defecto"
 
-#: src/wx/config_dialog.cc:298
+#: src/wx/config_dialog.cc:352
 msgid "Default audio delay"
 msgstr "Retardo de audio por defecto"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:334
 msgid "Default container"
 msgstr "Contenedor por defecto"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:338
 msgid "Default content type"
 msgstr "Tipo de contenido por defecto"
 
-#: src/wx/config_dialog.cc:268
+#: src/wx/config_dialog.cc:322
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:314
 msgid "Default duration of still images"
 msgstr "Duración por defecto de las imágenes fijas"
 
-#: src/wx/config_dialog.cc:306
+#: src/wx/config_dialog.cc:360
 msgid "Default issuer"
 msgstr "Emisor por defecto"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:296
 msgid "Defaults"
 msgstr "Por defecto"
 
-#: src/wx/audio_panel.cc:70
+#: src/wx/audio_panel.cc:64
 msgid "Delay"
 msgstr "Retardo"
 
-#: src/wx/dcp_panel.cc:71 src/wx/job_manager_view.cc:76
+#: src/wx/dcp_panel.cc:76 src/wx/job_manager_view.cc:69
 msgid "Details..."
 msgstr "Detalles..."
 
@@ -474,12 +480,12 @@ msgid "Disk space required"
 msgstr "Espacio requerido en disco"
 
 #: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
-#: src/wx/screen_dialog.cc:135
+#: src/wx/screen_dialog.cc:137
 msgid "Dolby"
 msgstr "Dolby"
 
 #: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
-#: src/wx/screen_dialog.cc:134
+#: src/wx/screen_dialog.cc:136
 msgid "Doremi"
 msgstr "Doremi"
 
@@ -487,11 +493,11 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Los números de serie de Doremi deben tener 6 cifras"
 
-#: src/wx/content_panel.cc:85
+#: src/wx/content_panel.cc:90
 msgid "Down"
 msgstr "Bajar"
 
-#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#: src/wx/download_certificate_dialog.cc:39 src/wx/screen_dialog.cc:47
 msgid "Download"
 msgstr "Descargar"
 
@@ -499,8 +505,8 @@ msgstr "Descargar"
 msgid "Download certificate"
 msgstr "Descargar certificado"
 
-#: src/wx/dolby_certificate_dialog.cc:157
-#: src/wx/doremi_certificate_dialog.cc:54
+#: src/wx/dolby_certificate_dialog.cc:158
+#: src/wx/doremi_certificate_dialog.cc:55
 msgid "Downloading certificate"
 msgstr "Descargando certificado"
 
@@ -512,8 +518,8 @@ msgstr "Editar cine..."
 msgid "Edit Screen..."
 msgstr "Editar pantalla..."
 
-#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:277
-#: src/wx/video_panel.cc:168 src/wx/video_panel.cc:176
+#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:331
+#: src/wx/dcp_panel.cc:123 src/wx/video_panel.cc:174 src/wx/video_panel.cc:193
 #: src/wx/editable_list.h:66
 msgid "Edit..."
 msgstr "Editar..."
@@ -526,7 +532,7 @@ msgstr "Remitente para los emails de KDM"
 msgid "Encoding Servers"
 msgstr "Servidores de codificación"
 
-#: src/wx/dcp_panel.cc:99
+#: src/wx/dcp_panel.cc:110
 msgid "Encrypted"
 msgstr "Encriptado"
 
@@ -534,11 +540,11 @@ msgstr "Encriptado"
 msgid "End"
 msgstr "Fin"
 
-#: src/wx/config_dialog.cc:1146
+#: src/wx/config_dialog.cc:1151
 msgid "Errors"
 msgstr "Errores"
 
-#: src/wx/config_dialog.cc:638
+#: src/wx/config_dialog.cc:636
 msgid "Export DCP decryption certificate..."
 msgstr "Exportar el certificado de desencriptación de DCP..."
 
@@ -546,11 +552,11 @@ msgstr "Exportar el certificado de desencriptación de DCP..."
 msgid "Facility (e.g. DLA)"
 msgstr "Compañía (ej. DLA)"
 
-#: src/wx/video_panel.cc:138
+#: src/wx/video_panel.cc:141
 msgid "Fade in"
 msgstr "Fundido de entrada"
 
-#: src/wx/video_panel.cc:143
+#: src/wx/video_panel.cc:146
 msgid "Fade out"
 msgstr "Fundido de salida"
 
@@ -560,6 +566,11 @@ msgstr "Fundido de salida"
 msgid "Fetching..."
 msgstr "Recuperando..."
 
+#: src/wx/content_properties_dialog.cc:38
+#, fuzzy
+msgid "Filename"
+msgstr "Nombre de la película"
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Propiedades de la película"
@@ -568,19 +579,19 @@ msgstr "Propiedades de la película"
 msgid "Film name"
 msgstr "Nombre de la película"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:165
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:168
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/wx/content_menu.cc:55
+#: src/wx/content_menu.cc:59
 msgid "Find missing..."
 msgstr "Buscar ausentes..."
 
-#: src/wx/fonts_dialog.cc:47
+#: src/wx/fonts_dialog.cc:48
 msgid "Font file"
 msgstr ""
 
-#: src/wx/fonts_dialog.cc:31
+#: src/wx/fonts_dialog.cc:32
 msgid "Fonts"
 msgstr ""
 
@@ -588,11 +599,11 @@ msgstr ""
 msgid "Fonts..."
 msgstr ""
 
-#: src/wx/dcp_panel.cc:543
+#: src/wx/dcp_panel.cc:584
 msgid "Frame Rate"
 msgstr "Velocidad"
 
-#: src/wx/image_sequence_dialog.cc:29
+#: src/wx/image_sequence_dialog.cc:27
 #, fuzzy
 msgid "Frame rate"
 msgstr "Velocidad"
@@ -601,12 +612,9 @@ msgstr "Velocidad"
 msgid "Frames"
 msgstr "Fotogramas"
 
-#: src/wx/properties_dialog.cc:45
-msgid "Frames already encoded"
-msgstr "Fotogramas ya codificados"
-
 #: src/wx/about_dialog.cc:65
-msgid "Free, open-source DCP generation from almost anything."
+#, fuzzy
+msgid "Free, open-source DCP creation from almost anything."
 msgstr ""
 "Generación de DCP a partir de casi cualquier cosa, libre y de código abierto."
 
@@ -614,7 +622,7 @@ msgstr ""
 msgid "From"
 msgstr "De"
 
-#: src/wx/config_dialog.cc:1001
+#: src/wx/config_dialog.cc:995
 msgid "From address"
 msgstr "De la dirección"
 
@@ -622,11 +630,11 @@ msgstr "De la dirección"
 msgid "Full"
 msgstr "Completo"
 
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:79
 msgid "Full length"
 msgstr "Duración completa"
 
-#: src/wx/audio_panel.cc:55
+#: src/wx/audio_panel.cc:49
 msgid "Gain"
 msgstr "Ganancia"
 
@@ -639,19 +647,19 @@ msgstr "Calculadora de ganancia"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Ganancia del canal %d en el canal %d del DCP"
 
-#: src/wx/properties_dialog.cc:51
+#: src/wx/properties_dialog.cc:48
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:1142
+#: src/wx/config_dialog.cc:1147
 msgid "General"
 msgstr "General"
 
-#: src/wx/audio_mapping_view.cc:309
-msgid "HI"
-msgstr "HI"
+#: src/wx/colour_conversion_editor.cc:119
+msgid "Green chromaticity"
+msgstr ""
 
-#: src/wx/hints_dialog.cc:31
+#: src/wx/hints_dialog.cc:34
 msgid "Hints"
 msgstr "Pistas"
 
@@ -667,15 +675,15 @@ msgstr "Nombre o dirección IP"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/fonts_dialog.cc:39
+#: src/wx/fonts_dialog.cc:40
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:886
+#: src/wx/config_dialog.cc:882
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/config_dialog.cc:449
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "Dirección IP / nombre"
 
@@ -683,27 +691,20 @@ msgstr "Dirección IP / nombre"
 msgid "ISDCF name"
 msgstr "Nombre ISDCF"
 
-#: src/wx/colour_conversion_editor.cc:68
-msgid "Input A value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:73
-msgid "Input B value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:53
+#: src/wx/colour_conversion_editor.cc:54
 msgid "Input gamma"
 msgstr "Gamma de entrada"
 
-#: src/wx/colour_conversion_editor.cc:58
-msgid "Input power"
-msgstr ""
+#: src/wx/colour_conversion_editor.cc:48
+#, fuzzy
+msgid "Input gamma correction"
+msgstr "Gamma de entrada"
 
-#: src/wx/colour_conversion_editor.cc:63
-msgid "Input threshold"
+#: src/wx/colour_conversion_editor.cc:59
+msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:714
+#: src/wx/config_dialog.cc:712
 msgid "Intermediate"
 msgstr "Intermedio"
 
@@ -711,19 +712,19 @@ msgstr "Intermedio"
 msgid "Intermediate common name"
 msgstr "Nombre común intermedio"
 
-#: src/wx/dcp_panel.cc:123
+#: src/wx/dcp_panel.cc:150
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/dcp_panel.cc:570
+#: src/wx/dcp_panel.cc:612
 msgid "JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/content_menu.cc:54
+#: src/wx/content_menu.cc:58
 msgid "Join"
 msgstr "Unir"
 
-#: src/wx/config_dialog.cc:953
+#: src/wx/config_dialog.cc:955
 msgid "KDM Email"
 msgstr "Email KDM"
 
@@ -739,24 +740,21 @@ msgstr "KDM|Tiempo"
 msgid "Keep video in sequence"
 msgstr "Mantener el video secuencia"
 
-#: src/wx/config_dialog.cc:535
-msgid "Keys"
+#: src/wx/dcp_panel.cc:119 src/wx/key_dialog.cc:26 src/wx/key_dialog.cc:28
+#, fuzzy
+msgid "Key"
 msgstr "Llaves"
 
-#: src/wx/audio_mapping_view.cc:285
-msgid "L"
-msgstr "L"
+#: src/wx/config_dialog.cc:548
+msgid "Keys"
+msgstr "Llaves"
 
 #: src/wx/subtitle_panel.cc:89
 #, fuzzy
 msgid "Language"
 msgstr "Seleccionar idioma"
 
-#: src/wx/audio_mapping_view.cc:317
-msgid "Lc"
-msgstr "Lc"
-
-#: src/wx/config_dialog.cc:712
+#: src/wx/config_dialog.cc:710
 msgid "Leaf"
 msgstr "Hoja"
 
@@ -764,48 +762,42 @@ msgstr "Hoja"
 msgid "Leaf common name"
 msgstr "Nombre común de hoja"
 
-#: src/wx/video_panel.cc:93
-msgid "Left crop"
+#: src/wx/video_panel.cc:96
+#, fuzzy
+msgid "Left"
 msgstr "Recorte izquierda"
 
-#: src/wx/audio_mapping_view.cc:297
-msgid "Lfe"
-msgstr "Lfe"
-
-#: src/wx/colour_conversion_editor.cc:49
-msgid "Linearise input gamma curve for low values"
+#: src/wx/colour_conversion_editor.cc:50
+#, fuzzy
+msgid "Linearise input gamma curve for small values"
 msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
 msgstr "Cargar de fichero..."
 
-#: src/wx/config_dialog.cc:607 src/wx/config_dialog.cc:620
-#: src/wx/config_dialog.cc:633
+#: src/wx/config_dialog.cc:616 src/wx/config_dialog.cc:624
+#: src/wx/config_dialog.cc:632
 msgid "Load..."
 msgstr "Cargar..."
 
-#: src/wx/config_dialog.cc:1136
+#: src/wx/config_dialog.cc:1141
 msgid "Log"
 msgstr "Registro"
 
-#: src/wx/config_dialog.cc:1133
+#: src/wx/config_dialog.cc:1138
 msgid "Log:"
 msgstr "Registro:"
 
-#: src/wx/audio_mapping_view.cc:301
-msgid "Ls"
-msgstr "Ls"
-
-#: src/wx/content_panel.cc:461
+#: src/wx/content_panel.cc:462 src/wx/content_panel.cc:491
 msgid "MISSING: "
 msgstr "FALTA:"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:980
 msgid "Mail password"
 msgstr "Clave del correo"
 
-#: src/wx/config_dialog.cc:982
+#: src/wx/config_dialog.cc:976
 msgid "Mail user name"
 msgstr "Usuario del correo"
 
@@ -822,28 +814,28 @@ msgstr "Crear cadena de certificados"
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr "Luminosidad de referencia (p.e. 14fl)"
 
-#: src/wx/colour_conversion_editor.cc:92
+#: src/wx/colour_conversion_editor.cc:109
 msgid "Matrix"
 msgstr "Matriz"
 
-#: src/wx/config_dialog.cc:1120
+#: src/wx/config_dialog.cc:1125
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 máximo"
 
-#: src/wx/config_dialog.cc:293 src/wx/config_dialog.cc:1124
-#: src/wx/dcp_panel.cc:574
+#: src/wx/config_dialog.cc:347 src/wx/config_dialog.cc:1129
+#: src/wx/dcp_panel.cc:616
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/content_panel.cc:82
+#: src/wx/content_panel.cc:87
 msgid "Move the selected piece of content earlier in the film."
 msgstr ""
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:91
 msgid "Move the selected piece of content later in the film."
 msgstr ""
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:345
 msgid "Multiple content selected"
 msgstr "Varios contenidos seleccionados"
 
@@ -855,13 +847,12 @@ msgstr "Mis documentos"
 msgid "My problem is"
 msgstr ""
 
-#: src/wx/content_panel.cc:465
+#: src/wx/content_panel.cc:495
 msgid "NEEDS KDM: "
 msgstr "NECESITA KDM:"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:505
-#: src/wx/dcp_panel.cc:56 src/wx/preset_colour_conversion_dialog.cc:38
-#: src/wx/screen_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/dcp_panel.cc:61
+#: src/wx/preset_colour_conversion_dialog.cc:38 src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nombre"
 
@@ -869,17 +860,17 @@ msgstr "Nombre"
 msgid "New Film"
 msgstr "Nueva película"
 
-#: src/wx/update_dialog.cc:36
+#: src/wx/update_dialog.cc:37
 msgid "New versions of DCP-o-matic are available."
 msgstr "Nuevas versiones disponibles de DCP-o-matic."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:312
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "No pasará audio del canal de origen %d al canal %d del DCP."
 
-#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:166
-#: src/wx/video_panel.cc:258 src/wx/video_panel.cc:267
+#: src/wx/dcp_panel.cc:672 src/wx/video_panel.cc:172 src/wx/video_panel.cc:186
+#: src/wx/video_panel.cc:289
 msgid "None"
 msgstr "Ninguno"
 
@@ -887,11 +878,11 @@ msgstr "Ninguno"
 msgid "Off"
 msgstr "Off"
 
-#: src/wx/config_dialog.cc:1154
+#: src/wx/config_dialog.cc:1159
 msgid "Open console window"
 msgstr "Abrir la ventana de la consola"
 
-#: src/wx/content_panel.cc:90
+#: src/wx/content_panel.cc:95
 msgid "Open the timeline for the film."
 msgstr ""
 
@@ -907,11 +898,11 @@ msgstr "Unidad organizativa"
 msgid "Other"
 msgstr "Otros"
 
-#: src/wx/config_dialog.cc:978
+#: src/wx/config_dialog.cc:972
 msgid "Outgoing mail server"
 msgstr "Servidor de salida de correo"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:62
 msgid "Outline content"
 msgstr "Resaltar contenido"
 
@@ -919,31 +910,41 @@ msgstr "Resaltar contenido"
 msgid "Output"
 msgstr "Salida"
 
-#: src/wx/colour_conversion_editor.cc:103
+#: src/wx/colour_conversion_editor.cc:184
 msgid "Output gamma"
 msgstr "Gamma de salida"
 
+#: src/wx/colour_conversion_editor.cc:182
+#, fuzzy
+msgid "Output gamma correction"
+msgstr "Gamma de salida"
+
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/config_dialog.cc:898
+#: src/wx/config_dialog.cc:894
 msgid "Password"
 msgstr "Clave"
 
-#: src/wx/job_manager_view.cc:71 src/wx/job_manager_view.cc:160
+#: src/wx/job_manager_view.cc:64 src/wx/job_manager_view.cc:133
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:74
 msgid "Peak"
 msgstr "Pico"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/audio_dialog.cc:245
+#, c-format
+msgid "Peak is %.2fdB at %s"
+msgstr ""
+
+#: src/wx/film_viewer.cc:68
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/wx/timing_panel.cc:55
+#: src/wx/timing_panel.cc:88
 msgid "Play length"
 msgstr "Duración"
 
@@ -953,11 +954,11 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:86
+#: src/wx/audio_plot.cc:85
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
 
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:76
 msgid "Position"
 msgstr "Posición"
 
@@ -965,48 +966,67 @@ msgstr "Posición"
 msgid "Pre-release"
 msgstr "Prelanzamiento"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:628
 msgid "Private key for decrypting DCPs"
 msgstr "Llave privada para desencriptar DCPs"
 
-#: src/wx/config_dialog.cc:599
+#: src/wx/config_dialog.cc:610
 msgid "Private key for leaf certificate"
 msgstr "Llave privada para certificado hoja"
 
-#: src/wx/audio_panel.cc:89
-msgid "Process with"
+#: src/wx/dcp_panel.cc:670
+#, fuzzy
+msgid "Processor"
 msgstr "Procesar con"
 
-#: src/wx/audio_mapping_view.cc:289
-msgid "R"
-msgstr "R"
+#: src/wx/content_menu.cc:60
+#, fuzzy
+msgid "Properties..."
+msgstr "Propiedades de la película"
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/colour_conversion_editor.cc:105
+#, fuzzy
+msgid "RGB to XYZ conversion"
+msgstr "Conversión de color"
+
+#: src/wx/audio_dialog.cc:75
 msgid "RMS"
 msgstr "RMS"
 
+#: src/wx/key_dialog.cc:48
+msgid "Random"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Clasificación (ej. 16)"
 
-#: src/wx/audio_mapping_view.cc:321
-msgid "Rc"
-msgstr "Rc"
-
-#: src/wx/content_menu.cc:56
+#: src/wx/content_menu.cc:61
 msgid "Re-examine..."
 msgstr "Reexaminar..."
 
-#: src/wx/config_dialog.cc:595
+#: src/wx/config_dialog.cc:606
 msgid "Re-make certificates..."
 msgstr "Recrear certificados..."
 
+#: src/wx/colour_conversion_editor.cc:98
+msgid "Rec. 601"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:99
+msgid "Rec. 709"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:62
 msgid "Red band"
 msgstr "Banda roja"
 
-#: src/wx/config_dialog.cc:586 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:77 src/wx/editable_list.h:68
+#: src/wx/colour_conversion_editor.cc:112
+msgid "Red chromaticity"
+msgstr ""
+
+#: src/wx/config_dialog.cc:596 src/wx/content_menu.cc:64
+#: src/wx/content_panel.cc:82 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1018,7 +1038,7 @@ msgstr "Quitar cine"
 msgid "Remove Screen"
 msgstr "Quitar pantalla"
 
-#: src/wx/content_panel.cc:78
+#: src/wx/content_panel.cc:83
 msgid "Remove the selected piece of content from the film."
 msgstr ""
 
@@ -1030,7 +1050,7 @@ msgstr "Repetir"
 msgid "Repeat Content"
 msgstr "Repetir contenido"
 
-#: src/wx/content_menu.cc:53
+#: src/wx/content_menu.cc:57
 msgid "Repeat..."
 msgstr "Repetir..."
 
@@ -1038,27 +1058,28 @@ msgstr "Repetir..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1016
+#: src/wx/config_dialog.cc:1010
 msgid "Reset to default text"
 msgstr "Restablecer el texto par defecto"
 
-#: src/wx/dcp_panel.cc:564
+#: src/wx/dcp_panel.cc:606
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/wx/job_manager_view.cc:163
+#: src/wx/job_manager_view.cc:136
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/wx/audio_mapping_view.cc:364
+#: src/wx/video_panel.cc:106
+#, fuzzy
+msgid "Right"
+msgstr "Recorte derecha"
+
+#: src/wx/audio_mapping_view.cc:320
 msgid "Right click to change gain."
 msgstr "Click derecho para cambiar la ganancia."
 
-#: src/wx/video_panel.cc:103
-msgid "Right crop"
-msgstr "Recorte derecha"
-
-#: src/wx/config_dialog.cc:710
+#: src/wx/config_dialog.cc:708
 msgid "Root"
 msgstr "Raiz"
 
@@ -1066,40 +1087,32 @@ msgstr "Raiz"
 msgid "Root common name"
 msgstr "Nombre común raiz"
 
-#: src/wx/audio_mapping_view.cc:305
-msgid "Rs"
-msgstr "Rs"
-
-#: src/wx/dcp_panel.cc:122
+#: src/wx/dcp_panel.cc:149
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:148
+#: src/wx/video_panel.cc:151
 msgid "Scale to"
 msgstr "Redimensionar a"
 
-#: src/wx/dcp_panel.cc:579
-msgid "Scaler"
-msgstr "Escalador"
-
 #: src/wx/kdm_dialog.cc:60
 msgid "Screens"
 msgstr "Pantallas"
 
-#: src/wx/kdm_dialog.cc:529
+#: src/wx/kdm_dialog.cc:531
 msgid "Select CPL XML file"
 msgstr "Seleccionar XML del CPL"
 
-#: src/wx/config_dialog.cc:666 src/wx/config_dialog.cc:782
-#: src/wx/config_dialog.cc:827 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:664 src/wx/config_dialog.cc:780
+#: src/wx/config_dialog.cc:825 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Seleccionar fichero de certificado"
 
-#: src/wx/content_menu.cc:266
+#: src/wx/content_menu.cc:312
 msgid "Select KDM"
 msgstr "Seleccionar KDM"
 
-#: src/wx/config_dialog.cc:756 src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:754 src/wx/config_dialog.cc:802
 msgid "Select Key File"
 msgstr "Seleccionar fichero de llave"
 
@@ -1127,32 +1140,33 @@ msgstr "Fabricante del servidor"
 msgid "Server serial number"
 msgstr "Número de serie del servidor"
 
-#: src/wx/config_dialog.cc:431
+#: src/wx/config_dialog.cc:488
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:64
+#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:97
 msgid "Set"
 msgstr "Seleccionar"
 
-#: src/wx/fonts_dialog.cc:57
+#: src/wx/fonts_dialog.cc:58
 #, fuzzy
 msgid "Set file..."
 msgstr "Añadir fichero(s)..."
 
-#: src/wx/config_dialog.cc:99
+#: src/wx/config_dialog.cc:153
 msgid "Set language"
 msgstr "Seleccionar idioma"
 
-#: src/wx/audio_panel.cc:51
-msgid "Show Audio..."
+#: src/wx/dcp_panel.cc:679
+#, fuzzy
+msgid "Show audio..."
 msgstr "Mostrar audio..."
 
-#: src/wx/dcp_panel.cc:95
+#: src/wx/dcp_panel.cc:106
 msgid "Signed"
 msgstr "Firmado"
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:85
 msgid "Smoothing"
 msgstr "Suavizado"
 
@@ -1160,11 +1174,11 @@ msgstr "Suavizado"
 msgid "Snap"
 msgstr "Acoplar"
 
-#: src/wx/update_dialog.cc:43
+#: src/wx/update_dialog.cc:45
 msgid "Stable version "
 msgstr "Versión estable"
 
-#: src/wx/dcp_panel.cc:103
+#: src/wx/dcp_panel.cc:129
 msgid "Standard"
 msgstr "Estandard"
 
@@ -1172,7 +1186,7 @@ msgstr "Estandard"
 msgid "Start"
 msgstr "Inicio"
 
-#: src/wx/audio_panel.cc:84 src/wx/subtitle_panel.cc:93
+#: src/wx/subtitle_panel.cc:93
 msgid "Stream"
 msgstr "Flujo"
 
@@ -1180,7 +1194,7 @@ msgstr "Flujo"
 msgid "Studio (e.g. TCF)"
 msgstr "Estudio (ej. TCF)"
 
-#: src/wx/config_dialog.cc:997
+#: src/wx/config_dialog.cc:991
 msgid "Subject"
 msgstr "Asunto"
 
@@ -1196,15 +1210,15 @@ msgstr "Idioma del subtítulo (ej. EN)"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:174
+#: src/wx/about_dialog.cc:187
 msgid "Supported by"
 msgstr "Soportado por"
 
-#: src/wx/config_dialog.cc:868
+#: src/wx/config_dialog.cc:865
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:890
+#: src/wx/config_dialog.cc:886
 msgid "Target path"
 msgstr "Ruta"
 
@@ -1216,15 +1230,15 @@ msgstr "Versión en prueba"
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
-#: src/wx/update_dialog.cc:48
+#: src/wx/update_dialog.cc:51
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:220
+#: src/wx/about_dialog.cc:235
 msgid "Tested by"
 msgstr "Comprobado por"
 
-#: src/wx/content_menu.cc:252
+#: src/wx/content_menu.cc:298
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1233,15 +1247,15 @@ msgstr ""
 "El fichero(s) especificados no es el mismo que el ausente. Puedes probar de "
 "nuevo con el fichero correcto o eliminar el contenido ausente."
 
-#: src/wx/hints_dialog.cc:154
+#: src/wx/hints_dialog.cc:178
 msgid "There are no hints: everything looks good!"
 msgstr "No hay recomendaciones: ¡todo parece bien!"
 
-#: src/wx/film_viewer.cc:144
+#: src/wx/film_viewer.cc:143
 msgid "There is not enough free memory to do that."
 msgstr "No hay suficiente memoria para hacer eso."
 
-#: src/wx/kdm_dialog.cc:554
+#: src/wx/kdm_dialog.cc:556
 msgid "This is not a valid CPL file"
 msgstr "Este no es un fichero CPL válido"
 
@@ -1249,15 +1263,15 @@ msgstr "Este no es un fichero CPL válido"
 msgid "Threads"
 msgstr "Hilos"
 
-#: src/wx/config_dialog.cc:118
+#: src/wx/config_dialog.cc:172
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:580
 msgid "Thumbprint"
 msgstr "Huella dactilar"
 
-#: src/wx/audio_plot.cc:165
+#: src/wx/audio_plot.cc:164
 msgid "Time"
 msgstr "Tiempo"
 
@@ -1265,36 +1279,36 @@ msgstr "Tiempo"
 msgid "Timeline"
 msgstr "Línea de tiempo"
 
-#: src/wx/content_panel.cc:89
+#: src/wx/content_panel.cc:94
 msgid "Timeline..."
 msgstr "Linea de tiempo..."
 
-#: src/wx/timing_panel.cc:38
+#: src/wx/timing_panel.cc:37
 msgid "Timing|Timing"
 msgstr "Tiempo|Tiempo"
 
-#: src/wx/video_panel.cc:115
-msgid "Top crop"
-msgstr "Recortar arriba"
+#: src/wx/video_panel.cc:118
+msgid "Top"
+msgstr ""
 
-#: src/wx/about_dialog.cc:111
+#: src/wx/about_dialog.cc:112
 msgid "Translated by"
 msgstr "Traducido por"
 
-#: src/wx/timing_panel.cc:52
+#: src/wx/timing_panel.cc:85
 msgid "Trim from end"
 msgstr "Recortar del final"
 
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:82
 msgid "Trim from start"
 msgstr "Recortar del inicio"
 
-#: src/wx/audio_dialog.cc:55 src/wx/config_dialog.cc:562
-#: src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:68 src/wx/config_dialog.cc:572
+#: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/dolby_certificate_dialog.cc:182
+#: src/wx/dolby_certificate_dialog.cc:183
 msgid "Unexpected certificate filename form"
 msgstr "Nombre inesperado del fichero de certificado"
 
@@ -1306,27 +1320,27 @@ msgstr "Desconocido"
 msgid "Until"
 msgstr "Hasta"
 
-#: src/wx/content_panel.cc:81
+#: src/wx/content_panel.cc:86
 msgid "Up"
 msgstr "Subir"
 
-#: src/wx/update_dialog.cc:27
+#: src/wx/update_dialog.cc:28
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/wx/dcp_panel.cc:66
+#: src/wx/dcp_panel.cc:71
 msgid "Use ISDCF name"
 msgstr "Usar el nombre ISDCF"
 
-#: src/wx/config_dialog.cc:445
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Usar todos los servidores"
 
-#: src/wx/dcp_panel.cc:550
+#: src/wx/dcp_panel.cc:592
 msgid "Use best"
 msgstr "Usar la mejor"
 
-#: src/wx/content_colour_conversion_dialog.cc:42
+#: src/wx/content_colour_conversion_dialog.cc:43
 msgid "Use preset"
 msgstr "Usar por defecto"
 
@@ -1334,35 +1348,50 @@ msgstr "Usar por defecto"
 msgid "Use subtitles"
 msgstr "Usar subtítulos"
 
-#: src/wx/config_dialog.cc:894
+#: src/wx/config_dialog.cc:890
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: src/wx/audio_mapping_view.cc:313
-msgid "VI"
-msgstr "VI"
-
-#: src/wx/dcp_panel.cc:92 src/wx/video_panel.cc:70
+#: src/wx/dcp_panel.cc:103 src/wx/video_panel.cc:71
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/wx/timing_panel.cc:60
+#: src/wx/content_properties_dialog.cc:51 src/wx/timing_panel.cc:93
 msgid "Video frame rate"
 msgstr "Velocidad de imagen"
 
+#: src/wx/content_properties_dialog.cc:43
+#, fuzzy
+msgid "Video length"
+msgstr "Duración completa"
+
+#: src/wx/content_properties_dialog.cc:47
+#, fuzzy
+msgid "Video size"
+msgstr "Vídeo"
+
 #: src/wx/subtitle_panel.cc:97
 msgid "View..."
 msgstr "Ver..."
 
-#: src/wx/config_dialog.cc:1144
+#: src/wx/config_dialog.cc:1149
 msgid "Warnings"
 msgstr "Alertas"
 
+#: src/wx/colour_conversion_editor.cc:133
+#, fuzzy
+msgid "White point"
+msgstr "Escribe a"
+
+#: src/wx/colour_conversion_editor.cc:157
+msgid "White point adjustment"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:172
 msgid "Write to"
 msgstr "Escribe a"
 
-#: src/wx/about_dialog.cc:95
+#: src/wx/about_dialog.cc:96
 msgid "Written by"
 msgstr "Escrito por"
 
@@ -1382,13 +1411,22 @@ msgstr "Desplazamiento en Y"
 msgid "Y Scale"
 msgstr "Redimensión Y"
 
-#: src/wx/hints_dialog.cc:147
+#: src/wx/colour_conversion_editor.cc:94
+#, fuzzy
+msgid "YUV to RGB conversion"
+msgstr "Conversión de color"
+
+#: src/wx/colour_conversion_editor.cc:96
+msgid "YUV to RGB matrix"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:171
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:133
+#: src/wx/hints_dialog.cc:157
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1397,7 +1435,16 @@ msgstr ""
 "Hay %d ficheros que parecen VOBs en el DVD. Deberías unirlos para asegurarte "
 "transiciones suaves."
 
-#: src/wx/hints_dialog.cc:114
+#: src/wx/hints_dialog.cc:92
+#, fuzzy
+msgid ""
+"You have specified a font file which is larger than 640kB.  This is very "
+"likely to cause problems on playback."
+msgstr ""
+"Tu DCP tiene un número impar de canales de audio. Es muy probable que cause "
+"problemas de reproducción."
+
+#: src/wx/hints_dialog.cc:138
 #, c-format
 msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
@@ -1407,7 +1454,7 @@ msgstr ""
 "proyectores (sobre todo antiguos).  Utiliza 24 o 48 imágenes por segundo "
 "para asegurarte."
 
-#: src/wx/hints_dialog.cc:72
+#: src/wx/hints_dialog.cc:97
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
@@ -1415,7 +1462,7 @@ msgstr ""
 "Tu DCP tiene un número impar de canales de audio. Es muy probable que cause "
 "problemas de reproducción."
 
-#: src/wx/hints_dialog.cc:76
+#: src/wx/hints_dialog.cc:101
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
@@ -1423,7 +1470,7 @@ msgstr ""
 "Tu DCP tiene menos de 6 canales de audio. Esto puede causar problemas con "
 "algunos proyectores."
 
-#: src/wx/hints_dialog.cc:81
+#: src/wx/hints_dialog.cc:106
 #, fuzzy
 msgid ""
 "Your DCP has no audio channels.  This is likely to cause problems on "
@@ -1432,43 +1479,137 @@ msgstr ""
 "Tu DCP tiene un número impar de canales de audio. Es muy probable que cause "
 "problemas de reproducción."
 
-#: src/wx/timeline.cc:229
+#: src/wx/timeline_audio_content_view.cc:37
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/properties_dialog.cc:46
-msgid "counting..."
-msgstr "contando..."
-
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
 msgid "dB"
 msgstr "dB"
 
+#. // TRANSLATORS: this is an abbreviation for "frames"
+#: src/wx/timing_panel.cc:68
+msgid "f"
+msgstr ""
+
+#: src/wx/content_properties_dialog.cc:52
+#, fuzzy
+msgid "frames per second"
+msgstr "Fotogramas ya codificados"
+
+#. // TRANSLATORS: this is an abbreviation for "hours"
+#: src/wx/timing_panel.cc:46
+msgid "h"
+msgstr ""
+
+#. // TRANSLATORS: this is an abbreviation for "minutes"
+#: src/wx/timing_panel.cc:54
+#, fuzzy
+msgid "m"
+msgstr "ms"
+
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:302
+#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:356
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:264
+#. // TRANSLATORS: this is an abbreviation for "seconds"
+#: src/wx/config_dialog.cc:318 src/wx/timing_panel.cc:61
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:258
+#: src/wx/timeline_video_content_view.cc:36
 msgid "still"
 msgstr "fijo"
 
-#: src/wx/timeline.cc:289
+#: src/wx/timeline_subtitle_content_view.cc:35
 msgid "subtitles"
 msgstr "subtítulos"
 
+#: src/wx/colour_conversion_editor.cc:64
+msgid "threshold"
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr "veces"
 
-#: src/wx/timeline.cc:260
+#: src/wx/timeline_video_content_view.cc:38
 msgid "video"
 msgstr "vídeo"
 
+#: src/wx/content_properties_dialog.cc:44
+#, fuzzy
+msgid "video frames"
+msgstr "Velocidad de imagen"
+
+#: src/wx/colour_conversion_editor.cc:107
+msgid "x"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:108
+msgid "y"
+msgstr ""
+
+#~ msgid "BsL"
+#~ msgstr "BsL"
+
+#~ msgid "BsR"
+#~ msgstr "BsR"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Calculate digests"
+#~ msgstr "Calcular..."
+
+#~ msgid "Colour Conversions"
+#~ msgstr "Conversiones de color"
+
+#, fuzzy
+#~ msgid "Could not find a DCP in that folder."
+#~ msgstr "No se pudieron encontrar imágenes ni un DCP en esta carpeta"
+
+#~ msgid "DCP Name"
+#~ msgstr "Nombre DCP"
+
+#~ msgid "HI"
+#~ msgstr "HI"
+
+#~ msgid "L"
+#~ msgstr "L"
+
+#~ msgid "Lc"
+#~ msgstr "Lc"
+
+#~ msgid "Lfe"
+#~ msgstr "Lfe"
+
+#~ msgid "Ls"
+#~ msgstr "Ls"
+
+#~ msgid "R"
+#~ msgstr "R"
+
+#~ msgid "Rc"
+#~ msgstr "Rc"
+
+#~ msgid "Rs"
+#~ msgstr "Rs"
+
+#~ msgid "Scaler"
+#~ msgstr "Escalador"
+
+#~ msgid "Top crop"
+#~ msgstr "Recortar arriba"
+
+#~ msgid "VI"
+#~ msgstr "VI"
+
+#~ msgid "counting..."
+#~ msgstr "contando..."
+
 #~ msgid "Bad setting for %s (%s)"
 #~ msgstr "Configuración erronea para %s (%s)"
 
@@ -1481,9 +1622,6 @@ msgstr "vídeo"
 #~ msgid "1 channel"
 #~ msgstr "1 canal"
 
-#~ msgid "Audio channels"
-#~ msgstr "Canales de audio"
-
 #~ msgid "Hz"
 #~ msgstr "Hz"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index c46454448..f660420ce 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/wx/key_dialog.cc:44
 msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-07-14 11:27+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -31,11 +32,11 @@ msgstr ""
 "(C) 2012-2014 par Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 "Laursen"
 
-#: src/wx/config_dialog.cc:990
+#: src/wx/config_dialog.cc:984
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(le mot de passe sera enregistré sur le disque dur au format texte)"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:165
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(redémarrez DCP-o-matic pour appliquer le changement de langue)"
 
@@ -45,11 +46,11 @@ 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:107
+#: src/wx/colour_conversion_editor.cc:188
 msgid "1 / "
 msgstr "1/"
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
 
@@ -57,46 +58,56 @@ msgstr "2D"
 msgid "2D version of content available in 3D"
 msgstr "Version 2D d'un contenu aussi disponible en 3D"
 
-#: src/wx/dcp_panel.cc:612
+#: src/wx/dcp_panel.cc:645
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:560
+#: src/wx/dcp_panel.cc:602
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:222
 msgid "3D alternate"
 msgstr "3D alternatif"
 
-#: src/wx/video_panel.cc:203
+#: src/wx/video_panel.cc:223
 msgid "3D left only"
 msgstr "3D gauche"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:220
 msgid "3D left/right"
 msgstr "3D gauche/droite"
 
-#: src/wx/video_panel.cc:204
+#: src/wx/video_panel.cc:224
 msgid "3D right only"
 msgstr "3D droite"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:221
 msgid "3D top/bottom"
 msgstr "3D dessus/dessous"
 
-#: src/wx/dcp_panel.cc:613
+#: src/wx/dcp_panel.cc:646
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/hints_dialog.cc:120
+#: src/wx/timing_panel.cc:109
+msgid ""
+"<i>Only change this if it the content's frame rate has been read incorrectly."
+"</i>"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "A"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:144
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/wx/update_dialog.cc:34
+#: src/wx/update_dialog.cc:35
 msgid "A new version of DCP-o-matic is available."
 msgstr "Une nouvelle version de DCP-o-matic est disponible"
 
@@ -108,7 +119,7 @@ msgstr "À propos de DCP-o-matic"
 msgid "Add Cinema..."
 msgstr "Ajout cinéma"
 
-#: src/wx/content_menu.cc:57
+#: src/wx/content_menu.cc:62
 #, fuzzy
 msgid "Add KDM..."
 msgstr "Ajout cinéma"
@@ -117,35 +128,39 @@ msgstr "Ajout cinéma"
 msgid "Add Screen..."
 msgstr "Ajout une salle"
 
-#: src/wx/content_panel.cc:74
+#: src/wx/content_panel.cc:79
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
 msgstr ""
 
-#: src/wx/content_panel.cc:69
+#: src/wx/content_panel.cc:74
 msgid "Add file(s)..."
 msgstr "Ajout fichier(s)..."
 
-#: src/wx/content_panel.cc:73
+#: src/wx/content_panel.cc:78
 #, fuzzy
 msgid "Add folder..."
 msgstr "Ajout fichier(s)..."
 
-#: src/wx/image_sequence_dialog.cc:27
+#: src/wx/image_sequence_dialog.cc:25
 #, fuzzy
 msgid "Add image sequence"
 msgstr "Conserver la vidéo dans la séquence"
 
-#: src/wx/content_panel.cc:70
+#: src/wx/content_panel.cc:75
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:584 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:594 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: src/wx/hints_dialog.cc:108
+#: src/wx/colour_conversion_editor.cc:159
+msgid "Adjust white point to"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:132
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -153,7 +168,7 @@ msgid ""
 "\"DCP\" tab."
 msgstr ""
 
-#: src/wx/hints_dialog.cc:102
+#: src/wx/hints_dialog.cc:126
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -161,15 +176,15 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1128
+#: src/wx/config_dialog.cc:1133
 msgid "Allow any DCP frame rate"
 msgstr "Autoriser toutes cadences"
 
-#: src/wx/about_dialog.cc:115
+#: src/wx/about_dialog.cc:116
 msgid "Artwork by"
 msgstr "Thème par"
 
-#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:93
+#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:104
 msgid "Audio"
 msgstr "Audio"
 
@@ -177,14 +192,19 @@ msgstr "Audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Langue audio (ex. FR)"
 
-#: src/wx/audio_mapping_view.cc:358
+#: src/wx/content_properties_dialog.cc:61
+#, fuzzy
+msgid "Audio channels"
+msgstr "canaux"
+
+#: src/wx/audio_mapping_view.cc:314
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
 "Le son du canal audio %d sera transféré au canal %d du DCP sans modification."
 
-#: src/wx/audio_mapping_view.cc:361
+#: src/wx/audio_mapping_view.cc:317
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -193,28 +213,30 @@ msgstr ""
 "Le son du canal audio %d sera transféré au canal %d du DCP avec un gain de "
 "%.1fdB."
 
-#: src/wx/config_dialog.cc:1009
+#: src/wx/colour_conversion_editor.cc:70
+#, fuzzy
+msgid "B"
+msgstr "dB"
+
+#: src/wx/config_dialog.cc:1003
 #, fuzzy
 msgid "BCC address"
 msgstr "Adresse CC"
 
-#: src/wx/video_panel.cc:125
-msgid "Bottom crop"
+#: src/wx/colour_conversion_editor.cc:126
+msgid "Blue chromaticity"
+msgstr ""
+
+#: src/wx/video_panel.cc:128
+#, fuzzy
+msgid "Bottom"
 msgstr "Rogner en bas"
 
 #: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Parcourir..."
 
-#: src/wx/audio_mapping_view.cc:325
-msgid "BsL"
-msgstr "Ar.G"
-
-#: src/wx/audio_mapping_view.cc:329
-msgid "BsR"
-msgstr "Ar.D"
-
-#: src/wx/dcp_panel.cc:556
+#: src/wx/dcp_panel.cc:598
 msgid "Burn subtitles into image"
 msgstr ""
 
@@ -222,18 +244,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Mais je dois mixer"
 
-#: src/wx/image_sequence_dialog.cc:33
-msgid ""
-"By default DCP-o-matic will calculate digests (hashes) of your image files "
-"so that it knows if they change.  Turning this off will speed up import but "
-"you must not alter the image files after import or strange things may happen."
-msgstr ""
-
-#: src/wx/audio_mapping_view.cc:293
-msgid "C"
-msgstr "C"
-
-#: src/wx/config_dialog.cc:1005
+#: src/wx/config_dialog.cc:999
 msgid "CC address"
 msgstr "Adresse CC"
 
@@ -249,16 +260,11 @@ msgstr "Id du CPL"
 msgid "CPL annotation text"
 msgstr "Commentaire CPL"
 
-#: src/wx/image_sequence_dialog.cc:31
-#, fuzzy
-msgid "Calculate digests"
-msgstr "Calcul..."
-
-#: src/wx/audio_panel.cc:66
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Calcul..."
 
-#: src/wx/job_manager_view.cc:66
+#: src/wx/job_manager_view.cc:59
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -266,16 +272,16 @@ msgstr "Annuler"
 msgid "Certificate"
 msgstr "Certificat"
 
-#: src/wx/config_dialog.cc:551
+#: src/wx/config_dialog.cc:561
 msgid "Certificate chain for signing DCPs and KDMs:"
 msgstr ""
 
-#: src/wx/dolby_certificate_dialog.cc:191
-#: src/wx/doremi_certificate_dialog.cc:103
+#: src/wx/dolby_certificate_dialog.cc:192
+#: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Certificat téléchargé"
 
-#: src/wx/config_dialog.cc:612
+#: src/wx/config_dialog.cc:620
 msgid "Certificate for decrypting DCPs"
 msgstr ""
 
@@ -287,31 +293,31 @@ msgstr "Chaîne"
 msgid "Channel gain"
 msgstr "Gain Canal"
 
-#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:628
+#: src/wx/audio_dialog.cc:56 src/wx/dcp_panel.cc:662
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:180
 msgid "Check for testing updates as well as stable ones"
 msgstr "Recherche toutes mises à jour : test et stables."
 
-#: src/wx/config_dialog.cc:122
+#: src/wx/config_dialog.cc:176
 msgid "Check for updates on startup"
 msgstr "Recherche de mises à jour au démarrage."
 
-#: src/wx/content_menu.cc:198
+#: src/wx/content_menu.cc:244
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
-#: src/wx/content_panel.cc:237
+#: src/wx/content_panel.cc:242
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:260
+#: src/wx/content_menu.cc:237 src/wx/content_panel.cc:264
 msgid "Choose a folder"
 msgstr "Choisissez un dossier"
 
-#: src/wx/fonts_dialog.cc:116
+#: src/wx/fonts_dialog.cc:120
 #, fuzzy
 msgid "Choose a font file"
 msgstr "Choisissez un fichier"
@@ -320,16 +326,12 @@ msgstr "Choisissez un fichier"
 msgid "Cinema"
 msgstr "Cinéma"
 
-#: src/wx/config_dialog.cc:491
-msgid "Colour Conversions"
-msgstr "Conversions Couleurs"
-
-#: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:172
+#: src/wx/content_colour_conversion_dialog.cc:35
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:181
 msgid "Colour conversion"
 msgstr "Espace Couleurs"
 
-#: src/wx/config_dialog.cc:1148
+#: src/wx/config_dialog.cc:1153
 msgid "Config|Timing"
 msgstr "Temps"
 
@@ -337,15 +339,20 @@ msgstr "Temps"
 msgid "Contact email"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:537
+#: src/wx/dcp_panel.cc:573
 msgid "Container"
 msgstr "Format"
 
-#: src/wx/audio_mapping_view.cc:278 src/wx/film_editor.cc:49
+#: src/wx/audio_mapping_view.cc:250 src/wx/film_editor.cc:49
 msgid "Content"
 msgstr "Contenu"
 
-#: src/wx/dcp_panel.cc:84
+#: src/wx/content_properties_dialog.cc:34
+#, fuzzy
+msgid "Content Properties"
+msgstr "Propriétés du film"
+
+#: src/wx/dcp_panel.cc:95
 msgid "Content Type"
 msgstr "Type de Contenu"
 
@@ -353,7 +360,7 @@ msgstr "Type de Contenu"
 msgid "Content version"
 msgstr "Version du contenu"
 
-#: src/wx/dcp_panel.cc:73
+#: src/wx/dcp_panel.cc:78
 msgid "Copy as name"
 msgstr ""
 
@@ -361,30 +368,30 @@ msgstr ""
 msgid "Copy..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:151
+#: src/wx/audio_dialog.cc:182
 msgid "Could not analyse audio."
 msgstr "Analyse du son impossible"
 
-#: src/wx/content_panel.cc:286
-msgid "Could not find a DCP in that folder."
+#: src/wx/content_panel.cc:290
+msgid "Could not find a DCP nor a set of images in that folder."
 msgstr ""
 
-#: src/wx/content_panel.cc:307
+#: src/wx/content_panel.cc:310
 msgid "Could not find any images in that folder"
 msgstr ""
 
-#: src/wx/film_viewer.cc:178
+#: src/wx/film_viewer.cc:181
 #, fuzzy, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Lecture du ficher de certificat (%s) impossible"
 
-#: src/wx/config_dialog.cc:675 src/wx/config_dialog.cc:770
-#: src/wx/config_dialog.cc:790 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:673 src/wx/config_dialog.cc:768
+#: src/wx/config_dialog.cc:788 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Lecture du ficher de certificat (%s) impossible"
 
-#: src/wx/config_dialog.cc:762 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:760 src/wx/config_dialog.cc:810
 #, fuzzy, c-format
 msgid "Could not read key file (%s)"
 msgstr "Lecture du ficher de certificat (%s) impossible"
@@ -397,7 +404,11 @@ msgstr "Pays"
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
-#: src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:91
+msgid "Crop"
+msgstr ""
+
+#: src/wx/video_panel.cc:190
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -405,10 +416,6 @@ msgstr "Personnalisé"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/dcp_panel.cc:79
-msgid "DCP Name"
-msgstr "Nom du DCP"
-
 #: src/wx/kdm_dialog.cc:140
 msgid "DCP directory"
 msgstr "Répertoire du DCP"
@@ -417,52 +424,52 @@ msgstr "Répertoire du DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:98
-#, c-format
-msgid "DCP-o-matic audio - %s"
+#: src/wx/audio_dialog.cc:108
+#, fuzzy
+msgid "DCP-o-matic audio"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:276
+#: src/wx/config_dialog.cc:330
 msgid "Default ISDCF name details"
 msgstr "Nom ISDCF par défaut"
 
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:343
 msgid "Default JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 par défaut"
 
-#: src/wx/config_dialog.cc:298
+#: src/wx/config_dialog.cc:352
 msgid "Default audio delay"
 msgstr "Délai audio par défaut"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:334
 msgid "Default container"
 msgstr "Format par défaut"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:338
 msgid "Default content type"
 msgstr "Catégorie par défaut"
 
-#: src/wx/config_dialog.cc:268
+#: src/wx/config_dialog.cc:322
 msgid "Default directory for new films"
 msgstr "Dossier par défaut pour les DCP"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:314
 msgid "Default duration of still images"
 msgstr "Durée par défaut des images fixes"
 
-#: src/wx/config_dialog.cc:306
+#: src/wx/config_dialog.cc:360
 msgid "Default issuer"
 msgstr "Labo par défaut"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:296
 msgid "Defaults"
 msgstr "Par défaut"
 
-#: src/wx/audio_panel.cc:70
+#: src/wx/audio_panel.cc:64
 msgid "Delay"
 msgstr "Délai"
 
-#: src/wx/dcp_panel.cc:71 src/wx/job_manager_view.cc:76
+#: src/wx/dcp_panel.cc:76 src/wx/job_manager_view.cc:69
 msgid "Details..."
 msgstr "Détails..."
 
@@ -471,12 +478,12 @@ msgid "Disk space required"
 msgstr "Espace disque requis"
 
 #: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
-#: src/wx/screen_dialog.cc:135
+#: src/wx/screen_dialog.cc:137
 msgid "Dolby"
 msgstr "Dolby"
 
 #: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
-#: src/wx/screen_dialog.cc:134
+#: src/wx/screen_dialog.cc:136
 msgid "Doremi"
 msgstr "Doremi"
 
@@ -484,11 +491,11 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Les numéros de série Doremi doivent être composés de 6 chiffres"
 
-#: src/wx/content_panel.cc:85
+#: src/wx/content_panel.cc:90
 msgid "Down"
 msgstr "Descendre"
 
-#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#: src/wx/download_certificate_dialog.cc:39 src/wx/screen_dialog.cc:47
 msgid "Download"
 msgstr "Télécharger"
 
@@ -496,8 +503,8 @@ msgstr "Télécharger"
 msgid "Download certificate"
 msgstr "Téléchargement Certificat"
 
-#: src/wx/dolby_certificate_dialog.cc:157
-#: src/wx/doremi_certificate_dialog.cc:54
+#: src/wx/dolby_certificate_dialog.cc:158
+#: src/wx/doremi_certificate_dialog.cc:55
 msgid "Downloading certificate"
 msgstr "Téléchargement Certificat en cours"
 
@@ -509,8 +516,8 @@ msgstr "Éditer le cinéma"
 msgid "Edit Screen..."
 msgstr "Éditer la salle"
 
-#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:277
-#: src/wx/video_panel.cc:168 src/wx/video_panel.cc:176
+#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:331
+#: src/wx/dcp_panel.cc:123 src/wx/video_panel.cc:174 src/wx/video_panel.cc:193
 #: src/wx/editable_list.h:66
 msgid "Edit..."
 msgstr "Éditer..."
@@ -523,7 +530,7 @@ msgstr "Adresse email pour l'envoi de KDM"
 msgid "Encoding Servers"
 msgstr "Serveurs Encodage"
 
-#: src/wx/dcp_panel.cc:99
+#: src/wx/dcp_panel.cc:110
 msgid "Encrypted"
 msgstr "Crypté"
 
@@ -531,11 +538,11 @@ msgstr "Crypté"
 msgid "End"
 msgstr "Fin"
 
-#: src/wx/config_dialog.cc:1146
+#: src/wx/config_dialog.cc:1151
 msgid "Errors"
 msgstr "Erreurs"
 
-#: src/wx/config_dialog.cc:638
+#: src/wx/config_dialog.cc:636
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
@@ -543,11 +550,11 @@ msgstr ""
 msgid "Facility (e.g. DLA)"
 msgstr "Laboratoire (ex. DLA)"
 
-#: src/wx/video_panel.cc:138
+#: src/wx/video_panel.cc:141
 msgid "Fade in"
 msgstr ""
 
-#: src/wx/video_panel.cc:143
+#: src/wx/video_panel.cc:146
 msgid "Fade out"
 msgstr ""
 
@@ -557,6 +564,11 @@ msgstr ""
 msgid "Fetching..."
 msgstr "Obtention..."
 
+#: src/wx/content_properties_dialog.cc:38
+#, fuzzy
+msgid "Filename"
+msgstr "Nom du Film"
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Propriétés du film"
@@ -565,19 +577,19 @@ msgstr "Propriétés du film"
 msgid "Film name"
 msgstr "Nom du Film"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:165
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:168
 msgid "Filters"
 msgstr "Filtres"
 
-#: src/wx/content_menu.cc:55
+#: src/wx/content_menu.cc:59
 msgid "Find missing..."
 msgstr "Recherche de l'élément manquant..."
 
-#: src/wx/fonts_dialog.cc:47
+#: src/wx/fonts_dialog.cc:48
 msgid "Font file"
 msgstr ""
 
-#: src/wx/fonts_dialog.cc:31
+#: src/wx/fonts_dialog.cc:32
 msgid "Fonts"
 msgstr ""
 
@@ -585,11 +597,11 @@ msgstr ""
 msgid "Fonts..."
 msgstr ""
 
-#: src/wx/dcp_panel.cc:543
+#: src/wx/dcp_panel.cc:584
 msgid "Frame Rate"
 msgstr "Cadence image"
 
-#: src/wx/image_sequence_dialog.cc:29
+#: src/wx/image_sequence_dialog.cc:27
 #, fuzzy
 msgid "Frame rate"
 msgstr "Cadence image"
@@ -598,19 +610,16 @@ msgstr "Cadence image"
 msgid "Frames"
 msgstr "Images"
 
-#: src/wx/properties_dialog.cc:45
-msgid "Frames already encoded"
-msgstr "Images déjà encodées"
-
 #: src/wx/about_dialog.cc:65
-msgid "Free, open-source DCP generation from almost anything."
+#, fuzzy
+msgid "Free, open-source DCP creation from almost anything."
 msgstr "Création de DCP libre et gratuit depuis presque tout."
 
 #: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "À partir du"
 
-#: src/wx/config_dialog.cc:1001
+#: src/wx/config_dialog.cc:995
 msgid "From address"
 msgstr "Adresse source"
 
@@ -618,11 +627,11 @@ msgstr "Adresse source"
 msgid "Full"
 msgstr "Plein"
 
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:79
 msgid "Full length"
 msgstr "Durée totale"
 
-#: src/wx/audio_panel.cc:55
+#: src/wx/audio_panel.cc:49
 msgid "Gain"
 msgstr "Gain"
 
@@ -635,19 +644,19 @@ msgstr "Calculateur de gain"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
 
-#: src/wx/properties_dialog.cc:51
+#: src/wx/properties_dialog.cc:48
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:1142
+#: src/wx/config_dialog.cc:1147
 msgid "General"
 msgstr "Général"
 
-#: src/wx/audio_mapping_view.cc:309
-msgid "HI"
-msgstr "HI"
+#: src/wx/colour_conversion_editor.cc:119
+msgid "Green chromaticity"
+msgstr ""
 
-#: src/wx/hints_dialog.cc:31
+#: src/wx/hints_dialog.cc:34
 msgid "Hints"
 msgstr "Conseils"
 
@@ -663,15 +672,15 @@ msgstr "Nom de l'hôte ou adresse IP"
 msgid "I want to play this back at fader"
 msgstr "Je veux lire avec une table de mixage"
 
-#: src/wx/fonts_dialog.cc:39
+#: src/wx/fonts_dialog.cc:40
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:886
+#: src/wx/config_dialog.cc:882
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/config_dialog.cc:449
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "Adresse IP / Nom d'Hôte"
 
@@ -679,27 +688,20 @@ msgstr "Adresse IP / Nom d'Hôte"
 msgid "ISDCF name"
 msgstr "Nom ISDCF"
 
-#: src/wx/colour_conversion_editor.cc:68
-msgid "Input A value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:73
-msgid "Input B value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:53
+#: src/wx/colour_conversion_editor.cc:54
 msgid "Input gamma"
 msgstr "gamma source"
 
-#: src/wx/colour_conversion_editor.cc:58
-msgid "Input power"
-msgstr ""
+#: src/wx/colour_conversion_editor.cc:48
+#, fuzzy
+msgid "Input gamma correction"
+msgstr "gamma source"
 
-#: src/wx/colour_conversion_editor.cc:63
-msgid "Input threshold"
+#: src/wx/colour_conversion_editor.cc:59
+msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:714
+#: src/wx/config_dialog.cc:712
 msgid "Intermediate"
 msgstr ""
 
@@ -707,19 +709,19 @@ msgstr ""
 msgid "Intermediate common name"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:123
+#: src/wx/dcp_panel.cc:150
 msgid "Interop"
 msgstr "MXF-Interop"
 
-#: src/wx/dcp_panel.cc:570
+#: src/wx/dcp_panel.cc:612
 msgid "JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000"
 
-#: src/wx/content_menu.cc:54
+#: src/wx/content_menu.cc:58
 msgid "Join"
 msgstr "Ajouter"
 
-#: src/wx/config_dialog.cc:953
+#: src/wx/config_dialog.cc:955
 msgid "KDM Email"
 msgstr "e-mail KDM"
 
@@ -735,24 +737,20 @@ msgstr "Temps"
 msgid "Keep video in sequence"
 msgstr "Conserver la vidéo dans la séquence"
 
-#: src/wx/config_dialog.cc:535
-msgid "Keys"
+#: src/wx/dcp_panel.cc:119 src/wx/key_dialog.cc:26 src/wx/key_dialog.cc:28
+msgid "Key"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:285
-msgid "L"
-msgstr "G"
+#: src/wx/config_dialog.cc:548
+msgid "Keys"
+msgstr ""
 
 #: src/wx/subtitle_panel.cc:89
 #, fuzzy
 msgid "Language"
 msgstr "Sélectionnez la langue"
 
-#: src/wx/audio_mapping_view.cc:317
-msgid "Lc"
-msgstr "CG"
-
-#: src/wx/config_dialog.cc:712
+#: src/wx/config_dialog.cc:710
 msgid "Leaf"
 msgstr ""
 
@@ -760,49 +758,43 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
-#: src/wx/video_panel.cc:93
-msgid "Left crop"
+#: src/wx/video_panel.cc:96
+#, fuzzy
+msgid "Left"
 msgstr "Rogner à gauche"
 
-#: src/wx/audio_mapping_view.cc:297
-msgid "Lfe"
-msgstr "BF"
-
-#: src/wx/colour_conversion_editor.cc:49
-msgid "Linearise input gamma curve for low values"
+#: src/wx/colour_conversion_editor.cc:50
+#, fuzzy
+msgid "Linearise input gamma curve for small values"
 msgstr "Courbe gamma d'entrée linéaire pour les bas niveaux"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
 msgstr "Chargement depuis fichier..."
 
-#: src/wx/config_dialog.cc:607 src/wx/config_dialog.cc:620
-#: src/wx/config_dialog.cc:633
+#: src/wx/config_dialog.cc:616 src/wx/config_dialog.cc:624
+#: src/wx/config_dialog.cc:632
 #, fuzzy
 msgid "Load..."
 msgstr "Ajouter..."
 
-#: src/wx/config_dialog.cc:1136
+#: src/wx/config_dialog.cc:1141
 msgid "Log"
 msgstr "Rapport"
 
-#: src/wx/config_dialog.cc:1133
+#: src/wx/config_dialog.cc:1138
 msgid "Log:"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:301
-msgid "Ls"
-msgstr "Sr.G"
-
-#: src/wx/content_panel.cc:461
+#: src/wx/content_panel.cc:462 src/wx/content_panel.cc:491
 msgid "MISSING: "
 msgstr "MANQUANT:"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:980
 msgid "Mail password"
 msgstr "Mot de passe Mail"
 
-#: src/wx/config_dialog.cc:982
+#: src/wx/config_dialog.cc:976
 msgid "Mail user name"
 msgstr "Nom Utilisateur Mail"
 
@@ -820,28 +812,28 @@ msgstr "Sélectionner le certificat"
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr "Luminance masterisée (ex: 4fl)"
 
-#: src/wx/colour_conversion_editor.cc:92
+#: src/wx/colour_conversion_editor.cc:109
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:1120
+#: src/wx/config_dialog.cc:1125
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 Maxi"
 
-#: src/wx/config_dialog.cc:293 src/wx/config_dialog.cc:1124
-#: src/wx/dcp_panel.cc:574
+#: src/wx/config_dialog.cc:347 src/wx/config_dialog.cc:1129
+#: src/wx/dcp_panel.cc:616
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/content_panel.cc:82
+#: src/wx/content_panel.cc:87
 msgid "Move the selected piece of content earlier in the film."
 msgstr ""
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:91
 msgid "Move the selected piece of content later in the film."
 msgstr ""
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:345
 msgid "Multiple content selected"
 msgstr "Contenus multiples sélectionnés"
 
@@ -853,13 +845,12 @@ msgstr "Mes Documents"
 msgid "My problem is"
 msgstr ""
 
-#: src/wx/content_panel.cc:465
+#: src/wx/content_panel.cc:495
 msgid "NEEDS KDM: "
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:505
-#: src/wx/dcp_panel.cc:56 src/wx/preset_colour_conversion_dialog.cc:38
-#: src/wx/screen_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/dcp_panel.cc:61
+#: src/wx/preset_colour_conversion_dialog.cc:38 src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nom"
 
@@ -867,17 +858,17 @@ msgstr "Nom"
 msgid "New Film"
 msgstr "Nouveau Film"
 
-#: src/wx/update_dialog.cc:36
+#: src/wx/update_dialog.cc:37
 msgid "New versions of DCP-o-matic are available."
 msgstr "De nouvelles versions de DCP-o-matic sont disponibles."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:312
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Aucun son ne passera du canal audio %d au canal %d du DCP."
 
-#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:166
-#: src/wx/video_panel.cc:258 src/wx/video_panel.cc:267
+#: src/wx/dcp_panel.cc:672 src/wx/video_panel.cc:172 src/wx/video_panel.cc:186
+#: src/wx/video_panel.cc:289
 msgid "None"
 msgstr "Aucun"
 
@@ -885,11 +876,11 @@ msgstr "Aucun"
 msgid "Off"
 msgstr "Eteint"
 
-#: src/wx/config_dialog.cc:1154
+#: src/wx/config_dialog.cc:1159
 msgid "Open console window"
 msgstr ""
 
-#: src/wx/content_panel.cc:90
+#: src/wx/content_panel.cc:95
 msgid "Open the timeline for the film."
 msgstr ""
 
@@ -906,11 +897,11 @@ msgstr ""
 msgid "Other"
 msgstr "Autre"
 
-#: src/wx/config_dialog.cc:978
+#: src/wx/config_dialog.cc:972
 msgid "Outgoing mail server"
 msgstr "Serveurs de messagerie sortant"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:62
 #, fuzzy
 msgid "Outline content"
 msgstr "Contenus multiples sélectionnés"
@@ -919,31 +910,41 @@ msgstr "Contenus multiples sélectionnés"
 msgid "Output"
 msgstr "Sortie"
 
-#: src/wx/colour_conversion_editor.cc:103
+#: src/wx/colour_conversion_editor.cc:184
 msgid "Output gamma"
 msgstr "Gamma de sortie"
 
+#: src/wx/colour_conversion_editor.cc:182
+#, fuzzy
+msgid "Output gamma correction"
+msgstr "Gamma de sortie"
+
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/config_dialog.cc:898
+#: src/wx/config_dialog.cc:894
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/wx/job_manager_view.cc:71 src/wx/job_manager_view.cc:160
+#: src/wx/job_manager_view.cc:64 src/wx/job_manager_view.cc:133
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:74
 msgid "Peak"
 msgstr "Crête"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/audio_dialog.cc:245
+#, c-format
+msgid "Peak is %.2fdB at %s"
+msgstr ""
+
+#: src/wx/film_viewer.cc:68
 msgid "Play"
 msgstr "Lecture"
 
-#: src/wx/timing_panel.cc:55
+#: src/wx/timing_panel.cc:88
 msgid "Play length"
 msgstr "Durée de lecture"
 
@@ -953,11 +954,11 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:86
+#: src/wx/audio_plot.cc:85
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
 
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:76
 msgid "Position"
 msgstr "Position"
 
@@ -965,49 +966,67 @@ msgstr "Position"
 msgid "Pre-release"
 msgstr "Avant sortie"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:628
 msgid "Private key for decrypting DCPs"
 msgstr ""
 
-#: src/wx/config_dialog.cc:599
+#: src/wx/config_dialog.cc:610
 msgid "Private key for leaf certificate"
 msgstr ""
 
-#: src/wx/audio_panel.cc:89
-msgid "Process with"
+#: src/wx/dcp_panel.cc:670
+msgid "Processor"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:289
-msgid "R"
-msgstr "D"
+#: src/wx/content_menu.cc:60
+#, fuzzy
+msgid "Properties..."
+msgstr "Propriétés du film"
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/colour_conversion_editor.cc:105
+#, fuzzy
+msgid "RGB to XYZ conversion"
+msgstr "Espace Couleurs"
+
+#: src/wx/audio_dialog.cc:75
 msgid "RMS"
 msgstr "RMS"
 
+#: src/wx/key_dialog.cc:48
+msgid "Random"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Rating (ex. 15)"
 
-#: src/wx/audio_mapping_view.cc:321
-msgid "Rc"
-msgstr "CD"
-
-#: src/wx/content_menu.cc:56
+#: src/wx/content_menu.cc:61
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:595
+#: src/wx/config_dialog.cc:606
 #, fuzzy
 msgid "Re-make certificates..."
 msgstr "Téléchargement Certificat"
 
+#: src/wx/colour_conversion_editor.cc:98
+msgid "Rec. 601"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:99
+msgid "Rec. 709"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:62
 msgid "Red band"
 msgstr "Red Band"
 
-#: src/wx/config_dialog.cc:586 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:77 src/wx/editable_list.h:68
+#: src/wx/colour_conversion_editor.cc:112
+msgid "Red chromaticity"
+msgstr ""
+
+#: src/wx/config_dialog.cc:596 src/wx/content_menu.cc:64
+#: src/wx/content_panel.cc:82 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1019,7 +1038,7 @@ msgstr "Supprimer le cinéma"
 msgid "Remove Screen"
 msgstr "Supprimer la salle"
 
-#: src/wx/content_panel.cc:78
+#: src/wx/content_panel.cc:83
 msgid "Remove the selected piece of content from the film."
 msgstr ""
 
@@ -1031,7 +1050,7 @@ msgstr "Répéter"
 msgid "Repeat Content"
 msgstr "Répéter le contenu"
 
-#: src/wx/content_menu.cc:53
+#: src/wx/content_menu.cc:57
 msgid "Repeat..."
 msgstr "Répéter..."
 
@@ -1039,27 +1058,28 @@ msgstr "Répéter..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1016
+#: src/wx/config_dialog.cc:1010
 msgid "Reset to default text"
 msgstr "texte par défaut"
 
-#: src/wx/dcp_panel.cc:564
+#: src/wx/dcp_panel.cc:606
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/wx/job_manager_view.cc:163
+#: src/wx/job_manager_view.cc:136
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/wx/audio_mapping_view.cc:364
+#: src/wx/video_panel.cc:106
+#, fuzzy
+msgid "Right"
+msgstr "Rogner à droite"
+
+#: src/wx/audio_mapping_view.cc:320
 msgid "Right click to change gain."
 msgstr "Cliquez droit pour modifier le gain."
 
-#: src/wx/video_panel.cc:103
-msgid "Right crop"
-msgstr "Rogner à droite"
-
-#: src/wx/config_dialog.cc:710
+#: src/wx/config_dialog.cc:708
 msgid "Root"
 msgstr ""
 
@@ -1067,40 +1087,32 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:305
-msgid "Rs"
-msgstr "Sr.D"
-
-#: src/wx/dcp_panel.cc:122
+#: src/wx/dcp_panel.cc:149
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:148
+#: src/wx/video_panel.cc:151
 msgid "Scale to"
 msgstr "Mise à l'échelle"
 
-#: src/wx/dcp_panel.cc:579
-msgid "Scaler"
-msgstr "Mise à l'échelle"
-
 #: src/wx/kdm_dialog.cc:60
 msgid "Screens"
 msgstr "Ecrans"
 
-#: src/wx/kdm_dialog.cc:529
+#: src/wx/kdm_dialog.cc:531
 msgid "Select CPL XML file"
 msgstr "Sélectionner le fichier CPL.xml"
 
-#: src/wx/config_dialog.cc:666 src/wx/config_dialog.cc:782
-#: src/wx/config_dialog.cc:827 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:664 src/wx/config_dialog.cc:780
+#: src/wx/config_dialog.cc:825 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Sélectionner le certificat"
 
-#: src/wx/content_menu.cc:266
+#: src/wx/content_menu.cc:312
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:756 src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:754 src/wx/config_dialog.cc:802
 #, fuzzy
 msgid "Select Key File"
 msgstr "Sélectionner le certificat"
@@ -1129,32 +1141,33 @@ msgstr "Constructeur du serveur"
 msgid "Server serial number"
 msgstr "Numéro de Série du Serveur"
 
-#: src/wx/config_dialog.cc:431
+#: src/wx/config_dialog.cc:488
 msgid "Servers"
 msgstr "Serveurs"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:64
+#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:97
 msgid "Set"
 msgstr "Sélection"
 
-#: src/wx/fonts_dialog.cc:57
+#: src/wx/fonts_dialog.cc:58
 #, fuzzy
 msgid "Set file..."
 msgstr "Ajout fichier(s)..."
 
-#: src/wx/config_dialog.cc:99
+#: src/wx/config_dialog.cc:153
 msgid "Set language"
 msgstr "Sélectionnez la langue"
 
-#: src/wx/audio_panel.cc:51
-msgid "Show Audio..."
+#: src/wx/dcp_panel.cc:679
+#, fuzzy
+msgid "Show audio..."
 msgstr "Afficher le son..."
 
-#: src/wx/dcp_panel.cc:95
+#: src/wx/dcp_panel.cc:106
 msgid "Signed"
 msgstr "Signé"
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:85
 msgid "Smoothing"
 msgstr "Lissage"
 
@@ -1162,11 +1175,11 @@ msgstr "Lissage"
 msgid "Snap"
 msgstr "Magnetisme"
 
-#: src/wx/update_dialog.cc:43
+#: src/wx/update_dialog.cc:45
 msgid "Stable version "
 msgstr "Version Stable"
 
-#: src/wx/dcp_panel.cc:103
+#: src/wx/dcp_panel.cc:129
 msgid "Standard"
 msgstr "Standard"
 
@@ -1175,7 +1188,7 @@ msgstr "Standard"
 msgid "Start"
 msgstr "Début"
 
-#: src/wx/audio_panel.cc:84 src/wx/subtitle_panel.cc:93
+#: src/wx/subtitle_panel.cc:93
 msgid "Stream"
 msgstr "Flux"
 
@@ -1183,7 +1196,7 @@ msgstr "Flux"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/config_dialog.cc:997
+#: src/wx/config_dialog.cc:991
 msgid "Subject"
 msgstr ""
 
@@ -1200,15 +1213,15 @@ msgstr "Langue de sous-titres (ex. FR)"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:174
+#: src/wx/about_dialog.cc:187
 msgid "Supported by"
 msgstr "Soutenu par"
 
-#: src/wx/config_dialog.cc:868
+#: src/wx/config_dialog.cc:865
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:890
+#: src/wx/config_dialog.cc:886
 msgid "Target path"
 msgstr "Chemin cible"
 
@@ -1220,15 +1233,15 @@ msgstr "Version temporaire"
 msgid "Territory (e.g. UK)"
 msgstr "Territoire (ex. FR)"
 
-#: src/wx/update_dialog.cc:48
+#: src/wx/update_dialog.cc:51
 msgid "Test version "
 msgstr "Version test"
 
-#: src/wx/about_dialog.cc:220
+#: src/wx/about_dialog.cc:235
 msgid "Tested by"
 msgstr "Testé par"
 
-#: src/wx/content_menu.cc:252
+#: src/wx/content_menu.cc:298
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1238,15 +1251,15 @@ msgstr ""
 "ceux détectés comme manquants. Vous pouvez réessayer avec les contenus "
 "corrects ou supprimer les contenus manquants."
 
-#: src/wx/hints_dialog.cc:154
+#: src/wx/hints_dialog.cc:178
 msgid "There are no hints: everything looks good!"
 msgstr "Il n'y a aucun avertissement: tout semble correct!"
 
-#: src/wx/film_viewer.cc:144
+#: src/wx/film_viewer.cc:143
 msgid "There is not enough free memory to do that."
 msgstr "Il n'y a pas assez de mémoire pour faire cela."
 
-#: src/wx/kdm_dialog.cc:554
+#: src/wx/kdm_dialog.cc:556
 msgid "This is not a valid CPL file"
 msgstr "Ceci n'est pas un fichier CPL valide"
 
@@ -1254,15 +1267,15 @@ msgstr "Ceci n'est pas un fichier CPL valide"
 msgid "Threads"
 msgstr "Processus"
 
-#: src/wx/config_dialog.cc:118
+#: src/wx/config_dialog.cc:172
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:580
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:165
+#: src/wx/audio_plot.cc:164
 msgid "Time"
 msgstr "Durée"
 
@@ -1270,36 +1283,36 @@ msgstr "Durée"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/content_panel.cc:89
+#: src/wx/content_panel.cc:94
 msgid "Timeline..."
 msgstr "Timeline..."
 
-#: src/wx/timing_panel.cc:38
+#: src/wx/timing_panel.cc:37
 msgid "Timing|Timing"
 msgstr "Temps"
 
-#: src/wx/video_panel.cc:115
-msgid "Top crop"
-msgstr "Rogner en haut"
+#: src/wx/video_panel.cc:118
+msgid "Top"
+msgstr ""
 
-#: src/wx/about_dialog.cc:111
+#: src/wx/about_dialog.cc:112
 msgid "Translated by"
 msgstr "Traduit par"
 
-#: src/wx/timing_panel.cc:52
+#: src/wx/timing_panel.cc:85
 msgid "Trim from end"
 msgstr "Rogner par la fin"
 
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:82
 msgid "Trim from start"
 msgstr "Rogner au début"
 
-#: src/wx/audio_dialog.cc:55 src/wx/config_dialog.cc:562
-#: src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:68 src/wx/config_dialog.cc:572
+#: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/dolby_certificate_dialog.cc:182
+#: src/wx/dolby_certificate_dialog.cc:183
 msgid "Unexpected certificate filename form"
 msgstr "Nom de fichier certificat non conforme "
 
@@ -1311,27 +1324,27 @@ msgstr "inconnu."
 msgid "Until"
 msgstr "Jusqu'au"
 
-#: src/wx/content_panel.cc:81
+#: src/wx/content_panel.cc:86
 msgid "Up"
 msgstr "Monter"
 
-#: src/wx/update_dialog.cc:27
+#: src/wx/update_dialog.cc:28
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/wx/dcp_panel.cc:66
+#: src/wx/dcp_panel.cc:71
 msgid "Use ISDCF name"
 msgstr "Utiliser le nom ISDCF"
 
-#: src/wx/config_dialog.cc:445
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Utiliser tous les serveurs"
 
-#: src/wx/dcp_panel.cc:550
+#: src/wx/dcp_panel.cc:592
 msgid "Use best"
 msgstr "Automatique"
 
-#: src/wx/content_colour_conversion_dialog.cc:42
+#: src/wx/content_colour_conversion_dialog.cc:43
 msgid "Use preset"
 msgstr "Utiliser le préréglage"
 
@@ -1340,35 +1353,50 @@ msgstr "Utiliser le préréglage"
 msgid "Use subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/config_dialog.cc:894
+#: src/wx/config_dialog.cc:890
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: src/wx/audio_mapping_view.cc:313
-msgid "VI"
-msgstr "VI"
-
-#: src/wx/dcp_panel.cc:92 src/wx/video_panel.cc:70
+#: src/wx/dcp_panel.cc:103 src/wx/video_panel.cc:71
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/wx/timing_panel.cc:60
+#: src/wx/content_properties_dialog.cc:51 src/wx/timing_panel.cc:93
 msgid "Video frame rate"
 msgstr "Cadence vidéo"
 
+#: src/wx/content_properties_dialog.cc:43
+#, fuzzy
+msgid "Video length"
+msgstr "Durée totale"
+
+#: src/wx/content_properties_dialog.cc:47
+#, fuzzy
+msgid "Video size"
+msgstr "Vidéo"
+
 #: src/wx/subtitle_panel.cc:97
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1144
+#: src/wx/config_dialog.cc:1149
 msgid "Warnings"
 msgstr "Avertissements"
 
+#: src/wx/colour_conversion_editor.cc:133
+#, fuzzy
+msgid "White point"
+msgstr "Ecrire à"
+
+#: src/wx/colour_conversion_editor.cc:157
+msgid "White point adjustment"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:172
 msgid "Write to"
 msgstr "Ecrire à"
 
-#: src/wx/about_dialog.cc:95
+#: src/wx/about_dialog.cc:96
 msgid "Written by"
 msgstr "Développé par"
 
@@ -1390,13 +1418,22 @@ msgstr "Position verticale"
 msgid "Y Scale"
 msgstr "Mise à l'échelle"
 
-#: src/wx/hints_dialog.cc:147
+#: src/wx/colour_conversion_editor.cc:94
+#, fuzzy
+msgid "YUV to RGB conversion"
+msgstr "Espace Couleurs"
+
+#: src/wx/colour_conversion_editor.cc:96
+msgid "YUV to RGB matrix"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:171
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:133
+#: src/wx/hints_dialog.cc:157
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1405,7 +1442,16 @@ msgstr ""
 "%d fichiers ressemblent à des fichiers VOB de DVD. Vous devriez les ajouter "
 "afin de vous assurer d'une jonction correcte entre vos fichiers."
 
-#: src/wx/hints_dialog.cc:114
+#: src/wx/hints_dialog.cc:92
+#, fuzzy
+msgid ""
+"You have specified a font file which is larger than 640kB.  This is very "
+"likely to cause problems on playback."
+msgstr ""
+"Votre DCP possède un nombre impair de canaux audio.  Cela peut créer des "
+"problèmes de lecture."
+
+#: src/wx/hints_dialog.cc:138
 #, c-format
 msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
@@ -1415,7 +1461,7 @@ msgstr ""
 "quelques projecteurs (anciens).  Utilisez plutôt une cadence de 24 ou 48 "
 "images par seconde pour assurer une plus grande compatibilité."
 
-#: src/wx/hints_dialog.cc:72
+#: src/wx/hints_dialog.cc:97
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
@@ -1423,7 +1469,7 @@ msgstr ""
 "Votre DCP possède un nombre impair de canaux audio.  Cela peut créer des "
 "problèmes de lecture."
 
-#: src/wx/hints_dialog.cc:76
+#: src/wx/hints_dialog.cc:101
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
@@ -1431,7 +1477,7 @@ msgstr ""
 "Votre DCP a moins de 6 canaux audio.  Cela peut créer des problèmes de "
 "lecture sur certains projecteurs."
 
-#: src/wx/hints_dialog.cc:81
+#: src/wx/hints_dialog.cc:106
 #, fuzzy
 msgid ""
 "Your DCP has no audio channels.  This is likely to cause problems on "
@@ -1440,44 +1486,134 @@ msgstr ""
 "Votre DCP possède un nombre impair de canaux audio.  Cela peut créer des "
 "problèmes de lecture."
 
-#: src/wx/timeline.cc:229
+#: src/wx/timeline_audio_content_view.cc:37
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/properties_dialog.cc:46
-msgid "counting..."
-msgstr "calcul..."
-
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
 msgid "dB"
 msgstr "dB"
 
+#. // TRANSLATORS: this is an abbreviation for "frames"
+#: src/wx/timing_panel.cc:68
+msgid "f"
+msgstr ""
+
+#: src/wx/content_properties_dialog.cc:52
+#, fuzzy
+msgid "frames per second"
+msgstr "Images déjà encodées"
+
+#. // TRANSLATORS: this is an abbreviation for "hours"
+#: src/wx/timing_panel.cc:46
+msgid "h"
+msgstr ""
+
+#. // TRANSLATORS: this is an abbreviation for "minutes"
+#: src/wx/timing_panel.cc:54
+#, fuzzy
+msgid "m"
+msgstr "ms"
+
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:302
+#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:356
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:264
+#. // TRANSLATORS: this is an abbreviation for "seconds"
+#: src/wx/config_dialog.cc:318 src/wx/timing_panel.cc:61
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:258
+#: src/wx/timeline_video_content_view.cc:36
 msgid "still"
 msgstr "fixe"
 
-#: src/wx/timeline.cc:289
+#: src/wx/timeline_subtitle_content_view.cc:35
 #, fuzzy
 msgid "subtitles"
 msgstr "Sous-titres"
 
+#: src/wx/colour_conversion_editor.cc:64
+msgid "threshold"
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr "fois"
 
-#: src/wx/timeline.cc:260
+#: src/wx/timeline_video_content_view.cc:38
 msgid "video"
 msgstr "vidéo"
 
+#: src/wx/content_properties_dialog.cc:44
+#, fuzzy
+msgid "video frames"
+msgstr "Cadence vidéo"
+
+#: src/wx/colour_conversion_editor.cc:107
+msgid "x"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:108
+msgid "y"
+msgstr ""
+
+#~ msgid "BsL"
+#~ msgstr "Ar.G"
+
+#~ msgid "BsR"
+#~ msgstr "Ar.D"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Calculate digests"
+#~ msgstr "Calcul..."
+
+#~ msgid "Colour Conversions"
+#~ msgstr "Conversions Couleurs"
+
+#~ msgid "DCP Name"
+#~ msgstr "Nom du DCP"
+
+#~ msgid "HI"
+#~ msgstr "HI"
+
+#~ msgid "L"
+#~ msgstr "G"
+
+#~ msgid "Lc"
+#~ msgstr "CG"
+
+#~ msgid "Lfe"
+#~ msgstr "BF"
+
+#~ msgid "Ls"
+#~ msgstr "Sr.G"
+
+#~ msgid "R"
+#~ msgstr "D"
+
+#~ msgid "Rc"
+#~ msgstr "CD"
+
+#~ msgid "Rs"
+#~ msgstr "Sr.D"
+
+#~ msgid "Scaler"
+#~ msgstr "Mise à l'échelle"
+
+#~ msgid "Top crop"
+#~ msgstr "Rogner en haut"
+
+#~ msgid "VI"
+#~ msgstr "VI"
+
+#~ msgid "counting..."
+#~ msgstr "calcul..."
+
 #~ msgid "Bad setting for %s (%s)"
 #~ msgstr "Mauvais réglage pour %s (%s)"
 
@@ -1490,9 +1626,6 @@ msgstr "vidéo"
 #~ msgid "Hz"
 #~ msgstr "Hz"
 
-#~ msgid "channels"
-#~ msgstr "canaux"
-
 #~ msgid "Default creator"
 #~ msgstr "Créateur par défaut"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 77d6dd3fa..6a8572e68 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/wx/key_dialog.cc:44
 msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -28,11 +29,11 @@ msgid ""
 " Ole Laursen, Brecht Sanders"
 msgstr ""
 
-#: src/wx/config_dialog.cc:990
+#: src/wx/config_dialog.cc:984
 msgid "(password will be stored on disk in plaintext)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:165
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
@@ -42,11 +43,11 @@ 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:107
+#: src/wx/colour_conversion_editor.cc:188
 msgid "1 / "
 msgstr ""
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr ""
 
@@ -55,46 +56,56 @@ msgstr ""
 msgid "2D version of content available in 3D"
 msgstr "Una nuova versione di DCP-o-matic è disponibile."
 
-#: src/wx/dcp_panel.cc:612
+#: src/wx/dcp_panel.cc:645
 msgid "2K"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:560
+#: src/wx/dcp_panel.cc:602
 msgid "3D"
 msgstr ""
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:222
 msgid "3D alternate"
 msgstr ""
 
-#: src/wx/video_panel.cc:203
+#: src/wx/video_panel.cc:223
 msgid "3D left only"
 msgstr ""
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:220
 msgid "3D left/right"
 msgstr ""
 
-#: src/wx/video_panel.cc:204
+#: src/wx/video_panel.cc:224
 msgid "3D right only"
 msgstr ""
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:221
 msgid "3D top/bottom"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:613
+#: src/wx/dcp_panel.cc:646
 msgid "4K"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:120
+#: src/wx/timing_panel.cc:109
+msgid ""
+"<i>Only change this if it the content's frame rate has been read incorrectly."
+"</i>"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "A"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:144
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/wx/update_dialog.cc:34
+#: src/wx/update_dialog.cc:35
 msgid "A new version of DCP-o-matic is available."
 msgstr "Una nuova versione di DCP-o-matic è disponibile"
 
@@ -106,7 +117,7 @@ msgstr "Su DCP-o-matic"
 msgid "Add Cinema..."
 msgstr "Aggiungi Cinema"
 
-#: src/wx/content_menu.cc:57
+#: src/wx/content_menu.cc:62
 #, fuzzy
 msgid "Add KDM..."
 msgstr "Aggiungi Cinema"
@@ -115,35 +126,39 @@ msgstr "Aggiungi Cinema"
 msgid "Add Screen..."
 msgstr "Aggiungi Schermo"
 
-#: src/wx/content_panel.cc:74
+#: src/wx/content_panel.cc:79
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
 msgstr ""
 
-#: src/wx/content_panel.cc:69
+#: src/wx/content_panel.cc:74
 msgid "Add file(s)..."
 msgstr "Aggiungi File"
 
-#: src/wx/content_panel.cc:73
+#: src/wx/content_panel.cc:78
 #, fuzzy
 msgid "Add folder..."
 msgstr "Aggiungi File"
 
-#: src/wx/image_sequence_dialog.cc:27
+#: src/wx/image_sequence_dialog.cc:25
 #, fuzzy
 msgid "Add image sequence"
 msgstr "Tieni i video in sequenza"
 
-#: src/wx/content_panel.cc:70
+#: src/wx/content_panel.cc:75
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:584 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:594 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: src/wx/hints_dialog.cc:108
+#: src/wx/colour_conversion_editor.cc:159
+msgid "Adjust white point to"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:132
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -151,7 +166,7 @@ msgid ""
 "\"DCP\" tab."
 msgstr ""
 
-#: src/wx/hints_dialog.cc:102
+#: src/wx/hints_dialog.cc:126
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -159,16 +174,16 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1128
+#: src/wx/config_dialog.cc:1133
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "Frequenza fotogrammi video"
 
-#: src/wx/about_dialog.cc:115
+#: src/wx/about_dialog.cc:116
 msgid "Artwork by"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:93
+#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:104
 msgid "Audio"
 msgstr "Audio"
 
@@ -176,14 +191,19 @@ msgstr "Audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Lingua dell'audio (es. EN)"
 
-#: src/wx/audio_mapping_view.cc:358
+#: src/wx/content_properties_dialog.cc:61
+#, fuzzy
+msgid "Audio channels"
+msgstr "canali"
+
+#: src/wx/audio_mapping_view.cc:314
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
 "L' audio sarà trasferito dal canale %d sorgente al canale %d DCP inalterato."
 
-#: src/wx/audio_mapping_view.cc:361
+#: src/wx/audio_mapping_view.cc:317
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -192,28 +212,30 @@ msgstr ""
 "L' audio sarà trasferito dal canale %d sorgente al canale %d DCP con "
 "guadagno di %.1fdB."
 
-#: src/wx/config_dialog.cc:1009
+#: src/wx/colour_conversion_editor.cc:70
+#, fuzzy
+msgid "B"
+msgstr "dB"
+
+#: src/wx/config_dialog.cc:1003
 #, fuzzy
 msgid "BCC address"
 msgstr "Indirizzo IP"
 
-#: src/wx/video_panel.cc:125
-msgid "Bottom crop"
+#: src/wx/colour_conversion_editor.cc:126
+msgid "Blue chromaticity"
+msgstr ""
+
+#: src/wx/video_panel.cc:128
+#, fuzzy
+msgid "Bottom"
 msgstr "Taglio in basso"
 
 #: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Sfoglia..."
 
-#: src/wx/audio_mapping_view.cc:325
-msgid "BsL"
-msgstr "BsL"
-
-#: src/wx/audio_mapping_view.cc:329
-msgid "BsR"
-msgstr "BsR"
-
-#: src/wx/dcp_panel.cc:556
+#: src/wx/dcp_panel.cc:598
 msgid "Burn subtitles into image"
 msgstr ""
 
@@ -221,18 +243,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Ma dovrò riprodurre con il fader a"
 
-#: src/wx/image_sequence_dialog.cc:33
-msgid ""
-"By default DCP-o-matic will calculate digests (hashes) of your image files "
-"so that it knows if they change.  Turning this off will speed up import but "
-"you must not alter the image files after import or strange things may happen."
-msgstr ""
-
-#: src/wx/audio_mapping_view.cc:293
-msgid "C"
-msgstr "C"
-
-#: src/wx/config_dialog.cc:1005
+#: src/wx/config_dialog.cc:999
 #, fuzzy
 msgid "CC address"
 msgstr "Indirizzo IP"
@@ -249,16 +260,11 @@ msgstr ""
 msgid "CPL annotation text"
 msgstr ""
 
-#: src/wx/image_sequence_dialog.cc:31
-#, fuzzy
-msgid "Calculate digests"
-msgstr "Calcola..."
-
-#: src/wx/audio_panel.cc:66
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Calcola..."
 
-#: src/wx/job_manager_view.cc:66
+#: src/wx/job_manager_view.cc:59
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -267,17 +273,17 @@ msgstr "Annulla"
 msgid "Certificate"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/config_dialog.cc:551
+#: src/wx/config_dialog.cc:561
 msgid "Certificate chain for signing DCPs and KDMs:"
 msgstr ""
 
-#: src/wx/dolby_certificate_dialog.cc:191
-#: src/wx/doremi_certificate_dialog.cc:103
+#: src/wx/dolby_certificate_dialog.cc:192
+#: src/wx/doremi_certificate_dialog.cc:104
 #, fuzzy
 msgid "Certificate downloaded"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/config_dialog.cc:612
+#: src/wx/config_dialog.cc:620
 msgid "Certificate for decrypting DCPs"
 msgstr ""
 
@@ -289,31 +295,31 @@ msgstr ""
 msgid "Channel gain"
 msgstr "Guadagno audio"
 
-#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:628
+#: src/wx/audio_dialog.cc:56 src/wx/dcp_panel.cc:662
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:180
 msgid "Check for testing updates as well as stable ones"
 msgstr "Controlla per aggiornamenti test o stabili"
 
-#: src/wx/config_dialog.cc:122
+#: src/wx/config_dialog.cc:176
 msgid "Check for updates on startup"
 msgstr "Controlla gli aggiornamentio alla partenza"
 
-#: src/wx/content_menu.cc:198
+#: src/wx/content_menu.cc:244
 msgid "Choose a file"
 msgstr "Scegli un file"
 
-#: src/wx/content_panel.cc:237
+#: src/wx/content_panel.cc:242
 msgid "Choose a file or files"
 msgstr "Scegli uno o più file"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:260
+#: src/wx/content_menu.cc:237 src/wx/content_panel.cc:264
 msgid "Choose a folder"
 msgstr "Scegli una cartella"
 
-#: src/wx/fonts_dialog.cc:116
+#: src/wx/fonts_dialog.cc:120
 #, fuzzy
 msgid "Choose a font file"
 msgstr "Scegli un file"
@@ -323,17 +329,12 @@ msgstr "Scegli un file"
 msgid "Cinema"
 msgstr "Aggiungi Cinema"
 
-#: src/wx/config_dialog.cc:491
-#, fuzzy
-msgid "Colour Conversions"
-msgstr "Conversioni colore"
-
-#: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:172
+#: src/wx/content_colour_conversion_dialog.cc:35
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:181
 msgid "Colour conversion"
 msgstr "Conversione colore"
 
-#: src/wx/config_dialog.cc:1148
+#: src/wx/config_dialog.cc:1153
 msgid "Config|Timing"
 msgstr ""
 
@@ -341,15 +342,20 @@ msgstr ""
 msgid "Contact email"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:537
+#: src/wx/dcp_panel.cc:573
 msgid "Container"
 msgstr "Contenitore"
 
-#: src/wx/audio_mapping_view.cc:278 src/wx/film_editor.cc:49
+#: src/wx/audio_mapping_view.cc:250 src/wx/film_editor.cc:49
 msgid "Content"
 msgstr "Sorgente"
 
-#: src/wx/dcp_panel.cc:84
+#: src/wx/content_properties_dialog.cc:34
+#, fuzzy
+msgid "Content Properties"
+msgstr "Proprietà del film"
+
+#: src/wx/dcp_panel.cc:95
 msgid "Content Type"
 msgstr "Tipo di sorgente"
 
@@ -357,7 +363,7 @@ msgstr "Tipo di sorgente"
 msgid "Content version"
 msgstr "Tipo di sorgente"
 
-#: src/wx/dcp_panel.cc:73
+#: src/wx/dcp_panel.cc:78
 msgid "Copy as name"
 msgstr ""
 
@@ -365,30 +371,30 @@ msgstr ""
 msgid "Copy..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:151
+#: src/wx/audio_dialog.cc:182
 msgid "Could not analyse audio."
 msgstr "Non posso analizzare l'audio."
 
-#: src/wx/content_panel.cc:286
-msgid "Could not find a DCP in that folder."
+#: src/wx/content_panel.cc:290
+msgid "Could not find a DCP nor a set of images in that folder."
 msgstr ""
 
-#: src/wx/content_panel.cc:307
+#: src/wx/content_panel.cc:310
 msgid "Could not find any images in that folder"
 msgstr ""
 
-#: src/wx/film_viewer.cc:178
+#: src/wx/film_viewer.cc:181
 #, fuzzy, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
 
-#: src/wx/config_dialog.cc:675 src/wx/config_dialog.cc:770
-#: src/wx/config_dialog.cc:790 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:673 src/wx/config_dialog.cc:768
+#: src/wx/config_dialog.cc:788 src/wx/screen_dialog.cc:95
 #, fuzzy, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
 
-#: src/wx/config_dialog.cc:762 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:760 src/wx/config_dialog.cc:810
 #, fuzzy, c-format
 msgid "Could not read key file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
@@ -401,7 +407,11 @@ msgstr ""
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
-#: src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:91
+msgid "Crop"
+msgstr ""
+
+#: src/wx/video_panel.cc:190
 msgid "Custom"
 msgstr ""
 
@@ -409,10 +419,6 @@ msgstr ""
 msgid "DCP"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:79
-msgid "DCP Name"
-msgstr "Nome del DCP"
-
 #: src/wx/kdm_dialog.cc:140
 msgid "DCP directory"
 msgstr ""
@@ -421,56 +427,56 @@ msgstr ""
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:98
-#, c-format
-msgid "DCP-o-matic audio - %s"
+#: src/wx/audio_dialog.cc:108
+#, fuzzy
+msgid "DCP-o-matic audio"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:276
+#: src/wx/config_dialog.cc:330
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Dettagli del nome DCI predefinito"
 
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:343
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:298
+#: src/wx/config_dialog.cc:352
 msgid "Default audio delay"
 msgstr "Ritardo audio predefinito"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:334
 msgid "Default container"
 msgstr "Contenitore predefinito"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:338
 msgid "Default content type"
 msgstr "Tipo sorgente predefinito"
 
-#: src/wx/config_dialog.cc:268
+#: src/wx/config_dialog.cc:322
 msgid "Default directory for new films"
 msgstr "Cartella predefinita per i nuovi films"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:314
 msgid "Default duration of still images"
 msgstr "Durata predefinita immagini statiche"
 
-#: src/wx/config_dialog.cc:306
+#: src/wx/config_dialog.cc:360
 #, fuzzy
 msgid "Default issuer"
 msgstr "Predefiniti"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:296
 msgid "Defaults"
 msgstr "Predefiniti"
 
-#: src/wx/audio_panel.cc:70
+#: src/wx/audio_panel.cc:64
 #, fuzzy
 msgid "Delay"
 msgstr "Ritardo dell'audio"
 
-#: src/wx/dcp_panel.cc:71 src/wx/job_manager_view.cc:76
+#: src/wx/dcp_panel.cc:76 src/wx/job_manager_view.cc:69
 msgid "Details..."
 msgstr "Dettagli"
 
@@ -479,12 +485,12 @@ msgid "Disk space required"
 msgstr "Spazio su disco rischiesto"
 
 #: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
-#: src/wx/screen_dialog.cc:135
+#: src/wx/screen_dialog.cc:137
 msgid "Dolby"
 msgstr ""
 
 #: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
-#: src/wx/screen_dialog.cc:134
+#: src/wx/screen_dialog.cc:136
 msgid "Doremi"
 msgstr ""
 
@@ -492,11 +498,11 @@ msgstr ""
 msgid "Doremi serial numbers must have 6 digits"
 msgstr ""
 
-#: src/wx/content_panel.cc:85
+#: src/wx/content_panel.cc:90
 msgid "Down"
 msgstr ""
 
-#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#: src/wx/download_certificate_dialog.cc:39 src/wx/screen_dialog.cc:47
 msgid "Download"
 msgstr ""
 
@@ -504,8 +510,8 @@ msgstr ""
 msgid "Download certificate"
 msgstr ""
 
-#: src/wx/dolby_certificate_dialog.cc:157
-#: src/wx/doremi_certificate_dialog.cc:54
+#: src/wx/dolby_certificate_dialog.cc:158
+#: src/wx/doremi_certificate_dialog.cc:55
 msgid "Downloading certificate"
 msgstr ""
 
@@ -517,8 +523,8 @@ msgstr "Modifica Cinema..."
 msgid "Edit Screen..."
 msgstr "Modifica Schermo..."
 
-#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:277
-#: src/wx/video_panel.cc:168 src/wx/video_panel.cc:176
+#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:331
+#: src/wx/dcp_panel.cc:123 src/wx/video_panel.cc:174 src/wx/video_panel.cc:193
 #: src/wx/editable_list.h:66
 msgid "Edit..."
 msgstr "Modifica..."
@@ -532,7 +538,7 @@ msgstr "Indirizzo email per consegna KDM"
 msgid "Encoding Servers"
 msgstr "Servers di codifica"
 
-#: src/wx/dcp_panel.cc:99
+#: src/wx/dcp_panel.cc:110
 msgid "Encrypted"
 msgstr "Criptato"
 
@@ -540,11 +546,11 @@ msgstr "Criptato"
 msgid "End"
 msgstr "Fine"
 
-#: src/wx/config_dialog.cc:1146
+#: src/wx/config_dialog.cc:1151
 msgid "Errors"
 msgstr ""
 
-#: src/wx/config_dialog.cc:638
+#: src/wx/config_dialog.cc:636
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
@@ -552,11 +558,11 @@ msgstr ""
 msgid "Facility (e.g. DLA)"
 msgstr "Facility (es. DLA)"
 
-#: src/wx/video_panel.cc:138
+#: src/wx/video_panel.cc:141
 msgid "Fade in"
 msgstr ""
 
-#: src/wx/video_panel.cc:143
+#: src/wx/video_panel.cc:146
 msgid "Fade out"
 msgstr ""
 
@@ -567,6 +573,11 @@ msgstr ""
 msgid "Fetching..."
 msgstr "conteggio..."
 
+#: src/wx/content_properties_dialog.cc:38
+#, fuzzy
+msgid "Filename"
+msgstr "Nome del film"
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Proprietà del film"
@@ -575,19 +586,19 @@ msgstr "Proprietà del film"
 msgid "Film name"
 msgstr "Nome del film"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:165
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:168
 msgid "Filters"
 msgstr "Filtri"
 
-#: src/wx/content_menu.cc:55
+#: src/wx/content_menu.cc:59
 msgid "Find missing..."
 msgstr "Trova mancante..."
 
-#: src/wx/fonts_dialog.cc:47
+#: src/wx/fonts_dialog.cc:48
 msgid "Font file"
 msgstr ""
 
-#: src/wx/fonts_dialog.cc:31
+#: src/wx/fonts_dialog.cc:32
 msgid "Fonts"
 msgstr ""
 
@@ -595,11 +606,11 @@ msgstr ""
 msgid "Fonts..."
 msgstr ""
 
-#: src/wx/dcp_panel.cc:543
+#: src/wx/dcp_panel.cc:584
 msgid "Frame Rate"
 msgstr "Frequenza fotogrammi"
 
-#: src/wx/image_sequence_dialog.cc:29
+#: src/wx/image_sequence_dialog.cc:27
 #, fuzzy
 msgid "Frame rate"
 msgstr "Frequenza fotogrammi"
@@ -608,19 +619,15 @@ msgstr "Frequenza fotogrammi"
 msgid "Frames"
 msgstr "Fotogrammi"
 
-#: src/wx/properties_dialog.cc:45
-msgid "Frames already encoded"
-msgstr "Fotogrammi già codificati"
-
 #: src/wx/about_dialog.cc:65
-msgid "Free, open-source DCP generation from almost anything."
+msgid "Free, open-source DCP creation from almost anything."
 msgstr ""
 
 #: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "Da"
 
-#: src/wx/config_dialog.cc:1001
+#: src/wx/config_dialog.cc:995
 #, fuzzy
 msgid "From address"
 msgstr "Indirizzo IP"
@@ -629,11 +636,11 @@ msgstr "Indirizzo IP"
 msgid "Full"
 msgstr ""
 
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:79
 msgid "Full length"
 msgstr ""
 
-#: src/wx/audio_panel.cc:55
+#: src/wx/audio_panel.cc:49
 msgid "Gain"
 msgstr ""
 
@@ -646,19 +653,19 @@ msgstr "Calcolatore del guadagno audio"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Guadagno per il canale sorgente %d nel canale DCP %d"
 
-#: src/wx/properties_dialog.cc:51
+#: src/wx/properties_dialog.cc:48
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:1142
+#: src/wx/config_dialog.cc:1147
 msgid "General"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:309
-msgid "HI"
-msgstr "HI"
+#: src/wx/colour_conversion_editor.cc:119
+msgid "Green chromaticity"
+msgstr ""
 
-#: src/wx/hints_dialog.cc:31
+#: src/wx/hints_dialog.cc:34
 msgid "Hints"
 msgstr "Suggerimenti"
 
@@ -674,15 +681,15 @@ msgstr "Nome dell'Host o indirizzo IP"
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/fonts_dialog.cc:39
+#: src/wx/fonts_dialog.cc:40
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:886
+#: src/wx/config_dialog.cc:882
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/config_dialog.cc:449
+#: src/wx/config_dialog.cc:505
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Indirizzo IP"
@@ -692,27 +699,19 @@ msgstr "Indirizzo IP"
 msgid "ISDCF name"
 msgstr "Nome DCI"
 
-#: src/wx/colour_conversion_editor.cc:68
-msgid "Input A value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:73
-msgid "Input B value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:53
+#: src/wx/colour_conversion_editor.cc:54
 msgid "Input gamma"
 msgstr ""
 
-#: src/wx/colour_conversion_editor.cc:58
-msgid "Input power"
+#: src/wx/colour_conversion_editor.cc:48
+msgid "Input gamma correction"
 msgstr ""
 
-#: src/wx/colour_conversion_editor.cc:63
-msgid "Input threshold"
+#: src/wx/colour_conversion_editor.cc:59
+msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:714
+#: src/wx/config_dialog.cc:712
 msgid "Intermediate"
 msgstr ""
 
@@ -720,19 +719,19 @@ msgstr ""
 msgid "Intermediate common name"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:123
+#: src/wx/dcp_panel.cc:150
 msgid "Interop"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:570
+#: src/wx/dcp_panel.cc:612
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/content_menu.cc:54
+#: src/wx/content_menu.cc:58
 msgid "Join"
 msgstr ""
 
-#: src/wx/config_dialog.cc:953
+#: src/wx/config_dialog.cc:955
 msgid "KDM Email"
 msgstr ""
 
@@ -748,24 +747,20 @@ msgstr ""
 msgid "Keep video in sequence"
 msgstr "Tieni i video in sequenza"
 
-#: src/wx/config_dialog.cc:535
-msgid "Keys"
+#: src/wx/dcp_panel.cc:119 src/wx/key_dialog.cc:26 src/wx/key_dialog.cc:28
+msgid "Key"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:285
-msgid "L"
-msgstr "L"
+#: src/wx/config_dialog.cc:548
+msgid "Keys"
+msgstr ""
 
 #: src/wx/subtitle_panel.cc:89
 #, fuzzy
 msgid "Language"
 msgstr "Seleziona la lingua"
 
-#: src/wx/audio_mapping_view.cc:317
-msgid "Lc"
-msgstr "Lc"
-
-#: src/wx/config_dialog.cc:712
+#: src/wx/config_dialog.cc:710
 msgid "Leaf"
 msgstr ""
 
@@ -773,50 +768,44 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
-#: src/wx/video_panel.cc:93
-msgid "Left crop"
+#: src/wx/video_panel.cc:96
+#, fuzzy
+msgid "Left"
 msgstr "Taglio a sinistra"
 
-#: src/wx/audio_mapping_view.cc:297
-msgid "Lfe"
-msgstr "Lfe"
-
-#: src/wx/colour_conversion_editor.cc:49
-msgid "Linearise input gamma curve for low values"
+#: src/wx/colour_conversion_editor.cc:50
+#, fuzzy
+msgid "Linearise input gamma curve for small values"
 msgstr "Linearizza la curva del gamma in ingresso per piccoli valori"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:607 src/wx/config_dialog.cc:620
-#: src/wx/config_dialog.cc:633
+#: src/wx/config_dialog.cc:616 src/wx/config_dialog.cc:624
+#: src/wx/config_dialog.cc:632
 #, fuzzy
 msgid "Load..."
 msgstr "Aggiungi..."
 
-#: src/wx/config_dialog.cc:1136
+#: src/wx/config_dialog.cc:1141
 msgid "Log"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1133
+#: src/wx/config_dialog.cc:1138
 msgid "Log:"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:301
-msgid "Ls"
-msgstr "Ls"
-
-#: src/wx/content_panel.cc:461
+#: src/wx/content_panel.cc:462 src/wx/content_panel.cc:491
 msgid "MISSING: "
 msgstr "MANCANTE:"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:980
 #, fuzzy
 msgid "Mail password"
 msgstr "Password del TMS"
 
-#: src/wx/config_dialog.cc:982
+#: src/wx/config_dialog.cc:976
 #, fuzzy
 msgid "Mail user name"
 msgstr "Nome utente del TMS"
@@ -834,29 +823,29 @@ msgstr "Seleziona il file del Certificato"
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr ""
 
-#: src/wx/colour_conversion_editor.cc:92
+#: src/wx/colour_conversion_editor.cc:109
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:1120
+#: src/wx/config_dialog.cc:1125
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:293 src/wx/config_dialog.cc:1124
-#: src/wx/dcp_panel.cc:574
+#: src/wx/config_dialog.cc:347 src/wx/config_dialog.cc:1129
+#: src/wx/dcp_panel.cc:616
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/content_panel.cc:82
+#: src/wx/content_panel.cc:87
 msgid "Move the selected piece of content earlier in the film."
 msgstr ""
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:91
 msgid "Move the selected piece of content later in the film."
 msgstr ""
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:345
 msgid "Multiple content selected"
 msgstr "Molteplici sorgenti selezionate"
 
@@ -868,13 +857,12 @@ msgstr "Documenti"
 msgid "My problem is"
 msgstr ""
 
-#: src/wx/content_panel.cc:465
+#: src/wx/content_panel.cc:495
 msgid "NEEDS KDM: "
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:505
-#: src/wx/dcp_panel.cc:56 src/wx/preset_colour_conversion_dialog.cc:38
-#: src/wx/screen_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/dcp_panel.cc:61
+#: src/wx/preset_colour_conversion_dialog.cc:38 src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nome"
 
@@ -882,17 +870,17 @@ msgstr "Nome"
 msgid "New Film"
 msgstr "Nuovo Film"
 
-#: src/wx/update_dialog.cc:36
+#: src/wx/update_dialog.cc:37
 msgid "New versions of DCP-o-matic are available."
 msgstr "Una nuova versione di DCP-o-matic è disponibile."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:312
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Nessun audio sarà passato dal canale %d sorgente al canale %d del DCP"
 
-#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:166
-#: src/wx/video_panel.cc:258 src/wx/video_panel.cc:267
+#: src/wx/dcp_panel.cc:672 src/wx/video_panel.cc:172 src/wx/video_panel.cc:186
+#: src/wx/video_panel.cc:289
 msgid "None"
 msgstr "Nessuno"
 
@@ -900,11 +888,11 @@ msgstr "Nessuno"
 msgid "Off"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1154
+#: src/wx/config_dialog.cc:1159
 msgid "Open console window"
 msgstr ""
 
-#: src/wx/content_panel.cc:90
+#: src/wx/content_panel.cc:95
 msgid "Open the timeline for the film."
 msgstr ""
 
@@ -921,11 +909,11 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:978
+#: src/wx/config_dialog.cc:972
 msgid "Outgoing mail server"
 msgstr "Mail server posta in uscita"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:62
 #, fuzzy
 msgid "Outline content"
 msgstr "Molteplici sorgenti selezionate"
@@ -935,32 +923,42 @@ msgstr "Molteplici sorgenti selezionate"
 msgid "Output"
 msgstr "Gamma in uscita"
 
-#: src/wx/colour_conversion_editor.cc:103
+#: 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)"
 
-#: src/wx/config_dialog.cc:898
+#: src/wx/config_dialog.cc:894
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
 
-#: src/wx/job_manager_view.cc:71 src/wx/job_manager_view.cc:160
+#: src/wx/job_manager_view.cc:64 src/wx/job_manager_view.cc:133
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:74
 msgid "Peak"
 msgstr "Picco"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/audio_dialog.cc:245
+#, c-format
+msgid "Peak is %.2fdB at %s"
+msgstr ""
+
+#: src/wx/film_viewer.cc:68
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/wx/timing_panel.cc:55
+#: src/wx/timing_panel.cc:88
 msgid "Play length"
 msgstr ""
 
@@ -970,11 +968,11 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:86
+#: src/wx/audio_plot.cc:85
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
 
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:76
 msgid "Position"
 msgstr "Posizione"
 
@@ -982,48 +980,66 @@ msgstr "Posizione"
 msgid "Pre-release"
 msgstr ""
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:628
 msgid "Private key for decrypting DCPs"
 msgstr ""
 
-#: src/wx/config_dialog.cc:599
+#: src/wx/config_dialog.cc:610
 msgid "Private key for leaf certificate"
 msgstr ""
 
-#: src/wx/audio_panel.cc:89
-msgid "Process with"
+#: src/wx/dcp_panel.cc:670
+msgid "Processor"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:289
-msgid "R"
-msgstr "R"
+#: src/wx/content_menu.cc:60
+#, fuzzy
+msgid "Properties..."
+msgstr "Proprietà del film"
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/colour_conversion_editor.cc:105
+#, fuzzy
+msgid "RGB to XYZ conversion"
+msgstr "Conversione colore"
+
+#: src/wx/audio_dialog.cc:75
 msgid "RMS"
 msgstr "RMS"
 
+#: src/wx/key_dialog.cc:48
+msgid "Random"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Classificazione (es. 15)"
 
-#: src/wx/audio_mapping_view.cc:321
-msgid "Rc"
-msgstr "Rc"
-
-#: src/wx/content_menu.cc:56
+#: src/wx/content_menu.cc:61
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:595
+#: src/wx/config_dialog.cc:606
 msgid "Re-make certificates..."
 msgstr ""
 
+#: src/wx/colour_conversion_editor.cc:98
+msgid "Rec. 601"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:99
+msgid "Rec. 709"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:62
 msgid "Red band"
 msgstr ""
 
-#: src/wx/config_dialog.cc:586 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:77 src/wx/editable_list.h:68
+#: src/wx/colour_conversion_editor.cc:112
+msgid "Red chromaticity"
+msgstr ""
+
+#: src/wx/config_dialog.cc:596 src/wx/content_menu.cc:64
+#: src/wx/content_panel.cc:82 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1035,7 +1051,7 @@ msgstr "Rimuovi Cinema"
 msgid "Remove Screen"
 msgstr "Rimuovi Schermo"
 
-#: src/wx/content_panel.cc:78
+#: src/wx/content_panel.cc:83
 msgid "Remove the selected piece of content from the film."
 msgstr ""
 
@@ -1047,7 +1063,7 @@ msgstr ""
 msgid "Repeat Content"
 msgstr "Ripeti il contenuto"
 
-#: src/wx/content_menu.cc:53
+#: src/wx/content_menu.cc:57
 msgid "Repeat..."
 msgstr ""
 
@@ -1055,27 +1071,28 @@ msgstr ""
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1016
+#: src/wx/config_dialog.cc:1010
 msgid "Reset to default text"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:564
+#: src/wx/dcp_panel.cc:606
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: src/wx/job_manager_view.cc:163
+#: src/wx/job_manager_view.cc:136
 msgid "Resume"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:364
+#: src/wx/video_panel.cc:106
+#, fuzzy
+msgid "Right"
+msgstr "Taglio a destra"
+
+#: src/wx/audio_mapping_view.cc:320
 msgid "Right click to change gain."
 msgstr "Clicca il tasto destro per cambiare guadagno."
 
-#: src/wx/video_panel.cc:103
-msgid "Right crop"
-msgstr "Taglio a destra"
-
-#: src/wx/config_dialog.cc:710
+#: src/wx/config_dialog.cc:708
 msgid "Root"
 msgstr ""
 
@@ -1083,42 +1100,34 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:305
-msgid "Rs"
-msgstr "Rs"
-
-#: src/wx/dcp_panel.cc:122
+#: src/wx/dcp_panel.cc:149
 msgid "SMPTE"
 msgstr ""
 
-#: src/wx/video_panel.cc:148
+#: src/wx/video_panel.cc:151
 msgid "Scale to"
 msgstr "Scala a"
 
-#: src/wx/dcp_panel.cc:579
-msgid "Scaler"
-msgstr "Scaler"
-
 #: src/wx/kdm_dialog.cc:60
 #, fuzzy
 msgid "Screens"
 msgstr "Aggiungi Schermo"
 
-#: src/wx/kdm_dialog.cc:529
+#: src/wx/kdm_dialog.cc:531
 #, fuzzy
 msgid "Select CPL XML file"
 msgstr "Seleziona file audio"
 
-#: src/wx/config_dialog.cc:666 src/wx/config_dialog.cc:782
-#: src/wx/config_dialog.cc:827 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:664 src/wx/config_dialog.cc:780
+#: src/wx/config_dialog.cc:825 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/content_menu.cc:266
+#: src/wx/content_menu.cc:312
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:756 src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:754 src/wx/config_dialog.cc:802
 #, fuzzy
 msgid "Select Key File"
 msgstr "Seleziona il file del Certificato"
@@ -1147,33 +1156,34 @@ msgstr ""
 msgid "Server serial number"
 msgstr ""
 
-#: src/wx/config_dialog.cc:431
+#: src/wx/config_dialog.cc:488
 #, fuzzy
 msgid "Servers"
 msgstr "Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:64
+#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:97
 msgid "Set"
 msgstr ""
 
-#: src/wx/fonts_dialog.cc:57
+#: src/wx/fonts_dialog.cc:58
 #, fuzzy
 msgid "Set file..."
 msgstr "Aggiungi File"
 
-#: src/wx/config_dialog.cc:99
+#: src/wx/config_dialog.cc:153
 msgid "Set language"
 msgstr "Seleziona la lingua"
 
-#: src/wx/audio_panel.cc:51
-msgid "Show Audio..."
+#: src/wx/dcp_panel.cc:679
+#, fuzzy
+msgid "Show audio..."
 msgstr "Mostra Audio..."
 
-#: src/wx/dcp_panel.cc:95
+#: src/wx/dcp_panel.cc:106
 msgid "Signed"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:85
 msgid "Smoothing"
 msgstr "Levigatura"
 
@@ -1181,11 +1191,11 @@ msgstr "Levigatura"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/update_dialog.cc:43
+#: src/wx/update_dialog.cc:45
 msgid "Stable version "
 msgstr "Versione stabile"
 
-#: src/wx/dcp_panel.cc:103
+#: src/wx/dcp_panel.cc:129
 msgid "Standard"
 msgstr ""
 
@@ -1194,7 +1204,7 @@ msgstr ""
 msgid "Start"
 msgstr "Inizio"
 
-#: src/wx/audio_panel.cc:84 src/wx/subtitle_panel.cc:93
+#: src/wx/subtitle_panel.cc:93
 #, fuzzy
 msgid "Stream"
 msgstr "Traccia"
@@ -1203,7 +1213,7 @@ msgstr "Traccia"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (es. TCF)"
 
-#: src/wx/config_dialog.cc:997
+#: src/wx/config_dialog.cc:991
 msgid "Subject"
 msgstr ""
 
@@ -1220,15 +1230,15 @@ msgstr "Lingua dei Sottotitoli (es. FR)"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:174
+#: src/wx/about_dialog.cc:187
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:868
+#: src/wx/config_dialog.cc:865
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:890
+#: src/wx/config_dialog.cc:886
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
@@ -1242,15 +1252,15 @@ msgstr "Versione di test"
 msgid "Territory (e.g. UK)"
 msgstr "Nazione (es. UK)"
 
-#: src/wx/update_dialog.cc:48
+#: src/wx/update_dialog.cc:51
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:220
+#: src/wx/about_dialog.cc:235
 msgid "Tested by"
 msgstr ""
 
-#: src/wx/content_menu.cc:252
+#: src/wx/content_menu.cc:298
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1259,15 +1269,15 @@ msgstr ""
 "Il/i file sorgenteo che hai specificato sono diversi da quelli mancanti. "
 "Riprova oppure rimuovi la sorgente mancante."
 
-#: src/wx/hints_dialog.cc:154
+#: src/wx/hints_dialog.cc:178
 msgid "There are no hints: everything looks good!"
 msgstr "Non ci sono suggerimenti: sembra tutto a posto!"
 
-#: src/wx/film_viewer.cc:144
+#: src/wx/film_viewer.cc:143
 msgid "There is not enough free memory to do that."
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:554
+#: src/wx/kdm_dialog.cc:556
 msgid "This is not a valid CPL file"
 msgstr ""
 
@@ -1275,15 +1285,15 @@ msgstr ""
 msgid "Threads"
 msgstr "Threads"
 
-#: src/wx/config_dialog.cc:118
+#: src/wx/config_dialog.cc:172
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:580
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:165
+#: src/wx/audio_plot.cc:164
 msgid "Time"
 msgstr "Tempo"
 
@@ -1291,36 +1301,36 @@ msgstr "Tempo"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/content_panel.cc:89
+#: src/wx/content_panel.cc:94
 msgid "Timeline..."
 msgstr ""
 
-#: src/wx/timing_panel.cc:38
+#: src/wx/timing_panel.cc:37
 msgid "Timing|Timing"
 msgstr ""
 
-#: src/wx/video_panel.cc:115
-msgid "Top crop"
-msgstr "Taglio in alto"
+#: src/wx/video_panel.cc:118
+msgid "Top"
+msgstr ""
 
-#: src/wx/about_dialog.cc:111
+#: src/wx/about_dialog.cc:112
 msgid "Translated by"
 msgstr ""
 
-#: src/wx/timing_panel.cc:52
+#: src/wx/timing_panel.cc:85
 msgid "Trim from end"
 msgstr "Taglia dalla fine"
 
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:82
 msgid "Trim from start"
 msgstr "Taglia dall'inizio"
 
-#: src/wx/audio_dialog.cc:55 src/wx/config_dialog.cc:562
-#: src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:68 src/wx/config_dialog.cc:572
+#: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/dolby_certificate_dialog.cc:182
+#: src/wx/dolby_certificate_dialog.cc:183
 #, fuzzy
 msgid "Unexpected certificate filename form"
 msgstr "Seleziona il file del Certificato"
@@ -1334,28 +1344,28 @@ msgstr "sconosciuto"
 msgid "Until"
 msgstr "Fino a"
 
-#: src/wx/content_panel.cc:81
+#: src/wx/content_panel.cc:86
 msgid "Up"
 msgstr "Su"
 
-#: src/wx/update_dialog.cc:27
+#: src/wx/update_dialog.cc:28
 msgid "Update"
 msgstr "Aggiorna"
 
-#: src/wx/dcp_panel.cc:66
+#: src/wx/dcp_panel.cc:71
 #, fuzzy
 msgid "Use ISDCF name"
 msgstr "Usa nome DCI"
 
-#: src/wx/config_dialog.cc:445
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Usa tutti i server"
 
-#: src/wx/dcp_panel.cc:550
+#: src/wx/dcp_panel.cc:592
 msgid "Use best"
 msgstr "Usa la migliore"
 
-#: src/wx/content_colour_conversion_dialog.cc:42
+#: src/wx/content_colour_conversion_dialog.cc:43
 msgid "Use preset"
 msgstr "Usa predefinito"
 
@@ -1364,35 +1374,48 @@ msgstr "Usa predefinito"
 msgid "Use subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/config_dialog.cc:894
+#: src/wx/config_dialog.cc:890
 msgid "User name"
 msgstr "Nome utente"
 
-#: src/wx/audio_mapping_view.cc:313
-msgid "VI"
-msgstr "VI"
-
-#: src/wx/dcp_panel.cc:92 src/wx/video_panel.cc:70
+#: src/wx/dcp_panel.cc:103 src/wx/video_panel.cc:71
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/timing_panel.cc:60
+#: src/wx/content_properties_dialog.cc:51 src/wx/timing_panel.cc:93
 msgid "Video frame rate"
 msgstr "Frequenza fotogrammi video"
 
+#: src/wx/content_properties_dialog.cc:43
+msgid "Video length"
+msgstr ""
+
+#: src/wx/content_properties_dialog.cc:47
+#, fuzzy
+msgid "Video size"
+msgstr "Video"
+
 #: src/wx/subtitle_panel.cc:97
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1144
+#: src/wx/config_dialog.cc:1149
 msgid "Warnings"
 msgstr ""
 
+#: src/wx/colour_conversion_editor.cc:133
+msgid "White point"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:157
+msgid "White point adjustment"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:172
 msgid "Write to"
 msgstr ""
 
-#: src/wx/about_dialog.cc:95
+#: src/wx/about_dialog.cc:96
 msgid "Written by"
 msgstr ""
 
@@ -1414,13 +1437,22 @@ msgstr "Spostamento Y"
 msgid "Y Scale"
 msgstr "Scaler"
 
-#: src/wx/hints_dialog.cc:147
+#: src/wx/colour_conversion_editor.cc:94
+#, fuzzy
+msgid "YUV to RGB conversion"
+msgstr "Conversione colore"
+
+#: src/wx/colour_conversion_editor.cc:96
+msgid "YUV to RGB matrix"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:171
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:133
+#: src/wx/hints_dialog.cc:157
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1429,7 +1461,16 @@ msgstr ""
 "Ci sono %d file che sembrano essere DVD VOB. Dovresti unirli per assicurare "
 "una giunta senza interruzioni tra i file."
 
-#: src/wx/hints_dialog.cc:114
+#: src/wx/hints_dialog.cc:92
+#, fuzzy
+msgid ""
+"You have specified a font file which is larger than 640kB.  This is very "
+"likely to cause problems on playback."
+msgstr ""
+"Il vostro DCP ha un numero dispari di canali audio. Questo può causare "
+"problemi durante la riproduzione."
+
+#: src/wx/hints_dialog.cc:138
 #, c-format
 msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
@@ -1439,7 +1480,7 @@ msgstr ""
 "problemi in alcuni (per lo più vecchi) proiettori. Usa 24 o 48 frame al "
 "secondo se vuoi esssere sicuro."
 
-#: src/wx/hints_dialog.cc:72
+#: src/wx/hints_dialog.cc:97
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
@@ -1447,7 +1488,7 @@ msgstr ""
 "Il vostro DCP ha un numero dispari di canali audio. Questo può causare "
 "problemi durante la riproduzione."
 
-#: src/wx/hints_dialog.cc:76
+#: src/wx/hints_dialog.cc:101
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
@@ -1455,7 +1496,7 @@ msgstr ""
 "Il vostro DCP ha meno di 6 canali audio. Questo può causare problemi su "
 "alcuni proiettori."
 
-#: src/wx/hints_dialog.cc:81
+#: src/wx/hints_dialog.cc:106
 #, fuzzy
 msgid ""
 "Your DCP has no audio channels.  This is likely to cause problems on "
@@ -1464,46 +1505,137 @@ msgstr ""
 "Il vostro DCP ha un numero dispari di canali audio. Questo può causare "
 "problemi durante la riproduzione."
 
-#: src/wx/timeline.cc:229
+#: src/wx/timeline_audio_content_view.cc:37
 #, fuzzy
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/properties_dialog.cc:46
-msgid "counting..."
-msgstr "conteggio..."
-
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
 msgid "dB"
 msgstr "dB"
 
+#. // TRANSLATORS: this is an abbreviation for "frames"
+#: src/wx/timing_panel.cc:68
+msgid "f"
+msgstr ""
+
+#: src/wx/content_properties_dialog.cc:52
+#, fuzzy
+msgid "frames per second"
+msgstr "Fotogrammi già codificati"
+
+#. // TRANSLATORS: this is an abbreviation for "hours"
+#: src/wx/timing_panel.cc:46
+msgid "h"
+msgstr ""
+
+#. // TRANSLATORS: this is an abbreviation for "minutes"
+#: src/wx/timing_panel.cc:54
+#, fuzzy
+msgid "m"
+msgstr "ms"
+
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:302
+#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:356
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:264
+#. // TRANSLATORS: this is an abbreviation for "seconds"
+#: src/wx/config_dialog.cc:318 src/wx/timing_panel.cc:61
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:258
+#: src/wx/timeline_video_content_view.cc:36
 msgid "still"
 msgstr ""
 
-#: src/wx/timeline.cc:289
+#: src/wx/timeline_subtitle_content_view.cc:35
 #, fuzzy
 msgid "subtitles"
 msgstr "Sottotitoli"
 
+#: src/wx/colour_conversion_editor.cc:64
+msgid "threshold"
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr ""
 
-#: src/wx/timeline.cc:260
+#: src/wx/timeline_video_content_view.cc:38
 #, fuzzy
 msgid "video"
 msgstr "Video"
 
+#: src/wx/content_properties_dialog.cc:44
+#, fuzzy
+msgid "video frames"
+msgstr "Frequenza fotogrammi video"
+
+#: src/wx/colour_conversion_editor.cc:107
+msgid "x"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:108
+msgid "y"
+msgstr ""
+
+#~ msgid "BsL"
+#~ msgstr "BsL"
+
+#~ msgid "BsR"
+#~ msgstr "BsR"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Calculate digests"
+#~ msgstr "Calcola..."
+
+#, fuzzy
+#~ msgid "Colour Conversions"
+#~ msgstr "Conversioni colore"
+
+#~ msgid "DCP Name"
+#~ msgstr "Nome del DCP"
+
+#~ msgid "HI"
+#~ msgstr "HI"
+
+#~ msgid "L"
+#~ msgstr "L"
+
+#~ msgid "Lc"
+#~ msgstr "Lc"
+
+#~ msgid "Lfe"
+#~ msgstr "Lfe"
+
+#~ msgid "Ls"
+#~ msgstr "Ls"
+
+#~ msgid "R"
+#~ msgstr "R"
+
+#~ msgid "Rc"
+#~ msgstr "Rc"
+
+#~ msgid "Rs"
+#~ msgstr "Rs"
+
+#~ msgid "Scaler"
+#~ msgstr "Scaler"
+
+#~ msgid "Top crop"
+#~ msgstr "Taglio in alto"
+
+#~ msgid "VI"
+#~ msgstr "VI"
+
+#~ msgid "counting..."
+#~ msgstr "conteggio..."
+
 #~ msgid "Bad setting for %s (%s)"
 #~ msgstr "Valore sbagliato per %s (%s)"
 
@@ -1519,9 +1651,6 @@ msgstr "Video"
 #~ msgid "Hz"
 #~ msgstr "Hz"
 
-#~ msgid "channels"
-#~ msgstr "canali"
-
 #, fuzzy
 #~ msgid "Default creator"
 #~ msgstr "Contenitore predefinito"
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index cf3f406ec..7a964b68b 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/wx/key_dialog.cc:44
 msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-09-04 20:17+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -31,11 +32,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:990
+#: src/wx/config_dialog.cc:984
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(wachtwoord wordt opgeslagen op disk in leesbare tekst)"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:165
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(herstart DCP-o-matic voor taal wijziging)"
 
@@ -45,11 +46,11 @@ 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:107
+#: src/wx/colour_conversion_editor.cc:188
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
 
@@ -57,46 +58,56 @@ msgstr "2D"
 msgid "2D version of content available in 3D"
 msgstr "2D versie van 3D content beschikbaar"
 
-#: src/wx/dcp_panel.cc:612
+#: src/wx/dcp_panel.cc:645
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:560
+#: src/wx/dcp_panel.cc:602
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:222
 msgid "3D alternate"
 msgstr "3D alternate"
 
-#: src/wx/video_panel.cc:203
+#: src/wx/video_panel.cc:223
 msgid "3D left only"
 msgstr "3D enkel Links"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:220
 msgid "3D left/right"
 msgstr "3D links/rechts"
 
-#: src/wx/video_panel.cc:204
+#: src/wx/video_panel.cc:224
 msgid "3D right only"
 msgstr "3D enkel rechts"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:221
 msgid "3D top/bottom"
 msgstr "3D boven/beneden"
 
-#: src/wx/dcp_panel.cc:613
+#: src/wx/dcp_panel.cc:646
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/hints_dialog.cc:120
+#: src/wx/timing_panel.cc:109
+msgid ""
+"<i>Only change this if it the content's frame rate has been read incorrectly."
+"</i>"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "A"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:144
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/wx/update_dialog.cc:34
+#: src/wx/update_dialog.cc:35
 msgid "A new version of DCP-o-matic is available."
 msgstr "Een nieuwe versie van DCP-o-matic is beschikbaar."
 
@@ -108,7 +119,7 @@ msgstr "Over DCP-o-matic"
 msgid "Add Cinema..."
 msgstr "Voeg Bioscoop toe..."
 
-#: src/wx/content_menu.cc:57
+#: src/wx/content_menu.cc:62
 #, fuzzy
 msgid "Add KDM..."
 msgstr "Voeg Bioscoop toe..."
@@ -117,35 +128,39 @@ msgstr "Voeg Bioscoop toe..."
 msgid "Add Screen..."
 msgstr "Voeg Scherm toe..."
 
-#: src/wx/content_panel.cc:74
+#: src/wx/content_panel.cc:79
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
 msgstr ""
 
-#: src/wx/content_panel.cc:69
+#: src/wx/content_panel.cc:74
 msgid "Add file(s)..."
 msgstr "Voeg bestande(n) toe..."
 
-#: src/wx/content_panel.cc:73
+#: src/wx/content_panel.cc:78
 #, fuzzy
 msgid "Add folder..."
 msgstr "Voeg bestande(n) toe..."
 
-#: src/wx/image_sequence_dialog.cc:27
+#: src/wx/image_sequence_dialog.cc:25
 #, fuzzy
 msgid "Add image sequence"
 msgstr "Behoud video in tijdlijn"
 
-#: src/wx/content_panel.cc:70
+#: src/wx/content_panel.cc:75
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:584 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:594 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Toevoegen.."
 
-#: src/wx/hints_dialog.cc:108
+#: src/wx/colour_conversion_editor.cc:159
+msgid "Adjust white point to"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:132
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -157,7 +172,7 @@ msgstr ""
 "van het beeld zullen komen. U kan best de DCP's container instellen in Flat "
 "(1.85:1) in de \"DCP\"tab."
 
-#: src/wx/hints_dialog.cc:102
+#: src/wx/hints_dialog.cc:126
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -169,15 +184,15 @@ msgstr ""
 "beeld zullen komen. U kan best de DCP's container instellen in Scope "
 "(2.39:1) in de \"DCP\"tab."
 
-#: src/wx/config_dialog.cc:1128
+#: src/wx/config_dialog.cc:1133
 msgid "Allow any DCP frame rate"
 msgstr "Sta om het welke frame rate toe in DCP"
 
-#: src/wx/about_dialog.cc:115
+#: src/wx/about_dialog.cc:116
 msgid "Artwork by"
 msgstr "Artwork door"
 
-#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:93
+#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:104
 msgid "Audio"
 msgstr "Audio"
 
@@ -185,7 +200,12 @@ msgstr "Audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "AudioTaal (e.g. NL)"
 
-#: src/wx/audio_mapping_view.cc:358
+#: src/wx/content_properties_dialog.cc:61
+#, fuzzy
+msgid "Audio channels"
+msgstr "kanalen"
+
+#: src/wx/audio_mapping_view.cc:314
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
@@ -193,7 +213,7 @@ msgstr ""
 "Audio van content kanaal  %d wordt onveranderd doorgestuurd naar DCP kanaal "
 "%d"
 
-#: src/wx/audio_mapping_view.cc:361
+#: src/wx/audio_mapping_view.cc:317
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -202,27 +222,29 @@ msgstr ""
 "Audio wordt doorgestuurd van content kanaal %d naar DCP kanaal %d met gain "
 "%1fdB."
 
-#: src/wx/config_dialog.cc:1009
+#: src/wx/colour_conversion_editor.cc:70
+#, fuzzy
+msgid "B"
+msgstr "dB"
+
+#: src/wx/config_dialog.cc:1003
 msgid "BCC address"
 msgstr "BCC adres"
 
-#: src/wx/video_panel.cc:125
-msgid "Bottom crop"
+#: src/wx/colour_conversion_editor.cc:126
+msgid "Blue chromaticity"
+msgstr ""
+
+#: src/wx/video_panel.cc:128
+#, fuzzy
+msgid "Bottom"
 msgstr "Bottom crop"
 
 #: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Verkennen..."
 
-#: src/wx/audio_mapping_view.cc:325
-msgid "BsL"
-msgstr "BsL"
-
-#: src/wx/audio_mapping_view.cc:329
-msgid "BsR"
-msgstr "BsR"
-
-#: src/wx/dcp_panel.cc:556
+#: src/wx/dcp_panel.cc:598
 msgid "Burn subtitles into image"
 msgstr ""
 
@@ -230,18 +252,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Maak ik gebruik een fader"
 
-#: src/wx/image_sequence_dialog.cc:33
-msgid ""
-"By default DCP-o-matic will calculate digests (hashes) of your image files "
-"so that it knows if they change.  Turning this off will speed up import but "
-"you must not alter the image files after import or strange things may happen."
-msgstr ""
-
-#: src/wx/audio_mapping_view.cc:293
-msgid "C"
-msgstr "C"
-
-#: src/wx/config_dialog.cc:1005
+#: src/wx/config_dialog.cc:999
 msgid "CC address"
 msgstr "CC adres"
 
@@ -257,16 +268,11 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL opmerkingen tekst"
 
-#: src/wx/image_sequence_dialog.cc:31
-#, fuzzy
-msgid "Calculate digests"
-msgstr "Bereken..."
-
-#: src/wx/audio_panel.cc:66
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Bereken..."
 
-#: src/wx/job_manager_view.cc:66
+#: src/wx/job_manager_view.cc:59
 msgid "Cancel"
 msgstr "Afbreken"
 
@@ -274,16 +280,16 @@ msgstr "Afbreken"
 msgid "Certificate"
 msgstr "certificaat"
 
-#: src/wx/config_dialog.cc:551
+#: src/wx/config_dialog.cc:561
 msgid "Certificate chain for signing DCPs and KDMs:"
 msgstr ""
 
-#: src/wx/dolby_certificate_dialog.cc:191
-#: src/wx/doremi_certificate_dialog.cc:103
+#: src/wx/dolby_certificate_dialog.cc:192
+#: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Certificaat gedownload"
 
-#: src/wx/config_dialog.cc:612
+#: src/wx/config_dialog.cc:620
 msgid "Certificate for decrypting DCPs"
 msgstr ""
 
@@ -295,31 +301,31 @@ msgstr "Ketting"
 msgid "Channel gain"
 msgstr "Kanaal versterking"
 
-#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:628
+#: src/wx/audio_dialog.cc:56 src/wx/dcp_panel.cc:662
 msgid "Channels"
 msgstr "Kanalen"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:180
 msgid "Check for testing updates as well as stable ones"
 msgstr "Selecteer voor Test updates en Stabiele versies "
 
-#: src/wx/config_dialog.cc:122
+#: src/wx/config_dialog.cc:176
 msgid "Check for updates on startup"
 msgstr "Selecteer voor updates controle bij startup"
 
-#: src/wx/content_menu.cc:198
+#: src/wx/content_menu.cc:244
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
-#: src/wx/content_panel.cc:237
+#: src/wx/content_panel.cc:242
 msgid "Choose a file or files"
 msgstr "Kies bestand(en)"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:260
+#: src/wx/content_menu.cc:237 src/wx/content_panel.cc:264
 msgid "Choose a folder"
 msgstr "Kies map"
 
-#: src/wx/fonts_dialog.cc:116
+#: src/wx/fonts_dialog.cc:120
 #, fuzzy
 msgid "Choose a font file"
 msgstr "Kies een bestand"
@@ -328,16 +334,12 @@ msgstr "Kies een bestand"
 msgid "Cinema"
 msgstr "Bioscoop"
 
-#: src/wx/config_dialog.cc:491
-msgid "Colour Conversions"
-msgstr "Colour Conversions"
-
-#: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:172
+#: src/wx/content_colour_conversion_dialog.cc:35
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:181
 msgid "Colour conversion"
 msgstr "Colour conversion"
 
-#: src/wx/config_dialog.cc:1148
+#: src/wx/config_dialog.cc:1153
 msgid "Config|Timing"
 msgstr "Configureer|Timing"
 
@@ -345,15 +347,20 @@ msgstr "Configureer|Timing"
 msgid "Contact email"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:537
+#: src/wx/dcp_panel.cc:573
 msgid "Container"
 msgstr "Container"
 
-#: src/wx/audio_mapping_view.cc:278 src/wx/film_editor.cc:49
+#: src/wx/audio_mapping_view.cc:250 src/wx/film_editor.cc:49
 msgid "Content"
 msgstr "Content"
 
-#: src/wx/dcp_panel.cc:84
+#: src/wx/content_properties_dialog.cc:34
+#, fuzzy
+msgid "Content Properties"
+msgstr "Film Instellingen"
+
+#: src/wx/dcp_panel.cc:95
 msgid "Content Type"
 msgstr "Content Type"
 
@@ -361,7 +368,7 @@ msgstr "Content Type"
 msgid "Content version"
 msgstr "Content versie"
 
-#: src/wx/dcp_panel.cc:73
+#: src/wx/dcp_panel.cc:78
 msgid "Copy as name"
 msgstr ""
 
@@ -369,30 +376,30 @@ msgstr ""
 msgid "Copy..."
 msgstr "Kopieer..."
 
-#: src/wx/audio_dialog.cc:151
+#: src/wx/audio_dialog.cc:182
 msgid "Could not analyse audio."
 msgstr "Kan audio niet analyseren"
 
-#: src/wx/content_panel.cc:286
-msgid "Could not find a DCP in that folder."
+#: src/wx/content_panel.cc:290
+msgid "Could not find a DCP nor a set of images in that folder."
 msgstr ""
 
-#: src/wx/content_panel.cc:307
+#: src/wx/content_panel.cc:310
 msgid "Could not find any images in that folder"
 msgstr ""
 
-#: src/wx/film_viewer.cc:178
+#: src/wx/film_viewer.cc:181
 #, fuzzy, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Onleesbaar certificaat (%s)"
 
-#: src/wx/config_dialog.cc:675 src/wx/config_dialog.cc:770
-#: src/wx/config_dialog.cc:790 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:673 src/wx/config_dialog.cc:768
+#: src/wx/config_dialog.cc:788 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Onleesbaar certificaat (%s)"
 
-#: src/wx/config_dialog.cc:762 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:760 src/wx/config_dialog.cc:810
 #, fuzzy, c-format
 msgid "Could not read key file (%s)"
 msgstr "Onleesbaar certificaat (%s)"
@@ -405,7 +412,11 @@ msgstr "Land"
 msgid "Create in folder"
 msgstr "Maak in map"
 
-#: src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:91
+msgid "Crop"
+msgstr ""
+
+#: src/wx/video_panel.cc:190
 msgid "Custom"
 msgstr "aangepast"
 
@@ -413,10 +424,6 @@ msgstr "aangepast"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/dcp_panel.cc:79
-msgid "DCP Name"
-msgstr "DCP naam"
-
 #: src/wx/kdm_dialog.cc:140
 msgid "DCP directory"
 msgstr "DCP map"
@@ -425,52 +432,52 @@ msgstr "DCP map"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:98
-#, c-format
-msgid "DCP-o-matic audio - %s"
+#: src/wx/audio_dialog.cc:108
+#, fuzzy
+msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:276
+#: src/wx/config_dialog.cc:330
 msgid "Default ISDCF name details"
 msgstr "Standaard ISDCF naam details"
 
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:343
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standaard JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:298
+#: src/wx/config_dialog.cc:352
 msgid "Default audio delay"
 msgstr "Standaard audio delay"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:334
 msgid "Default container"
 msgstr "Standaard container"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:338
 msgid "Default content type"
 msgstr "Standaard content type"
 
-#: src/wx/config_dialog.cc:268
+#: src/wx/config_dialog.cc:322
 msgid "Default directory for new films"
 msgstr "Standaard map voor nieuwe films"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:314
 msgid "Default duration of still images"
 msgstr "Standaard lengte van stills"
 
-#: src/wx/config_dialog.cc:306
+#: src/wx/config_dialog.cc:360
 msgid "Default issuer"
 msgstr "Standaard uitgever"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:296
 msgid "Defaults"
 msgstr "Standaard instellingen"
 
-#: src/wx/audio_panel.cc:70
+#: src/wx/audio_panel.cc:64
 msgid "Delay"
 msgstr "Vertraging"
 
-#: src/wx/dcp_panel.cc:71 src/wx/job_manager_view.cc:76
+#: src/wx/dcp_panel.cc:76 src/wx/job_manager_view.cc:69
 msgid "Details..."
 msgstr "Details..."
 
@@ -479,12 +486,12 @@ msgid "Disk space required"
 msgstr "Benodigde Diskruimte"
 
 #: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
-#: src/wx/screen_dialog.cc:135
+#: src/wx/screen_dialog.cc:137
 msgid "Dolby"
 msgstr "Dolby"
 
 #: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
-#: src/wx/screen_dialog.cc:134
+#: src/wx/screen_dialog.cc:136
 msgid "Doremi"
 msgstr "Doremi"
 
@@ -492,11 +499,11 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Doremi serial numbers moeten bestaan uit 6 digits"
 
-#: src/wx/content_panel.cc:85
+#: src/wx/content_panel.cc:90
 msgid "Down"
 msgstr "Naar beneden"
 
-#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#: src/wx/download_certificate_dialog.cc:39 src/wx/screen_dialog.cc:47
 msgid "Download"
 msgstr "Download"
 
@@ -504,8 +511,8 @@ msgstr "Download"
 msgid "Download certificate"
 msgstr "Download certificaat"
 
-#: src/wx/dolby_certificate_dialog.cc:157
-#: src/wx/doremi_certificate_dialog.cc:54
+#: src/wx/dolby_certificate_dialog.cc:158
+#: src/wx/doremi_certificate_dialog.cc:55
 msgid "Downloading certificate"
 msgstr "Downloading certificaat"
 
@@ -517,8 +524,8 @@ msgstr "Edit Bioscoop"
 msgid "Edit Screen..."
 msgstr "Edit scherm"
 
-#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:277
-#: src/wx/video_panel.cc:168 src/wx/video_panel.cc:176
+#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:331
+#: src/wx/dcp_panel.cc:123 src/wx/video_panel.cc:174 src/wx/video_panel.cc:193
 #: src/wx/editable_list.h:66
 msgid "Edit..."
 msgstr "Edit..."
@@ -531,7 +538,7 @@ msgstr "Email adres voor KDM aflevering"
 msgid "Encoding Servers"
 msgstr "Encoding Servers"
 
-#: src/wx/dcp_panel.cc:99
+#: src/wx/dcp_panel.cc:110
 msgid "Encrypted"
 msgstr "Encrypted"
 
@@ -539,11 +546,11 @@ msgstr "Encrypted"
 msgid "End"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1146
+#: src/wx/config_dialog.cc:1151
 msgid "Errors"
 msgstr "Fouten"
 
-#: src/wx/config_dialog.cc:638
+#: src/wx/config_dialog.cc:636
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
@@ -551,11 +558,11 @@ msgstr ""
 msgid "Facility (e.g. DLA)"
 msgstr "faciliteit (e.g. DLA)"
 
-#: src/wx/video_panel.cc:138
+#: src/wx/video_panel.cc:141
 msgid "Fade in"
 msgstr ""
 
-#: src/wx/video_panel.cc:143
+#: src/wx/video_panel.cc:146
 msgid "Fade out"
 msgstr ""
 
@@ -565,6 +572,11 @@ msgstr ""
 msgid "Fetching..."
 msgstr "Ophalen..."
 
+#: src/wx/content_properties_dialog.cc:38
+#, fuzzy
+msgid "Filename"
+msgstr "Film naam"
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Film Instellingen"
@@ -573,19 +585,19 @@ msgstr "Film Instellingen"
 msgid "Film name"
 msgstr "Film naam"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:165
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:168
 msgid "Filters"
 msgstr "Filters"
 
-#: src/wx/content_menu.cc:55
+#: src/wx/content_menu.cc:59
 msgid "Find missing..."
 msgstr "Zoek ontbrekende..."
 
-#: src/wx/fonts_dialog.cc:47
+#: src/wx/fonts_dialog.cc:48
 msgid "Font file"
 msgstr ""
 
-#: src/wx/fonts_dialog.cc:31
+#: src/wx/fonts_dialog.cc:32
 msgid "Fonts"
 msgstr ""
 
@@ -593,11 +605,11 @@ msgstr ""
 msgid "Fonts..."
 msgstr ""
 
-#: src/wx/dcp_panel.cc:543
+#: src/wx/dcp_panel.cc:584
 msgid "Frame Rate"
 msgstr "Frame Rate"
 
-#: src/wx/image_sequence_dialog.cc:29
+#: src/wx/image_sequence_dialog.cc:27
 #, fuzzy
 msgid "Frame rate"
 msgstr "Frame Rate"
@@ -606,19 +618,16 @@ msgstr "Frame Rate"
 msgid "Frames"
 msgstr "Frame"
 
-#: src/wx/properties_dialog.cc:45
-msgid "Frames already encoded"
-msgstr "Frames zijn al omgezet"
-
 #: src/wx/about_dialog.cc:65
-msgid "Free, open-source DCP generation from almost anything."
+#, fuzzy
+msgid "Free, open-source DCP creation from almost anything."
 msgstr "Gratis, open-source DCP samensteller voor bijna alles."
 
 #: src/wx/kdm_dialog.cc:104
 msgid "From"
 msgstr "Van"
 
-#: src/wx/config_dialog.cc:1001
+#: src/wx/config_dialog.cc:995
 msgid "From address"
 msgstr "Van adres"
 
@@ -626,11 +635,11 @@ msgstr "Van adres"
 msgid "Full"
 msgstr "Volledig"
 
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:79
 msgid "Full length"
 msgstr "Volledige lengte"
 
-#: src/wx/audio_panel.cc:55
+#: src/wx/audio_panel.cc:49
 msgid "Gain"
 msgstr "Versterking"
 
@@ -643,19 +652,19 @@ msgstr "Gain Calculator"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Gain voor content kanaal %d in DCP kanaal %d"
 
-#: src/wx/properties_dialog.cc:51
+#: src/wx/properties_dialog.cc:48
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:1142
+#: src/wx/config_dialog.cc:1147
 msgid "General"
 msgstr "Algemeen"
 
-#: src/wx/audio_mapping_view.cc:309
-msgid "HI"
-msgstr "HI"
+#: src/wx/colour_conversion_editor.cc:119
+msgid "Green chromaticity"
+msgstr ""
 
-#: src/wx/hints_dialog.cc:31
+#: src/wx/hints_dialog.cc:34
 msgid "Hints"
 msgstr "Tips"
 
@@ -671,15 +680,15 @@ msgstr "Host naam of IP address"
 msgid "I want to play this back at fader"
 msgstr "Ik wil dit afspelen met fader"
 
-#: src/wx/fonts_dialog.cc:39
+#: src/wx/fonts_dialog.cc:40
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:886
+#: src/wx/config_dialog.cc:882
 msgid "IP address"
 msgstr "IP adres"
 
-#: src/wx/config_dialog.cc:449
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "IP adres / host naam"
 
@@ -687,27 +696,20 @@ msgstr "IP adres / host naam"
 msgid "ISDCF name"
 msgstr "ISDCF naam"
 
-#: src/wx/colour_conversion_editor.cc:68
-msgid "Input A value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:73
-msgid "Input B value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:53
+#: src/wx/colour_conversion_editor.cc:54
 msgid "Input gamma"
 msgstr "Input gamma"
 
-#: src/wx/colour_conversion_editor.cc:58
-msgid "Input power"
-msgstr ""
+#: src/wx/colour_conversion_editor.cc:48
+#, fuzzy
+msgid "Input gamma correction"
+msgstr "Input gamma"
 
-#: src/wx/colour_conversion_editor.cc:63
-msgid "Input threshold"
+#: src/wx/colour_conversion_editor.cc:59
+msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:714
+#: src/wx/config_dialog.cc:712
 msgid "Intermediate"
 msgstr ""
 
@@ -715,19 +717,19 @@ msgstr ""
 msgid "Intermediate common name"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:123
+#: src/wx/dcp_panel.cc:150
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/dcp_panel.cc:570
+#: src/wx/dcp_panel.cc:612
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbreedte"
 
-#: src/wx/content_menu.cc:54
+#: src/wx/content_menu.cc:58
 msgid "Join"
 msgstr "Samenvoegen"
 
-#: src/wx/config_dialog.cc:953
+#: src/wx/config_dialog.cc:955
 msgid "KDM Email"
 msgstr "KDM Email"
 
@@ -743,24 +745,20 @@ msgstr "KDM|Timing"
 msgid "Keep video in sequence"
 msgstr "Behoud video in tijdlijn"
 
-#: src/wx/config_dialog.cc:535
-msgid "Keys"
+#: src/wx/dcp_panel.cc:119 src/wx/key_dialog.cc:26 src/wx/key_dialog.cc:28
+msgid "Key"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:285
-msgid "L"
-msgstr "L"
+#: src/wx/config_dialog.cc:548
+msgid "Keys"
+msgstr ""
 
 #: src/wx/subtitle_panel.cc:89
 #, fuzzy
 msgid "Language"
 msgstr "Taal Instellen"
 
-#: src/wx/audio_mapping_view.cc:317
-msgid "Lc"
-msgstr "Lc"
-
-#: src/wx/config_dialog.cc:712
+#: src/wx/config_dialog.cc:710
 msgid "Leaf"
 msgstr ""
 
@@ -768,49 +766,43 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
-#: src/wx/video_panel.cc:93
-msgid "Left crop"
+#: src/wx/video_panel.cc:96
+#, fuzzy
+msgid "Left"
 msgstr "Left crop"
 
-#: src/wx/audio_mapping_view.cc:297
-msgid "Lfe"
-msgstr "Lfe"
-
-#: src/wx/colour_conversion_editor.cc:49
-msgid "Linearise input gamma curve for low values"
+#: src/wx/colour_conversion_editor.cc:50
+#, fuzzy
+msgid "Linearise input gamma curve for small values"
 msgstr "Linearise input gamma curve for low values"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
 msgstr "Laad van bestand..."
 
-#: src/wx/config_dialog.cc:607 src/wx/config_dialog.cc:620
-#: src/wx/config_dialog.cc:633
+#: src/wx/config_dialog.cc:616 src/wx/config_dialog.cc:624
+#: src/wx/config_dialog.cc:632
 #, fuzzy
 msgid "Load..."
 msgstr "Toevoegen.."
 
-#: src/wx/config_dialog.cc:1136
+#: src/wx/config_dialog.cc:1141
 msgid "Log"
 msgstr "Log"
 
-#: src/wx/config_dialog.cc:1133
+#: src/wx/config_dialog.cc:1138
 msgid "Log:"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:301
-msgid "Ls"
-msgstr "Ls"
-
-#: src/wx/content_panel.cc:461
+#: src/wx/content_panel.cc:462 src/wx/content_panel.cc:491
 msgid "MISSING: "
 msgstr "ONTBREEKT:"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:980
 msgid "Mail password"
 msgstr "Mail wachtwoord"
 
-#: src/wx/config_dialog.cc:982
+#: src/wx/config_dialog.cc:976
 msgid "Mail user name"
 msgstr "Mail gebruikersnaam"
 
@@ -828,28 +820,28 @@ msgstr "Selecteer Certificaat bestand"
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr "Gemasterde helderheid (bv. 4fl)"
 
-#: src/wx/colour_conversion_editor.cc:92
+#: src/wx/colour_conversion_editor.cc:109
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:1120
+#: src/wx/config_dialog.cc:1125
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximum JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:293 src/wx/config_dialog.cc:1124
-#: src/wx/dcp_panel.cc:574
+#: src/wx/config_dialog.cc:347 src/wx/config_dialog.cc:1129
+#: src/wx/dcp_panel.cc:616
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/content_panel.cc:82
+#: src/wx/content_panel.cc:87
 msgid "Move the selected piece of content earlier in the film."
 msgstr ""
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:91
 msgid "Move the selected piece of content later in the film."
 msgstr ""
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:345
 msgid "Multiple content selected"
 msgstr "Meedere content geselecteerd"
 
@@ -861,13 +853,12 @@ msgstr "Mijn documenten"
 msgid "My problem is"
 msgstr ""
 
-#: src/wx/content_panel.cc:465
+#: src/wx/content_panel.cc:495
 msgid "NEEDS KDM: "
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:505
-#: src/wx/dcp_panel.cc:56 src/wx/preset_colour_conversion_dialog.cc:38
-#: src/wx/screen_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/dcp_panel.cc:61
+#: src/wx/preset_colour_conversion_dialog.cc:38 src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Naam"
 
@@ -875,19 +866,19 @@ msgstr "Naam"
 msgid "New Film"
 msgstr "Nieuwe Film"
 
-#: src/wx/update_dialog.cc:36
+#: src/wx/update_dialog.cc:37
 msgid "New versions of DCP-o-matic are available."
 msgstr "Er zijn nieuwe versies van DCP -o- matic beschikbaar."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:312
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr ""
 "Er wordt geen audio van het content kanaal %d doorgestuurd naar DCP kanaal "
 "%d."
 
-#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:166
-#: src/wx/video_panel.cc:258 src/wx/video_panel.cc:267
+#: src/wx/dcp_panel.cc:672 src/wx/video_panel.cc:172 src/wx/video_panel.cc:186
+#: src/wx/video_panel.cc:289
 msgid "None"
 msgstr "Geen"
 
@@ -895,11 +886,11 @@ msgstr "Geen"
 msgid "Off"
 msgstr "Uit"
 
-#: src/wx/config_dialog.cc:1154
+#: src/wx/config_dialog.cc:1159
 msgid "Open console window"
 msgstr ""
 
-#: src/wx/content_panel.cc:90
+#: src/wx/content_panel.cc:95
 msgid "Open the timeline for the film."
 msgstr ""
 
@@ -915,11 +906,11 @@ msgstr ""
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:978
+#: src/wx/config_dialog.cc:972
 msgid "Outgoing mail server"
 msgstr "Uitgaande mail server"
 
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:62
 #, fuzzy
 msgid "Outline content"
 msgstr "Meedere content geselecteerd"
@@ -928,31 +919,41 @@ msgstr "Meedere content geselecteerd"
 msgid "Output"
 msgstr "Output"
 
-#: src/wx/colour_conversion_editor.cc:103
+#: src/wx/colour_conversion_editor.cc:184
 msgid "Output gamma"
 msgstr "Output gamma"
 
+#: src/wx/colour_conversion_editor.cc:182
+#, fuzzy
+msgid "Output gamma correction"
+msgstr "Output gamma"
+
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Package Type (e.g. OV)"
 
-#: src/wx/config_dialog.cc:898
+#: src/wx/config_dialog.cc:894
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/wx/job_manager_view.cc:71 src/wx/job_manager_view.cc:160
+#: src/wx/job_manager_view.cc:64 src/wx/job_manager_view.cc:133
 msgid "Pause"
 msgstr "Pauze"
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:74
 msgid "Peak"
 msgstr "Piek"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/audio_dialog.cc:245
+#, c-format
+msgid "Peak is %.2fdB at %s"
+msgstr ""
+
+#: src/wx/film_viewer.cc:68
 msgid "Play"
 msgstr "Afspelen"
 
-#: src/wx/timing_panel.cc:55
+#: src/wx/timing_panel.cc:88
 msgid "Play length"
 msgstr "Afspeellengte"
 
@@ -962,11 +963,11 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:86
+#: src/wx/audio_plot.cc:85
 msgid "Please wait; audio is being analysed..."
 msgstr "Een ogenblik geduld, het audio wordt geanalyseerd..."
 
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:76
 msgid "Position"
 msgstr "Positie"
 
@@ -974,49 +975,67 @@ msgstr "Positie"
 msgid "Pre-release"
 msgstr "Voor-uitgave"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:628
 msgid "Private key for decrypting DCPs"
 msgstr ""
 
-#: src/wx/config_dialog.cc:599
+#: src/wx/config_dialog.cc:610
 msgid "Private key for leaf certificate"
 msgstr ""
 
-#: src/wx/audio_panel.cc:89
-msgid "Process with"
+#: src/wx/dcp_panel.cc:670
+msgid "Processor"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:289
-msgid "R"
-msgstr "R"
+#: src/wx/content_menu.cc:60
+#, fuzzy
+msgid "Properties..."
+msgstr "Film Instellingen"
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/colour_conversion_editor.cc:105
+#, fuzzy
+msgid "RGB to XYZ conversion"
+msgstr "Colour conversion"
+
+#: src/wx/audio_dialog.cc:75
 msgid "RMS"
 msgstr "RMS"
 
+#: src/wx/key_dialog.cc:48
+msgid "Random"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Beoordeling (e.g. 15)"
 
-#: src/wx/audio_mapping_view.cc:321
-msgid "Rc"
-msgstr "Rc"
-
-#: src/wx/content_menu.cc:56
+#: src/wx/content_menu.cc:61
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:595
+#: src/wx/config_dialog.cc:606
 #, fuzzy
 msgid "Re-make certificates..."
 msgstr "Download certificaat"
 
+#: src/wx/colour_conversion_editor.cc:98
+msgid "Rec. 601"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:99
+msgid "Rec. 709"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:62
 msgid "Red band"
 msgstr "Rode tape"
 
-#: src/wx/config_dialog.cc:586 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:77 src/wx/editable_list.h:68
+#: src/wx/colour_conversion_editor.cc:112
+msgid "Red chromaticity"
+msgstr ""
+
+#: src/wx/config_dialog.cc:596 src/wx/content_menu.cc:64
+#: src/wx/content_panel.cc:82 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -1028,7 +1047,7 @@ msgstr "Verwijder Bioscoop"
 msgid "Remove Screen"
 msgstr "Verwijder Scherm"
 
-#: src/wx/content_panel.cc:78
+#: src/wx/content_panel.cc:83
 msgid "Remove the selected piece of content from the film."
 msgstr ""
 
@@ -1040,7 +1059,7 @@ msgstr "Herhaal"
 msgid "Repeat Content"
 msgstr "Herhaal content"
 
-#: src/wx/content_menu.cc:53
+#: src/wx/content_menu.cc:57
 msgid "Repeat..."
 msgstr "Herhaal..."
 
@@ -1048,27 +1067,28 @@ msgstr "Herhaal..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1016
+#: src/wx/config_dialog.cc:1010
 msgid "Reset to default text"
 msgstr "Herinstellen oorspronkelijke tekst"
 
-#: src/wx/dcp_panel.cc:564
+#: src/wx/dcp_panel.cc:606
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: src/wx/job_manager_view.cc:163
+#: src/wx/job_manager_view.cc:136
 msgid "Resume"
 msgstr "Vervolg"
 
-#: src/wx/audio_mapping_view.cc:364
+#: src/wx/video_panel.cc:106
+#, fuzzy
+msgid "Right"
+msgstr "Right crop"
+
+#: src/wx/audio_mapping_view.cc:320
 msgid "Right click to change gain."
 msgstr "Klik Rechtermuis om gain te veranderen"
 
-#: src/wx/video_panel.cc:103
-msgid "Right crop"
-msgstr "Right crop"
-
-#: src/wx/config_dialog.cc:710
+#: src/wx/config_dialog.cc:708
 msgid "Root"
 msgstr ""
 
@@ -1076,40 +1096,32 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:305
-msgid "Rs"
-msgstr "Rs"
-
-#: src/wx/dcp_panel.cc:122
+#: src/wx/dcp_panel.cc:149
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:148
+#: src/wx/video_panel.cc:151
 msgid "Scale to"
 msgstr "Schaal tot"
 
-#: src/wx/dcp_panel.cc:579
-msgid "Scaler"
-msgstr "Schaler"
-
 #: src/wx/kdm_dialog.cc:60
 msgid "Screens"
 msgstr "Schermen"
 
-#: src/wx/kdm_dialog.cc:529
+#: src/wx/kdm_dialog.cc:531
 msgid "Select CPL XML file"
 msgstr "Selekteer CPL XML bestand"
 
-#: src/wx/config_dialog.cc:666 src/wx/config_dialog.cc:782
-#: src/wx/config_dialog.cc:827 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:664 src/wx/config_dialog.cc:780
+#: src/wx/config_dialog.cc:825 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Selecteer Certificaat bestand"
 
-#: src/wx/content_menu.cc:266
+#: src/wx/content_menu.cc:312
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:756 src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:754 src/wx/config_dialog.cc:802
 #, fuzzy
 msgid "Select Key File"
 msgstr "Selecteer Certificaat bestand"
@@ -1138,32 +1150,33 @@ msgstr "Server fabrikant"
 msgid "Server serial number"
 msgstr "Server serie nummer"
 
-#: src/wx/config_dialog.cc:431
+#: src/wx/config_dialog.cc:488
 msgid "Servers"
 msgstr "Servers"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:64
+#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:97
 msgid "Set"
 msgstr "Instellen"
 
-#: src/wx/fonts_dialog.cc:57
+#: src/wx/fonts_dialog.cc:58
 #, fuzzy
 msgid "Set file..."
 msgstr "Voeg bestande(n) toe..."
 
-#: src/wx/config_dialog.cc:99
+#: src/wx/config_dialog.cc:153
 msgid "Set language"
 msgstr "Taal Instellen"
 
-#: src/wx/audio_panel.cc:51
-msgid "Show Audio..."
+#: src/wx/dcp_panel.cc:679
+#, fuzzy
+msgid "Show audio..."
 msgstr "Toon Audio..."
 
-#: src/wx/dcp_panel.cc:95
+#: src/wx/dcp_panel.cc:106
 msgid "Signed"
 msgstr "Signed"
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:85
 msgid "Smoothing"
 msgstr "Smoothing"
 
@@ -1171,11 +1184,11 @@ msgstr "Smoothing"
 msgid "Snap"
 msgstr "Snap"
 
-#: src/wx/update_dialog.cc:43
+#: src/wx/update_dialog.cc:45
 msgid "Stable version "
 msgstr "Stabiele versie"
 
-#: src/wx/dcp_panel.cc:103
+#: src/wx/dcp_panel.cc:129
 msgid "Standard"
 msgstr "Standaard"
 
@@ -1183,7 +1196,7 @@ msgstr "Standaard"
 msgid "Start"
 msgstr ""
 
-#: src/wx/audio_panel.cc:84 src/wx/subtitle_panel.cc:93
+#: src/wx/subtitle_panel.cc:93
 msgid "Stream"
 msgstr "Stroom"
 
@@ -1191,7 +1204,7 @@ msgstr "Stroom"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (e.g. TCF)"
 
-#: src/wx/config_dialog.cc:997
+#: src/wx/config_dialog.cc:991
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -1208,15 +1221,15 @@ msgstr "Ondertitel Taal (vb  NL)"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:174
+#: src/wx/about_dialog.cc:187
 msgid "Supported by"
 msgstr "Ondersteund door"
 
-#: src/wx/config_dialog.cc:868
+#: src/wx/config_dialog.cc:865
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:890
+#: src/wx/config_dialog.cc:886
 msgid "Target path"
 msgstr "Doel pad"
 
@@ -1228,15 +1241,15 @@ msgstr "Tijdelijke Versie"
 msgid "Territory (e.g. UK)"
 msgstr "Grondgebied (vb NL)"
 
-#: src/wx/update_dialog.cc:48
+#: src/wx/update_dialog.cc:51
 msgid "Test version "
 msgstr "Test Versie"
 
-#: src/wx/about_dialog.cc:220
+#: src/wx/about_dialog.cc:235
 msgid "Tested by"
 msgstr "Getest door"
 
-#: src/wx/content_menu.cc:252
+#: src/wx/content_menu.cc:298
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1246,15 +1259,15 @@ msgstr ""
 "ontbrekende bestanden.  Probeer opnieuw met de goede content of verwijder de "
 "ontbrekende content. "
 
-#: src/wx/hints_dialog.cc:154
+#: src/wx/hints_dialog.cc:178
 msgid "There are no hints: everything looks good!"
 msgstr "Er zijn geen tips, alles lijkt goed!"
 
-#: src/wx/film_viewer.cc:144
+#: src/wx/film_viewer.cc:143
 msgid "There is not enough free memory to do that."
 msgstr "Er is niet genoeg geheugen om dat te doen."
 
-#: src/wx/kdm_dialog.cc:554
+#: src/wx/kdm_dialog.cc:556
 msgid "This is not a valid CPL file"
 msgstr "Dit is geen geldig CPL bestand"
 
@@ -1262,15 +1275,15 @@ msgstr "Dit is geen geldig CPL bestand"
 msgid "Threads"
 msgstr "CPU belasting"
 
-#: src/wx/config_dialog.cc:118
+#: src/wx/config_dialog.cc:172
 msgid "Threads to use for encoding on this host"
 msgstr "CPU cores beschikbaar voor encoding op deze host"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:580
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:165
+#: src/wx/audio_plot.cc:164
 msgid "Time"
 msgstr "Tijd"
 
@@ -1278,36 +1291,36 @@ msgstr "Tijd"
 msgid "Timeline"
 msgstr "Tijdlijn"
 
-#: src/wx/content_panel.cc:89
+#: src/wx/content_panel.cc:94
 msgid "Timeline..."
 msgstr "Tijdlijn..."
 
-#: src/wx/timing_panel.cc:38
+#: src/wx/timing_panel.cc:37
 msgid "Timing|Timing"
 msgstr "Timing|Timing"
 
-#: src/wx/video_panel.cc:115
-msgid "Top crop"
-msgstr "Top crop"
+#: src/wx/video_panel.cc:118
+msgid "Top"
+msgstr ""
 
-#: src/wx/about_dialog.cc:111
+#: src/wx/about_dialog.cc:112
 msgid "Translated by"
 msgstr "Vertaald door"
 
-#: src/wx/timing_panel.cc:52
+#: src/wx/timing_panel.cc:85
 msgid "Trim from end"
 msgstr "Trim vanaf einde"
 
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:82
 msgid "Trim from start"
 msgstr "Trim vanaf begin"
 
-#: src/wx/audio_dialog.cc:55 src/wx/config_dialog.cc:562
-#: src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:68 src/wx/config_dialog.cc:572
+#: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/dolby_certificate_dialog.cc:182
+#: src/wx/dolby_certificate_dialog.cc:183
 msgid "Unexpected certificate filename form"
 msgstr "Onverwachte certificaat bestandsnaam vorm"
 
@@ -1319,27 +1332,27 @@ msgstr "Onbekend"
 msgid "Until"
 msgstr "Totdat"
 
-#: src/wx/content_panel.cc:81
+#: src/wx/content_panel.cc:86
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/wx/update_dialog.cc:27
+#: src/wx/update_dialog.cc:28
 msgid "Update"
 msgstr "Update"
 
-#: src/wx/dcp_panel.cc:66
+#: src/wx/dcp_panel.cc:71
 msgid "Use ISDCF name"
 msgstr "Gebruik ISDCF naam"
 
-#: src/wx/config_dialog.cc:445
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Gebruik alle servers"
 
-#: src/wx/dcp_panel.cc:550
+#: src/wx/dcp_panel.cc:592
 msgid "Use best"
 msgstr "Gebruik de beste"
 
-#: src/wx/content_colour_conversion_dialog.cc:42
+#: src/wx/content_colour_conversion_dialog.cc:43
 msgid "Use preset"
 msgstr "Gebruik preset"
 
@@ -1348,35 +1361,50 @@ msgstr "Gebruik preset"
 msgid "Use subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/config_dialog.cc:894
+#: src/wx/config_dialog.cc:890
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: src/wx/audio_mapping_view.cc:313
-msgid "VI"
-msgstr "VI"
-
-#: src/wx/dcp_panel.cc:92 src/wx/video_panel.cc:70
+#: src/wx/dcp_panel.cc:103 src/wx/video_panel.cc:71
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/timing_panel.cc:60
+#: src/wx/content_properties_dialog.cc:51 src/wx/timing_panel.cc:93
 msgid "Video frame rate"
 msgstr "Video frame rate"
 
+#: src/wx/content_properties_dialog.cc:43
+#, fuzzy
+msgid "Video length"
+msgstr "Volledige lengte"
+
+#: src/wx/content_properties_dialog.cc:47
+#, fuzzy
+msgid "Video size"
+msgstr "Video"
+
 #: src/wx/subtitle_panel.cc:97
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1144
+#: src/wx/config_dialog.cc:1149
 msgid "Warnings"
 msgstr "Waarschuwingen"
 
+#: src/wx/colour_conversion_editor.cc:133
+#, fuzzy
+msgid "White point"
+msgstr "Schrijf naar"
+
+#: src/wx/colour_conversion_editor.cc:157
+msgid "White point adjustment"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:172
 msgid "Write to"
 msgstr "Schrijf naar"
 
-#: src/wx/about_dialog.cc:95
+#: src/wx/about_dialog.cc:96
 msgid "Written by"
 msgstr "Geschreven door"
 
@@ -1398,13 +1426,22 @@ msgstr "Y offset"
 msgid "Y Scale"
 msgstr "Schaal"
 
-#: src/wx/hints_dialog.cc:147
+#: src/wx/colour_conversion_editor.cc:94
+#, fuzzy
+msgid "YUV to RGB conversion"
+msgstr "Colour conversion"
+
+#: src/wx/colour_conversion_editor.cc:96
+msgid "YUV to RGB matrix"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:171
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:133
+#: src/wx/hints_dialog.cc:157
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1413,7 +1450,16 @@ msgstr ""
 "U hebt %d bestanden die lijken op VOB bestanden van DVD. U moet deze "
 "samenvoegen om soepele weergave mogelijk te maken."
 
-#: src/wx/hints_dialog.cc:114
+#: src/wx/hints_dialog.cc:92
+#, fuzzy
+msgid ""
+"You have specified a font file which is larger than 640kB.  This is very "
+"likely to cause problems on playback."
+msgstr ""
+"Uw DCP heeft een oneven aantal audio kanalen. Dit geeft hoogstwaarschijnlijk "
+"problemen met weergave."
+
+#: src/wx/hints_dialog.cc:138
 #, c-format
 msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
@@ -1422,7 +1468,7 @@ msgstr ""
 "Uw DCP frame rate (%d fps) kan mogelijk problemen veroorzaken met oudere "
 "projectors. Gebruik 24 of 48 frames per seconde voor zekerheid."
 
-#: src/wx/hints_dialog.cc:72
+#: src/wx/hints_dialog.cc:97
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
@@ -1430,7 +1476,7 @@ msgstr ""
 "Uw DCP heeft een oneven aantal audio kanalen. Dit geeft hoogstwaarschijnlijk "
 "problemen met weergave."
 
-#: src/wx/hints_dialog.cc:76
+#: src/wx/hints_dialog.cc:101
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
@@ -1438,7 +1484,7 @@ msgstr ""
 "Uw DCP heeft minder dan 6 audio kanalen. This kan problemen geven op sommige "
 "projectors."
 
-#: src/wx/hints_dialog.cc:81
+#: src/wx/hints_dialog.cc:106
 #, fuzzy
 msgid ""
 "Your DCP has no audio channels.  This is likely to cause problems on "
@@ -1447,44 +1493,134 @@ msgstr ""
 "Uw DCP heeft een oneven aantal audio kanalen. Dit geeft hoogstwaarschijnlijk "
 "problemen met weergave."
 
-#: src/wx/timeline.cc:229
+#: src/wx/timeline_audio_content_view.cc:37
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/properties_dialog.cc:46
-msgid "counting..."
-msgstr "tellen..."
-
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
 msgid "dB"
 msgstr "dB"
 
+#. // TRANSLATORS: this is an abbreviation for "frames"
+#: src/wx/timing_panel.cc:68
+msgid "f"
+msgstr ""
+
+#: src/wx/content_properties_dialog.cc:52
+#, fuzzy
+msgid "frames per second"
+msgstr "Frames zijn al omgezet"
+
+#. // TRANSLATORS: this is an abbreviation for "hours"
+#: src/wx/timing_panel.cc:46
+msgid "h"
+msgstr ""
+
+#. // TRANSLATORS: this is an abbreviation for "minutes"
+#: src/wx/timing_panel.cc:54
+#, fuzzy
+msgid "m"
+msgstr "ms"
+
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:302
+#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:356
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:264
+#. // TRANSLATORS: this is an abbreviation for "seconds"
+#: src/wx/config_dialog.cc:318 src/wx/timing_panel.cc:61
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:258
+#: src/wx/timeline_video_content_view.cc:36
 msgid "still"
 msgstr "still"
 
-#: src/wx/timeline.cc:289
+#: src/wx/timeline_subtitle_content_view.cc:35
 #, fuzzy
 msgid "subtitles"
 msgstr "Ondertitels"
 
+#: src/wx/colour_conversion_editor.cc:64
+msgid "threshold"
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr "tijden"
 
-#: src/wx/timeline.cc:260
+#: src/wx/timeline_video_content_view.cc:38
 msgid "video"
 msgstr "video"
 
+#: src/wx/content_properties_dialog.cc:44
+#, fuzzy
+msgid "video frames"
+msgstr "Video frame rate"
+
+#: src/wx/colour_conversion_editor.cc:107
+msgid "x"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:108
+msgid "y"
+msgstr ""
+
+#~ msgid "BsL"
+#~ msgstr "BsL"
+
+#~ msgid "BsR"
+#~ msgstr "BsR"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Calculate digests"
+#~ msgstr "Bereken..."
+
+#~ msgid "Colour Conversions"
+#~ msgstr "Colour Conversions"
+
+#~ msgid "DCP Name"
+#~ msgstr "DCP naam"
+
+#~ msgid "HI"
+#~ msgstr "HI"
+
+#~ msgid "L"
+#~ msgstr "L"
+
+#~ msgid "Lc"
+#~ msgstr "Lc"
+
+#~ msgid "Lfe"
+#~ msgstr "Lfe"
+
+#~ msgid "Ls"
+#~ msgstr "Ls"
+
+#~ msgid "R"
+#~ msgstr "R"
+
+#~ msgid "Rc"
+#~ msgstr "Rc"
+
+#~ msgid "Rs"
+#~ msgstr "Rs"
+
+#~ msgid "Scaler"
+#~ msgstr "Schaler"
+
+#~ msgid "Top crop"
+#~ msgstr "Top crop"
+
+#~ msgid "VI"
+#~ msgstr "VI"
+
+#~ msgid "counting..."
+#~ msgstr "tellen..."
+
 #~ msgid "Bad setting for %s (%s)"
 #~ msgstr "Verkeede instellingen voor %s (%s)"
 
@@ -1500,9 +1636,6 @@ msgstr "video"
 #~ msgid "Hz"
 #~ msgstr "Hz"
 
-#~ msgid "channels"
-#~ msgstr "kanalen"
-
 #~ msgid "Default creator"
 #~ msgstr "Standaard maker"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index b2be913f7..effbaa0a5 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/wx/key_dialog.cc:44
 msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-09 15:45+0000\n"
+"POT-Creation-Date: 2015-06-11 12:38+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -30,11 +31,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:990
+#: src/wx/config_dialog.cc:984
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(lösenord sparas på disk i klartext)"
 
-#: src/wx/config_dialog.cc:111
+#: src/wx/config_dialog.cc:165
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
@@ -44,11 +45,11 @@ 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:107
+#: src/wx/colour_conversion_editor.cc:188
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/video_panel.cc:199
+#: src/wx/video_panel.cc:219
 msgid "2D"
 msgstr "2D"
 
@@ -57,47 +58,57 @@ msgstr "2D"
 msgid "2D version of content available in 3D"
 msgstr "Nya versioner av DCP-o-matic finns tillgängligt."
 
-#: src/wx/dcp_panel.cc:612
+#: src/wx/dcp_panel.cc:645
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:560
+#: src/wx/dcp_panel.cc:602
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:222
 msgid "3D alternate"
 msgstr ""
 
-#: src/wx/video_panel.cc:203
+#: src/wx/video_panel.cc:223
 msgid "3D left only"
 msgstr ""
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:220
 msgid "3D left/right"
 msgstr "3D left/right"
 
-#: src/wx/video_panel.cc:204
+#: src/wx/video_panel.cc:224
 #, fuzzy
 msgid "3D right only"
 msgstr "3D left/right"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:221
 msgid "3D top/bottom"
 msgstr "3D top/bottom"
 
-#: src/wx/dcp_panel.cc:613
+#: src/wx/dcp_panel.cc:646
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/hints_dialog.cc:120
+#: src/wx/timing_panel.cc:109
+msgid ""
+"<i>Only change this if it the content's frame rate has been read incorrectly."
+"</i>"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "A"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:144
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/wx/update_dialog.cc:34
+#: src/wx/update_dialog.cc:35
 msgid "A new version of DCP-o-matic is available."
 msgstr "En ny version av DCP-o-matic finns tillgänglig."
 
@@ -109,7 +120,7 @@ msgstr "Om DCP-o-matic"
 msgid "Add Cinema..."
 msgstr "Lägg till Cinema..."
 
-#: src/wx/content_menu.cc:57
+#: src/wx/content_menu.cc:62
 #, fuzzy
 msgid "Add KDM..."
 msgstr "Lägg till Cinema..."
@@ -118,35 +129,39 @@ msgstr "Lägg till Cinema..."
 msgid "Add Screen..."
 msgstr "Lägg till Skärm..."
 
-#: src/wx/content_panel.cc:74
+#: src/wx/content_panel.cc:79
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
 msgstr ""
 
-#: src/wx/content_panel.cc:69
+#: src/wx/content_panel.cc:74
 msgid "Add file(s)..."
 msgstr "Lägg till fil(er)..."
 
-#: src/wx/content_panel.cc:73
+#: src/wx/content_panel.cc:78
 msgid "Add folder..."
 msgstr "Lägg till folder..."
 
 # "sekvens" eller "ordning"?
-#: src/wx/image_sequence_dialog.cc:27
+#: src/wx/image_sequence_dialog.cc:25
 #, fuzzy
 msgid "Add image sequence"
 msgstr "Behåll video i sekvens"
 
-#: src/wx/content_panel.cc:70
+#: src/wx/content_panel.cc:75
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:584 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:594 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Lägg till..."
 
-#: src/wx/hints_dialog.cc:108
+#: src/wx/colour_conversion_editor.cc:159
+msgid "Adjust white point to"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:132
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -154,7 +169,7 @@ msgid ""
 "\"DCP\" tab."
 msgstr ""
 
-#: src/wx/hints_dialog.cc:102
+#: src/wx/hints_dialog.cc:126
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -162,16 +177,16 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1128
+#: src/wx/config_dialog.cc:1133
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "bildhastighet"
 
-#: src/wx/about_dialog.cc:115
+#: src/wx/about_dialog.cc:116
 msgid "Artwork by"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:43 src/wx/dcp_panel.cc:93
+#: src/wx/audio_dialog.cc:35 src/wx/audio_panel.cc:42 src/wx/dcp_panel.cc:104
 msgid "Audio"
 msgstr "Audio"
 
@@ -179,7 +194,12 @@ msgstr "Audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Audiospråk (ex. SV)"
 
-#: src/wx/audio_mapping_view.cc:358
+#: src/wx/content_properties_dialog.cc:61
+#, fuzzy
+msgid "Audio channels"
+msgstr "kanaler"
+
+#: src/wx/audio_mapping_view.cc:314
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
@@ -187,7 +207,7 @@ msgstr ""
 "Audio kommer att överföras från innehållskanal %d till DCP-kanal %d "
 "oförändrad."
 
-#: src/wx/audio_mapping_view.cc:361
+#: src/wx/audio_mapping_view.cc:317
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -196,28 +216,30 @@ msgstr ""
 "Audio kommer att överföras från innehållskanal %d till DCP-kanal %d med "
 "förstärkning %.1fdB."
 
-#: src/wx/config_dialog.cc:1009
+#: src/wx/colour_conversion_editor.cc:70
+#, fuzzy
+msgid "B"
+msgstr "dB"
+
+#: src/wx/config_dialog.cc:1003
 #, fuzzy
 msgid "BCC address"
 msgstr "IP-adress"
 
-#: src/wx/video_panel.cc:125
-msgid "Bottom crop"
+#: src/wx/colour_conversion_editor.cc:126
+msgid "Blue chromaticity"
+msgstr ""
+
+#: src/wx/video_panel.cc:128
+#, fuzzy
+msgid "Bottom"
 msgstr "Nedre beskärning"
 
 #: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
 msgstr "Bläddra..."
 
-#: src/wx/audio_mapping_view.cc:325
-msgid "BsL"
-msgstr "BsL"
-
-#: src/wx/audio_mapping_view.cc:329
-msgid "BsR"
-msgstr "BsR"
-
-#: src/wx/dcp_panel.cc:556
+#: src/wx/dcp_panel.cc:598
 msgid "Burn subtitles into image"
 msgstr ""
 
@@ -225,18 +247,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Men jag måste använda mixervolym"
 
-#: src/wx/image_sequence_dialog.cc:33
-msgid ""
-"By default DCP-o-matic will calculate digests (hashes) of your image files "
-"so that it knows if they change.  Turning this off will speed up import but "
-"you must not alter the image files after import or strange things may happen."
-msgstr ""
-
-#: src/wx/audio_mapping_view.cc:293
-msgid "C"
-msgstr "C"
-
-#: src/wx/config_dialog.cc:1005
+#: src/wx/config_dialog.cc:999
 #, fuzzy
 msgid "CC address"
 msgstr "IP-adress"
@@ -254,16 +265,11 @@ msgstr ""
 msgid "CPL annotation text"
 msgstr ""
 
-#: src/wx/image_sequence_dialog.cc:31
-#, fuzzy
-msgid "Calculate digests"
-msgstr "Beräkna..."
-
-#: src/wx/audio_panel.cc:66
+#: src/wx/audio_panel.cc:60
 msgid "Calculate..."
 msgstr "Beräkna..."
 
-#: src/wx/job_manager_view.cc:66
+#: src/wx/job_manager_view.cc:59
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -272,17 +278,17 @@ msgstr "Avbryt"
 msgid "Certificate"
 msgstr "Välj certifikatfil"
 
-#: src/wx/config_dialog.cc:551
+#: src/wx/config_dialog.cc:561
 msgid "Certificate chain for signing DCPs and KDMs:"
 msgstr ""
 
-#: src/wx/dolby_certificate_dialog.cc:191
-#: src/wx/doremi_certificate_dialog.cc:103
+#: src/wx/dolby_certificate_dialog.cc:192
+#: src/wx/doremi_certificate_dialog.cc:104
 #, fuzzy
 msgid "Certificate downloaded"
 msgstr "Välj certifikatfil"
 
-#: src/wx/config_dialog.cc:612
+#: src/wx/config_dialog.cc:620
 msgid "Certificate for decrypting DCPs"
 msgstr ""
 
@@ -294,31 +300,31 @@ msgstr ""
 msgid "Channel gain"
 msgstr "Kanalförstärkning"
 
-#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:628
+#: src/wx/audio_dialog.cc:56 src/wx/dcp_panel.cc:662
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:180
 msgid "Check for testing updates as well as stable ones"
 msgstr "sök efter både test- och stabila uppdateringar"
 
-#: src/wx/config_dialog.cc:122
+#: src/wx/config_dialog.cc:176
 msgid "Check for updates on startup"
 msgstr "Sök efter uppdateringar vid start"
 
-#: src/wx/content_menu.cc:198
+#: src/wx/content_menu.cc:244
 msgid "Choose a file"
 msgstr "Välj en fil"
 
-#: src/wx/content_panel.cc:237
+#: src/wx/content_panel.cc:242
 msgid "Choose a file or files"
 msgstr "Välj en fil eller filer"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:260
+#: src/wx/content_menu.cc:237 src/wx/content_panel.cc:264
 msgid "Choose a folder"
 msgstr "Välj en folder"
 
-#: src/wx/fonts_dialog.cc:116
+#: src/wx/fonts_dialog.cc:120
 #, fuzzy
 msgid "Choose a font file"
 msgstr "Välj en fil"
@@ -328,18 +334,13 @@ msgstr "Välj en fil"
 msgid "Cinema"
 msgstr "Lägg till Cinema..."
 
-#: src/wx/config_dialog.cc:491
-#, fuzzy
-msgid "Colour Conversions"
-msgstr "Färgkonverteringar"
-
-#: src/wx/content_colour_conversion_dialog.cc:34
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:172
+#: src/wx/content_colour_conversion_dialog.cc:35
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:181
 msgid "Colour conversion"
 msgstr "Färgkonvertering"
 
 # Svengelska
-#: src/wx/config_dialog.cc:1148
+#: src/wx/config_dialog.cc:1153
 #, fuzzy
 msgid "Config|Timing"
 msgstr "Tajming"
@@ -348,15 +349,20 @@ msgstr "Tajming"
 msgid "Contact email"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:537
+#: src/wx/dcp_panel.cc:573
 msgid "Container"
 msgstr "Innehåll"
 
-#: src/wx/audio_mapping_view.cc:278 src/wx/film_editor.cc:49
+#: src/wx/audio_mapping_view.cc:250 src/wx/film_editor.cc:49
 msgid "Content"
 msgstr "Innehåll"
 
-#: src/wx/dcp_panel.cc:84
+#: src/wx/content_properties_dialog.cc:34
+#, fuzzy
+msgid "Content Properties"
+msgstr "Film Egenskaper"
+
+#: src/wx/dcp_panel.cc:95
 msgid "Content Type"
 msgstr "Innehållstyp"
 
@@ -364,7 +370,7 @@ msgstr "Innehållstyp"
 msgid "Content version"
 msgstr "Innehållsversion"
 
-#: src/wx/dcp_panel.cc:73
+#: src/wx/dcp_panel.cc:78
 msgid "Copy as name"
 msgstr ""
 
@@ -372,30 +378,30 @@ msgstr ""
 msgid "Copy..."
 msgstr ""
 
-#: src/wx/audio_dialog.cc:151
+#: src/wx/audio_dialog.cc:182
 msgid "Could not analyse audio."
 msgstr "Kunde inte analysera audio."
 
-#: src/wx/content_panel.cc:286
-msgid "Could not find a DCP in that folder."
+#: src/wx/content_panel.cc:290
+msgid "Could not find a DCP nor a set of images in that folder."
 msgstr ""
 
-#: src/wx/content_panel.cc:307
+#: src/wx/content_panel.cc:310
 msgid "Could not find any images in that folder"
 msgstr ""
 
-#: src/wx/film_viewer.cc:178
+#: src/wx/film_viewer.cc:181
 #, fuzzy, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Kunde inte öppna innehållsfilen (%s)"
 
-#: src/wx/config_dialog.cc:675 src/wx/config_dialog.cc:770
-#: src/wx/config_dialog.cc:790 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:673 src/wx/config_dialog.cc:768
+#: src/wx/config_dialog.cc:788 src/wx/screen_dialog.cc:95
 #, fuzzy, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Kunde inte öppna innehållsfilen (%s)"
 
-#: src/wx/config_dialog.cc:762 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:760 src/wx/config_dialog.cc:810
 #, fuzzy, c-format
 msgid "Could not read key file (%s)"
 msgstr "Kunde inte öppna innehållsfilen (%s)"
@@ -408,8 +414,12 @@ msgstr ""
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
+#: src/wx/video_panel.cc:91
+msgid "Crop"
+msgstr ""
+
 # sammanhang?
-#: src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:190
 msgid "Custom"
 msgstr "Special"
 
@@ -417,10 +427,6 @@ msgstr "Special"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/dcp_panel.cc:79
-msgid "DCP Name"
-msgstr "DCP-namn"
-
 #: src/wx/kdm_dialog.cc:140
 msgid "DCP directory"
 msgstr ""
@@ -429,55 +435,55 @@ msgstr ""
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:98
-#, c-format
-msgid "DCP-o-matic audio - %s"
+#: src/wx/audio_dialog.cc:108
+#, fuzzy
+msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:276
+#: src/wx/config_dialog.cc:330
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:343
 msgid "Default JPEG2000 bandwidth"
 msgstr "Förvald JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:298
+#: src/wx/config_dialog.cc:352
 msgid "Default audio delay"
 msgstr "Förvald audiofördröjning"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:334
 msgid "Default container"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:338
 msgid "Default content type"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:268
+#: src/wx/config_dialog.cc:322
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:260
+#: src/wx/config_dialog.cc:314
 msgid "Default duration of still images"
 msgstr "Förvald varaktighet på stillbilder"
 
-#: src/wx/config_dialog.cc:306
+#: src/wx/config_dialog.cc:360
 #, fuzzy
 msgid "Default issuer"
 msgstr "Standardval"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:296
 msgid "Defaults"
 msgstr "Standardval"
 
-#: src/wx/audio_panel.cc:70
+#: src/wx/audio_panel.cc:64
 #, fuzzy
 msgid "Delay"
 msgstr "Audio Fördröjning"
 
-#: src/wx/dcp_panel.cc:71 src/wx/job_manager_view.cc:76
+#: src/wx/dcp_panel.cc:76 src/wx/job_manager_view.cc:69
 msgid "Details..."
 msgstr "Detaljer..."
 
@@ -486,12 +492,12 @@ msgid "Disk space required"
 msgstr "Diskutrymme som krävs"
 
 #: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
-#: src/wx/screen_dialog.cc:135
+#: src/wx/screen_dialog.cc:137
 msgid "Dolby"
 msgstr ""
 
 #: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
-#: src/wx/screen_dialog.cc:134
+#: src/wx/screen_dialog.cc:136
 msgid "Doremi"
 msgstr ""
 
@@ -499,11 +505,11 @@ msgstr ""
 msgid "Doremi serial numbers must have 6 digits"
 msgstr ""
 
-#: src/wx/content_panel.cc:85
+#: src/wx/content_panel.cc:90
 msgid "Down"
 msgstr "Ner"
 
-#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#: src/wx/download_certificate_dialog.cc:39 src/wx/screen_dialog.cc:47
 #, fuzzy
 msgid "Download"
 msgstr "Ner"
@@ -512,8 +518,8 @@ msgstr "Ner"
 msgid "Download certificate"
 msgstr ""
 
-#: src/wx/dolby_certificate_dialog.cc:157
-#: src/wx/doremi_certificate_dialog.cc:54
+#: src/wx/dolby_certificate_dialog.cc:158
+#: src/wx/doremi_certificate_dialog.cc:55
 msgid "Downloading certificate"
 msgstr ""
 
@@ -525,8 +531,8 @@ msgstr "Redigera Cinema..."
 msgid "Edit Screen..."
 msgstr "Redigera Skärm..."
 
-#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:277
-#: src/wx/video_panel.cc:168 src/wx/video_panel.cc:176
+#: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:331
+#: src/wx/dcp_panel.cc:123 src/wx/video_panel.cc:174 src/wx/video_panel.cc:193
 #: src/wx/editable_list.h:66
 msgid "Edit..."
 msgstr "Redigera..."
@@ -539,7 +545,7 @@ msgstr "Mejladress för KDM-leverans"
 msgid "Encoding Servers"
 msgstr "Kodningsservrar"
 
-#: src/wx/dcp_panel.cc:99
+#: src/wx/dcp_panel.cc:110
 msgid "Encrypted"
 msgstr "Krypterad"
 
@@ -547,11 +553,11 @@ msgstr "Krypterad"
 msgid "End"
 msgstr "Slut"
 
-#: src/wx/config_dialog.cc:1146
+#: src/wx/config_dialog.cc:1151
 msgid "Errors"
 msgstr ""
 
-#: src/wx/config_dialog.cc:638
+#: src/wx/config_dialog.cc:636
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
@@ -559,11 +565,11 @@ msgstr ""
 msgid "Facility (e.g. DLA)"
 msgstr "Företag (ex. DLA)"
 
-#: src/wx/video_panel.cc:138
+#: src/wx/video_panel.cc:141
 msgid "Fade in"
 msgstr ""
 
-#: src/wx/video_panel.cc:143
+#: src/wx/video_panel.cc:146
 msgid "Fade out"
 msgstr ""
 
@@ -574,6 +580,11 @@ msgstr ""
 msgid "Fetching..."
 msgstr "räknar..."
 
+#: src/wx/content_properties_dialog.cc:38
+#, fuzzy
+msgid "Filename"
+msgstr "Filmnamn"
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Film Egenskaper"
@@ -582,19 +593,19 @@ msgstr "Film Egenskaper"
 msgid "Film name"
 msgstr "Filmnamn"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:165
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:168
 msgid "Filters"
 msgstr "Filter"
 
-#: src/wx/content_menu.cc:55
+#: src/wx/content_menu.cc:59
 msgid "Find missing..."
 msgstr "Hitta saknade..."
 
-#: src/wx/fonts_dialog.cc:47
+#: src/wx/fonts_dialog.cc:48
 msgid "Font file"
 msgstr ""
 
-#: src/wx/fonts_dialog.cc:31
+#: src/wx/fonts_dialog.cc:32
 msgid "Fonts"
 msgstr ""
 
@@ -602,11 +613,11 @@ msgstr ""
 msgid "Fonts..."
 msgstr ""
 
-#: src/wx/dcp_panel.cc:543
+#: src/wx/dcp_panel.cc:584
 msgid "Frame Rate"
 msgstr "Bildhastighet"
 
-#: src/wx/image_sequence_dialog.cc:29
+#: src/wx/image_sequence_dialog.cc:27
 #, fuzzy
 msgid "Frame rate"
 msgstr "Bildhastighet"
@@ -615,12 +626,9 @@ msgstr "Bildhastighet"
 msgid "Frames"
 msgstr "Bildrutor"
 
-#: src/wx/properties_dialog.cc:45
-msgid "Frames already encoded"
-msgstr "Bildrutor redan kodade"
-
 #: src/wx/about_dialog.cc:65
-msgid "Free, open-source DCP generation from almost anything."
+#, fuzzy
+msgid "Free, open-source DCP creation from almost anything."
 msgstr "Fri, öppen-källkods DCP-generering från nästan vad som helst."
 
 # Sammanhang?
@@ -628,7 +636,7 @@ msgstr "Fri, öppen-källkods DCP-generering från nästan vad som helst."
 msgid "From"
 msgstr "Avsändare"
 
-#: src/wx/config_dialog.cc:1001
+#: src/wx/config_dialog.cc:995
 #, fuzzy
 msgid "From address"
 msgstr "IP-adress"
@@ -637,11 +645,11 @@ msgstr "IP-adress"
 msgid "Full"
 msgstr "Full"
 
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:79
 msgid "Full length"
 msgstr "Full längd"
 
-#: src/wx/audio_panel.cc:55
+#: src/wx/audio_panel.cc:49
 msgid "Gain"
 msgstr ""
 
@@ -654,19 +662,19 @@ msgstr "Volym Kalkylator"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Förstärkning för innehållskanal %d i DCP-kanal %d"
 
-#: src/wx/properties_dialog.cc:51
+#: src/wx/properties_dialog.cc:48
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:1142
+#: src/wx/config_dialog.cc:1147
 msgid "General"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:309
-msgid "HI"
-msgstr "HI"
+#: src/wx/colour_conversion_editor.cc:119
+msgid "Green chromaticity"
+msgstr ""
 
-#: src/wx/hints_dialog.cc:31
+#: src/wx/hints_dialog.cc:34
 msgid "Hints"
 msgstr "Råd"
 
@@ -682,15 +690,15 @@ msgstr "Datornamn eller IP-adress"
 msgid "I want to play this back at fader"
 msgstr "Jag vill spela upp detta med mixervolym"
 
-#: src/wx/fonts_dialog.cc:39
+#: src/wx/fonts_dialog.cc:40
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:886
+#: src/wx/config_dialog.cc:882
 msgid "IP address"
 msgstr "IP-adress"
 
-#: src/wx/config_dialog.cc:449
+#: src/wx/config_dialog.cc:505
 msgid "IP address / host name"
 msgstr "IP-adress / datornamn"
 
@@ -699,27 +707,20 @@ msgstr "IP-adress / datornamn"
 msgid "ISDCF name"
 msgstr "DCI namn"
 
-#: src/wx/colour_conversion_editor.cc:68
-msgid "Input A value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:73
-msgid "Input B value"
-msgstr ""
-
-#: src/wx/colour_conversion_editor.cc:53
+#: src/wx/colour_conversion_editor.cc:54
 msgid "Input gamma"
 msgstr "Indata gamma"
 
-#: src/wx/colour_conversion_editor.cc:58
-msgid "Input power"
-msgstr ""
+#: src/wx/colour_conversion_editor.cc:48
+#, fuzzy
+msgid "Input gamma correction"
+msgstr "Indata gamma"
 
-#: src/wx/colour_conversion_editor.cc:63
-msgid "Input threshold"
+#: src/wx/colour_conversion_editor.cc:59
+msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:714
+#: src/wx/config_dialog.cc:712
 msgid "Intermediate"
 msgstr ""
 
@@ -727,19 +728,19 @@ msgstr ""
 msgid "Intermediate common name"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:123
+#: src/wx/dcp_panel.cc:150
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/dcp_panel.cc:570
+#: src/wx/dcp_panel.cc:612
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000-bandbredd"
 
-#: src/wx/content_menu.cc:54
+#: src/wx/content_menu.cc:58
 msgid "Join"
 msgstr "Anslut"
 
-#: src/wx/config_dialog.cc:953
+#: src/wx/config_dialog.cc:955
 #, fuzzy
 msgid "KDM Email"
 msgstr "KDM mejl"
@@ -759,24 +760,20 @@ msgstr "Tajming"
 msgid "Keep video in sequence"
 msgstr "Behåll video i sekvens"
 
-#: src/wx/config_dialog.cc:535
-msgid "Keys"
+#: src/wx/dcp_panel.cc:119 src/wx/key_dialog.cc:26 src/wx/key_dialog.cc:28
+msgid "Key"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:285
-msgid "L"
-msgstr "V"
+#: src/wx/config_dialog.cc:548
+msgid "Keys"
+msgstr ""
 
 #: src/wx/subtitle_panel.cc:89
 #, fuzzy
 msgid "Language"
 msgstr "Välj språk"
 
-#: src/wx/audio_mapping_view.cc:317
-msgid "Lc"
-msgstr "Vc"
-
-#: src/wx/config_dialog.cc:712
+#: src/wx/config_dialog.cc:710
 msgid "Leaf"
 msgstr ""
 
@@ -784,49 +781,43 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
-#: src/wx/video_panel.cc:93
-msgid "Left crop"
+#: src/wx/video_panel.cc:96
+#, fuzzy
+msgid "Left"
 msgstr "Vänster beskärning"
 
-#: src/wx/audio_mapping_view.cc:297
-msgid "Lfe"
-msgstr "Lfe"
-
-#: src/wx/colour_conversion_editor.cc:49
-msgid "Linearise input gamma curve for low values"
+#: src/wx/colour_conversion_editor.cc:50
+#, fuzzy
+msgid "Linearise input gamma curve for small values"
 msgstr "Linjärisera indatas gammakurva för låga värden"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:607 src/wx/config_dialog.cc:620
-#: src/wx/config_dialog.cc:633
+#: src/wx/config_dialog.cc:616 src/wx/config_dialog.cc:624
+#: src/wx/config_dialog.cc:632
 #, fuzzy
 msgid "Load..."
 msgstr "Lägg till..."
 
-#: src/wx/config_dialog.cc:1136
+#: src/wx/config_dialog.cc:1141
 msgid "Log"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1133
+#: src/wx/config_dialog.cc:1138
 msgid "Log:"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:301
-msgid "Ls"
-msgstr "Vs"
-
-#: src/wx/content_panel.cc:461
+#: src/wx/content_panel.cc:462 src/wx/content_panel.cc:491
 msgid "MISSING: "
 msgstr "SAKNAS:"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:980
 msgid "Mail password"
 msgstr "Mejl-lösenord"
 
-#: src/wx/config_dialog.cc:982
+#: src/wx/config_dialog.cc:976
 msgid "Mail user name"
 msgstr "Mejl-användarnamn"
 
@@ -843,30 +834,30 @@ msgstr "Välj certifikatfil"
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr ""
 
-#: src/wx/colour_conversion_editor.cc:92
+#: src/wx/colour_conversion_editor.cc:109
 msgid "Matrix"
 msgstr "Matris"
 
-#: src/wx/config_dialog.cc:1120
+#: src/wx/config_dialog.cc:1125
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:293 src/wx/config_dialog.cc:1124
-#: src/wx/dcp_panel.cc:574
+#: src/wx/config_dialog.cc:347 src/wx/config_dialog.cc:1129
+#: src/wx/dcp_panel.cc:616
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/content_panel.cc:82
+#: src/wx/content_panel.cc:87
 msgid "Move the selected piece of content earlier in the film."
 msgstr ""
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:91
 msgid "Move the selected piece of content later in the film."
 msgstr ""
 
 # Låter mysko
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:345
 msgid "Multiple content selected"
 msgstr "Flera innehåll valda"
 
@@ -878,13 +869,12 @@ msgstr "Mina Dokument"
 msgid "My problem is"
 msgstr ""
 
-#: src/wx/content_panel.cc:465
+#: src/wx/content_panel.cc:495
 msgid "NEEDS KDM: "
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:505
-#: src/wx/dcp_panel.cc:56 src/wx/preset_colour_conversion_dialog.cc:38
-#: src/wx/screen_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/dcp_panel.cc:61
+#: src/wx/preset_colour_conversion_dialog.cc:38 src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Namn"
 
@@ -892,19 +882,19 @@ msgstr "Namn"
 msgid "New Film"
 msgstr "Ny Film"
 
-#: src/wx/update_dialog.cc:36
+#: src/wx/update_dialog.cc:37
 msgid "New versions of DCP-o-matic are available."
 msgstr "Nya versioner av DCP-o-matic finns tillgängligt."
 
-#: src/wx/audio_mapping_view.cc:356
+#: src/wx/audio_mapping_view.cc:312
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr ""
 "Ingen audio kommer att överföras från innehållskanalen %d till DCP-kanalen "
 "%d."
 
-#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:166
-#: src/wx/video_panel.cc:258 src/wx/video_panel.cc:267
+#: src/wx/dcp_panel.cc:672 src/wx/video_panel.cc:172 src/wx/video_panel.cc:186
+#: src/wx/video_panel.cc:289
 msgid "None"
 msgstr "Inget"
 
@@ -912,11 +902,11 @@ msgstr "Inget"
 msgid "Off"
 msgstr "Av"
 
-#: src/wx/config_dialog.cc:1154
+#: src/wx/config_dialog.cc:1159
 msgid "Open console window"
 msgstr ""
 
-#: src/wx/content_panel.cc:90
+#: src/wx/content_panel.cc:95
 msgid "Open the timeline for the film."
 msgstr ""
 
@@ -933,12 +923,12 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:978
+#: src/wx/config_dialog.cc:972
 msgid "Outgoing mail server"
 msgstr "Utgående mejlserver"
 
 # Låter mysko
-#: src/wx/film_viewer.cc:63
+#: src/wx/film_viewer.cc:62
 #, fuzzy
 msgid "Outline content"
 msgstr "Flera innehåll valda"
@@ -948,31 +938,41 @@ msgstr "Flera innehåll valda"
 msgid "Output"
 msgstr "Utdata gamma"
 
-#: src/wx/colour_conversion_editor.cc:103
+#: src/wx/colour_conversion_editor.cc:184
 msgid "Output gamma"
 msgstr "Utdata gamma"
 
+#: src/wx/colour_conversion_editor.cc:182
+#, fuzzy
+msgid "Output gamma correction"
+msgstr "Utdata gamma"
+
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/config_dialog.cc:898
+#: src/wx/config_dialog.cc:894
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/wx/job_manager_view.cc:71 src/wx/job_manager_view.cc:160
+#: src/wx/job_manager_view.cc:64 src/wx/job_manager_view.cc:133
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:60
+#: src/wx/audio_dialog.cc:74
 msgid "Peak"
 msgstr "Topp"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/audio_dialog.cc:245
+#, c-format
+msgid "Peak is %.2fdB at %s"
+msgstr ""
+
+#: src/wx/film_viewer.cc:68
 msgid "Play"
 msgstr "Spela"
 
-#: src/wx/timing_panel.cc:55
+#: src/wx/timing_panel.cc:88
 msgid "Play length"
 msgstr "Spellängd"
 
@@ -982,11 +982,11 @@ msgid ""
 "about the problem."
 msgstr ""
 
-#: src/wx/audio_plot.cc:86
+#: src/wx/audio_plot.cc:85
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
 
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:76
 msgid "Position"
 msgstr "Position"
 
@@ -994,48 +994,66 @@ msgstr "Position"
 msgid "Pre-release"
 msgstr ""
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:628
 msgid "Private key for decrypting DCPs"
 msgstr ""
 
-#: src/wx/config_dialog.cc:599
+#: src/wx/config_dialog.cc:610
 msgid "Private key for leaf certificate"
 msgstr ""
 
-#: src/wx/audio_panel.cc:89
-msgid "Process with"
+#: src/wx/dcp_panel.cc:670
+msgid "Processor"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:289
-msgid "R"
-msgstr "H"
+#: src/wx/content_menu.cc:60
+#, fuzzy
+msgid "Properties..."
+msgstr "Film Egenskaper"
 
-#: src/wx/audio_dialog.cc:61
+#: src/wx/colour_conversion_editor.cc:105
+#, fuzzy
+msgid "RGB to XYZ conversion"
+msgstr "Färgkonvertering"
+
+#: src/wx/audio_dialog.cc:75
 msgid "RMS"
 msgstr "RMS"
 
+#: src/wx/key_dialog.cc:48
+msgid "Random"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Klassificering (ex. 15)"
 
-#: src/wx/audio_mapping_view.cc:321
-msgid "Rc"
-msgstr "Hc"
-
-#: src/wx/content_menu.cc:56
+#: src/wx/content_menu.cc:61
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:595
+#: src/wx/config_dialog.cc:606
 msgid "Re-make certificates..."
 msgstr ""
 
+#: src/wx/colour_conversion_editor.cc:98
+msgid "Rec. 601"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:99
+msgid "Rec. 709"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:62
 msgid "Red band"
 msgstr ""
 
-#: src/wx/config_dialog.cc:586 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:77 src/wx/editable_list.h:68
+#: src/wx/colour_conversion_editor.cc:112
+msgid "Red chromaticity"
+msgstr ""
+
+#: src/wx/config_dialog.cc:596 src/wx/content_menu.cc:64
+#: src/wx/content_panel.cc:82 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1048,7 +1066,7 @@ msgstr "Ta bort Cinema"
 msgid "Remove Screen"
 msgstr "Ta bort Skärm"
 
-#: src/wx/content_panel.cc:78
+#: src/wx/content_panel.cc:83
 msgid "Remove the selected piece of content from the film."
 msgstr ""
 
@@ -1060,7 +1078,7 @@ msgstr "Upprepa"
 msgid "Repeat Content"
 msgstr "Repetera Innehåll"
 
-#: src/wx/content_menu.cc:53
+#: src/wx/content_menu.cc:57
 msgid "Repeat..."
 msgstr "Upprepa..."
 
@@ -1068,27 +1086,28 @@ msgstr "Upprepa..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1016
+#: src/wx/config_dialog.cc:1010
 msgid "Reset to default text"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:564
+#: src/wx/dcp_panel.cc:606
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: src/wx/job_manager_view.cc:163
+#: src/wx/job_manager_view.cc:136
 msgid "Resume"
 msgstr "Fortsätt"
 
-#: src/wx/audio_mapping_view.cc:364
+#: src/wx/video_panel.cc:106
+#, fuzzy
+msgid "Right"
+msgstr "Höger beskärning"
+
+#: src/wx/audio_mapping_view.cc:320
 msgid "Right click to change gain."
 msgstr "Högerklicka för att ändra förstärkning."
 
-#: src/wx/video_panel.cc:103
-msgid "Right crop"
-msgstr "Höger beskärning"
-
-#: src/wx/config_dialog.cc:710
+#: src/wx/config_dialog.cc:708
 msgid "Root"
 msgstr ""
 
@@ -1096,42 +1115,34 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:305
-msgid "Rs"
-msgstr "Hs"
-
-#: src/wx/dcp_panel.cc:122
+#: src/wx/dcp_panel.cc:149
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:148
+#: src/wx/video_panel.cc:151
 msgid "Scale to"
 msgstr "Skala om till"
 
-#: src/wx/dcp_panel.cc:579
-msgid "Scaler"
-msgstr "Omskalare"
-
 #: src/wx/kdm_dialog.cc:60
 #, fuzzy
 msgid "Screens"
 msgstr "Lägg till Skärm..."
 
-#: src/wx/kdm_dialog.cc:529
+#: src/wx/kdm_dialog.cc:531
 #, fuzzy
 msgid "Select CPL XML file"
 msgstr "Välj audiofil"
 
-#: src/wx/config_dialog.cc:666 src/wx/config_dialog.cc:782
-#: src/wx/config_dialog.cc:827 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:664 src/wx/config_dialog.cc:780
+#: src/wx/config_dialog.cc:825 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Välj certifikatfil"
 
-#: src/wx/content_menu.cc:266
+#: src/wx/content_menu.cc:312
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:756 src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:754 src/wx/config_dialog.cc:802
 #, fuzzy
 msgid "Select Key File"
 msgstr "Välj certifikatfil"
@@ -1160,33 +1171,34 @@ msgstr ""
 msgid "Server serial number"
 msgstr ""
 
-#: src/wx/config_dialog.cc:431
+#: src/wx/config_dialog.cc:488
 #, fuzzy
 msgid "Servers"
 msgstr "Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:64
+#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:97
 msgid "Set"
 msgstr "Sätt"
 
-#: src/wx/fonts_dialog.cc:57
+#: src/wx/fonts_dialog.cc:58
 #, fuzzy
 msgid "Set file..."
 msgstr "Lägg till fil(er)..."
 
-#: src/wx/config_dialog.cc:99
+#: src/wx/config_dialog.cc:153
 msgid "Set language"
 msgstr "Välj språk"
 
-#: src/wx/audio_panel.cc:51
-msgid "Show Audio..."
+#: src/wx/dcp_panel.cc:679
+#, fuzzy
+msgid "Show audio..."
 msgstr "Visa Audio..."
 
-#: src/wx/dcp_panel.cc:95
+#: src/wx/dcp_panel.cc:106
 msgid "Signed"
 msgstr "Signerad"
 
-#: src/wx/audio_dialog.cc:71
+#: src/wx/audio_dialog.cc:85
 msgid "Smoothing"
 msgstr "Utjämning"
 
@@ -1195,11 +1207,11 @@ msgstr "Utjämning"
 msgid "Snap"
 msgstr "Snap"
 
-#: src/wx/update_dialog.cc:43
+#: src/wx/update_dialog.cc:45
 msgid "Stable version "
 msgstr "Stabil version"
 
-#: src/wx/dcp_panel.cc:103
+#: src/wx/dcp_panel.cc:129
 msgid "Standard"
 msgstr "Standard"
 
@@ -1208,7 +1220,7 @@ msgstr "Standard"
 msgid "Start"
 msgstr "Start"
 
-#: src/wx/audio_panel.cc:84 src/wx/subtitle_panel.cc:93
+#: src/wx/subtitle_panel.cc:93
 #, fuzzy
 msgid "Stream"
 msgstr "Audioström"
@@ -1217,7 +1229,7 @@ msgstr "Audioström"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/config_dialog.cc:997
+#: src/wx/config_dialog.cc:991
 msgid "Subject"
 msgstr ""
 
@@ -1234,15 +1246,15 @@ msgstr "Undertextspråk (ex. SV)"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:174
+#: src/wx/about_dialog.cc:187
 msgid "Supported by"
 msgstr "Stöd från"
 
-#: src/wx/config_dialog.cc:868
+#: src/wx/config_dialog.cc:865
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:890
+#: src/wx/config_dialog.cc:886
 msgid "Target path"
 msgstr "Målsökväg"
 
@@ -1255,16 +1267,16 @@ msgstr "Testversion"
 msgid "Territory (e.g. UK)"
 msgstr "Område (ex. SV)"
 
-#: src/wx/update_dialog.cc:48
+#: src/wx/update_dialog.cc:51
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:220
+#: src/wx/about_dialog.cc:235
 #, fuzzy
 msgid "Tested by"
 msgstr "Översatt av"
 
-#: src/wx/content_menu.cc:252
+#: src/wx/content_menu.cc:298
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1273,15 +1285,15 @@ msgstr ""
 "Innehållsfilerna du angav är inte samma som de som saknas. Försök igen med "
 "rätt innehållsfiler eller ta bort det saknade innehållet."
 
-#: src/wx/hints_dialog.cc:154
+#: src/wx/hints_dialog.cc:178
 msgid "There are no hints: everything looks good!"
 msgstr "Det finns inga råd: allt verkar bra!"
 
-#: src/wx/film_viewer.cc:144
+#: src/wx/film_viewer.cc:143
 msgid "There is not enough free memory to do that."
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:554
+#: src/wx/kdm_dialog.cc:556
 msgid "This is not a valid CPL file"
 msgstr ""
 
@@ -1289,15 +1301,15 @@ msgstr ""
 msgid "Threads"
 msgstr "Trådar"
 
-#: src/wx/config_dialog.cc:118
+#: src/wx/config_dialog.cc:172
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:580
 msgid "Thumbprint"
 msgstr ""
 
-#: src/wx/audio_plot.cc:165
+#: src/wx/audio_plot.cc:164
 msgid "Time"
 msgstr "Tid"
 
@@ -1305,38 +1317,38 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: src/wx/content_panel.cc:89
+#: src/wx/content_panel.cc:94
 msgid "Timeline..."
 msgstr "Tidslinje..."
 
 # Svengelska
-#: src/wx/timing_panel.cc:38
+#: src/wx/timing_panel.cc:37
 #, fuzzy
 msgid "Timing|Timing"
 msgstr "Tajming"
 
-#: src/wx/video_panel.cc:115
-msgid "Top crop"
-msgstr "Övre beskärning"
+#: src/wx/video_panel.cc:118
+msgid "Top"
+msgstr ""
 
-#: src/wx/about_dialog.cc:111
+#: src/wx/about_dialog.cc:112
 msgid "Translated by"
 msgstr "Översatt av"
 
-#: src/wx/timing_panel.cc:52
+#: src/wx/timing_panel.cc:85
 msgid "Trim from end"
 msgstr "Trimma från slut"
 
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:82
 msgid "Trim from start"
 msgstr "Trimma från start"
 
-#: src/wx/audio_dialog.cc:55 src/wx/config_dialog.cc:562
-#: src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:68 src/wx/config_dialog.cc:572
+#: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Typ"
 
-#: src/wx/dolby_certificate_dialog.cc:182
+#: src/wx/dolby_certificate_dialog.cc:183
 #, fuzzy
 msgid "Unexpected certificate filename form"
 msgstr "Välj certifikatfil"
@@ -1351,28 +1363,28 @@ msgstr "okänt"
 msgid "Until"
 msgstr "Tills"
 
-#: src/wx/content_panel.cc:81
+#: src/wx/content_panel.cc:86
 msgid "Up"
 msgstr "Upp"
 
-#: src/wx/update_dialog.cc:27
+#: src/wx/update_dialog.cc:28
 msgid "Update"
 msgstr "Uppdatera"
 
-#: src/wx/dcp_panel.cc:66
+#: src/wx/dcp_panel.cc:71
 #, fuzzy
 msgid "Use ISDCF name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/config_dialog.cc:445
+#: src/wx/config_dialog.cc:501
 msgid "Use all servers"
 msgstr "Använd alla servrar"
 
-#: src/wx/dcp_panel.cc:550
+#: src/wx/dcp_panel.cc:592
 msgid "Use best"
 msgstr "Använd bästa"
 
-#: src/wx/content_colour_conversion_dialog.cc:42
+#: src/wx/content_colour_conversion_dialog.cc:43
 msgid "Use preset"
 msgstr "Använd förhandsinställning"
 
@@ -1381,35 +1393,50 @@ msgstr "Använd förhandsinställning"
 msgid "Use subtitles"
 msgstr "Undertexter"
 
-#: src/wx/config_dialog.cc:894
+#: src/wx/config_dialog.cc:890
 msgid "User name"
 msgstr "Användarnamn"
 
-#: src/wx/audio_mapping_view.cc:313
-msgid "VI"
-msgstr "VI"
-
-#: src/wx/dcp_panel.cc:92 src/wx/video_panel.cc:70
+#: src/wx/dcp_panel.cc:103 src/wx/video_panel.cc:71
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/timing_panel.cc:60
+#: src/wx/content_properties_dialog.cc:51 src/wx/timing_panel.cc:93
 msgid "Video frame rate"
 msgstr "bildhastighet"
 
+#: src/wx/content_properties_dialog.cc:43
+#, fuzzy
+msgid "Video length"
+msgstr "Full längd"
+
+#: src/wx/content_properties_dialog.cc:47
+#, fuzzy
+msgid "Video size"
+msgstr "Video"
+
 #: src/wx/subtitle_panel.cc:97
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1144
+#: src/wx/config_dialog.cc:1149
 msgid "Warnings"
 msgstr ""
 
+#: src/wx/colour_conversion_editor.cc:133
+#, fuzzy
+msgid "White point"
+msgstr "Skriv till"
+
+#: src/wx/colour_conversion_editor.cc:157
+msgid "White point adjustment"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:172
 msgid "Write to"
 msgstr "Skriv till"
 
-#: src/wx/about_dialog.cc:95
+#: src/wx/about_dialog.cc:96
 msgid "Written by"
 msgstr "Skriven av"
 
@@ -1433,13 +1460,22 @@ msgstr "Undertext Förskjutning"
 msgid "Y Scale"
 msgstr "Omskalare"
 
-#: src/wx/hints_dialog.cc:147
+#: src/wx/colour_conversion_editor.cc:94
+#, fuzzy
+msgid "YUV to RGB conversion"
+msgstr "Färgkonvertering"
+
+#: src/wx/colour_conversion_editor.cc:96
+msgid "YUV to RGB matrix"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:171
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:133
+#: src/wx/hints_dialog.cc:157
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1448,7 +1484,16 @@ msgstr ""
 "Du har %d filer som verkar vara VOB-filer från DVD. Du borde sammanfoga dom "
 "för att säkerställa jämna övergångar mellan filerna."
 
-#: src/wx/hints_dialog.cc:114
+#: src/wx/hints_dialog.cc:92
+#, fuzzy
+msgid ""
+"You have specified a font file which is larger than 640kB.  This is very "
+"likely to cause problems on playback."
+msgstr ""
+"Din DCP har udda antal audiokanaler. Detta kommer troligen att ge problem "
+"vid uppspelning."
+
+#: src/wx/hints_dialog.cc:138
 #, c-format
 msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
@@ -1457,7 +1502,7 @@ msgstr ""
 "Din DCP-bildhastighet (%d bps) kan orsaka problem i några få (äldre) "
 "projektorer. Använd 24 eller 48 bilder per sekund för att vara säker."
 
-#: src/wx/hints_dialog.cc:72
+#: src/wx/hints_dialog.cc:97
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
@@ -1465,7 +1510,7 @@ msgstr ""
 "Din DCP har udda antal audiokanaler. Detta kommer troligen att ge problem "
 "vid uppspelning."
 
-#: src/wx/hints_dialog.cc:76
+#: src/wx/hints_dialog.cc:101
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
@@ -1473,7 +1518,7 @@ msgstr ""
 "Din DCP har mindre än 6 audiokanaler. Detta kan medföra problem på vissa "
 "projektorer."
 
-#: src/wx/hints_dialog.cc:81
+#: src/wx/hints_dialog.cc:106
 #, fuzzy
 msgid ""
 "Your DCP has no audio channels.  This is likely to cause problems on "
@@ -1482,45 +1527,136 @@ msgstr ""
 "Din DCP har udda antal audiokanaler. Detta kommer troligen att ge problem "
 "vid uppspelning."
 
-#: src/wx/timeline.cc:229
+#: src/wx/timeline_audio_content_view.cc:37
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/properties_dialog.cc:46
-msgid "counting..."
-msgstr "räknar..."
-
-#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:65
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:59
 msgid "dB"
 msgstr "dB"
 
+#. // TRANSLATORS: this is an abbreviation for "frames"
+#: src/wx/timing_panel.cc:68
+msgid "f"
+msgstr ""
+
+#: src/wx/content_properties_dialog.cc:52
+#, fuzzy
+msgid "frames per second"
+msgstr "Bildrutor redan kodade"
+
+#. // TRANSLATORS: this is an abbreviation for "hours"
+#: src/wx/timing_panel.cc:46
+msgid "h"
+msgstr ""
+
+#. // TRANSLATORS: this is an abbreviation for "minutes"
+#: src/wx/timing_panel.cc:54
+#, fuzzy
+msgid "m"
+msgstr "ms"
+
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:81 src/wx/config_dialog.cc:302
+#: src/wx/audio_panel.cc:75 src/wx/config_dialog.cc:356
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:264
+#. // TRANSLATORS: this is an abbreviation for "seconds"
+#: src/wx/config_dialog.cc:318 src/wx/timing_panel.cc:61
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:258
+#: src/wx/timeline_video_content_view.cc:36
 msgid "still"
 msgstr "stillbild"
 
-#: src/wx/timeline.cc:289
+#: src/wx/timeline_subtitle_content_view.cc:35
 #, fuzzy
 msgid "subtitles"
 msgstr "Undertexter"
 
+#: src/wx/colour_conversion_editor.cc:64
+msgid "threshold"
+msgstr ""
+
 # Sammanhang?
 #: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr "tider"
 
-#: src/wx/timeline.cc:260
+#: src/wx/timeline_video_content_view.cc:38
 msgid "video"
 msgstr "video"
 
+#: src/wx/content_properties_dialog.cc:44
+#, fuzzy
+msgid "video frames"
+msgstr "bildhastighet"
+
+#: src/wx/colour_conversion_editor.cc:107
+msgid "x"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:108
+msgid "y"
+msgstr ""
+
+#~ msgid "BsL"
+#~ msgstr "BsL"
+
+#~ msgid "BsR"
+#~ msgstr "BsR"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Calculate digests"
+#~ msgstr "Beräkna..."
+
+#, fuzzy
+#~ msgid "Colour Conversions"
+#~ msgstr "Färgkonverteringar"
+
+#~ msgid "DCP Name"
+#~ msgstr "DCP-namn"
+
+#~ msgid "HI"
+#~ msgstr "HI"
+
+#~ msgid "L"
+#~ msgstr "V"
+
+#~ msgid "Lc"
+#~ msgstr "Vc"
+
+#~ msgid "Lfe"
+#~ msgstr "Lfe"
+
+#~ msgid "Ls"
+#~ msgstr "Vs"
+
+#~ msgid "R"
+#~ msgstr "H"
+
+#~ msgid "Rc"
+#~ msgstr "Hc"
+
+#~ msgid "Rs"
+#~ msgstr "Hs"
+
+#~ msgid "Scaler"
+#~ msgstr "Omskalare"
+
+#~ msgid "Top crop"
+#~ msgstr "Övre beskärning"
+
+#~ msgid "VI"
+#~ msgstr "VI"
+
+#~ msgid "counting..."
+#~ msgstr "räknar..."
+
 #~ msgid "Bad setting for %s (%s)"
 #~ msgstr "Felaktig inställning för %s (%s)"
 
@@ -1537,9 +1673,6 @@ msgstr "video"
 #~ msgid "Hz"
 #~ msgstr "Hz"
 
-#~ msgid "channels"
-#~ msgstr "kanaler"
-
 #, fuzzy
 #~ msgid "Default creator"
 #~ msgstr "Förvald innehållstyp"