pot/merge.

1 files changed, 93 insertions, 76 deletions

diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index f39c6cfab..8f9c4435e 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -3,12 +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
+#: src/lib/util.cc:536 src/lib/util.cc:537
 msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-27 20:36+0100\n"
+"POT-Creation-Date: 2016-10-03 00:58+0100\n"
 "PO-Revision-Date: 2016-03-10 11:05+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%1 [Atmos]"
 msgstr "%1 [Atmos]"
 
-#: src/lib/dcp_content.cc:184
+#: src/lib/dcp_content.cc:190
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
@@ -119,7 +119,13 @@ msgstr "Riduttore di rumore 3D"
 msgid "4:3"
 msgstr "4:3"
 
-#: src/lib/hints.cc:101
+#. / TRANSLATORS: fps here is an abbreviation for frames per second
+#: src/lib/transcode_job.cc:125
+#, c-format
+msgid "; %.1f fps"
+msgstr ""
+
+#: src/lib/hints.cc:107
 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 "
@@ -138,7 +144,7 @@ msgstr "Academy (Oscar)"
 msgid "Advertisement"
 msgstr "Pubblicità"
 
-#: src/lib/hints.cc:93
+#: src/lib/hints.cc:95
 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) "
@@ -146,7 +152,7 @@ msgid ""
 "\"DCP\" tab."
 msgstr ""
 
-#: src/lib/hints.cc:89
+#: src/lib/hints.cc:91
 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.  "
@@ -154,11 +160,11 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/lib/job.cc:99
+#: src/lib/job.cc:101
 msgid "An error occurred whilst handling the file %1."
 msgstr "Errore durante l'elaborazione del file %1."
 
-#: src/lib/analyse_audio_job.cc:84
+#: src/lib/analyse_audio_job.cc:89
 msgid "Analyse audio"
 msgstr "Analizzare audio"
 
@@ -219,19 +225,19 @@ msgstr "BT709"
 msgid "Bits per pixel"
 msgstr "Bit per pixel"
 
-#: src/lib/util.cc:530
+#: src/lib/util.cc:532
 msgid "BsL"
 msgstr "BsL"
 
-#: src/lib/util.cc:531
+#: src/lib/util.cc:533
 msgid "BsR"
 msgstr "BsR"
 
-#: src/lib/util.cc:522
+#: src/lib/util.cc:524
 msgid "C"
 msgstr "C"
 
-#: src/lib/job.cc:401
+#: src/lib/job.cc:423
 msgid "Cancelled"
 msgstr "Cancellato"
 
@@ -239,7 +245,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:492
+#: src/lib/util.cc:493
 msgid "Centre"
 msgstr "Centro"
 
@@ -437,7 +443,7 @@ msgstr ""
 "Non posso mettermi in ascolto di server remoti di encoding. Forse un'altra "
 "istanza di DCP-o-matic è in esecuzione."
 
-#: src/lib/job.cc:118 src/lib/job.cc:132
+#: src/lib/job.cc:120 src/lib/job.cc:134
 msgid "Could not open %1"
 msgstr "Non riesco ad aprire %1"
 
@@ -466,21 +472,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:502
+#: src/lib/util.cc:503
 msgid "D-BOX primary"
 msgstr "D-BOX principale"
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:504
 msgid "D-BOX secondary"
 msgstr "D-BOX secondario"
 
-#: src/lib/util.cc:532
+#: src/lib/util.cc:534
 msgid "DBP"
 msgstr "DBP"
 
-#: src/lib/util.cc:533
-msgid "DBPS"
-msgstr ""
+#: src/lib/util.cc:535
+msgid "DBS"
+msgstr "DBS"
 
 #: src/lib/dcp_subtitle_content.cc:100
 msgid "DCP XML subtitles"
@@ -499,7 +505,7 @@ msgstr "Il DCP andrà al %1%% della velocità originale.\n"
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Il DCP utilizzerà ogni altro frame del sorgente.\n"
 
