summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-05 00:52:03 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-05 00:52:03 +0200
commitfd7b84dd8cc52dac22ce8903dd22b0046f1f9b72 (patch)
treef7bb91ea560ccba6e2e92efe9b440e93d803a856 /src/lib
parentda908d815787cd0272c8bdeef40e1a4d2f6a29f8 (diff)
pot/merge.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/po/cs_CZ.po205
-rw-r--r--src/lib/po/da_DK.po208
-rw-r--r--src/lib/po/de_DE.po211
-rw-r--r--src/lib/po/es_ES.po206
-rw-r--r--src/lib/po/fr_FR.po206
-rw-r--r--src/lib/po/it_IT.po207
-rw-r--r--src/lib/po/nl_NL.po208
-rw-r--r--src/lib/po/pl_PL.po206
-rw-r--r--src/lib/po/pt_BR.po209
-rw-r--r--src/lib/po/pt_PT.po206
-rw-r--r--src/lib/po/ru_RU.po208
-rw-r--r--src/lib/po/sk_SK.po205
-rw-r--r--src/lib/po/sv_SE.po209
-rw-r--r--src/lib/po/tr_TR.po201
-rw-r--r--src/lib/po/uk_UA.po207
-rw-r--r--src/lib/po/zh_CN.po205
16 files changed, 1835 insertions, 1472 deletions
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 6f9e3244b..17b6544af 100644
--- a/src/lib/po/cs_CZ.po
+++ b/src/lib/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2020-09-04 10:02+0200\n"
"Last-Translator: Tomáš Begeni <begeni@razdva.cz>\n"
"Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 2.2.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -27,7 +27,7 @@ msgstr ""
"\n"
"Snímková frekvence obsahu %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -35,7 +35,7 @@ msgstr ""
"\n"
"Oříznout na %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -44,7 +44,7 @@ msgstr ""
"\n"
"Poměr stran displeje %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -52,7 +52,7 @@ msgstr ""
"\n"
"Vyplněné černou, aby se zmenšil do kontejneru %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -60,7 +60,7 @@ msgstr ""
"\n"
"Měřítko %1x%2"
-#: 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 " (%.2f:1)"
@@ -71,7 +71,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " na %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -93,7 +93,7 @@ msgstr ""
"Délka: $LENGTH\n"
"Velikost: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$JOB_NAME: $JOB_STATUS"
@@ -105,7 +105,7 @@ msgstr "%1 (%2 GB) [%3]"
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -121,7 +121,7 @@ msgstr "%1 [video]"
msgid "%1 [video]"
msgstr "%1 [video]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", poměr stran obrazových bodů %.2f:1"
@@ -299,15 +299,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 "Zvuk bude re-samplovaný z %1Hz na %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Zvuk bude re-samplovaný na %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Zvuk nebude resamplovaný"
@@ -380,7 +380,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Zrušené"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "Nemůže obsahovat lomítka"
@@ -388,7 +388,7 @@ msgstr "Nemůže obsahovat lomítka"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Nemužu zpracovat formát pixelu %1 během %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr "Nelze vytvořit KDM, protože tento projekt není zašifrován."
@@ -396,7 +396,7 @@ msgstr "Nelze vytvořit KDM, protože tento projekt není zašifrován."
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Kanály"
@@ -404,7 +404,7 @@ msgstr "Kanály"
msgid "Checking content for changes"
msgstr "Zkontrolovat změny v obsahu"
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Kontroluji existující video data"
@@ -472,7 +472,7 @@ msgstr "Blahopřejeme!"
msgid "Content and DCP have the same rate.\n"
msgstr "Obsah a DCP mají stejný bitrate,\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Snímková frekvence audio obsahu"
@@ -488,79 +488,95 @@ msgstr "Veškerý obsah ke sloučení musí nebo nemusí obsahovat titulky"
msgid "Content to be joined must all have or not have video"
msgstr "Veškerý obsah ke sloučení musí mít video nebo žádné video"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "Veškerý obsah ke sloučení musí mít stejné mezery mezi řádky titulků."
+
+#: src/lib/video_content.cc:207
msgid "Content to be joined must have all its video used or not used."
msgstr ""
"Obsah, který má být připojen, musí obsahovat všechna jeho použitá nebo "
"nepoužitá videa."
-#: 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 "Aby se spojil obsah, musí mít stejné nastavení ’vypálené titulky'."
-#: 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 "Aby se spojil obsah, musí mít stejné nastavení ’použít titulky'."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Aby se spojil obsah, musí mít stejné nastavení zpoždění zvuku."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "Aby se spojil obsah, musí mít stejné nastavení hlasitosti zvuku."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Aby se spojil obsah, musí mít stejné nastavení hlasitosti zvuku."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr "Aby se spojil obsah, musí mít stejné nastavení ’vypálené titulky'."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Aby se spojil obsah, musí mít stejné nastavení konverzi barev."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Aby se spojil obsah, musí mít stejné nastavení ořezu."
-#: 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 ""
"Obsah, který má být spojen, musí mít stejné nastavení vlastního poměru."
-#: 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 ""
"Obsah, který má být spojen, musí mít stejné vlastní nastavení velikosti."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Aby se spojil obsah, musí mít stejné nastavení zeslabení."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "Připojený obsah musí mít stejnou šířku obrysu."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Aby se spojil obsah, musí mít stejné nastavení velikosti obrazu."
-#: 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 "Aby se spojil obsah, musí mít stejné nastavení titulků X offset."
-#: 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 "Aby se spojil obsah, musí mít stejné nastavení titulky X měřítko."
-#: 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 "Aby se spojil obsah, musí mít stejné nastavení titulkový Y offset."
-#: 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 "Aby se spojil obsah, musí mít stejné nastavení titulků Y měřítko."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr "Veškerý obsah ke sloučení musí mít stejné zeslabení titulků."
-#: 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 "Veškerý obsah ke sloučení musí mít stejné mezery mezi řádky titulků."
@@ -568,15 +584,15 @@ msgstr "Veškerý obsah ke sloučení musí mít stejné mezery mezi řádky tit
msgid "Content to be joined must have the same video frame rate"
msgstr "Veškerý obsah ke sloučení musí mít stejnou snímkovou rychlost"
-#: 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 "Aby se spojil obsah, musí mít stejné nastavení typu videa."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
msgid "Content to be joined must use the same DCP track."
msgstr "Aby se spojil obsah, musí používat stejnou DCP stopu ."
-#: 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 "Aby se spojil obsah, musí mít stejné nastavení písma."
@@ -584,7 +600,12 @@ msgstr "Aby se spojil obsah, musí mít stejné nastavení písma."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Aby se spojil obsah, musí mít stejné nastavení titulkového streamu."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Aby se spojil obsah, musí mít stejné nastavení písma."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Video je %1x%2"
@@ -596,7 +617,7 @@ msgstr "Kopírovat DCP do TMS"
msgid "Copying old video file"
msgstr "Kopírování starého souboru videa"
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
msgid "Copying video file into DCP"
msgstr "Kopírování video souboru do DCP"
@@ -640,7 +661,7 @@ msgstr "Nemohu otevřít ZIP soubor"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Nemohu otevřít stažený ZIP soubor (%1:%2: %3)"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
msgid "Could not open file for writing"
msgstr "Nemohu otevřít soubor pro zápis"
@@ -688,7 +709,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "DCP XML titulky"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "Snímková frekvence DCP"
@@ -709,7 +730,7 @@ msgstr ""
"DCP-o-matic nemohl otevřít soubor %1 (%2). Možná, že soubor neexistuje nebo "
"je v nepodporovaném formátu."
-#: 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."
@@ -717,7 +738,7 @@ msgstr ""
"DCP-o-matic musel změnit vaše nastavení pro odkazování na DCPs jako OV. "
"Zkontrolujte prosím tato nastavení a ujistěte se, že je to to co chcete."
-#: src/lib/film.cc:1508
+#: src/lib/film.cc:1525
#, fuzzy
msgid ""
"DCP-o-matic had to change your settings so that the film's frame rate is the "
@@ -731,7 +752,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic nepodporuje `%1' filter, takže filter bude vypnutý."
-#: 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 "DCP-o-matic oznámení"
@@ -744,7 +765,7 @@ msgstr "Datasat AP20 nebo AP25"
msgid "De-interlacing"
msgstr "De-interlacing"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -890,19 +911,19 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Full frame (Celý obraz)"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Plná délka zvukových snímků v DCP rychlosti"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Plná délka zvukových snímků v rychlosti obsahu"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Plná délka video snímků v DCP rychlosti"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Plná délka video snímků v rychlosti obsahu"
@@ -934,7 +955,7 @@ msgstr "Vysoká kvalita 3D denoiser"
msgid "Horizontal flip"
msgstr "Horizontální flip"
-#: 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 "Hz"
@@ -964,7 +985,7 @@ msgstr "Nevím, co zapříčinilo tuto chybu."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "KDM doručení: $CPL_NAME"
@@ -996,7 +1017,7 @@ msgstr "Left rear surround (Levý zadní surround)"
msgid "Left surround"
msgstr "Left surround (Levý surround)"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Délka"
@@ -1068,7 +1089,7 @@ msgstr "Chybí potřebná nastavení %1"
msgid "Monday"
msgstr "Pondělí"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1092,7 +1113,7 @@ msgstr "Ve složce nebyly nalezeny žádné platné soubory."
msgid "Noise reduction"
msgstr "Redukce hluku"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Žádný"
@@ -1285,11 +1306,11 @@ msgstr "Posílám email"
msgid "Short"
msgstr "Short (Krátky film)"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Velikost"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Některé audio bude převzorkované na %1Hz"
@@ -1320,15 +1341,15 @@ msgstr ""
"Některé ze skrytých titulků jsou rozloženy na více než %1 řádcích, takže "
"budou zkráceny."
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "Část vašeho obsahu potřebuje KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "Část vašeho obsahu potřebuje OV"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stereo"
@@ -1360,7 +1381,7 @@ msgstr "Test"
msgid "Text subtitles"
msgstr "Text titulků"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr "DCP je prázdný, možná proto, že veškerý obsah má nulovou délku."
@@ -1420,7 +1441,7 @@ msgstr ""
"tak, aby se přiblížila vašemu obsahu za předpokladu, že vaše cílové "
"projekční systémy podporují zvolenou rychlost DCP."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "V tomto DCP není video"
@@ -1471,7 +1492,7 @@ msgstr ""
"Tento soubor je KDM. KDM by měly být přidány do obsahu DCP klepnutím pravým "
"tlačítkem myši na obsah a výběrem možnosti “Přidat KDM”."
-#: 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!"
@@ -1479,7 +1500,7 @@ msgstr ""
"Tento film byl vytvořený novější verzí DCP-o-matic, a nemůže být načtený "
"touto verzí. Omlouváme se !"
-#: 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 "
@@ -1533,7 +1554,7 @@ msgstr "Neznámé"
msgid "Unknown error"
msgstr "Neznáma chyba"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Nerozpoznaná vzorkovací frekvence audia (%1)"
@@ -1655,7 +1676,7 @@ msgstr ""
"Máte %1 souborů, které vypadají jako VOB soubory z DVD. Měli byste je "
"spojit, aby zajistit tak hladké spojení mezi těmito dvěma soubory."
-#: 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."
@@ -1677,7 +1698,7 @@ msgstr ""
"Zadali jste soubor písma, který je větší než 640kB. Pravděpodobně to může "
"způsobit problémy při přehrávání."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "Musíte přidat obsah do DCP před tím než ho vytvoříte"
@@ -1751,11 +1772,11 @@ msgstr "spojení vypršelo"
msgid "connecting"
msgstr "připojuji"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "kontejner"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "typ obsahu"
@@ -1767,12 +1788,12 @@ msgstr "kopíruji %1"
msgid "could not find stream information"
msgstr "nemohu najít informace o streamu"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "nemohu přesunout audio do DCP (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "nemohu přesunout audio do DCP (%1)"
@@ -1826,68 +1847,68 @@ msgid "h"
msgstr "h"
#. / 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 "nemá skryté titulky ve všech reelech."
#. / 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 "nemá otevřené titulky ve všech reelech."
#. / 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 "nemá zvuk ve všech reelech."
#. / 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 "má jinou snímkovou frekvenci za sekundu pro film."
#. / 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 "je 2K a film je 4K."
#. / 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 "je 4K a film je 2K."
#. / 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 "to je Interop a film je nastaven na SMPTE."
#. / 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 "to je SMPTE a film je Interop."
#. / 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 "překrývá jiný zvukový obsah; odstranit jiný obsah."
#. / 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 "překrývá se s jiným textovým obsahem; odeberte další obsah."
#. / 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 "překrývá se s jiným videoobsahem; odstranit jiný obsah."
#. / 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'."
@@ -1896,7 +1917,7 @@ msgstr ""
"obsahu videa’."
#. / 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 "velikost video rámečku se liší od filmu."
@@ -1909,19 +1930,19 @@ msgstr "m"
msgid "moving"
msgstr "přesouvám"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "jméno"
#. / 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."
@@ -1936,7 +1957,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "část obsahu chybí"
@@ -1948,7 +1969,7 @@ msgstr "stále"
msgid "unknown"
msgstr "neznáme"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "video snímky"
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index eed32a6d6..6b50c63f5 100644
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2019-04-06 12:29+0200\n"
"Last-Translator: FULL NAME &lt;EMAIL@ADDRESS&gt;\n"
"Language-Team: LANGUAGE &lt;LL@li.org&gt;\n"
@@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Poedit 2.1.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -26,7 +26,7 @@ msgstr ""
"\n"
"Indholds billedhastighed %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -34,7 +34,7 @@ msgstr ""
"\n"
"Beskåret til %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -43,7 +43,7 @@ msgstr ""
"\n"
"Skærmformat %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -51,7 +51,7 @@ msgstr ""
"\n"
"Udfyldt med sort for at tilpasse til container %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -59,7 +59,7 @@ msgstr ""
"\n"
"Skaleret til %1x%2"
-#: 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 " (%.2f:1)"
@@ -70,7 +70,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " på %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -92,7 +92,7 @@ msgstr ""
"Længde: $LENGTH\n"
"Størrelse: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$JOB_NAME: $JOB_STATUS"
@@ -104,7 +104,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -120,7 +120,7 @@ msgstr "%1 [film]"
msgid "%1 [video]"
msgstr "%1 [video]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", pixel format %.2f:1"
@@ -290,15 +290,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 "Lyd resamples fra %1Hz til %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Lyd resamples til %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Lyd bliver ikke resamplet"
@@ -372,7 +372,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Annulleret"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "Må ikke indeholde skråstreger"
@@ -380,7 +380,7 @@ msgstr "Må ikke indeholde skråstreger"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Kan ikke håndtere pixelformat %1 under %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr "Kan ikke generere en KDM da projektet ikke er krypteret."
@@ -388,7 +388,7 @@ msgstr "Kan ikke generere en KDM da projektet ikke er krypteret."
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Lyd kanaler"
@@ -396,7 +396,7 @@ msgstr "Lyd kanaler"
msgid "Checking content for changes"
msgstr "Undersøger om der er ændringer i indholdet"
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Verificerer eksisterende billeddata"
@@ -464,7 +464,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "Indhold og DCP har samme billedhastighed.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Lydindholds sample rate"
@@ -485,82 +485,101 @@ msgstr ""
"Elementer der skal splejses skal enten alle have billede eller slet ikke "
"have billede"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"Indhold der skal splejses skal have samme linjeafstand på undertekster."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "Indhold der skal splejses skal have samme billedhastighed"
-#: 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 ""
"Indhold der skal splejses skal have samme indstilling af 'Brænd undertekster "
"ind i billedet'."
-#: 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 ""
"Indhold der skal splejses skal have den samme indstilling af 'brug "
"undertekster'."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Indhold der skal splejses skal have samme lydforsinkelse."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "Indhold der skal splejses skal have samme lydgain."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Indhold der skal splejses skal have samme lydgain."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+"Indhold der skal splejses skal have samme indstilling af 'Brænd undertekster "
+"ind i billedet'."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Indhold der skal splejses skal have samme farvekonvertering."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Indhold der skal splejses skal have samme beskæring."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr "Indhold der skal splejses skal have samme skaleringsindstilling."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr "Indhold der skal splejses skal have samme skaleringsindstilling."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Indhold der skal splejses skal fade på samme måde."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "Indhold der skal splejses skal have samme breddeindramning."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Indhold der skal splejses skal have samme billedstørrelse."
-#: 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 "Indhold der skal splejses skal have samme X offset for undertekst."
-#: 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 "Indhold der skal splejses skal have samme X skalering af undertekst."
-#: 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 "Indhold der skal splejses skal have samme Y offset for undertekst."
-#: 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 "Indhold der skal splejses skal have samme Y skalering af undertekst."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr "Indhold der skal splejses skal have samme udtoning af undertekster."
-#: 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 ""
"Indhold der skal splejses skal have samme linjeafstand på undertekster."
@@ -569,15 +588,15 @@ msgstr ""
msgid "Content to be joined must have the same video frame rate"
msgstr "Indhold der skal splejses skal have samme billedhastighed"
-#: 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 "Indhold der skal splejses skal have samme billedtype."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
msgid "Content to be joined must use the same DCP track."
msgstr "Indhold der skal splejses skal bruge det samme DCP-spor."
-#: 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 "Indhold der skal splejses skal bruge samme skrifttype."
@@ -585,7 +604,12 @@ msgstr "Indhold der skal splejses skal bruge samme skrifttype."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Indhold der skal splejses skal bruge samme tekstningsstrøm."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Indhold der skal splejses skal bruge samme skrifttype."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Indholdsvideo er %1x%2"
@@ -597,7 +621,7 @@ msgstr "Kopier DCP til TMS"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Videostørrelser passer ikke i DCP"
@@ -642,7 +666,7 @@ msgstr "Kunne ikke åbne downloadet ZIP-fil"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Den hentede ZIP-fil (%1:%2: %3) kunne ikke åbnes."
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
msgid "Could not open file for writing"
msgstr "Kunne ikke åbne fil til skrivning"
@@ -690,7 +714,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "DCP XML undertekster"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "DCP sample rate"
@@ -711,7 +735,7 @@ msgstr ""
"DCP-o-matic kunne ikke åbne filen %1 (%2). Måske findes den ikke, eller den "
"er i et uventet format."
-#: 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."
@@ -720,7 +744,7 @@ msgstr ""
"DCPer som OV. Gennemse venligst indstillingerne for at sikre at de er som "
"ønsket."
-#: src/lib/film.cc:1508
+#: src/lib/film.cc:1525
#, fuzzy
msgid ""
"DCP-o-matic had to change your settings so that the film's frame rate is the "
@@ -737,7 +761,7 @@ msgstr ""
"DCP-o-matic understøtter ikke længere `%1'-filteret, så det er blevet slået "
"fra."
-#: 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 "DCP-o-matic besked"
@@ -750,7 +774,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "Sammenfletning (de-interlacing)"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -901,19 +925,19 @@ msgstr "Fuld (0-%1)"
msgid "Full frame"
msgstr "Fuldt billede"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Full length in audio samples at DCP rate"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Full length in audio samples at content rate"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Full length in video frames at DCP rate"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Full length in video frames at content rate"
@@ -945,7 +969,7 @@ msgstr "Høj-kvalitets 3D-denoiser"
msgid "Horizontal flip"
msgstr "Horizontal flip"
-#: 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 "Hz"
@@ -975,7 +999,7 @@ msgstr "Det er uklart hvad der forårsagede denne fejl."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "KDM-levering: $CPL_NAME"
@@ -1007,7 +1031,7 @@ msgstr "Venstre bag surround"
msgid "Left surround"
msgstr "Venstre surround"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Længde"
@@ -1079,7 +1103,7 @@ msgstr "Mangler påkrævet indstilling %1"
msgid "Monday"
msgstr "Mandag"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1103,7 +1127,7 @@ msgstr "Ingen korrekte billedfiler kunne findes i folderen."
msgid "Noise reduction"
msgstr "Støjreduktion"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Ingen"
@@ -1296,11 +1320,11 @@ msgstr "Sender email"
msgid "Short"
msgstr "Short"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Størrelse"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Noget lyd resamples til %1Hz"
@@ -1333,15 +1357,15 @@ msgid ""
msgstr ""
"Nogle af underteksterne er på mere end %1 linjer, så de bliver beskåret."
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "Noget af dit indhold mangler en KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "Noget af dit indhold mangler en OV"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stereo"
@@ -1373,7 +1397,7 @@ msgstr "Test"
msgid "Text subtitles"
msgstr "Teks"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1430,7 +1454,7 @@ msgstr ""
"indholdet, sålænge det er en billedhastighed der understøttes af det system "
"DCPen skal afspilles fra."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "Der er ingen video i denne DCP"
@@ -1478,7 +1502,7 @@ msgstr ""
"Denne fil er en KDM. KDMer skal tilføjes til DCP indhold ved at højreklikke "
"på indholdet og vælge \"Tilføj KDM\"."
-#: 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!"
@@ -1486,7 +1510,7 @@ msgstr ""
"Denne film blev dannet med en nyere version af DCP-o-matic og kan ikke "
"indlæses i denne version. Beklager!"
-#: 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 "
@@ -1541,7 +1565,7 @@ msgstr "ukendt"
msgid "Unknown error"
msgstr "Ukendt fejl"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Kunne ikke genkende lydsekvensens format (%1)"
@@ -1665,7 +1689,7 @@ msgstr ""
"Du har %1 filer der ligner VOB-filer fra en DVD. Du bør samle dem for at "
"sikre gode overgange mellem filerne."
-#: 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."
@@ -1686,7 +1710,7 @@ msgstr ""
"Du har valgt en font-fil der er større end 640 kB. Dette vil højst "
"sandsynligt give problemer ved afspilningen."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "Du er nødt til at tilføje indhold til DCP'en før du kan danne den"
@@ -1758,11 +1782,11 @@ msgstr "forbindelsestimeout"
msgid "connecting"
msgstr "forbinder"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "container"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "indholdstype"
@@ -1774,12 +1798,12 @@ msgstr "kopierer %1"
msgid "could not find stream information"
msgstr "kunne ikke finde information om strøm"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "kunne ikke flytte lyd-MXF ind i DCPen (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "kunne ikke flytte lyd-MXF ind i DCPen (%1)"
@@ -1836,68 +1860,68 @@ msgid "h"
msgstr "t"
#. / 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 "den har ikke billedtekster på alle spoler."
#. / 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 "den har ikke undertekster på alle spoler."
#. / 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 "den har ikke lyd på alle spoler."
#. / 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 "den har en anden billedhastighed end filmen."
#. / 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 "den er 2K og filmen er 4K."
#. / 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 "den er 4K og filmen er 2K."
#. / 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 "den er i Interop formatet og filmen er i SMPTE."
#. / 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 "den er i SMPTE formatet og filmen er i Interop."
#. / 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 "den overlapper med anden lyd; fjern det andet indhold."
#. / 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 "den overlapper med anden tekst; fjern det andet indhold."
#. / 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 "den overlapper med andet video indhold; fjern det andet indhold."
#. / 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'."
@@ -1906,7 +1930,7 @@ msgstr ""
"til 'opdel efter videoindhold'."
#. / 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 "dens billedstørrelse er forskellig fra filmens."
@@ -1919,19 +1943,19 @@ msgstr "m"
msgid "moving"
msgstr "flytter"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "navn"
#. / 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."
@@ -1946,7 +1970,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "noget af dit indhold mangler"
@@ -1958,7 +1982,7 @@ msgstr "stille"
msgid "unknown"
msgstr "ukendt"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "videobilleder"
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index b728cf735..5f2021876 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
"PO-Revision-Date: 2019-05-10 02:41+0100\n"
"Last-Translator: Carsten Kurz\n"
"Language-Team: DCP-o-matic translators\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 1.6.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -27,7 +27,7 @@ msgstr ""
"\n"
"Bildrate %.4f fps\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -35,7 +35,7 @@ msgstr ""
"\n"
"Beschnitten zu %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -44,7 +44,7 @@ msgstr ""
"\n"
"Anzeigeseitenverhältnis (DAR) %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -52,7 +52,7 @@ msgstr ""
"\n"
"Mit Schwarz gefüllt auf Containerformat %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -60,7 +60,7 @@ msgstr ""
"\n"
"Skaliert auf %1x%2"
-#: 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 " (%.2f:1)"
@@ -71,7 +71,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " am %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -94,7 +94,7 @@ msgstr ""
"Größe: $SIZE\n"
"Bei Problemen mit diesem DCP kontaktieren Sie bitte:\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$JOB_NAME: $JOB_STATUS"
@@ -106,7 +106,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -122,7 +122,7 @@ msgstr "%1 [Film]"
msgid "%1 [video]"
msgstr "%1 [Bild]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", Pixelseitenverhältnis %.2f:1"
@@ -308,15 +308,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 "Audioabtastrate wird von %1Hz auf %2Hz angepasst."
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Audioabtastrate wird auf %1Hz angepasst."
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Audioabtastrate wird nicht verändert werden."
@@ -390,7 +390,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Abbruch"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "Darf keine Schrägstriche enthalten"
@@ -398,7 +398,7 @@ msgstr "Darf keine Schrägstriche enthalten"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr ""
"KDM Erzeugung nicht möglich, da dieses Projekt keine Verschlüsselung "
@@ -408,7 +408,7 @@ msgstr ""
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Audio Kanäle"
@@ -416,7 +416,7 @@ msgstr "Audio Kanäle"
msgid "Checking content for changes"
msgstr "Überprüfe Projektinhalte auf Änderungen"
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Überprüfe bestehende Bilddateien"
@@ -484,7 +484,7 @@ msgstr "Glückwunsch!"
msgid "Content and DCP have the same rate.\n"
msgstr "Quelle und DCP haben dieselbe Bildrate. Gut ;-)\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Audio Abtastrate (Quelle)"
@@ -502,90 +502,110 @@ msgstr ""
msgid "Content to be joined must all have or not have video"
msgstr "Zu verbindende Inhalte müssen identische Bildeigenschaften aufweisen."
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"Zu verbindende Inhalte müssen den gleichen Zeilenabstand für Untertitel "
+"aufweisen."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
-#: 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 ""
"Zu verbindende Inhalte müssen identische Untertitel-Einstellungen verwenden."
-#: 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 ""
"Zu verbindende Inhalte müssen identische Untertitel-Einstellungen verwenden."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Zu verbindende Inhalte müssen die gleiche Tonverzögerung verwenden."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr ""
"Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr ""
+"Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+"Zu verbindende Inhalte müssen identische Untertitel-Einstellungen verwenden."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Zu verbindende Inhalte müssen die gleiche Farbumwandlung verwenden."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr ""
"Zu verbindende Inhalte müssen identische Ein-/Ausblendungs-Einstellungen "
"verwenden."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "Zu verbindende Inhalte müssen die gleiche Outline-Stärke verwenden."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
-#: 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 ""
"Zu verbindende Inhalte müssen den gleichen horizontalen Untertitelversatz "
"verwenden."
-#: 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 ""
"Zu verbindende Inhalte müssen die gleiche Untertitel X-Skalierung verwenden."
-#: 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 ""
"Zu verbindende Inhalte müssen den gleichen vertikalen Untertitelversatz "
"verwenden."
-#: 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 ""
"Zu verbindende Inhalte müssen die gleiche Untertitel Y-Skalierung verwenden."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr ""
"Zu verbindende Inhalte müssen die gleichen Ein- und Ausblendzeiten aufweisen."
-#: 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 ""
"Zu verbindende Inhalte müssen den gleichen Zeilenabstand für Untertitel "
@@ -595,15 +615,15 @@ msgstr ""
msgid "Content to be joined must have the same video frame rate"
msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
-#: 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 "Zu verbindende Inhalte müssen den gleichen Bildtyp (z.B. 2D) haben."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
msgid "Content to be joined must use the same DCP track."
msgstr "Zu verbindende Inhalte müssen die gleiche Spur verwenden."
-#: 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 ""
"Zu verbindende Inhalte müssen die gleichen Zeichensätze für Untertitel "
@@ -613,7 +633,14 @@ msgstr ""
msgid "Content to be joined must use the same subtitle stream."
msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelspur verwenden."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr ""
+"Zu verbindende Inhalte müssen die gleichen Zeichensätze für Untertitel "
+"verwenden."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Inhalt Video ist %1x%2"
@@ -625,7 +652,7 @@ msgstr "DCP auf TMS übertragen"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Unterschiedliche Auflösungen im DCP"
@@ -670,7 +697,7 @@ msgstr "Heruntergeladene ZIP Datei kann nicht geöffnet werden."
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Heruntergeladene ZIP Datei kann nicht geöffnet werden (%1:%2: %3)"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
msgid "Could not open file for writing"
msgstr "Datei konnte nicht zum Schreiben geöffnet werden."
@@ -718,7 +745,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "DCP XML Untertitel"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "Audio Abtastrate (angepasst für DCP/48KHz)"
@@ -739,7 +766,7 @@ msgstr ""
"DCP-o-matic konnte die Datei %1 nicht öffnen (%2). Vielleicht existiert sie "
"nicht oder ist in einem unerwarteten Format."
-#: 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."
@@ -748,7 +775,7 @@ msgstr ""
"werden. Bitte prüfen Sie alle Einstellungen noch einmal, ob sie ihren "
"Wünschen entsprechen."
-#: src/lib/film.cc:1508
+#: src/lib/film.cc:1525
#, fuzzy
msgid ""
"DCP-o-matic had to change your settings so that the film's frame rate is the "
@@ -764,7 +791,7 @@ msgid ""
msgstr ""
"DCP-o-matic unterstützt den `%1' Filter nicht mehr, er wird deaktiviert."
-#: 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 "DCP-o-matic Benachrichtigungen"
@@ -777,7 +804,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "De-Interlacer"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -927,19 +954,19 @@ msgstr "Voll (0-%1)"
msgid "Full frame"
msgstr "DCI Full Container"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Gesamtlänge in Audio Blöcken (DCP)"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Gesamtlänge in Audio Blöcken (Quelle)"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Gesamtlänge in Bildern (DCP)"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Gesamtlänge in Bildern (Quelle)"
@@ -971,7 +998,7 @@ msgstr "3D Rauschunterdrückung hoher Qualität"
msgid "Horizontal flip"
msgstr "Horizontal Spiegeln"
-#: 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 "Hz"
@@ -1003,7 +1030,7 @@ msgstr "Ein unbekannter Fehler ist aufgetreten."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "KDM Zustellung: $CPL_NAME"
@@ -1035,7 +1062,7 @@ msgstr "Surround hinten links"
msgid "Left surround"
msgstr "Surround links"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Länge"
@@ -1107,7 +1134,7 @@ msgstr "Benötigte Einstellung %1 fehlt"
msgid "Monday"
msgstr "Montag"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1131,7 +1158,7 @@ msgstr "Keine gültigen Bilddaten gefunden."
msgid "Noise reduction"
msgstr "Rauschunterdrückung"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Kein"
@@ -1328,11 +1355,11 @@ msgstr "Sende Email"
msgid "Short"
msgstr "Kurzfilm - SHR"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Größe"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Einige Audioanteile werden in der Abtastrate geändert auf %1Hz"
@@ -1368,15 +1395,15 @@ msgstr ""
"Einige ihrer Closed Captions (CCAP) sind länger als %1 Zeile(n). Sie werden "
"abgeschnitten."
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "Teile ihrer Quellinhalte (DCP) benötigen eine KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "Teile ihrer Quellinhalte (DCP) benötigen eine OV-CPL"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stereo"
@@ -1408,7 +1435,7 @@ msgstr "Test - TST"
msgid "Text subtitles"
msgstr "Untertitel (Text)"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1466,7 +1493,7 @@ msgstr ""
"vorgesehene Projektionssystem diese Bildrate unterstützt, sollten Sie die "
"DCP Bildrate auf den gleichen oder zumindest einen näheren Wert einstellen."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "Dieses DCP enthält kein Bild"
@@ -1519,7 +1546,7 @@ msgstr ""
"gehöriges geladenes DCP selektieren und mit <RechtsClick> \"KDM zuweisen\" "
"ausführen!"
-#: 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!"
@@ -1528,7 +1555,7 @@ msgstr ""
"kann leider nicht mit dieser älteren Version geladen werden. Sie müssen den "
"Film neu erstellen oder eine aktuelle Version installieren. Sorry!"
-#: 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 "
@@ -1583,7 +1610,7 @@ msgstr "unbekannt"
msgid "Unknown error"
msgstr "Unbekannter Fehler"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Audio Sample Format (%1) nicht erkannt."
@@ -1711,7 +1738,7 @@ msgstr ""
"Dateien von einer DVD sind. Sie sollten die Funktion (->Rechtsclick) "
"'Nahtlos verbinden' verwenden, um Sprünge in der Wiedergabe zu vermeiden."
-#: 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."
@@ -1737,7 +1764,7 @@ msgstr ""
"speziellen Zeichensatz angewiesen sind, googlen Sie nach 'TI Font "
"Compressor' und verwenden Sie ggfs. dieses Tool zur Behebung des Problems."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "Sie müssen erst Inhalte hinzufügen bevor Sie ein DCP erstellen können!"
@@ -1818,11 +1845,11 @@ msgstr "Zeit für Verbindungsaufbau abgelaufen"
msgid "connecting"
msgstr "verbinde..."
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "Containerformat"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "Inhaltsbeschreibung"
@@ -1834,12 +1861,12 @@ msgstr "kopiere %1"
msgid "could not find stream information"
msgstr "Keine Spur-Information gefunden"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "Audio konnte nicht in DCP (%1) kopiert werden"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "Audio konnte nicht in DCP (%1) kopiert werden"
@@ -1896,83 +1923,83 @@ msgid "h"
msgstr "h"
#. / 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 ""
"Das DCP enthält in einigen Akten ('Reels') keine Closed Captions (CCAP)."
#. / 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 "Das DCP enthält in einigen Akten ('Reels') keine Untertitel."
#. / 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 "Das DCP enthält in einigen Akten ('Reels') keinen Ton."
#. / 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 "Dieses Projekt verwendet eine andere Bildrate als dieses DCP."
#. / 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 ""
"es ist in 2k, das gegenwärtige Projekt jedoch 4k. Eine Mischung ist nicht "
"möglich!"
#. / 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 ""
"es ist in 4k, das gegenwärtige Projekt jedoch 2k. Eine Mischung ist nicht "
"möglich!"
#. / 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 ""
"Dieses Projekt ist auf ’SMPTE’ Standard konfiguriert, das referenzierte DCP "
"ist jedoch in ‚INTEROP‘! Eine Mischung ist nicht möglich!"
#. / 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 ""
"Dieses Projekt ist auf ‚INTEROP‘ Standard konfiguriert, das referenzierte "
"DCP ist jedoch in ‚SMPTE‘. Eine Mischung ist nicht möglich!"
#. / 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 ""
"Einige Audioanteile überlappen mit diesem DCP, bitte entfernen Sie diese (-"
">Zeitleiste)!"
#. / 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 ""
"Einige Textanteile überlappen in diesem DCP, bitte entfernen Sie diese (-"
">Zeitleiste)!"
#. / 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 ""
"Einige Videoanteile überlappen mit diesem DCP, bitte entfernen Sie diese (-"
">Zeitleiste)!"
#. / 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'."
@@ -1981,7 +2008,7 @@ msgstr ""
"unter 'DCP' muss auf 'An Inhaltsgrenzen aufteilen' gesetzt werden."
#. / 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 "Dieses Projekt verwendet eine andere Bildauflösung als dieses DCP."
@@ -1994,19 +2021,19 @@ msgstr "m"
msgid "moving"
msgstr "wird verschoben"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "Name"
#. / 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."
@@ -2021,7 +2048,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "Inhalte fehlen"
@@ -2033,7 +2060,7 @@ msgstr "Standbild"
msgid "unknown"
msgstr "unbekannt"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "Video Bilder"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index a6b8df8f0..96ba7ffb7 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LIBDCPOMATIC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
"PO-Revision-Date: 2018-02-25 14:29-0600\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.6\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -26,7 +26,7 @@ msgstr ""
"\n"
"Velocidad del contenido %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -34,7 +34,7 @@ msgstr ""
"\n"
"Recortado a %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -43,7 +43,7 @@ msgstr ""
"\n"
"Proporción de aspecto mostrada %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -51,7 +51,7 @@ msgstr ""
"\n"
"Completado con negro para cubrir el contenedor %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -59,7 +59,7 @@ msgstr ""
"\n"
"Redimensionado a %1x%2"
-#: 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 " (%.2f:1)"
@@ -70,7 +70,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " el %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -92,7 +92,7 @@ msgstr ""
"Longitud: $LENGTH\n"
"Tamaño: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -120,7 +120,7 @@ msgstr "%1 [película]"
msgid "%1 [video]"
msgstr "%1 [película]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", proporción de aspecto de pixel %.2f:1"
@@ -289,15 +289,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 "EL audio será remuestreado de %1Hz a %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "EL audio será remuestreado a %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "El audio no será remuestreado"
@@ -371,7 +371,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Cancelado"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
#, fuzzy
msgid "Cannot contain slashes"
msgstr "no puede contener barras"
@@ -380,7 +380,7 @@ msgstr "no puede contener barras"
msgid "Cannot handle pixel format %1 during %2"
msgstr "No se puede usar el formato de pixel %1 para %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr ""
@@ -388,7 +388,7 @@ msgstr ""
msgid "Centre"
msgstr "Centro"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Canales"
@@ -396,7 +396,7 @@ msgstr "Canales"
msgid "Checking content for changes"
msgstr ""
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Comprobando las imágenes existentes"
@@ -467,7 +467,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "La fuente y el DCP tienen la misma velocidad.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Velocidad del contenido de audio"
@@ -484,81 +484,98 @@ msgstr "Para unir contenido deben tener subtítulos todos o ninguno"
msgid "Content to be joined must all have or not have video"
msgstr "Para unir contenido deben tener vídeo todos o ninguno"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"Para unir contenido debe tener la misma separación de línea de subtítulos."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "Para unir contenido debe tener la misma velocidad de imagen"
-#: 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 "Para unir contenido debe tener la misma opción ‘grabar subtítulos’."
-#: 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 "Para unir contenido debe tener la misma opción 'usar subtítulos'."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Para unir contenido debe tener el mismo retardo de audio."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "Para unir contenido debe tener la misma ganancia de audio."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Para unir contenido debe tener la misma ganancia de audio."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr "Para unir contenido debe tener la misma opción ‘grabar subtítulos’."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Para unir contenido debe tener la misma conversión de color."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Para unir contenido debe tener el mismo recorte."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr "Para unir contenido debe tener la misma redimensión."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr "Para unir contenido debe tener la misma redimensión."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Para unir contenido debe tener los mismos fundidos."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "Para unir contenido debe tener la misma anchura de contorno."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
-#: 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 ""
"Para unir contenido debe tener el mismo desplazamiento de subtítulo en X."
-#: 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 ""
"Para unir contenido debe tener la misma redimensión de subtítulo en X."
-#: 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 ""
"Para unir contenido debe tener el mismo desplazamiento de subtítulo en Y."
-#: 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 "Para unir contenido debe tener la misma redimensión de subtítulo en Y."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr "Para unir contenido debe tener el mismo fundido de subtítulos."
-#: 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 ""
"Para unir contenido debe tener la misma separación de línea de subtítulos."
@@ -567,16 +584,16 @@ msgstr ""
msgid "Content to be joined must have the same video frame rate"
msgstr "Para unir contenido debe tener la misma velocidad de imagen"
-#: 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 "Para unir contenido debe tener el mismo tamaño de imagen."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
#, fuzzy
msgid "Content to be joined must use the same DCP track."
msgstr "Para unir contenido debe usar la misma fuente."
-#: 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 "Para unir contenido debe usar la misma fuente."
@@ -584,7 +601,12 @@ msgstr "Para unir contenido debe usar la misma fuente."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Para unir contenido debe usar la misma fuente."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "El video es %1x%2"
@@ -596,7 +618,7 @@ msgstr "Copiar DCP al TMS"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "El tamaño de los vídeos no coincide en el DCP"
@@ -643,7 +665,7 @@ msgstr "No se puedo abrir el fichero ZIP descargado"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "No se puedo abrir el fichero ZIP descargado"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
#, fuzzy
msgid "Could not open file for writing"
msgstr "no se pudo abrir el fichero %1 para escritura (%2)"
@@ -692,7 +714,7 @@ msgstr "Scope DCI"
msgid "DCP XML subtitles"
msgstr "Subtítulos DCP XML"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "Velocidad del DCP"
@@ -713,13 +735,13 @@ msgstr ""
"DCP-o-matic no pudo abrir el fichero %1 (%2). Quizás no existe o está en un "
"formato inesperado."
-#: 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."
@@ -730,7 +752,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
-#: 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 ""
@@ -743,7 +765,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "Desentrelazado"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -898,19 +920,19 @@ msgstr "Completo (0-%1)"
msgid "Full frame"
msgstr "Frame completo"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Longitud total en frames de audio a la velocidad del DCP"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Longitud total en frames de audio a la velocidad del contenido"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Longitud total en frames de vídeo a la velocidad del DCP"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Longitud total en frames de vídeo a la velocidad del contenido"
@@ -943,7 +965,7 @@ msgstr "Reductor de ruido 3D de alta calidad"
msgid "Horizontal flip"
msgstr "Horizontal deblocking filter"
-#: 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 "Hz"
@@ -973,7 +995,7 @@ msgstr "Error desconocido."
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 "Envío de KDM: $CPL_NAME"
@@ -1005,7 +1027,7 @@ msgstr "Surround trasero izquierda"
msgid "Left surround"
msgstr "Surround izquierda"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Duración"
@@ -1078,7 +1100,7 @@ msgstr "falta una configuración obligatoria %1"
msgid "Monday"
msgstr "Lunes"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1102,7 +1124,7 @@ msgstr "No se encontraron imágenes válidas en la carpeta."
msgid "Noise reduction"
msgstr "Reducción de ruido"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Ninguno"
@@ -1295,11 +1317,11 @@ msgstr "Enviando correo"
msgid "Short"
msgstr "Cortometraje"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Tamaño"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "El audio será remuestreado a %1Hz"
@@ -1322,17 +1344,17 @@ msgid ""
"truncated."
msgstr ""
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
#, fuzzy
msgid "Some of your content needs a KDM"
msgstr "parte de su contenido necesita una KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
#, fuzzy
msgid "Some of your content needs an OV"
msgstr "parte de su contenido necesita una OV"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Estéreo"
@@ -1364,7 +1386,7 @@ msgstr "Test"
msgid "Text subtitles"
msgstr "Subtítulos de texto"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1416,7 +1438,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 ""
@@ -1461,7 +1483,7 @@ msgstr ""
"Este fichero es una KDM. Las KDM pueden añadirse al DCP pinchando con el "
"botón derecho sobre el contenido y eligiendo “Añadir KDM”"
-#: 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!"
@@ -1470,7 +1492,7 @@ msgstr ""
"desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
"volver a añadir y configurar ton contenido. ¡Lo siento!"
-#: src/lib/film.cc: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 "
@@ -1526,7 +1548,7 @@ msgstr "desconocido"
msgid "Unknown error"
msgstr "Error desconocido"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato de audio desconocido (%1)"
@@ -1647,7 +1669,7 @@ msgstr ""
"Hay %1 ficheros que parecen VOBs de un DVD. Deberías unirlos para asegurarte "
"transiciones suaves."
-#: 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."
@@ -1667,7 +1689,7 @@ msgstr ""
"Has seleccionado una fuente de más de 640 Kb. Es muy posible que cause "
"problemas en la reproducción."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
#, fuzzy
msgid "You must add some content to the DCP before creating it"
msgstr "tiene que añadir contenido al DCP antes de crearlo"
@@ -1739,11 +1761,11 @@ msgstr "tiempo de conexión agotado"
msgid "connecting"
msgstr "conectando"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "continente"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "tipo de contenido"
@@ -1755,12 +1777,12 @@ msgstr "copiando %1"
msgid "could not find stream information"
msgstr "no se pudo encontrar información del flujo"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "no se puede mover el audio en el DCP (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "no se puede mover el audio en el DCP (%1)"
@@ -1817,79 +1839,79 @@ msgid "h"
msgstr "h"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
#, fuzzy
msgid "it does not have closed captions in all its reels."
msgstr "El DCP no tiene sonido en todas las bobinas."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:739
+#: src/lib/dcp_content.cc:736
#, fuzzy
msgid "it does not have open subtitles in all its reels."
msgstr "El DCP no tiene subtítulos en todas las bobinas."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:706
+#: src/lib/dcp_content.cc:703
#, fuzzy
msgid "it does not have sound in all its reels."
msgstr "El DCP no tiene sonido en todas las bobinas."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:610
+#: src/lib/dcp_content.cc:607
#, fuzzy
msgid "it has a different frame rate to the film."
msgstr "La película tiene una velocidad diferente a este DCP."
#. / 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
#, fuzzy
msgid "it is 2K and the film is 4K."
msgstr "La película es Interop y este DCP es SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:664
+#: src/lib/dcp_content.cc:661
#, fuzzy
msgid "it is 4K and the film is 2K."
msgstr "La película es Interop y este DCP es SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:598
+#: src/lib/dcp_content.cc:595
#, fuzzy
msgid "it is Interop and the film is set to SMPTE."
msgstr "La película es Interop y este DCP es SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:602
+#: src/lib/dcp_content.cc:599
#, fuzzy
msgid "it is SMPTE and the film is set to Interop."
msgstr "La película es SMPTE y este DCP es Interop."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:712
+#: src/lib/dcp_content.cc:709
#, fuzzy
msgid "it overlaps other audio content; remove the other content."
msgstr "Hay otro contenido de audio superpuesto a este DCP; elimínelo."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:770
+#: src/lib/dcp_content.cc:767
#, fuzzy
msgid "it overlaps other text content; remove the other content."
msgstr "Hay otro contenido de vídeo superpuesto a este DCP; elimínelo."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:677
+#: src/lib/dcp_content.cc:674
#, fuzzy
msgid "it overlaps other video content; remove the other content."
msgstr "Hay otro contenido de vídeo superpuesto a este DCP; elimínelo."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:633
+#: src/lib/dcp_content.cc:630
#, fuzzy
msgid ""
"its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1899,7 +1921,7 @@ msgstr ""
"seleccione el modo de bobinas ‘dividir por contenido’."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:672
+#: src/lib/dcp_content.cc:669
#, fuzzy
msgid "its video frame size differs from the film's."
msgstr "El tamaño de imagen de vídeo en la película es diferente en el DCP."
@@ -1913,19 +1935,19 @@ msgstr "m"
msgid "moving"
msgstr "moviendo"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "nombre"
#. / 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."
@@ -1940,7 +1962,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "falta parte de su contenido"
@@ -1952,7 +1974,7 @@ msgstr "imagen fija"
msgid "unknown"
msgstr "desconocido"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "fotogramas"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 9477696aa..21b1e7ba4 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
"PO-Revision-Date: 2019-05-07 14:28+0100\n"
"Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
"Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.3\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -26,7 +26,7 @@ msgstr ""
"\n"
"Vitesse de défilement du contenu %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -34,7 +34,7 @@ msgstr ""
"\n"
"Rogné à %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -43,7 +43,7 @@ msgstr ""
"\n"
"Ratio image %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -51,7 +51,7 @@ msgstr ""
"\n"
"Ajout de bandes noires pour remplir le format image cible %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -59,7 +59,7 @@ msgstr ""
"\n"
"Mis à l'échelle à %1x%2"
-#: 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 " (%.2f:1)"
@@ -70,7 +70,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -92,7 +92,7 @@ msgstr ""
"Durée: $LENGTH\n"
"Taille: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$JOB_NAME: $JOB_STATUS"
@@ -104,7 +104,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -120,7 +120,7 @@ msgstr "%1 [film]"
msgid "%1 [video]"
msgstr "%1 [vidéo]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", ratio des pixels %.2f:1"
@@ -302,15 +302,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 "Le son sera ré-échantillonné de %1Hz à %2Hz."
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Le son sera ré-échantillonné à %1Hz."
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Le son ne sera pas ré-échantillonné."
@@ -384,7 +384,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Annulé"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "slash non autorisés"
@@ -392,7 +392,7 @@ msgstr "slash non autorisés"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Format du pixel %1 non géré par %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr "Fabrication d'une KDM impossible car ce projet n'est pas crypté."
@@ -400,7 +400,7 @@ msgstr "Fabrication d'une KDM impossible car ce projet n'est pas crypté."
msgid "Centre"
msgstr "Centre"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Canaux"
@@ -408,7 +408,7 @@ msgstr "Canaux"
msgid "Checking content for changes"
msgstr "Vérification des changements dans les contenus"
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Recherche de données images existantes"
@@ -476,7 +476,7 @@ msgstr "Félicitations!"
msgid "Content and DCP have the same rate.\n"
msgstr "Le DCP et la source ont la même cadence image.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "VItesse du contenu audio"
@@ -494,89 +494,106 @@ msgstr ""
msgid "Content to be joined must all have or not have video"
msgstr "Les contenus à ajouter doivent tous avoir ou ne pas avoir de vidéo"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"Les contenus à ajouter doivent tous avoir le même espacement de lignes."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "Le contenu à ajouter doit avoir la même cadence vidéo."
-#: 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 "Le contenu à ajouter doit avoir le même réglage 'sous-titres gravés'"
-#: 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 ""
"Le contenu à ajouter doit avoir le même réglage 'utiliser les sous-titres'"
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Le contenu à ajouter doit présenter le même délais audio"
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "Le contenu à ajouter doit avoir le même gain audio"
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Le contenu à ajouter doit avoir le même gain audio"
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr "Le contenu à ajouter doit avoir le même réglage 'sous-titres gravés'"
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Le contenu à ajouter doit avoir le même type de conversion couleur"
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr ""
"Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr ""
"Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Le contenu à ajouter doit avoir le même réglage de fondu."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "Le contenu ajouté doit avoir la même taille de contour."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Le contenu à ajouter doit avoir la même taille d'image"
-#: 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 ""
"Le contenu à ajouter doit avoir le même positionnement horizontal des sous-"
"titres"
-#: 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 ""
"Le contenu à ajouter doit avoir le même réglage d'échelle horizontale de "
"sous-titres"
-#: 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 ""
"Le contenu à ajouter doit avoir le même positionnement vertical des sous-"
"titres"
-#: 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 ""
"Le contenu à ajouter doit avoir le même réglage d'échelle verticale de sous-"
"titres"
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr "Le contenu ajouté doit avoir le même réglage de fondu."
-#: 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 ""
"Les contenus à ajouter doivent tous avoir le même espacement de lignes."
@@ -585,15 +602,15 @@ msgstr ""
msgid "Content to be joined must have the same video frame rate"
msgstr "Le contenu à ajouter doit avoir la même cadence vidéo."
-#: 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 "Le contenu à ajouter doit avoir le même type de trame vidéo"
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
msgid "Content to be joined must use the same DCP track."
msgstr "Le contenu à ajouter doit utiliser la même piste de DCP"
-#: 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 "Le contenu à ajouter doit avoir la même police de sous-titres"
@@ -601,7 +618,12 @@ msgstr "Le contenu à ajouter doit avoir la même police de sous-titres"
msgid "Content to be joined must use the same subtitle stream."
msgstr "Le contenu à ajouter doit avoir le même flux sous titre"
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Le contenu à ajouter doit avoir la même police de sous-titres"
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Le contenu vidéo est %1x%2"
@@ -613,7 +635,7 @@ msgstr "Copier le DCP dans le TMS"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Problème de taille d'images dans le DCP"
@@ -658,7 +680,7 @@ msgstr "Ouverture du fichier Zip téléchargé impossible"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Ouverture du fichier Zip téléchargé impossible (%1:%2: %3)"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
msgid "Could not open file for writing"
msgstr "Ouverture du fichier pour enregistrer impossible."
@@ -706,7 +728,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "Sous-titres XML du DCP"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "Cadence DCP"
@@ -727,7 +749,7 @@ msgstr ""
"DCP-o-matic ne peut pas ouvrir le fichier %1 (%2). Soit il n'existe pas, "
"soit il n'est pas dans un format géré."
-#: 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."
@@ -736,7 +758,7 @@ msgstr ""
"qu'OV. Merci de vérifier ces réglages pour être sûr qu'ils correspondent à "
"ce que vous attendez."
-#: src/lib/film.cc:1508
+#: src/lib/film.cc:1525
#, fuzzy
msgid ""
"DCP-o-matic had to change your settings so that the film's frame rate is the "
@@ -751,7 +773,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
-#: 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 "Notification DCP-o-matic"
@@ -764,7 +786,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "Désentrelacement"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -915,19 +937,19 @@ msgstr "en cours (0-%1)"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Echantillonnage audio non modifié pour la cadence du DCP"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Echantillonnage audio correspondant à la vitesse source"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Pleine durée en images vidéo à la cadence du DCP"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Pleine durée en images vidéo à la cadence du contenu"
@@ -959,7 +981,7 @@ msgstr "Débruiteur 3D haute qualité"
msgid "Horizontal flip"
msgstr "Inversion horizontale"
-#: 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 "Hz"
@@ -991,7 +1013,7 @@ msgstr "Erreur indéterminée."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "Envoi KDM: $CPL_NAME"
@@ -1023,7 +1045,7 @@ msgstr "Ambiance arrière gauche"
msgid "Left surround"
msgstr "Ambiance gauche"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Durée"
@@ -1095,7 +1117,7 @@ msgstr "Paramètre requis %1 manquant"
msgid "Monday"
msgstr "Lundi"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1119,7 +1141,7 @@ msgstr "Aucun fichier image valide dans ce dossier."
msgid "Noise reduction"
msgstr "Réduction de bruit"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Aucun"
@@ -1312,11 +1334,11 @@ msgstr "Envoi email"
msgid "Short"
msgstr "Short"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Taille"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Certains sons seront ré-échantillonné à %1Hz"
@@ -1348,15 +1370,15 @@ msgstr ""
"Certains de vos sous-titres font plus de %1 lignes, aussi seront ils "
"tronqués."
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "Certains de vos contenus nécessitent une clé"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "Certains de vos contenus nécessitent une OV"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stéréo"
@@ -1388,7 +1410,7 @@ msgstr "Test"
msgid "Text subtitles"
msgstr "Sous-titres textes"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1445,7 +1467,7 @@ msgstr ""
"votre DCP à une vitesse plus proche de la cadence de vos contenus, en "
"espérant que serveurs et projecteurs cibles supportent cette cadence."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "Il n'y a aucune vidéo dans ce DCP"
@@ -1493,7 +1515,7 @@ msgstr ""
"Ce fichier est une KDM. Les KDM doivent être ajoutées au contenu du DCP en "
"cliquant droit sur le contenu et en sélectionnant \"Add KDM\"."
-#: 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!"
@@ -1501,7 +1523,7 @@ msgstr ""
"Ce film a été créé avec une nouvelle version de DCP-o-matic et il ne peut "
"être ouvert dans cette version du programme. Désolé!"
-#: src/lib/film.cc: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 "
@@ -1556,7 +1578,7 @@ msgstr "Inconnu"
msgid "Unknown error"
msgstr "Erreur inconnue"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Échantillonnage audio (%1) inconnu"
@@ -1680,7 +1702,7 @@ msgstr ""
"Vous avez %1 fichiers qui ressemblent à des fichiers VOB issus de DVD. Vous "
"devriez les assembler pour vous assurer des transitions fluides."
-#: 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."
@@ -1702,7 +1724,7 @@ msgstr ""
"Vous avez choisi un fichier police de caractère qui est plus lourd que 640 "
"kB. Cela peut poser des problèmes en lecture."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "Vous devez ajouter des contenus au DCP avant de le créer"
@@ -1778,11 +1800,11 @@ msgstr "temps de connexion expiré"
msgid "connecting"
msgstr "connexion"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "conteneur"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "type de contenu"
@@ -1794,12 +1816,12 @@ msgstr "copie de %1"
msgid "could not find stream information"
msgstr "information du flux introuvable"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "ne peut pas transférer l'asset audio dans le DCP (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "ne peut pas transférer l'asset audio dans le DCP (%1)"
@@ -1856,68 +1878,68 @@ msgid "h"
msgstr "h"
#. / 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 "Pas de sous-titres dans toutes ses bobines"
#. / 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 "Pas de sous-titres ouverts dans toutes ses bobines"
#. / 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 "Pas de son dans toutes ses bobines"
#. / 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 "Vitesse de défilement différente du film"
#. / 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 "C'est du 2K mais le film est en 4K."
#. / 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 "C'est du 4K mais le film est en 2K."
#. / 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 "Format Interop alors que le DCP est SMPTE."
#. / 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 "Format SMPTE alors que le DCP est interop."
#. / 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 "Contenus audio superposés, enlevez les autres contenus."
#. / 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 "Contenus sous-titres superposés, enlevez les autres contenus."
#. / 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 "Contenus vidéo superposés, enlevez les autres contenus."
#. / 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'."
@@ -1926,7 +1948,7 @@ msgstr ""
"le mode 'découper par contenu vidéo'. "
#. / 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 "La taille de l'image du film diffère de celle du DCP"
@@ -1939,19 +1961,19 @@ msgstr "m"
msgid "moving"
msgstr "séquence"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "nom"
#. / 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."
@@ -1966,7 +1988,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "Certains de vos contenus sont manquants"
@@ -1978,7 +2000,7 @@ msgstr "fixe"
msgid "unknown"
msgstr "Inconnu"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "images"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 18f17a452..2e6763c7b 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: IT VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
"PO-Revision-Date: 2018-09-30 14:16+0200\n"
"Last-Translator: William Fanelli <william.f@impronte.com>\n"
"Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.7\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -26,7 +26,7 @@ msgstr ""
"\n"
"Frequenza fotogrammi del contenuto %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -34,7 +34,7 @@ msgstr ""
"\n"
"Ritagliato a %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -43,7 +43,7 @@ msgstr ""
"\n"
"Rapporto schermo %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -51,7 +51,7 @@ msgstr ""
"\n"
"Aggiunto nero per adattarsi al contenitore %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -59,7 +59,7 @@ msgstr ""
"\n"
"Scalato a %1x%2"
-#: 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 " (%.2f:1)"
@@ -70,7 +70,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " on %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -92,7 +92,7 @@ msgstr ""
"Lunghezza: $ LUNGHEZZA\n"
"Dimensioni: $ DIMENSIONI\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$NOME_LAVORO: $STATO_LAVORO"
@@ -104,7 +104,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -120,7 +120,7 @@ msgstr "%1 [film]"
msgid "%1 [video]"
msgstr "%1 [video]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", proporzioni pixel %.2f:1"
@@ -290,15 +290,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 "L'audio sarà ricampionato da %1Hz a %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "L'audio sarà ricampionato a %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "L'audio non sarà ricampionato"
@@ -372,7 +372,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Cancellato"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "Non può contenere slash"
@@ -380,7 +380,7 @@ msgstr "Non può contenere slash"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Impossibile gestire il formato pixel %1 durante %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr ""
"Impossibile creare un KDM in quanto questo progetto non è crittografato."
@@ -389,7 +389,7 @@ msgstr ""
msgid "Centre"
msgstr "Centro"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Canali"
@@ -397,7 +397,7 @@ msgstr "Canali"
msgid "Checking content for changes"
msgstr ""
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Controllo dati immagine esistente in corso"
@@ -466,7 +466,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "La sorgente e il DCP hanno la stessa frequenza di fotogrammi.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Frequenza di campionamento del contenuto audio"
@@ -483,84 +483,102 @@ msgstr "Tutti i contenuti da unire possono avere o non avere i sottotitoli"
msgid "Content to be joined must all have or not have video"
msgstr "Tutti i contenuti da unire possono avere o non avere la traccia video"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "Il contenuto da unire deve avere la stessa interlinea dei sottotitoli."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "Il contenuto da unire deve avere la stessa frequenza fotogrammi"
-#: 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 ""
"Il contenuto da unire deve avere le stesse impostazioni di 'masterizza "
"sottotitoli'."
-#: 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 ""
"Il contenuto da unire deve avere le stesse impostazioni di 'usa sottotitoli'."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Il contenuto da unire deve avere lo stesso ritardo audio."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "Il contenuto da unire deve avere lo stesso guadagno audio."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Il contenuto da unire deve avere lo stesso guadagno audio."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+"Il contenuto da unire deve avere le stesse impostazioni di 'masterizza "
+"sottotitoli'."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Il contenuto da unire deve avere la stessa conversione del colore."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Il contenuto da unire deve avere lo stesso ritaglio."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr "Il contenuto da unire deve avere la stessa scala."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr "Il contenuto da unire deve avere la stessa scala."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Il contenuto da unire deve avere le stesse dissolvenze."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "Il contenuto da unire deve avere la stessa dimensione."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Il contenuto da unire deve avere la stessa dimensione dell'immagine."
-#: 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 ""
"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
-#: 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 "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
-#: 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 ""
"Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
-#: 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 "Il contenuto da unire deve avere la stessa scala Y dei sottotitoli."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr ""
"Il contenuto da unire deve avere le stesse dissolvenze dei sottotitoli."
-#: 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 "Il contenuto da unire deve avere la stessa interlinea dei sottotitoli."
@@ -568,16 +586,16 @@ msgstr "Il contenuto da unire deve avere la stessa interlinea dei sottotitoli."
msgid "Content to be joined must have the same video frame rate"
msgstr "Il contenuto da unire deve avere la stessa frequenza fotogrammi"
-#: 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 "Il contenuto da unire deve avere lo stesso tipo di fotogramma video."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
#, fuzzy
msgid "Content to be joined must use the same DCP track."
msgstr "Il contenuto da unire deve usare gli stessi caratteri."
-#: 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 "Il contenuto da unire deve usare gli stessi caratteri."
@@ -585,7 +603,12 @@ msgstr "Il contenuto da unire deve usare gli stessi caratteri."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Il contenuto da unire deve usare lo stesso flusso di sottotitoli."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Il contenuto da unire deve usare gli stessi caratteri."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Il contenuto video è %1x%2"
@@ -597,7 +620,7 @@ msgstr "Copia DCP nel TMS"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "La dimensione video nel DCP non corrisponde"
@@ -644,7 +667,7 @@ msgstr "Impossibile aprire il file ZIP scaricato"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Impossibile aprire il file ZIP scaricato"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
#, fuzzy
msgid "Could not open file for writing"
msgstr "impossibile aprire il file %1 per la scrittura (%2)"
@@ -693,7 +716,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "DCP XML sottotitoli"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "DCP frequenza di campionamento"
@@ -714,13 +737,13 @@ msgstr ""
"DCP-o-MATIC non riesce ad aprire il file %1 (%2). Forse non esiste oppure è "
"un formato non riconosciuto."
-#: 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."
@@ -732,7 +755,7 @@ msgid ""
msgstr ""
"DCP-o-MATIC non supporta più il filtro '%1', quindi è stato disattivato."
-#: 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 "DCP-o-MATIC notifica"
@@ -745,7 +768,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "De-interlacciamento"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -900,19 +923,19 @@ msgstr "Completo (0-%1)"
msgid "Full frame"
msgstr "Fotogramma intero"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Lunghezza completa nei campioni audio alla velocità DCP"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Lunghezza completa nei campioni audio alla frequenza del contenuto"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Lunghezza completa nei fotogrammi video alla frequenza del DCP"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Lunghezza completa nei fotogrammi video alla frequenza del contenuto"
@@ -944,7 +967,7 @@ msgstr "Riduzzione del rumore 3D di alta qualità"
msgid "Horizontal flip"
msgstr "Vibrazione orizzontale"
-#: 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 "Hz"
@@ -974,7 +997,7 @@ msgstr "Non è chiaro cosa ha causato l'errore."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "Consegna KDM: $NOME_CPL"
@@ -1006,7 +1029,7 @@ msgstr "Surround posteriore sinistro"
msgid "Left surround"
msgstr "Surround sinistro"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Lunghezza"
@@ -1078,7 +1101,7 @@ msgstr "Impostazione obbligatoria mancante %1"
msgid "Monday"
msgstr "Lunedì"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1102,7 +1125,7 @@ msgstr "Nessun file immagine valido trovato nella cartella."
msgid "Noise reduction"
msgstr "Riduzione rumore"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Nulla"
@@ -1295,11 +1318,11 @@ msgstr "Invia e-mail"
msgid "Short"
msgstr "Corto"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Dimensione"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Parte dell'audio sarà ricampionato a %1Hz"
@@ -1322,15 +1345,15 @@ msgid ""
"truncated."
msgstr ""
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "Alcuni dei tuoi contenuti richiedono una KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "Alcuni dei tuoi contenuti richiedono un OV"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stereo"
@@ -1362,7 +1385,7 @@ msgstr "Test"
msgid "Text subtitles"
msgstr "Testo sottotitoli"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1420,7 +1443,7 @@ msgstr ""
"che i sistemi di proiezione selezionati supportino la frequenza del DCP "
"scelta."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "Nessun video in questo DCP"
@@ -1465,7 +1488,7 @@ msgstr ""
"Questo file è un KDM, deve essere aggiunti al contenuto DCP facendo clic con "
"il pulsante destro del mouse sul contenuto e scegliendo \"Aggiungi KDM\"."
-#: 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!"
@@ -1473,7 +1496,7 @@ msgstr ""
"Questo film è stato creato con una versione più recente di DCP-o-matic e non "
"può essere caricato in questa versione. Scusate!"
-#: 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 "
@@ -1530,7 +1553,7 @@ msgstr "sconosciuto"
msgid "Unknown error"
msgstr "Errore sconosciuto"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato campionamento audio non riconosciuto (%1)"
@@ -1658,7 +1681,7 @@ msgstr ""
"Hai %1 files che sembrano provenire da un DVD (files VOB). Dovresti unirli "
"per assicurare una transizione senza salti."
-#: 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."
@@ -1678,7 +1701,7 @@ msgstr ""
"Hai specificato un font la cui dimensione supera i 640kB. Probabilmente ci "
"saranno problemi nella riproduzione."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
@@ -1753,11 +1776,11 @@ msgstr "connessione scaduta"
msgid "connecting"
msgstr "connessione in corso"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "contenitore"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "tipo di contenuto"
@@ -1769,12 +1792,12 @@ msgstr "copia %1"
msgid "could not find stream information"
msgstr "non riesco a trovare informazioni sul flusso"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "impossibile spostare la risorsa audio nel DCP (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "impossibile spostare la risorsa audio nel DCP (%1)"
@@ -1831,73 +1854,73 @@ msgid "h"
msgstr "h"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
#, fuzzy
msgid "it does not have closed captions in all its reels."
msgstr "il DCP non ha sonoro in nessuna delle parti."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:739
+#: src/lib/dcp_content.cc:736
#, fuzzy
msgid "it does not have open subtitles in all its reels."
msgstr "il DCP non ha sottotitoli in nessuna delle parti."
#. / 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 "il DCP non ha sonoro in nessuna delle parti."
#. / 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 "il DCP ha una frequenza fotogrammi diversa rispetto al film."
#. / 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
#, fuzzy
msgid "it is 2K and the film is 4K."
msgstr "il film è impostato su Interop e questo DCP è SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:664
+#: src/lib/dcp_content.cc:661
#, fuzzy
msgid "it is 4K and the film is 2K."
msgstr "il film è impostato su Interop e questo DCP è SMPTE."
#. / 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 "il film è impostato su Interop e questo DCP è SMPTE."
#. / 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 "il film è impostato su SMPTE e questo DCP è Interop."
#. / 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 "c'è un altro flusso audio che si sovrappone; rimuoverlo."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:770
+#: src/lib/dcp_content.cc:767
#, fuzzy
msgid "it overlaps other text content; remove the other content."
msgstr "c'è un altro flusso video che si sovrappone; rimuoverlo."
#. / 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 "c'è un altro flusso video che si sovrappone; rimuoverlo."
#. / 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'."
@@ -1906,7 +1929,7 @@ msgstr ""
"bobina su \"dividi per contenuto video\"."
#. / 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 "la dimensione del frame nel film è diversa da quella del DCP."
@@ -1919,19 +1942,19 @@ msgstr "m"
msgid "moving"
msgstr "spostamento"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "nome"
#. / 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."
@@ -1946,7 +1969,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "alcuni dei tuoi contenuti sono mancanti"
@@ -1958,7 +1981,7 @@ msgstr "fermo immagine"
msgid "unknown"
msgstr "sconosciuto"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "fotogrammi video"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 915986214..af624aa9a 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
"PO-Revision-Date: 2021-03-24 00:13+0100\n"
"Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
"Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 2.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -27,7 +27,7 @@ msgstr ""
"\n"
"Content frame rate %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -35,7 +35,7 @@ msgstr ""
"\n"
"Bijgesneden naar %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -44,7 +44,7 @@ msgstr ""
"\n"
"Weergave-beeldverhouding %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -52,7 +52,7 @@ msgstr ""
"\n"
"Opgevuld met zwart om in container %1 (%2x%3) te passen"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -60,7 +60,7 @@ msgstr ""
"\n"
"Geschaald naar %1x%2"
-#: 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 " (%.2f:1)"
@@ -71,7 +71,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " op %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -93,7 +93,7 @@ msgstr ""
"Lengte: $LENGTH\n"
"Grootte: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$JOB_NAME: $JOB_STATUS"
@@ -105,7 +105,7 @@ msgstr "%1 (%2 GB) [%3]"
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -121,7 +121,7 @@ msgstr "%1 [video]"
msgid "%1 [video]"
msgstr "%1 [video]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", pixel-beeldverhouding %.2f:1"
@@ -312,15 +312,15 @@ msgstr ""
"Ten minste één van uw ondertitels begint minder dan 2 frames na de vorige. "
"Het is verstandig om minstens 2 frames tussen ondertitels te laten."
-#: src/lib/audio_content.cc:257
+#: src/lib/audio_content.cc:291
msgid "Audio will be resampled from %1Hz to %2Hz"
msgstr "Audio wordt geresampled van %1Hz naar %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Audio wordt geresampled naar %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Audio wordt niet geresampled"
@@ -393,7 +393,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Geannuleerd"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "Mag geen slash bevatten"
@@ -401,7 +401,7 @@ msgstr "Mag geen slash bevatten"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Kan pixelformaat %1 niet verwerken tijdens %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr "Kan geen KDM maken omdat dit project niet is versleuteld."
@@ -409,7 +409,7 @@ msgstr "Kan geen KDM maken omdat dit project niet is versleuteld."
msgid "Centre"
msgstr "Midden (C)"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Kanalen"
@@ -417,7 +417,7 @@ msgstr "Kanalen"
msgid "Checking content for changes"
msgstr "Controleren content op wijzigingen"
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Controleren bestaande beelddata"
@@ -485,7 +485,7 @@ msgstr "Gefeliciteerd!"
msgid "Content and DCP have the same rate.\n"
msgstr "Content en DCP hebben dezelfde frame rate.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Content audio sample rate"
@@ -507,89 +507,108 @@ msgstr ""
"Samen te voegen content moet allemaal wel video, of allemaal geen video "
"hebben"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"Samen te voegen content moet dezelfde regelafstand voor ondertitels hebben."
+
+#: src/lib/video_content.cc:207
msgid "Content to be joined must have all its video used or not used."
msgstr ""
"Video van samen te voegen content moet allemaal wel, of allemaal niet "
"gebruikt worden."
-#: 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 ""
"Samen te voegen content moeten dezelfde 'inbranden ondertitels'-instelling "
"hebben."
-#: 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 ""
"Samen te voegen content moet dezelfde 'gebruik ondertitels'-instelling "
"hebben."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Samen te voegen content moet dezelfde audio-vertraging hebben."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "Samen te voegen content moet dezelfde audio-versterking hebben."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Samen te voegen content moet dezelfde audio-versterking hebben."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+"Samen te voegen content moeten dezelfde 'inbranden ondertitels'-instelling "
+"hebben."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Samen te voegen content moet dezelfde kleurconversie hebben."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Samen te voegen content moet dezelfde bijsnijding hebben."
-#: 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 ""
"Samen te voegen content moet dezelfde instelling voor aangepaste "
"beeldverhouding hebben."
-#: 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 ""
"Samen te voegen content moet dezelfde instelling voor aangepaste grootte "
"hebben."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Samen te voegen content moet dezelfde fade-instelling hebben."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr ""
"Samen te voegen content moet dezelfde ondertitel omlijnings-breedte hebben."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Samen te voegen content moet dezelfde beeldgrootte hebben."
-#: 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 ""
"Samen te voegen content moet dezelfde ondertitel X-verschuiving hebben."
-#: 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 "Samen te voegen content moet dezelfde ondertitel X-schaling hebben."
-#: 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 ""
"Samen te voegen content moet dezelfde ondertitel Y-verschuiving hebben."
-#: 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 "Samen te voegen content moet dezelfde ondertitel Y-schaling hebben."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr ""
"Samen te voegen content moet dezelfde ondertitel fade-instelling hebben."
-#: 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 ""
"Samen te voegen content moet dezelfde regelafstand voor ondertitels hebben."
@@ -598,15 +617,15 @@ msgstr ""
msgid "Content to be joined must have the same video frame rate"
msgstr "Samen te voegen content moet dezelfde video frame rate hebben"
-#: 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 "Samen te voegen content moet hetzelfde video frame type hebben."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
msgid "Content to be joined must use the same DCP track."
msgstr "Samen te voegen content moet dezelfde DCP track gebruiken."
-#: 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 "Samen te voegen content moet hetzelfde lettertype gebruiken."
@@ -614,7 +633,12 @@ msgstr "Samen te voegen content moet hetzelfde lettertype gebruiken."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Samen te voegen content moet dezelfde ondertitel-stream gebruiken."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Samen te voegen content moet hetzelfde lettertype gebruiken."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Content-video is %1x%2"
@@ -626,7 +650,7 @@ msgstr "Kopieer DCP naar TMS"
msgid "Copying old video file"
msgstr "Kopiëren oud video-bestand"
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
msgid "Copying video file into DCP"
msgstr "Kopiëren video-bestand naar DCP"
@@ -670,7 +694,7 @@ msgstr "Kan gedownload ZIP-bestand niet openen"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Kan gedownload ZIP-bestand niet openen (%1:%2: %3)"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
msgid "Could not open file for writing"
msgstr "Kan bestand niet openen om te schrijven"
@@ -718,7 +742,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "DCP XML ondertitels"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "DCP sample rate"
@@ -739,7 +763,7 @@ msgstr ""
"DCP-o-matic kan het bestand %1 (%2) niet openen. Misschien bestaat het niet "
"of wordt het formaat niet ondersteund."
-#: 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."
@@ -748,7 +772,7 @@ msgstr ""
"Controleer a.u.b. deze instellingen om er zeker van te zijn dat ze zijn "
"zoals u wilt."
-#: 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."
@@ -763,7 +787,7 @@ msgstr ""
"DCP-o-matic ondersteunt het filter `%1' niet langer, daarom is het "
"uitgeschakeld."
-#: 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 "DCP-o-matic notificatie"
@@ -776,7 +800,7 @@ msgstr "Datasat AP20 of AP25"
msgid "De-interlacing"
msgstr "Deinterlacing"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -922,19 +946,19 @@ msgstr "Volledig (0-%1)"
msgid "Full frame"
msgstr "DCI Full Container"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Volledige lengte in audio samples bij DCP-snelheid"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Volledige lengte in audio samples bij content-snelheid"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Volledige lengte in video frames bij DCP-snelheid"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Volledige lengte in video frames bij content-snelheid"
@@ -966,7 +990,7 @@ msgstr "Hoge kwaliteit 3D ruisonderdrukking"
msgid "Horizontal flip"
msgstr "Spiegel horizontaal"
-#: 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 "Hz"
@@ -1000,7 +1024,7 @@ msgstr "Het is onbekend hoe deze fout is ontstaan."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "KDM-levering: $CPL_NAME"
@@ -1032,7 +1056,7 @@ msgstr "Achter surround links (BsL)"
msgid "Left surround"
msgstr "Links surround (Ls)"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Lengte"
@@ -1104,7 +1128,7 @@ msgstr "Ontbrekende verplichte instelling %1"
msgid "Monday"
msgstr "Maandag"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1128,7 +1152,7 @@ msgstr "Geen geldige beeldbestanden gevonden in de map."
msgid "Noise reduction"
msgstr "Ruisonderdrukking"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Geen"
@@ -1329,11 +1353,11 @@ msgstr "Verzenden e-mail"
msgid "Short"
msgstr "Short"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Grootte"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Een deel van de audio wordt geresampled naar %1Hz"
@@ -1365,15 +1389,15 @@ msgstr ""
"Een deel van uw closed captions heeft meer dan %1 regels, dus worden ze "
"afgekapt."
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "Een deel van uw content heeft een KDM nodig"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "Een deel van uw content heeft een OV nodig"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stereo"
@@ -1405,7 +1429,7 @@ msgstr "Test"
msgid "Text subtitles"
msgstr "Tekst-ondertitels"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr "De DCP is leeg, misschien omdat alle content lengte nul heeft."
@@ -1466,7 +1490,7 @@ msgstr ""
"op voorwaarde dat uw doelprojectiesystemen de door u gekozen DCP frame rate "
"ondersteunen."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "Deze DCP heeft geen video"
@@ -1521,7 +1545,7 @@ msgstr ""
"met de rechtermuisknop op de content te klikken en \"Voeg KDM toe\" te "
"kiezen."
-#: 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!"
@@ -1529,7 +1553,7 @@ msgstr ""
"Deze film is aangemaakt met een nieuwere versie van DCP-o-matic en kan niet "
"met deze versie geladen worden. Sorry!"
-#: 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 "
@@ -1583,7 +1607,7 @@ msgstr "Onbekend"
msgid "Unknown error"
msgstr "Onbekende fout"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Niet herkend audio sample-formaat (%1)"
@@ -1707,7 +1731,7 @@ msgstr ""
"U heeft %1 bestanden die VOB-bestanden van een DVD lijken te zijn. U kunt "
"deze beter samenvoegen om van soepele aansluitingen verzekerd te zijn."
-#: 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."
@@ -1731,7 +1755,7 @@ msgstr ""
"U heeft een lettertype-bestand gespecificeerd dat groter is dan 640kB. Dit "
"zal zeer waarschijnlijk problemen bij het afspelen geven."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "U moet content aan de DCP toevoegen voor hij gemaakt kan worden"
@@ -1809,11 +1833,11 @@ msgstr "time-out van verbinding"
msgid "connecting"
msgstr "verbinden"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "container"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "content-type"
@@ -1825,11 +1849,11 @@ msgstr "kopiëren van %1"
msgid "could not find stream information"
msgstr "kan geen stream-informatie vinden"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
msgid "could not move atmos asset into the DCP (%1)"
msgstr "kan Atmos asset niet naar de DCP verplaatsen (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "kan audio asset niet naar de DCP verplaatsen (%1)"
@@ -1883,27 +1907,27 @@ msgid "h"
msgstr "h"
#. / 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 "hij heeft niet closed captions in alle reels."
#. / 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 "hij heeft niet open ondertitels in alle reels."
#. / 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 "hij heeft niet audio in alle reels."
#. / 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 "hij heeft een andere frame rate dan de film."
#. / 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 ""
@@ -1911,42 +1935,42 @@ msgstr ""
"captions moeten opnieuw geschreven worden."
#. / 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 "hij is 2K en de film is 4k."
#. / 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 "hij is 4K en de film is 2K."
#. / 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 "hij is Interop en de film is SMPTE."
#. / 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 "hij is SMPTE en de film is Interop."
#. / 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 "hij overlapt met andere audio-content; verwijder deze andere content."
#. / 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 "hij overlapt met andere tekst-content; verwijder deze andere content."
#. / 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 "hij overlapt met andere video-content; verwijder deze andere content."
#. / 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'."
@@ -1955,7 +1979,7 @@ msgstr ""
"'splits per video-content'."
#. / 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 "zijn video-beeldgrootte verschilt van die in de film."
@@ -1968,12 +1992,12 @@ msgstr "m"
msgid "moving"
msgstr "verplaatsen"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "naam"
#. / 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."
@@ -1982,7 +2006,7 @@ msgstr ""
"moet opnieuw geschreven worden."
#. / 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."
@@ -1999,7 +2023,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "een deel van uw content ontbreekt"
@@ -2011,7 +2035,7 @@ msgstr "stilstaand beeld"
msgid "unknown"
msgstr "onbekend"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "video frames"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index 0709ba76b..712fc4b9e 100644
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2017-07-31 21:23+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -28,7 +28,7 @@ msgstr ""
"\n"
"Liczba kl/s pliku video %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -36,7 +36,7 @@ msgstr ""
"\n"
"Wykadrowany do %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -45,7 +45,7 @@ msgstr ""
"\n"
"Proporcje obrazu %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -53,7 +53,7 @@ msgstr ""
"\n"
"Dodane czarne pasy, aby dopasować do formatu %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -61,7 +61,7 @@ msgstr ""
"\n"
"Przeskalowany do %1x%2"
-#: 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 " (%.2f:1)"
@@ -72,7 +72,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " w %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -94,7 +94,7 @@ msgstr ""
"Długość: $LENGTH\n"
"Rozmiar: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr ""
@@ -106,7 +106,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -122,7 +122,7 @@ msgstr "%1 [film]"
msgid "%1 [video]"
msgstr "%1 [obraz]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", proporcje piksela %.2f:1"
@@ -293,15 +293,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 "Próbkowanie dźwięku zostanie zmienione z %1Hz na %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Próbkowanie dźwięku zostanie zmienione na %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Próbkowanie dźwięku zostanie zmienione"
@@ -375,7 +375,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Anulowane"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
#, fuzzy
msgid "Cannot contain slashes"
msgstr "nie może zawierać ukośników"
@@ -384,7 +384,7 @@ msgstr "nie może zawierać ukośników"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Nie można przetworzyć formatu %1 podczas %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr ""
@@ -392,7 +392,7 @@ msgstr ""
msgid "Centre"
msgstr "Centralny"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Kanały dźwiękowe"
@@ -400,7 +400,7 @@ msgstr "Kanały dźwiękowe"
msgid "Checking content for changes"
msgstr ""
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Sprawdzanie danych obrazu"
@@ -471,7 +471,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "Dodany plik i DCP mają taką samą liczbę kl/s.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Częstotliwość dźwięku dodanego pliku"
@@ -488,80 +488,97 @@ msgstr "Łączone pliki muszą jednocześnie posiadać lub nie posiadać napisó
msgid "Content to be joined must all have or not have video"
msgstr "Łączone pliki muszą jednocześnie posiadać lub nie posiadać obrazu"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "Łączone pliki muszą mieć takie odstępy między liniami napisów."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "Łączone pliki muszą mieć taką samą liczbę kl/s"
-#: 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 ""
"Łączone pliki muszą mieć takie same ustawienia w sekcji \"wypal napisy\"."
-#: 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 ""
"Łączone pliki muszą mieć takie same ustawienia w sekcji \"użyj napisów\"."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Łączone pliki muszą mieć takie samo opóźnienie dźwięku."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "Łączone pliki muszą mieć takie samo wzmocnienie dźwięku."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Łączone pliki muszą mieć takie samo wzmocnienie dźwięku."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+"Łączone pliki muszą mieć takie same ustawienia w sekcji \"wypal napisy\"."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Łączone pliki muszą mieć takią samą konwersję kolorów."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Łączone pliki muszą mieć takie samo kadrowanie."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr "Łączone pliki muszą mieć takie same ustawienia skalowania."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr "Łączone pliki muszą mieć takie same ustawienia skalowania."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Łączone pliki muszą mieć takie same czasy wejścia/wyjścia."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "Łączone pliki muszą mieć taki sam rozmiar obrysu zewnętrznego."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Łączone pliki muszą mieć taki sam rozmiar obrazu."
-#: 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 "Łączone pliki muszą mieć takie samo przesunięcie X napisów."
-#: 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 "Łączone pliki muszą mieć taki sam rozmiar X napisów."
-#: 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 "Łączone pliki muszą mieć takie samo przesunięcie Y napisów."
-#: 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 "Łączone pliki muszą mieć taki sam rozmiar Y napisów."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr "Łączone pliki muszą mieć taki same czasy wejścia/wyjścia."
-#: 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 "Łączone pliki muszą mieć takie odstępy między liniami napisów."
@@ -569,16 +586,16 @@ msgstr "Łączone pliki muszą mieć takie odstępy między liniami napisów."
msgid "Content to be joined must have the same video frame rate"
msgstr "Łączone pliki muszą mieć taką samą liczbę kl/s"
-#: 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 "Łączone pliki muszą mieć taki sam klatkaż."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
#, fuzzy
msgid "Content to be joined must use the same DCP track."
msgstr "Łączone pliki muszą mieć takie same czcionki."
-#: 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 "Łączone pliki muszą mieć takie same czcionki."
@@ -586,7 +603,12 @@ msgstr "Łączone pliki muszą mieć takie same czcionki."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Łączone pliki muszą używać tego samego strumienia napisów."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Łączone pliki muszą mieć takie same czcionki."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Rozdzielczość pliku video %1x%2"
@@ -598,7 +620,7 @@ msgstr "Kopiuj DCP do TMS"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Nieprawidłowe rozmiary plików obrazu w DCP"
@@ -645,7 +667,7 @@ msgstr "Nie udało się otworzyć pobranego archiwum ZIP"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Nie udało się otworzyć pobranego archiwum ZIP"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
#, fuzzy
msgid "Could not open file for writing"
msgstr "nie udało się otworzyć pliku %1 do zapisu (%2)"
@@ -694,7 +716,7 @@ msgstr "2.35 (Scope)"
msgid "DCP XML subtitles"
msgstr "Napisy DCP XML"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "Liczba kl/s DCP"
@@ -716,13 +738,13 @@ msgstr ""
"DCP-o-matic nie mógł otworzyć pliku %1. Plik nie istnieje, lub jest w "
"niewspieranym formacie."
-#: 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."
@@ -733,7 +755,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic nie wspiera już filtru `%1', więc został on wyłączony."
-#: 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 ""
@@ -746,7 +768,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "Usuwanie przeplotu"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -900,19 +922,19 @@ msgstr "Pełny (0-%1)"
msgid "Full frame"
msgstr "Pełna klatka"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Pełna długość dźwięu przy częstotliwości DCP"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Pełna długość próbkowania dźwięku przy częstotliwości kontentu"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Pełna długość klatek obrazu przy częstotliwości DCP"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Pełna długość klatek obrazu przy częstotliwości materiału"
@@ -944,7 +966,7 @@ msgstr "Odszumianie 3D wysokiej jakości"
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 "Hz"
@@ -974,7 +996,7 @@ msgstr "Wystąpił nieznany błąd."
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 "Wysyłanie klucza: $CPL_NAME"
@@ -1006,7 +1028,7 @@ msgstr "Lewy tylny surround"
msgid "Left surround"
msgstr "Lewy surround"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Długość"
@@ -1079,7 +1101,7 @@ msgstr "brakuje wymaganych ustawień %1"
msgid "Monday"
msgstr "Poniedziałek"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1103,7 +1125,7 @@ msgstr "W folderze nie znaleziono obsługiwanych plików."
msgid "Noise reduction"
msgstr "Redukcja szumu"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Brak"
@@ -1296,11 +1318,11 @@ msgstr "Wysyłam wiadomość"
msgid "Short"
msgstr "Krótkometrażowy"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Rozmiar"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Nastąpi zmiana częstotliwości niektórych ścieżek dźwiękowych do %1Hz"
@@ -1323,17 +1345,17 @@ msgid ""
"truncated."
msgstr ""
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
#, fuzzy
msgid "Some of your content needs a KDM"
msgstr "część Twoich materiałów wymaga klucza KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
#, fuzzy
msgid "Some of your content needs an OV"
msgstr "część Twoich materiałów wymaga wersji OV paczki DCP"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stereo"
@@ -1365,7 +1387,7 @@ msgstr "Testowy"
msgid "Text subtitles"
msgstr "Napisy"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1417,7 +1439,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 ""
@@ -1461,7 +1483,7 @@ msgstr ""
"To jest klucz KDM. KDMy powinny być dodane do szyfrowanej paczki DCP przez "
"prawy klik i wybranie \"Dodaj KDM\"."
-#: 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!"
@@ -1469,7 +1491,7 @@ msgstr ""
"Projekt został utworzony przy pomocy nowszej wersji DCP-o-matic i nie może "
"być otwarty w tej wersji. Przepraszamy!"
-#: 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 "
@@ -1525,7 +1547,7 @@ msgstr "nieznany"
msgid "Unknown error"
msgstr "Nieznany błąd"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Nieznany rodzaj pliku dźwiękowego (%1)"
@@ -1650,7 +1672,7 @@ msgstr ""
"Używasz %1 plików, które zdają się być plikami .vob z DVD. Powinieneś je "
"połączyć w jeden plik, by mieć pewność płynnych przejść w obrazie."
-#: 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."
@@ -1670,7 +1692,7 @@ msgstr ""
"Wskazana przez Ciebie czcionka ma rozmiar większy niż 640kB. "
"Najprawdopodobniej spowoduje to problemy podczas odtwarzania."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
#, fuzzy
msgid "You must add some content to the DCP before creating it"
msgstr "musisz najpierw dodać jakieś pliki zanim utworzysz DCP"
@@ -1742,11 +1764,11 @@ msgstr "minął czas połączenia"
msgid "connecting"
msgstr "łączenie"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "kontener"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "typ materiału"
@@ -1758,12 +1780,12 @@ msgstr "kopiowanie %1"
msgid "could not find stream information"
msgstr "nie udało się znaleźć informacji o strumieniu"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "nie udało się przenieść dźwięku do DCP (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "nie udało się przenieść dźwięku do DCP (%1)"
@@ -1820,79 +1842,79 @@ msgid "h"
msgstr "g"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
#, fuzzy
msgid "it does not have closed captions in all its reels."
msgstr "DCP nie ma dźwięku w żadnej rolce."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:739
+#: src/lib/dcp_content.cc:736
#, fuzzy
msgid "it does not have open subtitles in all its reels."
msgstr "DCP nie ma napisów w żadnej rolce."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:706
+#: src/lib/dcp_content.cc:703
#, fuzzy
msgid "it does not have sound in all its reels."
msgstr "DCP nie ma dźwięku w żadnej rolce."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:610
+#: src/lib/dcp_content.cc:607
#, fuzzy
msgid "it has a different frame rate to the film."
msgstr "Liczba kl/s w Projekcie i DCP różnią się."
#. / 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
#, fuzzy
msgid "it is 2K and the film is 4K."
msgstr "Projekt jest ustawiony na Interop, podczas gdy DCP jest SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:664
+#: src/lib/dcp_content.cc:661
#, fuzzy
msgid "it is 4K and the film is 2K."
msgstr "Projekt jest ustawiony na Interop, podczas gdy DCP jest SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:598
+#: src/lib/dcp_content.cc:595
#, fuzzy
msgid "it is Interop and the film is set to SMPTE."
msgstr "Projekt jest ustawiony na Interop, podczas gdy DCP jest SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:602
+#: src/lib/dcp_content.cc:599
#, fuzzy
msgid "it is SMPTE and the film is set to Interop."
msgstr "Projekt jest ustawiony na SMPTE, podczas gdy DCP jest Interop."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:712
+#: src/lib/dcp_content.cc:709
#, fuzzy
msgid "it overlaps other audio content; remove the other content."
msgstr "Inna ścieżka dźwiękowa pokrywa się z tym DCP; usuń ją."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:770
+#: src/lib/dcp_content.cc:767
#, fuzzy
msgid "it overlaps other text content; remove the other content."
msgstr "Inna ścieżka obrazu pokrywa się z tym DCP; usuń ją."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:677
+#: src/lib/dcp_content.cc:674
#, fuzzy
msgid "it overlaps other video content; remove the other content."
msgstr "Inna ścieżka obrazu pokrywa się z tym DCP; usuń ją."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:633
+#: src/lib/dcp_content.cc:630
#, fuzzy
msgid ""
"its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1902,7 +1924,7 @@ msgstr ""
"rolek na 'podziel zgodnie z zawartością paczki' w zakładce 'DCP'."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:672
+#: src/lib/dcp_content.cc:669
#, fuzzy
msgid "its video frame size differs from the film's."
msgstr "Rozdzielczość obrazu w Projekcie rożni się od tej w DCP."
@@ -1916,19 +1938,19 @@ msgstr "m"
msgid "moving"
msgstr "przenoszenie"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "nazwa"
#. / 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."
@@ -1943,7 +1965,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "brakuje części materiałów"
@@ -1955,7 +1977,7 @@ msgstr "stopklatka"
msgid "unknown"
msgstr "nieznany"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "klatki obrazu"
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index ddc8051d0..347128ee8 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2018-01-15 16:19-0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.5\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -26,7 +26,7 @@ msgstr ""
"\n"
"Taxa de quadros do conteúdo %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -34,7 +34,7 @@ msgstr ""
"\n"
"Redimensionado para %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -43,7 +43,7 @@ msgstr ""
"\n"
"Proporções de exibição %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -51,7 +51,7 @@ msgstr ""
"\n"
"Preenchido com barras pretas %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -59,7 +59,7 @@ msgstr ""
"\n"
"Redimensionado para %1x%2"
-#: 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 " (%.2f:1)"
@@ -70,7 +70,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " em %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -92,7 +92,7 @@ msgstr ""
"Duração: $LENGTH\n"
"Tamanho: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Dolby Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -120,7 +120,7 @@ msgstr "%1 [movie]"
msgid "%1 [video]"
msgstr "%1 [video]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", aspect ratio do pixel %.2f:1"
@@ -292,15 +292,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 "O áudio será convertido de %1Hz para %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "O áudio será convertido para %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "O áudio não terá sua taxa de amostragem alterada"
@@ -374,7 +374,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Cancelado"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
#, fuzzy
msgid "Cannot contain slashes"
msgstr "não pode conter barras"
@@ -383,7 +383,7 @@ msgstr "não pode conter barras"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Impossível processar formato de pixel %1 durante %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr ""
@@ -391,7 +391,7 @@ msgstr ""
msgid "Centre"
msgstr "Central"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Canais"
@@ -399,7 +399,7 @@ msgstr "Canais"
msgid "Checking content for changes"
msgstr ""
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Verificando dados existentes de imagem"
@@ -470,7 +470,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "O conteúdo e o DCP tem a mesma taxa de quadros\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Taxa de amostragem de áudio do conteúdo"
@@ -490,93 +490,113 @@ msgid "Content to be joined must all have or not have video"
msgstr ""
"Todos os conteúdos a serem concatenados devem conter ou não conter vídeo"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"O conteúdo a ser concatenado deve ter o mesmo espaçamento de linha de "
+"legenda."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "O conteúdo a ser concatenado deve ter a mesma taxa de quadros"
-#: 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 ""
"O conteúdo a ser concatenado deve ter a mesma configuração de 'queimar "
"legendas na imagem'."
-#: 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 ""
"O conteúdo a ser concatenado deve ter a mesma configuração em 'usar "
"legendas'."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "O conteúdo a ser concatenado deve ter o mesmo atraso de áudio."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "O conteúdo a ser concatenado deve ter o mesmo ganho de áudio."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "O conteúdo a ser concatenado deve ter o mesmo ganho de áudio."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+"O conteúdo a ser concatenado deve ter a mesma configuração de 'queimar "
+"legendas na imagem'."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "O conteúdo a ser concatenado deve ter a mesma conversão de cor."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "O conteúdo a ser concatenado deve ter o mesmo recorte de imagem."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr ""
"O conteúdo a ser concatenado deve ter o mesmo redimensionamento de imagem."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr ""
"O conteúdo a ser concatenado deve ter o mesmo redimensionamento de imagem."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr ""
"O conteúdo a ser concatenado deve ter as mesmas 'fade in' e 'fade out'."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "O conteúdo a ser concatenado deve ter a mesma largura de borda."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "O conteúdo a ser concatenado deve ter o mesmo tamanho de imagem."
-#: 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 ""
"O conteúdo a ser concatenado deve ter o mesmo reposicionamento de legenda no "
"eixo X."
-#: 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 ""
"O conteúdo a ser concatenado deve ter o mesmo redimensionamento de legenda "
"no eixo X."
-#: 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 ""
"O conteúdo a ser concatenado deve ter o mesmo reposicionamento de legenda no "
"eixo Y."
-#: 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 ""
"O conteúdo a ser concatenado deve ter o mesmo redimensionamento de legenda "
"no eixo Y."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr "O conteúdo a ser concatenado deve ter os mesmos fades de legendas."
-#: 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 ""
"O conteúdo a ser concatenado deve ter o mesmo espaçamento de linha de "
@@ -586,16 +606,16 @@ msgstr ""
msgid "Content to be joined must have the same video frame rate"
msgstr "O conteúdo a ser concatenado deve ter a mesma taxa de quadros"
-#: 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 "O conteúdo a ser concatenado deve ter o mesmo tipo de quadro."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
#, fuzzy
msgid "Content to be joined must use the same DCP track."
msgstr "O conteúdo a ser concatenado deve usar as mesmas fontes."
-#: 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 "O conteúdo a ser concatenado deve usar as mesmas fontes."
@@ -603,7 +623,12 @@ msgstr "O conteúdo a ser concatenado deve usar as mesmas fontes."
msgid "Content to be joined must use the same subtitle stream."
msgstr "O conteúdo a ser concatenado deve usar a mesma faixa de legendas."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "O conteúdo a ser concatenado deve usar as mesmas fontes."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "O conteúdo tem %1x%2"
@@ -615,7 +640,7 @@ msgstr "Copiar DCP para TMS"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Tamanhos de conteúdo inconsistentes no DCP"
@@ -662,7 +687,7 @@ msgstr "Impossível abrir arquivo ZIP baixado"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Impossível abrir arquivo ZIP baixado"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
#, fuzzy
msgid "Could not open file for writing"
msgstr "não foi possível abrir o arquivo %1 para gravação (%2)"
@@ -711,7 +736,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "Legendas XML do DCP"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "Taxa de quadros do DCP"
@@ -732,13 +757,13 @@ msgstr ""
"O DCP-o-matic não pôde abrir o arquivo %1 (%2). Talvez o arquivo não exista "
"ou tenha um formato não suportado."
-#: 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."
@@ -750,7 +775,7 @@ msgid ""
msgstr ""
"O DCP-o-matic não aceita mais o filtro `%1', portanto ele foi desativado."
-#: 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 ""
@@ -763,7 +788,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "Desentrelaçamento de conteúdo"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -917,19 +942,19 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Tela cheia"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Duração total em amostras de áudio na taxa do DCP"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Duração total em amostras de áudio na taxa do conteúdo"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Duração total em quadros de conteúdo na taxa do DCP"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Duração total em quadros de conteúdo na taxa do conteúdo"
@@ -961,7 +986,7 @@ msgstr "Redutor de ruído 3D de alta qualidade"
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 "Hz"
@@ -991,7 +1016,7 @@ msgstr "Erro desconhecido."
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 "Entrega de KDM: $CPL_NAME"
@@ -1023,7 +1048,7 @@ msgstr "Surround traseiro esquerdo"
msgid "Left surround"
msgstr "Surround esquerdo"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Duração"
@@ -1096,7 +1121,7 @@ msgstr "falta configuração obrigatória %1"
msgid "Monday"
msgstr ""
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1120,7 +1145,7 @@ msgstr "Não foram encontradas imagens válidas na pasta."
msgid "Noise reduction"
msgstr "Redução de ruído"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Nenhum"
@@ -1313,11 +1338,11 @@ msgstr "Enviando email"
msgid "Short"
msgstr "Curta-metragem"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Tamanho"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Alguns áudios serão reamostrados para %1Hz"
@@ -1340,17 +1365,17 @@ msgid ""
"truncated."
msgstr ""
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
#, fuzzy
msgid "Some of your content needs a KDM"
msgstr "uma parte do seu conteúdo necessita de KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
#, fuzzy
msgid "Some of your content needs an OV"
msgstr "uma parte do seu conteúdo necessita de uma versão original (OV)"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stereo"
@@ -1382,7 +1407,7 @@ msgstr "Teste"
msgid "Text subtitles"
msgstr "Legendas em texto"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1434,7 +1459,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 ""
@@ -1479,7 +1504,7 @@ msgstr ""
"Este arquivo é um KDM. KDMs devem ser adicionados a conteúdos DCPs clicando-"
"se com o botão direito no conteúdo e escolhendo \"Adicionar KDM\"."
-#: 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!"
@@ -1488,7 +1513,7 @@ msgstr ""
"ser carregado nesta versão. Desculpe-nos, e considere instalar uma versão "
"mais recente!"
-#: 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 "
@@ -1545,7 +1570,7 @@ msgstr "desconhecido"
msgid "Unknown error"
msgstr "Erro desconhecido"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato de amostragem de áudio desconhecido (%1)"
@@ -1670,7 +1695,7 @@ msgstr ""
"Você tem %1 arquivos que parecem ser arquivos VOB de um DVD. É recomendado "
"que você os concatene previamente para garantir uma reprodução sem cortes."
-#: 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."
@@ -1690,7 +1715,7 @@ msgstr ""
"Você especificou um arquivo de fonte que tem mais de 640kB. Isso muito "
"provavelmente causará problemas na reprodução."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
#, fuzzy
msgid "You must add some content to the DCP before creating it"
msgstr "você precisa adicionar conteúdo ao DCP antes de criá-lo"
@@ -1765,11 +1790,11 @@ msgstr "connect timed out"
msgid "connecting"
msgstr "conectando"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "container"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "tipo de conteúdo"
@@ -1781,12 +1806,12 @@ msgstr "copiando %1"
msgid "could not find stream information"
msgstr "não foi possível encontrar informação do stream"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "não foi possível mover os arquivos de áudio para o DCP (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "não foi possível mover os arquivos de áudio para o DCP (%1)"
@@ -1843,79 +1868,79 @@ msgid "h"
msgstr "h"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
#, fuzzy
msgid "it does not have closed captions in all its reels."
msgstr "O DCP não tem som em todos os rolos."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:739
+#: src/lib/dcp_content.cc:736
#, fuzzy
msgid "it does not have open subtitles in all its reels."
msgstr "O DCP não tem legendas em todos os rolos."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:706
+#: src/lib/dcp_content.cc:703
#, fuzzy
msgid "it does not have sound in all its reels."
msgstr "O DCP não tem som em todos os rolos."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:610
+#: src/lib/dcp_content.cc:607
#, fuzzy
msgid "it has a different frame rate to the film."
msgstr "O filme tem uma taxa de quadros diferente deste DCP."
#. / 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
#, fuzzy
msgid "it is 2K and the film is 4K."
msgstr "O filme está configurado como Interop e este DCP é SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:664
+#: src/lib/dcp_content.cc:661
#, fuzzy
msgid "it is 4K and the film is 2K."
msgstr "O filme está configurado como Interop e este DCP é SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:598
+#: src/lib/dcp_content.cc:595
#, fuzzy
msgid "it is Interop and the film is set to SMPTE."
msgstr "O filme está configurado como Interop e este DCP é SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:602
+#: src/lib/dcp_content.cc:599
#, fuzzy
msgid "it is SMPTE and the film is set to Interop."
msgstr "O filme está configurado como SMPTE e este DCP é Interop."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:712
+#: src/lib/dcp_content.cc:709
#, fuzzy
msgid "it overlaps other audio content; remove the other content."
msgstr "Há outros conteúdos de áudio sobrepostos neste DCP. Remova-os."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:770
+#: src/lib/dcp_content.cc:767
#, fuzzy
msgid "it overlaps other text content; remove the other content."
msgstr "Há outros conteúdos de vídeo sobrepostos neste DCP. Remova-os."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:677
+#: src/lib/dcp_content.cc:674
#, fuzzy
msgid "it overlaps other video content; remove the other content."
msgstr "Há outros conteúdos de vídeo sobrepostos neste DCP. Remova-os."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:633
+#: src/lib/dcp_content.cc:630
#, fuzzy
msgid ""
"its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1925,7 +1950,7 @@ msgstr ""
"'Rolos' em 'Dividir por arquivo de conteúdo'."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:672
+#: src/lib/dcp_content.cc:669
#, fuzzy
msgid "its video frame size differs from the film's."
msgstr "O tamanho de quadro do vídeo difere daquele do DCP."
@@ -1939,19 +1964,19 @@ msgstr "m"
msgid "moving"
msgstr "movendo"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "nome"
#. / 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."
@@ -1966,7 +1991,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "uma parte do seu conteúdo está faltando"
@@ -1978,7 +2003,7 @@ msgstr "imagem estática"
msgid "unknown"
msgstr "desconhecido"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "quadros de vídeo"
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 97aaff8d3..4f741b048 100644
--- a/src/lib/po/pt_PT.po
+++ b/src/lib/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic PORTUGUESE (Portugal)\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: 2016-03-19 18:19+0000\n"
"Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
"Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 1.8.7.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, fuzzy, c-format
msgid ""
"\n"
@@ -27,7 +27,7 @@ msgstr ""
"\n"
"Cadência de fotogramas do conteúdo %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
#, fuzzy
msgid ""
"\n"
@@ -36,7 +36,7 @@ msgstr ""
"\n"
"Recortado para %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, fuzzy, c-format
msgid ""
"\n"
@@ -45,7 +45,7 @@ msgstr ""
"\n"
"Rácio do ecrã %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
#, fuzzy
msgid ""
"\n"
@@ -54,7 +54,7 @@ msgstr ""
"\n"
"Preenchido com negro para caber no contentor %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
#, fuzzy
msgid ""
"\n"
@@ -63,7 +63,7 @@ msgstr ""
"\n"
"Redimensionado para %1x%2"
-#: 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 ""
@@ -74,7 +74,7 @@ msgstr ""
msgid " on %1"
msgstr ""
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -87,7 +87,7 @@ msgid ""
"Size: $SIZE\n"
msgstr ""
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr ""
@@ -100,7 +100,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -117,7 +117,7 @@ msgstr "%1 [movie]"
msgid "%1 [video]"
msgstr "%1 [movie]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, fuzzy, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", rácio de pixeis %.2f:1"
@@ -278,15 +278,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 "A taxa de amostragem será alterada de %1Hz para %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "A taxa de amostragem será alterada para %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "A taxa de amostragem será alterada"
@@ -361,7 +361,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Cancelado"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
#, fuzzy
msgid "Cannot contain slashes"
msgstr "não pode conter barras"
@@ -370,7 +370,7 @@ msgstr "não pode conter barras"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Impossível manusear o formato de pixeis %1 durante %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
msgid "Centre"
msgstr "Central"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Canais"
@@ -386,7 +386,7 @@ msgstr "Canais"
msgid "Checking content for changes"
msgstr ""
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "A verificar dados de imagem existentes"
@@ -458,7 +458,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "O conteúdo e o DCP têm a mesma cadência de fotogramas.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
#, fuzzy
msgid "Content audio sample rate"
msgstr "Cadência de fotogramas do conteúdo de áudio"
@@ -478,83 +478,100 @@ msgstr "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
msgid "Content to be joined must all have or not have video"
msgstr "O conteúdo a ser unido deve ter os mesmos fades."
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "O conteúdo a ser unido deve ter a mesma cadência de fotogramas."
-#: 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 ""
"O conteúdo a ser unido deve ter a mesma configuração 'gravar legendas'."
-#: 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 "O conteúdo a ser unido deve ter a mesma configuração 'usar legendas'."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "O conteúdo a ser unido deve ter o mesmo atraso de áudio."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "O conteúdo a ser unido deve ter o mesmo ganho de áudio."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "O conteúdo a ser unido deve ter o mesmo ganho de áudio."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+"O conteúdo a ser unido deve ter a mesma configuração 'gravar legendas'."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "O conteúdo a ser unido deve ter a mesma conversão de cor."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "O conteúdo a ser unido deve ter o mesmo recorte."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr ""
"O conteúdo a ser unido deve ter as mesmas definições de redimensionamento."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr ""
"O conteúdo a ser unido deve ter as mesmas definições de redimensionamento."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "O conteúdo a ser unido deve ter os mesmos fades."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
#, fuzzy
msgid "Content to be joined must have the same outline width."
msgstr "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "O conteúdo a ser unido deve ter o mesmo tamanho de imagem."
-#: 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 "O conteúdo a ser unido deve ter o mesmo alinhamento X nas legendas."
-#: 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 "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
-#: 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 "O conteúdo a ser unido deve ter o mesmo alinhamento Y nas legendas."
-#: 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 "O conteúdo a ser unido deve ter a mesma escala Y nas legendas."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
#, fuzzy
msgid "Content to be joined must have the same subtitle fades."
msgstr "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
-#: src/lib/text_content.cc:273
+#: src/lib/text_content.cc:285
#, fuzzy
msgid "Content to be joined must have the same subtitle line spacing."
msgstr "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
@@ -564,16 +581,16 @@ msgstr "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
msgid "Content to be joined must have the same video frame rate"
msgstr "O conteúdo a ser unido deve ter a mesma cadência de fotogramas."
-#: 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 "O conteúdo a ser unido deve ter o mesmo tipo de fotogramas de vídeo."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
#, fuzzy
msgid "Content to be joined must use the same DCP track."
msgstr "O conteúdo a ser unido deve usar os mesmos tipos de letra."
-#: 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 "O conteúdo a ser unido deve usar os mesmos tipos de letra."
@@ -581,7 +598,12 @@ msgstr "O conteúdo a ser unido deve usar os mesmos tipos de letra."
msgid "Content to be joined must use the same subtitle stream."
msgstr "O conteúdo a ser unido deve usar o mesmo fluxo de legendas."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "O conteúdo a ser unido deve usar os mesmos tipos de letra."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "O vídeo do conteúdo tem %1x%2"
@@ -593,7 +615,7 @@ msgstr "Copiar DCP para TMS"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Dimensões de vídeo do DCP inválidas"
@@ -640,7 +662,7 @@ msgstr "Não foi possível abrir o ficheiro ZIP descarregado"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Não foi possível abrir o ficheiro ZIP descarregado"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
#, fuzzy
msgid "Could not open file for writing"
msgstr "não foi possível abrir o ficheiro para leitura"
@@ -692,7 +714,7 @@ msgstr "Scope"
msgid "DCP XML subtitles"
msgstr "Legendas XML DCP"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
#, fuzzy
msgid "DCP sample rate"
msgstr "Cadência de fotogramas do DCP"
@@ -715,13 +737,13 @@ msgstr ""
"O DCP-o-matic não conseguiu abrir o ficheiro %1. Talvez não exista ou está "
"num formato inesperado."
-#: 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."
@@ -732,7 +754,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "O DCP-o-matic já não suporta o filtro '%1', e este foi desactivado."
-#: 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 ""
@@ -745,7 +767,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "A Desentrelaçar"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -901,21 +923,21 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
#, fuzzy
msgid "Full length in audio samples at DCP rate"
msgstr "Duração total dos fotogramas de audio à cadência do DCP"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
#, fuzzy
msgid "Full length in audio samples at content rate"
msgstr "Duração total dos fotogramas de audio à cadência do conteúdo"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Duração total dos fotogramas de vídeo à cadência do DCP"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Duração total dos fotogramas de vídeo à cadência do conteúdo"
@@ -948,7 +970,7 @@ msgstr "Remoção de ruido 3D de alta qualidade"
msgid "Horizontal flip"
msgstr "Filtre dé-bloc horizontal"
-#: 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 "Hz"
@@ -978,7 +1000,7 @@ msgstr "A causa do erro não é conhecida."
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 "Envio de chaves KDM: $CPL_NAME"
@@ -1010,7 +1032,7 @@ msgstr "Esquerdo traseiro surround"
msgid "Left surround"
msgstr "Esquerdo surround"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Duração"
@@ -1083,7 +1105,7 @@ msgstr "falta definição necessária %1"
msgid "Monday"
msgstr "Segunda-feira"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr ""
@@ -1107,7 +1129,7 @@ msgstr "Não foram encontrados ficheiros de imagem válidos na pasta."
msgid "Noise reduction"
msgstr "Redução de ruído"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr ""
@@ -1304,11 +1326,11 @@ msgstr "A enviar email"
msgid "Short"
msgstr "Curta-metragem"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Tamanho"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "Algum áudio vais ser alterado para %1Hz"
@@ -1331,15 +1353,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 ""
@@ -1371,7 +1393,7 @@ msgstr "Teste"
msgid "Text subtitles"
msgstr "Legendas de texto"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1424,7 +1446,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 ""
@@ -1467,7 +1489,7 @@ 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!"
@@ -1475,7 +1497,7 @@ msgstr ""
"Este filme foi criado com uma versão mais recente do DCP-o-matic, e não pode "
"ser carregado nesta. Desculpe!"
-#: 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 "
@@ -1531,7 +1553,7 @@ msgstr "desconhecido"
msgid "Unknown error"
msgstr "Erro desconhecido"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato de amostragem áudio desconhecido (%1)"
@@ -1640,7 +1662,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."
@@ -1658,7 +1680,7 @@ msgid ""
"likely to cause problems on playback."
msgstr ""
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
#, fuzzy
msgid "You must add some content to the DCP before creating it"
msgstr "Deve adicionar algum conteúdo ao DCP antes de o criar"
@@ -1725,11 +1747,11 @@ msgstr "Ligação expirou"
msgid "connecting"
msgstr "A ligar"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "contentor"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "tipo de conteúdo"
@@ -1741,12 +1763,12 @@ msgstr "a copiar %1"
msgid "could not find stream information"
msgstr "não foi possível encontrar a informação do fluxo"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "não foi possível enviar o áudio para o DCP (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "não foi possível enviar o áudio para o DCP (%1)"
@@ -1803,74 +1825,74 @@ msgid "h"
msgstr "h"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
#, fuzzy
msgid "it does not have closed captions in all its reels."
msgstr "Não há nenhuma bobina de audio no DCP"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:739
+#: src/lib/dcp_content.cc:736
#, fuzzy
msgid "it does not have open subtitles in all its reels."
msgstr "Não há nenhuma bobina de legendas no DCP"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:706
+#: src/lib/dcp_content.cc:703
#, fuzzy
msgid "it does not have sound in all its reels."
msgstr "Não há nenhuma bobina de audio no DCP"
#. / 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
#, fuzzy
msgid "it overlaps other audio content; remove the other content."
msgstr "Existe outro conteúdo áudio sobreposto a este DCP; remova-o."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:770
+#: src/lib/dcp_content.cc:767
#, fuzzy
msgid "it overlaps other text content; remove the other content."
msgstr "Existe outro conteúdo video sobreposto a este DCP; remova-o."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:677
+#: src/lib/dcp_content.cc:674
#, fuzzy
msgid "it overlaps other video content; remove the other content."
msgstr "Existe outro conteúdo video sobreposto a este DCP; remova-o."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:633
+#: src/lib/dcp_content.cc:630
#, fuzzy
msgid ""
"its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1880,7 +1902,7 @@ msgstr ""
"'Bobinas' para 'Dividir por conteúdo de vídeo'."
#. / 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 ""
@@ -1893,19 +1915,19 @@ msgstr "m"
msgid "moving"
msgstr "a mover"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "nome"
#. / 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."
@@ -1920,7 +1942,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr ""
@@ -1932,7 +1954,7 @@ msgstr "imagem estática"
msgid "unknown"
msgstr "desconhecido"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "fotogramas de vídeo"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 3aee4f261..295ccc406 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2019-03-27 00:34+0200\n"
"Last-Translator: Igor Voytovich <i.voyt@dualvfilms.com>\n"
"Language-Team: Russian\n"
@@ -15,7 +15,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -24,7 +24,7 @@ msgstr ""
"\n"
"Частота кадров контента: %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -32,7 +32,7 @@ msgstr ""
"\n"
"Размер при кадрировании: %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -41,7 +41,7 @@ msgstr ""
"\n"
"Соотношение сторон %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -49,7 +49,7 @@ msgstr ""
"\n"
"Заполнено черным для подгонки контейнера %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -57,7 +57,7 @@ msgstr ""
"\n"
"Размер при масштабировании: %1x%2"
-#: 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 " (%.2f:1)"
@@ -68,7 +68,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " на %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -90,7 +90,7 @@ msgstr ""
"Длительность: $LENGTH\n"
"Размер: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$JOB_NAME: $JOB_STATUS"
@@ -102,7 +102,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -118,7 +118,7 @@ msgstr "%1 [видео]"
msgid "%1 [video]"
msgstr "%1 [видео]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", соотношение сторон пикселей %.2f:1"
@@ -287,15 +287,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 "Аудио будет ресэмплировано с %1 Гц на %2 Гц"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Аудио будет ресэмплировано на %1 Гц"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Аудио не будет ресэмплировано"
@@ -369,7 +369,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Отменено"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "Не может содержать слэши"
@@ -377,7 +377,7 @@ msgstr "Не может содержать слэши"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Невозможно обработать формат пикселя %1 во время %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr "Нельзя создать KDM т.к. этот проект не зашифрован."
@@ -385,7 +385,7 @@ msgstr "Нельзя создать KDM т.к. этот проект не заш
msgid "Centre"
msgstr "Центральный"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Каналы"
@@ -393,7 +393,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 "Проверка данных изображения"
@@ -461,7 +461,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "У контента и DCP одинаковая частота кадров.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Скорость аудио-контента"
@@ -481,92 +481,111 @@ 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
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"Для присоединения контента должен быть одинаковый интервал между рядами "
+"субтитров."
+
+#: src/lib/video_content.cc:207
#, fuzzy
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
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Для присоединения контента должно быть одинаковое усиление аудио."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+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
#, fuzzy
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
#, fuzzy
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 ""
"Для присоединения контента должен быть одинаковый интервал между рядами "
@@ -576,15 +595,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 "Для присоединения контента должна использоваться та же DCP дорожка."
-#: 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 "Для присоединения контента должен использоваться одинаковый шрифт."
@@ -592,7 +611,12 @@ 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
+#, fuzzy
+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 "Разрешение контента: %1x%2"
@@ -604,7 +628,7 @@ msgstr "Копировать DCP на TMS (Theater Management System)"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Несоответствие размера видео в DCP"
@@ -649,7 +673,7 @@ msgstr "Не удалось открыть загруженный ZIP-архив
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Не удалось открыть загруженный ZIP-файл (%1:%2: %3)"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
msgid "Could not open file for writing"
msgstr "Не удалось открыть файл для записи"
@@ -697,7 +721,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "DCP XML субтитры"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "Частота кадров DCP"
@@ -718,7 +742,7 @@ msgstr ""
"DCP-o-matic не удалось открыть файл %1 (%2). Возможно он не существует или "
"имеет неожиданный формат."
-#: 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."
@@ -727,7 +751,7 @@ msgstr ""
"Пожалуйста, посмотрите на эти настройки, чтобы убедиться, что это то, чего "
"вы хотите."
-#: src/lib/film.cc:1508
+#: src/lib/film.cc:1525
#, fuzzy
msgid ""
"DCP-o-matic had to change your settings so that the film's frame rate is the "
@@ -743,7 +767,7 @@ msgid ""
msgstr ""
"DCP-o-matic больше не поддерживает фильтр `%1', поэтому он был выключен."
-#: 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 "Уведомление DCP-o-matic"
@@ -756,7 +780,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "Деинтерлейсинг"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -906,19 +930,19 @@ msgstr "Полный (0-%1)"
msgid "Full frame"
msgstr "FULL (2048x1080)"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Полная длина аудио-сэмплов на скорости DCP"
-#: 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 "Полная длина видео-кадров на скорости DCP"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Полная длина видео-кадров на скорости контента"
@@ -950,7 +974,7 @@ msgstr "Высококачественный подавитель шума 3D"
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 "Гц"
@@ -982,7 +1006,7 @@ msgstr "Неизвестно, что вызвало эту ошибку."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "Назначение KDM: $CPL_NAME"
@@ -1014,7 +1038,7 @@ msgstr "Левый тыловой surround"
msgid "Left surround"
msgstr "Левый surround"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Длительность"
@@ -1086,7 +1110,7 @@ msgstr "Отсутствует обязательная настройка %1"
msgid "Monday"
msgstr "Понедельник"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Моно"
@@ -1110,7 +1134,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 "Ничего"
@@ -1304,11 +1328,11 @@ msgstr "Отправка почты"
msgid "Short"
msgstr "SHR (Короткометражный фильм)"
-#: 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 "Некоторое аудио будет ресемплировано на %1 Гц"
@@ -1340,15 +1364,15 @@ msgid ""
"truncated."
msgstr ""
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "Часть вашего контента требует KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "Часть вашего контента требует OV"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Стерео"
@@ -1380,7 +1404,7 @@ msgstr "TST (Тестовый)"
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 ""
@@ -1437,7 +1461,7 @@ msgstr ""
"вашему контенту, при условии, что ваши целевая проекционная система "
"поддерживает выбранную вами скорость DCP."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "В данном DCP нет видео"
@@ -1484,7 +1508,7 @@ msgstr ""
"Этот файл - ключ (KDM). Ключи добавляются к DCP нажатием правой клавиши на "
"контент и выбором \"Добавить KDM\" в контекстном меню."
-#: 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!"
@@ -1492,7 +1516,7 @@ msgstr ""
"Проект создан более новой версией DCP-o-matic и не быть загружен этой "
"версией. Извините!"
-#: 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 "
@@ -1548,7 +1572,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 "Нераспознанный формат аудио (%1)"
@@ -1674,7 +1698,7 @@ 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."
@@ -1695,7 +1719,7 @@ msgstr ""
"Вы выбрали шрифт, размер которого больше 640 кБ. Весьма вероятно, что это "
"вызовет проблемы при воспроизведении."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "Вам необходимо добавить контент в DCP перед его созданием"
@@ -1771,11 +1795,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 "тип контента"
@@ -1787,12 +1811,12 @@ msgstr "копирование %1"
msgid "could not find stream information"
msgstr "не удалось найти информацию о потоке"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "не удалось переместить аудио в DCP-пакет (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "не удалось переместить аудио в DCP-пакет (%1)"
@@ -1849,68 +1873,68 @@ 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 "частота кадров проекта отличается от частоты кадров DCP."
#. / 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 "является 2K, а проект - 4K."
#. / 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 "является 4K, а проект - 2K."
#. / 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 "является в Interop , а проект настроен как SMPTE."
#. / 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 "является SMPTE, а этот проект настроен как Interop."
#. / 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'."
@@ -1919,7 +1943,7 @@ 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 "размер кадра видео в проекте отличается от размера видео DCP."
@@ -1932,19 +1956,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."
@@ -1959,7 +1983,7 @@ msgstr "с"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "часть вашего контента отсутствует"
@@ -1971,7 +1995,7 @@ msgstr "статичный"
msgid "unknown"
msgstr "неизвестно"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "видеокадры"
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index 0a05c4901..6a92b8e7e 100644
--- a/src/lib/po/sk_SK.po
+++ b/src/lib/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2016-01-06 00:23+0100\n"
"Last-Translator: Tomáš Hlaváč\n"
"Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 1.8.6\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, fuzzy, c-format
msgid ""
"\n"
@@ -27,7 +27,7 @@ msgstr ""
"\n"
"Snímacia frekvencia obsahu %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
#, fuzzy
msgid ""
"\n"
@@ -36,7 +36,7 @@ msgstr ""
"\n"
"Zmenšené na %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, fuzzy, c-format
msgid ""
"\n"
@@ -45,7 +45,7 @@ msgstr ""
"\n"
"Pomer strán displeja %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
#, fuzzy
msgid ""
"\n"
@@ -54,7 +54,7 @@ msgstr ""
"\n"
"Vyplnené čiernou, aby sa zmestil do kontajnera %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
#, fuzzy
msgid ""
"\n"
@@ -63,7 +63,7 @@ msgstr ""
"\n"
"Zmenšené na %1x%2"
-#: 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 ""
@@ -74,7 +74,7 @@ msgstr ""
msgid " on %1"
msgstr ""
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -87,7 +87,7 @@ msgid ""
"Size: $SIZE\n"
msgstr ""
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr ""
@@ -100,7 +100,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -117,7 +117,7 @@ msgstr "%1 [video]"
msgid "%1 [video]"
msgstr "%1 [video]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, fuzzy, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", pomer strán obrazových bodov %.2f:1"
@@ -278,15 +278,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 "Zvuk bude re-samplovaný z %1Hz na %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Zvuk bude re-samplovaný na %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Zvuk nebude resamplovaný"
@@ -360,7 +360,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Zrušené"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
#, fuzzy
msgid "Cannot contain slashes"
msgstr "nemôže obsahovať lomky"
@@ -369,7 +369,7 @@ msgstr "nemôže obsahovať lomky"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Nemôžem spracovať formát pixelu %1 počas %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
#, fuzzy
msgid "Channels"
msgstr "Zvukové kanály"
@@ -386,7 +386,7 @@ msgstr "Zvukové kanály"
msgid "Checking content for changes"
msgstr ""
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Kontrolujem existujúce video dáta"
@@ -458,7 +458,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "Obsah a DCP majú rovnaký bitrate,\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
#, fuzzy
msgid "Content audio sample rate"
msgstr "Snímacia frekvencia obsahu"
@@ -478,80 +478,96 @@ msgstr "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
msgid "Content to be joined must all have or not have video"
msgstr "Aby sa spojil obsah, musí mať rovnaké miznutie."
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "Aby sa spojil obsah, musí mať rovnaký počet obrázkov za sekundu."
-#: 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 "Aby sa spojil obsah, musí mať tie isté 'vypálené titulky' nastavenia."
-#: 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 "Aby sa spojil obsah, musí mať tie isté 'použiť titulky' nastavenia."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr "Aby sa spojil obsah, musí mať to isté oneskorenie zvuku."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr "Aby sa spojil obsah, musí mať tú istú hlasitosť zvuku."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Aby sa spojil obsah, musí mať tú istú hlasitosť zvuku."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr "Aby sa spojil obsah, musí mať tie isté 'vypálené titulky' nastavenia."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr "Aby sa spojil obsah, musí mať tú istú konverziu farieb."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Aby sa spojil obsah, musí mať to isté orezanie."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr "Aby sa spojil obsah, musí mať rovnaké nastavenia orezania."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr "Aby sa spojil obsah, musí mať rovnaké nastavenia orezania."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Aby sa spojil obsah, musí mať rovnaké miznutie."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
#, fuzzy
msgid "Content to be joined must have the same outline width."
msgstr "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Aby sa spojil obsah, musí mať rovnakú veľkosť obrazu."
-#: 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 "Aby sa spojil obsah, musí mať rovnaký titulkový X offset. "
-#: 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 "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
-#: 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 "Aby sa spojil obsah, musí mať rovnaký titulkový Y offset."
-#: 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 "Aby sa spojil obsah, musí mať rovnakú titulkovú Y mierku."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
#, fuzzy
msgid "Content to be joined must have the same subtitle fades."
msgstr "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
-#: src/lib/text_content.cc:273
+#: src/lib/text_content.cc:285
#, fuzzy
msgid "Content to be joined must have the same subtitle line spacing."
msgstr "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
@@ -561,16 +577,16 @@ msgstr "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
msgid "Content to be joined must have the same video frame rate"
msgstr "Aby sa spojil obsah, musí mať rovnaký počet obrázkov za sekundu."
-#: 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 "Aby sa spojil obsah, musí mať rovnaký typ videa."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
#, fuzzy
msgid "Content to be joined must use the same DCP track."
msgstr "Aby sa spojil obsah, musí používať rovnaké písma."
-#: 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 "Aby sa spojil obsah, musí používať rovnaké písma."
@@ -578,7 +594,12 @@ msgstr "Aby sa spojil obsah, musí používať rovnaké písma."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Aby sa spojil obsah, musí používať rovnaký titulkový stream."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Aby sa spojil obsah, musí používať rovnaké písma."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Video je %1x%2"
@@ -590,7 +611,7 @@ msgstr "Kopírovať DCP do TMS"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Nehoduje sa veľkosť videa v DCO"
@@ -637,7 +658,7 @@ msgstr "Nemôžem otvoriť ZIP súbor"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Nemôžem otvoriť ZIP súbor"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
#, fuzzy
msgid "Could not open file for writing"
msgstr "Datei konnte nicht zum Lesen geöffnet werden."
@@ -689,7 +710,7 @@ msgstr "Scope (2.39:1)"
msgid "DCP XML subtitles"
msgstr "DCP XML titulky"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
#, fuzzy
msgid "DCP sample rate"
msgstr "Snímacia frekvencia obsahu"
@@ -712,13 +733,13 @@ msgstr ""
"DCP-o-matic nemohol otvoriť %1. Možno, že súbor neexistuje alebo nie je "
"podporovaný."
-#: 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."
@@ -729,7 +750,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic nepodporuje `%1' filter, takže filter bude vypnutý."
-#: 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 ""
@@ -742,7 +763,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "De-interlacing"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -900,20 +921,20 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Full frame (Celý obraz)"
-#: 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
#, fuzzy
msgid "Full length in audio samples at content rate"
msgstr "Sample-Rate konnte nicht gewandelt werden"
-#: 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 ""
@@ -946,7 +967,7 @@ msgstr "Vysoko kvalitný 3D denoiser"
msgid "Horizontal flip"
msgstr "Horizontaler De-Blocker"
-#: 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 ""
@@ -976,7 +997,7 @@ msgstr "Neviem, čo zapríčinilo túto chybu."
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 "KDM donáška: $CPL_NAME"
@@ -1008,7 +1029,7 @@ msgstr "Left rear surround (Ľavý zadný priestorový)"
msgid "Left surround"
msgstr "Left surround (Ľavý zadný)"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr ""
@@ -1081,7 +1102,7 @@ msgstr "chýbajúce potrebné nastavenia %1"
msgid "Monday"
msgstr "Pondelok"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr ""
@@ -1105,7 +1126,7 @@ msgstr "Žiadne platné súbory nebolo nájdené v priečinku."
msgid "Noise reduction"
msgstr "Redukcia hluku"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr ""
@@ -1302,11 +1323,11 @@ msgstr "Posielam email"
msgid "Short"
msgstr "Short (Krátky film)"
-#: 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 "Nejaké audio bude prevzorkované na %1Hz"
@@ -1329,15 +1350,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 ""
@@ -1370,7 +1391,7 @@ msgstr "Test"
msgid "Text subtitles"
msgstr "[titulky]"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr ""
@@ -1423,7 +1444,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 ""
@@ -1465,7 +1486,7 @@ 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!"
@@ -1473,7 +1494,7 @@ msgstr ""
"Tento film bol vytvorený novšou verziou DCP-o-matic, a nemôže byť načítaný "
"touto verziou. Prepáčte !"
-#: 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 "
@@ -1529,7 +1550,7 @@ msgstr "neznáme"
msgid "Unknown error"
msgstr "Neznáma chyba"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Nerozpoznaná vzorkovacia frekvencia audia (%1)"
@@ -1637,7 +1658,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."
@@ -1655,7 +1676,7 @@ msgid ""
"likely to cause problems on playback."
msgstr ""
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
#, fuzzy
msgid "You must add some content to the DCP before creating it"
msgstr "Musíte pridať obsah do DCP pred tým, ako ho vytvoríte"
@@ -1722,11 +1743,11 @@ msgstr "spojenie vypršalo"
msgid "connecting"
msgstr "pripájam"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "kontajner"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "typ obsahu"
@@ -1738,12 +1759,12 @@ msgstr "kopírujem %1"
msgid "could not find stream information"
msgstr "nemôžem nájsť informácie o streame"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "nemôžem presunúť audio do DCP (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "nemôžem presunúť audio do DCP (%1)"
@@ -1800,74 +1821,74 @@ msgid "h"
msgstr "h"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
#, fuzzy
msgid "it does not have closed captions in all its reels."
msgstr "DCP nemá zvuk vo všetkých reeloch."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:739
+#: src/lib/dcp_content.cc:736
#, fuzzy
msgid "it does not have open subtitles in all its reels."
msgstr "DCP nemá titulky vo všetkých reeloch."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:706
+#: src/lib/dcp_content.cc:703
#, fuzzy
msgid "it does not have sound in all its reels."
msgstr "DCP nemá zvuk vo všetkých reeloch."
#. / 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
#, fuzzy
msgid "it overlaps other audio content; remove the other content."
msgstr "Už sa tu nachádza iný zvuk, ktorý sa prekrýva s DCP; zmaže ho."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:770
+#: src/lib/dcp_content.cc:767
#, fuzzy
msgid "it overlaps other text content; remove the other content."
msgstr "Už sa tu nachádza iné video, ktoré sa prekrýva s DCP; zmaže ho."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:677
+#: src/lib/dcp_content.cc:674
#, fuzzy
msgid "it overlaps other video content; remove the other content."
msgstr "Už sa tu nachádza iné video, ktoré sa prekrýva s DCP; zmaže ho."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:633
+#: src/lib/dcp_content.cc:630
#, fuzzy
msgid ""
"its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1877,7 +1898,7 @@ msgstr ""
"podľa obsahu videa'."
#. / 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 ""
@@ -1890,19 +1911,19 @@ msgstr "m"
msgid "moving"
msgstr "presúvam"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "meno"
#. / 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."
@@ -1917,7 +1938,7 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr ""
@@ -1929,7 +1950,7 @@ msgstr "stále"
msgid "unknown"
msgstr "neznáme"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "video snímky"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 3290cea32..44c104457 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
"PO-Revision-Date: 2021-03-22 02:21+0100\n"
"Last-Translator: Mattias Mattsson <vitplister@gmail.com>\n"
"Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.2\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -26,7 +26,7 @@ msgstr ""
"\n"
"Källmaterialets bildhastighet är %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -34,7 +34,7 @@ msgstr ""
"\n"
"Beskuren till %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -43,7 +43,7 @@ msgstr ""
"\n"
"Bildformat %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -51,7 +51,7 @@ msgstr ""
"\n"
"Svarta kanter tillagda för att passa %1-behållaren (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -59,7 +59,7 @@ msgstr ""
"\n"
"Skalat till %1x%2"
-#: 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 " (%.2f:1)"
@@ -70,7 +70,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " på %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -92,7 +92,7 @@ msgstr ""
"Speltid: $LENGTH\n"
"Storlek: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -120,7 +120,7 @@ msgstr "%1 [film]"
msgid "%1 [video]"
msgstr "%1 [bild]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", pixlarnas höjd/bredd-förhållande %.2f:1"
@@ -302,15 +302,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 "Ljudspåret kommer samplas om från %1 Hz till %2 Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Ljudspåret kommer samplas om till %1 Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Ljudspåret kommer inte samplas om"
@@ -385,7 +385,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Avbruten"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "Får inte innehålla snedstreck"
@@ -393,7 +393,7 @@ msgstr "Får inte innehålla snedstreck"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Kan inte hantera pixelformat %1 under %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr "Kan inte göra KDM eftersom projektet inte är krypterat."
@@ -401,7 +401,7 @@ msgstr "Kan inte göra KDM eftersom projektet inte är krypterat."
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Antal kanaler"
@@ -409,7 +409,7 @@ msgstr "Antal kanaler"
msgid "Checking content for changes"
msgstr "Kontrollerar om källmaterialet har ändrats"
-#: src/lib/reel_writer.cc:249
+#: src/lib/reel_writer.cc:243
msgid "Checking existing image data"
msgstr "Kontrollerar befintlig bilddata"
@@ -477,7 +477,7 @@ msgstr "Hurra!"
msgid "Content and DCP have the same rate.\n"
msgstr "Källmaterial och DCP har samma bildhastighet.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Källmaterialets samplingsfrekvens"
@@ -497,90 +497,110 @@ msgid "Content to be joined must all have or not have video"
msgstr ""
"Källmaterial som ska sammanfogas måste alla antingen ha eller inte ha video"
-#: src/lib/video_content.cc:199
+#: src/lib/text_content.cc:310
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "Undertextspår som ska sammanfogas måste ha samma radavstånd."
+
+#: src/lib/video_content.cc:207
#, fuzzy
msgid "Content to be joined must have all its video used or not used."
msgstr "Källmaterial som ska sammanfogas måste ha samma bildhastighet"
-#: 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 ""
"Källmaterial som ska sammanfogas måste använda samma inställning för 'bränn "
"in undertexter'."
-#: 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 ""
"Källmaterial som ska sammanfogas måste använda samma inställning för 'använd "
"undertexter'."
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
msgid "Content to be joined must have the same audio delay."
msgstr ""
"Källmaterial som ska sammanfogas måste använda samma inställning för "
"'fördröj ljudspår'."
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
msgid "Content to be joined must have the same audio gain."
msgstr ""
"Källmaterial som ska sammanfogas måste använda samma inställning för "
"'ljudförstärkning'."
-#: src/lib/video_content.cc:223
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr ""
+"Källmaterial som ska sammanfogas måste använda samma inställning för "
+"'ljudförstärkning'."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr ""
+"Källmaterial som ska sammanfogas måste använda samma inställning för 'bränn "
+"in undertexter'."
+
+#: src/lib/video_content.cc:231
msgid "Content to be joined must have the same colour conversion."
msgstr ""
"Källmaterial som ska sammanfogas måste använda samma inställning för "
"färgkonvertering."
-#: src/lib/video_content.cc:211
+#: src/lib/video_content.cc:219
msgid "Content to be joined must have the same crop."
msgstr "Källmaterial som ska sammanfogas måste ha samma beskärning."
-#: src/lib/video_content.cc:215
+#: src/lib/video_content.cc:223
#, fuzzy
msgid "Content to be joined must have the same custom ratio setting."
msgstr ""
"Källmaterial som ska sammanfogas måste ha samma inställning för 'Skala till'."
-#: src/lib/video_content.cc:219
+#: src/lib/video_content.cc:227
#, fuzzy
msgid "Content to be joined must have the same custom size setting."
msgstr ""
"Källmaterial som ska sammanfogas måste ha samma inställning för 'Skala till'."
-#: src/lib/video_content.cc:227
+#: src/lib/video_content.cc:235
msgid "Content to be joined must have the same fades."
msgstr "Källmaterial som ska sammanfogas måste ha samma in- och uttoning."
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:293
msgid "Content to be joined must have the same outline width."
msgstr "Texten i undertextspår som ska sammanfogas måste ha samma konturbredd."
-#: src/lib/video_content.cc:203
+#: src/lib/video_content.cc:211
msgid "Content to be joined must have the same picture size."
msgstr "Källmaterial som ska sammanfogas måste ha samma bildstorlek."
-#: 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 "Undertextspår som ska sammanfogas måste ha samma förskjutning i x-led."
-#: 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 "Undertextspår som ska sammanfogas måste ha samma skalning i x-led."
-#: 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 "Undertextspår som ska sammanfogas måste ha samma förskjutning i y-led."
-#: 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 "Undertextspår som ska sammanfogas måste ha samma skalning i y-led."
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:289
msgid "Content to be joined must have the same subtitle fades."
msgstr "Undertextspår som ska sammanfogas måste ha samma in- och uttoning."
-#: 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 "Undertextspår som ska sammanfogas måste ha samma radavstånd."
@@ -588,15 +608,15 @@ msgstr "Undertextspår som ska sammanfogas måste ha samma radavstånd."
msgid "Content to be joined must have the same video frame rate"
msgstr "Källmaterial som ska sammanfogas måste ha samma bildhastighet"
-#: 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 "Källmaterial som ska sammanfogas måste ha samma 2D-/3D-typ."
-#: src/lib/text_content.cc:290
+#: src/lib/text_content.cc:302
msgid "Content to be joined must use the same DCP track."
msgstr "Källmaterial som ska sammanfogas måste ha samma DCP-spår."
-#: 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 "Källmaterial som ska sammanfogas måste använda samma typsnitt."
@@ -604,7 +624,12 @@ msgstr "Källmaterial som ska sammanfogas måste använda samma typsnitt."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Källmaterial som ska sammanfogas måste använda undertext-ström."
-#: src/lib/video_content.cc:413
+#: src/lib/text_content.cc:306
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Källmaterial som ska sammanfogas måste använda samma typsnitt."
+
+#: src/lib/video_content.cc:430
msgid "Content video is %1x%2"
msgstr "Källmaterialet är %1x%2"
@@ -616,7 +641,7 @@ msgstr "Kopiera DCP till TMS"
msgid "Copying old video file"
msgstr "Kopierar tidigare videofil"
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
msgid "Copying video file into DCP"
msgstr "Kopierar in videofil till DCP"
@@ -660,7 +685,7 @@ msgstr "Kunde inte öppna hämtad ZIP-fil"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Kunde inte öppna hämtad ZIP-fil"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
msgid "Could not open file for writing"
msgstr "Kunde inte öppna fil %1 för skrivning (%2)"
@@ -708,7 +733,7 @@ msgstr "Scope"
msgid "DCP XML subtitles"
msgstr "DCP XML-undertexter"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "DCP:ns samplingsfrekvens"
@@ -729,7 +754,7 @@ msgstr ""
"DCP-o-matic kunde inte öppna %1 (%2). Kanske finns inte filen eller har ett "
"okänt format."
-#: 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."
@@ -738,7 +763,7 @@ msgstr ""
"DCP:er som OV. Var vänlig kontrollera dessa inställningar så att det är "
"korrekta."
-#: src/lib/film.cc:1508
+#: src/lib/film.cc:1525
#, fuzzy
msgid ""
"DCP-o-matic had to change your settings so that the film's frame rate is the "
@@ -753,7 +778,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic stödjer inte längre '%1'-filtret, så det har inaktiverats."
-#: 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 "Meddelande från DCP-o-matic"
@@ -766,7 +791,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "Avflätning"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -920,19 +945,19 @@ msgstr "Fullständigt (0-%1)"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Speltid i ljudsampel i DCP:ns hastighet"
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:344
msgid "Full length in audio samples at content rate"
msgstr "Speltid i ljudsampel i källmaterialets hastighet"
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:351
msgid "Full length in video frames at DCP rate"
msgstr "Speltid i bildrutor i DCP:ns hastighet"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Speltid i bildrutor i källmaterialets hastighet"
@@ -965,7 +990,7 @@ msgstr "Högkvalitativ brusreducering för 3D"
msgid "Horizontal flip"
msgstr "Horisontell spegling"
-#: 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 " Hz"
@@ -995,7 +1020,7 @@ msgstr "Det är inte känt vad som orsakade detta fel."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "KDM-leverans: $CPL_NAME"
@@ -1027,7 +1052,7 @@ msgstr "Vänster baksurround"
msgid "Left surround"
msgstr "Vänster surround"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Speltid"
@@ -1099,7 +1124,7 @@ msgstr "Nödvändig inställning saknas: %1"
msgid "Monday"
msgstr "Måndag"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Mono"
@@ -1123,7 +1148,7 @@ msgstr "Inga giltiga bildfiler hittades i mappen."
msgid "Noise reduction"
msgstr "Brusreducering"
-#: src/lib/writer.cc:738
+#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
msgid "None"
msgstr "Inget"
@@ -1316,11 +1341,11 @@ msgstr "Skickar e-post"
msgid "Short"
msgstr "Short"
-#: src/lib/video_content.cc:483
+#: src/lib/video_content.cc:500
msgid "Size"
msgstr "Upplösning"
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
msgid "Some audio will be resampled to %1Hz"
msgstr "En del av ljudspåret kommer samplas om till %1 Hz"
@@ -1354,15 +1379,15 @@ msgstr ""
"Några av dina dolda undertext-block har fler än %1 rader. De överskjutande "
"raderna kommer förmodligen klippas bort."
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "En del av ditt källmaterial behöver en KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "En del av ditt källmaterial behöver en OV"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Stereo"
@@ -1394,7 +1419,7 @@ msgstr "Test"
msgid "Text subtitles"
msgstr "Undertexter"
-#: src/lib/film.cc:371
+#: src/lib/film.cc:370
msgid "The DCP is empty, perhaps because all the content has zero length."
msgstr "DCP:n är tom, kanske för att källmaterialet har speltid noll."
@@ -1454,7 +1479,7 @@ msgstr ""
"att ange DCP:ns bildhastighet närmare källmaterialets, förutsatt att den "
"tänkta utrustningen för uppspelning klarar den angivna bildhastigheten."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "Det finns inget bildspår i denna DCP"
@@ -1501,7 +1526,7 @@ msgstr ""
"Detta är en KDM. KDM:er ska läggas till DCP:er genom att högerklicka på "
"källmaterialet och välja \"Lägg till KDM\"."
-#: 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!"
@@ -1509,7 +1534,7 @@ msgstr ""
"Denna film skapades i en nyare version av DCP-o-matic, och den kan inte "
"öppnas i denna version."
-#: 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 "
@@ -1563,7 +1588,7 @@ msgstr "Okänd"
msgid "Unknown error"
msgstr "Okänt fel"
-#: src/lib/ffmpeg_decoder.cc:358
+#: src/lib/ffmpeg_decoder.cc:359
msgid "Unrecognised audio sample format (%1)"
msgstr "Okänt ljudsamplingsformat (%1)"
@@ -1687,7 +1712,7 @@ msgstr ""
"Du har %1 filer som ser ut att vara VOB-filer från en DVD. Du bör sammanfoga "
"dem för att säkerställa korrekta skarvar mellan filerna."
-#: 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."
@@ -1709,7 +1734,7 @@ msgstr ""
"Du använder en typsnittsfil som är större än 640kB. Risken är stor att detta "
"leder till problem vid uppspelning."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "Du måste lägga till källmaterial till DCP:n innan du skapar den"
@@ -1783,11 +1808,11 @@ msgstr "uppkopplingen tog för lång tid"
msgid "connecting"
msgstr "ansluter"
-#: src/lib/film.cc:363
+#: src/lib/film.cc:362
msgid "container"
msgstr "behållare"
-#: src/lib/film.cc:375
+#: src/lib/film.cc:374
msgid "content type"
msgstr "filmtyp"
@@ -1799,12 +1824,12 @@ msgstr "kopierar %1"
msgid "could not find stream information"
msgstr "kunde inte hitta information om strömmen"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "kunde inte flytta in ljud till DCP:n (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "kunde inte flytta in ljud till DCP:n (%1)"
@@ -1861,68 +1886,68 @@ msgid "h"
msgstr " tim"
#. / 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 "den har inte dold undertext i alla akter."
#. / 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 "den har inte undertext i alla akter."
#. / 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 "den har inte ljud i alla akter."
#. / 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 "den har en annan bildhastighet än filmen."
#. / 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 "den är i 2K men filmen är i 4K."
#. / 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 "den är i 4K men filmen är i 2K."
#. / 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 "den är i Interop men filmen är inställd att vara i SMPTE."
#. / 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 "den är i SMPTE men filmen är inställd att vara i Interop."
#. / 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 "den överlappar med annat ljud-källmaterial; ta bort detta."
#. / 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 "den överlappar med annat undertext-källmaterial; ta bort detta."
#. / 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 "den överlappar med annat video-källmaterial; ta bort detta."
#. / 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'."
@@ -1931,7 +1956,7 @@ msgstr ""
"'dela upp enligt källmaterial'."
#. / 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 "bildrutornas storlek skiljer sig från filmens."
@@ -1945,19 +1970,19 @@ msgstr " min"
msgid "moving"
msgstr "rörlig"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "name"
msgstr "namn"
#. / 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."
@@ -1972,7 +1997,7 @@ msgstr " sek"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "en del av ditt källmaterial saknas"
@@ -1984,7 +2009,7 @@ msgstr "stillbild"
msgid "unknown"
msgstr "okänd"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "bildrutor"
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 ""
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index 4c8c16fea..c3ac553d6 100644
--- a/src/lib/po/uk_UA.po
+++ b/src/lib/po/uk_UA.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2018-08-20 19:32+0300\n"
"Last-Translator: Igor Voytovich <i.voyt@dualvfilms.com>\n"
"Language-Team: Українська\n"
@@ -15,7 +15,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -24,7 +24,7 @@ msgstr ""
"\n"
"Частота кадрів контенту %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -32,7 +32,7 @@ msgstr ""
"\n"
"Розмір при кадруванні: %1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -41,7 +41,7 @@ msgstr ""
"\n"
"Співвідношення сторін контенту %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -49,7 +49,7 @@ msgstr ""
"\n"
"Заповнено чорним для підгонки контейнера %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -57,7 +57,7 @@ msgstr ""
"\n"
"Розмір при масштабуванні: %1x%2"
-#: 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 " (%.2f:1)"
@@ -68,7 +68,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " на %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -90,7 +90,7 @@ msgstr ""
"Тривалість: $LENGTH\n"
"Розмір: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$JOB_NAME: $JOB_STATUS"
@@ -102,7 +102,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [Atmos]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -118,7 +118,7 @@ msgstr "%1 [відео]"
msgid "%1 [video]"
msgstr "%1 [відео]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", співвідношення сторін пікселей %.2f:1"
@@ -288,15 +288,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 "Аудіо буде ресемпловано з %1 Гц в %2 Гц"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "Аудіо будет ресемпловано в %1 Гц"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "Аудіо не буде ресемпловано"
@@ -370,7 +370,7 @@ msgstr "C"
msgid "Cancelled"
msgstr "Відмінено"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "Не може містити слеші"
@@ -378,7 +378,7 @@ msgstr "Не може містити слеші"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Неможливо обробити формат пікселя %1 під час %2"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr "Не можна створити KDM так як цей проект не зашифрований."
@@ -386,7 +386,7 @@ msgstr "Не можна створити KDM так як цей проект н
msgid "Centre"
msgstr "Центральний"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "Канали"
@@ -394,7 +394,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 "Перевірка данних зображення"
@@ -463,7 +463,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "У контента та DCP однакова частота кадрів.\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "Швидкість аудіо-контенту"
@@ -483,85 +483,103 @@ 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
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"Для приєднання контенту має бути такий самий інтервал між рядками субтитрів."
+
+#: src/lib/video_content.cc:207
#, fuzzy
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
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Для приєднання контенту має бути таке саме посилення аудіо."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+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
#, fuzzy
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
#, fuzzy
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 ""
"Для приєднання контенту має бути такий самий інтервал між рядками субтитрів."
@@ -570,16 +588,16 @@ 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
#, fuzzy
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 "Для приєднання контенту має бути такий самий шрифт."
@@ -587,7 +605,12 @@ 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
+#, fuzzy
+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 "Розмір контенту: %1x%2"
@@ -599,7 +622,7 @@ msgstr "Копіювати DCP на TMS (Theater Management System)"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "Невідповідність розміру відео в DCP"
@@ -646,7 +669,7 @@ msgstr "Не вдалося відкрити завантажений ZIP-арх
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "Не вдалося відкрити завантажений ZIP-архів"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
#, fuzzy
msgid "Could not open file for writing"
msgstr "не вдалося відкрити файл %1 для запису (%2)"
@@ -695,7 +718,7 @@ msgstr "DCI Scope"
msgid "DCP XML subtitles"
msgstr "DCP XML субтитри"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "Частота кадрів DCP"
@@ -716,13 +739,13 @@ msgstr ""
"DCP-o-matic не вдалося відкрити файл %1 (%2). Можливо він не існує або має "
"неочікуваний формат."
-#: 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."
@@ -733,7 +756,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic більше не підтримує фильтр `%1', тому він був вимкнений."
-#: 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 "Повідомлення DCP-o-matic"
@@ -746,7 +769,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "Деинтерлейсинг"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -900,19 +923,19 @@ msgstr "Повний (0-%1)"
msgid "Full frame"
msgstr "FULL (2048x1080)"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "Повна довжина аудіо-семплів на швидкості DCP"
-#: 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 "Повна довжина відео-кадрів на швидкості DCP"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "Повна довжина відео-кадрів на швидкості контенту"
@@ -944,7 +967,7 @@ msgstr "Високоякісне придушення шуму 3D"
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 "Гц"
@@ -974,7 +997,7 @@ msgstr "Невідомо, що викликало цю помилку."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "Призначення KDM: $CPL_NAME"
@@ -1006,7 +1029,7 @@ msgstr "Лівий тиловий surround"
msgid "Left surround"
msgstr "Лівий surround"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "Тривалість"
@@ -1078,7 +1101,7 @@ msgstr "Відсутнє обов'язкове налаштування %1"
msgid "Monday"
msgstr "Понеділок"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "Моно"
@@ -1102,7 +1125,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 "Нічого"
@@ -1294,11 +1317,11 @@ msgstr "Відправка пошти"
msgid "Short"
msgstr "SHR (Короткометражний фільм)"
-#: 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 "Деяке аудіо будет ресемпловано в %1 Гц"
@@ -1321,15 +1344,15 @@ msgid ""
"truncated."
msgstr ""
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "Частина вашого контенту потребує KDM"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "Часть вашего контента требует OV"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "Стерео"
@@ -1361,7 +1384,7 @@ msgstr "TST (Тестовий)"
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 ""
@@ -1418,7 +1441,7 @@ msgstr ""
"вашого контенту, при умові, що ваша цільова проекційна система підтримує "
"обрану вами швидкість DCP."
-#: src/lib/dcp_content.cc:657
+#: src/lib/dcp_content.cc:654
msgid "There is no video in this DCP"
msgstr "У даному DCP немає відео"
@@ -1463,7 +1486,7 @@ msgstr ""
"Цей файл - ключ (KDM). Ключі додаються до DCP натисканням правої клавіші на "
"контент і вибором «Додати KDM» у контекстному меню."
-#: 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!"
@@ -1471,7 +1494,7 @@ msgstr ""
"Проект був створений більш новою версією DCP-o-matic і не може бути "
"завантажений цією версією. Вибачте!"
-#: 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 "
@@ -1527,7 +1550,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 "Нерозпізнаний формат аудіо (%1)"
@@ -1652,7 +1675,7 @@ msgstr ""
"У вас %1 файлів, які схожі на VOB-файли з DVD. Вам необхідно об'єднати "
"(приєднати) їх, щоб гарантувати гладке з'єднання між файлами."
-#: 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."
@@ -1672,7 +1695,7 @@ msgstr ""
"Вы вибрали шрифт, розмір якого більше 640 кБ. Висока вірогідність, що це "
"викликає проблеми при відтворенні."
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
msgid "You must add some content to the DCP before creating it"
msgstr "Вам необхідно додати контент в DCP перед його створенням"
@@ -1749,11 +1772,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 "тип контенту"
@@ -1765,12 +1788,12 @@ msgstr "копіювання %1"
msgid "could not find stream information"
msgstr "не вдалося знайти інформацію про поток"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "не вдалося перемістити аудіо в DCP-пакет (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "не вдалося перемістити аудіо в DCP-пакет (%1)"
@@ -1827,74 +1850,74 @@ msgid "h"
msgstr "г"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
#, fuzzy
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
#, fuzzy
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
#, fuzzy
msgid "it has a different frame rate to the film."
msgstr "частота кадрів проекту відрізняється від частоти кадрів DCP."
#. / 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
#, fuzzy
msgid "it is 2K and the film is 4K."
msgstr "є Interop , а проект настроений як SMPTE."
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:664
+#: src/lib/dcp_content.cc:661
#, fuzzy
msgid "it is 4K and the film is 2K."
msgstr "є Interop , а проект настроений як SMPTE."
#. / 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 "є Interop , а проект настроений як SMPTE."
#. / 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 "є SMPTE, а проект настроений як Interop."
#. / 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
#, fuzzy
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'."
@@ -1903,7 +1926,7 @@ 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 "розмір кадру відео у проекті відрізняється вид розміру відео DCP."
@@ -1916,19 +1939,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."
@@ -1943,7 +1966,7 @@ msgstr "с"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "частина вашого контенту відсутня"
@@ -1955,7 +1978,7 @@ msgstr "статичний"
msgid "unknown"
msgstr "невідомо"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "відеокадри"
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index aa5c19264..a62e76a8b 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LIBDCPOMATIC\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: 2019-04-21 22:30+0800\n"
"Last-Translator: Hanyuan\n"
"Language-Team: Hanyuan\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-SourceCharset: UTF-8\n"
-#: src/lib/video_content.cc:469
+#: src/lib/video_content.cc:486
#, c-format
msgid ""
"\n"
@@ -28,7 +28,7 @@ msgstr ""
"\n"
"源视频帧率 %.4f\n"
-#: src/lib/video_content.cc:434
+#: src/lib/video_content.cc:451
msgid ""
"\n"
"Cropped to %1x%2"
@@ -36,7 +36,7 @@ msgstr ""
"\n"
"裁剪为%1x%2"
-#: src/lib/video_content.cc:427
+#: src/lib/video_content.cc:444
#, c-format
msgid ""
"\n"
@@ -45,7 +45,7 @@ msgstr ""
"\n"
"显示宽高比 %.2f:1"
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:474
msgid ""
"\n"
"Padded with black to fit container %1 (%2x%3)"
@@ -53,7 +53,7 @@ msgstr ""
"\n"
"填充为黑色,以适应打包宽高比 %1 (%2x%3)"
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:464
msgid ""
"\n"
"Scaled to %1x%2"
@@ -61,7 +61,7 @@ msgstr ""
"\n"
"缩放到 %1x%2"
-#: 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 " (%.2f:1)"
@@ -72,7 +72,7 @@ msgstr " (%.2f:1)"
msgid " on %1"
msgstr " on %1"
-#: src/lib/config.cc:1139
+#: src/lib/config.cc:1125
msgid ""
"$CPL_NAME\n"
"\n"
@@ -94,7 +94,7 @@ msgstr ""
"长度: $LENGTH\n"
"大小: $SIZE\n"
-#: src/lib/config.cc:1117
+#: src/lib/config.cc:1103
msgid "$JOB_NAME: $JOB_STATUS"
msgstr "$JOB_NAME: $JOB_STATUS"
@@ -106,7 +106,7 @@ msgstr ""
msgid "%1 [Atmos]"
msgstr "%1 [全景声]"
-#: src/lib/dcp_content.cc:318
+#: src/lib/dcp_content.cc:315
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
@@ -122,7 +122,7 @@ msgstr "%1 [影片]"
msgid "%1 [video]"
msgstr "%1 [视频]"
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:439
#, c-format
msgid ", pixel aspect ratio %.2f:1"
msgstr ", 像素宽高比 %.2f:1"
@@ -287,15 +287,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 "音频重新采样频率设置为 %1Hz 到 %2Hz"
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
msgid "Audio will be resampled to %1Hz"
msgstr "音频将被重新采样至 %1Hz"
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
msgid "Audio will not be resampled"
msgstr "音频不能被重新采样"
@@ -369,7 +369,7 @@ msgstr "中置"
msgid "Cancelled"
msgstr "取消"
-#: src/lib/film.cc:359
+#: src/lib/film.cc:358
msgid "Cannot contain slashes"
msgstr "不能包含斜杠"
@@ -377,7 +377,7 @@ msgstr "不能包含斜杠"
msgid "Cannot handle pixel format %1 during %2"
msgstr "在 %2 不能处理图片格式 %1"
-#: src/lib/film.cc:1637
+#: src/lib/film.cc:1654
msgid "Cannot make a KDM as this project is not encrypted."
msgstr "不能生成KDM,因为项目没有被加密."
@@ -385,7 +385,7 @@ msgstr "不能生成KDM,因为项目没有被加密."
msgid "Centre"
msgstr "居中对齐"
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:329
msgid "Channels"
msgstr "声音通道"
@@ -393,7 +393,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 "检查现有的图像数据"
@@ -463,7 +463,7 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "源内容和DCP设定帧率需要一致。\n"
-#: src/lib/audio_content.cc:294
+#: src/lib/audio_content.cc:330
msgid "Content audio sample rate"
msgstr "源音频采样率"
@@ -479,78 +479,94 @@ 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
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "字幕行距必须相同."
+
+#: src/lib/video_content.cc:207
#, fuzzy
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 "所有要添加“use 字幕”设置必须具有相同。"
-#: 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
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "视频和音频增益必须相同。"
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+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
#, fuzzy
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
#, fuzzy
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 "字幕X轴偏移必须相同。"
-#: 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 "字幕X轴缩放大小必须相同。"
-#: 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 "字幕Y轴偏移必须相同。"
-#: 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 "字幕Y轴缩放大小必须相同。"
-#: 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 "字幕行距必须相同."
@@ -558,15 +574,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 "DCP轨道必须相同。"
-#: 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 "字幕字体必须相同。"
@@ -574,7 +590,12 @@ 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
+#, fuzzy
+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 "源视频分辨率是 %1x%2"
@@ -586,7 +607,7 @@ msgstr "复制DCP到TMS(影院内容管理系统)"
msgid "Copying old video file"
msgstr ""
-#: src/lib/reel_writer.cc:388
+#: src/lib/reel_writer.cc:382
#, fuzzy
msgid "Copying video file into DCP"
msgstr "DCP中的视频分辨率不匹配"
@@ -629,7 +650,7 @@ msgstr "无法打开下载的zip文件"
msgid "Could not open downloaded ZIP file (%1:%2: %3)"
msgstr "无法打开下载的zip文件 (%1:%2: %3)"
-#: src/lib/config.cc:1003
+#: src/lib/config.cc:989
msgid "Could not open file for writing"
msgstr "无法执行写入,目标文件无法打开"
@@ -677,7 +698,7 @@ msgstr "DCI Scope(宽银幕/2.35/2.39) "
msgid "DCP XML subtitles"
msgstr "DCP XML字幕"
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:350
msgid "DCP sample rate"
msgstr "DCP 采样率"
@@ -696,7 +717,7 @@ msgid ""
"is in an unexpected format."
msgstr "无法打开文件%1 (%2)。文件不存在或格式无法识别。"
-#: 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."
@@ -704,7 +725,7 @@ msgstr ""
"DCP-o-matic必须把您DCP的设置更改为OV(原创)。请重新检查设置确认设置内容是否"
"为您的期望值。"
-#: src/lib/film.cc:1508
+#: src/lib/film.cc:1525
#, fuzzy
msgid ""
"DCP-o-matic had to change your settings so that the film's frame rate is the "
@@ -718,7 +739,7 @@ msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "不支持的格式`%1'。"
-#: 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 "DCP-o-matic提醒"
@@ -731,7 +752,7 @@ msgstr ""
msgid "De-interlacing"
msgstr "去除隔行"
-#: src/lib/config.cc:1102
+#: src/lib/config.cc:1088
msgid ""
"Dear Projectionist\n"
"\n"
@@ -880,19 +901,19 @@ msgstr "全幅 (0-%1)"
msgid "Full frame"
msgstr "Full(全幅/1.90)"
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:357
msgid "Full length in audio samples at DCP rate"
msgstr "DCP中音频采样率总时长"
-#: 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 "DCP中视频总时长"
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:337
msgid "Full length in video frames at content rate"
msgstr "源视频时长"
@@ -924,7 +945,7 @@ msgstr "高品质的3D降噪"
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 "Hz(赫兹)"
@@ -954,7 +975,7 @@ msgstr "未知错误."
msgid "JEDEC P22"
msgstr "JEDEC P22"
-#: 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 "发行KDM: $CPL_NAME"
@@ -986,7 +1007,7 @@ msgstr "左后环绕"
msgid "Left surround"
msgstr "左环绕"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "Length"
msgstr "长度"
@@ -1058,7 +1079,7 @@ msgstr "缺少必需的设置 %1"
msgid "Monday"
msgstr "星期一"
-#: src/lib/writer.cc:740
+#: src/lib/writer.cc:746
msgid "Mono"
msgstr "单声道"
@@ -1082,7 +1103,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 "无"
@@ -1274,11 +1295,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 "部分音频将被重新采样到%1Hz"
@@ -1301,15 +1322,15 @@ msgid ""
"truncated."
msgstr ""
-#: src/lib/film.cc:388
+#: src/lib/film.cc:387
msgid "Some of your content needs a KDM"
msgstr "一些内容需要KDM密匙"
-#: src/lib/film.cc:391
+#: src/lib/film.cc:390
msgid "Some of your content needs an OV"
msgstr "一些内容需要OV(声明原创)"
-#: src/lib/writer.cc:742
+#: src/lib/writer.cc:748
msgid "Stereo"
msgstr "双声道"
@@ -1341,7 +1362,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 ""
@@ -1391,7 +1412,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 "DCP中不包含画面"
@@ -1435,13 +1456,13 @@ msgstr ""
"这是一个KDM密匙文件。KDM密匙文件可以通过在你的DCP包上右键,点击添加KDM文件添"
"加到DCP中。"
-#: 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 "
@@ -1493,7 +1514,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 "无法识别的音频采样格式 (%1)"
@@ -1614,7 +1635,7 @@ msgstr ""
"您已经添加了 %1 个VOB文件,如果他们来自一张DVD,请确保您已经导入了所有文件,"
"否则可能无法正常播放。"
-#: 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."
@@ -1632,7 +1653,7 @@ msgid ""
"likely to cause problems on playback."
msgstr "您添加的字体文件超过了640KB,部分服务器不支持超过640KB大小的字体。"
-#: src/lib/film.cc:367
+#: src/lib/film.cc:366
#, fuzzy
msgid "You must add some content to the DCP before creating it"
msgstr "您必须在创建DCP之前添加一些内容"
@@ -1701,11 +1722,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 "打包类型"
@@ -1717,12 +1738,12 @@ msgstr "复制中... %1"
msgid "could not find stream information"
msgstr "找不到流信息"
-#: src/lib/reel_writer.cc:434
+#: src/lib/reel_writer.cc:428
#, fuzzy
msgid "could not move atmos asset into the DCP (%1)"
msgstr "无法移动的音频文件 (%1)"
-#: src/lib/reel_writer.cc:417
+#: src/lib/reel_writer.cc:411
msgid "could not move audio asset into the DCP (%1)"
msgstr "无法移动的音频文件 (%1)"
@@ -1779,79 +1800,79 @@ msgid "h"
msgstr "小时"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:750
+#: src/lib/dcp_content.cc:747
#, fuzzy
msgid "it does not have closed captions in all its reels."
msgstr "该DCP的所有分卷无声音。"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:739
+#: src/lib/dcp_content.cc:736
#, fuzzy
msgid "it does not have open subtitles in all its reels."
msgstr "该DCP的所有分卷无字幕。"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:706
+#: src/lib/dcp_content.cc:703
#, fuzzy
msgid "it does not have sound in all its reels."
msgstr "该DCP的所有分卷无声音。"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:610
+#: src/lib/dcp_content.cc:607
#, fuzzy
msgid "it has a different frame rate to the film."
msgstr "影片与DCP的帧速率不一致."
#. / 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
#, fuzzy
msgid "it is 2K and the film is 4K."
msgstr "打包内容被设置为Interop类型,而实际打包类型是 SMPTE。"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:664
+#: src/lib/dcp_content.cc:661
#, fuzzy
msgid "it is 4K and the film is 2K."
msgstr "打包内容被设置为Interop类型,而实际打包类型是 SMPTE。"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:598
+#: src/lib/dcp_content.cc:595
#, fuzzy
msgid "it is Interop and the film is set to SMPTE."
msgstr "打包内容被设置为Interop类型,而实际打包类型是 SMPTE。"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:602
+#: src/lib/dcp_content.cc:599
#, fuzzy
msgid "it is SMPTE and the film is set to Interop."
msgstr "打包内容被设置为SMPTE类型,而实际打包类型是 Interop。"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:712
+#: src/lib/dcp_content.cc:709
#, fuzzy
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
#, fuzzy
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
#, fuzzy
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
#, fuzzy
msgid ""
"its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1859,7 +1880,7 @@ msgid ""
msgstr "影片时长与DCP中的分卷时长不一致,请设置 【 分卷模式 】 来分割该内容。"
#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:672
+#: src/lib/dcp_content.cc:669
#, fuzzy
msgid "its video frame size differs from the film's."
msgstr "视频帧大小与DCP不一致。"
@@ -1873,19 +1894,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."
@@ -1900,7 +1921,7 @@ msgstr "秒"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
msgid "some of your content is missing"
msgstr "内容不完整"
@@ -1912,7 +1933,7 @@ msgstr "静止图像"
msgid "unknown"
msgstr "未知"
-#: src/lib/video_content.cc:482
+#: src/lib/video_content.cc:499
msgid "video frames"
msgstr "视频帧"