pot/merge.

1 files changed, 179 insertions, 172 deletions

diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index ce92da93b..c14d346c7 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: 2018-10-20 21:26+0100\n"
+"POT-Creation-Date: 2018-12-01 22:02+0000\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"
@@ -17,50 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/video_content.cc:448
+#: src/lib/video_content.cc:442
 #, c-format
 msgid ""
 "\n"
 "Content frame rate %.4f\n"
 msgstr ""
 
-#: src/lib/video_content.cc:412
+#: src/lib/video_content.cc:407
 msgid ""
 "\n"
 "Cropped to %1x%2"
 msgstr ""
 
-#: src/lib/video_content.cc:405
+#: src/lib/video_content.cc:400
 #, c-format
 msgid ""
 "\n"
 "Display aspect ratio %.2f:1"
 msgstr ""
 
-#: src/lib/video_content.cc:436
+#: src/lib/video_content.cc:430
 msgid ""
 "\n"
 "Padded with black to fit container %1 (%2x%3)"
 msgstr ""
 
-#: src/lib/video_content.cc:426
+#: src/lib/video_content.cc:420
 msgid ""
 "\n"
 "Scaled to %1x%2"
 msgstr ""
 
-#: src/lib/video_content.cc:430 src/lib/video_content.cc:441
+#: src/lib/video_content.cc:424 src/lib/video_content.cc:435
 #, c-format
 msgid " (%.2f:1)"
 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:447
+#: src/lib/job.cc:446
 msgid " on %1"
 msgstr ""
 
-#: src/lib/config.cc:1055
+#: src/lib/config.cc:1073
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -73,7 +73,7 @@ msgid ""
 "Size: $SIZE\n"
 msgstr ""
 
-#: src/lib/config.cc:1033
+#: src/lib/config.cc:1051
 msgid "$JOB_NAME: $JOB_STATUS"
 msgstr ""
 
@@ -81,23 +81,23 @@ msgstr ""
 msgid "%1 [Atmos]"
 msgstr ""
 
-#: src/lib/dcp_content.cc:247
+#: src/lib/dcp_content.cc:270
 msgid "%1 [DCP]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:332
+#: src/lib/ffmpeg_content.cc:337
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:328
+#: src/lib/ffmpeg_content.cc:333
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:330 src/lib/video_mxf_content.cc:96
+#: src/lib/ffmpeg_content.cc:335 src/lib/video_mxf_content.cc:96
 msgid "%1 [video]"
 msgstr ""
 
-#: src/lib/video_content.cc:400
+#: src/lib/video_content.cc:395
 #, c-format
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ""
@@ -147,12 +147,12 @@ msgid "3D denoiser"
 msgstr ""
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:132
+#: src/lib/transcode_job.cc:129
 #, c-format
 msgid "; %.1f fps"
 msgstr ""
 
-#: src/lib/job.cc:452
+#: src/lib/job.cc:451
 msgid "; %1 remaining; finishing at %2%3"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgid ""
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:612
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr ""
 
@@ -187,7 +187,7 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/lib/job.cc:105
+#: src/lib/job.cc:103
 msgid "An error occurred whilst handling the file %1."
 msgstr ""
 
@@ -207,52 +207,52 @@ msgstr ""
 msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:584
+#: src/lib/ffmpeg_content.cc:606
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:552
+#: src/lib/ffmpeg_content.cc:574
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:607
+#: src/lib/ffmpeg_content.cc:629
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:586
+#: src/lib/ffmpeg_content.cc:608
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:587
+#: src/lib/ffmpeg_content.cc:609
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/ffmpeg_content.cc:628
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:611
+#: src/lib/ffmpeg_content.cc:633
 msgid "BT2100"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:548
+#: src/lib/ffmpeg_content.cc:570
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:602
+#: src/lib/ffmpeg_content.cc:624
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:547
+#: src/lib/ffmpeg_content.cc:569
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:544 src/lib/ffmpeg_content.cc:573
-#: src/lib/ffmpeg_content.cc:598
+#: src/lib/ffmpeg_content.cc:566 src/lib/ffmpeg_content.cc:595
+#: src/lib/ffmpeg_content.cc:620
 msgid "BT709"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:618
+#: src/lib/ffmpeg_content.cc:640
 msgid "Bits per pixel"
 msgstr ""
 
@@ -268,11 +268,11 @@ msgstr ""
 msgid "C"
 msgstr ""
 
