pot/merge.

1 files changed, 275 insertions, 248 deletions

diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index 9b5944fdc..29cbaece5 100644
--- a/src/lib/po/tr_TR.po
+++ b/src/lib/po/tr_TR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 10:22+0200\n"
+"POT-Creation-Date: 2020-11-21 23:59+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,11 +56,11 @@ msgstr ""
 
 #. / TRANSLATORS: the %1 in this string will be filled in with a day of the week
 #. / to say what day a job will finish.
-#: src/lib/job.cc:494
+#: src/lib/job.cc:490
 msgid " on %1"
 msgstr ""
 
-#: src/lib/config.cc:1228
+#: src/lib/config.cc:1213
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -73,31 +73,31 @@ msgid ""
 "Size: $SIZE\n"
 msgstr ""
 
-#: src/lib/config.cc:1206
+#: src/lib/config.cc:1191
 msgid "$JOB_NAME: $JOB_STATUS"
 msgstr ""
 
-#: src/lib/cross_common.cc:89
+#: src/lib/cross_common.cc:92
 msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
-#: src/lib/atmos_mxf_content.cc:84
+#: src/lib/atmos_mxf_content.cc:88
 msgid "%1 [Atmos]"
 msgstr ""
 
-#: src/lib/dcp_content.cc:287
+#: src/lib/dcp_content.cc:319
 msgid "%1 [DCP]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:353
+#: src/lib/ffmpeg_content.cc:361
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:349
+#: src/lib/ffmpeg_content.cc:357
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:351 src/lib/video_mxf_content.cc:97
+#: src/lib/ffmpeg_content.cc:359 src/lib/video_mxf_content.cc:97
 msgid "%1 [video]"
 msgstr ""
 
@@ -156,11 +156,11 @@ msgstr ""
 msgid "; %.1f fps"
 msgstr ""
 
-#: src/lib/job.cc:499
+#: src/lib/job.cc:495
 msgid "; %1 remaining; finishing at %2%3"
 msgstr ""
 
-#: src/lib/analytics.cc:57
+#: src/lib/analytics.cc:60
 msgid ""
 "<h2>You have made %1 DCPs with DCP-o-matic!</h2><img width=\"20%%\" src="
 "\"memory:me.jpg\" align=\"center\"><p>Hello. I'm Carl and I'm the developer "
@@ -175,14 +175,14 @@ msgid ""
 "Paypal to donate €10</a></ul><p>Thank you!"
 msgstr ""
 
-#: src/lib/hints.cc:150
+#: src/lib/hints.cc:147
 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/lib/ffmpeg_content.cc:631
+#: src/lib/ffmpeg_content.cc:641
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Advertisement"
 msgstr ""
 
-#: src/lib/hints.cc:138
+#: src/lib/hints.cc:124
 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.  "
@@ -198,22 +198,22 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/lib/hints.cc:142
+#: src/lib/hints.cc:128
 msgid ""
 "All of your content narrower than 1.90:1 but your DCP's container is Scope "
 "(2.39:1).  This will pillar-box your content.  You may prefer to set your "
 "DCP's container to have the same ratio as your content."
 msgstr ""
 
-#: src/lib/job.cc:109
+#: src/lib/job.cc:105
 msgid "An error occurred whilst handling the file %1."
 msgstr ""
 
-#: src/lib/analyse_audio_job.cc:131
+#: src/lib/analyse_audio_job.cc:137
 msgid "Analysing audio"
 msgstr ""
 
-#: src/lib/analyse_subtitles_job.cc:48
+#: src/lib/analyse_subtitles_job.cc:51
 msgid "Analysing subtitles"
 msgstr ""
 
@@ -229,52 +229,52 @@ msgstr ""
 msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:625
+#: src/lib/ffmpeg_content.cc:635
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:593
+#: src/lib/ffmpeg_content.cc:603
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:648
+#: src/lib/ffmpeg_content.cc:658
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:627
+#: src/lib/ffmpeg_content.cc:637
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:628
+#: src/lib/ffmpeg_content.cc:638
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:647
+#: src/lib/ffmpeg_content.cc:657
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:652
+#: src/lib/ffmpeg_content.cc:662
 msgid "BT2100"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:589
+#: src/lib/ffmpeg_content.cc:599
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:643
+#: src/lib/ffmpeg_content.cc:653
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:588
+#: src/lib/ffmpeg_content.cc:598
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:585 src/lib/ffmpeg_content.cc:614
-#: src/lib/ffmpeg_content.cc:639
+#: src/lib/ffmpeg_content.cc:595 src/lib/ffmpeg_content.cc:624
+#: src/lib/ffmpeg_content.cc:649
 msgid "BT709"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:659
+#: src/lib/ffmpeg_content.cc:669
 msgid "Bits per pixel"
 msgstr ""
 
@@ -282,23 +282,23 @@ msgstr ""
 msgid "Bob Weaver Deinterlacing Filter"
 msgstr ""
 
-#: src/lib/util.cc:582
+#: src/lib/util.cc:590
 msgid "BsL"
 msgstr ""
 
