pot/merge.

1 files changed, 57 insertions, 49 deletions

diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 56b6f6d85..496b0c2b2 100644
--- 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: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
 "PO-Revision-Date: 2018-09-30 16:31+0200\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -31,11 +31,11 @@ msgstr "%d KDM scritte in %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Aggiungi Film...\tCtrl-A"
 
-#: src/tools/dcpomatic_player.cc:507
+#: src/tools/dcpomatic_player.cc:517
 msgid "&Add OV..."
 msgstr "&Aggiungi OV..."
 
-#: src/tools/dcpomatic_player.cc:513
+#: src/tools/dcpomatic_player.cc:523
 msgid "&Close"
 msgstr "&Chiudi"
 
@@ -45,25 +45,25 @@ msgid "&Close\tCtrl-W"
 msgstr "&Salva\tCtrl-S"
 
 #: src/tools/dcpomatic.cc:1395 src/tools/dcpomatic_batch.cc:93
-#: src/tools/dcpomatic_kdm.cc:266 src/tools/dcpomatic_player.cc:565
+#: src/tools/dcpomatic_kdm.cc:266 src/tools/dcpomatic_player.cc:575
 #: src/tools/dcpomatic_playlist.cc:547
 msgid "&Edit"
 msgstr "&Modifica"
 
 #: src/tools/dcpomatic.cc:1331 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:244 src/tools/dcpomatic_player.cc:517
+#: src/tools/dcpomatic_kdm.cc:244 src/tools/dcpomatic_player.cc:527
 #: src/tools/dcpomatic_playlist.cc:528
 msgid "&Exit"
 msgstr "&Esci"
 
 #: src/tools/dcpomatic.cc:1394 src/tools/dcpomatic_batch.cc:91
-#: src/tools/dcpomatic_kdm.cc:264 src/tools/dcpomatic_player.cc:563
+#: src/tools/dcpomatic_kdm.cc:264 src/tools/dcpomatic_player.cc:573
 #: src/tools/dcpomatic_playlist.cc:545
 msgid "&File"
 msgstr "&File"
 
 #: src/tools/dcpomatic.cc:1399 src/tools/dcpomatic_batch.cc:96
-#: src/tools/dcpomatic_kdm.cc:268 src/tools/dcpomatic_player.cc:569
+#: src/tools/dcpomatic_kdm.cc:268 src/tools/dcpomatic_player.cc:579
 #: src/tools/dcpomatic_playlist.cc:549
 msgid "&Help"
 msgstr "&Aiuto"
@@ -76,20 +76,20 @@ msgstr "&Elaborazioni"
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crea DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_player.cc:506
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_player.cc:516
 msgid "&Open...\tCtrl-O"
 msgstr "&Apri...\tCtrl-O"
 
 #: src/tools/dcpomatic.cc:1343 src/tools/dcpomatic.cc:1346
 #: src/tools/dcpomatic_batch.cc:79 src/tools/dcpomatic_batch.cc:82
 #: src/tools/dcpomatic_kdm.cc:250 src/tools/dcpomatic_kdm.cc:253
-#: src/tools/dcpomatic_player.cc:523 src/tools/dcpomatic_player.cc:526
+#: src/tools/dcpomatic_player.cc:533 src/tools/dcpomatic_player.cc:536
 #: src/tools/dcpomatic_playlist.cc:535
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferenze...\tCtrl-P"
 
 #: src/tools/dcpomatic.cc:1333 src/tools/dcpomatic_batch.cc:75
-#: src/tools/dcpomatic_kdm.cc:246 src/tools/dcpomatic_player.cc:519
+#: src/tools/dcpomatic_kdm.cc:246 src/tools/dcpomatic_player.cc:529
 #: src/tools/dcpomatic_playlist.cc:530
 msgid "&Quit"
 msgstr "&Esci"
@@ -103,11 +103,11 @@ msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
 #: src/tools/dcpomatic.cc:1398 src/tools/dcpomatic_batch.cc:95
-#: src/tools/dcpomatic_player.cc:568
+#: src/tools/dcpomatic_player.cc:578
 msgid "&Tools"
 msgstr "&Strumenti"
 
-#: src/tools/dcpomatic.cc:1397 src/tools/dcpomatic_player.cc:567
+#: src/tools/dcpomatic.cc:1397 src/tools/dcpomatic_player.cc:577
 msgid "&View"
 msgstr "&Visualizza"
 