-#: src/lib/job.cc:461
+#: src/lib/job.cc:460
 msgid "Cancelled"
 msgstr ""
 
-#: src/lib/film.cc:301
+#: src/lib/film.cc:300
 msgid "Cannot contain slashes"
 msgstr ""
 
@@ -280,7 +280,7 @@ msgstr ""
 msgid "Cannot handle pixel format %1 during %2"
 msgstr ""
 
-#: src/lib/film.cc:1267
+#: src/lib/film.cc:1282
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr ""
 
@@ -296,7 +296,7 @@ msgstr ""
 msgid "Check content for changes"
 msgstr ""
 
-#: src/lib/reel_writer.cc:104
+#: src/lib/reel_writer.cc:100
 msgid "Checking existing image data"
 msgstr ""
 
@@ -304,11 +304,11 @@ msgstr ""
 msgid "Choose 'Make DCP' again when you have done this."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:610
+#: src/lib/ffmpeg_content.cc:632
 msgid "Chroma-derived constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:609
+#: src/lib/ffmpeg_content.cc:631
 msgid "Chroma-derived non-constant luminance"
 msgstr ""
 
@@ -316,7 +316,7 @@ msgstr ""
 msgid "Closed captions"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:569
+#: src/lib/ffmpeg_content.cc:591
 msgid "Colour primaries"
 msgstr ""
 
@@ -330,29 +330,29 @@ 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:501 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:525
-#: src/lib/ffmpeg_content.cc:530 src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:537 src/lib/ffmpeg_content.cc:547
+#: src/lib/ffmpeg_content.cc:552 src/lib/ffmpeg_content.cc:557
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:594
+#: src/lib/ffmpeg_content.cc:616
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:615
+#: src/lib/ffmpeg_content.cc:637
 msgid "Colourspace"
 msgstr ""
 
-#: src/lib/content.cc:190
+#: src/lib/content.cc:185
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:526
+#: src/lib/writer.cc:519
 msgid "Computing digests"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:67
+#: src/lib/frame_rate_change.cc:101
 msgid "Content and DCP have the same rate.\n"
 msgstr ""
 
@@ -388,15 +388,15 @@ msgstr ""
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 
-#: src/lib/video_content.cc:184
+#: src/lib/video_content.cc:183
 msgid "Content to be joined must have the same colour conversion."
 msgstr ""
 
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:175
 msgid "Content to be joined must have the same crop."
 msgstr ""
 
-#: src/lib/video_content.cc:188
+#: src/lib/video_content.cc:187
 msgid "Content to be joined must have the same fades."
 msgstr ""
 
@@ -404,11 +404,11 @@ msgstr ""
 msgid "Content to be joined must have the same outline width."
 msgstr ""
 
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:167
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/video_content.cc:180
+#: src/lib/video_content.cc:179
 msgid "Content to be joined must have the same scale setting."
 msgstr ""
 
@@ -436,11 +436,11 @@ msgstr ""
 msgid "Content to be joined must have the same subtitle line spacing."
 msgstr ""
 
-#: src/lib/content.cc:137 src/lib/content.cc:141
+#: src/lib/content.cc:132 src/lib/content.cc:136
 msgid "Content to be joined must have the same video frame rate"
 msgstr ""
 
-#: src/lib/video_content.cc:172
+#: src/lib/video_content.cc:171
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
@@ -456,11 +456,11 @@ msgstr ""
 msgid "Content to be joined must use the same subtitle stream."
 msgstr ""
 
-#: src/lib/video_content.cc:391
+#: src/lib/video_content.cc:386
 msgid "Content video is %1x%2"
 msgstr ""
 
-#: src/lib/upload_job.cc:53
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr ""
 
@@ -482,7 +482,7 @@ msgid ""
 "o-matic is running."
 msgstr ""
 
-#: src/lib/job.cc:124 src/lib/job.cc:139
+#: src/lib/job.cc:122 src/lib/job.cc:137
 msgid "Could not open %1"
 msgstr ""
 
@@ -498,6 +498,10 @@ msgstr ""
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
 msgstr ""
 
+#: src/lib/config.cc:954
+msgid "Could not open file for writing"
+msgstr ""
+
 #: src/lib/dcp_subtitle.cc:55
 msgid "Could not read subtitles (%1 / %2)"
 msgstr ""
@@ -514,6 +518,10 @@ msgstr ""
 msgid "Could not write to remote file (%1)"
 msgstr ""
 