-#: src/lib/util.cc:583
+#: src/lib/util.cc:591
 msgid "BsR"
 msgstr ""
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:582
 msgid "C"
 msgstr ""
 
-#: src/lib/job.cc:508
+#: src/lib/job.cc:504
 msgid "Cancelled"
 msgstr ""
 
-#: src/lib/film.cc:350
+#: src/lib/film.cc:360
 msgid "Cannot contain slashes"
 msgstr ""
 
@@ -306,15 +306,15 @@ msgstr ""
 msgid "Cannot handle pixel format %1 during %2"
 msgstr ""
 
-#: src/lib/film.cc:1496
+#: src/lib/film.cc:1621
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr ""
 
-#: src/lib/util.cc:543
+#: src/lib/util.cc:551
 msgid "Centre"
 msgstr ""
 
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:294
 msgid "Channels"
 msgstr ""
 
@@ -322,7 +322,7 @@ msgstr ""
 msgid "Checking content for changes"
 msgstr ""
 
-#: src/lib/reel_writer.cc:225
+#: src/lib/reel_writer.cc:240
 msgid "Checking existing image data"
 msgstr ""
 
@@ -330,19 +330,19 @@ msgstr ""
 msgid "Choose 'Make DCP' again when you have done this."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:651
+#: src/lib/ffmpeg_content.cc:661
 msgid "Chroma-derived constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:650
+#: src/lib/ffmpeg_content.cc:660
 msgid "Chroma-derived non-constant luminance"
 msgstr ""
 
-#: src/lib/types.cc:140
+#: src/lib/types.cc:143
 msgid "Closed captions"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:610
+#: src/lib/ffmpeg_content.cc:620
 msgid "Colour primaries"
 msgstr ""
 
@@ -356,29 +356,33 @@ msgstr ""
 #. / file is limited, so that not all possible values are valid.
 #. / TRANSLATORS: this means that the range of pixel values used in this
 #. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:542 src/lib/ffmpeg_content.cc:549
-#: src/lib/ffmpeg_content.cc:556 src/lib/ffmpeg_content.cc:566
-#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:552 src/lib/ffmpeg_content.cc:559
+#: src/lib/ffmpeg_content.cc:566 src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:581 src/lib/ffmpeg_content.cc:586
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:635
+#: src/lib/ffmpeg_content.cc:645
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:656
+#: src/lib/ffmpeg_content.cc:666
 msgid "Colourspace"
 msgstr ""
 
+#: src/lib/combine_dcp_job.cc:46
+msgid "Combine DCPs"
+msgstr ""
+
 #: src/lib/content.cc:186
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:528
+#: src/lib/writer.cc:547
 msgid "Computing digests"
 msgstr ""
 
-#: src/lib/analytics.cc:55
+#: src/lib/analytics.cc:58
 msgid "Congratulations!"
 msgstr ""
 
@@ -386,7 +390,7 @@ msgstr ""
 msgid "Content and DCP have the same rate.\n"
 msgstr ""
 
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:295
 msgid "Content audio sample rate"
 msgstr ""
 
@@ -406,11 +410,11 @@ msgstr ""
 msgid "Content to be joined must have all its video used or not used."
 msgstr ""
 
-#: src/lib/text_content.cc:261
+#: src/lib/text_content.cc:254
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr ""
 
-#: src/lib/text_content.cc:257
+#: src/lib/text_content.cc:250
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr ""
 
@@ -442,7 +446,7 @@ msgstr ""
 msgid "Content to be joined must have the same fades."
 msgstr ""
 
-#: src/lib/text_content.cc:289
+#: src/lib/text_content.cc:282
 msgid "Content to be joined must have the same outline width."
 msgstr ""
 
@@ -450,27 +454,27 @@ msgstr ""
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/text_content.cc:265
+#: src/lib/text_content.cc:258
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 
-#: src/lib/text_content.cc:273
+#: src/lib/text_content.cc:266
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr ""
 
-#: src/lib/text_content.cc:269
+#: src/lib/text_content.cc:262
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:270
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr ""
 
-#: src/lib/text_content.cc:285
+#: src/lib/text_content.cc:278
 msgid "Content to be joined must have the same subtitle fades."
 msgstr ""
 
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:274
 msgid "Content to be joined must have the same subtitle line spacing."
 msgstr ""
 
@@ -482,11 +486,11 @@ msgstr ""
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
-#: src/lib/text_content.cc:298
+#: src/lib/text_content.cc:291
 msgid "Content to be joined must use the same DCP track."
 msgstr ""
 
-#: src/lib/text_content.cc:294 src/lib/text_content.cc:306
+#: src/lib/text_content.cc:287 src/lib/text_content.cc:299
 msgid "Content to be joined must use the same fonts."
 msgstr ""
 
@@ -498,23 +502,23 @@ msgstr ""
 msgid "Content video is %1x%2"
 msgstr ""
 
-#: src/lib/upload_job.cc:57
+#: src/lib/upload_job.cc:60
 msgid "Copy DCP to TMS"
 msgstr ""
 