-#: src/lib/job.cc:120 src/lib/job.cc:134
+#: src/lib/job.cc:122 src/lib/job.cc:136
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -582,7 +588,7 @@ msgstr ""
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr "Errore nel file dei sottotitoli: letto %1 ma era atteso %2"
 
-#: src/lib/job.cc:399
+#: src/lib/job.cc:421
 msgid "Error: %1"
 msgstr "Errore: %1"
 
@@ -598,7 +604,7 @@ msgstr "FCC"
 msgid "Failed to authenticate with server (%1)"
 msgstr "Autenticazione col server fallita (%1) "
 
-#: src/lib/emailer.cc:217
+#: src/lib/emailer.cc:222
 msgid "Failed to send email (%1)"
 msgstr "Invio email fallito (%1)"
 
@@ -677,11 +683,11 @@ msgstr "Gamma 28 (BT470BG)"
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/util.cc:526
+#: src/lib/util.cc:528
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:496
+#: src/lib/util.cc:497
 msgid "Hearing impaired"
 msgstr ""
 
@@ -701,7 +707,7 @@ msgstr "IEC61966-2-1 (sRGB o sYCC)"
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
-#: src/lib/job.cc:141 src/lib/job.cc:162 src/lib/job.cc:172
+#: src/lib/job.cc:143 src/lib/job.cc:175 src/lib/job.cc:185
 msgid "It is not known what caused this error."
 msgstr "Non è chiaro cosa ha causato l'errore."
 
@@ -713,27 +719,27 @@ msgstr "Consegna KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Deinterlacciatore Kernel"
 
-#: src/lib/util.cc:520
+#: src/lib/util.cc:522
 msgid "L"
 msgstr "L"
 
-#: src/lib/util.cc:528
+#: src/lib/util.cc:530
 msgid "Lc"
 msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:490
+#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:491
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:499
 msgid "Left centre"
 msgstr "Sinistro centro"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:501
 msgid "Left rear surround"
 msgstr "Surround posteriore sinistro"
 
-#: src/lib/util.cc:494
+#: src/lib/util.cc:495
 msgid "Left surround"
 msgstr "Surround sinistro"
 
@@ -741,11 +747,11 @@ msgstr "Surround sinistro"
 msgid "Length"
 msgstr "Durata"
 
-#: src/lib/util.cc:523
+#: src/lib/util.cc:525
 msgid "Lfe"
 msgstr "Lfe"
 
-#: src/lib/util.cc:493
+#: src/lib/util.cc:494
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -769,7 +775,7 @@ msgstr "Logaritmico (range 100:1)"
 msgid "Logarithmic (316:1 range)"
 msgstr "Logaritmico (range 316:1)"
 
-#: src/lib/util.cc:524
+#: src/lib/util.cc:526
 msgid "Ls"
 msgstr "Ls"
 
@@ -781,19 +787,19 @@ msgstr "Decodificatore in mezzo"
 msgid "Misc"
 msgstr "Varie"
 
-#: src/lib/dcp_examiner.cc:142
+#: src/lib/dcp_examiner.cc:145
 msgid "Mismatched audio channel counts in DCP"
 msgstr "Il numero di canali audio nel DCP non corrisponde"
 
-#: src/lib/dcp_examiner.cc:148
+#: src/lib/dcp_examiner.cc:151
 msgid "Mismatched audio sample rates in DCP"
 msgstr "La frequenza di campionamento audio nel DCP non corrisponde"
 
-#: src/lib/dcp_examiner.cc:117
+#: src/lib/dcp_examiner.cc:120
 msgid "Mismatched frame rates in DCP"
 msgstr "Il frame rate nel DCP non corrisponde"
 
-#: src/lib/dcp_examiner.cc:124
+#: src/lib/dcp_examiner.cc:127
 msgid "Mismatched video sizes in DCP"
 msgstr "La dimensione video nel DCP non corrisponde"
 
