pot/merge.

1 files changed, 463 insertions, 409 deletions

diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index 16e93a77a..f6d51f890 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: 2024-07-11 16:08+0200\n"
+"POT-Creation-Date: 2024-09-27 19:56+0200\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:518
+#: src/lib/video_content.cc:520
 #, c-format
 msgid ""
 "\n"
 "Content frame rate %.4f\n"
 msgstr ""
 
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:484
 msgid ""
 "\n"
 "Cropped to %1x%2"
 msgstr ""
 
-#: src/lib/video_content.cc:472
+#: src/lib/video_content.cc:474
 #, c-format
 msgid ""
 "\n"
 "Display aspect ratio %.2f:1"
 msgstr ""
 
-#: src/lib/video_content.cc:506
+#: src/lib/video_content.cc:508
 msgid ""
 "\n"
 "Padded with black to fit container %1 (%2x%3)"
 msgstr ""
 
-#: src/lib/video_content.cc:496
+#: src/lib/video_content.cc:498
 msgid ""
 "\n"
 "Scaled to %1x%2"
 msgstr ""
 
-#: src/lib/video_content.cc:500 src/lib/video_content.cc:511
+#: src/lib/video_content.cc:502 src/lib/video_content.cc:513
 #, 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:588
+#: src/lib/job.cc:598
 msgid " on %1"
 msgstr ""
 
-#: src/lib/config.cc:1276
+#: src/lib/config.cc:1275
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -74,39 +74,77 @@ msgid ""
 "Size: $SIZE\n"
 msgstr ""
 
-#: src/lib/config.cc:1254
+#: src/lib/config.cc:1253
 msgid "$JOB_NAME: $JOB_STATUS"
 msgstr ""
 
-#: src/lib/cross_common.cc:102
+#: src/lib/cross_common.cc:99
 msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
-#: src/lib/atmos_mxf_content.cc:96
+#: src/lib/atmos_mxf_content.cc:97
 msgid "%1 [Atmos]"
 msgstr ""
 
-#: src/lib/dcp_content.cc:334
+#: src/lib/dcp_content.cc:361
 msgid "%1 [DCP]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:353
+#: src/lib/ffmpeg_content.cc:354
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:349
+#: src/lib/ffmpeg_content.cc:350
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:351 src/lib/video_mxf_content.cc:105
+#: src/lib/ffmpeg_content.cc:352 src/lib/video_mxf_content.cc:106
 msgid "%1 [video]"
 msgstr ""
 
-#: src/lib/transcode_job.cc:162
+#: src/lib/job.cc:181 src/lib/job.cc:196
+msgid ""
+"%1 could not open the file %2 (%3).  Perhaps it does not exist or is in an "
+"unexpected format."
+msgstr ""
+
+#: src/lib/film.cc:1659
+msgid ""
+"%1 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:1627
+msgid ""
+"%1 had to change your settings so that the film's frame rate is the same as "
+"that of your Atmos content."
+msgstr ""
+
+#: src/lib/film.cc:1672
+msgid ""
+"%1 had to remove one of your custom reel boundaries as it no longer lies "
+"within the film."
+msgstr ""
+
+#: src/lib/film.cc:1670
+msgid ""
+"%1 had to remove some of your custom reel boundaries as they no longer lie "
+"within the film."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:122
+msgid "%1 no longer supports the `%2' filter, so it has been turned off."
+msgstr ""
+
+#: src/lib/config.cc:434 src/lib/config.cc:1250
+msgid "%1 notification"
+msgstr ""
+
+#: src/lib/transcode_job.cc:180
 msgid "%1; %2/%3 frames"
 msgstr ""
 
-#: src/lib/video_content.cc:467
+#: src/lib/video_content.cc:469
 #, c-format
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ""
@@ -143,11 +181,11 @@ msgstr ""
 msgid "1.90 (Full frame)"
 msgstr ""
 
-#: src/lib/util.cc:661
+#: src/lib/util.cc:668
 msgid "10"
 msgstr ""
 
-#: src/lib/util.cc:667
+#: src/lib/util.cc:674
 msgid "16"
 msgstr ""
 
@@ -159,68 +197,68 @@ msgstr ""
 msgid "2.39 (Scope)"
 msgstr ""
 
-#: src/lib/filter.cc:102
+#: src/lib/filter.cc:103
 msgid "3D denoiser"
 msgstr ""
 
-#: src/lib/hints.cc:210
+#: src/lib/hints.cc:221
 msgid ""
 "4K 3D is only supported by a very limited number of projectors.  Unless you "
 "know that you will play this DCP back on a capable projector, it is "
 "advisable to set the DCP to be 2K in the \"DCP→Video\" tab."
 msgstr ""
 
-#: src/lib/util.cc:660
+#: src/lib/util.cc:667
 msgid "9"
 msgstr ""
 
 #. TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:165
+#: src/lib/transcode_job.cc:183
 msgid "; %1 fps"
 msgstr ""
 
-#: src/lib/job.cc:593
+#: src/lib/job.cc:603
 msgid "; %1 remaining; finishing at %2%3"
 msgstr ""
 
