pot/merge.

1 files changed, 241 insertions, 56 deletions

diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 2dfa00047..c1520742f 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: 2023-03-29 01:43+0200\n"
+"POT-Creation-Date: 2023-03-29 01:56+0200\n"
 "PO-Revision-Date: 2018-09-30 16:31+0200\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.7\n"
 
+#: src/tools/dcpomatic_combiner.cc:171
+#, fuzzy
+msgid "%1 already exists as a file, so you cannot use it for a DCP."
+msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
+
 #: src/tools/dcpomatic_kdm.cc:451
 #, c-format
 msgid "%d KDM written to %s"
@@ -44,27 +49,27 @@ msgstr "&Chiudi"
 msgid "&Close\tCtrl-W"
 msgstr "&Salva\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1402 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic_batch.cc:105 src/tools/dcpomatic.cc:1402
 #: src/tools/dcpomatic_kdm.cc:308 src/tools/dcpomatic_player.cc:607
 #: src/tools/dcpomatic_playlist.cc:599
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:1327 src/tools/dcpomatic_batch.cc:85
-#: src/tools/dcpomatic_kdm.cc:286 src/tools/dcpomatic_player.cc:559
-#: src/tools/dcpomatic_playlist.cc:580
+#: src/tools/dcpomatic_batch.cc:85 src/tools/dcpomatic.cc:1327
+#: src/tools/dcpomatic_editor.cc:346 src/tools/dcpomatic_kdm.cc:286
+#: src/tools/dcpomatic_player.cc:559 src/tools/dcpomatic_playlist.cc:580
 msgid "&Exit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:1401 src/tools/dcpomatic_batch.cc:103
-#: src/tools/dcpomatic_kdm.cc:306 src/tools/dcpomatic_player.cc:605
-#: src/tools/dcpomatic_playlist.cc:597
+#: src/tools/dcpomatic_batch.cc:103 src/tools/dcpomatic.cc:1401
+#: src/tools/dcpomatic_editor.cc:358 src/tools/dcpomatic_kdm.cc:306
+#: src/tools/dcpomatic_player.cc:605 src/tools/dcpomatic_playlist.cc:597
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:1406 src/tools/dcpomatic_batch.cc:108
-#: src/tools/dcpomatic_kdm.cc:310 src/tools/dcpomatic_player.cc:611
-#: src/tools/dcpomatic_playlist.cc:601
+#: src/tools/dcpomatic_batch.cc:108 src/tools/dcpomatic.cc:1406
+#: src/tools/dcpomatic_editor.cc:359 src/tools/dcpomatic_kdm.cc:310
+#: src/tools/dcpomatic_player.cc:611 src/tools/dcpomatic_playlist.cc:601
 msgid "&Help"
 msgstr "&Aiuto"
 
@@ -76,25 +81,26 @@ msgstr "&Elaborazioni"
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crea DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1307 src/tools/dcpomatic_player.cc:546
+#: src/tools/dcpomatic.cc:1307 src/tools/dcpomatic_editor.cc:341
+#: src/tools/dcpomatic_player.cc:546
 msgid "&Open...\tCtrl-O"
 msgstr "&Apri...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:1342 src/tools/dcpomatic.cc:1346
 #: src/tools/dcpomatic_batch.cc:91 src/tools/dcpomatic_batch.cc:94
+#: src/tools/dcpomatic.cc:1342 src/tools/dcpomatic.cc:1346
 #: src/tools/dcpomatic_kdm.cc:292 src/tools/dcpomatic_kdm.cc:295
 #: src/tools/dcpomatic_player.cc:565 src/tools/dcpomatic_player.cc:568
 #: src/tools/dcpomatic_playlist.cc:579 src/tools/dcpomatic_playlist.cc:587
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferenze...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:1329 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:288 src/tools/dcpomatic_player.cc:561
-#: src/tools/dcpomatic_playlist.cc:582
+#: src/tools/dcpomatic_batch.cc:87 src/tools/dcpomatic.cc:1329
+#: src/tools/dcpomatic_editor.cc:348 src/tools/dcpomatic_kdm.cc:288
+#: src/tools/dcpomatic_player.cc:561 src/tools/dcpomatic_playlist.cc:582
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:1310
+#: src/tools/dcpomatic.cc:1310 src/tools/dcpomatic_editor.cc:343
 msgid "&Save\tCtrl-S"
 msgstr "&Salva\tCtrl-S"
 
@@ -107,7 +113,7 @@ msgstr "&Esporta...\tCtrl-O"
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:1405 src/tools/dcpomatic_batch.cc:107
+#: src/tools/dcpomatic_batch.cc:107 src/tools/dcpomatic.cc:1405
 #: src/tools/dcpomatic_player.cc:610
 msgid "&Tools"
 msgstr "&Strumenti"