-#: src/lib/reel_writer.cc:117
+#: src/lib/reel_writer.cc:125
 msgid "Copying old video file"
 msgstr ""
 
-#: src/lib/reel_writer.cc:348
+#: src/lib/reel_writer.cc:380
 msgid "Copying video file into DCP"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:51
+#: src/lib/scp_uploader.cc:52
 msgid "Could not connect to server %1 (%2)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:88
+#: src/lib/scp_uploader.cc:91
 msgid "Could not create remote directory %1 (%2)"
 msgstr ""
 
@@ -522,21 +526,21 @@ msgstr ""
 msgid "Could not decode JPEG2000 file %1 (%2)"
 msgstr ""
 
-#: src/lib/ffmpeg_image_proxy.cc:153
+#: src/lib/ffmpeg_image_proxy.cc:161
 msgid "Could not decode image (%1)"
 msgstr ""
 
-#: src/lib/encode_server_finder.cc:185
+#: src/lib/encode_server_finder.cc:183
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
 msgstr ""
 
-#: src/lib/job.cc:164 src/lib/job.cc:179
+#: src/lib/job.cc:160 src/lib/job.cc:175
 msgid "Could not open %1"
 msgstr ""
 
-#: src/lib/curl_uploader.cc:86 src/lib/scp_uploader.cc:101
+#: src/lib/curl_uploader.cc:86 src/lib/scp_uploader.cc:104
 msgid "Could not open %1 to send"
 msgstr ""
 
@@ -548,7 +552,7 @@ msgstr ""
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
 msgstr ""
 
-#: src/lib/config.cc:1092
+#: src/lib/config.cc:1077
 msgid "Could not open file for writing"
 msgstr ""
 
@@ -556,7 +560,7 @@ msgstr ""
 msgid "Could not read subtitles (%1 / %2)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:71
+#: src/lib/scp_uploader.cc:74
 msgid "Could not start SCP session (%1)"
 msgstr ""
 
@@ -564,23 +568,23 @@ msgstr ""
 msgid "Could not start transfer"
 msgstr ""
 
-#: src/lib/curl_uploader.cc:93 src/lib/scp_uploader.cc:118
+#: src/lib/curl_uploader.cc:93 src/lib/scp_uploader.cc:121
 msgid "Could not write to remote file (%1)"
 msgstr ""
 
-#: src/lib/util.cc:553
+#: src/lib/util.cc:561
 msgid "D-BOX primary"
 msgstr ""
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:562
 msgid "D-BOX secondary"
 msgstr ""
 
-#: src/lib/util.cc:584
+#: src/lib/util.cc:592
 msgid "DBP"
 msgstr ""
 
-#: src/lib/util.cc:585
+#: src/lib/util.cc:593
 msgid "DBS"
 msgstr ""
 
@@ -592,11 +596,11 @@ msgstr ""
 msgid "DCI Scope"
 msgstr ""
 
-#: src/lib/dcp_subtitle_content.cc:109
+#: src/lib/dcp_subtitle_content.cc:103
 msgid "DCP XML subtitles"
 msgstr ""
 
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:315
 msgid "DCP sample rate"
 msgstr ""
 
@@ -609,24 +613,30 @@ msgstr ""
 msgid "DCP will use every other frame of the content.\n"
 msgstr ""
 
-#: src/lib/job.cc:166 src/lib/job.cc:181
+#: src/lib/job.cc:162 src/lib/job.cc:177
 msgid ""
 "DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
 "is in an unexpected format."
 msgstr ""
 
-#: src/lib/film.cc:1419
+#: src/lib/film.cc:1524
 msgid ""
 "DCP-o-matic had to change your settings for referring to DCPs as OV.  Please "
 "review those settings to make sure they are what you want."
 msgstr ""
 
+#: src/lib/film.cc:1500
+msgid ""
+"DCP-o-matic had to change your settings so that the film's frame rate is the "
+"same as that of your Atmos content."
+msgstr ""
+
 #: src/lib/ffmpeg_content.cc:119
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
 
-#: src/lib/config.cc:378 src/lib/config.cc:1203
+#: src/lib/config.cc:377 src/lib/config.cc:1188
 msgid "DCP-o-matic notification"
 msgstr ""
 
@@ -639,7 +649,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr ""
 
-#: src/lib/config.cc:1191
+#: src/lib/config.cc:1176
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -690,7 +700,7 @@ msgstr ""
 msgid "Email problem report for %1"
 msgstr ""
 
-#: src/lib/dcp_encoder.cc:97 src/lib/ffmpeg_encoder.cc:142
+#: src/lib/dcp_encoder.cc:102 src/lib/ffmpeg_encoder.cc:125
 msgid "Encoding"
 msgstr ""
 
@@ -702,11 +712,11 @@ msgstr ""
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/job.cc:506
+#: src/lib/job.cc:502
 msgid "Error: %1"
 msgstr ""
 
-#: src/lib/hints.cc:260
+#: src/lib/hints.cc:332
 msgid "Examining closed captions"
 msgstr ""
 