-#: src/lib/analytics.cc:65
+#: src/lib/analytics.cc:66
 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 of DCP-o-matic. I work on it in my spare time (with the help of a "
-"fine volunteer team of testers and translators) and I release it as free "
-"software.<p>If you find DCP-o-matic useful, please consider a donation to "
-"the project. Financial support will help me to spend more time developing "
-"DCP-o-matic and making it better!<p><ul><li><a href=\"https://dcpomatic.com/"
-"donate_amount?amount=40\">Go to Paypal to donate €40</a><li><a "
-"href=\"https://dcpomatic.com/donate_amount?amount=20\">Go to Paypal to "
-"donate €20</a><li><a href=\"https://dcpomatic.com/donate_amount?"
-"amount=10\">Go to Paypal to donate €10</a></ul><p>Thank you!"
+"<h2>You have made %1 DCPs with %2!</h2><img width=\"20%%\" src=\"memory:me."
+"jpg\" align=\"center\"><font size=\"+1\"><p>Hello. I'm Carl and I'm the "
+"developer of %3. I work on it in my spare time (with the help of a fine "
+"volunteer team of testers and translators) and I release it as free software."
+"<p>If you find %4 useful, please consider a donation to the project. "
+"Financial support will help me to spend more time developing %5 and making "
+"it better!<p><ul><li><a href=\"https://dcpomatic.com/donate_amount?"
+"amount=40\">Go to Paypal to donate €40</a><li><a href=\"https://dcpomatic."
+"com/donate_amount?amount=20\">Go to Paypal to donate €20</a><li><a "
+"href=\"https://dcpomatic.com/donate_amount?amount=10\">Go to Paypal to "
+"donate €10</a></ul><p>Thank you!</font>"
 msgstr ""
 
-#: src/lib/hints.cc:167
+#: src/lib/hints.cc:178
 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 "
+"a good idea to drop the video bit rate down to about 200Mbit/s; this is "
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/lib/text_content.cc:247
+#: src/lib/text_content.cc:251
 msgid ""
 "A subtitle or closed caption file in this project is marked with the "
-"language '%1', which DCP-o-matic does not recognise.  The file's language "
-"has been cleared."
+"language '%1', which %2 does not recognise.  The file's language has been "
+"cleared."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:645
+#: src/lib/ffmpeg_content.cc:646
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:62
+#: src/lib/dcp_content_type.cc:63
 msgid "Advertisement"
 msgstr ""
 
-#: src/lib/hints.cc:144
+#: src/lib/hints.cc:155
 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.  "
@@ -228,14 +266,14 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/lib/hints.cc:148
+#: src/lib/hints.cc:159
 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:115
+#: src/lib/job.cc:116
 msgid "An error occurred whilst handling the file %1."
 msgstr ""
 
@@ -243,58 +281,58 @@ msgstr ""
 msgid "Analysing audio"
 msgstr ""
 
-#: src/lib/analyse_subtitles_job.cc:56
+#: src/lib/analyse_subtitles_job.cc:62
 msgid "Analysing subtitles"
 msgstr ""
 
-#: src/lib/hints.cc:366
+#: src/lib/hints.cc:386
 msgid ""
 "At least one marker comes after the end of the project and will be ignored."
 msgstr ""
 
-#: src/lib/hints.cc:502
+#: src/lib/hints.cc:523
 msgid "At least one of your closed caption files is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:495
+#: src/lib/hints.cc:516
 msgid "At least one of your closed caption files' XML part is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:510
+#: src/lib/hints.cc:531
 msgid "At least one of your subtitle files is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:474
+#: src/lib/hints.cc:495
 msgid ""
 "At least one of your subtitle lines has more than 52 characters.  It is "
 "recommended to make each line 52 characters at most in length."
 msgstr ""
 
-#: src/lib/hints.cc:476
+#: src/lib/hints.cc:497
 msgid ""
 "At least one of your subtitle lines has more than 79 characters.  You should "
 "make each line 79 characters at most in length."
 msgstr ""
 
-#: src/lib/hints.cc:642
+#: src/lib/hints.cc:663
 msgid ""
 "At least one of your subtitles has more than 3 lines.  It is advisable to "
 "use no more than 3 lines."
 msgstr ""
 
-#: src/lib/hints.cc:609
+#: src/lib/hints.cc:630
 msgid ""
 "At least one of your subtitles lasts less than 15 frames.  It is advisable "
 "to make each subtitle at least 15 frames long."
 msgstr ""
 
-#: src/lib/hints.cc:614
+#: src/lib/hints.cc:635
 msgid ""
 "At least one of your subtitles starts less than 2 frames after the previous "
 "one.  It is advisable to make the gap between subtitles at least 2 frames."
 msgstr ""
 
-#: src/lib/hints.cc:685
+#: src/lib/hints.cc:706
 msgid ""
 "At least one piece of subtitle content has no specified language.  It is "
 "advisable to set the language for each piece of subtitle content in the "
@@ -313,72 +351,72 @@ msgstr ""
 msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:639
+#: src/lib/ffmpeg_content.cc:640
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:607
+#: src/lib/ffmpeg_content.cc:608
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:662
+#: src/lib/ffmpeg_content.cc:663
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:641
+#: src/lib/ffmpeg_content.cc:642
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:642
+#: src/lib/ffmpeg_content.cc:643
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:661
+#: src/lib/ffmpeg_content.cc:662
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:666
+#: src/lib/ffmpeg_content.cc:667
 msgid "BT2100"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:603
+#: src/lib/ffmpeg_content.cc:604
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:657
+#: src/lib/ffmpeg_content.cc:658
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:602
+#: src/lib/ffmpeg_content.cc:603
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:599 src/lib/ffmpeg_content.cc:628
-#: src/lib/ffmpeg_content.cc:653
+#: src/lib/ffmpeg_content.cc:600 src/lib/ffmpeg_content.cc:629
+#: src/lib/ffmpeg_content.cc:654
 msgid "BT709"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:673
+#: src/lib/ffmpeg_content.cc:674
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/filter.cc:98
+#: src/lib/filter.cc:99
 msgid "Bob Weaver Deinterlacing Filter"
 msgstr ""
 
-#: src/lib/util.cc:662
+#: src/lib/util.cc:669
 msgid "BsL"
 msgstr ""
 
-#: src/lib/util.cc:663
+#: src/lib/util.cc:670
 msgid "BsR"
 msgstr ""
 
-#: src/lib/util.cc:654
+#: src/lib/util.cc:661
 msgid "C"
 msgstr ""
 
-#: src/lib/job.cc:617
+#: src/lib/job.cc:627
 msgid "Cancelled"
 msgstr ""
 
@@ -390,11 +428,11 @@ msgstr ""
 msgid "Cannot handle pixel format %1 during %2"
 msgstr ""
 
-#: src/lib/film.cc:1671
+#: src/lib/film.cc:1768
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr ""
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:630
 msgid "Centre"
 msgstr ""
 
@@ -402,7 +440,7 @@ msgstr ""
 msgid "Channels"
 msgstr ""
 
-#: src/lib/transcode_job.cc:108
+#: src/lib/transcode_job.cc:109
 msgid "Check their new settings, then try again."
 msgstr ""
 
@@ -410,27 +448,31 @@ msgstr ""
 msgid "Checking content"
 msgstr ""
 
-#: src/lib/reel_writer.cc:271
+#: src/lib/reel_writer.cc:248
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:665
+#: src/lib/ffmpeg_content.cc:666
 msgid "Chroma-derived constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:664
+#: src/lib/ffmpeg_content.cc:665
 msgid "Chroma-derived non-constant luminance"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:63
+#: src/lib/dcp_content_type.cc:64
 msgid "Clip"
 msgstr ""
 
-#: src/lib/text_type.cc:72
+#: src/lib/text_type.cc:85
 msgid "Closed captions"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:624
+#: src/lib/text_type.cc:83
+msgid "Closed subtitles"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:625
 msgid "Colour primaries"
 msgstr ""
 
@@ -444,17 +486,17 @@ 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:556 src/lib/ffmpeg_content.cc:563
-#: src/lib/ffmpeg_content.cc:570 src/lib/ffmpeg_content.cc:580
-#: src/lib/ffmpeg_content.cc:585 src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:557 src/lib/ffmpeg_content.cc:564
+#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:581
+#: src/lib/ffmpeg_content.cc:586 src/lib/ffmpeg_content.cc:591
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:649
+#: src/lib/ffmpeg_content.cc:650
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:670
+#: src/lib/ffmpeg_content.cc:671
 msgid "Colourspace"
 msgstr ""
 
@@ -462,15 +504,15 @@ msgstr ""
 msgid "Combine DCPs"
 msgstr ""
 
-#: src/lib/content.cc:179
+#: src/lib/content.cc:188
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:529
+#: src/lib/writer.cc:534
 msgid "Computing digests"
 msgstr ""
 
-#: src/lib/analytics.cc:63
+#: src/lib/analytics.cc:64
 msgid "Congratulations!"
 msgstr ""
 
@@ -486,19 +528,19 @@ msgstr ""
 msgid "Content sample rate"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:157
+#: src/lib/ffmpeg_content.cc:158
 msgid "Content to be joined must all have or not have audio"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:160
+#: src/lib/ffmpeg_content.cc:161
 msgid "Content to be joined must all have or not have subtitles or captions"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:154
+#: src/lib/ffmpeg_content.cc:155
 msgid "Content to be joined must all have or not have video"
 msgstr ""
 
-#: src/lib/text_content.cc:319
+#: src/lib/text_content.cc:323
 msgid ""
 "Content to be joined must both be main subtitle languages or both additional."
 msgstr ""
@@ -507,11 +549,11 @@ msgstr ""
 msgid "Content to be joined must have all its video used or not used."
 msgstr ""
 
-#: src/lib/text_content.cc:274
+#: src/lib/text_content.cc:278
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr ""
 
-#: src/lib/text_content.cc:270
+#: src/lib/text_content.cc:274
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr ""
 
@@ -547,7 +589,7 @@ msgstr ""
 msgid "Content to be joined must have the same fades."
 msgstr ""
 
-#: src/lib/text_content.cc:302
+#: src/lib/text_content.cc:306
 msgid "Content to be joined must have the same outline width."
 msgstr ""
 
@@ -555,31 +597,31 @@ msgstr ""
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/text_content.cc:278
+#: src/lib/text_content.cc:282
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 
-#: src/lib/text_content.cc:286
+#: src/lib/text_content.cc:290
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr ""
 
-#: src/lib/text_content.cc:282
+#: src/lib/text_content.cc:286
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:294
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr ""
 
-#: src/lib/text_content.cc:298
+#: src/lib/text_content.cc:302
 msgid "Content to be joined must have the same subtitle fades."
 msgstr ""
 
-#: src/lib/text_content.cc:294
+#: src/lib/text_content.cc:298
 msgid "Content to be joined must have the same subtitle line spacing."
 msgstr ""
 
-#: src/lib/content.cc:127 src/lib/content.cc:131
+#: src/lib/content.cc:131 src/lib/content.cc:135
 msgid "Content to be joined must have the same video frame rate"
 msgstr ""
 
@@ -587,23 +629,23 @@ msgstr ""
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
-#: src/lib/text_content.cc:311
+#: src/lib/text_content.cc:315
 msgid "Content to be joined must use the same DCP track."
 msgstr ""
 
-#: src/lib/text_content.cc:307 src/lib/text_content.cc:327
+#: src/lib/text_content.cc:311 src/lib/text_content.cc:331
 msgid "Content to be joined must use the same fonts."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:181
+#: src/lib/ffmpeg_content.cc:182
 msgid "Content to be joined must use the same subtitle stream."
 msgstr ""
 
-#: src/lib/text_content.cc:315
+#: src/lib/text_content.cc:319
 msgid "Content to be joined must use the same text language."
 msgstr ""
 
-#: src/lib/video_content.cc:458
+#: src/lib/video_content.cc:460
 msgid "Content video is %1x%2"
 msgstr ""
 
@@ -611,14 +653,6 @@ msgstr ""
 msgid "Copy DCP to TMS"
 msgstr ""
 
-#: src/lib/reel_writer.cc:142
-msgid "Copying old video file"
-msgstr ""
-
-#: src/lib/reel_writer.cc:407
-msgid "Copying video file into DCP"
-msgstr ""
-
 #: src/lib/scp_uploader.cc:57
 msgid "Could not connect to server %1 (%2)"
 msgstr ""
@@ -635,17 +669,17 @@ msgstr ""
 msgid "Could not decode image (%1)"
 msgstr ""
 
-#: src/lib/unzipper.cc:64
+#: src/lib/unzipper.cc:76
 msgid "Could not find file %1 in ZIP file"
 msgstr ""
 
-#: src/lib/encode_server_finder.cc:191
+#: src/lib/encode_server_finder.cc:193
 msgid ""
-"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
-"o-matic is running."
+"Could not listen for remote encode servers.  Perhaps another instance of %1 "
+"is running."
 msgstr ""
 
-#: src/lib/job.cc:170 src/lib/job.cc:185
+#: src/lib/job.cc:180 src/lib/job.cc:195
 msgid "Could not open %1"
 msgstr ""
 
@@ -653,19 +687,19 @@ msgstr ""
 msgid "Could not open %1 to send"
 msgstr ""
 
-#: src/lib/internet.cc:165 src/lib/internet.cc:170
+#: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
 msgstr ""
 
-#: src/lib/internet.cc:177
+#: src/lib/internet.cc:179
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
 msgstr ""
 
-#: src/lib/config.cc:1140
+#: src/lib/config.cc:1153
 msgid "Could not open file for writing"
 msgstr ""
 
-#: src/lib/ffmpeg_file_encoder.cc:265
+#: src/lib/ffmpeg_file_encoder.cc:271
 msgid "Could not open output file %1 (%2)"
 msgstr ""
 
@@ -681,19 +715,19 @@ msgstr ""
 msgid "Could not write to remote file (%1)"
 msgstr ""
 
-#: src/lib/util.cc:633
+#: src/lib/util.cc:640
 msgid "D-BOX primary"
 msgstr ""
 
-#: src/lib/util.cc:634
+#: src/lib/util.cc:641
 msgid "D-BOX secondary"
 msgstr ""
 
-#: src/lib/util.cc:664
+#: src/lib/util.cc:671
 msgid "DBP"
 msgstr ""
 
-#: src/lib/util.cc:665
+#: src/lib/util.cc:672
 msgid "DBS"
 msgstr ""
 
@@ -705,7 +739,7 @@ msgstr ""
 msgid "DCI Scope"
 msgstr ""
 
-#: src/lib/dcp_subtitle_content.cc:136
+#: src/lib/dcp_subtitle_content.cc:140
 msgid "DCP XML subtitles"
 msgstr ""
 
@@ -722,43 +756,34 @@ msgstr ""
 msgid "DCP will use every other frame of the content.\n"
 msgstr ""
 
-#: src/lib/job.cc:172 src/lib/job.cc:187
-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:1596
+#: src/lib/film.cc:1685
 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."
+"DCP-o-matic had to set your container to 1920x1080 as it's the only one that "
+"can be used with MPEG2 encoding."
 msgstr ""
 
-#: src/lib/film.cc:1564
+#: src/lib/film.cc:1689
 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."
+"DCP-o-matic had to set your film to 2D as 3D is not yet supported with MPEG2 "
+"encoding."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:121
+#: src/lib/film.cc:1693
 msgid ""
-"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
-msgstr ""
-
-#: src/lib/config.cc:429 src/lib/config.cc:1251
-msgid "DCP-o-matic notification"
+"DCP-o-matic set your container to DCI Flat as it was previously 1920x1080 "
+"and that is not a standard ratio with JPEG2000 encoding."
 msgstr ""
 
 #: src/lib/datasat_ap2x.cc:28
 msgid "Datasat AP20 or AP25"
 msgstr ""
 
-#: src/lib/filter.cc:95 src/lib/filter.cc:96 src/lib/filter.cc:97
-#: src/lib/filter.cc:98 src/lib/filter.cc:99
+#: src/lib/filter.cc:96 src/lib/filter.cc:97 src/lib/filter.cc:98
+#: src/lib/filter.cc:99 src/lib/filter.cc:100
 msgid "De-interlacing"
 msgstr ""
 
-#: src/lib/config.cc:1239
+#: src/lib/config.cc:1238
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -770,14 +795,18 @@ msgid ""
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
-"DCP-o-matic"
+"%1"
+msgstr ""
+
+#: src/lib/exceptions.cc:178
+msgid "Disk full when writing %1"
 msgstr ""
 
 #: src/lib/dolby_cp750.cc:31
 msgid "Dolby CP650 or CP750"
 msgstr ""
 
-#: src/lib/internet.cc:122
+#: src/lib/internet.cc:124
 msgid "Download failed (%1 error %2)"
 msgstr ""
 
@@ -801,19 +830,19 @@ msgstr ""
 msgid "Email notification"
 msgstr ""
 
-#: src/lib/send_problem_report_job.cc:68
+#: src/lib/send_problem_report_job.cc:69
 msgid "Email problem report"
 msgstr ""
 
-#: src/lib/send_problem_report_job.cc:71
+#: src/lib/send_problem_report_job.cc:72
 msgid "Email problem report for %1"
 msgstr ""
 
-#: src/lib/dcp_encoder.cc:103 src/lib/ffmpeg_encoder.cc:135
+#: src/lib/dcp_film_encoder.cc:120 src/lib/ffmpeg_film_encoder.cc:135
 msgid "Encoding"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:66
+#: src/lib/dcp_content_type.cc:67
 msgid "Episode"
 msgstr ""
 
@@ -821,19 +850,19 @@ msgstr ""
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/job.cc:615
+#: src/lib/job.cc:625
 msgid "Error: %1"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:68
+#: src/lib/dcp_content_type.cc:69
 msgid "Event"
 msgstr ""
 
-#: src/lib/hints.cc:397
+#: src/lib/hints.cc:417
 msgid "Examining audio"
 msgstr ""
 
-#: src/lib/hints.cc:399
+#: src/lib/hints.cc:419
 msgid "Examining audio, subtitles and closed captions"
 msgstr ""
 
@@ -845,15 +874,15 @@ msgstr ""
 msgid "Examining subtitles"
 msgstr ""
 
-#: src/lib/hints.cc:395
+#: src/lib/hints.cc:415
 msgid "Examining subtitles and closed captions"
 msgstr ""
 
-#: src/lib/subtitle_encoder.cc:99
+#: src/lib/subtitle_film_encoder.cc:99
 msgid "Extracting"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:656
+#: src/lib/ffmpeg_content.cc:657
 msgid "FCC"
 msgstr ""
 
@@ -861,51 +890,51 @@ msgstr ""
 msgid "Failed to authenticate with server (%1)"
 msgstr ""
 
-#: src/lib/job.cc:139 src/lib/job.cc:149
+#: src/lib/job.cc:140 src/lib/job.cc:154
 msgid "Failed to encode the DCP."
 msgstr ""
 
-#: src/lib/email.cc:239
+#: src/lib/email.cc:240
 msgid "Failed to send email"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:53
+#: src/lib/dcp_content_type.cc:54
 msgid "Feature"
 msgstr ""
 
-#: src/lib/content.cc:475
+#: src/lib/content.cc:487
 msgid "Filename"
 msgstr ""
 
-#: src/lib/content.cc:475
+#: src/lib/content.cc:487
 msgid "Filenames"
 msgstr ""
 
-#: src/lib/transcode_job.cc:108 src/lib/transcode_job.cc:113
+#: src/lib/transcode_job.cc:109 src/lib/transcode_job.cc:115
 msgid "Files have changed since they were added to the project."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/ffmpeg_content.cc:607
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:113
+#: src/lib/ffmpeg_examiner.cc:105
 msgid "Finding length"
 msgstr ""
 
-#: src/lib/content.cc:485
+#: src/lib/content.cc:497
 msgid "Frame rate"
 msgstr ""
 
-#: src/lib/job.cc:559
+#: src/lib/job.cc:569
 msgid "Friday"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:591
 msgid "Full"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:570
+#: src/lib/ffmpeg_content.cc:571
 msgid "Full (0-%1)"
 msgstr ""
 
@@ -929,35 +958,35 @@ msgstr ""
 msgid "Full length in video frames at content rate"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:631
+#: src/lib/ffmpeg_content.cc:632
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:632
+#: src/lib/ffmpeg_content.cc:633
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
-#: src/lib/filter.cc:100
+#: src/lib/filter.cc:101
 msgid "Gradient debander"
 msgstr ""
 
-#: src/lib/util.cc:658
+#: src/lib/util.cc:665
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:634
 msgid "Hearing impaired"
 msgstr ""
 
-#: src/lib/filter.cc:103
+#: src/lib/filter.cc:104
 msgid "High quality 3D denoiser"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:67
+#: src/lib/dcp_content_type.cc:68
 msgid "Highlights"
 msgstr ""
 
-#: src/lib/filter.cc:92
+#: src/lib/filter.cc:93
 msgid "Horizontal flip"
 msgstr ""
 
@@ -965,105 +994,105 @@ msgstr ""
 msgid "Hz"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:640
+#: src/lib/ffmpeg_content.cc:641
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:638
+#: src/lib/ffmpeg_content.cc:639
 msgid "IEC61966-2-4"
 msgstr ""
 
-#: src/lib/hints.cc:186
+#: src/lib/hints.cc:197
 msgid "If you do use 25fps you should change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/hints.cc:249
+#: src/lib/hints.cc:260
 msgid ""
 "In general it is now advisable to make SMPTE DCPs unless you have a "
 "particular reason to use Interop.  It is advisable to set your DCP to use "
 "the SMPTE standard in the \"DCP\" tab."
 msgstr ""
 
-#: src/lib/release_notes.cc:53
+#: src/lib/release_notes.cc:79
 msgid ""
-"In this version there are changes to the way that subtitles are positioned.  "
+"In this version there are changes to the way that subtitles are positioned. "
 "Positioning should now be more correct, with respect to the standards, but "
 "you should check any subtitles in your project to make sure that they are "
 "placed where you want them."
 msgstr ""
 
-#: src/lib/hints.cc:602
+#: src/lib/hints.cc:623
 msgid ""
 "It is advisable to put your first subtitle at least 4 seconds after the "
 "start of the DCP to make sure it is seen."
 msgstr ""
 
-#: src/lib/job.cc:160 src/lib/job.cc:195 src/lib/job.cc:255 src/lib/job.cc:265
-msgid "It is not known what caused this error."
+#: src/lib/job.cc:170 src/lib/job.cc:205 src/lib/job.cc:265 src/lib/job.cc:275
+msgid "It is not known what caused this error.  %1"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:620
+#: src/lib/ffmpeg_content.cc:621
 msgid "JEDEC P22"
 msgstr ""
 
-#: src/lib/config.cc:419 src/lib/config.cc:1236
+#: src/lib/config.cc:424 src/lib/config.cc:1235
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
-#: src/lib/filter.cc:96
+#: src/lib/filter.cc:97
 msgid "Kernel deinterlacer"
 msgstr ""
 
 #. TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export
-#: src/lib/ffmpeg_encoder.cc:266 src/lib/util.cc:652
+#: src/lib/ffmpeg_film_encoder.cc:266 src/lib/util.cc:659
 msgid "L"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:107 src/lib/util.cc:621
+#: src/lib/mid_side_decoder.cc:107 src/lib/util.cc:628
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:629
+#: src/lib/util.cc:636
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:631
+#: src/lib/util.cc:638
 msgid "Left rear surround"
 msgstr ""
 
-#: src/lib/util.cc:625
+#: src/lib/util.cc:632
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/video_content.cc:531
+#: src/lib/video_content.cc:533
 msgid "Length"
 msgstr ""
 
-#: src/lib/util.cc:655
+#: src/lib/util.cc:662
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:624
+#: src/lib/util.cc:631
 msgid "Lfe (sub)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:585
+#: src/lib/ffmpeg_content.cc:586
 msgid "Limited"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:563
+#: src/lib/ffmpeg_content.cc:564
 msgid "Limited / video (%1-%2)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:635
+#: src/lib/ffmpeg_content.cc:636
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:636
+#: src/lib/ffmpeg_content.cc:637
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:637
+#: src/lib/ffmpeg_content.cc:638
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
@@ -1071,7 +1100,7 @@ msgstr ""
 msgid "Lost communication between main and writer processes"
 msgstr ""
 
-#: src/lib/util.cc:656
+#: src/lib/util.cc:663
 msgid "Ls"
 msgstr ""
 
@@ -1079,24 +1108,24 @@ msgstr ""
 msgid "Mid-side decoder"
 msgstr ""
 
-#: src/lib/filter.cc:100 src/lib/filter.cc:101 src/lib/filter.cc:104
-#: src/lib/filter.cc:106
+#: src/lib/filter.cc:101 src/lib/filter.cc:102 src/lib/filter.cc:105
+#: src/lib/filter.cc:107
 msgid "Misc"
 msgstr ""
 
-#: src/lib/dcp_examiner.cc:183
+#: src/lib/dcp_examiner.cc:191
 msgid "Mismatched audio channel counts in DCP"
 msgstr ""
 
-#: src/lib/dcp_examiner.cc:191
+#: src/lib/dcp_examiner.cc:199
 msgid "Mismatched audio sample rates in DCP"
 msgstr ""
 
-#: src/lib/dcp_examiner.cc:156
+#: src/lib/dcp_examiner.cc:160
 msgid "Mismatched frame rates in DCP"
 msgstr ""
 
-#: src/lib/dcp_examiner.cc:163
+#: src/lib/dcp_examiner.cc:167
 msgid "Mismatched video sizes in DCP"
 msgstr ""
 
@@ -1104,19 +1133,19 @@ msgstr ""
 msgid "Missing required setting %1"
 msgstr ""
 
-#: src/lib/job.cc:551
+#: src/lib/job.cc:561
 msgid "Monday"
 msgstr ""
 
-#: src/lib/writer.cc:779
+#: src/lib/writer.cc:783
 msgid "Mono"
 msgstr ""
 
-#: src/lib/filter.cc:95
+#: src/lib/filter.cc:96
 msgid "Motion compensating deinterlacer"
 msgstr ""
 
-#: src/lib/dcp_decoder.cc:111
+#: src/lib/dcp_decoder.cc:114
 msgid "No CPLs found in DCP."
 msgstr ""
 
@@ -1128,74 +1157,83 @@ msgstr ""
 msgid "No outgoing mail server configured in the Email tab of preferences"
 msgstr ""
 
-#: src/lib/image_content.cc:131
+#: src/lib/image_content.cc:132
 msgid "No valid image files were found in the folder."
 msgstr ""
 
-#: src/lib/filter.cc:102 src/lib/filter.cc:103 src/lib/filter.cc:105
+#: src/lib/filter.cc:103 src/lib/filter.cc:104 src/lib/filter.cc:106
 msgid "Noise reduction"
 msgstr ""
 
-#: src/lib/writer.cc:747 src/lib/writer.cc:754 src/lib/writer.cc:777
+#: src/lib/writer.cc:751 src/lib/writer.cc:758 src/lib/writer.cc:781
 msgid "None"
 msgstr ""
 
-#: src/lib/job.cc:607
+#: src/lib/job.cc:617
 msgid "OK"
 msgstr ""
 
-#: src/lib/job.cc:612
+#: src/lib/job.cc:622
 msgid "OK (ran for %1 from %2 to %3)"
 msgstr ""
 
-#: src/lib/job.cc:610
+#: src/lib/job.cc:620
 msgid "OK (ran for %1)"
 msgstr ""
 
-#: src/lib/content.cc:116
+#: src/lib/content.cc:120
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 
-#: src/lib/content.cc:120
+#: src/lib/content.cc:124
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 
-#: src/lib/text_type.cc:70
+#: src/lib/text_type.cc:81
+msgid "Open captions"
+msgstr ""
+
+#: src/lib/text_type.cc:79
 msgid "Open subtitles"
 msgstr ""
 
-#: src/lib/transcode_job.cc:113
+#: src/lib/transcode_job.cc:116
 msgid ""
-"Open the project in DCP-o-matic, check the settings, then save it before "
-"trying again."
+"Open the project in %1, check the settings, then save it before trying again."
 msgstr ""
 
-#: src/lib/filter.cc:91 src/lib/filter.cc:92 src/lib/filter.cc:93
-#: src/lib/filter.cc:94
+#: src/lib/filter.cc:92 src/lib/filter.cc:93 src/lib/filter.cc:94
+#: src/lib/filter.cc:95
 msgid "Orientation"
 msgstr ""
 
-#: src/lib/job.cc:217
+#: src/lib/job.cc:227
 msgid "Out of memory"
 msgstr ""
 
-#: src/lib/filter.cc:105
+#: src/lib/filter.cc:106
 msgid "Overcomplete wavelet denoiser"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:293
+#: src/lib/colour_conversion.cc:292
 msgid "P3"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:60
+#: src/lib/util.cc:1186
+msgid ""
+"Please report this problem by using Help -> Report a problem or via email to "
+"%1"
+msgstr ""
+
+#: src/lib/dcp_content_type.cc:61
 msgid "Policy"
 msgstr ""
 
-#: src/lib/filter.cc:106
+#: src/lib/filter.cc:107
 msgid "Premultiply alpha channel"
 msgstr ""
 
-#: src/lib/content.cc:494
+#: src/lib/content.cc:506
 msgid "Prepared for video frame rate"
 msgstr ""
 
@@ -1203,116 +1241,116 @@ msgstr ""
 msgid "Programming error at %1:%2 %3"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:64
+#: src/lib/dcp_content_type.cc:65
 msgid "Promo"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:61
+#: src/lib/dcp_content_type.cc:62
 msgid "Public Service Announcement"
 msgstr ""
 
 #. TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export
-#: src/lib/ffmpeg_encoder.cc:271 src/lib/util.cc:653
+#: src/lib/ffmpeg_film_encoder.cc:271 src/lib/util.cc:660
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:652
+#: src/lib/ffmpeg_content.cc:653
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:58
+#: src/lib/dcp_content_type.cc:59
 msgid "Rating"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:294
+#: src/lib/colour_conversion.cc:293
 msgid "Rec. 1886"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:295
+#: src/lib/colour_conversion.cc:294
 msgid "Rec. 2020"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:291
+#: src/lib/colour_conversion.cc:290
 msgid "Rec. 601"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:292
+#: src/lib/colour_conversion.cc:291
 msgid "Rec. 709"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:108 src/lib/util.cc:622
+#: src/lib/mid_side_decoder.cc:108 src/lib/util.cc:629
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:630
+#: src/lib/util.cc:637
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:632
+#: src/lib/util.cc:639
 msgid "Right rear surround"
 msgstr ""
 
-#: src/lib/util.cc:626
+#: src/lib/util.cc:633
 msgid "Right surround"
 msgstr ""
 
-#: src/lib/filter.cc:94
+#: src/lib/filter.cc:95
 msgid "Rotate 90 degrees anti-clockwise"
 msgstr ""
 
-#: src/lib/filter.cc:93
+#: src/lib/filter.cc:94
 msgid "Rotate 90 degrees clockwise"
 msgstr ""
 
-#: src/lib/util.cc:657
+#: src/lib/util.cc:664
 msgid "Rs"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:296
+#: src/lib/colour_conversion.cc:295
 msgid "S-Gamut3/S-Log3"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:604 src/lib/ffmpeg_content.cc:633
+#: src/lib/ffmpeg_content.cc:605 src/lib/ffmpeg_content.cc:634
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:658
+#: src/lib/ffmpeg_content.cc:659
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:663
+#: src/lib/ffmpeg_content.cc:664
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:605 src/lib/ffmpeg_content.cc:634
-#: src/lib/ffmpeg_content.cc:659
+#: src/lib/ffmpeg_content.cc:606 src/lib/ffmpeg_content.cc:635
+#: src/lib/ffmpeg_content.cc:660
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/hints.cc:667
+#: src/lib/hints.cc:688
 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:643
+#: src/lib/ffmpeg_content.cc:644
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:644
+#: src/lib/ffmpeg_content.cc:645
 msgid "SMPTE ST 428-1"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:608
+#: src/lib/ffmpeg_content.cc:609
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:609
+#: src/lib/ffmpeg_content.cc:610
 msgid "SMPTE ST 431-2 (2011)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:610
+#: src/lib/ffmpeg_content.cc:611
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr ""
 
@@ -1325,27 +1363,27 @@ msgstr ""
 msgid "SSH error [%1] (%2)"
 msgstr ""
 
-#: src/lib/job.cc:561
+#: src/lib/job.cc:571
 msgid "Saturday"
 msgstr ""
 
-#: src/lib/image_content.cc:117
+#: src/lib/image_content.cc:118
 msgid "Scanning image files"
 msgstr ""
 
-#: src/lib/send_problem_report_job.cc:85
+#: src/lib/send_problem_report_job.cc:86
 msgid "Sending email"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:54
+#: src/lib/dcp_content_type.cc:55
 msgid "Short"
 msgstr ""
 
-#: src/lib/util.cc:666
+#: src/lib/util.cc:673
 msgid "Sign"
 msgstr ""
 
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:535
 msgid "Size"
 msgstr ""
 
@@ -1353,11 +1391,11 @@ msgstr ""
 msgid "Some audio will be resampled to %1Hz"
 msgstr ""
 
-#: src/lib/transcode_job.cc:117
+#: src/lib/transcode_job.cc:121
 msgid "Some files have been changed since they were added to the project."
 msgstr ""
 
-#: src/lib/transcode_job.cc:107
+#: src/lib/transcode_job.cc:108
 msgid ""
 "Some files have been changed since they were added to the project.\n"
 "\n"
@@ -1372,13 +1410,13 @@ msgid ""
 "These files will now be re-examined, so you may need to check their settings."
 msgstr ""
 
-#: src/lib/hints.cc:583
+#: src/lib/hints.cc:604
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
 msgstr ""
 
-#: src/lib/hints.cc:705
+#: src/lib/hints.cc:726
 msgid ""
 "Some of your content has audio but you have not set the audio language.  It "
 "is advisable to set the audio language in the \"DCP\" tab unless your audio "
@@ -1397,11 +1435,11 @@ msgstr ""
 msgid "Some of your content needs an OV"
 msgstr ""
 
-#: src/lib/writer.cc:781
+#: src/lib/writer.cc:785
 msgid "Stereo"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:65
+#: src/lib/dcp_content_type.cc:66
 msgid "Stereo card"
 msgstr ""
 
@@ -1413,19 +1451,19 @@ msgstr ""
 msgid "Stereo to 5.1 up-mixer B"
 msgstr ""
 
-#: src/lib/job.cc:549
+#: src/lib/job.cc:559
 msgid "Sunday"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:59
+#: src/lib/dcp_content_type.cc:60
 msgid "Teaser"
 msgstr ""
 
-#: src/lib/filter.cc:104
+#: src/lib/filter.cc:105
 msgid "Telecine filter"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:56
+#: src/lib/dcp_content_type.cc:57
 msgid "Test"
 msgstr ""
 
@@ -1445,54 +1483,68 @@ msgstr ""
 msgid "The certificate chain for signing is invalid (%1)"
 msgstr ""
 
-#: src/lib/hints.cc:721
+#: src/lib/hints.cc:743
 msgid ""
-"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
-"contains a small error which will prevent DCPs from being validated "
-"correctly on some systems.  It is advisable to re-create the signing "
-"certificate chain by clicking the \"Re-make certificates and key...\" button "
-"in the Keys page of Preferences."
+"The certificate chain that %1 uses for signing DCPs and KDMs contains a "
+"small error which will prevent DCPs from being validated correctly on some "
+"systems.  It is advisable to re-create the signing certificate chain by "
+"clicking the \"Re-make certificates and key...\" button in the Keys page of "
+"Preferences."
 msgstr ""
 
-#: src/lib/hints.cc:727
+#: src/lib/hints.cc:751
 msgid ""
-"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a "
-"validity period that is too long.  This will cause problems playing back "
-"DCPs on some systems. It is advisable to re-create the signing certificate "
-"chain by clicking the \"Re-make certificates and key...\" button in the Keys "
-"page of Preferences."
+"The certificate chain that %1 uses for signing DCPs and KDMs has a validity "
+"period that is too long.  This will cause problems playing back DCPs on some "
+"systems. It is advisable to re-create the signing certificate chain by "
+"clicking the \"Re-make certificates and key...\" button in the Keys page of "
+"Preferences."
 msgstr ""
 
-#: src/lib/video_decoder.cc:81
+#: src/lib/video_decoder.cc:70
 msgid ""
 "The content file %1 is set as 3D but does not appear to contain 3D images.  "
 "Please set it to 2D.  You can still make a 3D DCP from this content by "
 "ticking the 3D option in the DCP video tab."
 msgstr ""
 
-#: src/lib/job.cc:121
+#: src/lib/job.cc:122
 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:244
+#: src/lib/playlist.cc:245
 msgid "The file %1 has been moved %2 milliseconds earlier."
 msgstr ""
 
-#: src/lib/playlist.cc:239
+#: src/lib/playlist.cc:240
 msgid "The file %1 has been moved %2 milliseconds later."
 msgstr ""
 
-#: src/lib/playlist.cc:264
+#: src/lib/playlist.cc:265
 msgid "The file %1 has been trimmed by %2 milliseconds less."
 msgstr ""
 
-#: src/lib/playlist.cc:259
+#: src/lib/playlist.cc:260
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr ""
 
-#: src/lib/hints.cc:239
+#: src/lib/hints.cc:269
+msgid ""
+"The vast majority of cinemas in Europe, Australasia and North America expect "
+"DCPs encoded with JPEG2000 rather than MPEG2.  Make sure that your cinema "
+"really wants an old-style MPEG2 DCP."
+msgstr ""
+
+#: src/lib/release_notes.cc:86
+msgid ""
+"The vertical offset control for some subtitles now works in the opposite "
+"direction to how it was before.   You should check any subtitles in your "
+"project to make sure that they are placed where you want them."
+msgstr ""
+
+#: src/lib/hints.cc:250
 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 "
@@ -1501,38 +1553,37 @@ msgid ""
 "systems support your chosen DCP rate."
 msgstr ""
 
-#: src/lib/dcp_content.cc:675
+#: src/lib/dcp_content.cc:714
 msgid "There is no video in this DCP"
 msgstr ""
 
-#: src/lib/job.cc:217
+#: src/lib/job.cc:227
 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:1029
-msgid "This KDM was made for DCP-o-matic but not for its leaf certificate."
+#: src/lib/util.cc:1027
+msgid "This KDM was made for %1 but not for its leaf certificate."
 msgstr ""
 
-#: src/lib/util.cc:1027
-msgid "This KDM was not made for DCP-o-matic's decryption certificate."
+#: src/lib/util.cc:1025
+msgid "This KDM was not made for %1's decryption certificate."
 msgstr ""
 
-#: src/lib/job.cc:140
+#: src/lib/job.cc:142
 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 "
-"the 'number of threads DCP-o-matic should use' in the General tab of "
-"Preferences and try again."
+"of %1 and trying to use too many encoding threads.  Please reduce the "
+"'number of threads %2 should use' in the General tab of Preferences and try "
+"again."
 msgstr ""
 
-#: src/lib/job.cc:150
+#: src/lib/job.cc:156
 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 "
-"try again."
+"of %1.  Please re-install %2 with the 64-bit installer and try again."
 msgstr ""
 
 #: src/lib/exceptions.cc:113
@@ -1541,40 +1592,40 @@ msgid ""
 "the content and choosing \"Add KDM\"."
 msgstr ""
 
-#: src/lib/film.cc:521
+#: src/lib/film.cc:546
 msgid ""
-"This film was created with a newer version of DCP-o-matic, and it cannot be "
-"loaded into this version.  Sorry!"
+"This film was created with a newer version of %1, and it cannot be loaded "
+"into this version.  Sorry!"
 msgstr ""
 
-#: src/lib/film.cc:506
+#: src/lib/film.cc:527
 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!"
+"This film was created with an older version of %1, 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/job.cc:557
+#: src/lib/job.cc:567
 msgid "Thursday"
 msgstr ""
 
-#: src/lib/text_type.cc:68
+#: src/lib/text_type.cc:77
 msgid "Timed text"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:55
+#: src/lib/dcp_content_type.cc:56
 msgid "Trailer"
 msgstr ""
 
-#: src/lib/transcode_job.cc:74
+#: src/lib/transcode_job.cc:75
 msgid "Transcoding %1"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:57
+#: src/lib/dcp_content_type.cc:58
 msgid "Transitional"
 msgstr ""
 
-#: src/lib/job.cc:553
+#: src/lib/job.cc:563
 msgid "Tuesday"
 msgstr ""
 
@@ -1582,7 +1633,7 @@ msgstr ""
 msgid "USL"
 msgstr ""
 
-#: src/lib/internet.cc:186
+#: src/lib/internet.cc:188
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
@@ -1590,35 +1641,35 @@ msgstr ""
 msgid "Unexpected image type received by server"
 msgstr ""
 
-#: src/lib/cross_common.cc:99 src/lib/dcp_text_track.cc:53
+#: src/lib/cross_common.cc:96 src/lib/dcp_text_track.cc:53
 msgid "Unknown"
 msgstr ""
 
-#: src/lib/job.cc:264
+#: src/lib/job.cc:274
 msgid "Unknown error"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:374
+#: src/lib/ffmpeg_decoder.cc:373
 msgid "Unrecognised audio sample format (%1)"
 msgstr ""
 
-#: src/lib/filter.cc:101
+#: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:556 src/lib/ffmpeg_content.cc:580
-#: src/lib/ffmpeg_content.cc:598 src/lib/ffmpeg_content.cc:600
-#: src/lib/ffmpeg_content.cc:601 src/lib/ffmpeg_content.cc:627
-#: src/lib/ffmpeg_content.cc:629 src/lib/ffmpeg_content.cc:630
-#: src/lib/ffmpeg_content.cc:654 src/lib/ffmpeg_content.cc:655
+#: src/lib/ffmpeg_content.cc:557 src/lib/ffmpeg_content.cc:581
+#: src/lib/ffmpeg_content.cc:599 src/lib/ffmpeg_content.cc:601
+#: src/lib/ffmpeg_content.cc:602 src/lib/ffmpeg_content.cc:628
+#: src/lib/ffmpeg_content.cc:630 src/lib/ffmpeg_content.cc:631
+#: src/lib/ffmpeg_content.cc:655 src/lib/ffmpeg_content.cc:656
 msgid "Unspecified"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:249
+#: src/lib/colour_conversion.cc:248
 msgid "Untitled"
 msgstr ""
 
-#: src/lib/util.cc:635 src/lib/util.cc:636
+#: src/lib/util.cc:642 src/lib/util.cc:643
 msgid "Unused"
 msgstr ""
 
@@ -1630,7 +1681,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/util.cc:659
+#: src/lib/util.cc:666
 msgid "VI"
 msgstr ""
 
@@ -1638,11 +1689,11 @@ msgstr ""
 msgid "Verify DCP"
 msgstr ""
 
-#: src/lib/filter.cc:91
+#: src/lib/filter.cc:92
 msgid "Vertical flip"
 msgstr ""
 
-#: src/lib/util.cc:628
+#: src/lib/util.cc:635
 msgid "Visually impaired"
 msgstr ""
 
@@ -1650,74 +1701,74 @@ msgstr ""
 msgid "Waiting"
 msgstr ""
 
-#: src/lib/filter.cc:99
+#: src/lib/filter.cc:100
 msgid "Weave filter"
 msgstr ""
 
-#: src/lib/job.cc:555
+#: src/lib/job.cc:565
 msgid "Wednesday"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:660
+#: src/lib/ffmpeg_content.cc:661
 msgid "YCOCG"
 msgstr ""
 
-#: src/lib/filter.cc:97
+#: src/lib/filter.cc:98
 msgid "Yet Another Deinterlacing Filter"
 msgstr ""
 
-#: src/lib/hints.cc:199
+#: src/lib/hints.cc:210
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
 "supported by all projectors.  It is advisable to change the DCP frame rate "
 "to %2 fps."
 msgstr ""
 
-#: src/lib/hints.cc:183
+#: src/lib/hints.cc:194
 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:193
+#: src/lib/hints.cc:204
 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:304
+#: src/lib/hints.cc:127
 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.)"
