pot/merge.

diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 9beb59b6683e521408cd73f9895968ca4decdcd0..157d4366f618ea932c4b6773449efada8dd769be 100644 (file)
--- 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 b7add4583cab7eb13da928890bb7bd7da0038071..1b9266e61d003ccaa5737f3221fb9b8326e0532d 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 8a1362b3a20541ad586082484b1bc6e74ff48d5b..8f9b4ad982850c9882583864bcb65adbc477faaf 100644 (file)
--- 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 26f7a63dd7dc8208640372526f6f2fef2695e5a8..362c108cc0a6a0d7e768d2eaf48780de1beda6f6 100644 (file)
--- 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 666ab288e62322a180c97c49ec10a06330a37f78..6f64f8a8c44e43c0fa4cf5dc5fd0bcf607c8387e 100644 (file)
--- 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 37e4db273a7d7ac42f9faa69b778e44b08a91af0..92c0f8db1714a5ee73b0bfcee8e7e4d96e734276 100644 (file)
--- 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 34702274a926c6e8153801300b275e6779d0b813..ea70307fc906140135913c0dc5b088c40172bb66 100644 (file)
--- 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 1b3bb8adf164f61e63c5387c27d2b1efa9085d32..b5c68a00fc76a643cf5b9caf4382f4df76dbd233 100644 (file)
--- 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 8c1dac1c438eb75c3b0f6301251e0290b8578cb7..4e2d5c0aeae8785df4a9dcb960a63d65cd8188dd 100644 (file)
--- 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 cd648c64d082c380100cc1393d9125fd080fc33f..403fcaf45ed156ae21eb425d9f22bcf4f592912a 100644 (file)
--- 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 8e78743ce2dffcceec7eedc672fd1a672f08ca3f..e70248612cac6a71e3467cbff40d68d8904e5351 100644 (file)
--- 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 9aa6e60756d352aef827c13796f4ca223ba819e6..c03aeacc066a00278e7ff6a0d0a8594219f34cef 100644 (file)
--- 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 506e91582a64067b44f8012a70717d27494a97ff..cbcc951c8811457b590c4f2aa5e26362872142bc 100644 (file)
--- 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 2fb8801105ede122c27ae56959cdfd5c8312ca18..dd0e7f88f891187c371bc7372dba170c3d451840 100644 (file)
--- 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 bf529b99debd28324840b9f716801e3f8816f268..d7a45e5387233093e3e5af0c6694ea26ea02b095 100644 (file)
--- 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"
 

diff --git a/src/tools/po/cs_CZ.po b/src/tools/po/cs_CZ.po
index dba23f6f0c21803251c93dd74a0e9b58decf672c..09c37c078e521fbe4b95f4404f88eafa8f798be9 100644 (file)
--- a/src/tools/po/cs_CZ.po
+++ b/src/tools/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:51+0200\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"

diff --git a/src/tools/po/da_DK.po b/src/tools/po/da_DK.po
index 95407ad5134505eea734e79d566aca117644d722..4d0af7492689ed1332fe59f1a51ea8165429fe3a 100644 (file)
--- a/src/tools/po/da_DK.po
+++ b/src/tools/po/da_DK.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: 2015-10-27 17:25+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"

diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index a8206a3a5aaab997cc1a967cbeee53561782c729..0f1c3079a7269c09f2f6363a367f9e7ee9ded5df 100644 (file)
--- a/src/tools/po/de_DE.po
+++ b/src/tools/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:20+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 3e0ebb99545749ee87c3870057aa3049a3966da4..4ffec19b7769bf2625ce4a775ce03f4072066dc6 100644 (file)
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\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:07-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 9409bcb49a5237b61534c8a49b1152ca3602470f..d703f576f06497d7d552c703d89254671374544c 100644 (file)
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/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-05-29 17:47+0200\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"

diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index d3f5f8bb92b29ed0a3208af2a1a4fb6962cf84eb..799c40d83e116e5015afec2828faf003c9fe3b08 100644 (file)
--- a/src/tools/po/it_IT.po
+++ b/src/tools/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:13+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"

diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 1d5609871df90516c19e18971a537291d4919b23..b3aa0fe4b0d8578fbe764c65314a8ee97255fe75 100644 (file)
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/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:15+0200\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"

diff --git a/src/tools/po/pl_PL.po b/src/tools/po/pl_PL.po
index 4808b79e1e5da44d4b4d40de6de7673680508bba..e5161b0aef9404d2beec64ed0109bc07edba7f43 100644 (file)
--- a/src/tools/po/pl_PL.po
+++ b/src/tools/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:01+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"

diff --git a/src/tools/po/pt_BR.po b/src/tools/po/pt_BR.po
index 1fa9fb11051f497090ad5382975d21b175581e08..81100933da708d496cb6f90b0012b25cd32cdb44 100644 (file)
--- a/src/tools/po/pt_BR.po
+++ b/src/tools/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 00:53-0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"

diff --git a/src/tools/po/pt_PT.po b/src/tools/po/pt_PT.po
index e0c8898bb5453a2b0b2a60e04cbd74d65f119eb4..5a37c02521ae5331c23261a3bf18570da9e5b36f 100644 (file)
--- a/src/tools/po/pt_PT.po
+++ b/src/tools/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 13:01+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"

diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index e4184d1f70c88cb86410bb161535ab7b9e80ad2d..c0805bfd6975c514cf2d90bbb484ab99d6f0d8ea 100644 (file)
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/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:52+0300\n"
 "Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
 "Language-Team: Russian\n"

diff --git a/src/tools/po/sk_SK.po b/src/tools/po/sk_SK.po
index 3c25ddae2e74afcb934166bb5e26fc1058e14bea..eed43cddfaf29eb087d576026e8d76516e18a39a 100644 (file)
--- a/src/tools/po/sk_SK.po
+++ b/src/tools/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"

diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index adbbe7b110006bd1fa72acc2c9e7d2cc7d6f44fd..a8ca36f51b1d16bb48f3a7ae1fb57cc7889fa7bd 100644 (file)
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/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:12+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"

diff --git a/src/tools/po/uk_UA.po b/src/tools/po/uk_UA.po
index efa97a4d40f422012775d58049ab693de0bd94ad..15cc49709118f0fc268fad137e6dada5e258b50e 100644 (file)
--- a/src/tools/po/uk_UA.po
+++ b/src/tools/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: Ukrainian\n"

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index 28d79d1ab46761aa0ebc4771350e15eb43b2bfdc..17d4ac309fb4cf40ec46722b676e2a0ffe475412 100644 (file)
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\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"

diff --git a/src/wx/po/cs_CZ.po b/src/wx/po/cs_CZ.po
index bf4c3559148ef70f6a4b8d3a78cee8a36a35a99c..8dbd5794c8e8ba19873a1f88586263eca842acc2 100644 (file)
--- a/src/wx/po/cs_CZ.po
+++ b/src/wx/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 09:02+0200\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: DCP-o-matic translators\n"
@@ -21,6 +21,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -222,7 +223,7 @@ msgstr "Povolit všechny DCP frame rate"
 msgid "Alpha   0"
 msgstr "Alpha   0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Vzhled…"
 
@@ -346,7 +347,7 @@ msgstr "Zkontrolovat testovací aktualizace při startu programu"
 msgid "Check for updates on startup"
 msgstr "Zkontrolovat aktualizace při startu programu "
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Vyberte soubor"
 
@@ -354,7 +355,7 @@ msgstr "Vyberte soubor"
 msgid "Choose a file or files"
 msgstr "Vyberte soubor nebo soubory"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Vyberte složku"
 
@@ -429,16 +430,16 @@ msgstr "Kontrast"
 msgid "Copy as name"
 msgstr "Kopírovat jako název"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Nemůžu analyzovat zvuk."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Nemůžu získat náhled z videa (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Nemůžu načíst KDM (%s)"
@@ -480,7 +481,7 @@ msgstr "DCP adresář"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic zvuk"
 
@@ -670,7 +671,7 @@ msgstr "Najít chybějící…"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Písma..."
 
@@ -727,6 +728,11 @@ msgstr "Všeobecné"
 msgid "Get from file..."
 msgstr "Získat ze souboru…"
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Zelená barevnost (Green chromaticity)"
@@ -775,7 +781,7 @@ msgstr "Korekce výstupní gamy"
 msgid "Input power"
 msgstr "Vstupní sila"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Integrovaná hlasitost %.2f LUFS"
@@ -837,7 +843,7 @@ msgstr "Klíč"
 msgid "Keys"
 msgstr "Klíče"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Jazyk"
 
@@ -857,7 +863,7 @@ msgstr "Leaf private key"
 msgid "Left"
 msgstr "Levý"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Levé oko"
 
@@ -865,6 +871,10 @@ msgstr "Levé oko"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Linearizovat vstupní gama křivku pro malé hodnoty"
@@ -881,7 +891,7 @@ msgstr "Log"
 msgid "Log:"
 msgstr "Log:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Rozsah hlasitosti %.2f LU"
@@ -940,10 +950,18 @@ msgstr "Přesunout vybrané části obsahu dříve ve filmu."
 msgid "Move the selected piece of content later in the film."
 msgstr "Přesunou vybrané části obsahu později ve filmu."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Vícenásobný výběr obsahu "
@@ -1046,7 +1064,7 @@ msgstr "Orámovaní"
 msgid "Outline colour"
 msgstr "Barva orámování"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Orámovat obsah"
 
@@ -1062,7 +1080,7 @@ msgstr "Heslo"
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Maximum"
 
@@ -1075,7 +1093,7 @@ msgstr "Maximum: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Maximum: neznámy"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Přehrát"
 
@@ -1119,7 +1137,7 @@ msgstr "Protokol"
 msgid "RGB to XYZ conversion"
 msgstr "Konverze RGB na XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1235,7 +1253,7 @@ msgstr "Pravý"
 msgid "Right click to change gain."
 msgstr "Klikněte pravým tlačítkem, abyste změnili hlasitost."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Pravé oko"
 
