pot/merge.

1 files changed, 109 insertions, 92 deletions

diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index c51449842..155e3143c 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: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+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,39 +17,39 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
 #, c-format
 msgid ""
 "\n"
 "Content frame rate %.4f\n"
 msgstr ""
 
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
 msgid ""
 "\n"
 "Cropped to %1x%2"
 msgstr ""
 
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
 #, c-format
 msgid ""
 "\n"
 "Display aspect ratio %.2f:1"
 msgstr ""
 
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
 msgid ""
 "\n"
 "Padded with black to fit container %1 (%2x%3)"
 msgstr ""
 
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
 msgid ""
 "\n"
 "Scaled to %1x%2"
 msgstr ""
 
-#: src/lib/video_content.cc:451 src/lib/video_content.cc:462
+#: src/lib/video_content.cc:468 src/lib/video_content.cc:479
 #, c-format
 msgid " (%.2f:1)"
 msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
 msgid " on %1"
 msgstr ""
 
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -73,7 +73,7 @@ msgid ""
 "Size: $SIZE\n"
 msgstr ""
 
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
 msgid "$JOB_NAME: $JOB_STATUS"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "%1 [Atmos]"
 msgstr ""
 
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
 msgid "%1 [DCP]"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "%1 [video]"
 msgstr ""
 
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
 #, c-format
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ""
@@ -258,15 +258,15 @@ msgid ""
 "one.  It is advisable to make the gap between subtitles at least 2 frames."
 msgstr ""
 
-#: src/lib/audio_content.cc:257
+#: src/lib/audio_content.cc:291
 msgid "Audio will be resampled from %1Hz to %2Hz"
 msgstr ""
 
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
 msgid "Audio will be resampled to %1Hz"
 msgstr ""
 
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
 msgid "Audio will not be resampled"
 msgstr ""
 
@@ -339,7 +339,7 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
 msgid "Cannot contain slashes"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid "Cannot handle pixel format %1 during %2"
 msgstr ""
 
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr ""
 
@@ -355,7 +355,7 @@ msgstr ""
 msgid "Centre"
 msgstr ""
 
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
 msgid "Channels"
 msgstr ""
 
@@ -363,7 +363,7 @@ msgstr ""
 msgid "Checking content for changes"
 msgstr ""
 
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
 msgid "Checking existing image data"
 msgstr ""
 
@@ -431,7 +431,7 @@ msgstr ""
 msgid "Content and DCP have the same rate.\n"
 msgstr ""
 
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
 msgid "Content audio sample rate"
 msgstr ""
 
@@ -447,75 +447,88 @@ msgstr ""
 msgid "Content to be joined must all have or not have video"
 msgstr ""
 
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+
+#: src/lib/video_content.cc:207
 msgid "Content to be joined must have all its video used or not used."
 msgstr ""
 
-#: src/lib/text_content.cc:253
+#: src/lib/text_content.cc:265
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr ""
 
-#: src/lib/text_content.cc:249
+#: src/lib/text_content.cc:261
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr ""
 
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
 msgid "Content to be joined must have the same audio delay."
 msgstr ""
 
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+msgid "Content to be joined must have the same audio language."
+msgstr ""
+
+#: src/lib/video_content.cc:239
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+
+#: src/lib/video_content.cc:231
 msgid "Content to be joined must have the same colour conversion."
 msgstr ""
 
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
 msgid "Content to be joined must have the same crop."
 msgstr ""
 
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
 msgid "Content to be joined must have the same custom ratio setting."
 msgstr ""
 
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
 msgid "Content to be joined must have the same custom size setting."
 msgstr ""
 
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
 msgid "Content to be joined must have the same fades."
 msgstr ""
 
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
 msgid "Content to be joined must have the same outline width."
 msgstr ""
 
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/text_content.cc:257
+#: src/lib/text_content.cc:269
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 
-#: src/lib/text_content.cc:265
+#: src/lib/text_content.cc:277
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr ""
 