+"You are using %1'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:120
+#: src/lib/hints.cc:324
 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."
+"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:288
+#: src/lib/hints.cc:308
 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/film.cc:1560
+#: src/lib/film.cc:1623
 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:590
+#: src/lib/hints.cc:611
 msgid ""
 "You have overlapping closed captions, which are not allowed in Interop "
 "DCPs.  Change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/hints.cc:272
+#: src/lib/hints.cc:292
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
@@ -1727,59 +1778,59 @@ msgstr ""
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
-#: src/lib/hints.cc:744
+#: src/lib/hints.cc:769
 msgid ""
 "Your DCP has %1 audio channels, rather than 8 or 16.  This may cause some "
 "distributors to raise QC errors when they check your DCP.  To avoid this, "
 "set the DCP audio channels to 8 or 16."
 msgstr ""
 
-#: src/lib/hints.cc:110
+#: src/lib/hints.cc:112
 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 "
-"matter if your content has fewer channels, as DCP-o-matic will fill the "
-"extras with silence."
+"matter if your content has fewer channels, as %1 will fill the extras with "
+"silence."
 msgstr ""
 
-#: src/lib/hints.cc:158
+#: src/lib/hints.cc:169
 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:338
+#: src/lib/hints.cc:358
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
 msgstr ""
 