@@ -124,14 +130,15 @@ msgstr ""
 msgid "<b>Playlists</b>"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1397 src/tools/dcpomatic_batch.cc:101
-#: src/tools/dcpomatic_kdm.cc:302 src/tools/dcpomatic_player.cc:601
-#: src/tools/dcpomatic_playlist.cc:594
+#: src/tools/dcpomatic_batch.cc:101 src/tools/dcpomatic.cc:1397
+#: src/tools/dcpomatic_editor.cc:355 src/tools/dcpomatic_kdm.cc:302
+#: src/tools/dcpomatic_player.cc:601 src/tools/dcpomatic_playlist.cc:594
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:1395 src/tools/dcpomatic_kdm.cc:300
-#: src/tools/dcpomatic_player.cc:599 src/tools/dcpomatic_playlist.cc:592
+#: src/tools/dcpomatic.cc:1395 src/tools/dcpomatic_editor.cc:353
+#: src/tools/dcpomatic_kdm.cc:300 src/tools/dcpomatic_player.cc:599
+#: src/tools/dcpomatic_playlist.cc:592
 msgid "About DCP-o-matic"
 msgstr "Info su DVD-o-MATIC"
 
@@ -167,8 +174,10 @@ msgstr "Aggiungi cartella..."
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: src/tools/dcpomatic.cc:1757 src/tools/dcpomatic_kdm.cc:877
-#: src/tools/dcpomatic_player.cc:1294 src/tools/dcpomatic_playlist.cc:704
+#: src/tools/dcpomatic.cc:1757 src/tools/dcpomatic_combiner.cc:297
+#: src/tools/dcpomatic_disk.cc:552 src/tools/dcpomatic_editor.cc:517
+#: src/tools/dcpomatic_kdm.cc:877 src/tools/dcpomatic_player.cc:1294
+#: src/tools/dcpomatic_playlist.cc:704
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -186,8 +195,10 @@ msgstr ""
 "Si è verificata un'eccezione: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1776 src/tools/dcpomatic_kdm.cc:886
-#: src/tools/dcpomatic_player.cc:1303 src/tools/dcpomatic_playlist.cc:713
+#: src/tools/dcpomatic.cc:1776 src/tools/dcpomatic_combiner.cc:306
+#: src/tools/dcpomatic_disk.cc:561 src/tools/dcpomatic_editor.cc:526
+#: src/tools/dcpomatic_kdm.cc:886 src/tools/dcpomatic_player.cc:1303
+#: src/tools/dcpomatic_playlist.cc:713
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -201,12 +212,19 @@ msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Errore sconosciuto sul server di DCP-o-MATIC."
 
 #: src/tools/dcpomatic.cc:986 src/tools/dcpomatic.cc:1781
-#: src/tools/dcpomatic_kdm.cc:469 src/tools/dcpomatic_kdm.cc:891
-#: src/tools/dcpomatic_kdm.cc:900 src/tools/dcpomatic_player.cc:1308
-#: src/tools/dcpomatic_playlist.cc:718 src/tools/dcpomatic_playlist.cc:727
+#: src/tools/dcpomatic_combiner.cc:311 src/tools/dcpomatic_disk.cc:566
+#: src/tools/dcpomatic_editor.cc:531 src/tools/dcpomatic_kdm.cc:469
+#: src/tools/dcpomatic_kdm.cc:891 src/tools/dcpomatic_kdm.cc:900
+#: src/tools/dcpomatic_player.cc:1308 src/tools/dcpomatic_playlist.cc:718
+#: src/tools/dcpomatic_playlist.cc:727
 msgid "An unknown exception occurred."
 msgstr "Si è verificata un'eccezione sconosciuta."
 
+#: src/tools/dcpomatic_combiner.cc:116 src/tools/dcpomatic_editor.cc:78
+#: src/tools/dcpomatic_editor.cc:193
+msgid "Annotation text"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:760
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
@@ -220,7 +238,8 @@ msgstr ""
 msgid "Bad setting for %s."
 msgstr "Impostazione errata per %s."
 
-#: src/tools/dcpomatic_player.cc:577 src/tools/dcpomatic_playlist.cc:327
+#: src/tools/dcpomatic_editor.cc:319 src/tools/dcpomatic_player.cc:577
+#: src/tools/dcpomatic_playlist.cc:327
 msgid "CPL"
 msgstr "CPL"
 
@@ -232,6 +251,10 @@ msgstr "Il contenuto CPL non è criptato."
 msgid "Check for updates"
 msgstr "Controlla aggiornamenti"
 