+#: src/lib/config.cc:959
+msgid "Could not write whole file"
+msgstr ""
+
 #: src/lib/util.cc:520
 msgid "D-BOX primary"
 msgstr ""
@@ -538,7 +546,7 @@ msgstr ""
 msgid "DCI Scope"
 msgstr ""
 
-#: src/lib/dcp_subtitle_content.cc:100
+#: src/lib/dcp_subtitle_content.cc:106
 msgid "DCP XML subtitles"
 msgstr ""
 
@@ -546,26 +554,26 @@ msgstr ""
 msgid "DCP sample rate"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:79
+#: src/lib/frame_rate_change.cc:113
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:70
+#: src/lib/frame_rate_change.cc:104
 msgid "DCP will use every other frame of the content.\n"
 msgstr ""
 
-#: src/lib/job.cc:126 src/lib/job.cc:141
+#: src/lib/job.cc:124 src/lib/job.cc:139
 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/ffmpeg_content.cc:114
+#: src/lib/ffmpeg_content.cc:113
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
 
-#: src/lib/config.cc:358 src/lib/config.cc:1030
+#: src/lib/config.cc:359 src/lib/config.cc:1048
 msgid "DCP-o-matic notification"
 msgstr ""
 
@@ -574,7 +582,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr ""
 
-#: src/lib/config.cc:1018
+#: src/lib/config.cc:1036
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -597,19 +605,19 @@ msgstr ""
 msgid "Download failed (%1 error %2)"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:72
+#: src/lib/frame_rate_change.cc:106
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:74
+#: src/lib/frame_rate_change.cc:108
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr ""
 
-#: src/lib/send_kdm_email_job.cc:64
+#: src/lib/send_kdm_email_job.cc:61
 msgid "Email KDMs"
 msgstr ""
 
-#: src/lib/send_kdm_email_job.cc:67
+#: src/lib/send_kdm_email_job.cc:64
 msgid "Email KDMs for %1"
 msgstr ""
 
@@ -633,7 +641,7 @@ msgstr ""
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/job.cc:459
+#: src/lib/job.cc:458
 msgid "Error: %1"
 msgstr ""
 
@@ -645,7 +653,7 @@ msgstr ""
 msgid "Examining closed captions"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:601
+#: src/lib/ffmpeg_content.cc:623
 msgid "FCC"
 msgstr ""
 
@@ -661,11 +669,11 @@ msgstr ""
 msgid "Feature"
 msgstr ""
 
-#: src/lib/content.cc:445
+#: src/lib/content.cc:428
 msgid "Filename"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:551
+#: src/lib/ffmpeg_content.cc:573
 msgid "Film"
 msgstr ""
 
@@ -673,15 +681,15 @@ msgstr ""
 msgid "Finding length"
 msgstr ""
 
-#: src/lib/content.cc:452
+#: src/lib/content.cc:435
 msgid "Frame rate"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:557
 msgid "Full"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:537
 msgid "Full (0-%1)"
 msgstr ""
 
@@ -705,11 +713,11 @@ msgstr ""
 msgid "Full length in video frames at content rate"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:598
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:577
+#: src/lib/ffmpeg_content.cc:599
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -749,31 +757,31 @@ msgstr ""
 msgid "Hz"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:585
+#: src/lib/ffmpeg_content.cc:607
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:583
+#: src/lib/ffmpeg_content.cc:605
 msgid "IEC61966-2-4"
 msgstr ""
 
-#: src/lib/job.cc:149 src/lib/job.cc:193 src/lib/job.cc:203
+#: src/lib/job.cc:147 src/lib/job.cc:191 src/lib/job.cc:201
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:565
+#: src/lib/ffmpeg_content.cc:587
 msgid "JEDEC P22"
 msgstr ""
 
-#: src/lib/config.cc:348 src/lib/config.cc:1015
+#: src/lib/config.cc:349 src/lib/config.cc:1033
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
-#: src/lib/dcp.cc:76
+#: src/lib/dcp.cc:82
 msgid "KDM was made for DCP-o-matic but not for its leaf certificate."
 msgstr ""
 
-#: src/lib/dcp.cc:74
+#: src/lib/dcp.cc:80
 msgid "KDM was not made for DCP-o-matic's decryption certificate."
 msgstr ""
 
@@ -781,7 +789,7 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr ""
 
-#: src/lib/util.cc:539
+#: src/lib/ffmpeg_encoder.cc:203 src/lib/util.cc:539
 msgid "L"
 msgstr ""
 