@@ -1255,13 +1273,13 @@ msgstr "SCP (pre AAM a Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Nejvyšší vrchol hlasitosti zvuku (sample peak) je %.2fdB na %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1285,7 +1303,7 @@ msgstr "Vybrat CPL XML soubor"
 msgid "Select Certificate File"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Vybrat KDM"
 
@@ -1321,7 +1339,7 @@ msgstr "Server"
 msgid "Servers"
 msgstr "Servery"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Nastavit"
 
@@ -1357,7 +1375,7 @@ msgstr "Podepsané DCP a KDM"
 msgid "Single reel"
 msgstr "Jeden reel"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Vyhlazování"
 
@@ -1385,7 +1403,7 @@ msgstr "Start"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Stream"
 
@@ -1450,7 +1468,7 @@ msgstr "Testované"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "Čas 'do' musí být po čase 'od’."
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1463,7 +1481,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Žádné upozornění; všechno vypadá dobře !"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Nemáte dostatek paměti."
 
@@ -1532,12 +1550,12 @@ msgstr "Oříznout od začátku"
 msgid "Trim up to current position"
 msgstr "Oříznout až po aktuální pozici"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Skutečné maximum je %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Typ"
@@ -1696,7 +1714,7 @@ msgstr "Video Waveform"
 msgid "Video frame rate"
 msgstr "Počet snímků za sekundu (frame rate)"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Zobrazit…"
 

diff --git a/src/wx/po/da_DK.po b/src/wx/po/da_DK.po
index 27b7c7ba85d0dcb3b7cde8554283eda452187bde..0cd739ef07a1152c7a6cb81a56970f7ba6468e44 100644 (file)
--- a/src/wx/po/da_DK.po
+++ b/src/wx/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:35+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,6 +19,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -228,7 +229,7 @@ msgstr "Tillad vilkårlig DCP-billedhastighed"
 msgid "Alpha   0"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr ""
 
@@ -356,7 +357,7 @@ msgstr "Søg efter opdateringer ved opstart."
 msgid "Check for updates on startup"
 msgstr "Søg efter opdateringer ved opstart."
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Vælg en fil"
 
@@ -364,7 +365,7 @@ msgstr "Vælg en fil"
 msgid "Choose a file or files"
 msgstr "Vælg en fil eller filer"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Vælg en folder"
 
@@ -440,16 +441,16 @@ msgstr "Kontrast"
 msgid "Copy as name"
 msgstr "Kopier som navn"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Kunne ikke analysere lyden."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr ""
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Kunne ikke indlæse KDM (%s)"
@@ -491,7 +492,7 @@ msgstr "DCP-folder"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic lyd"
 
@@ -686,7 +687,7 @@ msgstr "Find manglende..."
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Skrifttyper..."
 
@@ -744,6 +745,11 @@ msgstr "Generelt"
 msgid "Get from file..."
 msgstr "Indlæs fra .ttf fil..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Grøn farvetone"
@@ -792,7 +798,7 @@ msgstr ""
 msgid "Input power"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr ""
@@ -856,7 +862,7 @@ msgstr "Nøgle"
 msgid "Keys"
 msgstr "Nøgler"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Sprog"
 
@@ -876,7 +882,7 @@ msgstr ""
 msgid "Left"
 msgstr "Venstre"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 #, fuzzy
 msgid "Left eye"
 msgstr "Venstre"
@@ -885,6 +891,10 @@ msgstr "Venstre"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr ""
@@ -901,7 +911,7 @@ msgstr "Log"
 msgid "Log:"
 msgstr "Log:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr ""
@@ -961,10 +971,18 @@ msgstr "Flyt det valgte indhold til tidligere i filmen."
 msgid "Move the selected piece of content later in the film."
 msgstr "Flyt det valgte indhold til senere i filmen."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Flere indholdselementer valgt"
@@ -1068,7 +1086,7 @@ msgstr ""
 msgid "Outline colour"
 msgstr ""
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr ""
 
@@ -1084,7 +1102,7 @@ msgstr "Password"
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr ""
 
@@ -1097,7 +1115,7 @@ msgstr ""
 msgid "Peak: unknown"
 msgstr ""
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Afspil"
 
@@ -1141,7 +1159,7 @@ msgstr "Protokol"
 msgid "RGB to XYZ conversion"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr ""
 
@@ -1261,7 +1279,7 @@ msgstr "Højre"
 msgid "Right click to change gain."
 msgstr "Højreklik for at ændre gain."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 #, fuzzy
 msgid "Right eye"
 msgstr "Højre"
@@ -1282,13 +1300,13 @@ msgstr ""
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr ""
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1312,7 +1330,7 @@ msgstr "Vælg CPL XML-fil"
 msgid "Select Certificate File"
 msgstr "Vælg certifikatfil"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr ""
 
@@ -1349,7 +1367,7 @@ msgstr "Server"
 msgid "Servers"
 msgstr "Servere"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Indstil"
 
@@ -1386,7 +1404,7 @@ msgstr ""
 msgid "Single reel"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr ""
 
@@ -1414,7 +1432,7 @@ msgstr "Start"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr ""
 
@@ -1480,7 +1498,7 @@ msgstr "Testet af"
 msgid "The 'until' time must be after the 'from' time."
 msgstr ""
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1493,7 +1511,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Der er ingen tips; det hele ser godt ud!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Der er ikke tilstrækkelig ledig hukommelse til at gøre dette."
 
@@ -1560,12 +1578,12 @@ msgstr "Trimning fra begyndelse"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Type"
@@ -1724,7 +1742,7 @@ msgstr ""
 msgid "Video frame rate"
 msgstr "Videobilledhastighed"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Se..."
 

diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 2455911d0544d186bf22a19b808adf2f30f8e928..44cee3216be8f9f415a22b92fa0806f741890453 100644 (file)
--- a/src/wx/po/de_DE.po
+++ b/src/wx/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:27+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: DCP-o-matic translators\n"
@@ -20,6 +20,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -232,7 +233,7 @@ msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)"
 msgid "Alpha   0"
 msgstr "Alpha 0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Darstellung..."
 
@@ -360,7 +361,7 @@ msgstr "Auch auf neue Testversionen prüfen"
 msgid "Check for updates on startup"
 msgstr "Beim Start auf Updates überprüfen."
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Datei auswählen"
 
@@ -368,7 +369,7 @@ msgstr "Datei auswählen"
 msgid "Choose a file or files"
 msgstr "Eine oder mehrere Dateien auswählen"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Ordner mit nummerierter Bildsequenz, oder DCP wählen!"
 