+#: src/tools/dcpomatic_combiner.cc:64 src/tools/dcpomatic_disk.cc:80
+msgid "Choose a DCP folder"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1874 src/tools/dcpomatic.cc:1889
 #, fuzzy
 msgid "Close DCP-o-matic"
@@ -245,6 +268,22 @@ msgstr "Chiudi senza salvare il film"
 msgid "Closed captions..."
 msgstr ""
 
+#: src/tools/dcpomatic_combiner.cc:124
+msgid "Combine"
+msgstr ""
+
+#: src/tools/dcpomatic_combiner.cc:178
+msgid "Combining DCPs"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:208
+msgid "Content title text"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:160
+msgid "Copy DCP"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1334
 msgid "Copy settings\tCtrl-C"
 msgstr "Copia preferenze\tCtrl-C"
@@ -315,8 +354,8 @@ msgstr "Impossibile caricare il film %1 (%2)"
 msgid "Could not make DCP."
 msgstr "Impossibile creare DCP."
 
-#: src/tools/dcpomatic.cc:502 src/tools/dcpomatic.cc:507
-#: src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic_batch.cc:255 src/tools/dcpomatic.cc:502
+#: src/tools/dcpomatic.cc:507
 #, c-format
 msgid "Could not open film at %s"
 msgstr "Impossibile aprire il film in %s"
@@ -372,13 +411,13 @@ msgid ""
 "Could not start the player.  You may need to download it from dcpomatic.com."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1419 src/tools/dcpomatic_batch.cc:361
+#: src/tools/dcpomatic_batch.cc:361 src/tools/dcpomatic.cc:1419
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr "Impossibile scrivere il file in %s. Le modifiche non verranno salvate."
 
-#: src/tools/dcpomatic.cc:1431 src/tools/dcpomatic_batch.cc:373
+#: src/tools/dcpomatic_batch.cc:373 src/tools/dcpomatic.cc:1431
 #: src/tools/dcpomatic_player.cc:983 src/tools/dcpomatic_playlist.cc:613
 #, c-format
 msgid ""
@@ -398,6 +437,15 @@ msgstr ""
 msgid "Create KDMs"
 msgstr "Crea le KDM"
 
+#: src/tools/dcpomatic_editor.cc:203
+msgid "Creator"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:131 src/tools/dcpomatic_disk.cc:135
+#, fuzzy
+msgid "DCP"
+msgstr "CPL"
+
 #: src/tools/dcpomatic.cc:1532 src/tools/dcpomatic.cc:1608
 #: src/tools/dcpomatic.cc:1649
 msgid "DCP-o-matic"
@@ -407,6 +455,29 @@ msgstr "DCP-o-MATIC"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-MATIC Convertitore batch"
 
+#: src/tools/dcpomatic_combiner.cc:178 src/tools/dcpomatic_combiner.cc:222
+#: src/tools/dcpomatic_combiner.cc:256
+#, fuzzy
+msgid "DCP-o-matic Combiner"
+msgstr "DCP-o-MATIC Player"
+
+#: src/tools/dcpomatic_disk.cc:314 src/tools/dcpomatic_disk.cc:322
+#: src/tools/dcpomatic_disk.cc:355 src/tools/dcpomatic_disk.cc:443
+#: src/tools/dcpomatic_disk.cc:489
+#, fuzzy
+msgid "DCP-o-matic Disk Writer"
+msgstr "DCP-o-MATIC KDM Creator"
+
+#: src/tools/dcpomatic_editor.cc:288 src/tools/dcpomatic_editor.cc:437
+#, fuzzy
+msgid "DCP-o-matic Editor"
+msgstr "DCP-o-MATIC Player"
+
+#: src/tools/dcpomatic_editor.cc:488
+#, fuzzy
+msgid "DCP-o-matic Editor could not start."
+msgstr "DCP-o-MATIC non può essere avviato"
+
 #: src/tools/dcpomatic_server.cc:151
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-MATIC Server per la Codifica"
@@ -434,6 +505,10 @@ msgstr "DCP-o-MATIC Player"
 msgid "DCP-o-matic could not start"
 msgstr "DCP-o-MATIC non può essere avviato"
 
+#: src/tools/dcpomatic_combiner.cc:188
+msgid "DCPs combined successfully."
+msgstr ""
+
 #: src/tools/dcpomatic_kdm.cc:167
 msgid "DKDM"
 msgstr "DKDM"
@@ -454,10 +529,22 @@ msgstr "Decodifica ad un quarto della risoluzione"
 msgid "Delete"
 msgstr ""
 