@@ -718,19 +728,19 @@ msgstr ""
 msgid "Examining subtitles"
 msgstr ""
 
-#: src/lib/subtitle_encoder.cc:80
+#: src/lib/subtitle_encoder.cc:89
 msgid "Extracting"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:642
+#: src/lib/ffmpeg_content.cc:652
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:61
+#: src/lib/scp_uploader.cc:64
 msgid "Failed to authenticate with server (%1)"
 msgstr ""
 
-#: src/lib/job.cc:133 src/lib/job.cc:143
+#: src/lib/job.cc:129 src/lib/job.cc:139
 msgid "Failed to encode the DCP."
 msgstr ""
 
@@ -746,11 +756,11 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:592
+#: src/lib/ffmpeg_content.cc:602
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:98
+#: src/lib/ffmpeg_examiner.cc:112
 msgid "Finding length"
 msgstr ""
 
@@ -758,15 +768,15 @@ msgstr ""
 msgid "Frame rate"
 msgstr ""
 
-#: src/lib/util.cc:918
+#: src/lib/util.cc:943
 msgid "Friday"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:586
 msgid "Full"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:556
+#: src/lib/ffmpeg_content.cc:566
 msgid "Full (0-%1)"
 msgstr ""
 
@@ -774,27 +784,27 @@ msgstr ""
 msgid "Full frame"
 msgstr ""
 
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:322
 msgid "Full length in audio samples at DCP rate"
 msgstr ""
 
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:309
 msgid "Full length in audio samples at content rate"
 msgstr ""
 
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:316
 msgid "Full length in video frames at DCP rate"
 msgstr ""
 
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:302
 msgid "Full length in video frames at content rate"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:617
+#: src/lib/ffmpeg_content.cc:627
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:618
+#: src/lib/ffmpeg_content.cc:628
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -802,11 +812,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr ""
 
-#: src/lib/util.cc:578
+#: src/lib/util.cc:586
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:547
+#: src/lib/util.cc:555
 msgid "Hearing impaired"
 msgstr ""
 
@@ -818,31 +828,31 @@ msgstr ""
 msgid "Horizontal flip"
 msgstr ""
 
-#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
 msgid "Hz"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:626
+#: src/lib/ffmpeg_content.cc:636
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:624
+#: src/lib/ffmpeg_content.cc:634
 msgid "IEC61966-2-4"
 msgstr ""
 
-#: src/lib/hints.cc:163
+#: src/lib/hints.cc:166
 msgid "If you do use 25fps you should change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/job.cc:154 src/lib/job.cc:189 src/lib/job.cc:239 src/lib/job.cc:249
+#: src/lib/job.cc:150 src/lib/job.cc:185 src/lib/job.cc:235 src/lib/job.cc:245
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/ffmpeg_content.cc:616
 msgid "JEDEC P22"
 msgstr ""
 
-#: src/lib/config.cc:368 src/lib/config.cc:1188
+#: src/lib/config.cc:367 src/lib/config.cc:1173
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -850,27 +860,27 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr ""
 
-#: src/lib/ffmpeg_encoder.cc:241 src/lib/util.cc:572
+#: src/lib/ffmpeg_encoder.cc:263 src/lib/util.cc:580
 msgid "L"
 msgstr ""
 
-#: src/lib/util.cc:580
+#: src/lib/util.cc:588
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:541
+#: src/lib/mid_side_decoder.cc:97 src/lib/util.cc:549
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:549
+#: src/lib/util.cc:557
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:551
+#: src/lib/util.cc:559
 msgid "Left rear surround"
 msgstr ""
 
-#: src/lib/util.cc:545
+#: src/lib/util.cc:553
 msgid "Left surround"
 msgstr ""
 
@@ -878,31 +888,31 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: src/lib/util.cc:575
+#: src/lib/util.cc:583
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:552
 msgid "Lfe (sub)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:571
+#: src/lib/ffmpeg_content.cc:581
 msgid "Limited"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:549
+#: src/lib/ffmpeg_content.cc:559
 msgid "Limited (%1-%2)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:621
+#: src/lib/ffmpeg_content.cc:631
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:622
+#: src/lib/ffmpeg_content.cc:632
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:623
+#: src/lib/ffmpeg_content.cc:633
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
@@ -910,7 +920,7 @@ msgstr ""
 msgid "Lost communication between main and writer processes"
 msgstr ""
 
-#: src/lib/util.cc:576
+#: src/lib/util.cc:584
 msgid "Ls"
 msgstr ""
 
@@ -922,19 +932,19 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#: src/lib/dcp_examiner.cc:157
+#: src/lib/dcp_examiner.cc:163
 msgid "Mismatched audio channel counts in DCP"
 msgstr ""
 
-#: src/lib/dcp_examiner.cc:163
+#: src/lib/dcp_examiner.cc:169
 msgid "Mismatched audio sample rates in DCP"
 msgstr ""
 
-#: src/lib/dcp_examiner.cc:130
+#: src/lib/dcp_examiner.cc:136
 msgid "Mismatched frame rates in DCP"
 msgstr ""
 