@@ -443,16 +444,16 @@ msgstr "Kontrast"
 msgid "Copy as name"
 msgstr "ISDCF Name statisch kopieren"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Ton konnte nicht analysiert werden"
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Konnte Video nicht anzeigen (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Konnte KDM %s nicht laden"
@@ -494,7 +495,7 @@ msgstr "DCP Verzeichnis"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "Audio Pegelverlauf und Analyse"
 
@@ -683,7 +684,7 @@ msgstr "Suche fehlende..."
 msgid "Fonts"
 msgstr "Zeichensätze"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Zeichensätze..."
 
@@ -742,6 +743,11 @@ msgstr "Allgemein"
 msgid "Get from file..."
 msgstr "Lade aus Datei..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Grün Chromatizität"
@@ -790,7 +796,7 @@ msgstr "Eingangs-Gamma Korrektur:"
 msgid "Input power"
 msgstr "Eingangswert"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr ""
@@ -855,7 +861,7 @@ msgstr "Schlüssel"
 msgid "Keys"
 msgstr "Eigenzertifikate"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Sprache"
 
@@ -875,7 +881,7 @@ msgstr "Leaf private key"
 msgid "Left"
 msgstr "Links"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Linkes Auge"
 
@@ -883,6 +889,10 @@ msgstr "Linkes Auge"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Linearisiere Eingangs Gamma für niedrige Helligkeitswerte"
@@ -899,7 +909,7 @@ msgstr "In die Log-Datei schreiben:"
 msgid "Log:"
 msgstr "In die Log-Datei schreiben:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "LU - Relativer Lautheitsumfang (EBU R128): %.2f LU"
@@ -958,10 +968,18 @@ msgstr "Den ausgewählten Inhalt nach vorne rücken."
 msgid "Move the selected piece of content later in the film."
 msgstr "Den ausgewählten Inhalt nach hinten rücken."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Mehrere Inhalte ausgewählt"
@@ -1065,7 +1083,7 @@ msgstr "Umrissdarstellung"
 msgid "Outline colour"
 msgstr "Umrissfarbe"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Inhalt hervorheben"
 
@@ -1081,7 +1099,7 @@ msgstr "Passwort"
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Spitzenwert (Sample)"
 
@@ -1094,7 +1112,7 @@ msgstr "Spitzenwert: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Spitzenwert: Unbekannt"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Abspielen"
 
@@ -1138,7 +1156,7 @@ msgstr "Protokoll"
 msgid "RGB to XYZ conversion"
 msgstr "RGB-XYZ Konvertierung:"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS (Mittelwert)"
 
@@ -1254,7 +1272,7 @@ msgstr "Rechts"
 msgid "Right click to change gain."
 msgstr "Rechtsklick für Anpassung."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Rechtes Auge"
 
@@ -1274,13 +1292,13 @@ msgstr "SCP (AAM und Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Spitzenwert (Sample peak): %.2fdB bei %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1304,7 +1322,7 @@ msgstr "CPL XML Datei auswählen"
 msgid "Select Certificate File"
 msgstr "Zertifikats-Datei auswählen"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "KDM auswählen"
 
@@ -1340,7 +1358,7 @@ msgstr "Server"
 msgid "Servers"
 msgstr "Encoding Server"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Setzen"
 
@@ -1376,7 +1394,7 @@ msgstr "DCPs und KDMs signieren"
 msgid "Single reel"
 msgstr "Einzelakt (nur eine MXF Datei)"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Glätten"
 
@@ -1404,7 +1422,7 @@ msgstr "Start"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Spur"
 
@@ -1471,7 +1489,7 @@ msgstr ""
 "Das Ende des Gültigkeitsfensters muss nach dem Start des Gültigkeitsfensters "
 "liegen ;-)"
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1484,7 +1502,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Keine Warnungen: Alles sieht gut aus!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Für diese Operation ist nicht genug freier Speicher verfügbar."
 
@@ -1553,12 +1571,12 @@ msgstr "Schnitt vom Anfang"
 msgid "Trim up to current position"
 msgstr "Beschnitt vor aktueller Vorschauposition (Slider)"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Spitzenwert (True peak): %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Typ"
@@ -1717,7 +1735,7 @@ msgstr "Video Waveform (Vorschau-Slider ändert Auswahl...)"
 msgid "Video frame rate"
 msgstr "Bildratenbezugswert"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Liste..."
 

diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 237482f231b98d677db35a244670c80216124485..a6606c328a1b1b9361252709d37872528e4462c9 100644 (file)
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\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:21-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -19,6 +19,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -225,7 +226,7 @@ msgstr "Permitir cualquier velocidad de DCP"
 msgid "Alpha   0"
 msgstr "Alpha   0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Apariencia…"
 
@@ -349,7 +350,7 @@ msgstr "Buscar actualizaciones experimentales al inicio"
 msgid "Check for updates on startup"
 msgstr "Buscar actualizaciones al iniciar"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Elige un fichero"
 
@@ -357,7 +358,7 @@ msgstr "Elige un fichero"
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Elige una carpeta"
 
@@ -433,16 +434,16 @@ msgstr "Contraste"
 msgid "Copy as name"
 msgstr "Copiar como nombre"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "No se pudo analizar el audio."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "No se pudo obtener el vídeo para mostrarlo (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "No se pudo cargar la KDM %s"
@@ -485,7 +486,7 @@ msgstr "Carpeta DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "Audio DCP-o-matic"
 
@@ -675,7 +676,7 @@ msgstr "Buscar ausentes..."
 msgid "Fonts"
 msgstr "Fuentes"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Fuentes…"
 
@@ -733,6 +734,11 @@ msgstr "General"
 msgid "Get from file..."
 msgstr "Usar del fichero…"
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Cromaticidad verde"
@@ -781,7 +787,7 @@ msgstr "Correción de gamma de entrada"
 msgid "Input power"
 msgstr "Potencia de entrada"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Volumen integrado %.2f LUFS"
@@ -843,7 +849,7 @@ msgstr "Llave"
 msgid "Keys"
 msgstr "Llaves"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Idioma"
 
@@ -863,7 +869,7 @@ msgstr "Llave privada para certificado hoja"
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Ojo izquierdo"
 
@@ -871,6 +877,10 @@ msgstr "Ojo izquierdo"
 msgid "Length"
 msgstr "Longitud"
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
@@ -887,7 +897,7 @@ msgstr "Registro"
 msgid "Log:"
 msgstr "Registro:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Rango de volumen %.2f LU"
@@ -946,10 +956,18 @@ msgstr "Avanzar la selección en la película."
 msgid "Move the selected piece of content later in the film."
 msgstr "Retroceder la selección en la película."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Varios contenidos seleccionados"
@@ -1052,7 +1070,7 @@ msgstr "Contorno"
 msgid "Outline colour"
 msgstr "Color del contorno"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Resaltar contenido"
 
@@ -1068,7 +1086,7 @@ msgstr "Clave"
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Pico"
 
@@ -1081,7 +1099,7 @@ msgstr "Pico: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Pico: desconocido"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Reproducir"
 
@@ -1125,7 +1143,7 @@ msgstr "Protocolo"
 msgid "RGB to XYZ conversion"
 msgstr "Conversión RGB a XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1241,7 +1259,7 @@ msgstr "Derecha"
 msgid "Right click to change gain."
 msgstr "Click derecho para cambiar la ganancia."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Ojo derecho"
 
@@ -1261,13 +1279,13 @@ msgstr "SCP (para AAM y Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "El pico de la muestra es %.2fdB en %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1291,7 +1309,7 @@ msgstr "Seleccionar XML del CPL"
 msgid "Select Certificate File"
 msgstr "Seleccionar fichero de certificado"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Seleccionar KDM"
 
@@ -1327,7 +1345,7 @@ msgstr "Servidor"
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Seleccionar"
 
@@ -1363,7 +1381,7 @@ msgstr "Firmand DCPs y KDMs"
 msgid "Single reel"
 msgstr "Bobina única"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Suavizado"
 
@@ -1391,7 +1409,7 @@ msgstr "Inicio"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Flujo"
 
@@ -1456,7 +1474,7 @@ msgstr "Comprobado por"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "El tiempo ‘hasta’ debe ser posterior al tiempo ‘desde’."
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1469,7 +1487,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "No hay recomendaciones: ¡todo parece bien!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "No hay suficiente memoria para hacer eso."
 
@@ -1538,12 +1556,12 @@ msgstr "Recortar del inicio"
 msgid "Trim up to current position"
 msgstr "Recortar hasta la posición actual"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "El pico es %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Tipo"
@@ -1702,7 +1720,7 @@ msgstr "Forma de de onda del vídeo"
 msgid "Video frame rate"
 msgstr "Velocidad de imagen"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Ver..."
 

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 391dd23a4b2c714c1a6896722233fecf7aa477ac..e433aa566f643d0d1fbf10ccb2de4f1f01f495f0 100644 (file)
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/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:46+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -19,6 +19,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -226,7 +227,7 @@ msgstr "Autoriser toutes cadences"
 msgid "Alpha   0"
 msgstr "Alpha   0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Apparence..."
 
@@ -353,7 +354,7 @@ msgstr "Recherche de mises à jour test au démarrage."
 msgid "Check for updates on startup"
 msgstr "Recherche de mises à jour au démarrage."
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
@@ -361,7 +362,7 @@ msgstr "Choisissez un fichier"
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Choisissez un dossier"
 
@@ -438,16 +439,16 @@ msgstr "Contraste"
 msgid "Copy as name"
 msgstr "Copier le nom"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Analyse du son impossible"
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "aucune vidéo à afficher (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Chargement KDM impossible (%s)"
@@ -489,7 +490,7 @@ msgstr "Répertoire du DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "Son DCP-o-matic"
 
@@ -679,7 +680,7 @@ msgstr "Recherche de l'élément manquant..."
 msgid "Fonts"
 msgstr "Police"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Police..."
 
@@ -736,6 +737,11 @@ msgstr "Général"
 msgid "Get from file..."
 msgstr "Depuis le fichier..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Chromaticité du Vert"
@@ -784,7 +790,7 @@ msgstr "Correction gamma d'entrée"
 msgid "Input power"
 msgstr "puissance d'entrée"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Basses fréquences intégrées %.2f LUFS"
@@ -846,7 +852,7 @@ msgstr "Clé"
 msgid "Keys"
 msgstr "Clés"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Langue"
 
@@ -866,7 +872,7 @@ msgstr "Page de clé privée"
 msgid "Left"
 msgstr "Gauche"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Oeil Gauche"
 
@@ -874,6 +880,10 @@ msgstr "Oeil Gauche"
 msgid "Length"
 msgstr "Longueur"
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Linéariser la courbe d'entrée gamma pour les bas niveaux"
@@ -890,7 +900,7 @@ msgstr "Rapport"
 msgid "Log:"
 msgstr "Rapport:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Plage Basses fréquences %.2f LU"
@@ -949,10 +959,18 @@ msgstr "Déplacer le contenu sélectionné plus tôt dans le film."
 msgid "Move the selected piece of content later in the film."
 msgstr "Déplacer le contenu sélectionné plus tard dans le film."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Contenus multiples sélectionnés"
@@ -1055,7 +1073,7 @@ msgstr "Contours"
 msgid "Outline colour"
 msgstr "Couleur contours"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "contours image"
 
@@ -1071,7 +1089,7 @@ msgstr "Mot de passe"
 msgid "Pause"
 msgstr "Pause"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Crête"
 
@@ -1084,7 +1102,7 @@ msgstr "Crête: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Crête: inconnue"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Lecture"
 
@@ -1128,7 +1146,7 @@ msgstr "Protocole"
 msgid "RGB to XYZ conversion"
 msgstr "Conversion RGB vers XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1244,7 +1262,7 @@ msgstr "Droit"
 msgid "Right click to change gain."
 msgstr "Cliquez droit pour modifier le gain."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Oeil Droit"
 
@@ -1264,13 +1282,13 @@ msgstr "SCP (pour AAM et Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "La crête d'échantillon est de %.2fdB à %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1294,7 +1312,7 @@ msgstr "Sélectionner le fichier CPL.xml"
 msgid "Select Certificate File"
 msgstr "Sélectionner le certificat"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Selectionner KDM"
 
@@ -1330,7 +1348,7 @@ msgstr "Serveur"
 msgid "Servers"
 msgstr "Serveurs"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Sélection"
 
@@ -1366,7 +1384,7 @@ msgstr "Signature des DCPs et KDMs:"
 msgid "Single reel"
 msgstr "Bobine unique"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Lissage"
 
@@ -1394,7 +1412,7 @@ msgstr "Démarrer"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Flux"
 
@@ -1459,7 +1477,7 @@ msgstr "Testé par"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "la date de fin doit logiquement être plus tardive que la date de début"
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1473,7 +1491,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Il n'y a aucun avertissement: tout semble correct!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Il n'y a pas assez de mémoire pour faire cela."
 
@@ -1542,12 +1560,12 @@ msgstr "Couper au début"
 msgid "Trim up to current position"
 msgstr "Couper avant le curseur"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "La crête absolue est de %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Type"
@@ -1706,7 +1724,7 @@ msgstr "Forme d'onde vidéo"
 msgid "Video frame rate"
 msgstr "Cadence vidéo"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "voir..."
 

diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index a7aa7e979c70e6da21d3f3cadabab600688fbfb1..46b0f08e8f58fb905d4f8f9fac3aed547d371c87 100644 (file)
--- a/src/wx/po/it_IT.po
+++ b/src/wx/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 14:15+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -19,6 +19,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -225,7 +226,7 @@ msgstr "Consenti qualsiasi frame rate nel DCP"
 msgid "Alpha   0"
 msgstr "Alpha   0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Aspetto..."
 
@@ -352,7 +353,7 @@ msgstr "Controlla gli aggiornamenti di test all'avvio"
 msgid "Check for updates on startup"
 msgstr "Controlla gli aggiornamenti all'avvio"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Scegli un file"
 
@@ -360,7 +361,7 @@ msgstr "Scegli un file"
 msgid "Choose a file or files"
 msgstr "Scegli uno o più file"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Scegli una cartella"
 
@@ -436,16 +437,16 @@ msgstr "Contrasto"
 msgid "Copy as name"
 msgstr "Salva una copia"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Non posso analizzare l'audio."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Non posso aprire il file sorgente per visualizzarlo (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Non posso caricare la KDM (%s)"
@@ -487,7 +488,7 @@ msgstr "Cartella DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "Audio DCP-o-matic"
 
@@ -679,7 +680,7 @@ msgstr "Trova il mancante..."
 msgid "Fonts"
 msgstr "Fonts"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Fonts..."
 
@@ -736,6 +737,11 @@ msgstr "Generale"
 msgid "Get from file..."
 msgstr "Leggi dal file..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Cromacità verde"
@@ -784,7 +790,7 @@ msgstr "Inserisci correzione gamma"
 msgid "Input power"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Volume integrato %.2f LUFS"
@@ -846,7 +852,7 @@ msgstr "Chiave"
 msgid "Keys"
 msgstr "Chiavi"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Lingua"
 
@@ -866,7 +872,7 @@ msgstr "Chiave privata foglia"
 msgid "Left"
 msgstr "Sinistra"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 #, fuzzy
 msgid "Left eye"
 msgstr "Sinistra"
@@ -875,6 +881,10 @@ msgstr "Sinistra"
 msgid "Length"
 msgstr "Lunghezza"
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Linearizza la curva del gamma in ingresso per piccoli valori"
@@ -891,7 +901,7 @@ msgstr "Log"
 msgid "Log:"
 msgstr "Log:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Range del volume %.2f LU"
@@ -952,10 +962,18 @@ msgid "Move the selected piece of content later in the film."
 msgstr ""
 "Sposta il pezzo selezionato del sorgente in un punto successivo del film."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Molteplici sorgenti selezionate"
@@ -1058,7 +1076,7 @@ msgstr "Traccia"
 msgid "Outline colour"
 msgstr "Colore traccia"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Contenuto traccia"
 
@@ -1074,7 +1092,7 @@ msgstr "Password"
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Picco"
 
@@ -1087,7 +1105,7 @@ msgstr "Picco: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Picco: unknown"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Riproduci"
 
@@ -1131,7 +1149,7 @@ msgstr "Protocollo"
 msgid "RGB to XYZ conversion"
 msgstr "Conversione colore da RGB a XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1248,7 +1266,7 @@ msgstr "Destra"
 msgid "Right click to change gain."
 msgstr "Clicca il tasto destro per cambiare guadagno."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 #, fuzzy
 msgid "Right eye"
 msgstr "Destra"
@@ -1269,13 +1287,13 @@ msgstr "SCP (per AAM e Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Picco audio è %.2fdB a %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1299,7 +1317,7 @@ msgstr "Seleziona file XML CPL"
 msgid "Select Certificate File"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Seleziona KDM"
 
@@ -1335,7 +1353,7 @@ msgstr "Server"
 msgid "Servers"
 msgstr "Server"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Imposta"
 
@@ -1371,7 +1389,7 @@ msgstr "Firma dei DCP e delle KDM"
 msgid "Single reel"
 msgstr "Parte singola"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Rifinitura"
 
@@ -1399,7 +1417,7 @@ msgstr "Inizio"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Flusso"
 
@@ -1464,7 +1482,7 @@ msgstr "Testato da"
 msgid "The 'until' time must be after the 'from' time."
 msgstr ""
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1477,7 +1495,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Non ci sono suggerimenti: sembra tutto a posto!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Non c'è abbastanza memoria per farlo."
 
@@ -1544,12 +1562,12 @@ msgstr "Taglia dall'inizio"
 msgid "Trim up to current position"
 msgstr "Elimina fino alla posizione corrente"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Picco reale è %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Tipo"
@@ -1708,7 +1726,7 @@ msgstr "Forma d'onda video"
 msgid "Video frame rate"
 msgstr "Frame rate video"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Visualizza..."
 

diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index cd547a1fe9630019db40c334c369eae92cad62fb..f290d1661b21dd820739f3b6f06ef216bd191963 100644 (file)
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/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:16+0200\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
@@ -20,6 +20,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -226,7 +227,7 @@ msgstr "Sta elke DCP frame rate toe"
 msgid "Alpha   0"
 msgstr "Alpha   0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Uiterlijk..."
 
@@ -354,7 +355,7 @@ msgstr "Zoek naar test-updates bij opstarten"
 msgid "Check for updates on startup"
 msgstr "Zoek naar updates bij opstarten"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
@@ -362,7 +363,7 @@ msgstr "Kies een bestand"
 msgid "Choose a file or files"
 msgstr "Kies een of meer bestanden"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Kies een map"
 
@@ -439,16 +440,16 @@ msgstr "Contrast"
 msgid "Copy as name"
 msgstr "Kopieer als naam"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Kan audio niet analyseren."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Kan video niet tonen (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Kan KDM niet laden (%s)"
@@ -490,7 +491,7 @@ msgstr "DCP-map"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic audio"
 
@@ -680,7 +681,7 @@ msgstr "Zoek ontbrekende..."
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Lettertypen..."
 
@@ -737,6 +738,11 @@ msgstr "Algemeen"
 msgid "Get from file..."
 msgstr "Haal uit bestand..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Groen-chromaticiteit"
@@ -785,7 +791,7 @@ msgstr "Input-gammacorrectie"
 msgid "Input power"
 msgstr "Input-macht"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Geïntegreerde luidheid %.2f LUFS"
@@ -847,7 +853,7 @@ msgstr "Sleutel"
 msgid "Keys"
 msgstr "Sleutels"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Taal"
 
@@ -867,7 +873,7 @@ msgstr "Leaf private key"
 msgid "Left"
 msgstr "Links"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Linkeroog"
 
@@ -875,6 +881,10 @@ msgstr "Linkeroog"
 msgid "Length"
 msgstr "Lengte"
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Lineariseer input-gammacurve voor kleine waarden"
@@ -891,7 +901,7 @@ msgstr "Log"
 msgid "Log:"
 msgstr "Log:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Luidheidbereik %.2f LU"
@@ -949,10 +959,19 @@ msgstr "Verplaats het geselecteerde stuk content naar eerder in de film."
 msgid "Move the selected piece of content later in the film."
 msgstr "Verplaats het geselecteerde stuk content naar later in de film."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+#, fuzzy
+msgid "Move to frame"
+msgstr "Verplaats naar begin van reel"
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr "Verplaats naar begin van reel"
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Meedere content geselecteerd"
@@ -973,8 +992,7 @@ msgstr "Mijn probleem is"
 msgid "NEEDS KDM: "
 msgstr "HEEFT KDM NODIG: "
 
-#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:71
-#: src/wx/screen_dialog.cc:67
+#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:71 src/wx/screen_dialog.cc:67
 msgid "Name"
 msgstr "Naam"
 
@@ -1058,7 +1076,7 @@ msgstr "Omlijn"
 msgid "Outline colour"
 msgstr "Omlijnings-kleur"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Omlijn content"
 
@@ -1074,7 +1092,7 @@ msgstr "Wachtwoord"
 msgid "Pause"
 msgstr "Pauzeer"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Piek"
 
@@ -1087,7 +1105,7 @@ msgstr "Piek: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Piek: onbekend"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Speel af"
 
@@ -1131,7 +1149,7 @@ msgstr "Protocol"
 msgid "RGB to XYZ conversion"
 msgstr "RGB naar XYZ conversie"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "Effectieve waarde (RMS)"
 
@@ -1247,7 +1265,7 @@ msgstr "Rechts"
 msgid "Right click to change gain."
 msgstr "Klik met de rechtermuisknop om versterking te wijzigen."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Rechteroog"
 
@@ -1267,13 +1285,14 @@ msgstr "SCP (voor AAM and Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Sample-piek is %.2fdB op %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+#, fuzzy
+msgid "Save to KDM Creator tool's list"
 msgstr "Bewaar in lijst van KDM Creator tool"
 
 #: src/wx/video_panel.cc:164
@@ -1297,7 +1316,7 @@ msgstr "Selecteer CPL XML-bestand"
 msgid "Select Certificate File"
 msgstr "Selecteer Certificaat-bestand"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Selecteer KDM"
 
@@ -1333,7 +1352,7 @@ msgstr "Server"
 msgid "Servers"
 msgstr "Servers"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Stel in"
 
@@ -1369,7 +1388,7 @@ msgstr "Ondertekenen van DCP's en KDM's"
 msgid "Single reel"
 msgstr "Enkele reel"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Gladstrijken"
 
@@ -1397,7 +1416,7 @@ msgstr "Start"
 msgid "Start of reel"
 msgstr "Begin van reel"
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Stream"
 
@@ -1462,7 +1481,7 @@ msgstr "Getest door"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "De 'tot'-tijd moet na de 'van'-tijd zijn."
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1476,7 +1495,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Er zijn geen hints, alles ziet er goed uit!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Er is niet genoeg geheugen om dat te doen."
 
@@ -1545,12 +1564,12 @@ msgstr "Wegknippen van begin"
 msgid "Trim up to current position"
 msgstr "Wegknippen tot aan huidige positie"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Piek (True peak) is %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Type"
@@ -1709,7 +1728,7 @@ msgstr "Video-golfvorm"
 msgid "Video frame rate"
 msgstr "Video frame rate"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Toon..."
 

diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index 7afb448061f0d6d701b3a3fe6b6c2372a19a4e92..59d3e2f981b824436dc50c9fa21c7aae11f67c13 100644 (file)
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/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 20:35+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -21,6 +21,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -224,7 +225,7 @@ msgstr "Zezwalaj na dowolną częstotliwość kl/s DCP"
 msgid "Alpha   0"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr ""
 
@@ -355,7 +356,7 @@ msgstr "Sprawdź aktualizacje przy starcie programu"
 msgid "Check for updates on startup"
 msgstr "Sprawdź aktualizacje przy starcie programu"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Wybierz plik"
 
@@ -363,7 +364,7 @@ msgstr "Wybierz plik"
 msgid "Choose a file or files"
 msgstr "Wybierz plik lub pliki"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Wybierz folder"
 
@@ -439,16 +440,16 @@ msgstr "Kontrast"
 msgid "Copy as name"
 msgstr "Kopiuj jako"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Nie udało się przeanalizować dźwięku."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Nie udało się otworzyć podglądu obrazu (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Nie udało się załadować KDM (%s)"
@@ -490,7 +491,7 @@ msgstr "Katalog DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic dźwięk"
 
@@ -685,7 +686,7 @@ msgstr "Znajdź brakujące"
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Czcionki"
 
@@ -744,6 +745,11 @@ msgstr "Ogólne"
 msgid "Get from file..."
 msgstr "Ustaw czcionkę z pliku .ttf"
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Chroma kanału zielonego"
@@ -792,7 +798,7 @@ msgstr "Korekcja gammy wejściowej"
 msgid "Input power"
 msgstr "Moc wejściowa"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr ""
@@ -856,7 +862,7 @@ msgstr "Klucz"
 msgid "Keys"
 msgstr "Klucze"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Język"
 
@@ -876,7 +882,7 @@ msgstr "Klucz prywatny Leaf"
 msgid "Left"
 msgstr "Lewa"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 #, fuzzy
 msgid "Left eye"
 msgstr "Lewa"
@@ -885,6 +891,10 @@ msgstr "Lewa"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Wyrównaj krzywą gamma dla niskich wartości"
@@ -901,7 +911,7 @@ msgstr "Dziennik"
 msgid "Log:"
 msgstr "Dziennik:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr ""
@@ -961,10 +971,18 @@ msgstr "Przenieś zaznaczony fragment wcześniej."
 msgid "Move the selected piece of content later in the film."
 msgstr "Przenieś zaznaczony fragment później."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Zaznaczono wiele plików"
@@ -1071,7 +1089,7 @@ msgstr "Obrysuj obraz"
 msgid "Outline colour"
 msgstr "Obrysuj obraz"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Obrysuj obraz"
 
@@ -1087,7 +1105,7 @@ msgstr "Hasło"
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Peak"
 
@@ -1100,7 +1118,7 @@ msgstr "Peak wynosi %.2fdB"
 msgid "Peak: unknown"
 msgstr "Peak: nieznany"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Odtwórz"
 
@@ -1142,7 +1160,7 @@ msgstr "Protokół"
 msgid "RGB to XYZ conversion"
 msgstr "Konwersja RGB na XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1262,7 +1280,7 @@ msgstr "Prawa"
 msgid "Right click to change gain."
 msgstr "Kliknij prawy przycisk myszy, żeby zmienić wzmocenienie."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 #, fuzzy
 msgid "Right eye"
 msgstr "Prawa"
@@ -1283,13 +1301,13 @@ msgstr "SCP (dla AAM i Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, fuzzy, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Peak wynosi %.2fdB w %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1313,7 +1331,7 @@ msgstr "Wybierz plik CPL XML"
 msgid "Select Certificate File"
 msgstr "Wybierz plik certyfikatu"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Wybierz KDM"
 
@@ -1350,7 +1368,7 @@ msgstr "Serwer"
 msgid "Servers"
 msgstr "Serwery"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Wybierz"
 
@@ -1387,7 +1405,7 @@ msgstr "Podpisuję cyfrowo DCP i KDM"
 msgid "Single reel"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Wygładzanie"
 
@@ -1415,7 +1433,7 @@ msgstr "Rozpocznij"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Strumień"
 
@@ -1481,7 +1499,7 @@ msgstr "Testerzy"
 msgid "The 'until' time must be after the 'from' time."
 msgstr ""
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1494,7 +1512,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Brak wskazówek: wszystko wygląda świetnie!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Brak pamięci RAM"
 
@@ -1561,12 +1579,12 @@ msgstr "Przytnij od początku"
 msgid "Trim up to current position"
 msgstr "Przytnij do obecnego miejsca"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Peak wynosi %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Rodzaj"
@@ -1725,7 +1743,7 @@ msgstr "Analiza pliku video"
 msgid "Video frame rate"
 msgstr "Czestotliwość kl/s pliku wideo"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Podgląd"
 

diff --git a/src/wx/po/pt_BR.po b/src/wx/po/pt_BR.po
index 75dcc55cc5dc285c1e0fe5b316970a97b4fdc6d6..c8740ec6a36e0b686bda18025565c8f633ebd46e 100644 (file)
--- a/src/wx/po/pt_BR.po
+++ b/src/wx/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:15-0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -19,6 +19,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -226,7 +227,7 @@ msgstr "Permitir qualquer taxa de quadros no DCP"
 msgid "Alpha   0"
 msgstr "Alpha   0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Aparência..."
 
@@ -353,7 +354,7 @@ msgstr "Verificar updates de teste ao inicializar"
 msgid "Check for updates on startup"
 msgstr "Verificar updates ao inicializar"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Escolher um arquivo"
 
@@ -361,7 +362,7 @@ msgstr "Escolher um arquivo"
 msgid "Choose a file or files"
 msgstr "Escolher um arquivo ou arquivos"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Escolher uma pasta"
 
@@ -437,16 +438,16 @@ msgstr "Contraste"
 msgid "Copy as name"
 msgstr "Copiar com o nome"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Impossível analisar áudio"
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Impossível conseguir vídeo para exibição (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Impossível carregar KDM (%s)"
@@ -488,7 +489,7 @@ msgstr "Diretório do DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "Áudio DCP-o-matic"
 
@@ -678,7 +679,7 @@ msgstr "Encontrar faltantes..."
 msgid "Fonts"
 msgstr "Fontes"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Fontes..."
 
@@ -736,6 +737,11 @@ msgstr "Geral"
 msgid "Get from file..."
 msgstr "Abrir de um arquivo..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Cromaticidade verde"
@@ -784,7 +790,7 @@ msgstr "Correção do gama de entrada"
 msgid "Input power"
 msgstr "Potência de entrada"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Amplitude integrada %.2f LUFS"
@@ -846,7 +852,7 @@ msgstr "Chave"
 msgid "Keys"
 msgstr "Chaves"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Idioma"
 
@@ -866,7 +872,7 @@ msgstr "Chave privada Leaf"
 msgid "Left"
 msgstr "Esquerdo"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Olho esquerdo"
 
@@ -874,6 +880,10 @@ msgstr "Olho esquerdo"
 msgid "Length"
 msgstr "Duração"
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Linearizar gama de entrada para valores pequenos"
@@ -890,7 +900,7 @@ msgstr "Log"
 msgid "Log:"
 msgstr "Log:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Faixa de amplitude %.2f LU"
@@ -949,10 +959,19 @@ msgstr "Mover o conteúdo selecionado para antes no filme"
 msgid "Move the selected piece of content later in the film."
 msgstr "Mover o conteúdo selecionado para depois no filme"
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+#, fuzzy
+msgid "Move to frame"
+msgstr "Mover para o início do rolo"
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr "Mover para o início do rolo"
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Múltiplos conteúdos selecionados"
@@ -1055,7 +1074,7 @@ msgstr "Borda"
 msgid "Outline colour"
 msgstr "Cor da borda"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Mostrar borda no conteúdo"
 
@@ -1071,7 +1090,7 @@ msgstr "Senha"
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Pico"
 
@@ -1084,7 +1103,7 @@ msgstr "Pico: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Pico: desconhecido"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Reproduzir"
 
@@ -1128,7 +1147,7 @@ msgstr "Protocolo"
 msgid "RGB to XYZ conversion"
 msgstr "Conversão RGB para XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1244,7 +1263,7 @@ msgstr "Direito"
 msgid "Right click to change gain."
 msgstr "Clique com o botão direito para alterar o ganho"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Olho direito"
 
@@ -1264,13 +1283,13 @@ msgstr "SCP (para AAM e Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Pico da amotra é %.2fdB em %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1294,7 +1313,7 @@ msgstr "Selecionar arquivo CPL XML"
 msgid "Select Certificate File"
 msgstr "Selecionar arquivo de certificado"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Selecionar KDM"
 
@@ -1330,7 +1349,7 @@ msgstr "Servidor"
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Definir"
 
@@ -1366,7 +1385,7 @@ msgstr "Assinando DCPs e KDMs"
 msgid "Single reel"
 msgstr "Rolo único"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Amenizar curva"
 
@@ -1394,7 +1413,7 @@ msgstr "Início"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Stream"
 
@@ -1459,7 +1478,7 @@ msgstr "Testado por"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "O tempo 'Até' de vir depois do tempo 'De'"
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1473,7 +1492,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Não há dicas: tudo parece perfeito!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Não há memória livre suficiente para fazer isso."
 
@@ -1542,12 +1561,12 @@ msgstr "Cortar a partir do começo"
 msgid "Trim up to current position"
 msgstr "Cortar até a posição atual"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Pico real é %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Tipo"
@@ -1706,7 +1725,7 @@ msgstr "Waveform de vídeo"
 msgid "Video frame rate"
 msgstr "Taxa de quadros do vídeo"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Exibir..."
 

diff --git a/src/wx/po/pt_PT.po b/src/wx/po/pt_PT.po
index 874686c426eb8200b5c6263129f666a463804722..bfb7271edf5cd6185072bae67bb789bb96361591 100644 (file)
--- a/src/wx/po/pt_PT.po
+++ b/src/wx/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 13:56+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"
@@ -20,6 +20,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -227,7 +228,7 @@ msgstr "Permitir qualquer cadência de fotogramas"
 msgid "Alpha   0"
 msgstr "Alfa   O"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Aparência..."
 
@@ -354,7 +355,7 @@ msgstr "Pesquisar por actualizações de teste no arranque"
 msgid "Check for updates on startup"
 msgstr "Pesquisar por actualizações no arranque"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Seleccionar ficheiro"
 
@@ -362,7 +363,7 @@ msgstr "Seleccionar ficheiro"
 msgid "Choose a file or files"
 msgstr "Seleccionar ficheiro(s)"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Seleccionar pasta"
 
@@ -439,16 +440,16 @@ msgstr "Contraste"
 msgid "Copy as name"
 msgstr "Copiar como nome"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Não foi possível analizar audio."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Não foi possível obter o vídeo para visualizar (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Não foi possível carregar a KDM (%s)"
@@ -490,7 +491,7 @@ msgstr "Directório do DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "Audio do DCP-o-matic"
 
@@ -682,7 +683,7 @@ msgstr "A procurar em falta..."
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Tipos de letra..."
 
@@ -740,6 +741,11 @@ msgstr "Geral"
 msgid "Get from file..."
 msgstr "Definir a partir de ficheiro..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Cromaticidade verde"
@@ -788,7 +794,7 @@ msgstr "Correcção de gama de entrada"
 msgid "Input power"
 msgstr "Potência de entrada"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Intensidade sonora integrada %.2f LUFS"
@@ -850,7 +856,7 @@ msgstr "Chave"
 msgid "Keys"
 msgstr "Chaves"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Língua"
 
@@ -870,7 +876,7 @@ msgstr "Chave privada da folha"
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 #, fuzzy
 msgid "Left eye"
 msgstr "Esquerda"
@@ -879,6 +885,10 @@ msgstr "Esquerda"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Achatar curva de entrada de gama a valores pequenos"
@@ -895,7 +905,7 @@ msgstr "Registo"
 msgid "Log:"
 msgstr "Registo:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Variação de intensidade sonora %.2f LU"
@@ -957,10 +967,18 @@ msgstr ""
 "Mover o fragmento de conteúdo seleccionado para o um ponto posterior do "
 "filme."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Conteúdo múltiplo seleccionado"
@@ -1063,7 +1081,7 @@ msgstr "Contorno"
 msgid "Outline colour"
 msgstr "Cor do contorno"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Contornar conteúdo"
 
@@ -1079,7 +1097,7 @@ msgstr "Palavra passe"
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Pico"
 
@@ -1092,7 +1110,7 @@ msgstr "Pico: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Pico: desconhecido"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Reproduzir"
 
@@ -1136,7 +1154,7 @@ msgstr "Protocolo"
 msgid "RGB to XYZ conversion"
 msgstr "Conversão de RGB para XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "PMQ"
 
@@ -1253,7 +1271,7 @@ msgstr "Direita"
 msgid "Right click to change gain."
 msgstr "Clique direito para alterar o ganho."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 #, fuzzy
 msgid "Right eye"
 msgstr "Direita"
@@ -1274,13 +1292,13 @@ msgstr "SCP (para AAM e Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Pico de amostra é %.2fdB em %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1304,7 +1322,7 @@ msgstr "Seleccionar ficheiro XML da CPL"
 msgid "Select Certificate File"
 msgstr "Seleccionar Ficheiro do Certificado"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Seleccionar KDM"
 
@@ -1340,7 +1358,7 @@ msgstr "Servidor"
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Definir"
 
@@ -1376,7 +1394,7 @@ msgstr "Assinar DCP e KDM"
 msgid "Single reel"
 msgstr "Bobina única"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Suavização"
 
@@ -1404,7 +1422,7 @@ msgstr "Iniciar"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Fluxo"
 
@@ -1469,7 +1487,7 @@ msgstr "Testado por"
 msgid "The 'until' time must be after the 'from' time."
 msgstr ""
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1482,7 +1500,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Não há sugestões: Tudo parece bem!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Não há memória livre para executar essa acção."
 
@@ -1549,12 +1567,12 @@ msgstr "Aparar do início"
 msgid "Trim up to current position"
 msgstr "Aparar até à posição actual"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Pico real é %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Tipo"
@@ -1713,7 +1731,7 @@ msgstr "Forma de onda de vídeo"
 msgid "Video frame rate"
 msgstr "Cadência de fotogramas de vídeo"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Ver..."
 

diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index 5ddb8f292e95af6d285be54fb7ad132e136d100f..d1f8a4ba93b8a4058438c2e2da59c9fc645bc94c 100644 (file)
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/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:52+0300\n"
 "Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
 "Language-Team: Russian\n"
@@ -17,6 +17,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -221,7 +222,7 @@ msgstr "Разрешить любую частоту кадров DCP"
 msgid "Alpha   0"
 msgstr "Альфа 0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Внешний вид..."
 
@@ -348,7 +349,7 @@ msgstr "Проверять тестовые обновления при запу
 msgid "Check for updates on startup"
 msgstr "Проверять обновления при запуске"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Выбрать файл"
 
@@ -356,7 +357,7 @@ msgstr "Выбрать файл"
 msgid "Choose a file or files"
 msgstr "Выбрать файл или файлы"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Выбрать папку"
 
@@ -433,16 +434,16 @@ msgstr "Контраст"
 msgid "Copy as name"
 msgstr "Копировать в название"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Не удалось проанализировать аудио."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Не удалось вывести предпросмотр видео (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Не удалось загрузить KDM (%s)"
@@ -484,7 +485,7 @@ msgstr "Папка DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "Аудио DCP-o-matic"
 
@@ -674,7 +675,7 @@ msgstr "Найти отсутствующее..."
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Шрифты..."
 
@@ -733,6 +734,11 @@ msgstr "Основные"
 msgid "Get from file..."
 msgstr "Выбрать из файла..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Зеленая цветность"
@@ -781,7 +787,7 @@ msgstr "Коррекция входной гаммы"
 msgid "Input power"
 msgstr "Входная мощность"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Интегрированная громкость %.2f LUFS"
@@ -843,7 +849,7 @@ msgstr "Ключ"
 msgid "Keys"
 msgstr "Ключи"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Язык"
 
@@ -863,7 +869,7 @@ msgstr "Leaf private key"
 msgid "Left"
 msgstr "Слева"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Левый глаз"
 
@@ -871,6 +877,10 @@ msgstr "Левый глаз"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Выровнять входную гамму для малых значений"
@@ -887,7 +897,7 @@ msgstr "Лог"
 msgid "Log:"
 msgstr "Лог:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Диапазон громкости %.2f LU"
@@ -946,10 +956,18 @@ msgstr "Переместить выбранный элемент контент
 msgid "Move the selected piece of content later in the film."
 msgstr "Переместить выбранный элемент контента позднее в проекте."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Множественное выделение контента"
@@ -1052,7 +1070,7 @@ msgstr "Контур"
 msgid "Outline colour"
 msgstr "Цвет контура"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Очертить контент"
 
@@ -1068,7 +1086,7 @@ msgstr "Пароль"
 msgid "Pause"
 msgstr "Пазуа"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Вершина"
 
@@ -1081,7 +1099,7 @@ msgstr "Пиковая громкость %.2fдБ"
 msgid "Peak: unknown"
 msgstr "Пиковая громкость: неизвестна"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Вопроизведение"
 
@@ -1125,7 +1143,7 @@ msgstr "Протокол"
 msgid "RGB to XYZ conversion"
 msgstr "Преобразование RGB в XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "Rated Maximum Sinusoidal"
 
@@ -1241,7 +1259,7 @@ msgstr "Справа"
 msgid "Right click to change gain."
 msgstr "Правый клик для изменения усиления"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Правый глаз"
 
@@ -1261,13 +1279,13 @@ msgstr "SCP (для AAM и Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Пиковая громкость %.2fдБ на %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1291,7 +1309,7 @@ msgstr "Выберите XML-файл CPL"
 msgid "Select Certificate File"
 msgstr "Выберите файл сертификата"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Выберите KDM"
 
@@ -1327,7 +1345,7 @@ msgstr "Сервер"
 msgid "Servers"
 msgstr "Сервера"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Назначить"
 
@@ -1363,7 +1381,7 @@ msgstr "Подпись DCP и KDM:"
 msgid "Single reel"
 msgstr "Одна бобина"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Сглаживание"
 
@@ -1391,7 +1409,7 @@ msgstr "Начало"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Поток"
 
@@ -1456,7 +1474,7 @@ msgstr "Тестирование"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "Время \"до\" должно быть после времени \"от\""
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1469,7 +1487,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Нет подсказок: похоже всё хорошо!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Недостаточно памяти, чтобы сделать это."
 
@@ -1538,12 +1556,12 @@ msgstr "Обрезать с начала"
 msgid "Trim up to current position"
 msgstr "Обрезать до текущей позиции"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Пиковая громкость %.2fдБ"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Тип"
@@ -1702,7 +1720,7 @@ msgstr "График видео"
 msgid "Video frame rate"
 msgstr "Частота кадров видео"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Просмотр..."
 

diff --git a/src/wx/po/sk_SK.po b/src/wx/po/sk_SK.po
index 5561cf97c4048a2f24d07db6bbdb76e8a5cdaf1c..48ce12d69b376b9226c47fdd2b26b28913e6ec83 100644 (file)
--- a/src/wx/po/sk_SK.po
+++ b/src/wx/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: DCP-o-matic translators\n"
@@ -21,6 +21,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -224,7 +225,7 @@ msgstr "Povoliť všetky DCP frame rate"
 msgid "Alpha   0"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Vzhľad..."
 
@@ -349,7 +350,7 @@ msgstr "Skontrolovať testing aktualizácie pri spustení programu"
 msgid "Check for updates on startup"
 msgstr "Skontrolovať aktualizácie pri spustení programu "
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Vyberte súbor"
 
@@ -357,7 +358,7 @@ msgstr "Vyberte súbor"
 msgid "Choose a file or files"
 msgstr "Vyberte súbor alebo súbory"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Vyberte priečinok"
 
@@ -433,16 +434,16 @@ msgstr "Kontrast"
 msgid "Copy as name"
 msgstr "Kopírovať ako názov"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Nemôžem analyzovať zvuk."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Nemôžem získať náhľad z videa (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Nemôžem načítať kDM (%s)"
@@ -484,7 +485,7 @@ msgstr "DCP adresár"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic zvuk"
 
@@ -674,7 +675,7 @@ msgstr "Nájsť chýbajúce..."
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Písma..."
 
@@ -731,6 +732,11 @@ msgstr "Všeobecné"
 msgid "Get from file..."
 msgstr "Získať zo súboru..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Zelená farebnosť (Green chromaticity)"
@@ -779,7 +785,7 @@ msgstr "Korekcia vstupnej gamy"
 msgid "Input power"
 msgstr "Vstupná sila"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Integrovaná hlasitosť %.2f LUFS"
@@ -842,7 +848,7 @@ msgstr "Kľúč"
 msgid "Keys"
 msgstr "Kľúče"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Jazyk"
 
@@ -862,7 +868,7 @@ msgstr "Leaf private key"
 msgid "Left"
 msgstr "Ľavý"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 #, fuzzy
 msgid "Left eye"
 msgstr "Ľavý"
@@ -871,6 +877,10 @@ msgstr "Ľavý"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Linearizovať vstupnú gama krivku pre malé hodnoty"
@@ -887,7 +897,7 @@ msgstr "Log"
 msgid "Log:"
 msgstr "Log:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Rozsah hlasitosti %.2f LU"
@@ -946,10 +956,18 @@ msgstr "Presunúť vybrané časti obsahu skôr vo filme."
 msgid "Move the selected piece of content later in the film."
 msgstr "Presunúť vybrané časti obsahu neskôr vo filme."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Viacnásobný výber obsahu "
@@ -1052,7 +1070,7 @@ msgstr "Orámovanie"
 msgid "Outline colour"
 msgstr "Umrissfarbe"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Farba orámovania"
 
@@ -1068,7 +1086,7 @@ msgstr "Heslo"
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Maximum"
 
@@ -1081,7 +1099,7 @@ msgstr "Maximum: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Maximum: neznámy"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Prehrať"
 
@@ -1125,7 +1143,7 @@ msgstr "Protokol"
 msgid "RGB to XYZ conversion"
 msgstr "Konverzia RGB na XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1242,7 +1260,7 @@ msgstr "Pravý"
 msgid "Right click to change gain."
 msgstr "Kliknite prvým tlačidlom aby ste zmenili hlasitosť."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 #, fuzzy
 msgid "Right eye"
 msgstr "Pravý"
@@ -1263,13 +1281,13 @@ msgstr "SCP (pre AAM a Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Vzorka najvyššej hlasitosti zvuku (sample peak) je %.2fdB na %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1293,7 +1311,7 @@ msgstr "Vybrať CPL XML súbor"
 msgid "Select Certificate File"
 msgstr "Vybrať súbor s certifikátom"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Vybrať KDM"
 
@@ -1329,7 +1347,7 @@ msgstr "Server"
 msgid "Servers"
 msgstr "Servery"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Nastaviť"
 
@@ -1365,7 +1383,7 @@ msgstr "Podpisovanie DCP a KDM"
 msgid "Single reel"
 msgstr "Jeden reel"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Vyhladzovanie"
 
@@ -1393,7 +1411,7 @@ msgstr "Začať"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Stream"
 
@@ -1459,7 +1477,7 @@ msgstr "Testované"
 msgid "The 'until' time must be after the 'from' time."
 msgstr ""
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1472,7 +1490,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Žiadne upozornenie; všetko vyzerá dobre !"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Nemáte dostatok pamäte."
 
@@ -1539,12 +1557,12 @@ msgstr "Odseknúť zo začiatku"
 msgid "Trim up to current position"
 msgstr "Orezať až do súčasnej pozície"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Skutočné maximum je %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Typ"
@@ -1703,7 +1721,7 @@ msgstr "Video Waveform"
 msgid "Video frame rate"
 msgstr "Počet snímok za sekundu (frame rate)"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Zobraziť..."
 

diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 61c663b1a27cba078e4eb41c0159173e101bdbfc..31fc4c4ac12898f7c0b8a3dfe2a95d00e7378e3e 100644 (file)
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/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 16:41+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -19,6 +19,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -224,7 +225,7 @@ msgstr "Tillåt valfri DCP bildhastighet"
 msgid "Alpha   0"
 msgstr "Alpha   0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Utseende..."
 
@@ -352,7 +353,7 @@ msgstr "Sök efter testuppdateringar vid start"
 msgid "Check for updates on startup"
 msgstr "Sök efter uppdateringar vid start"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Välj en fil"
 
@@ -360,7 +361,7 @@ msgstr "Välj en fil"
 msgid "Choose a file or files"
 msgstr "Välj en fil eller filer"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Välj en folder"
 
@@ -436,16 +437,16 @@ msgstr "Kontrast"
 msgid "Copy as name"
 msgstr "Kopiera som namn"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Kunde inte analysera audio."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Kunde inte få video för vy (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Kunde inte ladda KDM (%s)"
@@ -487,7 +488,7 @@ msgstr "DCP register"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic audio"
 
@@ -677,7 +678,7 @@ msgstr "Hitta saknade..."
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Typsnitt..."
 
@@ -734,6 +735,11 @@ msgstr "Generellt"
 msgid "Get from file..."
 msgstr "Hämta från fil..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Grönfärgning"
@@ -782,7 +788,7 @@ msgstr "Input gammakorrigering"
 msgid "Input power"
 msgstr "Input kraft"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Integrerad loudness %.2f LUFS"
@@ -845,7 +851,7 @@ msgstr "Nyckel"
 msgid "Keys"
 msgstr "Nycklar"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Språk"
 
@@ -865,7 +871,7 @@ msgstr "Löv privat nyckel"
 msgid "Left"
 msgstr "Vänster"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Vänster öga"
 
@@ -873,6 +879,10 @@ msgstr "Vänster öga"
 msgid "Length"
 msgstr "Längd"
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Linjärisera input-gammakurvan för små värden"
@@ -889,7 +899,7 @@ msgstr "Logg"
 msgid "Log:"
 msgstr "Logg:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Loudness-omfång %.2f LU"
@@ -948,10 +958,18 @@ msgstr "Flytta den valda delen av innehåll tidigare i filmen."
 msgid "Move the selected piece of content later in the film."
 msgstr "Flytta den valda delen av innehåll senare i filmen."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Flera innehåll valda"
@@ -1056,7 +1074,7 @@ msgstr "Markera"
 msgid "Outline colour"
 msgstr "Markör-färg"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Markera innehåll"
 
@@ -1072,7 +1090,7 @@ msgstr "Lösenord"
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Topp"
 
@@ -1085,7 +1103,7 @@ msgstr "Maxvärde: %.2fdB"
 msgid "Peak: unknown"
 msgstr "Maxvärde: unknown"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Spela"
 
@@ -1129,7 +1147,7 @@ msgstr "Protokol"
 msgid "RGB to XYZ conversion"
 msgstr "RGB till XYZ konvertering"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1245,7 +1263,7 @@ msgstr "Höger"
 msgid "Right click to change gain."
 msgstr "Högerklicka för att ändra förstärkning."
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Höger öga"
 
@@ -1265,13 +1283,13 @@ msgstr "SCP (för AAM och Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Sample-maxvärde är %.2fdB vid %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1295,7 +1313,7 @@ msgstr "Välj CPL XML-fil"
 msgid "Select Certificate File"
 msgstr "Välj certifikatfil"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Välj KDM"
 
@@ -1331,7 +1349,7 @@ msgstr "Server"
 msgid "Servers"
 msgstr "Servrar"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Sätt"
 
@@ -1367,7 +1385,7 @@ msgstr "Signerar DCP:er och KDM:er"
 msgid "Single reel"
 msgstr "Enskild rulle"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Utjämning"
 
@@ -1395,7 +1413,7 @@ msgstr "Start"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Strömma"
 
@@ -1460,7 +1478,7 @@ msgstr "Testad av"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "'tills'-tiden måste vara efter 'från'-tiden."
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1473,7 +1491,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Det finns inga råd: allt verkar bra!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Det finns inte tillräckligt mycket ledigt minne för att göra det."
 
@@ -1543,12 +1561,12 @@ msgstr "Trimma från start"
 msgid "Trim up to current position"
 msgstr "Trimma före nuvarande position"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Maxvärde är %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Typ"
@@ -1707,7 +1725,7 @@ msgstr "Video Vågform"
 msgid "Video frame rate"
 msgstr "bildhastighet"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Visa..."
 

diff --git a/src/wx/po/uk_UA.po b/src/wx/po/uk_UA.po
index 09e5a45d801b5a030f3796142efe8638dfd734dc..5a753a51765695e9d2e5354652276de4444cc215 100644 (file)
--- a/src/wx/po/uk_UA.po
+++ b/src/wx/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:47+0300\n"
 "Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
 "Language-Team: Ukrainian\n"
@@ -17,6 +17,7 @@ msgstr ""
 
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -221,7 +222,7 @@ msgstr "Дозволити будь яку частоту кадрів DCP"
 msgid "Alpha   0"
 msgstr "Альфа 0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "Зовнішній вигляд..."
 
@@ -347,7 +348,7 @@ msgstr "Перевіряти тестові оновлення при запус
 msgid "Check for updates on startup"
 msgstr "Перевіряти оновлення при запуску"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "Обрати файл"
 
@@ -355,7 +356,7 @@ msgstr "Обрати файл"
 msgid "Choose a file or files"
 msgstr "Обрати файл або файли"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "Обрати папку"
 
@@ -432,16 +433,16 @@ msgstr "Контраст"
 msgid "Copy as name"
 msgstr "Копіювати у назву"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "Не вдалося проаналізувати аудіо."
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "Не вдалося отримати попередній перегляд видео (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "Не вдалося завантажити KDM (%s)"
@@ -483,7 +484,7 @@ msgstr "Папка DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "Аудіо DCP-o-matic"
 
@@ -673,7 +674,7 @@ msgstr "Знайти відсутнє..."
 msgid "Fonts"
 msgstr "Шрифти"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "Шрифти..."
 
@@ -732,6 +733,11 @@ msgstr "Основні"
 msgid "Get from file..."
 msgstr "Вибрати з файлу..."
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "Зелена кольоровість"
@@ -780,7 +786,7 @@ msgstr "Корекція вхідної гамми"
 msgid "Input power"
 msgstr "Вхідна потужність"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "Інтегрована гучність %.2f LUFS"
@@ -842,7 +848,7 @@ msgstr "Ключ"
 msgid "Keys"
 msgstr "Ключі"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "Мова"
 
@@ -862,7 +868,7 @@ msgstr "Leaf private key"
 msgid "Left"
 msgstr "Зліва"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
 msgstr "Ліве око"
 
@@ -870,6 +876,10 @@ msgstr "Ліве око"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "Вирівняти вхідну гамму для малих значень"
@@ -886,7 +896,7 @@ msgstr "Лог"
 msgid "Log:"
 msgstr "Лог:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "Діапазон гучності %.2f LU"
@@ -945,10 +955,18 @@ msgstr "Перемістити обраний елемент контенту р
 msgid "Move the selected piece of content later in the film."
 msgstr "Перемістити обраний елемент контенту пізніше у проекті."
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "Множинне виділення контенту"
@@ -1051,7 +1069,7 @@ msgstr "Контур"
 msgid "Outline colour"
 msgstr "Колір контуру"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "Окреслити контент"
 
@@ -1067,7 +1085,7 @@ msgstr "Пароль"
 msgid "Pause"
 msgstr "Пазуа"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "Вершина"
 
@@ -1080,7 +1098,7 @@ msgstr "Пікова гучність %.2fдБ"
 msgid "Peak: unknown"
 msgstr "Пікова гучність: невідома"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "Відтворення"
 
@@ -1124,7 +1142,7 @@ msgstr "Протокол"
 msgid "RGB to XYZ conversion"
 msgstr "Перетворення RGB в XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "Rated Maximum Sinusoidal"
 
@@ -1240,7 +1258,7 @@ msgstr "Зправа"
 msgid "Right click to change gain."
 msgstr "Правий клік для змінення посилення"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
 msgstr "Праве око"
 
@@ -1260,13 +1278,13 @@ msgstr "SCP (для AAM и Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "Пікова гучність %.2fдБ на %s"
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1290,7 +1308,7 @@ msgstr "Оберіть XML-файл CPL"
 msgid "Select Certificate File"
 msgstr "Оберіть Файл Сертификату"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "Оберіть KDM"
 
@@ -1326,7 +1344,7 @@ msgstr "Сервер"
 msgid "Servers"
 msgstr "Сервери"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "Назначити"
 
@@ -1362,7 +1380,7 @@ msgstr "Підпис DCP та KDM:"
 msgid "Single reel"
 msgstr "Одна бобіна"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "Зглажування"
 
@@ -1390,7 +1408,7 @@ msgstr "Початок"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "Потік"
 
@@ -1455,7 +1473,7 @@ msgstr "Тестування"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "Час \"до\" має бути після часу \"від\"."
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1468,7 +1486,7 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Немає підказок: схоже, що все добре!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "Недостатньо пам'яті, щоб зробити це."
 
@@ -1537,12 +1555,12 @@ msgstr "Обрізати з початку"
 msgid "Trim up to current position"
 msgstr "Обрізати до поточної позиції"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "Пікова гучність %.2fдБ"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "Тип"
@@ -1701,7 +1719,7 @@ msgstr "Графік відео"
 msgid "Video frame rate"
 msgstr "Частота кадрів відео"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "Перегляд..."
 

diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 110c1b75f66d4f9b908bc9c1bac1c7cb1ef0fed1..0f676ffe2df93d8160790e1d62ddc0afb289304b 100644 (file)
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-O-MATIC_CN\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"
@@ -27,6 +27,7 @@ msgstr ""
 #
 #: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
 #: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
+#: src/wx/subtitle_panel.cc:113
 msgid "%"
 msgstr "%"
 
@@ -220,7 +221,7 @@ msgstr "允许任何DCP帧速率"
 msgid "Alpha   0"
 msgstr "透明度 0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
 msgstr "显示"
 
@@ -344,7 +345,7 @@ msgstr "启动时检查更新 "
 msgid "Check for updates on startup"
 msgstr "启动时检查更新"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:251
 msgid "Choose a file"
 msgstr "选择一个文件"
 
@@ -352,7 +353,7 @@ msgstr "选择一个文件"
 msgid "Choose a file or files"
 msgstr "选择一个或多个文件"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "选择一个文件夹"
 
@@ -428,16 +429,16 @@ msgstr "对比"
 msgid "Copy as name"
 msgstr "复制名称"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:234
 msgid "Could not analyse audio."
 msgstr "无法分析音频。"
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "无法获取视频 (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:327
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "无法加载 KDM (%s)"
@@ -479,7 +480,7 @@ msgstr "DCP目录"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:139
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic音频"
 
@@ -669,7 +670,7 @@ msgstr "寻找丢失..."
 msgid "Fonts"
 msgstr "字体..."
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "字体..."
 
@@ -728,6 +729,11 @@ msgstr "普通"
 msgid "Get from file..."
 msgstr "外置字体 "
 
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:28
+msgid "Go to"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:126
 msgid "Green chromaticity"
 msgstr "绿色色度"
@@ -776,7 +782,7 @@ msgstr "伽玛校正"
 msgid "Input power"
 msgstr "功率"
 
-#: src/wx/audio_dialog.cc:335
+#: src/wx/audio_dialog.cc:339
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "平均响度 %.2f LUFS"
@@ -838,7 +844,7 @@ msgstr "键值"
 msgid "Keys"
 msgstr "键值"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "语言"
 
@@ -858,7 +864,7 @@ msgstr "私钥"
 msgid "Left"
 msgstr "左边"
 
-#: src/wx/film_viewer.cc:68
+#: src/wx/film_viewer.cc:70
 #, fuzzy
 msgid "Left eye"
 msgstr "左边"
@@ -867,6 +873,10 @@ msgstr "左边"
 msgid "Length"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:51
 msgid "Linearise input gamma curve for small values"
 msgstr "对齐低位的伽马值"
@@ -883,7 +893,7 @@ msgstr "日志"
 msgid "Log:"
 msgstr "日志:"
 
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:348
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "响度范围 %.2f LU"
@@ -942,10 +952,18 @@ msgstr "移动选择部分之前内容"
 msgid "Move the selected piece of content later in the film."
 msgstr "移动选择部分之后内容"
 
+#: src/wx/playhead_to_frame_dialog.cc:25
+msgid "Move to frame"
+msgstr ""
+
 #: src/wx/timing_panel.cc:92
 msgid "Move to start of reel"
 msgstr ""
 
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Move to timecode"
+msgstr ""
+
 #: src/wx/video_panel.cc:374
 msgid "Multiple content selected"
 msgstr "选择多个文件"
@@ -1048,7 +1066,7 @@ msgstr "缩略视图"
 msgid "Outline colour"
 msgstr "缩略视图轮廓颜色"
 
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "缩略视图内容"
 
@@ -1064,7 +1082,7 @@ msgstr "密码"
 msgid "Pause"
 msgstr "暂停"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:103
 msgid "Peak"
 msgstr "最佳"
 
@@ -1077,7 +1095,7 @@ msgstr "最佳值 %.2fdB"
 msgid "Peak: unknown"
 msgstr "最佳值: 未知"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "播放"
 
@@ -1119,7 +1137,7 @@ msgstr "协议"
 msgid "RGB to XYZ conversion"
 msgstr "RGB 转换到 XYZ"
 
-#: src/wx/audio_dialog.cc:100
+#: src/wx/audio_dialog.cc:104
 msgid "RMS"
 msgstr "RMS"
 
@@ -1236,7 +1254,7 @@ msgstr "右边"
 msgid "Right click to change gain."
 msgstr "右键单击要更改增益。"
 
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:71
 #, fuzzy
 msgid "Right eye"
 msgstr "右边"
@@ -1257,13 +1275,13 @@ msgstr "SCP (AAM-Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:309
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "最佳值 %.2fdB 到 %s "
 
 #: src/wx/self_dkdm_dialog.cc:70
-msgid "Save to KDM creator tool's list"
+msgid "Save to KDM Creator tool's list"
 msgstr ""
 
 #: src/wx/video_panel.cc:164
@@ -1287,7 +1305,7 @@ msgstr "选择CPL文件"
 msgid "Select Certificate File"
 msgstr "选择证书文件"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/content_menu.cc:321
 msgid "Select KDM"
 msgstr "选择KDM"
 
@@ -1323,7 +1341,7 @@ msgstr "服务器"
 msgid "Servers"
 msgstr "服务器"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:119
 msgid "Set"
 msgstr "设置"
 
@@ -1359,7 +1377,7 @@ msgstr "签名DCP和KDM"
 msgid "Single reel"
 msgstr "签名卷"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:114
 msgid "Smoothing"
 msgstr "平滑"
 
@@ -1387,7 +1405,7 @@ msgstr "开始"
 msgid "Start of reel"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "流"
 
@@ -1452,7 +1470,7 @@ msgstr "测试"
 msgid "The 'until' time must be after the 'from' time."
 msgstr ""
 
-#: src/wx/content_menu.cc:309
+#: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -1463,7 +1481,7 @@ msgstr "文件不匹配，请删除或添加正确的文件"
 msgid "There are no hints: everything looks good!"
 msgstr "正常!"
 
-#: src/wx/film_viewer.cc:159
+#: src/wx/film_viewer.cc:163
 msgid "There is not enough free memory to do that."
 msgstr "内存不够！"
 
@@ -1530,12 +1548,12 @@ msgstr "开始裁剪"
 msgid "Trim up to current position"
 msgstr "裁剪至当前位置"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:325
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:690
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "类型"
@@ -1706,7 +1724,7 @@ msgstr "视频波形"
 msgid "Video frame rate"
 msgstr "视频帧率"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "视图窗口"