+#: src/tools/dcpomatic_disk.cc:323
+msgid ""
+"Did you install the DCP-o-matic Disk Writer.pkg from the .dmg?  Please check "
+"and try again."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1847 src/tools/dcpomatic.cc:1862
 msgid "Do nothing"
 msgstr ""
 
+#: src/tools/dcpomatic_disk.cc:315
+msgid ""
+"Do you see a 'User Account Control' dialogue asking about "
+"dcpomatic2_disk_writer.exe?  If so, click 'Yes', then try again."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:821
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
@@ -475,6 +562,10 @@ msgstr "Non duplicare"
 msgid "Down"
 msgstr ""
 
+#: src/tools/dcpomatic_disk.cc:147
+msgid "Drive"
+msgstr ""
+
 #: src/tools/dcpomatic_player.cc:580
 msgid "Dual screen\tShift+F11"
 msgstr ""
@@ -495,7 +586,15 @@ msgstr "Duplica senza salvare il film"
 msgid "Duplicate..."
 msgstr "Duplica..."
 
-#: src/tools/dcpomatic.cc:1383 src/tools/dcpomatic_batch.cc:98
+#: src/tools/dcpomatic_editor.cc:88
+msgid "Duration"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:148
+msgid "Edit reel"
+msgstr ""
+
+#: src/tools/dcpomatic_batch.cc:98 src/tools/dcpomatic.cc:1383
 msgid "Encoding servers..."
 msgstr "Servers di codifica..."
 
@@ -503,6 +602,10 @@ msgstr "Servers di codifica..."
 msgid "Encrypted"
 msgstr ""
 
+#: src/tools/dcpomatic_editor.cc:83
+msgid "Entry point"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1391
 #, fuzzy
 msgid "Export preferences..."
@@ -558,6 +661,18 @@ msgstr ""
 msgid "Hints..."
 msgstr "Suggerimenti..."
 
+#: src/tools/dcpomatic_combiner.cc:101
+msgid "Input DCP"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:93
+msgid "Intrinsic duration"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:198
+msgid "Issuer"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:498
 msgid ""
 "It looks like you are trying to open a DCP.  File -> Open is for loading DCP-"
@@ -620,6 +735,12 @@ msgstr ""
 msgid "New...\tCtrl-N"
 msgstr "Nuovo...\tCtrl-N"
 
+#: src/tools/dcpomatic_disk.cc:89
+msgid ""
+"No ASSETMAP or ASSETMAP.xml found in this folder.  Please choose a DCP "
+"folder."
+msgstr ""
+
 #: src/tools/dcpomatic_playlist.cc:242
 msgid ""
 "No playlist folder is specified in preferences.  Please set one and then try "
@@ -630,10 +751,18 @@ msgstr ""
 msgid "Open DCP in &player"
 msgstr "Apri il DCP nel Player"
 
+#: src/tools/dcpomatic_editor.cc:276
+msgid "Open a DCP using File -> Open"
+msgstr ""
+
 #: src/tools/dcpomatic_kdm.cc:219
 msgid "Output"
 msgstr "Uscita"
 
+#: src/tools/dcpomatic_combiner.cc:120
+msgid "Output DCP folder"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1336
 msgid "Paste settings...\tCtrl-V"
 msgstr "Incolla preferenze...\tCtrl-V"
@@ -646,6 +775,10 @@ msgstr ""
 msgid "Pause/resume"
 msgstr ""
 
+#: src/tools/dcpomatic_editor.cc:166
+msgid "Picture"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:582
 msgid ""
 "Please check that you do not have Windows controlled folder access enabled "
@@ -669,6 +802,14 @@ msgstr ""
 msgid "Recreate signing certificates"
 msgstr ""
 
+#: src/tools/dcpomatic_editor.cc:213
+msgid "Reels"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:151
+msgid "Refresh"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1696
 msgid "Release notes"
 msgstr ""
@@ -736,7 +877,7 @@ msgstr ""
 msgid "Screens"
 msgstr "Schermi"
 
-#: src/tools/dcpomatic_player.cc:621
+#: src/tools/dcpomatic_editor.cc:365 src/tools/dcpomatic_player.cc:621
 msgid "Select DCP to open"
 msgstr "Seleziona il DCP da aprire"
 
@@ -761,7 +902,7 @@ msgstr "Seleziona KDM"
 msgid "Select all\tShift-Ctrl-A"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:595 src/tools/dcpomatic_batch.cc:329
+#: src/tools/dcpomatic_batch.cc:329 src/tools/dcpomatic.cc:595
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
@@ -784,10 +925,18 @@ msgid ""
 "not be created."
 msgstr ""
 