-#: src/lib/dcp_examiner.cc:138
+#: src/lib/dcp_examiner.cc:144
 msgid "Mismatched video sizes in DCP"
 msgstr ""
 
@@ -942,11 +952,11 @@ msgstr ""
 msgid "Missing required setting %1"
 msgstr ""
 
-#: src/lib/util.cc:910
+#: src/lib/util.cc:935
 msgid "Monday"
 msgstr ""
 
-#: src/lib/writer.cc:636
+#: src/lib/writer.cc:697
 msgid "Mono"
 msgstr ""
 
@@ -954,7 +964,7 @@ msgstr ""
 msgid "Motion compensating deinterlacer"
 msgstr ""
 
-#: src/lib/dcp_decoder.cc:98
+#: src/lib/dcp_decoder.cc:103
 msgid "No CPLs found in DCP."
 msgstr ""
 
@@ -970,11 +980,11 @@ msgstr ""
 msgid "Noise reduction"
 msgstr ""
 
-#: src/lib/writer.cc:634
+#: src/lib/writer.cc:695
 msgid "None"
 msgstr ""
 
-#: src/lib/job.cc:504
+#: src/lib/job.cc:500
 msgid "OK (ran for %1)"
 msgstr ""
 
@@ -986,7 +996,7 @@ msgstr ""
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 
-#: src/lib/types.cc:138
+#: src/lib/types.cc:141
 msgid "Open subtitles"
 msgstr ""
 
@@ -995,7 +1005,7 @@ msgstr ""
 msgid "Orientation"
 msgstr ""
 
-#: src/lib/job.cc:213
+#: src/lib/job.cc:209
 msgid "Out of memory"
 msgstr ""
 
@@ -1003,11 +1013,11 @@ msgstr ""
 msgid "Overcomplete wavelet denoiser"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:284
+#: src/lib/colour_conversion.cc:287
 msgid "P3"
 msgstr ""
 
-#: src/lib/util.h:59
+#: src/lib/util.h:60
 msgid ""
 "Please report this problem by using Help -> Report a problem or via email to "
 "carl@dcpomatic.com"
@@ -1033,11 +1043,11 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr ""
 
-#: src/lib/ffmpeg_encoder.cc:249 src/lib/util.cc:573
+#: src/lib/ffmpeg_encoder.cc:273 src/lib/util.cc:581
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:638
+#: src/lib/ffmpeg_content.cc:648
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -1045,39 +1055,39 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: src/lib/util.cc:581
+#: src/lib/util.cc:589
 msgid "Rc"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:285
+#: src/lib/colour_conversion.cc:288
 msgid "Rec. 1886"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:286
+#: src/lib/colour_conversion.cc:289
 msgid "Rec. 2020"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:282
+#: src/lib/colour_conversion.cc:285
 msgid "Rec. 601"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:283
+#: src/lib/colour_conversion.cc:286
 msgid "Rec. 709"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:542
+#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:550
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:558
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:552
+#: src/lib/util.cc:560
 msgid "Right rear surround"
 msgstr ""
 
-#: src/lib/util.cc:546
+#: src/lib/util.cc:554
 msgid "Right surround"
 msgstr ""
 
@@ -1089,56 +1099,63 @@ msgstr ""
 msgid "Rotate 90 degrees clockwise"
 msgstr ""
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:585
 msgid "Rs"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:287
+#: src/lib/colour_conversion.cc:290
 msgid "S-Gamut3/S-Log3"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:590 src/lib/ffmpeg_content.cc:619
+#: src/lib/ffmpeg_content.cc:600 src/lib/ffmpeg_content.cc:629
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:644
+#: src/lib/ffmpeg_content.cc:654
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:649
+#: src/lib/ffmpeg_content.cc:659
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:591 src/lib/ffmpeg_content.cc:620
-#: src/lib/ffmpeg_content.cc:645
+#: src/lib/ffmpeg_content.cc:601 src/lib/ffmpeg_content.cc:630
+#: src/lib/ffmpeg_content.cc:655
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:629
+#: src/lib/hints.cc:415
+msgid ""
+"SMPTE DCPs with the type FTR (feature) should have markers for the first "
+"frame of end credits (FFEC) and the first frame of moving credits (FFMC).  "
+"You should add these markers using the 'Markers' button in the DCP tab."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:639
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:630
+#: src/lib/ffmpeg_content.cc:640
 msgid "SMPTE ST 428-1"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:594
+#: src/lib/ffmpeg_content.cc:604
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:595
+#: src/lib/ffmpeg_content.cc:605
 msgid "SMPTE ST 431-2 (2011)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:596
+#: src/lib/ffmpeg_content.cc:606
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:56
+#: src/lib/scp_uploader.cc:58
 msgid "SSH error (%1)"
 msgstr ""
 
-#: src/lib/util.cc:920
+#: src/lib/util.cc:945
 msgid "Saturday"
 msgstr ""
 
@@ -1175,27 +1192,27 @@ msgid ""
 "project in DCP-o-matic, check the settings, then save it before trying again."
 msgstr ""
 