@@ -120,13 +120,13 @@ msgid "<b>Playlists</b>"
 msgstr ""
 
 #: src/tools/dcpomatic.cc:1390 src/tools/dcpomatic_batch.cc:89
-#: src/tools/dcpomatic_kdm.cc:260 src/tools/dcpomatic_player.cc:559
+#: src/tools/dcpomatic_kdm.cc:260 src/tools/dcpomatic_player.cc:569
 #: src/tools/dcpomatic_playlist.cc:542
 msgid "About"
 msgstr "Informazioni"
 
 #: src/tools/dcpomatic.cc:1388 src/tools/dcpomatic_kdm.cc:258
-#: src/tools/dcpomatic_player.cc:557 src/tools/dcpomatic_playlist.cc:540
+#: src/tools/dcpomatic_player.cc:567 src/tools/dcpomatic_playlist.cc:540
 msgid "About DCP-o-matic"
 msgstr "Info su DVD-o-MATIC"
 
@@ -135,7 +135,7 @@ msgstr "Info su DVD-o-MATIC"
 msgid "Add"
 msgstr "Aggiungi..."
 
-#: src/tools/dcpomatic_player.cc:508
+#: src/tools/dcpomatic_player.cc:518
 #, fuzzy
 msgid "Add &KDM..."
 msgstr "&Aggiungi KDM..."
@@ -158,7 +158,7 @@ msgid "Add..."
 msgstr "Aggiungi..."
 
 #: src/tools/dcpomatic.cc:1731 src/tools/dcpomatic_kdm.cc:704
-#: src/tools/dcpomatic_player.cc:1202 src/tools/dcpomatic_playlist.cc:652
+#: src/tools/dcpomatic_player.cc:1212 src/tools/dcpomatic_playlist.cc:652
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 
 #: src/tools/dcpomatic.cc:1750 src/tools/dcpomatic_kdm.cc:713
-#: src/tools/dcpomatic_player.cc:1211 src/tools/dcpomatic_playlist.cc:661
+#: src/tools/dcpomatic_player.cc:1221 src/tools/dcpomatic_playlist.cc:661
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -192,7 +192,7 @@ msgstr "Errore sconosciuto sul server di DCP-o-MATIC."
 
 #: src/tools/dcpomatic.cc:964 src/tools/dcpomatic.cc:1755
 #: src/tools/dcpomatic_kdm.cc:403 src/tools/dcpomatic_kdm.cc:718
-#: src/tools/dcpomatic_kdm.cc:727 src/tools/dcpomatic_player.cc:1216
+#: src/tools/dcpomatic_kdm.cc:727 src/tools/dcpomatic_player.cc:1226
 #: src/tools/dcpomatic_playlist.cc:666 src/tools/dcpomatic_playlist.cc:675
 msgid "An unknown exception occurred."
 msgstr "Si è verificata un'eccezione sconosciuta."
@@ -210,7 +210,7 @@ msgstr ""
 msgid "Bad setting for %s."
 msgstr "Impostazione errata per %s."
 
-#: src/tools/dcpomatic_player.cc:535 src/tools/dcpomatic_playlist.cc:271
+#: src/tools/dcpomatic_player.cc:545 src/tools/dcpomatic_playlist.cc:271
 msgid "CPL"
 msgstr "CPL"
 
@@ -218,7 +218,7 @@ msgstr "CPL"
 msgid "CPL's content is not encrypted."
 msgstr "Il contenuto CPL non è criptato."
 
-#: src/tools/dcpomatic.cc:1380 src/tools/dcpomatic_player.cc:551
+#: src/tools/dcpomatic.cc:1380 src/tools/dcpomatic_player.cc:561
 msgid "Check for updates"
 msgstr "Controlla aggiornamenti"
 
@@ -231,7 +231,7 @@ msgstr "DCP-o-MATIC"
 msgid "Close without saving film"
 msgstr "Chiudi senza salvare il film"
 
-#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:541
+#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:551
 msgid "Closed captions..."
 msgstr ""
 
@@ -260,11 +260,11 @@ msgstr "Impossibile trovare il convertitore batch."
 msgid "Could not find player."
 msgstr "Impossibile trovare il player."
 
-#: src/tools/dcpomatic_player.cc:678 src/tools/dcpomatic_player.cc:1141
+#: src/tools/dcpomatic_player.cc:688 src/tools/dcpomatic_player.cc:1151
 msgid "Could not load DCP %1."
 msgstr "Impossibile caricare DCP %1."
 