@@ -805,7 +813,7 @@ msgstr ""
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/video_content.cc:461
+#: src/lib/video_content.cc:455
 msgid "Length"
 msgstr ""
 
@@ -817,23 +825,23 @@ msgstr ""
 msgid "Lfe (sub)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:552
 msgid "Limited"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:530
 msgid "Limited (%1-%2)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:580
+#: src/lib/ffmpeg_content.cc:602
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:581
+#: src/lib/ffmpeg_content.cc:603
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:582
+#: src/lib/ffmpeg_content.cc:604
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
@@ -869,7 +877,7 @@ msgstr ""
 msgid "Missing required setting %1"
 msgstr ""
 
-#: src/lib/writer.cc:625
+#: src/lib/writer.cc:618
 msgid "Mono"
 msgstr ""
 
@@ -877,11 +885,11 @@ msgstr ""
 msgid "Motion compensating deinterlacer"
 msgstr ""
 
-#: src/lib/dcp_decoder.cc:76
+#: src/lib/dcp_decoder.cc:77
 msgid "No CPLs found in DCP."
 msgstr ""
 
-#: src/lib/cinema_kdms.cc:202 src/lib/send_notification_email_job.cc:61
+#: src/lib/cinema_kdms.cc:201 src/lib/send_notification_email_job.cc:61
 msgid "No mail server configured in preferences"
 msgstr ""
 
@@ -893,7 +901,7 @@ msgstr ""
 msgid "No stretch"
 msgstr ""
 
-#: src/lib/image_content.cc:122
+#: src/lib/image_content.cc:121
 msgid "No valid image files were found in the folder."
 msgstr ""
 
@@ -901,19 +909,19 @@ msgstr ""
 msgid "Noise reduction"
 msgstr ""
 
-#: src/lib/writer.cc:623
+#: src/lib/writer.cc:616
 msgid "None"
 msgstr ""
 
-#: src/lib/job.cc:457
+#: src/lib/job.cc:456
 msgid "OK (ran for %1)"
 msgstr ""
 
-#: src/lib/content.cc:126
+#: src/lib/content.cc:121
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 
-#: src/lib/content.cc:130
+#: src/lib/content.cc:125
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 
@@ -926,7 +934,7 @@ msgstr ""
 msgid "Orientation"
 msgstr ""
 
-#: src/lib/job.cc:173
+#: src/lib/job.cc:171
 msgid "Out of memory"
 msgstr ""
 
@@ -948,7 +956,7 @@ msgstr ""
 msgid "Policy"
 msgstr ""
 
-#: src/lib/content.cc:461
+#: src/lib/content.cc:444
 msgid "Prepared for video frame rate"
 msgstr ""
 
@@ -960,11 +968,11 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr ""
 
-#: src/lib/util.cc:540
+#: src/lib/ffmpeg_encoder.cc:207 src/lib/util.cc:540
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:597
+#: src/lib/ffmpeg_content.cc:619
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -1024,40 +1032,40 @@ msgstr ""
 msgid "S-Gamut3/S-Log3"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:549 src/lib/ffmpeg_content.cc:578
+#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:600
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:603
+#: src/lib/ffmpeg_content.cc:625
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:608
+#: src/lib/ffmpeg_content.cc:630
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:550 src/lib/ffmpeg_content.cc:579
-#: src/lib/ffmpeg_content.cc:604
+#: src/lib/ffmpeg_content.cc:572 src/lib/ffmpeg_content.cc:601
+#: src/lib/ffmpeg_content.cc:626
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:588
+#: src/lib/ffmpeg_content.cc:610
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:589
+#: src/lib/ffmpeg_content.cc:611
 msgid "SMPTE ST 428-1"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:553
+#: src/lib/ffmpeg_content.cc:575
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:554
+#: src/lib/ffmpeg_content.cc:576
 msgid "SMPTE ST 431-2 (2011)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:555
+#: src/lib/ffmpeg_content.cc:577
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr ""
 
@@ -1065,7 +1073,7 @@ msgstr ""
 msgid "SSH error (%1)"
 msgstr ""
 
-#: src/lib/image_content.cc:108
+#: src/lib/image_content.cc:107
 msgid "Scanning image files"
 msgstr ""
 
@@ -1077,7 +1085,7 @@ msgstr ""
 msgid "Short"
 msgstr ""
 
-#: src/lib/video_content.cc:462
+#: src/lib/video_content.cc:456
 msgid "Size"
 msgstr ""
 