+#: src/tools/dcpomatic_editor.cc:169
+msgid "Sound"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:773
 msgid "Specify ZIP file"
 msgstr ""
 
+#: src/tools/dcpomatic_editor.cc:172
+msgid "Subtitle"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1387 src/tools/dcpomatic_player.cc:595
 msgid "System information..."
 msgstr ""
@@ -887,7 +1036,24 @@ msgid ""
 "the certificate chain for signing DCPs and KDMs?"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:1332
+#: src/tools/dcpomatic_combiner.cc:161
+msgid ""
+"The directory %1 already exists and is not empty.  Are you sure you want to "
+"use it?"
+msgstr "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
+
+#: src/tools/dcpomatic_disk.cc:278
+msgid "The disk you selected is no longer available.  Please choose another."
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:357
+#, c-format
+msgid ""
+"The drive %s could not be unmounted.\n"
+"Close any application that is using it, then try again. (%s)"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:530 src/tools/dcpomatic_player.cc:1332
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -900,7 +1066,8 @@ msgstr ""
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Non ci sono nuove versioni di DCP-o-MATIC disponibili."
 
-#: src/tools/dcpomatic.cc:1153 src/tools/dcpomatic_batch.cc:274
+#: src/tools/dcpomatic_batch.cc:274 src/tools/dcpomatic.cc:1153
+#: src/tools/dcpomatic_disk.cc:254
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "C'è un processo in corso: sei sicuro di voler uscire?"
 
@@ -925,6 +1092,11 @@ msgstr ""
 msgid "Timing..."
 msgstr "KDM|Timing"
 
+#: src/tools/dcpomatic_disk.cc:115
+#, fuzzy
+msgid "Tools"
+msgstr "&Strumenti"
+
 #: src/tools/dcpomatic.cc:580
 #, c-format
 msgid "Try removing the %s characters from your folder name."
@@ -934,10 +1106,15 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1154 src/tools/dcpomatic_batch.cc:275
+#: src/tools/dcpomatic_batch.cc:275 src/tools/dcpomatic.cc:1154
+#: src/tools/dcpomatic_disk.cc:255
 msgid "Unfinished jobs"
 msgstr "Lavori incompiuti"
 
+#: src/tools/dcpomatic_disk.cc:114
+msgid "Uninstall..."
+msgstr ""
+
 #: src/tools/dcpomatic_playlist.cc:344
 msgid "Up"
 msgstr ""
@@ -1000,8 +1177,21 @@ msgid ""
 "matic."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:604 src/tools/dcpomatic_batch.cc:338
-#: src/tools/dcpomatic_player.cc:627 src/tools/dcpomatic_player.cc:658
+#: src/tools/dcpomatic_disk.cc:484
+msgid ""
+"You did not correctly confirm that you read the warning that was just "
+"shown.  DCP-o-matic Disk Writer will close now.  Please try again."
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:373
+msgid ""
+"You did not correctly confirm that you read the warning that was just "
+"shown.  Please try again."
+msgstr ""
+
+#: src/tools/dcpomatic_batch.cc:338 src/tools/dcpomatic.cc:604
+#: src/tools/dcpomatic_editor.cc:371 src/tools/dcpomatic_player.cc:627
+#: src/tools/dcpomatic_player.cc:658
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -1015,6 +1205,14 @@ msgid ""
 "the DCP-o-matic maintainers cannot credit you or contact you with questions."
 msgstr ""
 
+#, fuzzy
+#~ msgid "DCP-o-matic DCP Combiner"
+#~ msgstr "DCP-o-MATIC KDM Creator"
+
+#, fuzzy
+#~ msgid "DCP-o-matic Combine"
+#~ msgstr "DCP-o-MATIC"
+
 #~ msgid "Could not run konqueror"
 #~ msgstr "Impossibile eseguire konqueror"
 
@@ -1034,25 +1232,12 @@ msgstr ""
 #~ msgstr "Adatta alla &larghezza"
 
 #, fuzzy
-#~ msgid "DCP"
-#~ msgstr "CPL"
-
-#, fuzzy
 #~ msgid "Select playlist file"
 #~ msgstr "Seleziona il file DKDM"
 
 #~ msgid "Could not load DCP"
 #~ msgstr "Impossibile caricare DCP"
 
-#~ msgid "%1 already exists as a file, so you cannot use it for a new film."
-#~ msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
-
-#~ msgid ""
-#~ "The directory %1 already exists and is not empty.  Are you sure you want "
-#~ "to use it?"
-#~ msgstr ""
-#~ "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
-
 #~ msgid "&Properties..."
 #~ msgstr "&Proprieta'..."