pot/merge.

1 files changed, 66 insertions, 63 deletions

diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 3ad3d4b3a..f39c6cfab 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/lib/util.cc:534 src/lib/util.cc:535
 msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-24 16:46+0100\n"
+"POT-Creation-Date: 2016-08-27 20:36+0100\n"
 "PO-Revision-Date: 2016-03-10 11:05+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -118,7 +119,7 @@ msgstr "Riduttore di rumore 3D"
 msgid "4:3"
 msgstr "4:3"
 
-#: src/lib/hints.cc:99
+#: src/lib/hints.cc:101
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
@@ -137,7 +138,7 @@ msgstr "Academy (Oscar)"
 msgid "Advertisement"
 msgstr "Pubblicità"
 
-#: src/lib/hints.cc:91
+#: src/lib/hints.cc:93
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -145,7 +146,7 @@ msgid ""
 "\"DCP\" tab."
 msgstr ""
 
-#: src/lib/hints.cc:87
+#: src/lib/hints.cc:89
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -157,7 +158,7 @@ msgstr ""
 msgid "An error occurred whilst handling the file %1."
 msgstr "Errore durante l'elaborazione del file %1."
 
-#: src/lib/analyse_audio_job.cc:81
+#: src/lib/analyse_audio_job.cc:84
 msgid "Analyse audio"
 msgstr "Analizzare audio"
 
@@ -218,15 +219,15 @@ msgstr "BT709"
 msgid "Bits per pixel"
 msgstr "Bit per pixel"
 
-#: src/lib/film.cc:1403
+#: src/lib/util.cc:530
 msgid "BsL"
 msgstr "BsL"
 
-#: src/lib/film.cc:1404
+#: src/lib/util.cc:531
 msgid "BsR"
 msgstr "BsR"
 
-#: src/lib/film.cc:1395
+#: src/lib/util.cc:522
 msgid "C"
 msgstr "C"
 
@@ -238,7 +239,7 @@ msgstr "Cancellato"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
-#: src/lib/util.cc:493
+#: src/lib/util.cc:492
 msgid "Centre"
 msgstr "Centro"
 
@@ -311,13 +312,13 @@ msgstr "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
 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:172
+#: src/lib/subtitle_content.cc:175
 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:168
+#: src/lib/subtitle_content.cc:171
 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'."
@@ -342,6 +343,11 @@ msgstr "Il contenuto da unire deve avere lo stesso crop."
 msgid "Content to be joined must have the same fades."
 msgstr "Il contenuto da unire deve avere le stesse dissolvenze."
 
+#: src/lib/subtitle_content.cc:203
+#, fuzzy
+msgid "Content to be joined must have the same outline width."
+msgstr "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
+
 #: src/lib/video_content.cc:170
 msgid "Content to be joined must have the same picture size."
 msgstr "Il contenuto da unire deve avere la stessa dimensione dell'immagine."
@@ -350,30 +356,30 @@ 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:176
+#: src/lib/subtitle_content.cc:179
 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:184
+#: src/lib/subtitle_content.cc:187
 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:180
+#: src/lib/subtitle_content.cc:183
 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:188
+#: src/lib/subtitle_content.cc:191
 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:196
+#: src/lib/subtitle_content.cc:199
 #, fuzzy
 msgid "Content to be joined must have the same subtitle fades."
 msgstr "Il contenuto da unire deve avere la stessa scala X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:192
+#: src/lib/subtitle_content.cc:195
 #, 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."
@@ -387,7 +393,7 @@ 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:201 src/lib/subtitle_content.cc:209
+#: src/lib/subtitle_content.cc:208 src/lib/subtitle_content.cc:216
 msgid "Content to be joined must use the same fonts."
 msgstr "Il contenuto da unire deve usare gli stessi font."
 
@@ -460,21 +466,21 @@ msgstr "Non posso avviare il trasferimento"
 msgid "Could not write to remote file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:502
 msgid "D-BOX primary"
 msgstr "D-BOX principale"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:503
 msgid "D-BOX secondary"
 msgstr "D-BOX secondario"
 
-#: src/lib/film.cc:1405
+#: src/lib/util.cc:532
 msgid "DBP"
 msgstr "DBP"
 
-#: src/lib/film.cc:1406
-msgid "DBS"
-msgstr "DBS"
+#: src/lib/util.cc:533
+msgid "DBPS"
+msgstr ""
 
 #: src/lib/dcp_subtitle_content.cc:100
 msgid "DCP XML subtitles"
@@ -510,7 +516,7 @@ msgstr "DCP-o-matic non supporta più il filtro '%1', ed è stato disattivato."
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
-#: src/lib/config.cc:527
+#: src/lib/config.cc:530
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -671,11 +677,11 @@ msgstr "Gamma 28 (BT470BG)"
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/film.cc:1399
+#: src/lib/util.cc:526
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:497
+#: src/lib/util.cc:496
 msgid "Hearing impaired"
 msgstr ""
 
@@ -699,7 +705,7 @@ msgstr "IEC61966-2-4"
 msgid "It is not known what caused this error."
 msgstr "Non è chiaro cosa ha causato l'errore."
 
-#: src/lib/config.cc:238 src/lib/config.cc:524
+#: src/lib/config.cc:239 src/lib/config.cc:527
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Consegna KDM: $CPL_NAME"
 