-#: src/lib/playlist.cc:235
+#: src/lib/playlist.cc:236
 msgid ""
 "Your project contains video content that was not aligned to a frame boundary."
 msgstr ""
 
-#: src/lib/playlist.cc:255
+#: src/lib/playlist.cc:256
 msgid ""
 "Your project contains video content whose trim was not aligned to a frame "
 "boundary."
 msgstr ""
 
-#: src/lib/image_content.cc:78
+#: src/lib/image_content.cc:79
 msgid "[moving images]"
 msgstr ""
 
-#: src/lib/image_content.cc:76
+#: src/lib/image_content.cc:77
 msgid "[still]"
 msgstr ""
 
-#: src/lib/dcp_subtitle_content.cc:130 src/lib/string_text_file_content.cc:112
+#: src/lib/dcp_subtitle_content.cc:134 src/lib/string_text_file_content.cc:112
 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:152
+#: src/lib/ffmpeg_film_encoder.cc:152
 msgid "_reel%1"
 msgstr ""
 
@@ -1811,11 +1862,11 @@ msgstr ""
 msgid "could not find stream information"
 msgstr ""
 
-#: src/lib/reel_writer.cc:453
+#: src/lib/reel_writer.cc:407
 msgid "could not move atmos asset into the DCP (%1)"
 msgstr ""
 