-#: src/lib/hints.cc:309
+#: src/lib/hints.cc:381
 msgid ""
 "Some of your closed captions have lines longer than %1 characters, so they "
 "will probably be word-wrapped."
 msgstr ""
 
-#: src/lib/hints.cc:315
+#: src/lib/hints.cc:387
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
 msgstr ""
 
-#: src/lib/film.cc:379
+#: src/lib/film.cc:389
 msgid "Some of your content needs a KDM"
 msgstr ""
 
-#: src/lib/film.cc:382
+#: src/lib/film.cc:392
 msgid "Some of your content needs an OV"
 msgstr ""
 
-#: src/lib/writer.cc:638
+#: src/lib/writer.cc:699
 msgid "Stereo"
 msgstr ""
 
@@ -1207,7 +1224,7 @@ msgstr ""
 msgid "Stereo to 5.1 up-mixer B"
 msgstr ""
 
-#: src/lib/util.cc:908
+#: src/lib/util.cc:933
 msgid "Sunday"
 msgstr ""
 
@@ -1227,7 +1244,7 @@ msgstr ""
 msgid "Text subtitles"
 msgstr ""
 
-#: src/lib/film.cc:362
+#: src/lib/film.cc:372
 msgid "The DCP is empty, perhaps because all the content has zero length."
 msgstr ""
 
@@ -1246,29 +1263,29 @@ msgid ""
 "ticking the 3D option in the DCP video tab."
 msgstr ""
 
-#: src/lib/job.cc:115
+#: src/lib/job.cc:111
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
 msgstr ""
 
-#: src/lib/playlist.cc:220
+#: src/lib/playlist.cc:224
 msgid "The file %1 has been moved %2 milliseconds earlier."
 msgstr ""
 
-#: src/lib/playlist.cc:215
+#: src/lib/playlist.cc:219
 msgid "The file %1 has been moved %2 milliseconds later."
 msgstr ""
 
-#: src/lib/playlist.cc:240
+#: src/lib/playlist.cc:244
 msgid "The file %1 has been trimmed by %2 milliseconds less."
 msgstr ""
 
-#: src/lib/playlist.cc:235
+#: src/lib/playlist.cc:239
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr ""
 
-#: src/lib/hints.cc:201
+#: src/lib/hints.cc:209
 msgid ""
 "There is a large difference between the frame rate of your DCP and that of "
 "some of your content.  This will cause your audio to play back at a much "
@@ -1277,26 +1294,26 @@ msgid ""
 "systems support your chosen DCP rate."
 msgstr ""
 
-#: src/lib/dcp_content.cc:620
+#: src/lib/dcp_content.cc:658
 msgid "There is no video in this DCP"
 msgstr ""
 
-#: src/lib/job.cc:213
+#: src/lib/job.cc:209
 msgid ""
 "There was not enough memory to do this.  If you are running a 32-bit "
 "operating system try reducing the number of encoding threads in the General "
 "tab of Preferences."
 msgstr ""
 
-#: src/lib/util.cc:1226
+#: src/lib/util.cc:1251
 msgid "This KDM was made for DCP-o-matic but not for its leaf certificate."
 msgstr ""
 
-#: src/lib/util.cc:1224
+#: src/lib/util.cc:1249
 msgid "This KDM was not made for DCP-o-matic's decryption certificate."
 msgstr ""
 
-#: src/lib/job.cc:134
+#: src/lib/job.cc:130
 msgid ""
 "This error has probably occurred because you are running the 32-bit version "
 "of DCP-o-matic and trying to use too many encoding threads.  Please reduce "
@@ -1304,7 +1321,7 @@ msgid ""
 "Preferences and try again."
 msgstr ""
 
-#: src/lib/job.cc:144
+#: src/lib/job.cc:140
 msgid ""
 "This error has probably occurred because you are running the 32-bit version "
 "of DCP-o-matic.  Please re-install DCP-o-matic with the 64-bit installer and "
@@ -1317,24 +1334,24 @@ msgid ""
 "the content and choosing \"Add KDM\"."
 msgstr ""
 
-#: src/lib/film.cc:524
+#: src/lib/film.cc:549
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
 msgstr ""
 
-#: src/lib/film.cc:509
+#: src/lib/film.cc:534
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
 "create a new Film, re-add your content and set it up again.  Sorry!"
 msgstr ""
 
-#: src/lib/util.cc:916
+#: src/lib/util.cc:941
 msgid "Thursday"
 msgstr ""
 
-#: src/lib/types.cc:136
+#: src/lib/types.cc:139
 msgid "Timed text"
 msgstr ""
 
@@ -1350,7 +1367,7 @@ msgstr ""
 msgid "Transitional"
 msgstr ""
 
-#: src/lib/util.cc:912
+#: src/lib/util.cc:937
 msgid "Tuesday"
 msgstr ""
 
@@ -1366,15 +1383,15 @@ msgstr ""
 msgid "Unexpected image type received by server"
 msgstr ""
 
-#: src/lib/cross_common.cc:86
+#: src/lib/cross_common.cc:89 src/lib/dcp_examiner.cc:193
 msgid "Unknown"
 msgstr ""
 