-#: src/tools/dcpomatic_player.cc:496
+#: src/tools/dcpomatic_player.cc:506
 #, fuzzy, c-format
 msgid ""
 "Could not load DCP.\n"
@@ -272,11 +272,12 @@ msgid ""
 "%s."
 msgstr "Impossibile caricare DCP %1."
 
-#: src/tools/dcpomatic_player.cc:660
+#: src/tools/dcpomatic_player.cc:670
 msgid "Could not load KDM."
 msgstr "Impossibile caricare KDM."
 
-#: src/tools/dcpomatic_player.cc:365 src/tools/dcpomatic_player.cc:367
+#: src/tools/dcpomatic_player.cc:368 src/tools/dcpomatic_player.cc:375
+#: src/tools/dcpomatic_player.cc:377
 #, c-format
 msgid "Could not load a DCP from %s"
 msgstr ""
@@ -354,7 +355,7 @@ msgid ""
 msgstr "Impossibile scrivere il file in %s. Le modifiche non verranno salvate."
 
 #: src/tools/dcpomatic.cc:1424 src/tools/dcpomatic_batch.cc:336
-#: src/tools/dcpomatic_player.cc:899 src/tools/dcpomatic_playlist.cc:561
+#: src/tools/dcpomatic_player.cc:909 src/tools/dcpomatic_playlist.cc:561
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
@@ -362,7 +363,7 @@ msgstr ""
 "Impossibile scrivere il file di configurazione in %s. Le modifiche non "
 "verranno salvate."
 
-#: src/tools/dcpomatic_player.cc:907
+#: src/tools/dcpomatic_player.cc:917
 #, fuzzy
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""
@@ -390,13 +391,13 @@ msgstr "DCP-o-MATIC Server per la Codifica"
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-MATIC KDM Creator"
 
-#: src/tools/dcpomatic_player.cc:140 src/tools/dcpomatic_player.cc:359
-#: src/tools/dcpomatic_player.cc:625 src/tools/dcpomatic_player.cc:811
-#: src/tools/dcpomatic_player.cc:1089
+#: src/tools/dcpomatic_player.cc:140 src/tools/dcpomatic_player.cc:360
+#: src/tools/dcpomatic_player.cc:635 src/tools/dcpomatic_player.cc:821
+#: src/tools/dcpomatic_player.cc:1099
 msgid "DCP-o-matic Player"
 msgstr "DCP-o-MATIC Player"
 
-#: src/tools/dcpomatic_player.cc:1164
+#: src/tools/dcpomatic_player.cc:1174
 msgid "DCP-o-matic Player could not start."
 msgstr "DCP-o-MATIC Player non può essere avviato."
 
@@ -413,15 +414,15 @@ msgstr "DCP-o-MATIC non può essere avviato"
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic_player.cc:544
+#: src/tools/dcpomatic_player.cc:554
 msgid "Decode at full resolution"
 msgstr "Decodifica a risoluzione massima"
 
-#: src/tools/dcpomatic_player.cc:545
+#: src/tools/dcpomatic_player.cc:555
 msgid "Decode at half resolution"
 msgstr "Decodifica a metá risoluzione"
 
-#: src/tools/dcpomatic_player.cc:546
+#: src/tools/dcpomatic_player.cc:556
 msgid "Decode at quarter resolution"
 msgstr "Decodifica ad un quarto della risoluzione"
 
@@ -450,7 +451,7 @@ msgstr "Non duplicare"
 msgid "Down"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:538
+#: src/tools/dcpomatic_player.cc:548
 msgid "Dual screen\tShift+F11"
 msgstr ""
 
@@ -508,7 +509,7 @@ msgstr "Film modificato"
 msgid "Frames per second"
 msgstr "Frame per secondo"
 
-#: src/tools/dcpomatic_player.cc:537
+#: src/tools/dcpomatic_player.cc:547
 msgid "Full screen\tF11"
 msgstr ""
 
@@ -532,7 +533,7 @@ msgstr "KDM|Timing"
 msgid "Length"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:359 src/tools/dcpomatic_player.cc:625
+#: src/tools/dcpomatic_player.cc:360 src/tools/dcpomatic_player.cc:635
 #, fuzzy
 msgid "Loading content"
 msgstr "Caricamento DCP"