-#: src/lib/reel_writer.cc:436
+#: src/lib/reel_writer.cc:390
 msgid "could not move audio asset into the DCP (%1)"
 msgstr ""
 
@@ -1843,7 +1894,7 @@ msgstr ""
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/dcpomatic_socket.cc:142
+#: src/lib/dcpomatic_socket.cc:149
 msgid "error during async_read (%1)"
 msgstr ""
 
@@ -1851,78 +1902,85 @@ msgstr ""
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/content.cc:487 src/lib/content.cc:496
+#: src/lib/content.cc:499 src/lib/content.cc:508
 msgid "frames per second"
 msgstr ""
 
 #. TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:207
+#: src/lib/util.cc:208
 msgid "h"
 msgstr ""
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:633
+#: src/lib/dcp_content.cc:671
 msgid "it has a different frame rate to the film."
 msgstr ""
 
-#: src/lib/dcp_content.cc:726
+#: src/lib/dcp_content.cc:753
 msgid ""
 "it has a different number of audio channels than the project; set the "
 "project to have %1 channels."
 msgstr ""
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:780
+#: src/lib/dcp_content.cc:789
 msgid ""
 "it has a start trim so its subtitles or closed captions must be re-written."
 msgstr ""
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:685
+#: src/lib/dcp_content.cc:724
 msgid "it is 2K and the film is 4K."
 msgstr ""
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:682
+#: src/lib/dcp_content.cc:721
 msgid "it is 4K and the film is 2K."
 msgstr ""
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:621
+#: src/lib/dcp_content.cc:659
 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:625
