pot/merge.

1 files changed, 77 insertions, 57 deletions

diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 37e4db273..92c0f8db1 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
 "PO-Revision-Date: 2016-03-10 11:05+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -26,15 +26,15 @@ msgstr "%1 [Atmos]"
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
 #, fuzzy
 msgid "%1 [video]"
 msgstr "%1 [film]"
@@ -91,48 +91,48 @@ msgstr "L'Audio sarà ricampionato a %1kHz"
 msgid "Audio will not be resampled"
 msgstr "L'audio non sarà ricampionato"
 
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
 msgid "BT1361 extended colour gamut"
 msgstr "BT1361 gamma colori estesa"
 
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
 msgid "BT2020 constant luminance"
 msgstr "BT2020 luminanza costante"
 
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 per sistema 10-bit"
 
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
 msgid "BT2020 for a 12-bit system"
 msgstr "BT2020 per sistema 12-bit"
 
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 luminanza non costante"
 
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
 msgid "BT709"
 msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
 msgid "Bits per pixel"
 msgstr "Bit per pixel"
 
@@ -168,7 +168,7 @@ msgstr "Canali audio"
 msgid "Checking existing image data"
 msgstr "Controllo dati immagine esistenti in corso"
 
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
 msgid "Colour primaries"
 msgstr "Colori primari"
 
@@ -182,17 +182,17 @@ msgstr "Colori primari"
 #. / file is limited, so that not all possible values are valid.
 #. / TRANSLATORS: this means that the range of pixel values used in this
 #. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
 msgid "Colour range"
 msgstr "Range dei colori"
 
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
 msgid "Colour transfer characteristic"
 msgstr "Caratteristica di trasferimento del colore"
 
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
 msgid "Colourspace"
 msgstr "Spazio colore"
 
@@ -221,13 +221,28 @@ msgstr "Frame rate audio sorgente"
 msgid "Content frame rate"
 msgstr "Frame rate sorgente"
 
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Il contenuto da unire deve avere lo stesso guadagno audio."
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Il contenuto da unire deve avere le stesse dissolvenze."
+
+#: src/lib/subtitle_content.cc:156
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr ""
 "Il contenuto da unire deve avere la stessa impostazione di 'masterizza "
 "sottotitoli'."
 
-#: src/lib/subtitle_content.cc:149
+#: src/lib/subtitle_content.cc:152
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr ""
 "Il contenuto da unire deve avere la stessa impostazione di 'usa sottotitoli'."
@@ -260,24 +275,29 @@ msgstr "Il contenuto da unire deve avere la stessa dimensione dell'immagine."
 msgid "Content to be joined must have the same scale setting."
 msgstr "Il contenuto da unire deve avere la stessa scala."
 
-#: src/lib/subtitle_content.cc:157
+#: src/lib/subtitle_content.cc:160
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:165
+#: src/lib/subtitle_content.cc:168
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:161
+#: src/lib/subtitle_content.cc:164
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:169
+#: src/lib/subtitle_content.cc:172
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Il contenuto da unire deve avere la stessa scala Y dei sottotitoli."
 
+#: src/lib/subtitle_content.cc:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
+
 #: src/lib/content.cc:122 src/lib/content.cc:126
 #, fuzzy
 msgid "Content to be joined must have the same video frame rate"
@@ -287,11 +307,11 @@ msgstr "Il contenuto da unire deve avere lo stesso frame rate."
 msgid "Content to be joined must have the same video frame type."
 msgstr "Il contenuto da unire deve avere lo stesso tipo di frame rate video."
 
-#: src/lib/subtitle_content.cc:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
 msgid "Content to be joined must use the same fonts."
 msgstr "Il contenuto da unire deve usare gli stessi font."
 
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Il contenuto da unire deve usare lo stesso flusso di sottotitoli."
 
@@ -492,7 +512,7 @@ msgstr "Errore: %1"
 msgid "Examine content"
 msgstr "Esamino il contenuto"
 
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
 msgid "FCC"
 msgstr "FCC"
 
@@ -513,7 +533,7 @@ msgstr "Film"
 msgid "Filename"
 msgstr "nome"
 
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
 msgid "Film"
 msgstr "Film"
 
@@ -537,11 +557,11 @@ msgstr "Flat"
 msgid "Frame rate"
 msgstr "Frame rate"
 
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
 msgid "Full"
 msgstr "Full"
 
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
 msgid "Full (0-%1)"
 msgstr "Full (0-%1)"
 
@@ -567,11 +587,11 @@ msgstr "Lunghezza completa nei frame video alla velocità DCP"
 msgid "Full length in video frames at content rate"
 msgstr "Lunghezza completa nei frame video alla velocità sorgente"
 
-#: src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:533
 msgid "Gamma 22 (BT470M)"
 msgstr "Gamma 22 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
 msgid "Gamma 28 (BT470BG)"
 msgstr "Gamma 28 (BT470BG)"
 
@@ -595,11 +615,11 @@ msgstr "Riduttore di rumore 3D di alta qualità"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB o sYCC)"
 
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
@@ -651,23 +671,23 @@ msgstr "Lfe"
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
 msgid "Limited"
 msgstr "Limitato"
 
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
 msgid "Limited (%1-%2)"
 msgstr "Limitato (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
 msgid "Linear"
 msgstr "Lineare"
 
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
 msgid "Logarithmic (100:1 range)"
 msgstr "Logaritmico (range 100:1)"
 
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
 msgid "Logarithmic (316:1 range)"
 msgstr "Logaritmico (range 316:1)"
 
@@ -771,7 +791,7 @@ msgstr "Annuncio di pubblico servizio"
 msgid "R"
 msgstr "R"
 
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr "RGB / sRGB (IEC61966-2-1)"
 
@@ -830,28 +850,28 @@ msgstr "Surround destro"
 msgid "Rs"
 msgstr "Rs"
 
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
 msgid "SMPTE 170M (BT601)"
 msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:546
 msgid "SMPTE ST 428-1"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr ""
 
@@ -1013,11 +1033,11 @@ msgstr "Formato di campionamento audio non riconosciuto (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Maschera di contrasto e sfocatura Gaussiana"
 
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
 msgid "Unspecified"
 msgstr "Non specificato"
 
@@ -1049,7 +1069,7 @@ msgstr "Ipovedente"
 msgid "Waiting"
 msgstr "Attendere"
 
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
 msgid "YCOCG"
 msgstr "YCOCG"