@@ -707,27 +713,27 @@ msgstr "Consegna KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Deinterlacciatore Kernel"
 
-#: src/lib/film.cc:1393
+#: src/lib/util.cc:520
 msgid "L"
 msgstr "L"
 
-#: src/lib/film.cc:1401
+#: src/lib/util.cc:528
 msgid "Lc"
 msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:491
+#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:490
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:498
 msgid "Left centre"
 msgstr "Sinistro centro"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:500
 msgid "Left rear surround"
 msgstr "Surround posteriore sinistro"
 
-#: src/lib/util.cc:495
+#: src/lib/util.cc:494
 msgid "Left surround"
 msgstr "Surround sinistro"
 
@@ -735,11 +741,11 @@ msgstr "Surround sinistro"
 msgid "Length"
 msgstr "Durata"
 
-#: src/lib/film.cc:1396
+#: src/lib/util.cc:523
 msgid "Lfe"
 msgstr "Lfe"
 
-#: src/lib/util.cc:494
+#: src/lib/util.cc:493
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -763,7 +769,7 @@ msgstr "Logaritmico (range 100:1)"
 msgid "Logarithmic (316:1 range)"
 msgstr "Logaritmico (range 316:1)"
 
-#: src/lib/film.cc:1397
+#: src/lib/util.cc:524
 msgid "Ls"
 msgstr "Ls"
 
@@ -855,7 +861,7 @@ msgstr "Errore di programmazione a %1:%2"
 msgid "Public Service Announcement"
 msgstr "Annuncio di pubblico servizio"
 
-#: src/lib/film.cc:1394
+#: src/lib/util.cc:521
 msgid "R"
 msgstr "R"
 
@@ -867,7 +873,7 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/film.cc:1402
+#: src/lib/util.cc:529
 msgid "Rc"
 msgstr "Rc"
 
@@ -889,23 +895,23 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:492
+#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:491
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:499
 msgid "Right centre"
 msgstr "Destro centro"
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:501
 msgid "Right rear surround"
 msgstr "Surround posteriore destro"
 
-#: src/lib/util.cc:496
+#: src/lib/util.cc:495
 msgid "Right surround"
 msgstr "Surround destro"
 
-#: src/lib/film.cc:1398
+#: src/lib/util.cc:525
 msgid "Rs"
 msgstr "Rs"
 
@@ -982,7 +988,7 @@ msgstr "Prova"
 msgid "Text subtitles"
 msgstr "sottotitoli"
 
-#: src/lib/film.cc:1522
+#: src/lib/film.cc:1510
 msgid ""
 "The DCP %1 was being referred to by this film.  This not now possible "
 "because the reel sizes in the film no longer agree with those in the "
@@ -1121,7 +1127,7 @@ msgstr "Non specificato"
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/util.cc:505 src/lib/util.cc:506
+#: src/lib/util.cc:504 src/lib/util.cc:505
 msgid "Unused"
 msgstr "Non utilizzato"
 
@@ -1133,11 +1139,11 @@ msgstr "Upmix L"
 msgid "Upmix R"
 msgstr "Upmix R"
 
-#: src/lib/film.cc:1400
+#: src/lib/util.cc:527
 msgid "VI"
 msgstr "VI"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:497
 msgid "Visually impaired"
 msgstr "Ipovedente"
 
@@ -1153,25 +1159,25 @@ msgstr "YCOCG"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/hints.cc:103
+#: src/lib/hints.cc:105
 msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
 "supported.  You are advised to make a SMPTE DCP instead."
 msgstr ""
 
-#: src/lib/hints.cc:125
+#: src/lib/hints.cc:127
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/lib/hints.cc:114
+#: src/lib/hints.cc:116
 msgid ""
 "You have %1 files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."
 msgstr ""
 
-#: src/lib/hints.cc:66
+#: src/lib/hints.cc:68
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
@@ -1181,28 +1187,22 @@ msgstr ""
 msgid "You must add some content to the DCP before creating it"
 msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
 
-#: src/lib/hints.cc:95
+#: src/lib/hints.cc:97
 msgid ""
 "Your DCP frame rate (%1 fps) may cause problems in a few (mostly older) "
 "projectors.  Use 24 or 48 frames per second to be on the safe side."
 msgstr ""
 
-#: src/lib/hints.cc:70
+#: src/lib/hints.cc:72
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
 msgstr ""
 
-#: src/lib/hints.cc:137
+#: src/lib/hints.cc:152
 msgid ""
-"Your audio level is very close to clipping.  You should reduce the gain of "
-"your audio content."
-msgstr ""
-
-#: src/lib/hints.cc:135
-msgid ""
-"Your audio level is very high.  You should reduce the gain of your audio "
-"content."
+"Your audio level is very high (on %1).  You should reduce the gain of your "
+"audio content."
 msgstr ""
 
 #: src/lib/image_content.cc:81
@@ -1340,6 +1340,9 @@ msgstr "sconosciuto"
 msgid "video frames"
 msgstr "fotogrammi video"
 
+#~ msgid "DBS"
+#~ msgstr "DBS"
+
 #~ msgid "could not create file %1"
 #~ msgstr "Non posso creare il file (%1)"