-#: src/lib/job.cc:248
+#: src/lib/job.cc:244
 msgid "Unknown error"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:333
+#: src/lib/ffmpeg_decoder.cc:335
 msgid "Unrecognised audio sample format (%1)"
 msgstr ""
 
@@ -1382,19 +1399,19 @@ msgstr ""
 msgid "Unsharp mask and Gaussian blur"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:542 src/lib/ffmpeg_content.cc:566
-#: src/lib/ffmpeg_content.cc:584 src/lib/ffmpeg_content.cc:586
-#: src/lib/ffmpeg_content.cc:587 src/lib/ffmpeg_content.cc:613
-#: src/lib/ffmpeg_content.cc:615 src/lib/ffmpeg_content.cc:616
-#: src/lib/ffmpeg_content.cc:640 src/lib/ffmpeg_content.cc:641
+#: src/lib/ffmpeg_content.cc:552 src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:594 src/lib/ffmpeg_content.cc:596
+#: src/lib/ffmpeg_content.cc:597 src/lib/ffmpeg_content.cc:623
+#: src/lib/ffmpeg_content.cc:625 src/lib/ffmpeg_content.cc:626
+#: src/lib/ffmpeg_content.cc:650 src/lib/ffmpeg_content.cc:651
 msgid "Unspecified"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:240
+#: src/lib/colour_conversion.cc:243
 msgid "Untitled"
 msgstr ""
 
-#: src/lib/util.cc:555 src/lib/util.cc:556
+#: src/lib/util.cc:563 src/lib/util.cc:564
 msgid "Unused"
 msgstr ""
 
@@ -1406,11 +1423,11 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/util.cc:579
+#: src/lib/util.cc:587
 msgid "VI"
 msgstr ""
 
-#: src/lib/verify_dcp_job.cc:47
+#: src/lib/verify_dcp_job.cc:50
 msgid "Verify DCP"
 msgstr ""
 
@@ -1418,11 +1435,11 @@ msgstr ""
 msgid "Vertical flip"
 msgstr ""
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:556
 msgid "Visually impaired"
 msgstr ""
 
-#: src/lib/upload_job.cc:44
+#: src/lib/upload_job.cc:47
 msgid "Waiting"
 msgstr ""
 
@@ -1430,11 +1447,11 @@ msgstr ""
 msgid "Weave filter"
 msgstr ""
 
-#: src/lib/util.cc:914
+#: src/lib/util.cc:939
 msgid "Wednesday"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:646
+#: src/lib/ffmpeg_content.cc:656
 msgid "YCOCG"
 msgstr ""
 
@@ -1442,62 +1459,68 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr ""
 
-#: src/lib/hints.cc:176
+#: src/lib/hints.cc:179
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
 "supported by all projectors.  You are advised to change the DCP frame rate "
 "to %2 fps."
 msgstr ""
 
-#: src/lib/hints.cc:160
+#: src/lib/hints.cc:163
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
 "supported by all projectors.  You may want to consider changing your frame "
 "rate to %2 fps."
 msgstr ""
 
-#: src/lib/hints.cc:170
+#: src/lib/hints.cc:173
 msgid ""
 "You are set up for a DCP frame rate of 30fps, which is not supported by all "
 "projectors.  Be aware that you may have compatibility problems."
 msgstr ""
 
-#: src/lib/hints.cc:223
+#: src/lib/hints.cc:265
 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/lib/hints.cc:119
+#: src/lib/hints.cc:100
 msgid ""
 "You are using DCP-o-matic's stereo-to-5.1 upmixer.  This is experimental and "
 "may result in poor-quality audio.  If you continue, you should listen to the "
 "resulting DCP in a cinema to make sure that it sounds good."
 msgstr ""
 
-#: src/lib/hints.cc:212
+#: src/lib/hints.cc:249
 msgid ""
 "You have %1 files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."
 msgstr ""
 
-#: src/lib/hints.cc:325
+#: src/lib/film.cc:1496
+msgid ""
+"You have more than one piece of Atmos content, and they do not have the same "
+"frame rate.  You must remove some Atmos content."
+msgstr ""
+
+#: src/lib/hints.cc:394
 msgid ""
 "You have overlapping closed captions, which are not allowed in Interop "
 "DCPs.  Change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/hints.cc:110
+#: src/lib/hints.cc:233
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
 msgstr ""
 
-#: src/lib/film.cc:358
+#: src/lib/film.cc:368
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
-#: src/lib/hints.cc:114
+#: src/lib/hints.cc:90
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors.  You may want to set the DCP to have 6 channels.  It does not "
@@ -1505,29 +1528,29 @@ msgid ""
 "extras with silence."
 msgstr ""
 
-#: src/lib/hints.cc:146
+#: src/lib/hints.cc:138
 msgid ""
 "Your DCP uses an unusual container ratio.  This may cause problems on some "
 "projectors.  If possible, use Flat or Scope for the DCP container ratio"
 msgstr ""
 
-#: src/lib/hints.cc:248
+#: src/lib/hints.cc:295
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
 msgstr ""
 