+#: src/lib/dcp_content.cc:663
 msgid "it is SMPTE and the film is set to Interop."
 msgstr ""
 
-#: src/lib/dcp_content.cc:736
-msgid "it overlaps other audio content; remove the other content."
+#. TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:764
+msgid "it overlaps other audio content."
 msgstr ""
 
-#: src/lib/dcp_content.cc:700
-msgid "it overlaps other video content; remove the other content."
+#. TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:799
+msgid "it overlaps other text content."
 msgstr ""
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:656
+#: src/lib/dcp_content.cc:739
+msgid "it overlaps other video content."
+msgstr ""
+
+#. TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:694
 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:690
+#: src/lib/dcp_content.cc:729
 msgid "its video frame size differs from the film's."
 msgstr ""
 
 #. TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:216
+#: src/lib/util.cc:217
 msgid "m"
 msgstr ""
 
-#: src/lib/image_content.cc:94
+#: src/lib/image_content.cc:95
 msgid "moving"
 msgstr ""
 
@@ -1931,40 +1989,36 @@ msgid "name"
 msgstr ""
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:771
+#: src/lib/dcp_content.cc:783
 msgid ""
 "one of its closed caption has a non-zero entry point so it must be re-"
 "written."
 msgstr ""
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:763
+#: src/lib/dcp_content.cc:777
 msgid ""
 "one of its subtitle reels has a non-zero entry point so it must be re-"
 "written."
 msgstr ""
 
 #. TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:226
+#: src/lib/util.cc:227
 msgid "s"
 msgstr ""
 
-#: src/lib/colour_conversion.cc:290
+#: src/lib/colour_conversion.cc:289
 msgid "sRGB"
 msgstr ""
 
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:93
 msgid "still"
 msgstr ""
 
-#: src/lib/dcp_content.cc:790
-msgid "they overlap other text content; remove the other content."
-msgstr ""
-
-#: src/lib/ffmpeg_examiner.cc:343 src/lib/video_content.cc:375
+#: src/lib/ffmpeg_examiner.cc:334 src/lib/video_content.cc:375
 msgid "unknown"
 msgstr ""
 
-#: src/lib/video_content.cc:531
+#: src/lib/video_content.cc:533
 msgid "video frames"
 msgstr ""