@@ -1104,15 +1112,15 @@ msgid ""
 "truncated."
 msgstr ""
 
-#: src/lib/film.cc:326
+#: src/lib/film.cc:325
 msgid "Some of your content needs a KDM"
 msgstr ""
 
-#: src/lib/film.cc:329
+#: src/lib/film.cc:328
 msgid "Some of your content needs an OV"
 msgstr ""
 
-#: src/lib/writer.cc:627
+#: src/lib/writer.cc:620
 msgid "Stereo"
 msgstr ""
 
@@ -1148,25 +1156,25 @@ msgstr ""
 msgid "The certificate chain for signing is invalid (%1)"
 msgstr ""
 
-#: src/lib/job.cc:111
+#: src/lib/job.cc:109
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
 msgstr ""
 
-#: src/lib/content_factory.cc:115
+#: src/lib/playlist.cc:204
 msgid "The file %1 has been moved %2 milliseconds earlier."
 msgstr ""
 
-#: src/lib/content_factory.cc:110
+#: src/lib/playlist.cc:199
 msgid "The file %1 has been moved %2 milliseconds later."
 msgstr ""
 
-#: src/lib/content_factory.cc:135
+#: src/lib/playlist.cc:224
 msgid "The file %1 has been trimmed by %2 milliseconds less."
 msgstr ""
 
-#: src/lib/content_factory.cc:130
+#: src/lib/playlist.cc:219
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr ""
 
@@ -1179,11 +1187,11 @@ msgid ""
 "systems support your chosen DCP rate."
 msgstr ""
 
-#: src/lib/dcp_content.cc:558
+#: src/lib/dcp_content.cc:590
 msgid "There is no video in this DCP"
 msgstr ""
 
-#: src/lib/job.cc:173
+#: src/lib/job.cc:171
 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 "
@@ -1196,13 +1204,13 @@ msgid ""
 "the content and choosing \"Add KDM\"."
 msgstr ""
 
-#: src/lib/film.cc:445
+#: src/lib/film.cc:452
 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:434
+#: src/lib/film.cc:441
 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 "
@@ -1217,7 +1225,7 @@ msgstr ""
 msgid "Trailer"
 msgstr ""
 
-#: src/lib/transcode_job.cc:58
+#: src/lib/transcode_job.cc:55
 msgid "Transcode %1"
 msgstr ""
 
@@ -1233,11 +1241,11 @@ msgstr ""
 msgid "Unexpected image type received by server"
 msgstr ""
 
-#: src/lib/job.cc:202
+#: src/lib/job.cc:200
 msgid "Unknown error"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:325
+#: src/lib/ffmpeg_decoder.cc:322
 msgid "Unrecognised audio sample format (%1)"
 msgstr ""
 
@@ -1245,11 +1253,11 @@ msgstr ""
 msgid "Unsharp mask and Gaussian blur"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:501 src/lib/ffmpeg_content.cc:525
-#: src/lib/ffmpeg_content.cc:543 src/lib/ffmpeg_content.cc:545
-#: src/lib/ffmpeg_content.cc:546 src/lib/ffmpeg_content.cc:572
-#: src/lib/ffmpeg_content.cc:574 src/lib/ffmpeg_content.cc:575
-#: src/lib/ffmpeg_content.cc:599 src/lib/ffmpeg_content.cc:600
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:547
+#: src/lib/ffmpeg_content.cc:565 src/lib/ffmpeg_content.cc:567
+#: src/lib/ffmpeg_content.cc:568 src/lib/ffmpeg_content.cc:594
+#: src/lib/ffmpeg_content.cc:596 src/lib/ffmpeg_content.cc:597
+#: src/lib/ffmpeg_content.cc:621 src/lib/ffmpeg_content.cc:622
 msgid "Unspecified"
 msgstr ""
 
@@ -1285,7 +1293,7 @@ msgstr ""
 msgid "Visually impaired"
 msgstr ""
 
-#: src/lib/upload_job.cc:45
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr ""
 
@@ -1293,7 +1301,7 @@ msgstr ""
 msgid "Weave filter"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:605
+#: src/lib/ffmpeg_content.cc:627
 msgid "YCOCG"
 msgstr ""
 
@@ -1345,7 +1353,7 @@ msgid ""
 "likely to cause problems on playback."
 msgstr ""
 
-#: src/lib/film.cc:309
+#: src/lib/film.cc:308
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
@@ -1367,39 +1375,38 @@ msgid ""
 "audio content."
 msgstr ""
 