-#: src/lib/config.cc:307
+#: src/lib/config.cc:306
 msgid ""
 "Your default container is not valid and has been changed to Flat (1.85:1)"
 msgstr ""
 
-#: src/lib/playlist.cc:211
+#: src/lib/playlist.cc:215
 msgid ""
 "Your project contains video content that was not aligned to a frame boundary."
 msgstr ""
 
-#: src/lib/playlist.cc:231
+#: src/lib/playlist.cc:235
 msgid ""
 "Your project contains video content whose trim was not aligned to a frame "
 "boundary."
@@ -1541,13 +1564,13 @@ msgstr ""
 msgid "[still]"
 msgstr ""
 
-#: src/lib/dcp_subtitle_content.cc:103 src/lib/string_text_file_content.cc:70
+#: src/lib/dcp_subtitle_content.cc:97 src/lib/string_text_file_content.cc:70
 msgid "[subtitles]"
 msgstr ""
 
 #. / TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
 #. / which reel it is.  Preserve the %1; it will be replaced with the reel number.
-#: src/lib/ffmpeg_encoder.cc:74 src/lib/subtitle_encoder.cc:63
+#: src/lib/ffmpeg_encoder.cc:142
 msgid "_reel%1"
 msgstr ""
 
@@ -1559,11 +1582,11 @@ msgstr ""
 msgid "connecting"
 msgstr ""
 
-#: src/lib/film.cc:354
+#: src/lib/film.cc:364
 msgid "container"
 msgstr ""
 
-#: src/lib/film.cc:366
+#: src/lib/film.cc:376
 msgid "content type"
 msgstr ""
 
@@ -1571,11 +1594,15 @@ msgstr ""
 msgid "copying %1"
 msgstr ""
 
-#: src/lib/ffmpeg.cc:142 src/lib/ffmpeg_image_proxy.cc:158
+#: src/lib/ffmpeg.cc:144 src/lib/ffmpeg_image_proxy.cc:166
 msgid "could not find stream information"
 msgstr ""
 
-#: src/lib/reel_writer.cc:378
+#: src/lib/reel_writer.cc:428
+msgid "could not move atmos asset into the DCP (%1)"
+msgstr ""
+
+#: src/lib/reel_writer.cc:410
 msgid "could not move audio asset into the DCP (%1)"
 msgstr ""
 
@@ -1595,11 +1622,11 @@ msgstr ""
 msgid "could not read from file %1 (%2)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:66
+#: src/lib/scp_uploader.cc:69
 msgid "could not start SCP session (%1)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:41
+#: src/lib/scp_uploader.cc:42
 msgid "could not start SSH session"
 msgstr ""
 
@@ -1624,79 +1651,79 @@ msgid "frames per second"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:190
+#: src/lib/util.cc:194
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:706
+#: src/lib/dcp_content.cc:744
 msgid "it does not have closed captions in all its reels."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:701
+#: src/lib/dcp_content.cc:739
 msgid "it does not have open subtitles in all its reels."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:669
+#: src/lib/dcp_content.cc:707
 msgid "it does not have sound in all its reels."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:573
+#: src/lib/dcp_content.cc:611
 msgid "it has a different frame rate to the film."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:630
+#: src/lib/dcp_content.cc:668
 msgid "it is 2K and the film is 4K."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:627
+#: src/lib/dcp_content.cc:665
 msgid "it is 4K and the film is 2K."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:561
+#: src/lib/dcp_content.cc:599
 msgid "it is Interop and the film is set to SMPTE."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:565
+#: src/lib/dcp_content.cc:603
 msgid "it is SMPTE and the film is set to Interop."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:675
+#: src/lib/dcp_content.cc:713
 msgid "it overlaps other audio content; remove the other content."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:712
+#: src/lib/dcp_content.cc:750
 msgid "it overlaps other text content; remove the other content."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:640
+#: src/lib/dcp_content.cc:678
 msgid "it overlaps other video content; remove the other content."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:596
+#: src/lib/dcp_content.cc:634
 msgid ""
 "its reel lengths differ from those in the film; set the reel mode to 'split "
 "by video content'."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:635
+#: src/lib/dcp_content.cc:673
 msgid "its video frame size differs from the film's."
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:199
+#: src/lib/util.cc:203
 msgid "m"
 msgstr ""
 
@@ -1704,20 +1731,20 @@ msgstr ""
 msgid "moving"
 msgstr ""
 
-#: src/lib/film.cc:350
+#: src/lib/film.cc:360
 msgid "name"
 msgstr ""
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:209
+#: src/lib/util.cc:213
 msgid "s"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:281
+#: src/lib/colour_conversion.cc:284
 msgid "sRGB"
 msgstr ""
 
-#: src/lib/film.cc:375
+#: src/lib/film.cc:385
 msgid "some of your content is missing"
 msgstr ""
 
@@ -1725,7 +1752,7 @@ msgstr ""
 msgid "still"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:264
+#: src/lib/ffmpeg_examiner.cc:308
 msgid "unknown"
 msgstr ""