-#: src/lib/text_content.cc:261
+#: src/lib/text_content.cc:273
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 
-#: src/lib/text_content.cc:269
+#: src/lib/text_content.cc:281
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr ""
 
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
 msgid "Content to be joined must have the same subtitle fades."
 msgstr ""
 
-#: src/lib/text_content.cc:273
+#: src/lib/text_content.cc:285
 msgid "Content to be joined must have the same subtitle line spacing."
 msgstr ""
 
@@ -523,15 +536,15 @@ msgstr ""
 msgid "Content to be joined must have the same video frame rate"
 msgstr ""
 
-#: src/lib/video_content.cc:207
+#: src/lib/video_content.cc:215
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
 msgid "Content to be joined must use the same DCP track."
 msgstr ""
 
-#: src/lib/text_content.cc:286 src/lib/text_content.cc:298
+#: src/lib/text_content.cc:298 src/lib/text_content.cc:318
 msgid "Content to be joined must use the same fonts."
 msgstr ""
 
@@ -539,7 +552,11 @@ msgstr ""
 msgid "Content to be joined must use the same subtitle stream."
 msgstr ""
 
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+msgid "Content to be joined must use the same text language."
+msgstr ""
+
+#: src/lib/video_content.cc:430
 msgid "Content video is %1x%2"
 msgstr ""
 
@@ -551,7 +568,7 @@ msgstr ""
 msgid "Copying old video file"
 msgstr ""
 
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
 msgid "Copying video file into DCP"
 msgstr ""
 
@@ -593,7 +610,7 @@ msgstr ""
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
 msgstr ""
 
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
 msgid "Could not open file for writing"
 msgstr ""
 
@@ -641,7 +658,7 @@ msgstr ""
 msgid "DCP XML subtitles"
 msgstr ""
 
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
 msgid "DCP sample rate"
 msgstr ""
 
@@ -660,13 +677,13 @@ msgid ""
 "is in an unexpected format."
 msgstr ""
 
-#: src/lib/film.cc:1540
+#: src/lib/film.cc:1557
 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:1508
+#: src/lib/film.cc:1525
 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."
@@ -677,7 +694,7 @@ msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
 
-#: src/lib/config.cc:359 src/lib/config.cc:1114
+#: src/lib/config.cc:353 src/lib/config.cc:1100
 msgid "DCP-o-matic notification"
 msgstr ""
 
@@ -690,7 +707,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr ""
 
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -825,19 +842,19 @@ msgstr ""
 msgid "Full frame"
 msgstr ""
 
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
 msgid "Full length in audio samples at DCP rate"
 msgstr ""
 
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
 msgid "Full length in audio samples at content rate"
 msgstr ""
 
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
 msgid "Full length in video frames at DCP rate"
 msgstr ""
 
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
 msgid "Full length in video frames at content rate"
 msgstr ""
 
@@ -869,7 +886,7 @@ msgstr ""
 msgid "Horizontal flip"
 msgstr ""
 
-#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:330 src/lib/audio_content.cc:350
 msgid "Hz"
 msgstr ""
 
@@ -899,7 +916,7 @@ msgstr ""
 msgid "JEDEC P22"
 msgstr ""
 
-#: src/lib/config.cc:349 src/lib/config.cc:1099
+#: src/lib/config.cc:343 src/lib/config.cc:1085
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -931,7 +948,7 @@ msgstr ""
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
 msgid "Length"
 msgstr ""
 
@@ -1003,7 +1020,7 @@ msgstr ""
 msgid "Monday"
 msgstr ""
 
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
 msgid "Mono"
 msgstr ""
 
@@ -1027,7 +1044,7 @@ msgstr ""
 msgid "Noise reduction"
 msgstr ""
 
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
 msgid "None"
 msgstr ""
 