@@ -821,7 +827,7 @@ msgstr "Nessun file immagine trovato nella cartella."
 msgid "Noise reduction"
 msgstr "Riduzione del rumore"
 
-#: src/lib/job.cc:397
+#: src/lib/job.cc:419
 msgid "OK (ran for %1)"
 msgstr "OK (eseguito al %1)"
 
@@ -833,7 +839,7 @@ msgstr "Soltanto il primo spezzone da unire può avere un trim iniziale."
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Soltanto l'ultimo spezzone da unire può avere un trim finale"
 
-#: src/lib/job.cc:154
+#: src/lib/job.cc:167
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
@@ -861,7 +867,7 @@ msgstr "Errore di programmazione a %1:%2"
 msgid "Public Service Announcement"
 msgstr "Annuncio di pubblico servizio"
 
-#: src/lib/util.cc:521
+#: src/lib/util.cc:523
 msgid "R"
 msgstr "R"
 
@@ -873,7 +879,7 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/util.cc:529
+#: src/lib/util.cc:531
 msgid "Rc"
 msgstr "Rc"
 
@@ -895,23 +901,23 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:491
+#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:492
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:500
 msgid "Right centre"
 msgstr "Destro centro"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:502
 msgid "Right rear surround"
 msgstr "Surround posteriore destro"
 
-#: src/lib/util.cc:495
+#: src/lib/util.cc:496
 msgid "Right surround"
 msgstr "Surround destro"
 
-#: src/lib/util.cc:525
+#: src/lib/util.cc:527
 msgid "Rs"
 msgstr "Rs"
 
@@ -1000,15 +1006,15 @@ msgid ""
 "existing DCP' checkboxes."
 msgstr ""
 
-#: src/lib/dcp_content.cc:431
+#: src/lib/dcp_content.cc:461
 msgid "The DCP does not have sound in all reels."
 msgstr "Il DCP non ha sonoro in nessuna delle parti."
 
-#: src/lib/dcp_content.cc:445
+#: src/lib/dcp_content.cc:475
 msgid "The DCP does not have subtitles in all reels."
 msgstr "Il DCP non ha sottotitoli in nessuna delle parti."
 
-#: src/lib/dcp_examiner.cc:186
+#: src/lib/dcp_examiner.cc:197
 msgid ""
 "The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr "La KDM non decripta il DCP. Forse si riferisce alla CPL sbagliata."
@@ -1017,7 +1023,7 @@ msgstr "La KDM non decripta il DCP. Forse si riferisce alla CPL sbagliata."
 msgid "The certificate chain for signing is invalid"
 msgstr "La catena del certificato per la firma non è valita"
 
-#: src/lib/job.cc:105
+#: src/lib/job.cc:107
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -1025,15 +1031,19 @@ msgstr ""
 "Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
 "altro spazio e riprovare."
 
-#: src/lib/dcp_content.cc:394
+#: src/lib/dcp_content.cc:419
+msgid "The film has a different frame rate to this DCP."
+msgstr ""
+
+#: src/lib/dcp_content.cc:412
 msgid "The film is set to Interop and this DCP is SMPTE."
 msgstr ""
 
-#: src/lib/dcp_content.cc:391
+#: src/lib/dcp_content.cc:409
 msgid "The film is set to SMPTE and this DCP is Interop."
 msgstr ""
 
-#: src/lib/dcp_content.cc:405
+#: src/lib/dcp_content.cc:430
 #, fuzzy
 msgid ""
 "The reel lengths in the film differ from those in the DCP; set the reel mode "
@@ -1042,20 +1052,24 @@ msgstr ""
 "La lunghezza della bobina nel progetto è diversa da quella nel DCP; imposta "
 "la modalità della bobina su 'suddividi per contenuto video'."
 