-#: src/lib/config.cc:307
+#: src/lib/config.cc:308
 msgid ""
 "Your default container is not valid and has been changed to Flat (1.85:1)"
 msgstr ""
 
-#: src/lib/content_factory.cc:106
+#: src/lib/playlist.cc:195
 msgid ""
 "Your project contains video content that was not aligned to a frame boundary."
 msgstr ""
 
-#: src/lib/content_factory.cc:126
+#: src/lib/playlist.cc:215
 msgid ""
 "Your project contains video content whose trim was not aligned to a frame "
 "boundary."
 msgstr ""
 
-#: src/lib/image_content.cc:72
+#: src/lib/image_content.cc:71
 msgid "[moving images]"
 msgstr ""
 
-#: src/lib/image_content.cc:70
+#: src/lib/image_content.cc:69
 msgid "[still]"
 msgstr ""
 
-#: src/lib/dcp_subtitle_content.cc:94 src/lib/string_text_file_content.cc:69
+#: src/lib/dcp_subtitle_content.cc:100 src/lib/string_text_file_content.cc:69
 msgid "[subtitles]"
 msgstr ""
 
-#. / TRANSLATORS: _reel%1.%2 here is to be added to an export filename to indicate
-#. / which reel it is.  Preserve the %1 and %2; %1 will be replaced with the reel number
-#. / and %2 with the file extension.
-#: src/lib/ffmpeg_encoder.cc:66
-msgid "_reel%1%2"
+#. / 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:67
+msgid "_reel%1"
 msgstr ""
 
 #: src/lib/dcpomatic_socket.cc:69
@@ -1410,11 +1417,11 @@ msgstr ""
 msgid "connecting"
 msgstr ""
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:304
 msgid "container"
 msgstr ""
 
-#: src/lib/film.cc:313
+#: src/lib/film.cc:312
 msgid "content type"
 msgstr ""
 
@@ -1422,11 +1429,11 @@ msgstr ""
 msgid "copying %1"
 msgstr ""
 
-#: src/lib/ffmpeg.cc:141 src/lib/ffmpeg_image_proxy.cc:139
+#: src/lib/ffmpeg.cc:135 src/lib/ffmpeg_image_proxy.cc:139
 msgid "could not find stream information"
 msgstr ""
 
-#: src/lib/reel_writer.cc:329
+#: src/lib/reel_writer.cc:325
 msgid "could not move audio asset into the DCP (%1)"
 msgstr ""
 
@@ -1466,7 +1473,7 @@ msgstr ""
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/content.cc:454 src/lib/content.cc:463
+#: src/lib/content.cc:437 src/lib/content.cc:446
 msgid "frames per second"
 msgstr ""
 
@@ -1476,69 +1483,69 @@ msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:649
+#: src/lib/dcp_content.cc:682
 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:644
+#: src/lib/dcp_content.cc:677
 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:612
+#: src/lib/dcp_content.cc:644
 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:511
+#: src/lib/dcp_content.cc:543
 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:573
+#: src/lib/dcp_content.cc:605
 msgid "it is 2K and the film is 4K."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:570
+#: src/lib/dcp_content.cc:602
 msgid "it is 4K and the film is 2K."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:499
+#: src/lib/dcp_content.cc:531
 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:503
+#: src/lib/dcp_content.cc:535
 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:618
+#: src/lib/dcp_content.cc:650
 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:655
+#: src/lib/dcp_content.cc:688
 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:583
+#: src/lib/dcp_content.cc:615
 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:534
+#: src/lib/dcp_content.cc:566
 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:578
+#: src/lib/dcp_content.cc:610
 msgid "its video frame size differs from the film's."
 msgstr ""
 
@@ -1547,11 +1554,11 @@ msgstr ""
 msgid "m"
 msgstr ""
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:86
 msgid "moving"
 msgstr ""
 
-#: src/lib/film.cc:301
+#: src/lib/film.cc:300
 msgid "name"
 msgstr ""
 
@@ -1564,11 +1571,11 @@ msgstr ""
 msgid "sRGB"
 msgstr ""
 
-#: src/lib/film.cc:322
+#: src/lib/film.cc:321
 msgid "some of your content is missing"
 msgstr ""
 
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:84
 msgid "still"
 msgstr ""
 
@@ -1576,6 +1583,6 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: src/lib/video_content.cc:461
+#: src/lib/video_content.cc:455
 msgid "video frames"
 msgstr ""