@@ -1218,11 +1235,11 @@ msgstr ""
 msgid "Short"
 msgstr ""
 
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
 msgid "Size"
 msgstr ""
 
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
 msgid "Some audio will be resampled to %1Hz"
 msgstr ""
 
@@ -1245,15 +1262,15 @@ msgid ""
 "truncated."
 msgstr ""
 
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
 msgid "Some of your content needs a KDM"
 msgstr ""
 
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
 msgid "Some of your content needs an OV"
 msgstr ""
 
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
 msgid "Stereo"
 msgstr ""
 
@@ -1285,7 +1302,7 @@ msgstr ""
 msgid "Text subtitles"
 msgstr ""
 
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
 msgid "The DCP is empty, perhaps because all the content has zero length."
 msgstr ""
 
@@ -1335,7 +1352,7 @@ msgid ""
 "systems support your chosen DCP rate."
 msgstr ""
 
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
 msgid "There is no video in this DCP"
 msgstr ""
 
@@ -1375,13 +1392,13 @@ msgid ""
 "the content and choosing \"Add KDM\"."
 msgstr ""
 
-#: src/lib/film.cc:555
+#: src/lib/film.cc:557
 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:540
+#: src/lib/film.cc:542
 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 "
@@ -1432,7 +1449,7 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
 msgid "Unrecognised audio sample format (%1)"
 msgstr ""
 
@@ -1539,7 +1556,7 @@ msgid ""
 "join them to ensure smooth joins between the files."
 msgstr ""
 
-#: src/lib/film.cc:1504
+#: src/lib/film.cc:1521
 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."
@@ -1557,7 +1574,7 @@ msgid ""
 "likely to cause problems on playback."
 msgstr ""
 
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
@@ -1623,11 +1640,11 @@ msgstr ""
 msgid "connecting"
 msgstr ""
 
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
 msgid "container"
 msgstr ""
 
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
 msgid "content type"
 msgstr ""
 
@@ -1639,11 +1656,11 @@ msgstr ""
 msgid "could not find stream information"
 msgstr ""
 
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
 msgid "could not move atmos asset into the DCP (%1)"
 msgstr ""
 
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
 msgid "could not move audio asset into the DCP (%1)"
 msgstr ""
 
@@ -1697,75 +1714,75 @@ msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
 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:739
+#: src/lib/dcp_content.cc:736
 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:706
+#: src/lib/dcp_content.cc:703
 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:610
+#: src/lib/dcp_content.cc:607
 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:765
+#: src/lib/dcp_content.cc:762
 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:667
+#: src/lib/dcp_content.cc:664
 msgid "it is 2K and the film is 4K."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:664
+#: src/lib/dcp_content.cc:661
 msgid "it is 4K and the film is 2K."
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:598
+#: src/lib/dcp_content.cc:595
 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:602
+#: src/lib/dcp_content.cc:599
 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:712
+#: src/lib/dcp_content.cc:709
 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:770
+#: src/lib/dcp_content.cc:767
 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:677
+#: src/lib/dcp_content.cc:674
 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:633
+#: src/lib/dcp_content.cc:630
 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:672
+#: src/lib/dcp_content.cc:669
 msgid "its video frame size differs from the film's."
 msgstr ""
 
@@ -1778,19 +1795,19 @@ msgstr ""
 msgid "moving"
 msgstr ""
 
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
 msgid "name"
 msgstr ""
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:756
+#: src/lib/dcp_content.cc:753
 msgid ""
 "one if 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:743
+#: src/lib/dcp_content.cc:740
 msgid ""
 "one if its subtitle reels has a non-zero entry point so it must be re-"
 "written."
@@ -1805,7 +1822,7 @@ msgstr ""
 msgid "sRGB"
 msgstr ""
 
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
 msgid "some of your content is missing"
 msgstr ""
 
@@ -1817,6 +1834,6 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
 msgid "video frames"
 msgstr ""