-#: src/lib/dcp_content.cc:436
+#: src/lib/dcp_content.cc:448
+msgid "The video frame size in the film differs from that in the DCP."
+msgstr ""
+
+#: src/lib/dcp_content.cc:466
 msgid "There is other audio content overlapping this DCP; remove it."
 msgstr "C'è un altro flusso audio che si sovrappone a questo DCP; rimuoverlo."
 
-#: src/lib/dcp_content.cc:450
+#: src/lib/dcp_content.cc:480
 msgid "There is other subtitle content overlapping this DCP; remove it."
 msgstr ""
 "C'è un altro file di sottotitoli che si sovrappone a questo DCP; rimuoverlo."
 
-#: src/lib/dcp_content.cc:422
+#: src/lib/dcp_content.cc:452
 msgid "There is other video content overlapping this DCP; remove it."
 msgstr "C'è un altro flusso video che si sovrappone a questo DCP; rimuoverlo."
 
-#: src/lib/job.cc:154
+#: src/lib/job.cc:167
 msgid ""
 "There was not enough memory to do this.  If you are running a 32-bit "
 "operating system try reducing the number of encoding threads in the General "
@@ -1103,7 +1117,7 @@ msgstr "Contenuto file ZIP inatteso"
 msgid "Unexpected image type received by server"
 msgstr "Immagine ricevuta dal server inattesa"
 
-#: src/lib/job.cc:171
+#: src/lib/job.cc:184
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -1127,7 +1141,7 @@ msgstr "Non specificato"
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/util.cc:504 src/lib/util.cc:505
+#: src/lib/util.cc:505 src/lib/util.cc:506
 msgid "Unused"
 msgstr "Non utilizzato"
 
@@ -1139,11 +1153,11 @@ msgstr "Upmix L"
 msgid "Upmix R"
 msgstr "Upmix R"
 
-#: src/lib/util.cc:527
+#: src/lib/util.cc:529
 msgid "VI"
 msgstr "VI"
 
-#: src/lib/util.cc:497
+#: src/lib/util.cc:498
 msgid "Visually impaired"
 msgstr "Ipovedente"
 
@@ -1159,19 +1173,19 @@ msgstr "YCOCG"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/hints.cc:105
+#: src/lib/hints.cc:111
 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:127
+#: src/lib/hints.cc:133
 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:116
+#: src/lib/hints.cc:122
 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."
@@ -1187,7 +1201,7 @@ 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:97
+#: src/lib/hints.cc:103
 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."
@@ -1199,7 +1213,13 @@ msgid ""
 "projectors."
 msgstr ""
 
-#: src/lib/hints.cc:152
+#: src/lib/hints.cc:99
+msgid ""
+"Your DCP uses an unusual container ratio.  This may cause problems on some "
+"projectors.  If possible, use Flat or Scope for the DCP container ratio"
+msgstr ""
+
+#: src/lib/hints.cc:158
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
@@ -1245,7 +1265,7 @@ msgstr "copia %1"
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sul flusso"
 
-#: src/lib/reel_writer.cc:306
+#: src/lib/reel_writer.cc:320
 msgid "could not move audio asset into the DCP (%1)"
 msgstr "non posso spostare l'asset audio nel DCP (%1)"
 
@@ -1292,12 +1312,12 @@ msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:146 src/lib/util.cc:149
+#: src/lib/util.cc:147 src/lib/util.cc:150
 msgid "h"
 msgstr "h"
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:161 src/lib/util.cc:164
+#: src/lib/util.cc:162 src/lib/util.cc:165
 msgid "m"
 msgstr "m"
 
@@ -1315,12 +1335,12 @@ msgstr "nome"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:394
+#: src/lib/job.cc:416
 msgid "remaining"
 msgstr "rimanenti"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:175
+#: src/lib/util.cc:176
 msgid "s"
 msgstr "s"
 
@@ -1340,9 +1360,6 @@ 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)"