summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-05-25 13:56:52 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-25 13:56:52 +0100
commitf79a483c937dad8a89410b5aed97c11d8a715443 (patch)
tree8246d5ca0bb70ded6c170cba8310ce79dda71e52 /src/lib
parent5189e5720bd583dbf8a4a4e89c5a1b2e61c6d214 (diff)
pot/merge.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/po/cs_CZ.po363
-rw-r--r--src/lib/po/da_DK.po359
-rw-r--r--src/lib/po/de_DE.po361
-rw-r--r--src/lib/po/es_ES.po361
-rw-r--r--src/lib/po/fr_FR.po361
-rw-r--r--src/lib/po/it_IT.po361
-rw-r--r--src/lib/po/nl_NL.po361
-rw-r--r--src/lib/po/pl_PL.po365
-rw-r--r--src/lib/po/pt_BR.po339
-rw-r--r--src/lib/po/pt_PT.po361
-rw-r--r--src/lib/po/ru_RU.po363
-rw-r--r--src/lib/po/sk_SK.po365
-rw-r--r--src/lib/po/sv_SE.po362
-rw-r--r--src/lib/po/uk_UA.po361
-rw-r--r--src/lib/po/zh_CN.po361
15 files changed, 2841 insertions, 2563 deletions
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 242a8d914..b38e134f5 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-04-19 10:09+0200\n"
"Last-Translator: Tomáš Hlaváč\n"
"Language-Team: \n"
@@ -18,18 +18,23 @@ msgstr ""
"X-Generator: Poedit 1.8.7\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [zvuk]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [video]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [video]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -70,77 +75,77 @@ msgstr "Vyskytla se chyba při zpracování souboru %1."
msgid "Analyse audio"
msgstr "Analyzovat zvuk"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Zvuk"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Zvuk bude re-samplovaný z %1kHz na %2kHz"
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Zvuk bude re-samplovaný na %1kHz"
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Zvuk nebude resamplovaný"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 rozšířený rozsah barev"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 konstanta jasu"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 pro 10-bit systém"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 pro 12-bit systém"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 non-constant luminance"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bitů na pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -156,7 +161,7 @@ msgstr "Nemužu zpracovat formát pixelu %1 během %2"
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Kanály"
@@ -164,33 +169,33 @@ msgstr "Kanály"
msgid "Checking existing image data"
msgstr "Kontroluji existující video data"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Primární volby barev"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Rozsah barev"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Charakteristika přenosu barev"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Barevný prostor"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Počítám souhrn zvuku"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Počítám schrnutí"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Počítám souhrn videa"
@@ -198,84 +203,76 @@ msgstr "Počítám souhrn videa"
msgid "Content and DCP have the same rate.\n"
msgstr "Obsah a DCP mají stejný bitrate,\n"
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Snímková frekvence audio obsahu"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Snímková frekvence obsahu"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
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/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
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:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
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:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Aby se spojil obsah, musí mít stejné nastavení zeslabení."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
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/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Aby se spojil obsah, musí mít stejné nastavení měřítka."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr ""
-"Aby se spojil obsah, musí mít stejné nastavení počtu obrázků za sekundu."
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
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/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Aby se spojil obsah, musí mít stejné nastavení písma."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Video je %1x%2"
@@ -299,7 +296,7 @@ msgstr "Nemohu dekódovat JPEG2000 soubor %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Nemohu dekódovat video soubor (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "Nemohu najít formát pixelu pro video."
@@ -339,7 +336,7 @@ msgstr "Nemohu začít přenos"
msgid "Could not write to remote file (%1)"
msgstr "Nemohu zapisovat do vzdáleného souboru (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Zmenšit na %1x%2"
@@ -351,19 +348,19 @@ msgstr "D-BOX primární"
msgid "D-BOX secondary"
msgstr "D-BOX sekundární"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML titulky"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "Snímková frekvence DCP"
@@ -383,7 +380,7 @@ msgstr ""
"DCP-o-matic nemohl otevřít %1. Možná, že soubor neexistuje nebo není "
"podporovaný."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
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ý."
@@ -418,7 +415,7 @@ msgstr ""
"Děkujeme a přejeme pěkný den,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Poměr stran displeje"
@@ -470,7 +467,7 @@ msgstr "Chyba: %1"
msgid "Examine content"
msgstr "Vypočítávám obsah"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -486,15 +483,15 @@ msgstr "Chyba při odeslání emailu (%1)"
msgid "Feature"
msgstr "Feature"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Hledám délku a titulky"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Hledám titulky"
@@ -502,15 +499,11 @@ msgstr "Hledám titulky"
msgid "Flat"
msgstr "Flat"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Snímková frekvence"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -518,27 +511,29 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Full frame (Celý obraz)"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+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:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+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:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr "Plná délka video snímků v DCP rychlosti"
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Plná délka video snímků v rychlosti obsahu"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -546,7 +541,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Gradient debander"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -558,15 +553,15 @@ msgstr "Sluchově postižený(í)"
msgid "High quality 3D denoiser"
msgstr "Vysoká kvalita 3D denoiser"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB nebo sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -582,11 +577,11 @@ msgstr "KDM doručení: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel deinterlacer"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -606,13 +601,13 @@ msgstr "Left rear surround (Levý zadní surround)"
msgid "Left surround"
msgstr "Left surround (Levý surround)"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Délka"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -620,27 +615,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (Subwoofer)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Limitovaný"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Limitovaný (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Lineární"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logarmitmický (rozsah 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logarmitmický (rozsah 316:1 )"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -684,7 +679,7 @@ msgstr "Bez měřítka"
msgid "No stretch"
msgstr "Bez roztažení"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Ve složce nebyly nalezeny žádné platné soubory."
@@ -696,11 +691,11 @@ msgstr "Redukce hluku"
msgid "OK (ran for %1)"
msgstr "OK (hotovo za %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Jen pravá část připojeného obsahu může být upravená od začátku."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Jen poslední část připojeného obsahu může být upravená od konce."
@@ -716,7 +711,7 @@ msgstr "Overcomplete wavelet denoiser"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Vyplněné černou, aby se zmenšil do kontejneru %1 (%2x%3)"
@@ -732,11 +727,11 @@ msgstr "Chyba při programovaní na %1:%2"
msgid "Public Service Announcement"
msgstr "Public Service Announcement (Veřejné oznámení služby)"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -744,10 +739,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Přístupnost"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601 (SD)"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601 (SD)"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601 (SD)"
@@ -756,10 +761,11 @@ msgstr "Rec. 601 (SD)"
msgid "Rec. 709"
msgstr "Rec. 709 (HD)"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Délka reelu v projektu se liší od těch v DCP; nastavte reel mod na 'rozdělit "
"podle obsahu videa'."
@@ -780,32 +786,32 @@ msgstr "Right rear surround (Pravý zadní surround)"
msgid "Right surround"
msgstr "Right surround (Pravý surround)"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -813,7 +819,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "SSH chyba (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Zmenšené na %1x%2"
@@ -829,11 +835,11 @@ msgstr "Posílám email"
msgid "Short"
msgstr "Short (Krátky film)"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Velikost"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Některé audio bude převzorkované na %1kHz"
@@ -857,15 +863,15 @@ msgstr "Telecine Filter"
msgid "Test"
msgstr "Test"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Text titulků"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "DCP nemá zvuk ve všech reeloch."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "DCP nemá titulky ve všech reeloch."
@@ -886,15 +892,23 @@ msgstr ""
"Disk, na kterém se nachází film už má málo volného místa. Uvolněte místo a "
"zkuste to znovu."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Už se tu nachází jiný zvuk, který se překrývá s DCP; odstraní ho."
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "Už se tu nachází jiné titulky, které se překrývají s DCP; smaže je."
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Už se tu nachází jiné video, které se překrývá s DCP; smaže ho."
@@ -907,7 +921,7 @@ msgstr ""
"Zbývá málo paměti. Pokud je váš systém 32-bitový, zkuste snížit počet "
"enkódovacích threadov v záložce Všeobecné, v nastavení."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -915,7 +929,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:384
+#: src/lib/film.cc:383
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 "
@@ -949,7 +963,7 @@ msgstr "Server obdržel neočekávaný typ obrazu"
msgid "Unknown error"
msgstr "Neznáma chyba"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Nerozpoznaná vzorkovací frekvence audia (%1)"
@@ -957,11 +971,11 @@ msgstr "Nerozpoznaná vzorkovací frekvence audia (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Doostření a Gaussovské rozostření"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Nespecifikované"
@@ -981,7 +995,7 @@ msgstr "Upmix L"
msgid "Upmix R"
msgstr "Upmix R"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -995,13 +1009,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Video"
@@ -1013,7 +1026,7 @@ msgstr "Zrakově postižený(í)"
msgid "Waiting"
msgstr "Čekám"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1021,23 +1034,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Ještě další deinterlacing filter"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
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"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[přesouvám obrázky]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[stále]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[titulky]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "nemůže obsahovat lomítka"
@@ -1049,11 +1062,11 @@ msgstr "spojení vypršelo"
msgid "connecting"
msgstr "připojuji"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "kontejner"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "typ obsahu"
@@ -1065,18 +1078,14 @@ msgstr "kopíruji %1"
msgid "could not create file %1"
msgstr "nemohu vytvořit soubor %1"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "nemohu najít informace o streamu"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "nemohu přesunout audio do DCP (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "nemohu otevřít audio soubor k načtení"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "nemohu otevřít soubor %1"
@@ -1117,10 +1126,6 @@ msgstr "fps"
msgid "frames"
msgstr "snímky"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "snímky za sekundu"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1135,15 +1140,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "chybí potřebná nastavení %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "přesouvám"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "jméno"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "poměr stran obrazových bodů"
@@ -1162,18 +1167,34 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "stále"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "neznáme"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "video snímky"
+#~ msgid "Content frame rate"
+#~ msgstr "Snímková frekvence obsahu"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr ""
+#~ "Aby se spojil obsah, musí mít stejné nastavení počtu obrázků za sekundu."
+
+#~ msgid "Frame rate"
+#~ msgstr "Snímková frekvence"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "nemohu otevřít audio soubor k načtení"
+
+#~ msgid "frames per second"
+#~ msgstr "snímky za sekundu"
+
#~ msgid "SubRip subtitles"
#~ msgstr "SubRip titulky"
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index 5fbde8699..ae0648948 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2015-10-27 20:47+0100\n"
"Last-Translator: FULL NAME &lt;EMAIL@ADDRESS&gt;\n"
"Language-Team: LANGUAGE &lt;LL@li.org&gt;\n"
@@ -17,18 +17,23 @@ msgstr ""
"X-Generator: Poedit 1.8.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [lyd]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [film]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [film]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -69,77 +74,77 @@ msgstr "Der skete en fejl, mens der blev arbejdet på filen %1."
msgid "Analyse audio"
msgstr "Analyser lyd"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr ""
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr ""
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr ""
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr ""
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 til 10 bit system"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 til 12 bit system"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bits per pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr ""
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr ""
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr ""
@@ -155,7 +160,7 @@ msgstr "Kan ikke håndtere pixelformat %1 under %2"
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
#, fuzzy
msgid "Channels"
msgstr "Lyd kanaler"
@@ -164,33 +169,33 @@ msgstr "Lyd kanaler"
msgid "Checking existing image data"
msgstr "Verificerer eksisterende billeddata"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr ""
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Beregner lydresume"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Beregner resume"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Beregner billedresume"
@@ -198,88 +203,80 @@ msgstr "Beregner billedresume"
msgid "Content and DCP have the same rate.\n"
msgstr "Indhold og DCP har samme billedhastighed.\n"
-#: src/lib/audio_content.cc:319
+#: src/lib/audio_content.cc:295
#, fuzzy
-msgid "Content audio frame rate"
-msgstr "Indholds billedhastighed"
-
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
+msgid "Content audio sample rate"
msgstr "Indholds billedhastighed"
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"lIndhold der skal splejses skal have den samme indstilling af 'Brænd "
"undertekster ind i billedet'."
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
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:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
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:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Indhold der skal splejses skal fade på samme måde."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "Indhold der skal splejses skal have samme billedstørrelse."
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Indhold der skal splejses skal have samme skaleringsindstilling."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-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:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr "Indhold der skal splejses skal have samme billedtype."
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Indhold der skal splejses skal bruge samme skrifttype."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Indholdsvideo er %1x%2"
@@ -303,7 +300,7 @@ msgstr "Kunne ikke læse JPEG2000 fil %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Kunne ikke afkode billedfil (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
#, fuzzy
msgid "Could not find pixel format for video."
msgstr "kunne ikke finde information om strøm"
@@ -344,7 +341,7 @@ msgstr "Kunne ikke starte overførsel"
msgid "Could not write to remote file (%1)"
msgstr "Kunne ikke skrive til fjernfil. (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Beskåret til %1x%2"
@@ -356,19 +353,19 @@ msgstr ""
msgid "D-BOX secondary"
msgstr ""
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr ""
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr ""
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML undertekster"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
#, fuzzy
msgid "DCP frame rate"
msgstr "Indholds billedhastighed"
@@ -389,7 +386,7 @@ msgstr ""
"DCP-o-matic kunne ikke åbne filen %1. Måske findes den ikke, eller den er i "
"et uventet format."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr ""
@@ -426,7 +423,7 @@ msgstr ""
"Med venlig hilsen,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr ""
@@ -480,7 +477,7 @@ msgstr "Fejl: %1"
msgid "Examine content"
msgstr "Undersøg indhold"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr ""
@@ -496,16 +493,16 @@ msgstr ""
msgid "Feature"
msgstr "Feature"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
#, fuzzy
msgid "Finding length and subtitles"
msgstr "Finder undertekster"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Finder undertekster"
@@ -513,16 +510,11 @@ msgstr "Finder undertekster"
msgid "Flat"
msgstr "Flat"
-#: src/lib/video_content.cc:586
-#, fuzzy
-msgid "Frame rate"
-msgstr "Video billedhastighed"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Fuld"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Fuld (0-%1)"
@@ -530,27 +522,27 @@ msgstr "Fuld (0-%1)"
msgid "Full frame"
msgstr "Fuldt billede"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+msgid "Full length in audio samples at DCP rate"
msgstr ""
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+msgid "Full length in audio samples at content rate"
msgstr ""
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr ""
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr ""
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -558,7 +550,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr ""
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr ""
@@ -570,15 +562,15 @@ msgstr "Hørehæmmede"
msgid "High quality 3D denoiser"
msgstr "Høj-kvalitets 3D-denoiser"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr ""
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB eller sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -594,11 +586,11 @@ msgstr "KDM-levering: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kerne sammenfletter"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -618,13 +610,13 @@ msgstr "Venstre bag surround"
msgid "Left surround"
msgstr "Venstre surround"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr ""
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -632,27 +624,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr ""
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Lineær"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logaritmisk (100:1 range)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logaritmisk (316:1 range)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr ""
@@ -697,7 +689,7 @@ msgstr "Ingen skalering"
msgid "No stretch"
msgstr "Intet stræk"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Ingen korrekte billedfiler kunne findes i folderen."
@@ -709,11 +701,11 @@ msgstr "Støjreduktion"
msgid "OK (ran for %1)"
msgstr "OK (kørte i %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Kun det første indhold, der skal sammensættes, kan have starttrim."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Kun det sidste indhold, der skal sammensættes, kan have sluttrim."
@@ -729,7 +721,7 @@ msgstr ""
msgid "P3"
msgstr ""
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Udfyldt med sort for at tilpasse container %1 (%2x%3)"
@@ -745,11 +737,11 @@ msgstr "Programmerings fejl ved %1: %2"
msgid "Public Service Announcement"
msgstr "Publikumsorientering (PSA)"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -757,10 +749,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Censur"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr ""
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -769,10 +771,10 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:486
@@ -791,32 +793,32 @@ msgstr "Højre bag surround"
msgid "Right surround"
msgstr "Højre surround"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -824,7 +826,7 @@ msgstr ""
msgid "SSH error (%1)"
msgstr "SSH-fejl (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Skaleret til %1x%2"
@@ -840,11 +842,11 @@ msgstr "Sender email"
msgid "Short"
msgstr "Short"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr ""
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr ""
@@ -868,16 +870,16 @@ msgstr "Telecinefilter"
msgid "Test"
msgstr "Test"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
#, fuzzy
msgid "Text subtitles"
msgstr "[undertekster]"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr ""
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr ""
@@ -899,15 +901,23 @@ msgstr ""
"Filmen ligger på et drev, der kun har lidt ledig plads. Frigør noget plads "
"og prøv igen."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr ""
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr ""
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr ""
@@ -921,7 +931,7 @@ msgstr ""
"kører på et 32 bit operativsystem, så prøv at reducere antallet af "
"genereringstråde i fanebladet Generelt i Indstillinger."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -929,7 +939,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:384
+#: src/lib/film.cc:383
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 "
@@ -963,7 +973,7 @@ msgstr "Uventet billedtype modtaget af server"
msgid "Unknown error"
msgstr "Ukendt fejl"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Kunne ikke genkende lydsekvensens format (%1)"
@@ -971,11 +981,11 @@ msgstr "Kunne ikke genkende lydsekvensens format (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Uspecificeret"
@@ -995,7 +1005,7 @@ msgstr ""
msgid "Upmix R"
msgstr ""
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr ""
@@ -1009,13 +1019,12 @@ msgstr ""
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
#, fuzzy
msgid "Video"
msgstr "Video størrelse"
@@ -1028,7 +1037,7 @@ msgstr "Synshandicappet"
msgid "Waiting"
msgstr "Venter"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr ""
@@ -1036,23 +1045,23 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr "Endnu et Deinterlacing Filter"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
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"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[levende billeder]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[stillbillede]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[undertekster]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "må ikke indeholde skråstreger"
@@ -1064,11 +1073,11 @@ msgstr "forbindelsestimeout"
msgid "connecting"
msgstr "forbinder"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "container"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "indholdstype"
@@ -1080,18 +1089,14 @@ msgstr "kopierer %1"
msgid "could not create file %1"
msgstr "kunne ikke danne filen %1"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "kunne ikke finde information om strøm"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr ""
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "lydfil kunne ikke indlæses"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "kunne ikke åbne filen %"
@@ -1132,10 +1137,6 @@ msgstr "bps"
msgid "frames"
msgstr "billeder"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "billeder pr. sekund"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1150,15 +1151,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "mangler påkrævet indstilling %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr ""
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "navn"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr ""
@@ -1177,18 +1178,34 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "ukendt"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "videobilleder"
+#~ msgid "Content frame rate"
+#~ msgstr "Indholds billedhastighed"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "Indhold der skal splejses skal have samme billedhastighed."
+
+#, fuzzy
+#~ msgid "Frame rate"
+#~ msgstr "Video billedhastighed"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "lydfil kunne ikke indlæses"
+
+#~ msgid "frames per second"
+#~ msgstr "billeder pr. sekund"
+
#~ msgid "Video length"
#~ msgstr "Video længde"
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index bf16e08e9..ef33ffdab 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-04-26 02:08+0100\n"
"Last-Translator: Carsten Kurz\n"
"Language-Team: DCP-o-matic translators\n"
@@ -18,18 +18,23 @@ msgstr ""
"X-Generator: Poedit 1.6.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [Ton]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [Film]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [Film]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19:1"
@@ -70,77 +75,77 @@ msgstr "Beim Bearbeiten der Datei %1 trat ein Fehler auf."
msgid "Analyse audio"
msgstr "Audio analysieren"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Audioeigenschaften"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Audioabtastrate wird von %1kHz auf %2kHz angepasst."
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Audioabtastrate wird auf %1kHz angepasst."
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Audioabtastrate wird nicht verändert werden."
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 extended colour gamut"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 constant luminance"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 for a 10-bit system"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 for a 12-bit system"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 non-constant luminance"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bits pro pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -156,7 +161,7 @@ msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Audio Kanäle"
@@ -164,33 +169,33 @@ msgstr "Audio Kanäle"
msgid "Checking existing image data"
msgstr "Überprüfe bestehende Bilddateien"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Grundfarbbezug ('primaries')"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Farbumfang"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Farbkonvertierung"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Farbraum"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Tonübersicht berechnen"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Zusammenfassung berechnen"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Bildübersicht berechnen"
@@ -198,96 +203,89 @@ msgstr "Bildübersicht berechnen"
msgid "Content and DCP have the same rate.\n"
msgstr "Quelle und DCP haben dieselbe Bildrate. Gut ;-)\n"
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Audio Abtastrate (Quelle)"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Inhalt Bildrate"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"Zu verbindende Inhalte müssen identische Untertitel-Einstellungen verwenden."
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
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:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr ""
"Zu verbindende Inhalte müssen identische Ein-/Ausblendungs-Einstellungen "
"verwenden."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-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:160
+#: src/lib/video_content.cc:147
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/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr ""
"Zu verbindende Inhalte müssen die gleichen Zeichensätze für Untertitel "
"verwenden."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Inhalt Video ist %1x%2"
@@ -311,7 +309,7 @@ msgstr "Fehler beim Dekodieren der JPEG2000 Datei %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Fehler beim Dekodieren der Bild-Datei (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "Kein Pixelformat erkannt"
@@ -351,7 +349,7 @@ msgstr "Fehler beim Start der Übertragung"
msgid "Could not write to remote file (%1)"
msgstr "Entfernte Datei (%1) konnte nicht gespeichert werden"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Beschnitten zu %1x%2"
@@ -363,19 +361,19 @@ msgstr "D-Box primärer TC"
msgid "D-BOX secondary"
msgstr "D-BOX sekundärer TC"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML Untertitel"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "Audio Abtastrate (angepasst für DCP/48KHz)"
@@ -395,7 +393,7 @@ msgstr ""
"DCP-o-matic konnte die Datei %1 nicht öffnen. Vielleicht existiert sie nicht "
"oder ist in einem unerwarteten Format."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr ""
@@ -431,7 +429,7 @@ msgstr ""
"Mit freundlichen Gruessen,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Anzeigeseitenverhältnis (DAR):"
@@ -483,7 +481,7 @@ msgstr "Fehler: (%1)"
msgid "Examine content"
msgstr "Inhalt wird überprüft"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -499,15 +497,15 @@ msgstr "Konnte KDM Email nicht senden (%1)"
msgid "Feature"
msgstr "Hauptfilm - FTR"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Länge und Untertitel werden ermittelt"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Suche Untertitel"
@@ -515,15 +513,11 @@ msgstr "Suche Untertitel"
msgid "Flat"
msgstr "1.85:1 (Flat/BW)"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Bildrate"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Voll"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Voll (0-%1)"
@@ -531,27 +525,29 @@ msgstr "Voll (0-%1)"
msgid "Full frame"
msgstr "Full Container (DCI)"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+msgid "Full length in audio samples at DCP rate"
msgstr "Gesamtlänge in Audio Blöcken (DCP)"
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
msgstr "Gesamtlänge in Audio Blöcken (Quelle)"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr "Gesamtlänge in Bildern (DCP)"
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Gesamtlänge in Bildern (Quelle)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -559,7 +555,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Gradient Glätter"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -571,15 +567,15 @@ msgstr "HI"
msgid "High quality 3D denoiser"
msgstr "3D Rauschunterdrückung hoher Qualität"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB or sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -595,11 +591,11 @@ msgstr "KDM Zustellung: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel De-Interlacer"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -619,13 +615,13 @@ msgstr "Surround hinten links"
msgid "Left surround"
msgstr "Surround links"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Länge"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -633,27 +629,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "LFE (Subwoofer)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Begrenzt"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Begrenzt (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Linear"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logarithmisch (Bereich 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logarithmisch (Bereich 316:1 )"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -698,7 +694,7 @@ msgstr "Originalgröße"
msgid "No stretch"
msgstr "Proportional (unverzerrt)"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Keine gültigen Bilddaten gefunden."
@@ -710,13 +706,13 @@ msgstr "Rauschunterdrückung"
msgid "OK (ran for %1)"
msgstr "OK (Dauer %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr ""
"Nur das erste Segment der zu verbindenden Inhalte kann vom Anfang her "
"beschnitten werden."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr ""
"Nur das letzte Segment der zu verbindenden Inhalte kann vom Ende her "
@@ -734,7 +730,7 @@ msgstr "Überbestimmte Wavelet Entrauschung"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Mit Schwarz gefüllt auf Containerformat %1 (%2x%3)"
@@ -750,11 +746,11 @@ msgstr "Programmfehler bei %1:%2"
msgid "Public Service Announcement"
msgstr "Hinweis - PSA"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -762,10 +758,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Freigabehinweis - RTG"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601 (SD)"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601 (SD)"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601 (SD)"
@@ -774,10 +780,11 @@ msgstr "Rec. 601 (SD)"
msgid "Rec. 709"
msgstr "Rec. 709 (HD)"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Aktlängen im Projekt unterscheiden sich von DCP; Aktunterteilung wurde auf "
"Inhalts-Segmentgrenzen gesetzt!"
@@ -798,32 +805,32 @@ msgstr "Surround hinten rechts"
msgid "Right surround"
msgstr "Surround rechts"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -831,7 +838,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "SSH Fehler (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Skaliert auf %1x%2"
@@ -847,11 +854,11 @@ msgstr "Sende Email"
msgid "Short"
msgstr "Kurzfilm - SHR"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Größe"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Einige Audioanteile werden in der Abtastrate geändert auf %1kHz"
@@ -875,15 +882,15 @@ msgstr "Telecine Filter"
msgid "Test"
msgstr "Test - TST"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Untertitel (Text)"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "Das DCP enthält in einigen Akten ('Reels') keinen Ton."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "Das DCP enthält in einigen Akten ('Reels') keine Untertitel."
@@ -906,19 +913,27 @@ msgstr ""
"Das Laufwerk, auf dem der Film gespeichert werden soll, hat zu wenig freien "
"Speicher. Bitte Speicher freigeben und nochmal versuchen."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr ""
"Einige Audioanteile überlappen mit diesem DCP, bitte entfernen Sie diese (-"
">Zeitleiste)!"
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr ""
"Einige Untertitel überlappen mit diesem DCP, bitte entfernen Sie diese (-"
">Zeitleiste)!"
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr ""
"Einige Videoanteile überlappen mit diesem DCP, bitte entfernen Sie diese (-"
@@ -934,7 +949,7 @@ msgstr ""
"Bit Betriebssystem ausführen, versuchen Sie, die Anzahl der Encoding Threads "
"in den Voreinstellungen n zu reduzieren."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -943,7 +958,7 @@ msgstr ""
"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:384
+#: src/lib/film.cc:383
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 "
@@ -977,7 +992,7 @@ msgstr "Ungültiges Bildformat vom Server erhalten"
msgid "Unknown error"
msgstr "Unbekannter Fehler"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Audio Sample Format (%1) nicht erkannt."
@@ -985,11 +1000,11 @@ msgstr "Audio Sample Format (%1) nicht erkannt."
msgid "Unsharp mask and Gaussian blur"
msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Unbestimmt"
@@ -1009,7 +1024,7 @@ msgstr "Upmix L"
msgid "Upmix R"
msgstr "Upmix R"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1023,13 +1038,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Videoeigenschaften"
@@ -1041,7 +1055,7 @@ msgstr "VI"
msgid "Waiting"
msgstr "Warte..."
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1049,23 +1063,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Und ein weiterer De-Interlacer ('YADIF')"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
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!"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[Bewegte Bilder]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[Standbild]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[Untertitel]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "Darf keine Schrägstriche enthalten"
@@ -1077,11 +1091,11 @@ msgstr "Zeit für Verbindungsaufbau abgelaufen"
msgid "connecting"
msgstr "verbinde..."
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "Containerformat"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "Inhaltsbeschreibung"
@@ -1093,18 +1107,14 @@ msgstr "kopiere %1"
msgid "could not create file %1"
msgstr "Datei %1 konnte nicht erstellt werden."
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "Keine Spur-Information gefunden"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "Audio konnte nicht in DCP (%1) kopiert werden"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "Audiodatei kann nicht zum Lesen geöffnet werden."
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "Datei %1 konnte nicht geöffnet werden."
@@ -1145,10 +1155,6 @@ msgstr "fps"
msgid "frames"
msgstr "Bilder"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "Bilder pro Sekunde"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1163,15 +1169,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "Benötigte Einstellung %1 fehlt"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "wird verschoben"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "Name"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "Pixelseitenverhältnis"
@@ -1190,18 +1196,33 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "Standbild"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "unbekannt"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "Video Bilder"
+#~ msgid "Content frame rate"
+#~ msgstr "Inhalt Bildrate"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
+
+#~ msgid "Frame rate"
+#~ msgstr "Bildrate"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "Audiodatei kann nicht zum Lesen geöffnet werden."
+
+#~ msgid "frames per second"
+#~ msgstr "Bilder pro Sekunde"
+
#~ msgid "SubRip subtitles"
#~ msgstr "SubRip Untertitel"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 764b2babe..3d8ed1d16 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-04-26 00:01-0400\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,18 +17,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [película]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [película]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -69,77 +74,77 @@ msgstr "Ha ocurrido un error con el fichero %1."
msgid "Analyse audio"
msgstr "Analizar audio"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Audio"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "EL audio será remuestreado de %1kHz a %2kHz."
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "EL audio será remuestreado a %1kHz."
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "El audio no será remuestreado."
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "Gama de color extendido BT1361"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 a luminosidad constante"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 para un sistema de 10-bit"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 para un sistema de 12 bits"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 a luminosidad no constante"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bits por pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -155,7 +160,7 @@ msgstr "No se puede usar el formato de pixel %1 para %2"
msgid "Centre"
msgstr "Centro"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Canales"
@@ -163,33 +168,33 @@ msgstr "Canales"
msgid "Checking existing image data"
msgstr "Comprobando las imágenes existentes"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Colores primarios"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Rango de color"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Características de la transferencia de color"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Espacio de color"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Calculando la firma resumen del audio"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Calculando la firma resumen"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Calculando la firma resumen de imagen"
@@ -197,86 +202,79 @@ msgstr "Calculando la firma resumen de imagen"
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:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Velocidad del contenido de audio"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Velocidad del contenido"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
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/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
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:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "Para unir contenido debe tener el mismo recorte."
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Para unir contenido debe tener los mismos fundidos."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
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/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Para unir contenido debe tener la misma redimensión."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-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:160
+#: src/lib/video_content.cc:147
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/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Para unir contenido debe usar la misma fuente."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "El video es %1x%2"
@@ -300,7 +298,7 @@ msgstr "No se pudo descodificar el fichero JPEG2000 %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "No se pudo descodificar el fichero de imagen (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "No se pudo encontrar el formato de los píxeles del vídeo."
@@ -340,7 +338,7 @@ msgstr "No se pudo iniciar la transferencia"
msgid "Could not write to remote file (%1)"
msgstr "No se pudo escribir el fichero remoto (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Recortado a %1x%2"
@@ -352,19 +350,19 @@ msgstr "Primario D-BOX"
msgid "D-BOX secondary"
msgstr "Secundario D-BOX"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "Subtítulos DCP XML"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "Velocidad del DCP"
@@ -384,7 +382,7 @@ msgstr ""
"DCP-o-matic no pudo abrir el fichero %1. Quizás no existe o está en un "
"formato inesperado."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
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."
@@ -419,7 +417,7 @@ msgstr ""
"Atentamente,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Proporción de aspecto mostrada"
@@ -471,7 +469,7 @@ msgstr "Error: (%1)"
msgid "Examine content"
msgstr "Examinar contenido"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -487,15 +485,15 @@ msgstr "Error al enviar el correo electrónico (%1)"
msgid "Feature"
msgstr "Película"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Película"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Buscando duración y subtítulos"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Buscando subtítulos"
@@ -503,15 +501,11 @@ msgstr "Buscando subtítulos"
msgid "Flat"
msgstr "Flat"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Velocidad"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Completo"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Completo (0-%1)"
@@ -519,27 +513,29 @@ msgstr "Completo (0-%1)"
msgid "Full frame"
msgstr "Frame completo"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+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:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+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:340
+#: src/lib/audio_content.cc:316
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:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Longitud total en frames de vídeo a la velocidad del contenido"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -547,7 +543,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Gradient debander"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -559,15 +555,15 @@ msgstr "Sordos"
msgid "High quality 3D denoiser"
msgstr "Reductor de ruido 3D de alta calidad"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB o sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -583,11 +579,11 @@ msgstr "Envío de KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel deinterlacer"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -607,13 +603,13 @@ msgstr "Surround trasero izquierda"
msgid "Left surround"
msgstr "Surround izquierda"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Duración"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -621,27 +617,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (bajos)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Limitado"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Limitado (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Lineal"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logarítmico (rango 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logarítmico (rango 316:1)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -685,7 +681,7 @@ msgstr "No redimensionar"
msgid "No stretch"
msgstr "Sin deformación"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "No se encontraron imágenes válidas en la carpeta."
@@ -697,12 +693,12 @@ msgstr "Reducción de ruido"
msgid "OK (ran for %1)"
msgstr "OK (ejecución %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr ""
"Solo la primera pieza a ser unida puede tener un recorte en su comienzo."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Solo la última pieza a ser unida puede tener un recorte en su final."
@@ -718,7 +714,7 @@ msgstr "Overcomplete wavelet denoiser"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Completado con negro para cubrir el contenedor %1 (%2x%3)"
@@ -734,11 +730,11 @@ msgstr "Error de programación en %1:%2"
msgid "Public Service Announcement"
msgstr "Anuncio de servicio público"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -746,10 +742,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Clasificación"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -758,10 +764,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"La duración de las bobinas no coincide con la especificada en el DCP; "
"seleccione el modo de bobinas ‘dividir por contenido’."
@@ -782,32 +789,32 @@ msgstr "Surround trasero derecha"
msgid "Right surround"
msgstr "Surround derecha"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 para sistemas de 10, 12, 14 y 16 bits"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -815,7 +822,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "error SSH (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Redimensionado a %1x%2"
@@ -831,11 +838,11 @@ msgstr "Enviando correo"
msgid "Short"
msgstr "Cortometraje"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Tamaño"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "El audio será remuestreado a %1kHz"
@@ -859,15 +866,15 @@ msgstr "Filtro telecine"
msgid "Test"
msgstr "Test"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Subtítulos de texto"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "El DCP no tiene sonido en todas las bobinas."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "El DCP no tiene subtítulos en todas las bobinas."
@@ -890,15 +897,23 @@ msgstr ""
"En el dispositivo donde se encuentra la película queda poco espacio. Libere "
"espacio en el disco y pruebe de nuevo."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Hay otro contenido de audio superpuesto a este DCP; elimínelo."
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "Hay otros subtítulos superpuestos a este DCP; elimínelos."
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Hay otro contenido de vídeo superpuesto a este DCP; elimínelo."
@@ -912,7 +927,7 @@ msgstr ""
"sistema operativo de 32 bits, trate de reducir el número de hilos de "
"codificación en la sección General de las preferencias."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -921,7 +936,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:384
+#: src/lib/film.cc:383
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 "
@@ -955,7 +970,7 @@ msgstr "El servidor recibió un tipo de imagen inesperada"
msgid "Unknown error"
msgstr "Error desconocido"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato de audio desconocido (%1)"
@@ -963,11 +978,11 @@ msgstr "Formato de audio desconocido (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Máscara de desenfoque Gaussiano"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Sin especificar"
@@ -987,7 +1002,7 @@ msgstr "Upmix L"
msgid "Upmix R"
msgstr "Upmix R"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1001,13 +1016,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Vídeo"
@@ -1019,7 +1033,7 @@ msgstr "Ciegos"
msgid "Waiting"
msgstr "Esperando"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1027,23 +1041,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "Tienes que añadir contenido al DCP antes de crearlo."
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[imágenes en movimiento]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[imagen fija]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[subtítulos]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "no puede contener barras"
@@ -1055,11 +1069,11 @@ msgstr "tiempo de conexión agotado"
msgid "connecting"
msgstr "conectando"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "continente"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "tipo de contenido"
@@ -1071,18 +1085,14 @@ msgstr "copiando %1"
msgid "could not create file %1"
msgstr "No se pudo crear el fichero (%1)"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "no se pudo encontrar información del flujo"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "no se puede mover el audio en el DCP (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "no se pudo abrir el fichero de audio para lectura"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "no se pudo abrir el fichero %1"
@@ -1123,10 +1133,6 @@ msgstr "fps"
msgid "frames"
msgstr "fotogramas"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "imágenes por segundo"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1141,15 +1147,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "falta una configuración obligatoria %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "moviendo"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "nombre"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "proporción de aspecto de pixel"
@@ -1168,18 +1174,33 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "imagen fija"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "desconocido"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "fotogramas"
+#~ msgid "Content frame rate"
+#~ msgstr "Velocidad del contenido"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "Para unir contenido debe tener la misma velocidad de imagen."
+
+#~ msgid "Frame rate"
+#~ msgstr "Velocidad"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "no se pudo abrir el fichero de audio para lectura"
+
+#~ msgid "frames per second"
+#~ msgstr "imágenes por segundo"
+
#~ msgid "SubRip subtitles"
#~ msgstr "Subtítulos SubRip"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index cf0b0d725..5919bff55 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-04-28 21:17+0100\n"
"Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
"Language-Team: \n"
@@ -17,18 +17,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.3\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [vidéo]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [vidéo]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -69,77 +74,77 @@ msgstr "Une erreur s'est produite lors du traitement du fichier %1."
msgid "Analyse audio"
msgstr "Analyse audio"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Audio"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Le son sera ré-échantillonné de %1kHz à %2kHz."
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Le son sera ré-échantillonné à %1kHz."
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Le son ne sera pas ré-échantillonné."
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 gamme de couleurs étendue"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 luminance constante"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 pour un système 10-bit"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 pour un système 12-bit"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 luminance non-constante"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "bits par pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -155,7 +160,7 @@ msgstr "Format du pixel %1 non géré par %2"
msgid "Centre"
msgstr "Centre"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Canaux"
@@ -163,33 +168,33 @@ msgstr "Canaux"
msgid "Checking existing image data"
msgstr "Recherche de données images existantes"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Couleurs primaires"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Plage de couleurs"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Caractéristique conversion colorimétrique"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Espace colorimétrique"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Fabrication rendu audio"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "fabrication rendu"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Fabrication rendu image"
@@ -197,93 +202,86 @@ msgstr "Fabrication rendu image"
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:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Cadence du contenu audio"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Cadence du contenu"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
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/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
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:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
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:176
+#: src/lib/video_content.cc:163
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/video_content.cc:152
+#: src/lib/video_content.cc:143
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/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr ""
"Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr "Le contenu à ajouter doit avoir la même cadence d'images"
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
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/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Le contenu à ajouter doit avoir la même police de sous-titres"
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Le contenu vidéo est %1x%2"
@@ -307,7 +305,7 @@ msgstr "Ne parvient pas à décoder le fichier JPEG2000 %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Ne parvient pas à décoder le fichier image (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "format du pixel pour la vidéo non determiné"
@@ -347,7 +345,7 @@ msgstr "Transfert de fichier impossible"
msgid "Could not write to remote file (%1)"
msgstr "Écriture vers fichier distant (%1) impossible"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Rognage de %1x%2"
@@ -359,19 +357,19 @@ msgstr "D-BOX primaire"
msgid "D-BOX secondary"
msgstr "D-BOX secondaire"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "Sous-titres XML du DCP"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "Cadence du DCP"
@@ -391,7 +389,7 @@ msgstr ""
"DCP-o-matic ne peut pas ouvrir le fichier %1. Soit il n'existe pas, soit il "
"n'est pas au bon format."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
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é."
@@ -426,7 +424,7 @@ msgstr ""
"Cordialement,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Format d'affichage"
@@ -479,7 +477,7 @@ msgstr "Erreur: %1"
msgid "Examine content"
msgstr "Examen du contenu"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -495,15 +493,15 @@ msgstr "Echec d'envoi email (%1)"
msgid "Feature"
msgstr "Feature"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Recherche durées et sous-titres"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Recherche sous-titres"
@@ -511,15 +509,11 @@ msgstr "Recherche sous-titres"
msgid "Flat"
msgstr "Flat"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Cadence"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Complet"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "en cours (0-%1)"
@@ -527,27 +521,29 @@ msgstr "en cours (0-%1)"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+msgid "Full length in audio samples at DCP rate"
msgstr "Pleine durée en frames audio à la cadence du DCP"
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
msgstr "Pleine durée en frames audio à la cadence du contenu"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
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:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Pleine durée en images vidéo à la cadence du contenu"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -555,7 +551,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Corrections des bandes par dégradé"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -567,15 +563,15 @@ msgstr "Déficients Auditifs"
msgid "High quality 3D denoiser"
msgstr "Débruiteur 3D haute qualité"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB or sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -591,11 +587,11 @@ msgstr "Envoi KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Désentrelaceur noyau"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "G"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -615,13 +611,13 @@ msgstr "Surround arrière gauche"
msgid "Left surround"
msgstr "Arrière gauche"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Durée"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Bf"
@@ -629,27 +625,27 @@ msgstr "Bf"
msgid "Lfe (sub)"
msgstr "Basses fréquences"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Limité"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Limité (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Linéaire"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logarithmique (plage 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logarithmique (plage 316:1)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "ArG"
@@ -693,7 +689,7 @@ msgstr "Pas de mise à l'échelle"
msgid "No stretch"
msgstr "Sans déformation"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Aucun fichier image valide dans ce dossier."
@@ -705,11 +701,11 @@ msgstr "Réduction de bruit"
msgid "OK (ran for %1)"
msgstr "OK (processus %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Seul le premier contenu à ajouter peut être rogné au point d'entrée."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Seul le dernier contenu à ajouter peut être rogné au point de sortie."
@@ -725,7 +721,7 @@ msgstr "Réduction de bruit par ondelettes"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Ajout de bandes noires pour remplir le format image %1 (%2x%3)"
@@ -741,11 +737,11 @@ msgstr "Erreur de programme à %1:%2"
msgid "Public Service Announcement"
msgstr "Public Service Announcement"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "D"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -753,10 +749,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Classification"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -765,10 +771,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Les durées de bobines dans le projet diffèrent de celles du DCP; veuillez "
"scinder en bobines par contenu vidéo. "
@@ -789,32 +796,32 @@ msgstr "Surround arrière droite"
msgid "Right surround"
msgstr "Arrière droite"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "ArD"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 pour systèmes 10, 12, 14 et 16 bits"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -822,7 +829,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "Erreur SSH (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Mis à l'échelle de %1x%2"
@@ -838,11 +845,11 @@ msgstr "Envoi email"
msgid "Short"
msgstr "Short"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Taille"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Certains sons seront ré-échantillonné à %1kHz"
@@ -866,15 +873,15 @@ msgstr "Filtre télécinéma"
msgid "Test"
msgstr "Test"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Sous-titres textes"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "Ce DCP ne posséde pas de son dans chacune de ses bobines"
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "Ce DCP ne posséde pas de sous-titres dans chacune de ses bobines"
@@ -895,15 +902,23 @@ msgstr ""
"Le disque contenant le film est presque plein. Libérez de l'espace et "
"essayez à nouveau."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Il existe d'autres contenus audio dans ce DCP, enlevez les."
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "Il existe d'autres contenus de sous-titres dans ce DCP, enlevez les."
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Il existe d'autres contenus video dans ce DCP, enlevez les."
@@ -917,7 +932,7 @@ msgstr ""
"32 bit, essayez de réduire le nombre de processus à utiliser dans l'onglet "
"principal des préférences."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -925,7 +940,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:384
+#: src/lib/film.cc:383
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 "
@@ -959,7 +974,7 @@ msgstr "Type d'image non conforme reçu par le serveur"
msgid "Unknown error"
msgstr "Erreur inconnue"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Échantillonnage audio (%1) inconnu"
@@ -967,11 +982,11 @@ msgstr "Échantillonnage audio (%1) inconnu"
msgid "Unsharp mask and Gaussian blur"
msgstr "Adoucissement et flou Gaussien"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Non-spécifié"
@@ -991,7 +1006,7 @@ msgstr "Gauche sur-mixé"
msgid "Upmix R"
msgstr "Droit sur-mixé"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1005,13 +1020,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Vidéo"
@@ -1023,7 +1037,7 @@ msgstr "Déficients Visuels"
msgid "Waiting"
msgstr "En cours"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1031,23 +1045,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Un autre filtre de désentrelacement"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "Ajoutez un contenu pour créer le DCP"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[séquence d'images]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[image fixe]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[sous-titres]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "slash interdit"
@@ -1059,11 +1073,11 @@ msgstr "temps de connexion expiré"
msgid "connecting"
msgstr "connexion"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "conteneur"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "type de contenu"
@@ -1075,18 +1089,14 @@ msgstr "copie de %1"
msgid "could not create file %1"
msgstr "Écriture vers fichier distant (%1) impossible"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "information du flux introuvable"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "ne peut pas transférer l'asset audio dans le DCP (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "lecture du fichier audio impossible"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "lecture du fichier (%1) impossible"
@@ -1127,10 +1137,6 @@ msgstr "ips"
msgid "frames"
msgstr "image"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "images par seconde"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1145,15 +1151,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "paramètre %1 manquant"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "séquence"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "nom"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "ratio H L des pixels"
@@ -1172,18 +1178,33 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "fixe"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "Inconnu"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "images"
+#~ msgid "Content frame rate"
+#~ msgstr "Cadence du contenu"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "Le contenu à ajouter doit avoir la même cadence d'images"
+
+#~ msgid "Frame rate"
+#~ msgstr "Cadence"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "lecture du fichier audio impossible"
+
+#~ msgid "frames per second"
+#~ msgstr "images par seconde"
+
#~ msgid "SubRip subtitles"
#~ msgstr "Sous-titres SubRip"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 4b72b3caf..b6fdff9d2 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-03-10 11:05+0100\n"
"Last-Translator: William Fanelli <william.f@impronte.com>\n"
"Language-Team: \n"
@@ -17,18 +17,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [film]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [film]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -69,77 +74,77 @@ msgstr "Errore durante l'elaborazione del file %1."
msgid "Analyse audio"
msgstr "Analizzare audio"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Audio"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "L'Audio sarà ricampionato a %1kHz"
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "L'audio non sarà ricampionato"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 gamma colori estesa"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 luminanza costante"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 per sistema 10-bit"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 per sistema 12-bit"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 luminanza non costante"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bit per pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -155,7 +160,7 @@ msgstr "Non posso gestire il formato di pixel %1 durante %2"
msgid "Centre"
msgstr "Centro"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Canali audio"
@@ -163,33 +168,33 @@ msgstr "Canali audio"
msgid "Checking existing image data"
msgstr "Controllo dati immagine esistenti in corso"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Colori primari"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Range dei colori"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Caratteristica di trasferimento del colore"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Spazio colore"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Calcolo del digest audio"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Calcolo del digest"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Calcolo del digest delle immagini"
@@ -197,88 +202,81 @@ msgstr "Calcolo del digest delle immagini"
msgid "Content and DCP have the same rate.\n"
msgstr "La sorgente e il DCP hanno lo stesso rate.\n"
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Frame rate audio sorgente"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Frame rate sorgente"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"Il contenuto da unire deve avere la stessa impostazione di 'masterizza "
"sottotitoli'."
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Il contenuto da unire deve avere la stessa impostazione di 'usa sottotitoli'."
-#: src/lib/audio_content.cc:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
msgid "Content to be joined must have the same colour conversion."
msgstr "Il contenuto da unire deve avere la stessa conversione colore."
-#: src/lib/video_content.cc:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "Il contenuto da unire deve avere lo stesso crop."
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Il contenuto da unire deve avere le stesse dissolvenze."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
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/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Il contenuto da unire deve avere la stessa scala."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr "Il contenuto da unire deve avere lo stesso frame rate."
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr "Il contenuto da unire deve avere lo stesso tipo di frame rate video."
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Il contenuto da unire deve usare gli stessi font."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Il video originale è %1x%2"
@@ -302,7 +300,7 @@ msgstr "Non posso decodificare il file JPEG2000 %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Non posso decodificare il file immagine (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "Non posso trovare informazioni sul formato pixel del video."
@@ -342,7 +340,7 @@ msgstr "Non posso avviare il trasferimento"
msgid "Could not write to remote file (%1)"
msgstr "Non posso scrivere il file remoto (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Tagliato da %1x%2"
@@ -354,19 +352,19 @@ msgstr "D-BOX principale"
msgid "D-BOX secondary"
msgstr "D-BOX secondario"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML sottotitoli"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "DCP frame rate"
@@ -386,7 +384,7 @@ msgstr ""
"DCP-o-matic non può aprire il file %1. Forse non esiste oppure è in un "
"formato non riconosciuto."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic non supporta più il filtro '%1', ed è stato disattivato."
@@ -421,7 +419,7 @@ msgstr ""
"Distinti saluti,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Rapporto dello schermo"
@@ -473,7 +471,7 @@ msgstr "Errore: %1"
msgid "Examine content"
msgstr "Esamino il contenuto"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -489,15 +487,15 @@ msgstr "Invio email fallito (%1)"
msgid "Feature"
msgstr "Film"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Trova durata e sottotitoli"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Trova sottotitoli"
@@ -505,15 +503,11 @@ msgstr "Trova sottotitoli"
msgid "Flat"
msgstr "Flat"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Frame rate"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -521,27 +515,29 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Fill frame"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+msgid "Full length in audio samples at DCP rate"
msgstr "Lunghezza completa nei frame audio alla velocità DCP"
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
msgstr "Lunghezza completa nei frame audio alla velocità sorgente"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr "Lunghezza completa nei frame video alla velocità DCP"
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Lunghezza completa nei frame video alla velocità sorgente"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -549,7 +545,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Gradiente debander"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -561,15 +557,15 @@ msgstr ""
msgid "High quality 3D denoiser"
msgstr "Riduttore di rumore 3D di alta qualità"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB o sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -585,11 +581,11 @@ msgstr "Consegna KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Deinterlacciatore Kernel"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -609,13 +605,13 @@ msgstr "Surround posteriore sinistro"
msgid "Left surround"
msgstr "Surround sinistro"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Durata"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -623,27 +619,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Limitato"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Limitato (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Lineare"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logaritmico (range 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logaritmico (range 316:1)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -687,7 +683,7 @@ msgstr "Non scalare"
msgid "No stretch"
msgstr "Non smongolare"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Nessun file immagine trovato nella cartella."
@@ -699,11 +695,11 @@ msgstr "Riduzione del rumore"
msgid "OK (ran for %1)"
msgstr "OK (eseguito al %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Soltanto il primo spezzone da unire può avere un trim iniziale."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Soltanto l'ultimo spezzone da unire può avere un trim finale"
@@ -719,7 +715,7 @@ msgstr ""
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Aggiunto il nero fino a riempire tutto lo schermo %1 (%2x%3)"
@@ -735,11 +731,11 @@ msgstr "Errore di programmazione a %1:%2"
msgid "Public Service Announcement"
msgstr "Annuncio di pubblico servizio"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -747,10 +743,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Punteggio"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -759,10 +765,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"La lunghezza della bobina nel progetto è diversa da quella nel DCP; imposta "
"la modalità della bobina su 'suddividi per contenuto video'."
@@ -783,32 +790,32 @@ msgstr "Surround posteriore destro"
msgid "Right surround"
msgstr "Surround destro"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -816,7 +823,7 @@ msgstr ""
msgid "SSH error (%1)"
msgstr "Errore SSH (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Scalato a %1x%2"
@@ -832,11 +839,11 @@ msgstr "Invia e-mail"
msgid "Short"
msgstr "Corto"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Dimensione"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Parte dell'audio sarà ricampionato a %1kHz"
@@ -860,15 +867,15 @@ msgstr "Filtro telecinema"
msgid "Test"
msgstr "Prova"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "sottotitoli"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "Il DCP non ha sonoro in nessuna delle parti."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "Il DCP non ha sottotitoli in nessuna delle parti."
@@ -889,16 +896,24 @@ msgstr ""
"Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
"altro spazio e riprovare."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "C'è un altro flusso audio che si sovrappone a questo DCP; rimuoverlo."
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr ""
"C'è un altro file di sottotitoli che si sovrappone a questo DCP; rimuoverlo."
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "C'è un altro flusso video che si sovrappone a questo DCP; rimuoverlo."
@@ -912,7 +927,7 @@ msgstr ""
"prova a ridurre il numero di threads dedicati alla codifica, tramite la "
"scheda Generale delle Preferenze."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -920,7 +935,7 @@ msgstr ""
"Questo film è stato creato con una versione superiore di DCP-o-matic, e non "
"può essere caricato con questa versione. Ci spiace!"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
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 "
@@ -954,7 +969,7 @@ msgstr "Immagine ricevuta dal server inattesa"
msgid "Unknown error"
msgstr "Errore sconosciuto"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato di campionamento audio non riconosciuto (%1)"
@@ -962,11 +977,11 @@ msgstr "Formato di campionamento audio non riconosciuto (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Maschera di contrasto e sfocatura Gaussiana"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Non specificato"
@@ -986,7 +1001,7 @@ msgstr "Upmix L"
msgid "Upmix R"
msgstr "Upmix R"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1000,13 +1015,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Video"
@@ -1018,7 +1032,7 @@ msgstr "Ipovedente"
msgid "Waiting"
msgstr "Attendere"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1026,23 +1040,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Altro filtro di deinterlacciamento"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[spostamento immagini]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[fermo immagine]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[sottotitoli]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "non può contenere slash"
@@ -1054,11 +1068,11 @@ msgstr "connessione scaduta"
msgid "connecting"
msgstr "connessione in corso"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "contenitore"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "tipo di contenuto"
@@ -1070,18 +1084,14 @@ msgstr "copia %1"
msgid "could not create file %1"
msgstr "Non posso creare il file (%1)"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "non riesco a trovare informazioni sul flusso"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "non posso spostare l'asset audio nel DCP (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "non riesco ad aprire il file in lettura"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "non riesco ad aprire %1"
@@ -1122,10 +1132,6 @@ msgstr "fps"
msgid "frames"
msgstr "fotogrammi"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "fotogrammi al secondo"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1140,15 +1146,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "impostazione obbligatoria mancante %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "spostamento"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "nome"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "rapporto pixel"
@@ -1167,18 +1173,33 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "fermo immagine"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "sconosciuto"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "fotogrammi video"
+#~ msgid "Content frame rate"
+#~ msgstr "Frame rate sorgente"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "Il contenuto da unire deve avere lo stesso frame rate."
+
+#~ msgid "Frame rate"
+#~ msgstr "Frame rate"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "non riesco ad aprire il file in lettura"
+
+#~ msgid "frames per second"
+#~ msgstr "fotogrammi al secondo"
+
#~ msgid "could not open file for reading"
#~ msgstr "non riesco ad aprire il file per leggerlo"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 6c1a18e52..9a09a8a90 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-04-27 05:20+0200\n"
"Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
"Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
@@ -18,18 +18,23 @@ msgstr ""
"X-Generator: Poedit 1.8.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [video]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [video]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1,19:1"
@@ -70,77 +75,77 @@ msgstr "Er is een fout opgetreden bij de verwerking van bestand %1."
msgid "Analyse audio"
msgstr "Analyseer audio"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Audio"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Audio wordt geresampled van %1kHz naar %2kHz"
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Audio wordt geresampled naar %1kHz"
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Audio wordt niet geresampled"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 uitgebreid gamut"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 constante luminantie"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 voor een 10-bit systeem"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 voor een 12-bit systeem"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 niet-constante luminantie"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bits per pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -156,7 +161,7 @@ msgstr "Kan pixelformaat %1 niet verwerken tijdens %2"
msgid "Centre"
msgstr "Midden (C)"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Kanalen"
@@ -164,33 +169,33 @@ msgstr "Kanalen"
msgid "Checking existing image data"
msgstr "Bestaande beelddata controleren"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Primaire kleuren"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Keurbereik"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Kleuroverdrachtskarakteristiek"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Kleurruimte"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Berekenen audio-digest"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Berekenen digest"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Berekenen beeld-digest"
@@ -198,89 +203,82 @@ msgstr "Berekenen beeld-digest"
msgid "Content and DCP have the same rate.\n"
msgstr "Content en DCP hebben dezelfde frame rate.\n"
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Content audio frame rate"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Content frame rate"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
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/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
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:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "Samen te voegen content moet dezelfde bijsnijding hebben."
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Samen te voegen content moet dezelfde fade-instelling hebben."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "Samen te voegen content moet dezelfde beeldgrootte hebben."
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Samen te voegen content moet dezelfde schaalinstelling hebben."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-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:160
+#: src/lib/video_content.cc:147
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/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Samen te voegen content moet hetzelfde lettertype gebruiken."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Content-video is %1x%2"
@@ -304,7 +302,7 @@ msgstr "Kan JPEG2000-bestand %1 (%2) niet decoderen"
msgid "Could not decode image file (%1)"
msgstr "Kan beeldbestand %1 (%2) niet decoderen"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "Kan pixelformaat voor video niet vinden"
@@ -344,7 +342,7 @@ msgstr "Kan overdracht niet starten"
msgid "Could not write to remote file (%1)"
msgstr "Kan extern bestand niet schrijven (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Bijgesneden naar %1x%2"
@@ -356,19 +354,19 @@ msgstr "D-BOX primair (DBP)"
msgid "D-BOX secondary"
msgstr "D-BOX secundair (DBS)"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML ondertitels"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "DCP frame rate"
@@ -388,7 +386,7 @@ msgstr ""
"DCP-o-matic kan het bestand %1 niet openen. Misschien bestaat het niet of "
"wordt het formaat niet ondersteund."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr ""
@@ -425,7 +423,7 @@ msgstr ""
"Met vriendelijke groet,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Weergave-beeldverhouding"
@@ -477,7 +475,7 @@ msgstr "Fout: %1"
msgid "Examine content"
msgstr "Onderzoeken content"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -493,15 +491,15 @@ msgstr "Versturen email mislukt (%1)"
msgid "Feature"
msgstr "Feature"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Lengte bepalen en ondertitels zoeken"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Ondertitels zoeken"
@@ -509,15 +507,11 @@ msgstr "Ondertitels zoeken"
msgid "Flat"
msgstr "1,85:1 (Flat)"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Frame rate"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Volledig"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Volledig (0-%1)"
@@ -525,27 +519,29 @@ msgstr "Volledig (0-%1)"
msgid "Full frame"
msgstr "1,896:1 (Full DCI Container)"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+msgid "Full length in audio samples at DCP rate"
msgstr "Volledige lengte in audio frames bij DCP-snelheid"
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
msgstr "Volledige lengte in audio frames bij content-snelheid"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr "Volledige lengte in video frames bij DCP-snelheid"
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Volledige lengte in video frames bij content-snelheid"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -553,7 +549,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Gradient debander"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -565,15 +561,15 @@ msgstr "Slechthorenden (HI)"
msgid "High quality 3D denoiser"
msgstr "Hoge kwaliteit 3D ruisonderdrukking"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB of sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -589,11 +585,11 @@ msgstr "KDM-levering: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel deinterlacer"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -613,13 +609,13 @@ msgstr "Achter surround links (BsL)"
msgid "Left surround"
msgstr "Links surround (Ls)"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Lengte"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -627,27 +623,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Subwoofer (Lfe)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Gelimiteerd"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Gelimiteerd (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Lineair"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logaritmisch (100: 1 bereik)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logaritmisch (316: 1 bereik)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -691,7 +687,7 @@ msgstr "Niet schalen"
msgid "No stretch"
msgstr "Niet uitvullen"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Geen geldige beeldbestanden gevonden in de map."
@@ -703,13 +699,13 @@ msgstr "Ruisonderdrukking"
msgid "OK (ran for %1)"
msgstr "OK (%1 bezig)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr ""
"Alleen bij het eerste deel van samengevoegde content kan het begin "
"bijgeknipt worden."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr ""
"Alleen bij het laatste deel van samengevoegde content kan het einde "
@@ -727,7 +723,7 @@ msgstr "Overcomplete wavelet denoiser"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Opgevuld met zwart om in container %1 (%2x%3) te passen"
@@ -743,11 +739,11 @@ msgstr "Programmeerfout op %1:%2"
msgid "Public Service Announcement"
msgstr "Public Service Announcement"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -755,10 +751,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Rating"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -767,10 +773,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Reel-lengtes in het project en die in de DCP verschillen; stel de reel-mode "
"in op 'splits per video-content'."
@@ -791,32 +798,32 @@ msgstr "Achter surround rechts (Bsr)"
msgid "Right surround"
msgstr "Rechts surround (Rs)"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 voor 10, 12, 14 and 16 bit systemen"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -824,7 +831,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "SSH-fout (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Geschaald naar %1x%2"
@@ -840,11 +847,11 @@ msgstr "Email versturen"
msgid "Short"
msgstr "Short"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Grootte"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Sommige audio wordt geresampled naar %1kHz"
@@ -868,15 +875,15 @@ msgstr "Telecine-filter"
msgid "Test"
msgstr "Test"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Tekst-ondertitels"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "De DCP heeft niet geluid in alle reels."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "De DCP heeft niet ondertitels in alle reels."
@@ -899,16 +906,24 @@ msgstr ""
"De harddisk waarop de film is opgeslagen heeft te weinig vrije ruimte. Maak "
"meer ruimte vrij en probeer opnieuw."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Er is andere audio-content die overlapt met deze DCP; verwijder deze."
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr ""
"Er is andere ondertitel-content die overlapt met deze DCP; verwijder deze."
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Er is andere video-content die overlapt met deze DCP; verwijder deze."
@@ -922,7 +937,7 @@ msgstr ""
"threads te verminderen in het Algemeen-tabblad bij Voorkeuren als u een 32-"
"bit operating system draait."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -930,7 +945,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:384
+#: src/lib/film.cc:383
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 "
@@ -964,7 +979,7 @@ msgstr "Onverwacht beeldtype ontvangen door server"
msgid "Unknown error"
msgstr "Onbekende fout"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Niet herkend audio sample-formaat (%1)"
@@ -972,11 +987,11 @@ msgstr "Niet herkend audio sample-formaat (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Onscherpheidsmasker en Gaussische onscherpte"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Niet gespecificeerd"
@@ -996,7 +1011,7 @@ msgstr "Upmix L"
msgid "Upmix R"
msgstr "Upmix R"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1010,13 +1025,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Video"
@@ -1028,7 +1042,7 @@ msgstr "Slechtzienden (VI)"
msgid "Waiting"
msgstr "Wachten"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1036,23 +1050,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
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"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[bewegende beelden]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[stilstaand beeld]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[ondertitels]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "mag geen slash bevatten"
@@ -1064,11 +1078,11 @@ msgstr "time-out van verbinding"
msgid "connecting"
msgstr "verbinden"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "container"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "content-type"
@@ -1080,18 +1094,14 @@ msgstr "kopiëren van %1"
msgid "could not create file %1"
msgstr "kan bestand %1 niet aanmaken"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "kan geen stream-informatie vinden"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "kan audio asset niet naar de DCP verplaatsen (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "kan audio-bestand niet openen om te lezen"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "kan bestand %1 niet openen"
@@ -1132,10 +1142,6 @@ msgstr "fps"
msgid "frames"
msgstr "frames"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "frames per seconde"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1150,15 +1156,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "ontbrekende verplichte instelling %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "verplaatsen"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "naam"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "pixel-beeldverhouding"
@@ -1177,14 +1183,29 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "stilstaand beeld"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "onbekend"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "video frames"
+
+#~ msgid "Content frame rate"
+#~ msgstr "Content frame rate"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "Samen te voegen content moet dezelfde video frame rate hebben."
+
+#~ msgid "Frame rate"
+#~ msgstr "Frame rate"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "kan audio-bestand niet openen om te lezen"
+
+#~ msgid "frames per second"
+#~ msgstr "frames per seconde"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index 62bffc36b..482aea358 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2015-10-10 19:02+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -19,18 +19,23 @@ 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/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [dźwięk]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [obraz]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [obraz]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -71,77 +76,77 @@ msgstr "Wystąpił błąd podczas przetwarzania pliku %1."
msgid "Analyse audio"
msgstr "Analizuj dźwięk"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr ""
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Dźwięk będzie przesamplowany z %1kHz na %2kHz."
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Dźwięk będzie przesamplowany na %1kHz."
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Dźwięk nie będzie przesamplowany."
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 rozszerzony gamut"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 stała luminancja"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 dla systemów 10 bitowych"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 dla systemów 12 bitowych"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 zmienna luminancja"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bitów na piksel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -157,7 +162,7 @@ msgstr "Nie można było obsłużyć formatu %1 kiedy %2"
msgid "Centre"
msgstr "Centralny"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
#, fuzzy
msgid "Channels"
msgstr "Kanały dźwiękowe"
@@ -166,33 +171,33 @@ msgstr "Kanały dźwiękowe"
msgid "Checking existing image data"
msgstr "Sprawdzanie danych obrazu"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Kolory podstawowe"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Rozpiętość tonalna"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Charakterystyka przenoszenia kolorystyki"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Przestrzeń kolorów"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Obliczanie danych dźwięku"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Obliczanie danych"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Obliczanie danych obrazu"
@@ -200,86 +205,78 @@ msgstr "Obliczanie danych obrazu"
msgid "Content and DCP have the same rate.\n"
msgstr "Plik obrazu i DCP mają taką samą ilość kl/s.\n"
-#: src/lib/audio_content.cc:319
+#: src/lib/audio_content.cc:295
#, fuzzy
-msgid "Content audio frame rate"
-msgstr "Prędkość kl/s pliku video"
-
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
+msgid "Content audio sample rate"
msgstr "Prędkość kl/s pliku video"
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
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/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Łączone pliki muszą mieć takie same ustawienia w sekcji \"użyj napisy\"."
-#: src/lib/audio_content.cc:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
msgid "Content to be joined must have the same audio gain."
msgstr "Łączone pliki muszą mieć takie samo gain dźwięku."
-#: src/lib/video_content.cc:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "Łączone pliki muszą mieć takie samo kadrowanie."
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Łączone pliki muszą mieć takie same wyciemnienia."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "Łączone pliki muszą mieć taki sam rozmiar obrazu."
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Łączone pliki muszą mieć takie samo skalowanie."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr "Łączone pliki muszą mieć taką samą ilość kl/s."
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr "Łączone pliki muszą mieć taki sam typ klatki."
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Łączone pliki muszą mieć takie same czcionki."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Rozdzielczość pliku video %1x%2"
@@ -303,7 +300,7 @@ msgstr "Nie można odkodować pliku JPEG2000 %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Nie można odkodować obrazu (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
#, fuzzy
msgid "Could not find pixel format for video."
msgstr "nie udało się znaleźć właściwości strumienia"
@@ -344,7 +341,7 @@ msgstr "Nie udało się rozpocząć transferu"
msgid "Could not write to remote file (%1)"
msgstr "Nie udało się zapisać do pliku zdalnego (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Przycięty do"
@@ -356,19 +353,19 @@ msgstr ""
msgid "D-BOX secondary"
msgstr ""
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr ""
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr ""
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "Napisy DCP XML"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
#, fuzzy
msgid "DCP frame rate"
msgstr "Prędkość kl/s pliku video"
@@ -389,7 +386,7 @@ msgstr ""
"DCP-o-matic nie mógł otworzyć pliku %1. Plik nie istnieje, lub jest w "
"niewspieranym formacie."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic nie używa już filtru `%1', więc został on wyłączony."
@@ -424,7 +421,7 @@ msgstr ""
"Z poważaniem,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Proporcje obrazu"
@@ -479,7 +476,7 @@ msgstr "Błąd %1"
msgid "Examine content"
msgstr "Sprawdzanie materiału"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -495,16 +492,16 @@ msgstr ""
msgid "Feature"
msgstr "Pełnometrażowy"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
#, fuzzy
msgid "Finding length and subtitles"
msgstr "Szukanie napisów"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Szukanie napisów"
@@ -512,16 +509,11 @@ msgstr "Szukanie napisów"
msgid "Flat"
msgstr "1.85"
-#: src/lib/video_content.cc:586
-#, fuzzy
-msgid "Frame rate"
-msgstr "Prękość kl/s"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -529,27 +521,28 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Pełna klatka"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+msgid "Full length in audio samples at DCP rate"
msgstr ""
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
-msgstr ""
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
+msgstr "nie udało się uruchomić konwertera częstotliwości próbkowania"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr ""
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr ""
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -557,7 +550,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Zachowaj przejścia tonalne"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -569,15 +562,15 @@ msgstr "Dla niesłyszących"
msgid "High quality 3D denoiser"
msgstr "Odszumianie 3D wysokiej jakości"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr ""
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB or sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -593,11 +586,11 @@ msgstr "Wysyłanie klucza: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Usuwanie przeplotu metodą Kernel"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -617,13 +610,13 @@ msgstr "Lewy tylny surround"
msgid "Left surround"
msgstr "Lewy surround"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr ""
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -631,27 +624,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (subwoofer)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Ograniczony"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Ograniczony (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Liniowy"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logarytmiczny (100:1 range)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logarytmiczny (316:1 range)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -696,7 +689,7 @@ msgstr "Nie skaluj"
msgid "No stretch"
msgstr "Nie rozciągaj"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "W folderze nie znaleziono obsługiwanych plików"
@@ -708,11 +701,11 @@ msgstr "Redukcja szumu"
msgid "OK (ran for %1)"
msgstr "OK (czas trwania %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Tylko pierwszy z łączonych plików może być przycięty na początku."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Tylko ostatni z łączonych plików może być przycięty na końcu."
@@ -728,7 +721,7 @@ msgstr "Odszumianie DWT"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Dodana czarna kaszeta, aby dopasować do formatu %1 (%2x%3)"
@@ -744,11 +737,11 @@ msgstr "Błąd programowania w lini %1:%2"
msgid "Public Service Announcement"
msgstr "Komunikat publiczny"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -756,10 +749,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Klasyfikacja"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -768,10 +771,10 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:486
@@ -790,32 +793,32 @@ msgstr "Prawy tylny surround"
msgid "Right surround"
msgstr "Prawy surround"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -823,7 +826,7 @@ msgstr ""
msgid "SSH error (%1)"
msgstr "Błąd SSH (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Przeskalowany do %1x%2"
@@ -839,11 +842,11 @@ msgstr "Wysyłam wiadomość"
msgid "Short"
msgstr "Krótkometrażowy"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr ""
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Cześć ścieżki dźwiękowej będzie przesamplowana do %1kHz"
@@ -867,16 +870,16 @@ msgstr "Filtr Telecine"
msgid "Test"
msgstr "Testowy"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
#, fuzzy
msgid "Text subtitles"
msgstr "[napisy]"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr ""
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr ""
@@ -897,15 +900,23 @@ msgstr ""
"Dysk na którym zapisany jest film ma mało wolnego miejsca. Zwolnij miejsce "
"na dysku i spróbuj ponownie."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr ""
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr ""
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr ""
@@ -918,7 +929,7 @@ msgstr ""
"Brakuje pamięci, aby wykonać tą operację. Jeśli twój system jest 32 bitowy "
"spróbuj zmniejszyć liczbę wątków kodujących."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -926,7 +937,7 @@ msgstr ""
"Film został utworzony przy pomocy nowszej wersji DCP-o-matic i nie może być "
"otwarty w tej wersji. Przepraszamy!"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
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 "
@@ -960,7 +971,7 @@ msgstr "Serwer otrzymał nieobsługiwany typ obrazu"
msgid "Unknown error"
msgstr "Nieznany błąd"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Nieznany rodzaj pliku audio (%1)"
@@ -968,11 +979,11 @@ msgstr "Nieznany rodzaj pliku audio (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Wyostrzanie i filtr Gausowski"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Nieokreślony"
@@ -992,7 +1003,7 @@ msgstr "Upmix L"
msgid "Upmix R"
msgstr "Upmix R"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1006,13 +1017,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
#, fuzzy
msgid "Video"
msgstr "Rozdzielczość"
@@ -1025,7 +1035,7 @@ msgstr "Dla niedowidzących"
msgid "Waiting"
msgstr "Czekam"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1033,23 +1043,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "I jeszcze jeden filtr usuwania przeplotu"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "Musisz dodać pliki zanim utworzysz DCP"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[ruchome obrazy]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[stopklatka]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[napisy]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "nie może zawierać ukośników"
@@ -1061,11 +1071,11 @@ msgstr "minął czas połączenia"
msgid "connecting"
msgstr "łączenie"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "format"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "typ DCP"
@@ -1077,18 +1087,14 @@ msgstr "kopiowanie %1"
msgid "could not create file %1"
msgstr "nie udało się utworzyć pliku %1"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "nie udało się znaleźć właściwości strumienia"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "nie udało się przenieść dźwięku (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "nie udało się otworzyć pliku dźwiękowego"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "nie udało się otworzyć pliku (%1)"
@@ -1129,10 +1135,6 @@ msgstr "kl/s"
msgid "frames"
msgstr "klatek"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "klatek na sekundę"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1147,15 +1149,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "brakuje wymaganych ustawień %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "przenoszenie"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "nazwa"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "proporcje obrazu"
@@ -1174,18 +1176,34 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "stopklatka"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "nieznany"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "klatki obrazu"
+#~ msgid "Content frame rate"
+#~ msgstr "Prędkość kl/s pliku video"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "Łączone pliki muszą mieć taką samą ilość kl/s."
+
+#, fuzzy
+#~ msgid "Frame rate"
+#~ msgstr "Prękość kl/s"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "nie udało się otworzyć pliku dźwiękowego"
+
+#~ msgid "frames per second"
+#~ msgstr "klatek na sekundę"
+
#~ msgid "SubRip subtitles"
#~ msgstr "Napisy SRT"
@@ -1214,9 +1232,6 @@ msgstr "klatki obrazu"
#~ msgid "There was not enough memory to do this."
#~ msgstr "Zabrakło pamięci RAM."
-#~ msgid "could not run sample-rate converter"
-#~ msgstr "nie udało się uruchomić konwertera częstotliwości próbkowania"
-
#~ msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
#~ msgstr ""
#~ "nie udało się uruchomić konwertera częstotliwości próbkowania dla %1 "
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index db9cd3959..90fed0efb 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,22 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr ""
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr ""
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr ""
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+msgid "%1 [video]"
+msgstr ""
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr ""
@@ -68,77 +72,77 @@ msgstr ""
msgid "Analyse audio"
msgstr ""
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr ""
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr ""
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr ""
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr ""
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr ""
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr ""
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr ""
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr ""
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr ""
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr ""
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr ""
@@ -154,7 +158,7 @@ msgstr ""
msgid "Centre"
msgstr ""
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr ""
@@ -162,33 +166,33 @@ msgstr ""
msgid "Checking existing image data"
msgstr ""
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr ""
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr ""
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr ""
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr ""
@@ -196,83 +200,75 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr ""
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+msgid "Content audio sample rate"
msgstr ""
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr ""
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
-#: src/lib/audio_content.cc:98
+#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
msgstr ""
-#: src/lib/audio_content.cc:94
+#: src/lib/audio_content.cc:90
msgid "Content to be joined must have the same audio gain."
msgstr ""
-#: src/lib/video_content.cc:172
+#: src/lib/video_content.cc:159
msgid "Content to be joined must have the same colour conversion."
msgstr ""
-#: src/lib/video_content.cc:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr ""
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr ""
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr ""
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr ""
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
msgid "Content to be joined must have the same subtitle X offset."
msgstr ""
-#: src/lib/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
msgid "Content to be joined must have the same subtitle X scale."
msgstr ""
-#: src/lib/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
msgid "Content to be joined must have the same subtitle Y offset."
msgstr ""
-#: src/lib/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
-#: src/lib/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr ""
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr ""
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr ""
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
msgid "Content to be joined must use the same subtitle stream."
msgstr ""
-#: src/lib/video_content.cc:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr ""
@@ -296,7 +292,7 @@ msgstr ""
msgid "Could not decode image file (%1)"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr ""
@@ -334,7 +330,7 @@ msgstr ""
msgid "Could not write to remote file (%1)"
msgstr ""
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr ""
@@ -346,19 +342,19 @@ msgstr ""
msgid "D-BOX secondary"
msgstr ""
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr ""
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr ""
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr ""
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr ""
@@ -376,7 +372,7 @@ msgid ""
"an unexpected format."
msgstr ""
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr ""
@@ -400,7 +396,7 @@ msgid ""
"DCP-o-matic"
msgstr ""
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr ""
@@ -452,7 +448,7 @@ msgstr ""
msgid "Examine content"
msgstr ""
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr ""
@@ -468,15 +464,15 @@ msgstr ""
msgid "Feature"
msgstr ""
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr ""
@@ -484,15 +480,11 @@ msgstr ""
msgid "Flat"
msgstr ""
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr ""
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr ""
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr ""
@@ -500,27 +492,27 @@ msgstr ""
msgid "Full frame"
msgstr ""
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+msgid "Full length in audio samples at DCP rate"
msgstr ""
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+msgid "Full length in audio samples at content rate"
msgstr ""
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr ""
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr ""
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr ""
@@ -528,7 +520,7 @@ msgstr ""
msgid "Gradient debander"
msgstr ""
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr ""
@@ -540,15 +532,15 @@ msgstr ""
msgid "High quality 3D denoiser"
msgstr ""
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr ""
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr ""
@@ -564,11 +556,11 @@ msgstr ""
msgid "Kernel deinterlacer"
msgstr ""
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr ""
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr ""
@@ -588,13 +580,13 @@ msgstr ""
msgid "Left surround"
msgstr ""
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr ""
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr ""
@@ -602,27 +594,27 @@ msgstr ""
msgid "Lfe (sub)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr ""
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr ""
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr ""
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr ""
@@ -666,7 +658,7 @@ msgstr ""
msgid "No stretch"
msgstr ""
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr ""
@@ -678,11 +670,11 @@ msgstr ""
msgid "OK (ran for %1)"
msgstr ""
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr ""
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr ""
@@ -698,7 +690,7 @@ msgstr ""
msgid "P3"
msgstr ""
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr ""
@@ -714,11 +706,11 @@ msgstr ""
msgid "Public Service Announcement"
msgstr ""
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr ""
@@ -726,10 +718,18 @@ msgstr ""
msgid "Rating"
msgstr ""
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr ""
+#: src/lib/colour_conversion.cc:267
+msgid "Rec. 1886"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:268
+msgid "Rec. 2020"
+msgstr ""
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr ""
@@ -738,10 +738,10 @@ msgstr ""
msgid "Rec. 709"
msgstr ""
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:486
@@ -760,32 +760,32 @@ msgstr ""
msgid "Right surround"
msgstr ""
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -793,7 +793,7 @@ msgstr ""
msgid "SSH error (%1)"
msgstr ""
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr ""
@@ -809,11 +809,11 @@ msgstr ""
msgid "Short"
msgstr ""
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr ""
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr ""
@@ -837,15 +837,15 @@ msgstr ""
msgid "Test"
msgstr ""
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr ""
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr ""
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr ""
@@ -864,15 +864,23 @@ msgid ""
"space and try again."
msgstr ""
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr ""
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr ""
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr ""
@@ -883,13 +891,13 @@ msgid ""
"tab of Preferences."
msgstr ""
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
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:384
+#: src/lib/film.cc:383
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 "
@@ -920,7 +928,7 @@ msgstr ""
msgid "Unknown error"
msgstr ""
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr ""
@@ -928,11 +936,11 @@ msgstr ""
msgid "Unsharp mask and Gaussian blur"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr ""
@@ -952,7 +960,7 @@ msgstr ""
msgid "Upmix R"
msgstr ""
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr ""
@@ -966,13 +974,12 @@ msgstr ""
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr ""
@@ -984,7 +991,7 @@ msgstr ""
msgid "Waiting"
msgstr ""
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr ""
@@ -992,23 +999,23 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr ""
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr ""
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr ""
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr ""
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr ""
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr ""
@@ -1020,11 +1027,11 @@ msgstr ""
msgid "connecting"
msgstr ""
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr ""
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr ""
@@ -1036,18 +1043,14 @@ msgstr ""
msgid "could not create file %1"
msgstr ""
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr ""
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr ""
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr ""
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr ""
@@ -1088,10 +1091,6 @@ msgstr ""
msgid "frames"
msgstr ""
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr ""
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1106,15 +1105,15 @@ msgstr ""
msgid "missing required setting %1"
msgstr ""
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr ""
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr ""
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr ""
@@ -1133,14 +1132,14 @@ msgstr ""
msgid "sRGB"
msgstr ""
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr ""
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr ""
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 85ff07380..d9570ff56 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-03-19 18:19+0000\n"
"Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
"Language-Team: \n"
@@ -18,18 +18,23 @@ msgstr ""
"X-Generator: Poedit 1.8.7.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [áudio]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [movie]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [movie]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -70,77 +75,77 @@ msgstr "Ocorreu um erro ao manipular o ficheiro %1."
msgid "Analyse audio"
msgstr "Analizar áudio"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Áudio"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "A taxa de amostragem será alterada de %1kHz para %2kHz"
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "A taxa de amostragem será alterada para %1kHz"
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "A taxa de amostragem será alterada"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "Gama de cores ampliada BT1361"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "Luminância constante BT2020"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 para um sistema de 10-bit"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 para um sistema de 12-bit"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "Luminância não constante BT2020"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bits por pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -156,7 +161,7 @@ msgstr "Impossível manusear o formato de pixeis %1 durante %2"
msgid "Centre"
msgstr "Central"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Canais"
@@ -164,33 +169,33 @@ msgstr "Canais"
msgid "Checking existing image data"
msgstr "A verificar dados de imagem existentes"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Cores preliminares"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Gama de cores"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Característica de transferência de cores"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Espaço de cor"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "A processar o resumo de áudio"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "A processar o resumo"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "A processar o resumo de imagem"
@@ -198,85 +203,78 @@ msgstr "A processar o resumo de imagem"
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:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Cadência de fotogramas do conteúdo de áudio"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Cadência de fotogramas do conteúdo"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
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/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
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:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
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:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "O conteúdo a ser unido deve ter os mesmos fades."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
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/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr ""
"O conteúdo a ser unido deve ter as mesmas definições de redimensionamento."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-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:160
+#: src/lib/video_content.cc:147
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/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "O conteúdo a ser unido deve usar os mesmos tipos de letra."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "O vídeo do conteúdo tem %1x%2"
@@ -300,7 +298,7 @@ msgstr "Não foi possível descodificar o ficheiro JPEG2000 %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Não foi possível descodificar a imagem (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "não foi possível encontrar o formato do pixel para o vídeo"
@@ -340,7 +338,7 @@ msgstr "Não foi possível iniciar a transferência"
msgid "Could not write to remote file (%1)"
msgstr "Não foi possível escrever para o ficheiro remoto (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Recortado para %1x%2"
@@ -352,19 +350,19 @@ msgstr "D-BOX primário"
msgid "D-BOX secondary"
msgstr "D-BOX secundário"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "Legendas XML DCP"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "Cadência de fotogramas do DCP"
@@ -384,7 +382,7 @@ msgstr ""
"O DCP-o-matic não conseguiu abrir o ficheiro %1. Talvez não exista ou está "
"num formato inesperado."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
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."
@@ -419,7 +417,7 @@ msgstr ""
"Cumprimentos,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Rácio do ecrã"
@@ -471,7 +469,7 @@ msgstr "Erro: %1"
msgid "Examine content"
msgstr "Examinar conteúdo"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -487,15 +485,15 @@ msgstr "Falha no envio de email (%1)"
msgid "Feature"
msgstr "Longa-metragem"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Filme"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "À procura de duração e legendas"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "À procura das legendas"
@@ -503,15 +501,11 @@ msgstr "À procura das legendas"
msgid "Flat"
msgstr "Flat"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Cadência de fotogramas"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -519,27 +513,29 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, 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:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, 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:340
+#: src/lib/audio_content.cc:316
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:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Duração total dos fotogramas de vídeo à cadência do conteúdo"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gama 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gama 28 (BT470BG)"
@@ -547,7 +543,7 @@ msgstr "Gama 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Alterar banda do gradiente"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "DA"
@@ -559,15 +555,15 @@ msgstr "Deficientes auditivos"
msgid "High quality 3D denoiser"
msgstr "Remoção de ruido 3D de alta qualidade"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB ou sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -583,11 +579,11 @@ msgstr "Envio de chaves KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Desentrelaçador do núcleo"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "E"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Ec"
@@ -607,13 +603,13 @@ msgstr "Esquerdo traseiro surround"
msgid "Left surround"
msgstr "Esquerdo surround"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Duração"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -621,27 +617,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Limitado"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Limitado (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Linear"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logarítmico (variação 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logarítmico (Variação 316:1)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Es"
@@ -685,7 +681,7 @@ msgstr "Sem redimensionamento"
msgid "No stretch"
msgstr "Sem distorção"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Não foram encontrados ficheiros de imagem válidos na pasta."
@@ -697,11 +693,11 @@ msgstr "Redução de ruído"
msgid "OK (ran for %1)"
msgstr "OK (executado durante %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Apenas o primeiro elemento a ser unido pode ser aparado no início."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Apenas o último elemento a ser unido pode ser aparado no fim."
@@ -717,7 +713,7 @@ msgstr "Redutor de ruído de onda"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Preenchido com negro para caber no contentor %1 (%2x%3)"
@@ -733,11 +729,11 @@ msgstr "Erro de programação em %1:%2"
msgid "Public Service Announcement"
msgstr "Anúncio Público"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "D"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -745,10 +741,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Classificação"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Dc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -757,10 +763,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Duração das bobinas do projecto diferente do DCP; defina o parâmetro "
"'Bobinas' para 'Dividir por conteúdo de vídeo'."
@@ -781,32 +788,32 @@ msgstr "Direito traseiro surround"
msgid "Right surround"
msgstr "Direito surround"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Ds"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -814,7 +821,7 @@ msgstr ""
msgid "SSH error (%1)"
msgstr "Erro de SSH (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Redimensionado para %1x%2"
@@ -830,11 +837,11 @@ msgstr "A enviar email"
msgid "Short"
msgstr "Curta-metragem"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Tamanho"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Algum áudio vais ser alterado para %1kHz"
@@ -858,15 +865,15 @@ msgstr "Filtro de telecinema"
msgid "Test"
msgstr "Teste"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Legendas de texto"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "Não há nenhuma bobina de audio no DCP"
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "Não há nenhuma bobina de legendas no DCP"
@@ -887,15 +894,23 @@ msgstr ""
"O disco onde o filme está armazenado está com pouco espaço. Liberte algum "
"espaço e tente de novo."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Existe outro conteúdo áudio sobreposto a este DCP; remova-o."
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "Existem outro conteúdo de legendas sobreposto a este DCP; remova-o."
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Existe outro conteúdo video sobreposto a este DCP; remova-o."
@@ -909,7 +924,7 @@ msgstr ""
"sistema de 32-bit tente reduzir o número de linhas de execução na aba Geral "
"das Preferências."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -917,7 +932,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:384
+#: src/lib/film.cc:383
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 "
@@ -951,7 +966,7 @@ msgstr "Tipo de imagem inesperada recebida pelo servidor"
msgid "Unknown error"
msgstr "Erro desconhecido"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato de amostragem áudio desconhecido (%1)"
@@ -959,11 +974,11 @@ msgstr "Formato de amostragem áudio desconhecido (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Máscara de nitidez e desfoque de Gauss"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Não especificado"
@@ -983,7 +998,7 @@ msgstr "Combinar E"
msgid "Upmix R"
msgstr "Combinar D"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "DV"
@@ -997,13 +1012,12 @@ msgstr "DV"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Vídeo"
@@ -1015,7 +1029,7 @@ msgstr "Deficientes Visuais"
msgid "Waiting"
msgstr "A aguardar"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1024,23 +1038,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "Deve adicionar algum conteúdo ao DCP antes de o criar"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[moving images]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[still]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[subtitles]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "não pode conter barras"
@@ -1052,11 +1066,11 @@ msgstr "Ligação expirou"
msgid "connecting"
msgstr "A ligar"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "contentor"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "tipo de conteúdo"
@@ -1068,18 +1082,14 @@ msgstr "a copiar %1"
msgid "could not create file %1"
msgstr "não foi possível criar o ficheiro %1"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "não foi possível encontrar a informação do fluxo"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "não foi possível enviar o áudio para o DCP (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "não foi possível abrir o ficheiro de áudio para leitura"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "não foi possível abrir o ficheiro %1"
@@ -1120,10 +1130,6 @@ msgstr "fps"
msgid "frames"
msgstr "fotogramas"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "fotogramas por segundo"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1138,15 +1144,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "falta definição necessária %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "a mover"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "nome"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "rácio de pixeis"
@@ -1165,18 +1171,33 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "imagem estática"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "desconhecido"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "fotogramas de vídeo"
+#~ msgid "Content frame rate"
+#~ msgstr "Cadência de fotogramas do conteúdo"
+
+#~ 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."
+
+#~ msgid "Frame rate"
+#~ msgstr "Cadência de fotogramas"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "não foi possível abrir o ficheiro de áudio para leitura"
+
+#~ msgid "frames per second"
+#~ msgstr "fotogramas por segundo"
+
#~ msgid "SubRip subtitles"
#~ msgstr "Legendas SubRip"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 075afeb57..0ed5d66de 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-04-15 20:01+0300\n"
"Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
"Language-Team: Russian\n"
@@ -15,18 +15,23 @@ 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/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [аудио]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [видео]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [видео]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -67,77 +72,77 @@ msgstr "Возникла ошибка при обращении к файлу %1
msgid "Analyse audio"
msgstr "Анализ аудио"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Аудио"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Аудио будет ресэмплировано из %1kГц в %2kГц"
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Аудио будет ресэмплировано в %1kГц"
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Аудио не будет ресэмплировано"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 расширенная цветовая гамма"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 постоянная яркость"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 для 10-битной системы"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 для 12-битной системы"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 непостоянная яркость"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Бит на пиксель"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -153,7 +158,7 @@ msgstr "Невозможно обработать формат пикселя %1
msgid "Centre"
msgstr "Центральный"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Каналы"
@@ -161,33 +166,33 @@ msgstr "Каналы"
msgid "Checking existing image data"
msgstr "Проверка данных изображения"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Основные цвета"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Цветовая гамма"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Характеристика цветопередачи"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Цветовое пространство"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Рендеринг аудио"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Рендеринг"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Рендеринг изображения"
@@ -195,97 +200,89 @@ msgstr "Рендеринг изображения"
msgid "Content and DCP have the same rate.\n"
msgstr "У контента и DCP одинаковая частота кадров.\n"
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Частота кадров аудио-контента:"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Частота кадров контента:"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"Для присоединения контента должны быть такие же настройки \"вшить субтитры\"."
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Для присоединения контента должны быть такие же настройки \"использовать "
"субтитры\"."
-#: src/lib/audio_content.cc:98
+#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
msgstr "Для присоединения контента должна быть одинаковая задержка аудио."
-#: src/lib/audio_content.cc:94
+#: src/lib/audio_content.cc:90
msgid "Content to be joined must have the same audio gain."
msgstr "Для присоединения контента должно быть одинаковое усиление аудио."
-#: src/lib/video_content.cc:172
+#: src/lib/video_content.cc:159
msgid "Content to be joined must have the same colour conversion."
msgstr ""
"Для присоединения контента должно быть одинаковое преобразование цвета."
-#: src/lib/video_content.cc:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "Для присоединения контента должно быть одинаковое кадрирование."
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Для присоединения контента должно быть одинаковое угасание."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "Для присоединения контента должен быть одинаковый размер изображения."
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr ""
"Для присоединения контента должны быть одинаковые параметры масштабирования."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
msgid "Content to be joined must have the same subtitle X offset."
msgstr ""
"Для присоединения контента должно быть одинаковое горизонтальное смещение "
"субтитров."
-#: src/lib/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
msgid "Content to be joined must have the same subtitle X scale."
msgstr ""
"Для присоединения контента должен быть одинаковый размер субтитров по "
"горизонтали."
-#: src/lib/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
msgid "Content to be joined must have the same subtitle Y offset."
msgstr ""
"Для присоединения контента должно быть одинаковое вертикальное смещение "
"субтитров."
-#: src/lib/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
"Для присоединения контента должен быть одинаковый размер субтитров по "
"вертикали."
-#: src/lib/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr ""
-"Для присоединения контента должна быть одинаковой частота кадров видео."
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr "Для присоединения контента должен быть одинаковый тип видео."
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Для присоединения контента должен использоваться одинаковый шрифт."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
msgid "Content to be joined must use the same subtitle stream."
msgstr "Для присоединения контента необходимо использовать те же субтитры."
-#: src/lib/video_content.cc:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Разрешение контента: %1x%2"
@@ -309,7 +306,7 @@ msgstr "Не удалось декодировать JPEG2000-файл(ы) %1 (%
msgid "Could not decode image file (%1)"
msgstr "Не удалось декодировать изображение (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "Не удалось найти формат пикселя видео."
@@ -349,7 +346,7 @@ msgstr "не удалось начать передачу"
msgid "Could not write to remote file (%1)"
msgstr "Не удалось записать в удаленный файл (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Кадрировано в %1x%2"
@@ -361,19 +358,19 @@ msgstr "D-BOX основной (DBP)"
msgid "D-BOX secondary"
msgstr "D-BOX второстепенный (DBS)"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML субтитры"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "Частота кадров DCP:"
@@ -393,7 +390,7 @@ msgstr ""
"DCP-o-matic не удалось открыть файл %1. Возможно он не существует или имеет "
"неожиданный формат."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr ""
@@ -429,7 +426,7 @@ msgstr ""
"С наилучшими пожеланиями,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Соотношение сторон контента:"
@@ -481,7 +478,7 @@ msgstr "Ошибка: (%1)"
msgid "Examine content"
msgstr "Проверка контента"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -497,15 +494,15 @@ msgstr "Ошибка отправки email (%1)"
msgid "Feature"
msgstr "FTR (Фильм)"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Проект"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Определение длительности и субтитров"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Поиск субтитров"
@@ -513,15 +510,11 @@ msgstr "Поиск субтитров"
msgid "Flat"
msgstr "Flat (1998x1080)"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Частота кадров"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Полный"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Полный (0-%1)"
@@ -529,27 +522,29 @@ msgstr "Полный (0-%1)"
msgid "Full frame"
msgstr "FULL (2048x1080)"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+msgid "Full length in audio samples at DCP rate"
msgstr "Полная длина аудио-кадров на скорости DCP"
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
msgstr "Полная длина аудио-кадров на скорости контента"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr "Полная длина видео-кадров на скорости DCP"
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Полная длина видео-кадров на скорости контента"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Гамма 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Гамма 28 (BT470BG)"
@@ -557,7 +552,7 @@ msgstr "Гамма 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Разбиение градиента"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -569,15 +564,15 @@ msgstr "Для слабослышащих"
msgid "High quality 3D denoiser"
msgstr "Высококачественный подавитель шума 3D"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Гц"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB или sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -593,11 +588,11 @@ msgstr "Назначение KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Деинтерлейсинг ядром"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -617,13 +612,13 @@ msgstr "Левый тыловой surround"
msgid "Left surround"
msgstr "Левый surround"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Длительность"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "LFE"
@@ -631,27 +626,27 @@ msgstr "LFE"
msgid "Lfe (sub)"
msgstr "НЧ (sub)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Ограничен"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Ограничен (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Линейный"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Логарифмический (диапазон 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Логарифмический (диапазон 316:1)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -695,7 +690,7 @@ msgstr "Без масштабирования"
msgid "No stretch"
msgstr "Без растягивания"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "В папке не найдено подходящих изображений."
@@ -707,11 +702,11 @@ msgstr "Подавление шума"
msgid "OK (ran for %1)"
msgstr "Готово! (выполнено за %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Только первый элемент контента может иметь обрезку с начала."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Только последний элемент контента может иметь обрезку с конца."
@@ -727,7 +722,7 @@ msgstr "Сверхполный подавитель шума небольшой
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Заполнено черным для подгонки контейнера %1 (%2x%3)"
@@ -743,11 +738,11 @@ msgstr "Ошибка програмиирования %1:%2"
msgid "Public Service Announcement"
msgstr "PSA (Социальная реклама)"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -755,10 +750,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "RTG (Рейтинг)"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -767,10 +772,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Длительности бобин в проекте отличаются от таковых в DCP; установите режим "
"бобины \"Разделять по видео-контенту\"."
@@ -791,32 +797,32 @@ msgstr "Правый тыловой surround"
msgid "Right surround"
msgstr "Правый surround"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 для 10, 12, 14 и 16-битных систем"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -824,7 +830,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "Ошибка SSH (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Масштабировано до %1x%2"
@@ -840,11 +846,11 @@ msgstr "Отправка почты"
msgid "Short"
msgstr "SHR (Короткометражный фильм)"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Размер"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Некоторое аудио будет ресемплировано в %1kГц"
@@ -868,15 +874,15 @@ msgstr "Фильтр Telecine"
msgid "Test"
msgstr "TST (Тестовый)"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Текстовые субтитры"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "Во всех бобинах данного DCP отсутствует звук."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "Во всех бобинах данного DCP отсутствуют субтитры."
@@ -899,15 +905,23 @@ msgstr ""
"На устройство, на котором хранится проект, заканчивается место. Освободите "
"немного места и попробуйте снова."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Присутствует другое аудио, перекрывающее этот DCP. Уберите его!"
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "Присутствуют другие субтитрі, перекрывающие этот DCP. Уберите их!"
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Присутствует другое видео, перекрывающее этот DCP. Уберите его!"
@@ -921,7 +935,7 @@ msgstr ""
"попробуйте уменьшить число потоков кодирования в Настройках во вкладке "
"\"Основные\"."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -929,7 +943,7 @@ msgstr ""
"Проект создан более новой версией DCP-o-matic и не быть загружен этой "
"версией. Извините!"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
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 "
@@ -963,7 +977,7 @@ msgstr "Сервером получен неожиданный тип изобр
msgid "Unknown error"
msgstr "Неизвестная ошибка"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Нераспознанный формат аудио (%1)"
@@ -971,11 +985,11 @@ msgstr "Нераспознанный формат аудио (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Маска понижения резкости и Гауссово размытие"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Не определено"
@@ -995,7 +1009,7 @@ msgstr "Преобразовать Л"
msgid "Upmix R"
msgstr "Преобразовать П"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1009,13 +1023,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Видео"
@@ -1027,7 +1040,7 @@ msgstr "Для слабовидящих"
msgid "Waiting"
msgstr "Ожидание"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1035,23 +1048,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Очередной фильтр деинтерлейсинга"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "Добавьте контент в проект прежде чем создавать DCP"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[последовательность]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[статичный]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[субтитры]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "не может содержать разрезы"
@@ -1063,11 +1076,11 @@ msgstr "таймаут соединения"
msgid "connecting"
msgstr "соединение"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "контейнер"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "тип контента"
@@ -1079,18 +1092,14 @@ msgstr "копирование %1"
msgid "could not create file %1"
msgstr "не удалось создать файл %1"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "не удалось найти информацию о потоке"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "не удалось переместить аудио в DCP-пакет (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "не удалось открыть аудиофайл для чтения"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "не удалось открыть файл %1"
@@ -1131,10 +1140,6 @@ msgstr "кадр/сек"
msgid "frames"
msgstr "кадры"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "кадра(ов) в секунду"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1149,15 +1154,15 @@ msgstr "м"
msgid "missing required setting %1"
msgstr "отсутствует обязательная настройка: %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "последовательность"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "название"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "Соотношение сторон пикселей"
@@ -1176,18 +1181,34 @@ msgstr "с"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "статичный"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "неизвестно"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "видеокадры"
+#~ msgid "Content frame rate"
+#~ msgstr "Частота кадров контента:"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr ""
+#~ "Для присоединения контента должна быть одинаковой частота кадров видео."
+
+#~ msgid "Frame rate"
+#~ msgstr "Частота кадров"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "не удалось открыть аудиофайл для чтения"
+
+#~ msgid "frames per second"
+#~ msgstr "кадра(ов) в секунду"
+
#~ msgid "SubRip subtitles"
#~ msgstr "Субтитры SubRip"
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index b83870427..03aabb210 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-01-06 00:23+0100\n"
"Last-Translator: Tomáš Hlaváč\n"
"Language-Team: \n"
@@ -18,18 +18,23 @@ msgstr ""
"X-Generator: Poedit 1.8.6\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [zvuk]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [video]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [video]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -70,77 +75,77 @@ msgstr "Vyskytla sa chyba počas spracovávania súboru %1."
msgid "Analyse audio"
msgstr "Analyzovať zvuk"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr ""
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Zvuk bude re-samplovaný z %1kHz na %2kHz"
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Zvuk bude re-samplovaný na %1kHz"
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Zvuk nebude resamplovaný"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 rozšírený rozsah farieb"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 konštansta jasu"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 pre 10-bit systém"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 pre 12-bit systém"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 non-constant luminance"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bitov na pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -156,7 +161,7 @@ msgstr "Nemôžem spracovať formát pixelu %1 počas %2"
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
#, fuzzy
msgid "Channels"
msgstr "Zvukové kanály"
@@ -165,33 +170,33 @@ msgstr "Zvukové kanály"
msgid "Checking existing image data"
msgstr "Kontrolujem existujúce video dáta"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Primárne voľby fariem"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Rozsah farieb"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Charakteristika prenosu farieb"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Farebný priestor"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Počítam súhrn zvuku"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Počítam zhrnutie"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Počítam súhrn videa"
@@ -199,84 +204,76 @@ msgstr "Počítam súhrn videa"
msgid "Content and DCP have the same rate.\n"
msgstr "Obsah a DCP majú rovnaký bitrate,\n"
-#: src/lib/audio_content.cc:319
+#: src/lib/audio_content.cc:295
#, fuzzy
-msgid "Content audio frame rate"
-msgstr "Snímacia frekvencia obsahu"
-
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
+msgid "Content audio sample rate"
msgstr "Snímacia frekvencia obsahu"
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
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/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
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:98
+#: src/lib/audio_content.cc:94
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:94
+#: src/lib/audio_content.cc:90
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:172
+#: src/lib/video_content.cc:159
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:164
+#: src/lib/video_content.cc:151
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:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Aby sa spojil obsah, musí mať rovnaké miznutie."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "Aby sa spojil obsah, musí mať rovnakú veľkosť obrazu."
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Aby sa spojil obsah, musí mať rovnaké nastavenia orezania."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
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/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
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/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
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/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
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/audio_content.cc:102 src/lib/video_content.cc:156
-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:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr "Aby sa spojil obsah, musí mať rovnaký typ videa."
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Aby sa spojil obsah, musí používať rovnaké písma."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
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:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Video je %1x%2"
@@ -300,7 +297,7 @@ msgstr "Nemôžem dekódovať JPEG2000 súbor %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Nemôžem dekódovať video súbor (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
#, fuzzy
msgid "Could not find pixel format for video."
msgstr "nemôžem nájsť informácie o streame"
@@ -341,7 +338,7 @@ msgstr "Nemôžem začať prenos"
msgid "Could not write to remote file (%1)"
msgstr "Nemôžem zapisovať do vzdialeného súboru (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Zmenšené na %1x%2"
@@ -353,19 +350,19 @@ msgstr "D-BOX primárne"
msgid "D-BOX secondary"
msgstr "D-BOX sekundárne"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML titulky"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
#, fuzzy
msgid "DCP frame rate"
msgstr "Snímacia frekvencia obsahu"
@@ -386,7 +383,7 @@ msgstr ""
"DCP-o-matic nemohol otvoriť %1. Možno, že súbor neexistuje alebo nie je "
"podporovaný."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
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ý."
@@ -421,7 +418,7 @@ msgstr ""
"Ďakujem a prajem pekný deň,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Pomer strán displeja"
@@ -474,7 +471,7 @@ msgstr "Chyba: %1"
msgid "Examine content"
msgstr "Vypočítavam obsah"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -490,15 +487,15 @@ msgstr "Chyba pri posielaní emailu (%1)"
msgid "Feature"
msgstr "Feature"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Hľadám dĺžku a titulky"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Hľadám titulky"
@@ -506,16 +503,11 @@ msgstr "Hľadám titulky"
msgid "Flat"
msgstr "Flat"
-#: src/lib/video_content.cc:586
-#, fuzzy
-msgid "Frame rate"
-msgstr "Frame rate videa (počet obrázkov za sekundu)"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -523,27 +515,28 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Full frame (Celý obraz)"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+msgid "Full length in audio samples at DCP rate"
msgstr ""
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
-msgstr ""
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
+msgstr "Sample-Rate konnte nicht gewandelt werden"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr ""
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr ""
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -551,7 +544,7 @@ msgstr "Gamma 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Gradient debander"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -563,15 +556,15 @@ msgstr "Sluchovo postihnutý(í)"
msgid "High quality 3D denoiser"
msgstr "Vysoko kvalitný 3D denoiser"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr ""
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB alebo sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -587,11 +580,11 @@ msgstr "KDM donáška: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel deinterlacer"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -611,13 +604,13 @@ msgstr "Left rear surround (Ľavý zadný priestorový)"
msgid "Left surround"
msgstr "Left surround (Ľavý zadný)"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr ""
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -625,27 +618,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (Subwoofer)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Limitovaný"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Limitovaný (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Lineárny"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logarmitmický (rozsah 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logarmitmický (rozsah 316:1 )"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -689,7 +682,7 @@ msgstr "Bez orezania"
msgid "No stretch"
msgstr "Bez natiahnutia"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Žiadne platné súbory nebolo nájdené v priečinku."
@@ -701,11 +694,11 @@ msgstr "Redukcia hluku"
msgid "OK (ran for %1)"
msgstr "OK (hotovo za %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Iba prvá časť pripojeného obsahu môže byť upravená od začiatku."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Iba posledná časť pripojeného obsahu môže byť upravená od konca."
@@ -721,7 +714,7 @@ msgstr "Overcomplete wavelet denoiser"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Vyplnené čiernou, aby sa zmestil do kontajnera %1 (%2x%3)"
@@ -737,11 +730,11 @@ msgstr "Chyba pri programovaní na %1:%2"
msgid "Public Service Announcement"
msgstr "Public Service Announcement (Verejné oznámenie služby)"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -749,10 +742,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Prístupnosť"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601 (SD)"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601 (SD)"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601 (SD)"
@@ -761,11 +764,11 @@ msgstr "Rec. 601 (SD)"
msgid "Rec. 709"
msgstr "Rec. 709 (HD)"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Dĺžka reelu v projekte sa líši od tých v DCP; nastavte reel mod na 'rozdeliť "
"podľa obsahu videa'."
@@ -786,32 +789,32 @@ msgstr "Right rear surround (Pravý zadný priestorový)"
msgid "Right surround"
msgstr "Right surround (Pravý priestorový)"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -819,7 +822,7 @@ msgstr ""
msgid "SSH error (%1)"
msgstr "SSH chyba (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Zmenšené na %1x%2"
@@ -835,11 +838,11 @@ msgstr "Posielam email"
msgid "Short"
msgstr "Short (Krátky film)"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr ""
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Nejaké audio bude prevzorkované na %1kHz"
@@ -863,16 +866,16 @@ msgstr "Telecine Filter"
msgid "Test"
msgstr "Test"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
#, fuzzy
msgid "Text subtitles"
msgstr "[titulky]"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "DCP nemá zvuk vo všetkých reeloch."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "DCP nemá titulky vo všetkých reeloch."
@@ -893,15 +896,23 @@ msgstr ""
"Disk, na ktorom sa nachádza film už má málo voľného miesta. Niečo vymažte a "
"skúste to znovu."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Už sa tu nachádza iný zvuk, ktorý sa prekrýva s DCP; zmaže ho."
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "Už sa tu nachádzajú iné titulky, ktoré sa prekrývajú s DCP; zmaže ho."
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Už sa tu nachádza iné video, ktoré sa prekrýva s DCP; zmaže ho."
@@ -914,7 +925,7 @@ msgstr ""
"Zostáva málo pamäte. Ak je váš operačný system 32-bitový, skúste znížiť "
"počet enkódovacích threadov v záložke Všeobecné, v nastaveniach."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -922,7 +933,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:384
+#: src/lib/film.cc:383
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 "
@@ -956,7 +967,7 @@ msgstr "Neočakávaný typ obrazu obdŕžaný od servera "
msgid "Unknown error"
msgstr "Neznáma chyba"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Nerozpoznaná vzorkovacia frekvencia audia (%1)"
@@ -964,11 +975,11 @@ msgstr "Nerozpoznaná vzorkovacia frekvencia audia (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Doostrenie a Gaussove rozostrenie"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Nešpecifikované"
@@ -988,7 +999,7 @@ msgstr "Upmix L"
msgid "Upmix R"
msgstr "Upmix R"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1002,13 +1013,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
#, fuzzy
msgid "Video"
msgstr "Veľkosť videa"
@@ -1021,7 +1031,7 @@ msgstr "Zrakovo postihnutý(í)"
msgid "Waiting"
msgstr "Čakám"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1029,23 +1039,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Len ďalší deinterlacing filter"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
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"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[presúvam obrázky]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[stále]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[titulky]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "nemôže obsahovať lomky"
@@ -1057,11 +1067,11 @@ msgstr "spojenie vypršalo"
msgid "connecting"
msgstr "pripájam"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "kontajner"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "typ obsahu"
@@ -1073,18 +1083,14 @@ msgstr "kopírujem %1"
msgid "could not create file %1"
msgstr "nemôžem vytvoriť súbor %1"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "nemôžem nájsť informácie o streame"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "nemôžem presunúť audio do DCP (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "nemôžem otvoriť audio súbor na čítanie"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "nemôžem otvoriť súbor %1"
@@ -1125,10 +1131,6 @@ msgstr "fps"
msgid "frames"
msgstr "obrázky"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "obrázky za sekundu"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1143,15 +1145,15 @@ msgstr "m"
msgid "missing required setting %1"
msgstr "chýbajúce potrebné nastavenia %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "presúvam"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "meno"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "pomer strán obrazových bodov"
@@ -1170,18 +1172,34 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "stále"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "neznáme"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "video snímky"
+#~ msgid "Content frame rate"
+#~ msgstr "Snímacia frekvencia obsahu"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Frame rate"
+#~ msgstr "Frame rate videa (počet obrázkov za sekundu)"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "nemôžem otvoriť audio súbor na čítanie"
+
+#~ msgid "frames per second"
+#~ msgstr "obrázky za sekundu"
+
#~ msgid "SubRip subtitles"
#~ msgstr "SubRip titulky"
@@ -1204,9 +1222,6 @@ msgstr "video snímky"
#~ msgid "There was not enough memory to do this."
#~ msgstr "Zu wenig Speicher für diese Operation."
-#~ msgid "could not run sample-rate converter"
-#~ msgstr "Sample-Rate konnte nicht gewandelt werden"
-
#~ msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
#~ msgstr "Sample-Rate für %1 samples konnte nicht gewandelt werden (%2)(%3)"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 28628b1cd..3460caf15 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-04-26 17:09+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
@@ -17,18 +17,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [ljud]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [film]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [film]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1,19"
@@ -69,77 +74,77 @@ msgstr "Ett fel inträffade vid hantering av filen %1"
msgid "Analyse audio"
msgstr "Analysera audio"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Audio"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Audio kommer att samplas om från %1kHz till %2kHz"
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Audio kommer att samplas om till %1kHz"
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Audio kommer inte att samplas om"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 utökat färgomfång"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 konstant luminans"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 för ett 10-bitars system"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 för ett 12-bitars system"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 icke-konstant luminans"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Bitar per pixel"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsV"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsH"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -155,7 +160,7 @@ msgstr "Kan inte hantera pixelformat %1 under %2"
msgid "Centre"
msgstr "Center"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Kanaler"
@@ -163,33 +168,33 @@ msgstr "Kanaler"
msgid "Checking existing image data"
msgstr "Kontrollerar befintligt bilddata"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Grundläggande färger"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Färgomfång"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Färgöversättningskarakteristik"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Färgrymd"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Beräknar audiosammanfattning"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Beräknar sammanfattning"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Beräknar bildsammanfattning"
@@ -197,93 +202,86 @@ msgstr "Beräknar bildsammanfattning"
msgid "Content and DCP have the same rate.\n"
msgstr "Innehåll och DCP har samma bildfrekvens.\n"
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Innehållets ljudramshastighet"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Innehållets bildhastighet"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"Innehåll som ska sammanfogas måste använda samma inställning på 'bränn in "
"undertexter'."
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Innehåll som ska sammanfogas måste använda samma inställning på 'använd "
"undertexter'."
-#: src/lib/audio_content.cc:98
+#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
msgstr "Innehåll som ska sammanfogas måste använda samma audiofördröjning."
-#: src/lib/audio_content.cc:94
+#: src/lib/audio_content.cc:90
msgid "Content to be joined must have the same audio gain."
msgstr "Innehåll som ska sammanfogas måste använda samma audioförstärkning."
-#: src/lib/video_content.cc:172
+#: src/lib/video_content.cc:159
msgid "Content to be joined must have the same colour conversion."
msgstr "Innehåll som ska sammanfogas måste använda samma färgkonvertering."
-#: src/lib/video_content.cc:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "Innehåll som ska sammanfogas måste använda samma beskärning."
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Innehåll som ska sammanfogas måste använda samma intoning."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek."
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
msgid "Content to be joined must have the same subtitle X offset."
msgstr ""
"Innehåll som ska sammanfogas måste använda samma X-förskjutning på "
"undertexten."
-#: src/lib/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
msgid "Content to be joined must have the same subtitle X scale."
msgstr ""
"Innehåll som ska sammanfogas måste använda samma X-skala på undertexten."
-#: src/lib/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
msgid "Content to be joined must have the same subtitle Y offset."
msgstr ""
"Innehåll som ska sammanfogas måste använda samma Y-förskjutning på "
"undertexten."
-#: src/lib/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
"Innehåll som ska sammanfogas måste använda samma Y-skala på undertexten."
-#: src/lib/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr "Innehåll som ska sammanfogas måste använda samma videobildhastighet."
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr "Innehåll som ska sammanfogas måste använda samma videobildtyp."
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Innehåll som ska sammanfogas måste använda samma typsnitt."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
msgid "Content to be joined must use the same subtitle stream."
msgstr "Innehåll som ska sammanfogas måste använda samma undertextström."
-#: src/lib/video_content.cc:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Original-videon är %1x%2"
@@ -307,7 +305,7 @@ msgstr "Kunde inte avkoda JPEG2000-fil %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Kunde inte avkoda bildfil (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "Kunde inte hitta information om pixel-formatet för videon."
@@ -347,7 +345,7 @@ msgstr "Kunde inte starta överföring"
msgid "Could not write to remote file (%1)"
msgstr "Kunde inte skriva till fjärrfil (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Beskuren till %1x%2"
@@ -359,19 +357,19 @@ msgstr "D-BOX primär"
msgid "D-BOX secondary"
msgstr "D-BOX sekundär"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML undertexter"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "DCP-bldhastighet"
@@ -391,7 +389,7 @@ msgstr ""
"DCP-o-matic kunde inte öppna filen %1. Saknas den, eller har den ett "
"oförväntat format?"
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
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'-filter, så det har stängts av."
@@ -426,7 +424,7 @@ msgstr ""
"Vänliga hälsningar,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Skärmens höjd/bredd-förhållande"
@@ -479,7 +477,7 @@ msgstr "Fel: %1"
msgid "Examine content"
msgstr "Undersök innehållet"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -495,15 +493,15 @@ msgstr "Misslyckades att skicka epost (%1)"
msgid "Feature"
msgstr "Feature"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Film"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Söker längd och undertexter"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Letar undertexter"
@@ -511,17 +509,13 @@ msgstr "Letar undertexter"
msgid "Flat"
msgstr "Flat"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Bildhastighet"
-
# Sammanhang?
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Full"
# Sammanhang?
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -529,27 +523,29 @@ msgstr "Full (0-%1)"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+msgid "Full length in audio samples at DCP rate"
msgstr "Full längd i bilder med DCP-hastighet"
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
msgstr "Full längd i audioramar med innehållets hastighet"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr "Full längd i bilder med DCP-hastighet"
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Full längd i bilder med innehållets hastighet"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -558,7 +554,7 @@ msgid "Gradient debander"
msgstr "Gradientutjämnare"
# Sammanhang?
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -570,15 +566,15 @@ msgstr "Hörselskadad"
msgid "High quality 3D denoiser"
msgstr "Högkvalitets 3D-brusreducering"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB eller sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -594,11 +590,11 @@ msgstr "KDM-leverans: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel-avflätare"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "V"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Vc"
@@ -618,13 +614,13 @@ msgstr "Vänster bakre surround"
msgid "Left surround"
msgstr "Vänster surround"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Längd"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "Lfe"
@@ -632,27 +628,27 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Begränsad"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Begränsad (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Linjär"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Logaritmisk (100:1 omfång)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Logaritmisk (316:1 omfång)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Vs"
@@ -696,7 +692,7 @@ msgstr "Ingen skalning"
msgid "No stretch"
msgstr "Ingen utsträckning"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "Inga giltiga bildfiler hittades i foldern."
@@ -708,12 +704,12 @@ msgstr "Brusreducering"
msgid "OK (ran for %1)"
msgstr "OK (kördes %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr ""
"Endast den första delen av innehållet som läggs ihop kan start-trimmas."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Endast den sista delen av innehållet som läggs ihop kan slut-trimmas."
@@ -729,7 +725,7 @@ msgstr "Överkomplett wavelet-brusreducering"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Svarta kanter tillagda för att passa %1 (%2x%3)"
@@ -745,11 +741,11 @@ msgstr "Programmeringsfel vid %1:%2"
msgid "Public Service Announcement"
msgstr "Public Service Announcement"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "H"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -757,10 +753,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "Rating"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Hc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -769,10 +775,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Rull-längder i projektet skiljer sig från DCP:n; sätt rull-läget till 'dela "
"upp enligt videoinnehåll'."
@@ -793,32 +800,32 @@ msgstr "Höger bakre surround"
msgid "Right surround"
msgstr "Höger surround"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Hs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 för 10-, 12-, 14- och 16-bitars system"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -826,7 +833,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "SSH fel (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Skalad till %1x%2"
@@ -842,11 +849,11 @@ msgstr "Skickar e-post"
msgid "Short"
msgstr "Short"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Storlek"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "En del av audio kommer att samplas om till %1kHz"
@@ -870,15 +877,15 @@ msgstr "Telecine-filter"
msgid "Test"
msgstr "Test"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Undertexter"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "DCP:n har inte ljud i alla rullar."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "DCP:n har inte undertexter i alla rullar."
@@ -899,15 +906,23 @@ msgstr ""
"Enheten som filmen lagras på har för lite ledigt utrymme. Frigör utrymme och "
"försök igen."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Det finns annat audioinnehåll som överlappar denna DCP; ta bort det."
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "Det finns annan undertext som överlappar denna DCP; ta bort den."
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Det finns annat videoinnehåll som överlappar denna DCP; ta bort det."
@@ -921,7 +936,7 @@ msgstr ""
"operativsystem, försök att minska antalet kodnings-trådar i Generellt-fliken "
"under Inställningar."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -929,7 +944,7 @@ msgstr ""
"Denna film skapades i en nyare version av DCP-o-matic, och den kan inte "
"öppnas i denna version. Ledsen!"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
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 "
@@ -963,7 +978,7 @@ msgstr "Oväntad bildtyp mottogs av server"
msgid "Unknown error"
msgstr "Okänt fel"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Okänt ljudformat (%1)"
@@ -971,11 +986,11 @@ msgstr "Okänt ljudformat (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Oskärpemask och Gaussisk suddighet"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Ospecificerad"
@@ -996,7 +1011,7 @@ msgid "Upmix R"
msgstr "Uppmixa H"
# Sammanhang?
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1010,13 +1025,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Video"
@@ -1028,7 +1042,7 @@ msgstr "Synskadade"
msgid "Waiting"
msgstr "Väntar"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1037,23 +1051,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[rörliga bilder]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[stillbild]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[undertexter]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "får inte innehålla snedstreck"
@@ -1065,11 +1079,11 @@ msgstr "uppkopplingen tog för lång tid"
msgid "connecting"
msgstr "kopplar upp"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "behållare"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "innehållstyp"
@@ -1081,18 +1095,14 @@ msgstr "kopierar %1"
msgid "could not create file %1"
msgstr "kunde inte skapa fil %1"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "kunde inte hitta information om strömmen"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "kunde inte flytta audio in i DCP:n (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "kunde inte öppna audio-fil för läsning"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "kunde inte öppna fil %1"
@@ -1133,10 +1143,6 @@ msgstr "bps"
msgid "frames"
msgstr "bildrutor"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "bilder per sekund"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1152,15 +1158,15 @@ msgid "missing required setting %1"
msgstr "saknad nödvändig inställning %1"
# Sammanhang?
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "rörlig"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "namn"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "pixlars höjd/bredd-förhållande"
@@ -1179,18 +1185,34 @@ msgstr "s"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "stillbild"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "okänd"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "bildrutor"
+#~ msgid "Content frame rate"
+#~ msgstr "Innehållets bildhastighet"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr ""
+#~ "Innehåll som ska sammanfogas måste använda samma videobildhastighet."
+
+#~ msgid "Frame rate"
+#~ msgstr "Bildhastighet"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "kunde inte öppna audio-fil för läsning"
+
+#~ msgid "frames per second"
+#~ msgstr "bilder per sekund"
+
#~ msgid "SubRip subtitles"
#~ msgstr "SubRip-undertexter"
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index 612f44f1d..89718c763 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-04-15 20:09+0300\n"
"Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
"Language-Team: Українська\n"
@@ -15,18 +15,23 @@ 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/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [аудіо]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [відео]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [відео]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -67,77 +72,77 @@ msgstr "Виникла помилка при зверненні до файлу
msgid "Analyse audio"
msgstr "Аналіз аудіо"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "Аудіо"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "Аудіо буде ресемпловано з %1kГц в %2kГц"
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "Аудіо будет ресемпловано в %1kГц"
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "Аудіо не буде ресемпловано"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "BT1361 розширена колірна гамма"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 постійна яскравість"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 для 10-бітної системи"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 для 12-бітної системи"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 непостійна яскравість"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "Біт на піксель"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "C"
@@ -153,7 +158,7 @@ msgstr "Неможливо обробити формат пікселя %1 пі
msgid "Centre"
msgstr "Центральний"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "Канали"
@@ -161,33 +166,33 @@ msgstr "Канали"
msgid "Checking existing image data"
msgstr "Перевірка данних зображення"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "Основні кольори"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "Колірна гамма"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "Характеристика передачі кольору"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "Кольорова палітра"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "Рендеринг аудіо"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "Рендеринг"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "Рендеринг зображення"
@@ -195,90 +200,83 @@ msgstr "Рендеринг зображення"
msgid "Content and DCP have the same rate.\n"
msgstr "У контента та DCP однакова частота кадрів.\n"
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "Частота кадрів аудіо-контента:"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "Частота кадрів контента:"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"Для приєднання контента мають бути такі самі налаштування \"вшити субтитри\"."
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Для приєднання контента мають бути такі самі налаштування \"використовувати "
"субтитри\"."
-#: src/lib/audio_content.cc:98
+#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
msgstr "Для приєднання контента має бути така сама затримка аудіо."
-#: src/lib/audio_content.cc:94
+#: src/lib/audio_content.cc:90
msgid "Content to be joined must have the same audio gain."
msgstr "Для приєднання контента має бути таке саме посилення аудіо."
-#: src/lib/video_content.cc:172
+#: src/lib/video_content.cc:159
msgid "Content to be joined must have the same colour conversion."
msgstr "Для приєднання контента має бути таке саме перетворення кольору."
-#: src/lib/video_content.cc:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "Для приєднання контента має бути таке саме кадрування."
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "Для приєднання контента має бути таке саме згасання."
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "Для приєднання контента має бути такий самий розмір зображення."
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "Для приєднання контента мають бути такі самі параметри масштабування."
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
msgid "Content to be joined must have the same subtitle X offset."
msgstr ""
"Для приєднання контента має бути таке саме горизонтальне зміщення субтитрів."
-#: src/lib/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
msgid "Content to be joined must have the same subtitle X scale."
msgstr ""
"Для приєднання контента має бути таке саме розмір субтитрів по горизонталі."
-#: src/lib/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
msgid "Content to be joined must have the same subtitle Y offset."
msgstr ""
"Для приєднання контента має бути таке саме вертикальне зміщення субтитрів."
-#: src/lib/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
"Для приєднання контента має бути таке саме розмір субтитрів по вертикалі."
-#: src/lib/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr "Для приєднання контента має бути такою самою частота кадрів відео."
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr "Для приєднання контента має бути такий самий тип відео."
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "Для приєднання контента має бути такий самий шрифт."
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
msgid "Content to be joined must use the same subtitle stream."
msgstr "Для приєднання контента необхідно використовувати ті самі субтитри."
-#: src/lib/video_content.cc:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "Розмір контенту: %1x%2"
@@ -302,7 +300,7 @@ msgstr "Не вдалось декодувати JPEG2000-файл %1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "Не вдалося декодувати зображення (%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "Не вдалося знайти формат пікселя відео."
@@ -342,7 +340,7 @@ msgstr "не вдалося почати передачу"
msgid "Could not write to remote file (%1)"
msgstr "Не вдалося записати в віддалений файл (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "Кадровано в %1x%2"
@@ -354,19 +352,19 @@ msgstr "D-BOX основний (DBP)"
msgid "D-BOX secondary"
msgstr "D-BOX другорядний (DBS)"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML субтитри"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "Частота кадрів DCP:"
@@ -386,7 +384,7 @@ msgstr ""
"DCP-o-matic не вдалося відкрити файл %1. Можливо він не існує або має "
"неочікуваний формат."
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "DCP-o-matic більше не підтримує фильтр `%1', тому він був вимкнений."
@@ -421,7 +419,7 @@ msgstr ""
"Із найкращими побажаннями,\n"
"DCP-o-matic"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "Співвідношення сторін контенту:"
@@ -473,7 +471,7 @@ msgstr "Помилка: (%1)"
msgid "Examine content"
msgstr "Перевірка контенту"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -489,15 +487,15 @@ msgstr "Помилка відправки email (%1)"
msgid "Feature"
msgstr "FTR (Фільм)"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "Проект"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "Визначення довжини і субтитрів"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "Пошук субтитрів"
@@ -505,15 +503,11 @@ msgstr "Пошук субтитрів"
msgid "Flat"
msgstr "Flat (1998x1080)"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "Частота кадрів"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "Повний"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "Повний (0-%1)"
@@ -521,27 +515,29 @@ msgstr "Повний (0-%1)"
msgid "Full frame"
msgstr "FULL (2048x1080)"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+msgid "Full length in audio samples at DCP rate"
msgstr "Повна довжина аудіо-кадрів на швидкості DCP"
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
msgstr "Повна довжина аудіо-кадрів на швидкості контенту"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr "Повна довжина відео-кадрів на швидкості DCP"
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "Повна довжина відео-кадрів на швидкості контенту"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "Гамма 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "Гамма 28 (BT470BG)"
@@ -549,7 +545,7 @@ msgstr "Гамма 28 (BT470BG)"
msgid "Gradient debander"
msgstr "Розбиття градієнта"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "HI"
@@ -561,15 +557,15 @@ msgstr "Для людей з вадами слуху"
msgid "High quality 3D denoiser"
msgstr "Високоякісне придушення шуму 3D"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Гц"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB или sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -585,11 +581,11 @@ msgstr "Призначення KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Деинтерлейсинг ядром"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "Lc"
@@ -609,13 +605,13 @@ msgstr "Лівий тиловий surround"
msgid "Left surround"
msgstr "Лівий surround"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "Тривалість"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "LFE"
@@ -623,27 +619,27 @@ msgstr "LFE"
msgid "Lfe (sub)"
msgstr "НЧ (sub)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "Обмежено"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "Обмежено (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "Лінійний"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "Логаріфмічний (діапазон 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "Логаріфмічний (діапазон 316:1)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "Ls"
@@ -687,7 +683,7 @@ msgstr "Без масштабування"
msgid "No stretch"
msgstr "Без розтягування"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "У папці не знайдено відповідних зображень."
@@ -699,11 +695,11 @@ msgstr "Придушення шуму"
msgid "OK (ran for %1)"
msgstr "Готово! (виконано за %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "Тільки перший елемент контенту може мати обрізку з початку."
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "Тільки останній елемент контенту може мати обрізку з кінця."
@@ -719,7 +715,7 @@ msgstr "Надповне придушення шуму невеликої хви
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "Заповнено чорним для підгонки контейнера %1 (%2x%3)"
@@ -735,11 +731,11 @@ msgstr "Помилка програмування %1:%2"
msgid "Public Service Announcement"
msgstr "PSA (Соціальна реклама)"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -747,10 +743,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "RTG (Рейтинг)"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "Rc"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -759,10 +765,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr ""
"Довжини бобін у проекті відрізняються від таких у DCP; установіть режим "
"бобіни \"Розділяти по відео-контенту\"."
@@ -783,32 +790,32 @@ msgstr "Правий тиловий surround"
msgid "Right surround"
msgstr "Правий surround"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 для 10, 12, 14 та 16-бітних систем"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -816,7 +823,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "Помилка SSH (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "Масштабовано до %1x%2"
@@ -832,11 +839,11 @@ msgstr "Відправка пошти"
msgid "Short"
msgstr "SHR (Короткометражний фільм)"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "Розмір"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "Деяке аудіо будет ресемпловано в %1kГц"
@@ -860,15 +867,15 @@ msgstr "Фільтр Telecine"
msgid "Test"
msgstr "TST (Тестовий)"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "Текстові субтитри"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "У всіх бобінах даного DCP відсутній звук."
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "У всіх бобінах даного DCP відсутні субтитри."
@@ -890,15 +897,23 @@ msgstr ""
"На пристрої, на якому зберігається проект, закінчується місце. Звільніть "
"трохи місця та спробуйте знову."
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "Присутнє інше аудіо, яке перекриває цей DCP. Приберіть його!"
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "Присутні інші субтитри, які перекривають цей DCP. Приберіть їх!"
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "Присутнє інше відео, яке перекриває цей DCP. Приберіть його!"
@@ -912,7 +927,7 @@ msgstr ""
"спробуйте зменшити кількість потоків кодування у \"Налаштуваннях\" у вкладці "
"\"Основні\"."
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -920,7 +935,7 @@ msgstr ""
"Проект був створений більш новою версією DCP-o-matic і не може бути "
"завантажений цією версією. Вибачте!"
-#: src/lib/film.cc:384
+#: src/lib/film.cc:383
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 "
@@ -954,7 +969,7 @@ msgstr "Сервером отриманий неочікуваний тип зо
msgid "Unknown error"
msgstr "Невідома помилка"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "Нерозпізнаний формат аудіо (%1)"
@@ -962,11 +977,11 @@ msgstr "Нерозпізнаний формат аудіо (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Маска пониження різкості та Гауссово розмиття"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "Не визначено"
@@ -986,7 +1001,7 @@ msgstr "Перевторити Л"
msgid "Upmix R"
msgstr "Перевторити П"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "VI"
@@ -1000,13 +1015,12 @@ msgstr "VI"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "Відео"
@@ -1018,7 +1032,7 @@ msgstr "Для людей з вадами зору"
msgid "Waiting"
msgstr "Очікування"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1026,23 +1040,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "Ще один фільтр деінтерлейсинга"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "Додайте контент в проект перед створенням DCP"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[послідовність]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[статичний]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[субтитри]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "не може містити розрізи"
@@ -1054,11 +1068,11 @@ msgstr "таймаут з'єднання"
msgid "connecting"
msgstr "з'єднання"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "контейнер"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "тип контенту"
@@ -1070,18 +1084,14 @@ msgstr "копіювання %1"
msgid "could not create file %1"
msgstr "не вдалося створити файл %1"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "не вдалося знайти інформацію про поток"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "не вдалося перемістити аудіо в DCP-пакет (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "не вдалося відкрити аудіофайл для читання"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "не вдалося відкрити файл %1"
@@ -1122,10 +1132,6 @@ msgstr "кадр/сек"
msgid "frames"
msgstr "кадри"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "кадра(ів) в секунду"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1140,15 +1146,15 @@ msgstr "м"
msgid "missing required setting %1"
msgstr "відсутня обов'язкове налаштування: %1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "послідовність"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "назва"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "Співвідношення сторін пікселей"
@@ -1167,18 +1173,33 @@ msgstr "с"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "статичний"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "невідомо"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "відеокадри"
+#~ msgid "Content frame rate"
+#~ msgstr "Частота кадрів контента:"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "Для приєднання контента має бути такою самою частота кадрів відео."
+
+#~ msgid "Frame rate"
+#~ msgstr "Частота кадрів"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "не вдалося відкрити аудіофайл для читання"
+
+#~ msgid "frames per second"
+#~ msgstr "кадра(ів) в секунду"
+
#~ msgid "SubRip subtitles"
#~ msgstr "Субтитры SubRip"
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index f45f94bcf..c640fed7b 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: 2016-04-28 23:28+0100\n"
+"POT-Creation-Date: 2016-05-25 13:56+0100\n"
"PO-Revision-Date: 2016-03-27 22:12+0800\n"
"Last-Translator: Rov(若文)\n"
"Language-Team: Rov(若文) <lojy2009@qq.com>\n"
@@ -19,18 +19,23 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-SourceCharset: UTF-8\n"
-#: src/lib/dcp_content.cc:127
+#: src/lib/dcp_content.cc:168
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/sndfile_content.cc:68
+#: src/lib/ffmpeg_content.cc:261
msgid "%1 [audio]"
msgstr "%1 [音频]"
-#: src/lib/ffmpeg_content.cc:232
+#: src/lib/ffmpeg_content.cc:257
msgid "%1 [movie]"
msgstr "%1 [视频]"
+#: src/lib/ffmpeg_content.cc:259 src/lib/video_mxf_content.cc:88
+#, fuzzy
+msgid "%1 [video]"
+msgstr "%1 [视频]"
+
#: src/lib/ratio.cc:35
msgid "1.19"
msgstr "1.19"
@@ -71,77 +76,77 @@ msgstr "执行错误 %1."
msgid "Analyse audio"
msgstr "音频解析"
-#: src/lib/audio_content.cc:318 src/lib/audio_content.cc:319
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:295
+#: src/lib/audio_content.cc:315
msgid "Audio"
msgstr "音频解析"
-#: src/lib/audio_content.cc:270
+#: src/lib/audio_content.cc:246
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "音频将重新采样 %1kHz 到 %2kHz."
-#: src/lib/audio_content.cc:272
+#: src/lib/audio_content.cc:248
msgid "Audio will be resampled to %1kHz"
msgstr "音频将被重新采样%1kHz."
-#: src/lib/audio_content.cc:261
+#: src/lib/audio_content.cc:237
msgid "Audio will not be resampled"
msgstr "音频不能被重新采样!"
-#: src/lib/ffmpeg_content.cc:479
+#: src/lib/ffmpeg_content.cc:497
msgid "BT1361 extended colour gamut"
msgstr "色彩范围 BT1361"
-#: src/lib/ffmpeg_content.cc:459
+#: src/lib/ffmpeg_content.cc:477
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:501
+#: src/lib/ffmpeg_content.cc:519
msgid "BT2020 constant luminance"
msgstr "BT2020 恒定亮度"
-#: src/lib/ffmpeg_content.cc:481
+#: src/lib/ffmpeg_content.cc:499
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 采样深度为 10-bit"
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:500
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 采样深度为 12 bits"
-#: src/lib/ffmpeg_content.cc:500
+#: src/lib/ffmpeg_content.cc:518
msgid "BT2020 non-constant luminance"
msgstr "BT2020 非恒定亮度"
-#: src/lib/ffmpeg_content.cc:455
+#: src/lib/ffmpeg_content.cc:473
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:496
+#: src/lib/ffmpeg_content.cc:514
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:454
+#: src/lib/ffmpeg_content.cc:472
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:451 src/lib/ffmpeg_content.cc:468
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:486
+#: src/lib/ffmpeg_content.cc:510
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:526
msgid "Bits per pixel"
msgstr "像素位"
-#: src/lib/film.cc:1339
+#: src/lib/film.cc:1333
msgid "BsL"
msgstr "左后环绕"
-#: src/lib/film.cc:1340
+#: src/lib/film.cc:1334
msgid "BsR"
msgstr "右后环绕"
-#: src/lib/film.cc:1331
+#: src/lib/film.cc:1325
msgid "C"
msgstr "中置"
@@ -157,7 +162,7 @@ msgstr "在%2不能处理图片格式 %1"
msgid "Centre"
msgstr "中置音"
-#: src/lib/audio_content.cc:318
+#: src/lib/audio_content.cc:294
msgid "Channels"
msgstr "声音通道"
@@ -165,33 +170,33 @@ msgstr "声音通道"
msgid "Checking existing image data"
msgstr "检查现有的图像数据"
-#: src/lib/ffmpeg_content.cc:464
+#: src/lib/ffmpeg_content.cc:482
msgid "Colour primaries"
msgstr "原色"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
msgid "Colour range"
msgstr "色彩范围"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:506
msgid "Colour transfer characteristic"
msgstr "彩色传输特性"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:523
msgid "Colourspace"
msgstr "色彩空间"
-#: src/lib/reel_writer.cc:437
+#: src/lib/reel_writer.cc:415
msgid "Computing audio digest"
msgstr "计算音频Hash"
-#: src/lib/content.cc:138
+#: src/lib/content.cc:139
msgid "Computing digest"
msgstr "计算Hash"
-#: src/lib/reel_writer.cc:431
+#: src/lib/reel_writer.cc:409
msgid "Computing image digest"
msgstr "计算图像Hash"
@@ -199,83 +204,76 @@ msgstr "计算图像Hash"
msgid "Content and DCP have the same rate.\n"
msgstr "内容和DCP需相同的速率。\n"
-#: src/lib/audio_content.cc:319
-msgid "Content audio frame rate"
+#: src/lib/audio_content.cc:295
+#, fuzzy
+msgid "Content audio sample rate"
msgstr "音频帧率"
-#: src/lib/video_content.cc:572
-msgid "Content frame rate"
-msgstr "视频帧率"
-
-#: src/lib/subtitle_content.cc:127
+#: src/lib/subtitle_content.cc:141
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr "“烧录字幕”设置必须相同。"
-#: src/lib/subtitle_content.cc:123
+#: src/lib/subtitle_content.cc:137
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr "“use字幕”设置必须相同。"
-#: src/lib/audio_content.cc:98
+#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
msgstr "视频和音频的延迟必须相同。"
-#: src/lib/audio_content.cc:94
+#: src/lib/audio_content.cc:90
msgid "Content to be joined must have the same audio gain."
msgstr "视频和音频增益必须相同。"
-#: src/lib/video_content.cc:172
+#: src/lib/video_content.cc:159
msgid "Content to be joined must have the same colour conversion."
msgstr "视频颜色转换必须相同。"
-#: src/lib/video_content.cc:164
+#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same crop."
msgstr "视频裁剪必须相同。"
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:163
msgid "Content to be joined must have the same fades."
msgstr "视频衰减必须相同。"
-#: src/lib/video_content.cc:152
+#: src/lib/video_content.cc:143
msgid "Content to be joined must have the same picture size."
msgstr "视频图像尺寸必须相同。"
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:155
msgid "Content to be joined must have the same scale setting."
msgstr "视频比例设置必须相同。"
-#: src/lib/subtitle_content.cc:131
+#: src/lib/subtitle_content.cc:145
msgid "Content to be joined must have the same subtitle X offset."
msgstr "字幕X轴偏移必须相同。"
-#: src/lib/subtitle_content.cc:139
+#: src/lib/subtitle_content.cc:153
msgid "Content to be joined must have the same subtitle X scale."
msgstr "字幕X调整大小必须相同。"
-#: src/lib/subtitle_content.cc:135
+#: src/lib/subtitle_content.cc:149
msgid "Content to be joined must have the same subtitle Y offset."
msgstr "字幕Y轴偏移必须相同。"
-#: src/lib/subtitle_content.cc:143
+#: src/lib/subtitle_content.cc:157
msgid "Content to be joined must have the same subtitle Y scale."
msgstr "字幕Y调整大小必须相同。"
-#: src/lib/audio_content.cc:102 src/lib/video_content.cc:156
-msgid "Content to be joined must have the same video frame rate."
-msgstr "视频的帧率必须相同。"
-
-#: src/lib/video_content.cc:160
+#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same video frame type."
msgstr "帧类型必须相同。"
-#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
+#: src/lib/subtitle_content.cc:162 src/lib/subtitle_content.cc:170
msgid "Content to be joined must use the same fonts."
msgstr "字体必须相同。"
-#: src/lib/ffmpeg_content.cc:130
+#: src/lib/ffmpeg_content.cc:133
msgid "Content to be joined must use the same subtitle stream."
msgstr "字幕流必须相同。"
-#: src/lib/video_content.cc:524
+#: src/lib/video_content.cc:356
msgid "Content video is %1x%2"
msgstr "内容视频 %1x%2"
@@ -299,7 +297,7 @@ msgstr "无法解码JPEG2000文件%1 (%2)"
msgid "Could not decode image file (%1)"
msgstr "无法解码图像文件(%1)"
-#: src/lib/ffmpeg_examiner.cc:374
+#: src/lib/ffmpeg_examiner.cc:402
msgid "Could not find pixel format for video."
msgstr "找不到视频格式"
@@ -337,7 +335,7 @@ msgstr "无法启动转移"
msgid "Could not write to remote file (%1)"
msgstr "无法写入远程文件 (%1)"
-#: src/lib/video_content.cc:543
+#: src/lib/video_content.cc:375
msgid "Cropped to %1x%2"
msgstr "裁剪为%1x%2"
@@ -349,19 +347,19 @@ msgstr "初级D-BOX"
msgid "D-BOX secondary"
msgstr "高级D-BOX"
-#: src/lib/film.cc:1341
+#: src/lib/film.cc:1335
msgid "DBP"
msgstr "DBP"
-#: src/lib/film.cc:1342
+#: src/lib/film.cc:1336
msgid "DBS"
msgstr "DBS"
-#: src/lib/dcp_subtitle_content.cc:98
+#: src/lib/dcp_subtitle_content.cc:96
msgid "DCP XML subtitles"
msgstr "DCP XML字幕"
-#: src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:315
msgid "DCP frame rate"
msgstr "帧率"
@@ -379,7 +377,7 @@ msgid ""
"an unexpected format."
msgstr "无法打开文件%1。文件不存在或无法识别的格式。"
-#: src/lib/ffmpeg_content.cc:99
+#: src/lib/ffmpeg_content.cc:101
msgid ""
"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
msgstr "不支持的格式`%1'。"
@@ -414,7 +412,7 @@ msgstr ""
"Rov汉化,真心不易,欢迎访问:www.rov8.com (放映员资料库)关注最新汉化,\n"
"DCP-O-MATIC"
-#: src/lib/video_content.cc:537
+#: src/lib/video_content.cc:369
msgid "Display aspect ratio"
msgstr "显示宽高比"
@@ -466,7 +464,7 @@ msgstr "错误: (%1)"
msgid "Examine content"
msgstr "检查内容"
-#: src/lib/ffmpeg_content.cc:495
+#: src/lib/ffmpeg_content.cc:513
msgid "FCC"
msgstr "FCC"
@@ -482,15 +480,15 @@ msgstr "发送电子邮件失败"
msgid "Feature"
msgstr "功能片"
-#: src/lib/ffmpeg_content.cc:458
+#: src/lib/ffmpeg_content.cc:476
msgid "Film"
msgstr "电影"
-#: src/lib/ffmpeg_examiner.cc:83
+#: src/lib/ffmpeg_examiner.cc:93
msgid "Finding length and subtitles"
msgstr "查找长度和字幕"
-#: src/lib/ffmpeg_examiner.cc:85
+#: src/lib/ffmpeg_examiner.cc:95
msgid "Finding subtitles"
msgstr "查找字幕"
@@ -498,15 +496,11 @@ msgstr "查找字幕"
msgid "Flat"
msgstr "遮幅"
-#: src/lib/video_content.cc:586
-msgid "Frame rate"
-msgstr "帧率"
-
-#: src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:460
msgid "Full"
msgstr "全幅"
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:440
msgid "Full (0-%1)"
msgstr "全幅 (0-%1)"
@@ -514,27 +508,29 @@ msgstr "全幅 (0-%1)"
msgid "Full frame"
msgstr "全画幅"
-#: src/lib/audio_content.cc:346
-msgid "Full length in audio frames at DCP rate"
+#: src/lib/audio_content.cc:322
+#, fuzzy
+msgid "Full length in audio samples at DCP rate"
msgstr "DCP中音频总时长"
-#: src/lib/audio_content.cc:333
-msgid "Full length in audio frames at content rate"
+#: src/lib/audio_content.cc:309
+#, fuzzy
+msgid "Full length in audio samples at content rate"
msgstr "音频时长"
-#: src/lib/audio_content.cc:340
+#: src/lib/audio_content.cc:316
msgid "Full length in video frames at DCP rate"
msgstr "DCP中视频总时长"
-#: src/lib/audio_content.cc:326
+#: src/lib/audio_content.cc:302
msgid "Full length in video frames at content rate"
msgstr "视频时长"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:489
msgid "Gamma 22 (BT470M)"
msgstr "伽玛 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:472
+#: src/lib/ffmpeg_content.cc:490
msgid "Gamma 28 (BT470BG)"
msgstr "伽玛 28 (BT470BG)"
@@ -542,7 +538,7 @@ msgstr "伽玛 28 (BT470BG)"
msgid "Gradient debander"
msgstr "梯度"
-#: src/lib/film.cc:1335
+#: src/lib/film.cc:1329
msgid "HI"
msgstr "听力障碍"
@@ -554,15 +550,15 @@ msgstr "听力障碍"
msgid "High quality 3D denoiser"
msgstr "高品质的3D降噪"
-#: src/lib/audio_content.cc:319 src/lib/audio_content.cc:339
+#: src/lib/audio_content.cc:295 src/lib/audio_content.cc:315
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:480
+#: src/lib/ffmpeg_content.cc:498
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB o sYCC)"
-#: src/lib/ffmpeg_content.cc:478
+#: src/lib/ffmpeg_content.cc:496
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -578,11 +574,11 @@ msgstr "发行KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "去隔行"
-#: src/lib/film.cc:1329
+#: src/lib/film.cc:1323
msgid "L"
msgstr "左声道"
-#: src/lib/film.cc:1337
+#: src/lib/film.cc:1331
msgid "Lc"
msgstr "左中"
@@ -602,13 +598,13 @@ msgstr "左后环绕"
msgid "Left surround"
msgstr "左环绕"
-#: src/lib/audio_content.cc:326 src/lib/audio_content.cc:332
-#: src/lib/audio_content.cc:340 src/lib/audio_content.cc:345
-#: src/lib/video_content.cc:584
+#: src/lib/audio_content.cc:302 src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:321
+#: src/lib/video_content.cc:411
msgid "Length"
msgstr "长度"
-#: src/lib/film.cc:1332
+#: src/lib/film.cc:1326
msgid "Lfe"
msgstr "次低"
@@ -616,27 +612,27 @@ msgstr "次低"
msgid "Lfe (sub)"
msgstr "次低(子)"
-#: src/lib/ffmpeg_content.cc:437
+#: src/lib/ffmpeg_content.cc:455
msgid "Limited"
msgstr "限制"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:433
msgid "Limited (%1-%2)"
msgstr "限制 (%1-%2)"
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:493
msgid "Linear"
msgstr "线性"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:494
msgid "Logarithmic (100:1 range)"
msgstr "对数 (范围 100:1)"
-#: src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:495
msgid "Logarithmic (316:1 range)"
msgstr "对数 (范围 316:1)"
-#: src/lib/film.cc:1333
+#: src/lib/film.cc:1327
msgid "Ls"
msgstr "左环绕"
@@ -680,7 +676,7 @@ msgstr "不调整"
msgid "No stretch"
msgstr "不变形"
-#: src/lib/image_content.cc:54
+#: src/lib/image_content.cc:56
msgid "No valid image files were found in the folder."
msgstr "未发现有效的图片序列文件。"
@@ -692,11 +688,11 @@ msgstr "降噪"
msgid "OK (ran for %1)"
msgstr "确认 (运行 %1)"
-#: src/lib/content.cc:107
+#: src/lib/content.cc:108
msgid "Only the first piece of content to be joined can have a start trim."
msgstr "只有最先一段才可以进行起始裁剪。"
-#: src/lib/content.cc:111
+#: src/lib/content.cc:112
msgid "Only the last piece of content to be joined can have an end trim."
msgstr "最有最后一段才可以进行终止裁剪。"
@@ -712,7 +708,7 @@ msgstr "小波降噪"
msgid "P3"
msgstr "P3"
-#: src/lib/video_content.cc:564
+#: src/lib/video_content.cc:397
msgid "Padded with black to fit container %1 (%2x%3)"
msgstr "填充为黑色,以适应打包类型 %1 (%2x%3)"
@@ -728,11 +724,11 @@ msgstr "编程错误%1:%2"
msgid "Public Service Announcement"
msgstr "公共服务或公告"
-#: src/lib/film.cc:1330
+#: src/lib/film.cc:1324
msgid "R"
msgstr "右声道"
-#: src/lib/ffmpeg_content.cc:491
+#: src/lib/ffmpeg_content.cc:509
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -740,10 +736,20 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
msgid "Rating"
msgstr "限级"
-#: src/lib/film.cc:1338
+#: src/lib/film.cc:1332
msgid "Rc"
msgstr "右中"
+#: src/lib/colour_conversion.cc:267
+#, fuzzy
+msgid "Rec. 1886"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:268
+#, fuzzy
+msgid "Rec. 2020"
+msgstr "Rec. 601"
+
#: src/lib/colour_conversion.cc:264
msgid "Rec. 601"
msgstr "Rec. 601"
@@ -752,10 +758,11 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/dcp_content.cc:297
+#: src/lib/dcp_content.cc:374
+#, fuzzy
msgid ""
-"Reel lengths in the project differ from those in the DCP; set the reel mode "
-"to 'split by video content'."
+"Reel lengths in the film differ from those in the DCP; set the reel mode to "
+"'split by video content'."
msgstr "DCP分卷长度不同;请设置卷轴模式为'分割视频内容“。"
#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:486
@@ -774,32 +781,32 @@ msgstr "右后环绕"
msgid "Right surround"
msgstr "右环绕"
-#: src/lib/film.cc:1334
+#: src/lib/film.cc:1328
msgid "Rs"
msgstr "右环绕"
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:473
+#: src/lib/ffmpeg_content.cc:474 src/lib/ffmpeg_content.cc:491
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:515
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:457 src/lib/ffmpeg_content.cc:474
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:516
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:483
+#: src/lib/ffmpeg_content.cc:501
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 for 10, 12, 14和16 bit"
-#: src/lib/ffmpeg_content.cc:484
+#: src/lib/ffmpeg_content.cc:502
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:478
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -807,7 +814,7 @@ msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgid "SSH error (%1)"
msgstr "错误 SSH (%1)"
-#: src/lib/video_content.cc:555
+#: src/lib/video_content.cc:388
msgid "Scaled to %1x%2"
msgstr "缩放到 %1x%2"
@@ -823,11 +830,11 @@ msgstr "发送电子邮件"
msgid "Short"
msgstr "短片"
-#: src/lib/video_content.cc:585
+#: src/lib/video_content.cc:412
msgid "Size"
msgstr "大小"
-#: src/lib/audio_content.cc:265
+#: src/lib/audio_content.cc:241
msgid "Some audio will be resampled to %1kHz"
msgstr "部分音频将被重新采样到%1kHz"
@@ -851,15 +858,15 @@ msgstr "胶转磁过滤器"
msgid "Test"
msgstr "测试片"
-#: src/lib/text_subtitle_content.cc:94
+#: src/lib/text_subtitle_content.cc:74
msgid "Text subtitles"
msgstr "[文本字幕]"
-#: src/lib/dcp_content.cc:323
+#: src/lib/dcp_content.cc:400
msgid "The DCP does not have sound in all reels."
msgstr "该DCP的所有卷无声音。"
-#: src/lib/dcp_content.cc:337
+#: src/lib/dcp_content.cc:414
msgid "The DCP does not have subtitles in all reels."
msgstr "该DCP的所有卷无字幕。"
@@ -878,15 +885,23 @@ msgid ""
"space and try again."
msgstr "磁盘空间不足!"
-#: src/lib/dcp_content.cc:328
+#: src/lib/dcp_content.cc:363
+msgid "The film is set to Interop and this DCP is SMPTE."
+msgstr ""
+
+#: src/lib/dcp_content.cc:360
+msgid "The film is set to SMPTE and this DCP is Interop."
+msgstr ""
+
+#: src/lib/dcp_content.cc:405
msgid "There is other audio content overlapping this DCP; remove it."
msgstr "音频文件重复,"
-#: src/lib/dcp_content.cc:342
+#: src/lib/dcp_content.cc:419
msgid "There is other subtitle content overlapping this DCP; remove it."
msgstr "字幕文件重复!"
-#: src/lib/dcp_content.cc:314
+#: src/lib/dcp_content.cc:391
msgid "There is other video content overlapping this DCP; remove it."
msgstr "视频文件重复!"
@@ -897,13 +912,13 @@ msgid ""
"tab of Preferences."
msgstr "内存不足,若您是32位系统,请重新设置运行线程数量来达到稳定运行。"
-#: src/lib/film.cc:392
+#: src/lib/film.cc:391
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:384
+#: src/lib/film.cc:383
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 "
@@ -934,7 +949,7 @@ msgstr "由服务器接收意外的图像类型"
msgid "Unknown error"
msgstr "未知错误"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:284
msgid "Unrecognised audio sample format (%1)"
msgstr "未确认音频采样格式 (%1)"
@@ -942,11 +957,11 @@ msgstr "未确认音频采样格式 (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "USM锐化和高斯模糊"
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:450 src/lib/ffmpeg_content.cc:452
-#: src/lib/ffmpeg_content.cc:453 src/lib/ffmpeg_content.cc:467
-#: src/lib/ffmpeg_content.cc:469 src/lib/ffmpeg_content.cc:470
-#: src/lib/ffmpeg_content.cc:493 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:485
+#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:512
msgid "Unspecified"
msgstr "未指定"
@@ -966,7 +981,7 @@ msgstr "左混"
msgid "Upmix R"
msgstr "右混"
-#: src/lib/film.cc:1336
+#: src/lib/film.cc:1330
msgid "VI"
msgstr "视障"
@@ -980,13 +995,12 @@ msgstr "视障"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:415
-#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:432
-#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:442
-#: src/lib/ffmpeg_content.cc:464 src/lib/ffmpeg_content.cc:488
-#: src/lib/ffmpeg_content.cc:505 src/lib/ffmpeg_content.cc:508
-#: src/lib/video_content.cc:584 src/lib/video_content.cc:585
-#: src/lib/video_content.cc:586
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:440 src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:455 src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:526
+#: src/lib/video_content.cc:411 src/lib/video_content.cc:412
msgid "Video"
msgstr "视频"
@@ -998,7 +1012,7 @@ msgstr "视障"
msgid "Waiting"
msgstr "等候"
-#: src/lib/ffmpeg_content.cc:499
+#: src/lib/ffmpeg_content.cc:517
msgid "YCOCG"
msgstr "YCOCG"
@@ -1006,23 +1020,23 @@ msgstr "YCOCG"
msgid "Yet Another Deinterlacing Filter"
msgstr "反隔行扫描滤镜"
-#: src/lib/film.cc:304
+#: src/lib/film.cc:303
msgid "You must add some content to the DCP before creating it"
msgstr "您必须在创建DCP之前添加一些内容。"
-#: src/lib/image_content.cc:77
+#: src/lib/image_content.cc:80
msgid "[moving images]"
msgstr "[运动图像]"
-#: src/lib/image_content.cc:75
+#: src/lib/image_content.cc:78
msgid "[still]"
msgstr "[静态图像]"
-#: src/lib/dcp_subtitle_content.cc:92 src/lib/text_subtitle_content.cc:88
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/text_subtitle_content.cc:68
msgid "[subtitles]"
msgstr "[字幕]"
-#: src/lib/film.cc:279
+#: src/lib/film.cc:278
msgid "cannot contain slashes"
msgstr "不能包含斜线"
@@ -1034,11 +1048,11 @@ msgstr "连接超时"
msgid "connecting"
msgstr "连接"
-#: src/lib/film.cc:300
+#: src/lib/film.cc:299
msgid "container"
msgstr "打包类型"
-#: src/lib/film.cc:308
+#: src/lib/film.cc:307
msgid "content type"
msgstr "打包类型"
@@ -1050,18 +1064,14 @@ msgstr "仿形 %1"
msgid "could not create file %1"
msgstr "无法创建文件 (%1)"
-#: src/lib/ffmpeg.cc:138
+#: src/lib/ffmpeg.cc:137
msgid "could not find stream information"
msgstr "找不到流信息"
-#: src/lib/reel_writer.cc:316
+#: src/lib/reel_writer.cc:294
msgid "could not move audio asset into the DCP (%1)"
msgstr "无法移动的音频文件 (%1)"
-#: src/lib/sndfile_base.cc:47
-msgid "could not open audio file for reading"
-msgstr "无法打开音频文件进行读取"
-
#: src/lib/exceptions.cc:30
msgid "could not open file %1"
msgstr "无法打开文件 %1"
@@ -1102,10 +1112,6 @@ msgstr "fps"
msgid "frames"
msgstr "帧"
-#: src/lib/video_content.cc:586
-msgid "frames per second"
-msgstr "每秒帧数"
-
#. / TRANSLATORS: h here is an abbreviation for hours
#: src/lib/util.cc:144 src/lib/util.cc:147
msgid "h"
@@ -1120,15 +1126,15 @@ msgstr "分"
msgid "missing required setting %1"
msgstr "缺少必需的设置%1"
-#: src/lib/image_content.cc:92
+#: src/lib/image_content.cc:95
msgid "moving"
msgstr "移动"
-#: src/lib/film.cc:279 src/lib/film.cc:312
+#: src/lib/film.cc:278 src/lib/film.cc:311
msgid "name"
msgstr "名字"
-#: src/lib/video_content.cc:533
+#: src/lib/video_content.cc:365
msgid "pixel aspect ratio"
msgstr "宽高比"
@@ -1147,18 +1153,33 @@ msgstr "秒"
msgid "sRGB"
msgstr "sRGB"
-#: src/lib/image_content.cc:90
+#: src/lib/image_content.cc:93
msgid "still"
msgstr "静止图像"
-#: src/lib/ffmpeg_examiner.cc:341
+#: src/lib/ffmpeg_examiner.cc:369
msgid "unknown"
msgstr "未知"
-#: src/lib/video_content.cc:584
+#: src/lib/video_content.cc:411
msgid "video frames"
msgstr "视频帧"
+#~ msgid "Content frame rate"
+#~ msgstr "视频帧率"
+
+#~ msgid "Content to be joined must have the same video frame rate."
+#~ msgstr "视频的帧率必须相同。"
+
+#~ msgid "Frame rate"
+#~ msgstr "帧率"
+
+#~ msgid "could not open audio file for reading"
+#~ msgstr "无法打开音频文件进行读取"
+
+#~ msgid "frames per second"
+#~ msgstr "每秒帧数"
+
#~ msgid "SubRip subtitles"
#~ msgstr "SubRip字幕"