summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-02 10:49:27 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-02 10:49:27 +0100
commit1af49ec03de41c6217a34b9e9d1da9bf888e5b08 (patch)
tree03d2dbfeac4d9c037d6e301732d17d3a1045f05d /src/lib
parentf956741ca5ec8deaa0b45cdbb1ac0330c2287e3f (diff)
pot/merge.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/po/cs_CZ.po134
-rw-r--r--src/lib/po/da_DK.po134
-rw-r--r--src/lib/po/de_DE.po139
-rw-r--r--src/lib/po/es_ES.po136
-rw-r--r--src/lib/po/fr_FR.po138
-rw-r--r--src/lib/po/it_IT.po134
-rw-r--r--src/lib/po/nl_NL.po134
-rw-r--r--src/lib/po/pl_PL.po135
-rw-r--r--src/lib/po/pt_BR.po138
-rw-r--r--src/lib/po/pt_PT.po134
-rw-r--r--src/lib/po/ru_RU.po138
-rw-r--r--src/lib/po/sk_SK.po134
-rw-r--r--src/lib/po/sv_SE.po136
-rw-r--r--src/lib/po/uk_UA.po137
-rw-r--r--src/lib/po/zh_CN.po135
15 files changed, 1178 insertions, 858 deletions
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 9beb59b66..157d4366f 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-06-01 08:49+0200\n"
"Last-Translator: Tomáš Hlaváč\n"
"Language-Team: \n"
@@ -26,15 +26,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [zvuk]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [video]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
msgid "%1 [video]"
msgstr "%1 [video]"
@@ -90,48 +90,48 @@ msgstr "Zvuk bude re-samplovaný na %1kHz"
msgid "Audio will not be resampled"
msgstr "Zvuk nebude resamplovaný"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 rozšířený rozsah barev"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 konstanta jasu"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 pro 10-bit systém"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 pro 12-bit systém"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 non-constant luminance"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bitů na pixel"
@@ -167,7 +167,7 @@ msgstr "Kanály"
msgid "Checking existing image data"
msgstr "Kontroluji existující video data"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Primární volby barev"
@@ -181,17 +181,17 @@ msgstr "Primární volby barev"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Rozsah barev"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Charakteristika přenosu barev"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Barevný prostor"
@@ -219,11 +219,26 @@ msgstr "Snímková frekvence audio obsahu"
msgid "Content frame rate"
msgstr "Snímková frekvence obsahu"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Aby se spojil obsah, musí mít stejné nastavení hlasitosti zvuku."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "Aby se spojil obsah, musí mít stejné nastavení titulky X měřítko. "
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Aby se spojil obsah, musí mít stejné nastavení zeslabení."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
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'."
@@ -255,22 +270,27 @@ msgstr "Aby se spojil obsah, musí mít stejné nastavení velikosti obrazu."
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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "Aby se spojil obsah, musí mít stejné nastavení titulky X měřítko. "
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -281,11 +301,11 @@ msgstr ""
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
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:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Aby se spojil obsah, musí mít stejné nastavení titulkového streamu."
@@ -486,7 +506,7 @@ msgstr "Chyba: %1"
msgid "Examine content"
msgstr "Vypočítávám obsah"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -507,7 +527,7 @@ msgstr "Feature"
msgid "Filename"
msgstr "jméno"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -532,11 +552,11 @@ msgstr "Flat"
msgid "Frame rate"
msgstr "Snímková frekvence"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -560,11 +580,11 @@ msgstr "Plná délka video snímků v DCP rychlosti"
msgid "Full length in video frames at content rate"
msgstr "Plná délka video snímků v rychlosti obsahu"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -588,11 +608,11 @@ msgstr "Vysoká kvalita 3D denoiser"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB nebo sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -644,23 +664,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (Subwoofer)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Limitovaný"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Limitovaný (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Lineární"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logarmitmický (rozsah 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logarmitmický (rozsah 316:1 )"
@@ -764,7 +784,7 @@ msgstr "Public Service Announcement (Veřejné oznámení služby)"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -820,28 +840,28 @@ msgstr "Right surround (Pravý surround)"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1001,11 +1021,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:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Nespecifikované"
@@ -1037,7 +1057,7 @@ msgstr "Zrakově postižený(í)"
msgid "Waiting"
msgstr "Čekám"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index b7add4583..1b9266e61 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+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"
@@ -26,15 +26,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [lyd]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [film]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
#, fuzzy
msgid "%1 [video]"
msgstr "%1 [film]"
@@ -91,48 +91,48 @@ msgstr ""
msgid "Audio will not be resampled"
msgstr ""
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 til 10 bit system"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 til 12 bit system"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bits per pixel"
@@ -169,7 +169,7 @@ msgstr "Lyd kanaler"
msgid "Checking existing image data"
msgstr "Verificerer eksisterende billeddata"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr ""
@@ -183,17 +183,17 @@ msgstr ""
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr ""
@@ -222,13 +222,28 @@ msgstr "Indholds billedhastighed"
msgid "Content frame rate"
msgstr "Indholds billedhastighed"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Indhold der skal splejses skal have samme lydgain."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "Indhold der skal splejses skal have samme X skalering af undertekst."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Indhold der skal splejses skal fade på samme måde."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Indhold der skal splejses skal have den samme indstilling af 'brug "
@@ -262,22 +277,27 @@ msgstr "Indhold der skal splejses skal have samme billedstørrelse."
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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "Indhold der skal splejses skal have samme X skalering af undertekst."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -287,11 +307,11 @@ msgstr "Indhold der skal splejses skal have samme billedhastighed."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
msgid "Content to be joined must use the same fonts."
msgstr "Indhold der skal splejses skal bruge samme skrifttype."
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Indhold der skal splejses skal bruge samme tekstningsstrøm."
@@ -497,7 +517,7 @@ msgstr "Fejl: %1"
msgid "Examine content"
msgstr "Undersøg indhold"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr ""
@@ -518,7 +538,7 @@ msgstr "Feature"
msgid "Filename"
msgstr "navn"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -544,11 +564,11 @@ msgstr "Flat"
msgid "Frame rate"
msgstr "Video billedhastighed"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Fuld"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Fuld (0-%1)"
@@ -572,11 +592,11 @@ msgstr ""
msgid "Full length in video frames at content rate"
msgstr ""
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -600,11 +620,11 @@ msgstr "Høj-kvalitets 3D-denoiser"
msgid "Hz"
msgstr ""
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB eller sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -656,23 +676,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr ""
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Lineær"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logaritmisk (100:1 range)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logaritmisk (316:1 range)"
@@ -777,7 +797,7 @@ msgstr "Publikumsorientering (PSA)"
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -833,28 +853,28 @@ msgstr "Højre surround"
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -1017,11 +1037,11 @@ msgstr "Kunne ikke genkende lydsekvensens format (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr ""
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Uspecificeret"
@@ -1053,7 +1073,7 @@ msgstr "Synshandicappet"
msgid "Waiting"
msgstr "Venter"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr ""
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 8a1362b3a..8f9b4ad98 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-05-29 15:12+0100\n"
"Last-Translator: Carsten Kurz\n"
"Language-Team: DCP-o-matic translators\n"
@@ -27,15 +27,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [Ton]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [Film]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
msgid "%1 [video]"
msgstr "%1 [Bild]"
@@ -91,48 +91,48 @@ msgstr "Audioabtastrate wird auf %1kHz angepasst."
msgid "Audio will not be resampled"
msgstr "Audioabtastrate wird nicht verändert werden."
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 extended colour gamut"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 constant luminance"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 for a 10-bit system"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 for a 12-bit system"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 non-constant luminance"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bits pro pixel"
@@ -168,7 +168,7 @@ msgstr "Audio Kanäle"
msgid "Checking existing image data"
msgstr "Überprüfe bestehende Bilddateien"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Grundfarbbezug ('primaries')"
@@ -182,17 +182,17 @@ msgstr "Grundfarbbezug ('primaries')"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Farbumfang"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Farbkonvertierung"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Farbraum"
@@ -220,12 +220,31 @@ msgstr "Audio Abtastrate (Quelle)"
msgid "Content frame rate"
msgstr "Inhalt Bildrate"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr ""
+"Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr ""
+"Zu verbindende Inhalte müssen die gleiche Untertitel X-Skalierung verwenden."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr ""
+"Zu verbindende Inhalte müssen identische Ein-/Ausblendungs-Einstellungen "
+"verwenden."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Zu verbindende Inhalte müssen identische Untertitel-Einstellungen verwenden."
@@ -261,28 +280,34 @@ msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr ""
+"Zu verbindende Inhalte müssen die gleiche Untertitel X-Skalierung verwenden."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -292,13 +317,13 @@ msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
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:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelspur verwenden."
@@ -500,7 +525,7 @@ msgstr "Fehler: (%1)"
msgid "Examine content"
msgstr "Inhalt wird überprüft"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -521,7 +546,7 @@ msgstr "Hauptfilm - FTR"
msgid "Filename"
msgstr "Name"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -546,11 +571,11 @@ msgstr "1.85:1 (Flat/BW)"
msgid "Frame rate"
msgstr "Bildrate"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Voll"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Voll (0-%1)"
@@ -574,11 +599,11 @@ msgstr "Gesamtlänge in Bildern (DCP)"
msgid "Full length in video frames at content rate"
msgstr "Gesamtlänge in Bildern (Quelle)"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -602,11 +627,11 @@ msgstr "3D Rauschunterdrückung hoher Qualität"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB or sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -658,23 +683,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "LFE (Subwoofer)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Begrenzt"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Begrenzt (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Linear"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logarithmisch (Bereich 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logarithmisch (Bereich 316:1 )"
@@ -783,7 +808,7 @@ msgstr "Hinweis - PSA"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -839,28 +864,28 @@ msgstr "Surround rechts"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1034,11 +1059,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:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Unbestimmt"
@@ -1070,7 +1095,7 @@ msgstr "VI"
msgid "Waiting"
msgstr "Warte..."
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 26f7a63dd..362c108cc 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+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"
@@ -26,15 +26,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [película]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
#, fuzzy
msgid "%1 [video]"
msgstr "%1 [película]"
@@ -91,48 +91,48 @@ msgstr "EL audio será remuestreado a %1kHz."
msgid "Audio will not be resampled"
msgstr "El audio no será remuestreado."
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "Gama de color extendido BT1361"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 a luminosidad constante"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 para un sistema de 10-bit"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 para un sistema de 12 bits"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 a luminosidad no constante"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bits por pixel"
@@ -168,7 +168,7 @@ msgstr "Canales"
msgid "Checking existing image data"
msgstr "Comprobando las imágenes existentes"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Colores primarios"
@@ -182,17 +182,17 @@ msgstr "Colores primarios"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Rango de color"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Características de la transferencia de color"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Espacio de color"
@@ -221,11 +221,27 @@ msgstr "Velocidad del contenido de audio"
msgid "Content frame rate"
msgstr "Velocidad del contenido"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Para unir contenido debe tener la misma ganancia de audio."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr ""
+"Para unir contenido debe tener la misma redimensión de subtítulo en X."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Para unir contenido debe tener los mismos fundidos."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
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'."
@@ -257,25 +273,31 @@ msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr ""
+"Para unir contenido debe tener la misma redimensión de subtítulo en X."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -285,11 +307,11 @@ msgstr "Para unir contenido debe tener la misma velocidad de imagen."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
msgid "Content to be joined must use the same fonts."
msgstr "Para unir contenido debe usar la misma fuente."
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
@@ -490,7 +512,7 @@ msgstr "Error: (%1)"
msgid "Examine content"
msgstr "Examinar contenido"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -511,7 +533,7 @@ msgstr "Película"
msgid "Filename"
msgstr "nombre"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Película"
@@ -535,11 +557,11 @@ msgstr "Flat"
msgid "Frame rate"
msgstr "Velocidad"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Completo"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Completo (0-%1)"
@@ -565,11 +587,11 @@ msgstr "Longitud total en frames de vídeo a la velocidad del DCP"
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:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -593,11 +615,11 @@ msgstr "Reductor de ruido 3D de alta calidad"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB o sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -649,23 +671,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (bajos)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Limitado"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Limitado (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Lineal"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logarítmico (rango 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logarítmico (rango 316:1)"
@@ -770,7 +792,7 @@ msgstr "Anuncio de servicio público"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -829,28 +851,28 @@ msgstr "Surround derecha"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1014,11 +1036,11 @@ msgstr "Formato de audio desconocido (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Máscara de desenfoque Gaussiano"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Sin especificar"
@@ -1050,7 +1072,7 @@ msgstr "Ciegos"
msgid "Waiting"
msgstr "Esperando"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 666ab288e..6f64f8a8c 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-06-05 16:43+0100\n"
"Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
"Language-Team: \n"
@@ -25,15 +25,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [film]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
msgid "%1 [video]"
msgstr "%1 [vidéo]"
@@ -89,48 +89,48 @@ msgstr "Le son sera ré-échantillonné à %1kHz."
msgid "Audio will not be resampled"
msgstr "Le son ne sera pas ré-échantillonné."
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 gamme de couleurs étendue"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 luminance constante"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 pour un système 10-bit"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 pour un système 12-bit"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 luminance non-constante"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "bits par pixel"
@@ -166,7 +166,7 @@ msgstr "Canaux"
msgid "Checking existing image data"
msgstr "Recherche de données images existantes"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Couleurs primaires"
@@ -180,17 +180,17 @@ msgstr "Couleurs primaires"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Plage de couleurs"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Caractéristique conversion colorimétrique"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Espace colorimétrique"
@@ -218,11 +218,28 @@ msgstr "VItesse du contenu audio"
msgid "Content frame rate"
msgstr "Cadence du contenu"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Le contenu à ajouter doit avoir le même gain audio"
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr ""
+"Le contenu à ajouter doit avoir le même réglage d'échelle horizontale de "
+"sous-titres"
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Le contenu à ajouter doit avoir le même réglage de fondu."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
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'"
@@ -256,30 +273,37 @@ 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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr ""
+"Le contenu à ajouter doit avoir le même réglage d'échelle horizontale de "
+"sous-titres"
+
#: src/lib/content.cc:122 src/lib/content.cc:126
msgid "Content to be joined must have the same video frame rate"
msgstr "Le contenu à ajouter doit avoir la même cadence vidéo."
@@ -288,11 +312,11 @@ msgstr "Le contenu à ajouter doit avoir la même cadence vidéo."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
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:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Le contenu à ajouter doit avoir le même flux sous titre"
@@ -494,7 +518,7 @@ msgstr "Erreur: %1"
msgid "Examine content"
msgstr "Examen du contenu"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -514,7 +538,7 @@ msgstr "Feature"
msgid "Filename"
msgstr "Nom de Fichier"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -538,11 +562,11 @@ msgstr "Flat"
msgid "Frame rate"
msgstr "Cadence"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Complet"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "en cours (0-%1)"
@@ -566,11 +590,11 @@ msgstr "Pleine durée en images vidéo à la cadence du DCP"
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:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -594,11 +618,11 @@ msgstr "Débruiteur 3D haute qualité"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB or sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -650,23 +674,23 @@ msgstr "Bf"
msgid "Lfe (sub)"
msgstr "Basses fréquences"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Limité"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Limité (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Linéaire"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logarithmique (plage 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logarithmique (plage 316:1)"
@@ -770,7 +794,7 @@ msgstr "Public Service Announcement"
msgid "R"
msgstr "D"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -826,28 +850,28 @@ msgstr "Arrière droite"
msgid "Rs"
msgstr "ArD"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1008,11 +1032,11 @@ msgstr "Échantillonnage audio (%1) inconnu"
msgid "Unsharp mask and Gaussian blur"
msgstr "Adoucissement et flou Gaussien"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Non-spécifié"
@@ -1044,7 +1068,7 @@ msgstr "Déficients Visuels"
msgid "Waiting"
msgstr "En cours"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 37e4db273..92c0f8db1 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-03-10 11:05+0100\n"
"Last-Translator: William Fanelli <william.f@impronte.com>\n"
"Language-Team: \n"
@@ -26,15 +26,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [film]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
#, fuzzy
msgid "%1 [video]"
msgstr "%1 [film]"
@@ -91,48 +91,48 @@ msgstr "L'Audio sarà ricampionato a %1kHz"
msgid "Audio will not be resampled"
msgstr "L'audio non sarà ricampionato"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 gamma colori estesa"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 luminanza costante"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 per sistema 10-bit"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 per sistema 12-bit"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 luminanza non costante"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bit per pixel"
@@ -168,7 +168,7 @@ msgstr "Canali audio"
msgid "Checking existing image data"
msgstr "Controllo dati immagine esistenti in corso"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Colori primari"
@@ -182,17 +182,17 @@ msgstr "Colori primari"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Range dei colori"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Caratteristica di trasferimento del colore"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Spazio colore"
@@ -221,13 +221,28 @@ msgstr "Frame rate audio sorgente"
msgid "Content frame rate"
msgstr "Frame rate sorgente"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Il contenuto da unire deve avere lo stesso guadagno audio."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Il contenuto da unire deve avere le stesse dissolvenze."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
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'."
@@ -260,24 +275,29 @@ msgstr "Il contenuto da unire deve avere la stessa dimensione dell'immagine."
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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -287,11 +307,11 @@ msgstr "Il contenuto da unire deve avere lo stesso frame rate."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
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:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Il contenuto da unire deve usare lo stesso flusso di sottotitoli."
@@ -492,7 +512,7 @@ msgstr "Errore: %1"
msgid "Examine content"
msgstr "Esamino il contenuto"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -513,7 +533,7 @@ msgstr "Film"
msgid "Filename"
msgstr "nome"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -537,11 +557,11 @@ msgstr "Flat"
msgid "Frame rate"
msgstr "Frame rate"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -567,11 +587,11 @@ msgstr "Lunghezza completa nei frame video alla velocità DCP"
msgid "Full length in video frames at content rate"
msgstr "Lunghezza completa nei frame video alla velocità sorgente"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -595,11 +615,11 @@ msgstr "Riduttore di rumore 3D di alta qualità"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB o sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -651,23 +671,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Limitato"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Limitato (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Lineare"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logaritmico (range 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logaritmico (range 316:1)"
@@ -771,7 +791,7 @@ msgstr "Annuncio di pubblico servizio"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -830,28 +850,28 @@ msgstr "Surround destro"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -1013,11 +1033,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:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Non specificato"
@@ -1049,7 +1069,7 @@ msgstr "Ipovedente"
msgid "Waiting"
msgstr "Attendere"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 34702274a..ea70307fc 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-06-30 00:14+0200\n"
"Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
"Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
@@ -26,15 +26,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [video]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
msgid "%1 [video]"
msgstr "%1 [video]"
@@ -90,48 +90,48 @@ msgstr "Audio wordt geresampled naar %1kHz"
msgid "Audio will not be resampled"
msgstr "Audio wordt niet geresampled"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 uitgebreid gamut"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 constante luminantie"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 voor een 10-bit systeem"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 voor een 12-bit systeem"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 niet-constante luminantie"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bits per pixel"
@@ -167,7 +167,7 @@ msgstr "Kanalen"
msgid "Checking existing image data"
msgstr "Bestaande beelddata controleren"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Primaire kleuren"
@@ -181,17 +181,17 @@ msgstr "Primaire kleuren"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Kleurbereik"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Kleuroverdrachtskarakteristiek"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Kleurruimte"
@@ -219,13 +219,28 @@ msgstr "Content audio sample rate"
msgid "Content frame rate"
msgstr "Content frame rate"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Samen te voegen content moet dezelfde audio-versterking hebben."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "Samen te voegen content moet dezelfde ondertitel X-schaling hebben."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Samen te voegen content moet dezelfde fade-instelling hebben."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Samen te voegen content moet dezelfde 'gebruik ondertitels'-instelling "
@@ -259,24 +274,29 @@ msgstr "Samen te voegen content moet dezelfde beeldgrootte hebben."
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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "Samen te voegen content moet dezelfde ondertitel X-schaling hebben."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
msgid "Content to be joined must have the same video frame rate"
msgstr "Samen te voegen content moet dezelfde video frame rate hebben."
@@ -285,11 +305,11 @@ msgstr "Samen te voegen content moet dezelfde video frame rate hebben."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
msgid "Content to be joined must use the same fonts."
msgstr "Samen te voegen content moet hetzelfde lettertype gebruiken."
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Samen te voegen content moet dezelfde ondertitel-stream gebruiken."
@@ -490,7 +510,7 @@ msgstr "Fout: %1"
msgid "Examine content"
msgstr "Onderzoeken content"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -510,7 +530,7 @@ msgstr "Feature"
msgid "Filename"
msgstr "Bestandsnaam"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -534,11 +554,11 @@ msgstr "1,85:1 (Flat)"
msgid "Frame rate"
msgstr "Frame rate"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Volledig"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Volledig (0-%1)"
@@ -562,11 +582,11 @@ msgstr "Volledige lengte in video frames bij DCP-snelheid"
msgid "Full length in video frames at content rate"
msgstr "Volledige lengte in video frames bij content-snelheid"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -590,11 +610,11 @@ msgstr "Hoge kwaliteit 3D ruisonderdrukking"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB of sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -646,23 +666,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Subwoofer (Lfe)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Gelimiteerd"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Gelimiteerd (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Lineair"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logaritmisch (100: 1 bereik)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logaritmisch (316: 1 bereik)"
@@ -770,7 +790,7 @@ msgstr "Public Service Announcement"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -826,28 +846,28 @@ msgstr "Rechts surround (Rs)"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1011,11 +1031,11 @@ msgstr "Niet herkend audio sample-formaat (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Onscherpheidsmasker en Gaussische onscherpte"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Niet gespecificeerd"
@@ -1047,7 +1067,7 @@ msgstr "Slechtzienden (VI)"
msgid "Waiting"
msgstr "Wachten"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index 1b3bb8adf..b5c68a00f 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2015-10-10 19:02+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -28,15 +28,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [dźwięk]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [obraz]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
#, fuzzy
msgid "%1 [video]"
msgstr "%1 [obraz]"
@@ -93,48 +93,48 @@ msgstr "Dźwięk będzie przesamplowany na %1kHz."
msgid "Audio will not be resampled"
msgstr "Dźwięk nie będzie przesamplowany."
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 rozszerzony gamut"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 stała luminancja"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 dla systemów 10 bitowych"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 dla systemów 12 bitowych"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 zmienna luminancja"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bitów na piksel"
@@ -171,7 +171,7 @@ msgstr "Kanały dźwiękowe"
msgid "Checking existing image data"
msgstr "Sprawdzanie danych obrazu"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Kolory podstawowe"
@@ -185,17 +185,17 @@ msgstr "Kolory podstawowe"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Rozpiętość tonalna"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Charakterystyka przenoszenia kolorystyki"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Przestrzeń kolorów"
@@ -224,12 +224,27 @@ msgstr "Prędkość kl/s pliku video"
msgid "Content frame rate"
msgstr "Prędkość kl/s pliku video"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Łączone pliki muszą mieć takie samo gain dźwięku."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "Łączone pliki muszą mieć taki sam rozmiar X napisów."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Łączone pliki muszą mieć takie same wyciemnienia."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
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\"."
@@ -262,22 +277,27 @@ msgstr "Łączone pliki muszą mieć taki sam rozmiar obrazu."
msgid "Content to be joined must have the same scale setting."
msgstr "Łączone pliki muszą mieć takie samo skalowanie."
-#: src/lib/subtitle_content.cc:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "Łączone pliki muszą mieć taki sam rozmiar X napisów."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -287,11 +307,11 @@ msgstr "Łączone pliki muszą mieć taką samą ilość kl/s."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
msgid "Content to be joined must use the same fonts."
msgstr "Łączone pliki muszą mieć takie same czcionki."
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Łączone pliki muszą używać tego samego strumienia napisów."
@@ -496,7 +516,7 @@ msgstr "Błąd %1"
msgid "Examine content"
msgstr "Sprawdzanie materiału"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -517,7 +537,7 @@ msgstr "Pełnometrażowy"
msgid "Filename"
msgstr "nazwa"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -543,11 +563,11 @@ msgstr "1.85"
msgid "Frame rate"
msgstr "Prękość kl/s"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -572,11 +592,11 @@ msgstr ""
msgid "Full length in video frames at content rate"
msgstr ""
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -600,11 +620,11 @@ msgstr "Odszumianie 3D wysokiej jakości"
msgid "Hz"
msgstr ""
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB or sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -656,23 +676,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (subwoofer)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Ograniczony"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Ograniczony (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Liniowy"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logarytmiczny (100:1 range)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logarytmiczny (316:1 range)"
@@ -762,7 +782,6 @@ msgid "Policy"
msgstr "Umowa"
#: src/lib/content.cc:378
-#, fuzzy
msgid "Prepared for video frame rate"
msgstr ""
@@ -778,7 +797,7 @@ msgstr "Komunikat publiczny"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -834,28 +853,28 @@ msgstr "Prawy surround"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -1016,11 +1035,11 @@ msgstr "Nieznany rodzaj pliku audio (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Wyostrzanie i filtr Gausowski"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Nieokreślony"
@@ -1052,7 +1071,7 @@ msgstr "Dla niedowidzących"
msgid "Waiting"
msgstr "Czekam"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index 8c1dac1c4..4e2d5c0ae 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-06-20 01:14-0300\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -25,15 +25,15 @@ msgstr "[Dolby Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [movie]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
msgid "%1 [video]"
msgstr "%1 [video]"
@@ -89,48 +89,48 @@ msgstr "O áudio será convertido para %1kHz"
msgid "Audio will not be resampled"
msgstr "O áudio não terá sua taxa de amostragem alterada"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "Gama de cores extendida BT1361"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 com luminância constante"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 para sistema de 10-bits"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 para sistema de 12-bits"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 com luminância não-constante"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bits por pixel"
@@ -166,7 +166,7 @@ msgstr "Canais"
msgid "Checking existing image data"
msgstr "Verificando dados existentes de imagem"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Primárias de cor"
@@ -180,17 +180,17 @@ msgstr "Primárias de cor"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Gama de cores"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Característica de transferência de cores"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Espaço de cor"
@@ -218,12 +218,29 @@ msgstr "Taxa de amostragem de áudio do vídeo"
msgid "Content frame rate"
msgstr "Taxa de quadros do vídeo"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "O vídeo a ser concatenado deve ter o mesmo ganho de áudio"
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr ""
+"O vídeo a ser concatenado deve ter o mesmo redimensionamento de legenda no "
+"eixo X"
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "O vídeo a ser concatenado deve ter as mesmas transições"
+
+#: src/lib/subtitle_content.cc:156
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"O vídeo a ser concatenado deve ter a mesma configuração em 'queimar legendas'"
-#: src/lib/subtitle_content.cc:149
+#: src/lib/subtitle_content.cc:152
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"O vídeo a ser concatenado deve ter a mesma configuração em 'usar legendas'"
@@ -256,30 +273,37 @@ msgstr "O vídeo a ser concatenado deve ter o mesmo tamanho de imagem"
msgid "Content to be joined must have the same scale setting."
msgstr "O vídeo a ser concatenado deve ter o mesmo redimensionamento de imagem"
-#: src/lib/subtitle_content.cc:157
+#: src/lib/subtitle_content.cc:160
msgid "Content to be joined must have the same subtitle X offset."
msgstr ""
"O vídeo a ser concatenado deve ter o mesmo reposicionamento de legenda no "
"eixo X"
-#: src/lib/subtitle_content.cc:165
+#: src/lib/subtitle_content.cc:168
msgid "Content to be joined must have the same subtitle X scale."
msgstr ""
"O vídeo a ser concatenado deve ter o mesmo redimensionamento de legenda no "
"eixo X"
-#: src/lib/subtitle_content.cc:161
+#: src/lib/subtitle_content.cc:164
msgid "Content to be joined must have the same subtitle Y offset."
msgstr ""
"O vídeo a ser concatenado deve ter o mesmo reposicionamento de legenda no "
"eixo Y"
-#: src/lib/subtitle_content.cc:169
+#: src/lib/subtitle_content.cc:172
msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
"O vídeo a ser concatenado deve ter o mesmo redimensionamento de legenda no "
"eixo Y"
+#: src/lib/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr ""
+"O vídeo a ser concatenado deve ter o mesmo redimensionamento de legenda no "
+"eixo X"
+
#: src/lib/content.cc:122 src/lib/content.cc:126
msgid "Content to be joined must have the same video frame rate"
msgstr "O vídeo a ser concatenado deve ter a mesma taxa de quadros"
@@ -288,11 +312,11 @@ msgstr "O vídeo a ser concatenado deve ter a mesma taxa de quadros"
msgid "Content to be joined must have the same video frame type."
msgstr "O vídeo a ser concatenado deve ter o mesmo tipo de quadro"
-#: src/lib/subtitle_content.cc:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
msgid "Content to be joined must use the same fonts."
msgstr "O vídeo a ser concatenado deve usar as mesmas fontes"
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "O vídeo a ser concatenado deve usar o mesmo arquivo de legendas"
@@ -494,7 +518,7 @@ msgstr "Erro: %1"
msgid "Examine content"
msgstr "Examinar vídeo"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -514,7 +538,7 @@ msgstr "Longa-metragem"
msgid "Filename"
msgstr "Nome do arquivo"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Filme"
@@ -539,11 +563,11 @@ msgstr "FLAT"
msgid "Frame rate"
msgstr "Taxa de quadros do DCP"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -567,11 +591,11 @@ msgstr "Duração total em quadros de vídeo na taxa do DCP"
msgid "Full length in video frames at content rate"
msgstr "Duração total em quadros de vídeo na taxa do vídeo"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gama 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gama 28 (BT470BG)"
@@ -595,11 +619,11 @@ msgstr "Redutor de ruído 3D de alta qualidade"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB ou sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -651,23 +675,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Limitado"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Limitado (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Linear"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logarítmico (faixa 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logarítmico (faixa 316:1)"
@@ -774,7 +798,7 @@ msgstr "Public Service Announcement"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -830,28 +854,28 @@ msgstr "Surround direito"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr "SMPTE ST 2084 para sistemas de 10, 12, 14 e 16 bits"
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1014,11 +1038,11 @@ msgstr "Formato de amostragem de áudio desconhecido (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Unsharp Mask e Blur Gaussiano"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Não especificado"
@@ -1050,7 +1074,7 @@ msgstr "Trilha descritiva"
msgid "Waiting"
msgstr "Aguardando"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index cd648c64d..403fcaf45 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-03-19 18:19+0000\n"
"Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
"Language-Team: \n"
@@ -27,15 +27,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [áudio]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [movie]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
#, fuzzy
msgid "%1 [video]"
msgstr "%1 [movie]"
@@ -92,48 +92,48 @@ msgstr "A taxa de amostragem será alterada para %1kHz"
msgid "Audio will not be resampled"
msgstr "A taxa de amostragem será alterada"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "Gama de cores ampliada BT1361"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "Luminância constante BT2020"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 para um sistema de 10-bit"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 para um sistema de 12-bit"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "Luminância não constante BT2020"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bits por pixel"
@@ -169,7 +169,7 @@ msgstr "Canais"
msgid "Checking existing image data"
msgstr "A verificar dados de imagem existentes"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Cores preliminares"
@@ -183,17 +183,17 @@ msgstr "Cores preliminares"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Gama de cores"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Característica de transferência de cores"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Espaço de cor"
@@ -222,12 +222,27 @@ msgstr "Cadência de fotogramas do conteúdo de áudio"
msgid "Content frame rate"
msgstr "Cadência de fotogramas do conteúdo"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "O conteúdo a ser unido deve ter o mesmo ganho de áudio."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "O conteúdo a ser unido deve ter os mesmos fades."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
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'."
@@ -260,22 +275,27 @@ 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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "O conteúdo a ser unido deve ter a mesma escala X nas legendas."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -285,11 +305,11 @@ msgstr "O conteúdo a ser unido deve ter a mesma cadência de fotogramas."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
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:138
+#: src/lib/ffmpeg_content.cc:166
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."
@@ -490,7 +510,7 @@ msgstr "Erro: %1"
msgid "Examine content"
msgstr "Examinar conteúdo"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -511,7 +531,7 @@ msgstr "Longa-metragem"
msgid "Filename"
msgstr "nome"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Filme"
@@ -535,11 +555,11 @@ msgstr "Flat"
msgid "Frame rate"
msgstr "Cadência de fotogramas"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -565,11 +585,11 @@ msgstr "Duração total dos fotogramas de vídeo à cadência do DCP"
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:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gama 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gama 28 (BT470BG)"
@@ -593,11 +613,11 @@ msgstr "Remoção de ruido 3D de alta qualidade"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB ou sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -649,23 +669,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Limitado"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Limitado (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Linear"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logarítmico (variação 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logarítmico (Variação 316:1)"
@@ -769,7 +789,7 @@ msgstr "Anúncio Público"
msgid "R"
msgstr "D"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -828,28 +848,28 @@ msgstr "Direito surround"
msgid "Rs"
msgstr "Ds"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -1010,11 +1030,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:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Não especificado"
@@ -1046,7 +1066,7 @@ msgstr "Deficientes Visuais"
msgid "Waiting"
msgstr "A aguardar"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 8e78743ce..e70248612 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-05-26 19:51+0300\n"
"Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
"Language-Team: Russian\n"
@@ -24,15 +24,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [аудио]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [видео]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
msgid "%1 [video]"
msgstr "%1 [видео]"
@@ -88,48 +88,48 @@ msgstr "Аудио будет ресэмплировано в %1kГц"
msgid "Audio will not be resampled"
msgstr "Аудио не будет ресэмплировано"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 расширенная цветовая гамма"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 постоянная яркость"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 для 10-битной системы"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 для 12-битной системы"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 непостоянная яркость"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Бит на пиксель"
@@ -165,7 +165,7 @@ msgstr "Каналы"
msgid "Checking existing image data"
msgstr "Проверка данных изображения"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Основные цвета"
@@ -179,17 +179,17 @@ msgstr "Основные цвета"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Цветовая гамма"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Характеристика цветопередачи"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Цветовое пространство"
@@ -217,12 +217,29 @@ msgstr "Скорость аудио-контента"
msgid "Content frame rate"
msgstr "Частота кадров контента:"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Для присоединения контента должно быть одинаковое усиление аудио."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr ""
+"Для присоединения контента должен быть одинаковый размер субтитров по "
+"горизонтали."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Для присоединения контента должно быть одинаковое угасание."
+
+#: src/lib/subtitle_content.cc:156
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"Для присоединения контента должны быть такие же настройки \"вшить субтитры\"."
-#: src/lib/subtitle_content.cc:149
+#: src/lib/subtitle_content.cc:152
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Для присоединения контента должны быть такие же настройки \"использовать "
@@ -258,30 +275,37 @@ msgid "Content to be joined must have the same scale setting."
msgstr ""
"Для присоединения контента должны быть одинаковые параметры масштабирования."
-#: src/lib/subtitle_content.cc:157
+#: src/lib/subtitle_content.cc:160
msgid "Content to be joined must have the same subtitle X offset."
msgstr ""
"Для присоединения контента должно быть одинаковое горизонтальное смещение "
"субтитров."
-#: src/lib/subtitle_content.cc:165
+#: src/lib/subtitle_content.cc:168
msgid "Content to be joined must have the same subtitle X scale."
msgstr ""
"Для присоединения контента должен быть одинаковый размер субтитров по "
"горизонтали."
-#: src/lib/subtitle_content.cc:161
+#: src/lib/subtitle_content.cc:164
msgid "Content to be joined must have the same subtitle Y offset."
msgstr ""
"Для присоединения контента должно быть одинаковое вертикальное смещение "
"субтитров."
-#: src/lib/subtitle_content.cc:169
+#: src/lib/subtitle_content.cc:172
msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
"Для присоединения контента должен быть одинаковый размер субтитров по "
"вертикали."
+#: src/lib/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr ""
+"Для присоединения контента должен быть одинаковый размер субтитров по "
+"горизонтали."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -292,11 +316,11 @@ msgstr ""
msgid "Content to be joined must have the same video frame type."
msgstr "Для присоединения контента должен быть одинаковый тип видео."
-#: src/lib/subtitle_content.cc:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
msgid "Content to be joined must use the same fonts."
msgstr "Для присоединения контента должен использоваться одинаковый шрифт."
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Для присоединения контента необходимо использовать те же субтитры."
@@ -498,7 +522,7 @@ msgstr "Ошибка: (%1)"
msgid "Examine content"
msgstr "Проверка контента"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -519,7 +543,7 @@ msgstr "FTR (Фильм)"
msgid "Filename"
msgstr "название"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Проект"
@@ -543,11 +567,11 @@ msgstr "Flat (1998x1080)"
msgid "Frame rate"
msgstr "Частота кадров"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Полный"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Полный (0-%1)"
@@ -571,11 +595,11 @@ msgstr "Полная длина видео-кадров на скорости DC
msgid "Full length in video frames at content rate"
msgstr "Полная длина видео-кадров на скорости контента"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Гамма 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Гамма 28 (BT470BG)"
@@ -599,11 +623,11 @@ msgstr "Высококачественный подавитель шума 3D"
msgid "Hz"
msgstr "Гц"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB или sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -655,23 +679,23 @@ msgstr "LFE"
msgid "Lfe (sub)"
msgstr "НЧ (sub)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Ограничен"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Ограничен (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Линейный"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Логарифмический (диапазон 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Логарифмический (диапазон 316:1)"
@@ -775,7 +799,7 @@ msgstr "PSA (Социальная реклама)"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -831,28 +855,28 @@ msgstr "Правый surround"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1015,11 +1039,11 @@ msgstr "Нераспознанный формат аудио (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Маска понижения резкости и Гауссово размытие"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Не определено"
@@ -1051,7 +1075,7 @@ msgstr "Для слабовидящих"
msgid "Waiting"
msgstr "Ожидание"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index 9aa6e6075..c03aeacc0 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-01-06 00:23+0100\n"
"Last-Translator: Tomáš Hlaváč\n"
"Language-Team: \n"
@@ -27,15 +27,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [zvuk]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [video]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
#, fuzzy
msgid "%1 [video]"
msgstr "%1 [video]"
@@ -92,48 +92,48 @@ msgstr "Zvuk bude re-samplovaný na %1kHz"
msgid "Audio will not be resampled"
msgstr "Zvuk nebude resamplovaný"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 rozšírený rozsah farieb"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 konštansta jasu"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 pre 10-bit systém"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 pre 12-bit systém"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 non-constant luminance"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bitov na pixel"
@@ -170,7 +170,7 @@ msgstr "Zvukové kanály"
msgid "Checking existing image data"
msgstr "Kontrolujem existujúce video dáta"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Primárne voľby fariem"
@@ -184,17 +184,17 @@ msgstr "Primárne voľby fariem"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Rozsah farieb"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Charakteristika prenosu farieb"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Farebný priestor"
@@ -223,11 +223,26 @@ msgstr "Snímacia frekvencia obsahu"
msgid "Content frame rate"
msgstr "Snímacia frekvencia obsahu"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Aby sa spojil obsah, musí mať tú istú hlasitosť zvuku."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Aby sa spojil obsah, musí mať rovnaké miznutie."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
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."
@@ -259,22 +274,27 @@ msgstr "Aby sa spojil obsah, musí mať rovnakú veľkosť obrazu."
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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "Aby sa spojil obsah, musí mať rovnakú titulkovú X mierku. "
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -284,11 +304,11 @@ msgstr "Aby sa spojil obsah, musí mať rovnaký počet obrázkov za sekundu."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
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:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Aby sa spojil obsah, musí používať rovnaký titulkový stream."
@@ -491,7 +511,7 @@ msgstr "Chyba: %1"
msgid "Examine content"
msgstr "Vypočítavam obsah"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -512,7 +532,7 @@ msgstr "Feature"
msgid "Filename"
msgstr "meno"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -538,11 +558,11 @@ msgstr "Flat"
msgid "Frame rate"
msgstr "Frame rate videa (počet obrázkov za sekundu)"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Full"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -567,11 +587,11 @@ msgstr ""
msgid "Full length in video frames at content rate"
msgstr ""
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -595,11 +615,11 @@ msgstr "Vysoko kvalitný 3D denoiser"
msgid "Hz"
msgstr ""
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB alebo sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -651,23 +671,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (Subwoofer)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Limitovaný"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Limitovaný (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Lineárny"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logarmitmický (rozsah 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logarmitmický (rozsah 316:1 )"
@@ -771,7 +791,7 @@ msgstr "Public Service Announcement (Verejné oznámenie služby)"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -830,28 +850,28 @@ msgstr "Right surround (Pravý priestorový)"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
msgstr ""
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr ""
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr ""
@@ -1012,11 +1032,11 @@ msgstr "Nerozpoznaná vzorkovacia frekvencia audia (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Doostrenie a Gaussove rozostrenie"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Nešpecifikované"
@@ -1048,7 +1068,7 @@ msgstr "Zrakovo postihnutý(í)"
msgid "Waiting"
msgstr "Čakám"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 506e91582..cbcc951c8 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-04-26 17:09+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
@@ -26,15 +26,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [ljud]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [film]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
#, fuzzy
msgid "%1 [video]"
msgstr "%1 [film]"
@@ -91,48 +91,48 @@ msgstr "Audio kommer att samplas om till %1kHz"
msgid "Audio will not be resampled"
msgstr "Audio kommer inte att samplas om"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 utökat färgomfång"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 konstant luminans"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 för ett 10-bitars system"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 för ett 12-bitars system"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 icke-konstant luminans"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Bitar per pixel"
@@ -168,7 +168,7 @@ msgstr "Kanaler"
msgid "Checking existing image data"
msgstr "Kontrollerar befintligt bilddata"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Grundläggande färger"
@@ -182,17 +182,17 @@ msgstr "Grundläggande färger"
#. / 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Färgomfång"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Färgöversättningskarakteristik"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Färgrymd"
@@ -221,13 +221,29 @@ msgstr "Innehållets ljudramshastighet"
msgid "Content frame rate"
msgstr "Innehållets bildhastighet"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Innehåll som ska sammanfogas måste använda samma audioförstärkning."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr ""
+"Innehåll som ska sammanfogas måste använda samma X-skala på undertexten."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Innehåll som ska sammanfogas måste använda samma intoning."
+
+#: src/lib/subtitle_content.cc:156
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:149
+#: src/lib/subtitle_content.cc:152
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 "
@@ -261,28 +277,34 @@ msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek."
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:157
+#: src/lib/subtitle_content.cc:160
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:165
+#: src/lib/subtitle_content.cc:168
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:161
+#: src/lib/subtitle_content.cc:164
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:169
+#: src/lib/subtitle_content.cc:172
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/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr ""
+"Innehåll som ska sammanfogas måste använda samma X-skala på undertexten."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -292,11 +314,11 @@ msgstr "Innehåll som ska sammanfogas måste använda samma videobildhastighet."
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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
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:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Innehåll som ska sammanfogas måste använda samma undertextström."
@@ -498,7 +520,7 @@ msgstr "Fel: %1"
msgid "Examine content"
msgstr "Undersök innehållet"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -519,7 +541,7 @@ msgstr "Feature"
msgid "Filename"
msgstr "namn"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Film"
@@ -545,12 +567,12 @@ msgid "Frame rate"
msgstr "Bildhastighet"
# Sammanhang?
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Full"
# Sammanhang?
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Full (0-%1)"
@@ -576,11 +598,11 @@ msgstr "Full längd i bilder med DCP-hastighet"
msgid "Full length in video frames at content rate"
msgstr "Full längd i bilder med innehållets hastighet"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Gamma 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Gamma 28 (BT470BG)"
@@ -605,11 +627,11 @@ msgstr "Högkvalitets 3D-brusreducering"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB eller sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -661,23 +683,23 @@ msgstr "Lfe"
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Begränsad"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Begränsad (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Linjär"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Logaritmisk (100:1 omfång)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Logaritmisk (316:1 omfång)"
@@ -782,7 +804,7 @@ msgstr "Public Service Announcement"
msgid "R"
msgstr "H"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -841,28 +863,28 @@ msgstr "Höger surround"
msgid "Rs"
msgstr "Hs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1023,11 +1045,11 @@ msgstr "Okänt ljudformat (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Oskärpemask och Gaussisk suddighet"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Ospecificerad"
@@ -1060,7 +1082,7 @@ msgstr "Synskadade"
msgid "Waiting"
msgstr "Väntar"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index 2fb880110..dd0e7f88f 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-05-26 19:52+0300\n"
"Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
"Language-Team: Українська\n"
@@ -24,15 +24,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [аудіо]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [відео]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
msgid "%1 [video]"
msgstr "%1 [відео]"
@@ -88,48 +88,48 @@ msgstr "Аудіо будет ресемпловано в %1kГц"
msgid "Audio will not be resampled"
msgstr "Аудіо не буде ресемпловано"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "BT1361 розширена колірна гамма"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 постійна яскравість"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 для 10-бітної системи"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 для 12-бітної системи"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 непостійна яскравість"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "Біт на піксель"
@@ -165,7 +165,7 @@ msgstr "Канали"
msgid "Checking existing image data"
msgstr "Перевірка данних зображення"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "Основні кольори"
@@ -179,17 +179,17 @@ msgstr "Основні кольори"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "Колірна гамма"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "Характеристика передачі кольору"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "Кольорова палітра"
@@ -217,12 +217,28 @@ msgstr "Швидкість аудіо-контенту"
msgid "Content frame rate"
msgstr "Частота кадрів контента:"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Для приєднання контента має бути таке саме посилення аудіо."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr ""
+"Для приєднання контента має бути таке саме розмір субтитрів по горизонталі."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Для приєднання контента має бути таке саме згасання."
+
+#: src/lib/subtitle_content.cc:156
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
"Для приєднання контента мають бути такі самі налаштування \"вшити субтитри\"."
-#: src/lib/subtitle_content.cc:149
+#: src/lib/subtitle_content.cc:152
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Для приєднання контента мають бути такі самі налаштування \"використовувати "
@@ -256,26 +272,32 @@ msgstr "Для приєднання контента має бути такий
msgid "Content to be joined must have the same scale setting."
msgstr "Для приєднання контента мають бути такі самі параметри масштабування."
-#: src/lib/subtitle_content.cc:157
+#: src/lib/subtitle_content.cc:160
msgid "Content to be joined must have the same subtitle X offset."
msgstr ""
"Для приєднання контента має бути таке саме горизонтальне зміщення субтитрів."
-#: src/lib/subtitle_content.cc:165
+#: src/lib/subtitle_content.cc:168
msgid "Content to be joined must have the same subtitle X scale."
msgstr ""
"Для приєднання контента має бути таке саме розмір субтитрів по горизонталі."
-#: src/lib/subtitle_content.cc:161
+#: src/lib/subtitle_content.cc:164
msgid "Content to be joined must have the same subtitle Y offset."
msgstr ""
"Для приєднання контента має бути таке саме вертикальне зміщення субтитрів."
-#: src/lib/subtitle_content.cc:169
+#: src/lib/subtitle_content.cc:172
msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
"Для приєднання контента має бути таке саме розмір субтитрів по вертикалі."
+#: src/lib/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr ""
+"Для приєднання контента має бути таке саме розмір субтитрів по горизонталі."
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -285,11 +307,11 @@ msgstr "Для приєднання контента має бути такою
msgid "Content to be joined must have the same video frame type."
msgstr "Для приєднання контента має бути такий самий тип відео."
-#: src/lib/subtitle_content.cc:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
msgid "Content to be joined must use the same fonts."
msgstr "Для приєднання контента має бути такий самий шрифт."
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "Для приєднання контента необхідно використовувати ті самі субтитри."
@@ -490,7 +512,7 @@ msgstr "Помилка: (%1)"
msgid "Examine content"
msgstr "Перевірка контенту"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -511,7 +533,7 @@ msgstr "FTR (Фільм)"
msgid "Filename"
msgstr "назва"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "Проект"
@@ -535,11 +557,11 @@ msgstr "Flat (1998x1080)"
msgid "Frame rate"
msgstr "Частота кадрів"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "Повний"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "Повний (0-%1)"
@@ -563,11 +585,11 @@ msgstr "Повна довжина відео-кадрів на швидкост
msgid "Full length in video frames at content rate"
msgstr "Повна довжина відео-кадрів на швидкості контенту"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "Гамма 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "Гамма 28 (BT470BG)"
@@ -591,11 +613,11 @@ msgstr "Високоякісне придушення шуму 3D"
msgid "Hz"
msgstr "Гц"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB или sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -647,23 +669,23 @@ msgstr "LFE"
msgid "Lfe (sub)"
msgstr "НЧ (sub)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "Обмежено"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "Обмежено (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "Лінійний"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "Логаріфмічний (діапазон 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "Логаріфмічний (діапазон 316:1)"
@@ -752,7 +774,6 @@ msgid "Policy"
msgstr "POL (Стратегічний)"
#: src/lib/content.cc:378
-#, fuzzy
msgid "Prepared for video frame rate"
msgstr ""
@@ -768,7 +789,7 @@ msgstr "PSA (Соціальна реклама)"
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -824,28 +845,28 @@ msgstr "Правий surround"
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -1007,11 +1028,11 @@ msgstr "Нерозпізнаний формат аудіо (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Маска пониження різкості та Гауссово розмиття"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "Не визначено"
@@ -1043,7 +1064,7 @@ msgstr "Для людей з вадами зору"
msgid "Waiting"
msgstr "Очікування"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index bf529b99d..d7a45e538 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-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
"PO-Revision-Date: 2016-03-27 22:12+0800\n"
"Last-Translator: Rov(若文)\n"
"Language-Team: Rov(若文) <lojy2009@qq.com>\n"
@@ -28,15 +28,15 @@ msgstr "%1 [Atmos]"
msgid "%1 [DCP]"
msgstr "%1 [DCP]"
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
msgid "%1 [audio]"
msgstr "%1 [音频]"
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
msgid "%1 [movie]"
msgstr "%1 [视频]"
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
#, fuzzy
msgid "%1 [video]"
msgstr "%1 [视频]"
@@ -93,48 +93,48 @@ msgstr "音频将被重新采样%1kHz."
msgid "Audio will not be resampled"
msgstr "音频不能被重新采样!"
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
msgid "BT1361 extended colour gamut"
msgstr "色彩范围 BT1361"
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
msgid "BT2020"
msgstr "BT2020"
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
msgid "BT2020 constant luminance"
msgstr "BT2020 恒定亮度"
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
msgid "BT2020 for a 10-bit system"
msgstr "BT2020 采样深度为 10-bit"
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
msgid "BT2020 for a 12-bit system"
msgstr "BT2020 采样深度为 12 bits"
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
msgid "BT2020 non-constant luminance"
msgstr "BT2020 非恒定亮度"
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
msgid "BT470BG"
msgstr "BT470BG"
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
msgid "BT470BG (BT601-6)"
msgstr "BT470BG (BT601-6)"
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
msgid "BT470M"
msgstr "BT470M"
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
msgid "BT709"
msgstr "BT709"
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
msgid "Bits per pixel"
msgstr "像素位"
@@ -170,7 +170,7 @@ msgstr "声音通道"
msgid "Checking existing image data"
msgstr "检查现有的图像数据"
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
msgid "Colour primaries"
msgstr "原色"
@@ -184,17 +184,17 @@ msgstr "原色"
#. / file is limited, so that not all possible values are valid.
#. / TRANSLATORS: this means that the range of pixel values used in this
#. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
msgid "Colour range"
msgstr "色彩范围"
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
msgid "Colour transfer characteristic"
msgstr "彩色传输特性"
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
msgid "Colourspace"
msgstr "色彩空间"
@@ -223,11 +223,26 @@ msgstr "音频帧率"
msgid "Content frame rate"
msgstr "视频帧率"
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "视频和音频增益必须相同。"
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "字幕X调整大小必须相同。"
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "视频衰减必须相同。"
+
+#: src/lib/subtitle_content.cc:156
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr "“烧录字幕”设置必须相同。"
-#: src/lib/subtitle_content.cc:149
+#: src/lib/subtitle_content.cc:152
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr "“use字幕”设置必须相同。"
@@ -259,22 +274,27 @@ msgstr "视频图像尺寸必须相同。"
msgid "Content to be joined must have the same scale setting."
msgstr "视频比例设置必须相同。"
-#: src/lib/subtitle_content.cc:157
+#: src/lib/subtitle_content.cc:160
msgid "Content to be joined must have the same subtitle X offset."
msgstr "字幕X轴偏移必须相同。"
-#: src/lib/subtitle_content.cc:165
+#: src/lib/subtitle_content.cc:168
msgid "Content to be joined must have the same subtitle X scale."
msgstr "字幕X调整大小必须相同。"
-#: src/lib/subtitle_content.cc:161
+#: src/lib/subtitle_content.cc:164
msgid "Content to be joined must have the same subtitle Y offset."
msgstr "字幕Y轴偏移必须相同。"
-#: src/lib/subtitle_content.cc:169
+#: src/lib/subtitle_content.cc:172
msgid "Content to be joined must have the same subtitle Y scale."
msgstr "字幕Y调整大小必须相同。"
+#: src/lib/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "字幕X调整大小必须相同。"
+
#: src/lib/content.cc:122 src/lib/content.cc:126
#, fuzzy
msgid "Content to be joined must have the same video frame rate"
@@ -284,11 +304,11 @@ msgstr "视频的帧率必须相同。"
msgid "Content to be joined must have the same video frame type."
msgstr "帧类型必须相同。"
-#: src/lib/subtitle_content.cc:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
msgid "Content to be joined must use the same fonts."
msgstr "字体必须相同。"
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
msgid "Content to be joined must use the same subtitle stream."
msgstr "字幕流必须相同。"
@@ -485,7 +505,7 @@ msgstr "错误: (%1)"
msgid "Examine content"
msgstr "检查内容"
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
msgid "FCC"
msgstr "FCC"
@@ -506,7 +526,7 @@ msgstr "功能片"
msgid "Filename"
msgstr "名字"
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
msgid "Film"
msgstr "电影"
@@ -530,11 +550,11 @@ msgstr "遮幅"
msgid "Frame rate"
msgstr "帧率"
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
msgid "Full"
msgstr "全幅"
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
msgid "Full (0-%1)"
msgstr "全幅 (0-%1)"
@@ -560,11 +580,11 @@ msgstr "DCP中视频总时长"
msgid "Full length in video frames at content rate"
msgstr "视频时长"
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
msgid "Gamma 22 (BT470M)"
msgstr "伽玛 22 (BT470M)"
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
msgid "Gamma 28 (BT470BG)"
msgstr "伽玛 28 (BT470BG)"
@@ -588,11 +608,11 @@ msgstr "高品质的3D降噪"
msgid "Hz"
msgstr "Hz"
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr "IEC61966-2-1 (sRGB o sYCC)"
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
msgid "IEC61966-2-4"
msgstr "IEC61966-2-4"
@@ -644,23 +664,23 @@ msgstr "次低"
msgid "Lfe (sub)"
msgstr "次低(子)"
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
msgid "Limited"
msgstr "限制"
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
msgid "Limited (%1-%2)"
msgstr "限制 (%1-%2)"
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
msgid "Linear"
msgstr "线性"
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
msgid "Logarithmic (100:1 range)"
msgstr "对数 (范围 100:1)"
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
msgid "Logarithmic (316:1 range)"
msgstr "对数 (范围 316:1)"
@@ -749,7 +769,6 @@ msgid "Policy"
msgstr "政策相关"
#: src/lib/content.cc:378
-#, fuzzy
msgid "Prepared for video frame rate"
msgstr ""
@@ -765,7 +784,7 @@ msgstr "公共服务或公告"
msgid "R"
msgstr "右声道"
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr "RGB / sRGB (IEC61966-2-1)"
@@ -822,28 +841,28 @@ msgstr "右环绕"
msgid "Rs"
msgstr "右环绕"
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
msgid "SMPTE 170M (BT601)"
msgstr "SMPTE 170M (BT601)"
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
msgid "SMPTE 170M (BT601-6)"
msgstr "SMPTE 170M (BT601-6)"
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
msgid "SMPTE 240M"
msgstr "SMPTE 240M"
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
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:518
+#: src/lib/ffmpeg_content.cc:546
msgid "SMPTE ST 428-1"
msgstr "SMPTE ST 428-1"
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
@@ -994,11 +1013,11 @@ msgstr "未确认音频采样格式 (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "USM锐化和高斯模糊"
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
msgid "Unspecified"
msgstr "未指定"
@@ -1030,7 +1049,7 @@ msgstr "视障"
msgid "Waiting"
msgstr "等候"
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
msgid "YCOCG"
msgstr "YCOCG"