@@ -627,7 +628,7 @@ msgid "Remove"
 msgstr "Rimuovi"
 
 #: src/tools/dcpomatic.cc:1392 src/tools/dcpomatic_kdm.cc:262
-#: src/tools/dcpomatic_player.cc:561
+#: src/tools/dcpomatic_player.cc:571
 msgid "Report a problem..."
 msgstr "Segnala un problema..."
 
@@ -680,11 +681,11 @@ msgstr "Salva il film e duplica"
 msgid "Screens"
 msgstr "Schermi"
 
-#: src/tools/dcpomatic_player.cc:579
+#: src/tools/dcpomatic_player.cc:589
 msgid "Select DCP to open"
 msgstr "Seleziona il DCP da aprire"
 
-#: src/tools/dcpomatic_player.cc:604
+#: src/tools/dcpomatic_player.cc:614
 msgid "Select DCP to open as OV"
 msgstr "Seleziona il DCP da aprire come OV"
 
@@ -697,7 +698,7 @@ msgstr "Seleziona il file DKDM"
 msgid "Select DKDM file"
 msgstr "Seleziona il file DKDM"
 
-#: src/tools/dcpomatic_player.cc:646
+#: src/tools/dcpomatic_player.cc:656
 msgid "Select KDM"
 msgstr "Seleziona KDM"
 
@@ -717,11 +718,11 @@ msgstr "Invia email KDM"
 msgid "Send translations..."
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:543
+#: src/tools/dcpomatic_player.cc:553
 msgid "Set decode resolution to match display"
 msgstr "Imposta la risoluzione di decodifica come quella del display"
 
-#: src/tools/dcpomatic.cc:1382 src/tools/dcpomatic_player.cc:553
+#: src/tools/dcpomatic.cc:1382 src/tools/dcpomatic_player.cc:563
 msgid "System information..."
 msgstr ""
 
@@ -747,7 +748,7 @@ msgstr ""
 "Il DCP di questo film occupa %.1f Gb, ma il disco che stai usando dispone di "
 "%.1f Gb liberi.  Vuoi continuare ugualmente?"
 
-#: src/tools/dcpomatic.cc:1486 src/tools/dcpomatic_player.cc:881
+#: src/tools/dcpomatic.cc:1486 src/tools/dcpomatic_player.cc:891
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Non è stato possibile contattare il server di download DCP-o-MATIC."
 
@@ -796,7 +797,7 @@ msgstr ""
 
 #: src/tools/dcpomatic.cc:1797 src/tools/dcpomatic_batch.cc:481
 #: src/tools/dcpomatic_kdm.cc:737 src/tools/dcpomatic_server.cc:353
-#: src/tools/dcpomatic_player.cc:1240
+#: src/tools/dcpomatic_player.cc:1250
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -805,7 +806,7 @@ msgstr ""
 "i valori predefiniti. Questi potrebbero richiedere poco tempo per essere "
 "creati."
 
-#: src/tools/dcpomatic.cc:1488 src/tools/dcpomatic_player.cc:883
+#: src/tools/dcpomatic.cc:1488 src/tools/dcpomatic_player.cc:893
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Non ci sono nuove versioni di DCP-o-MATIC disponibili."
 
@@ -822,7 +823,14 @@ msgstr ""
 "potrebbe non essere caricato correttamente in questa versione. Per favore "
 "controlla attentamente le impostazioni del film."
 
-#: src/tools/dcpomatic_player.cc:552
+#: src/tools/dcpomatic_player.cc:370
+msgid ""
+"This looks like a DCP-o-matic project folder, which cannot be loaded into "
+"the player.  Choose the DCP directory inside the DCP-o-matic project folder "
+"if that's what you want to play."
+msgstr ""
+
+#: src/tools/dcpomatic_player.cc:562
 #, fuzzy
 msgid "Timing..."
 msgstr "KDM|Timing"
@@ -844,7 +852,7 @@ msgstr "Lavori incompiuti"
 msgid "Up"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:549
+#: src/tools/dcpomatic_player.cc:559
 #, fuzzy
 msgid "Verify DCP..."
 msgstr "Verifica DCP"
@@ -903,7 +911,7 @@ msgid ""
 msgstr ""
 
 #: src/tools/dcpomatic.cc:586 src/tools/dcpomatic_batch.cc:299
-#: src/tools/dcpomatic_player.cc:585 src/tools/dcpomatic_player.cc:613
+#: src/tools/dcpomatic_player.cc:595 src/tools/dcpomatic_player.cc:623
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."