X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fpo%2Fpt_PT.po;h=88a69ff10b3e629a325201f87794ddacbde79b9f;hb=HEAD;hp=9b2b7b50e8f7e418e0cfa25420b70853403374ce;hpb=978b1c022a0949296e1e6ac8c5c95481f89033a1;p=dcpomatic.git

diff --git a/src/tools/po/pt_PT.po b/src/tools/po/pt_PT.po
index 9b2b7b50e..88a69ff10 100644
--- a/src/tools/po/pt_PT.po
+++ b/src/tools/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic PORTUGUESE (Portugal)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-06 10:10+0200\n"
+"POT-Creation-Date: 2024-01-12 00:54+0100\n"
 "PO-Revision-Date: 2016-03-19 13:01+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"
@@ -18,155 +18,169 @@ msgstr ""
 "X-Generator: Poedit 1.8.7.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic_kdm.cc:392
+#: src/tools/dcpomatic_combiner.cc:171
+#, fuzzy
+msgid "%1 already exists as a file, so you cannot use it for a DCP."
+msgstr "O ficheiro %1 já existe, não o pode usar para um novo filme."
+
+#: src/tools/dcpomatic_kdm.cc:453
 #, c-format
 msgid "%d KDM written to %s"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:392
+#: src/tools/dcpomatic_kdm.cc:453
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr ""
 
-#: src/tools/dcpomatic_batch.cc:81
+#: src/tools/dcpomatic_batch.cc:85
 #, fuzzy
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Adicionar Filme..."
 
-#: src/tools/dcpomatic_player.cc:502
+#: src/tools/dcpomatic_player.cc:560
 #, fuzzy
 msgid "&Add OV..."
 msgstr "Adicionar Filme..."
 
-#: src/tools/dcpomatic_player.cc:510
+#: src/tools/dcpomatic_player.cc:568
 msgid "&Close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1326
+#: src/tools/dcpomatic.cc:1325
 #, fuzzy
 msgid "&Close\tCtrl-W"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1408 src/tools/dcpomatic_batch.cc:103
-#: src/tools/dcpomatic_kdm.cc:270 src/tools/dcpomatic_player.cc:562
-#: src/tools/dcpomatic_playlist.cc:554
+#: src/tools/dcpomatic_batch.cc:107 src/tools/dcpomatic.cc:1407
+#: src/tools/dcpomatic_kdm.cc:313 src/tools/dcpomatic_player.cc:620
+#: src/tools/dcpomatic_playlist.cc:592
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:1333 src/tools/dcpomatic_batch.cc:83
-#: src/tools/dcpomatic_kdm.cc:248 src/tools/dcpomatic_player.cc:514
-#: src/tools/dcpomatic_playlist.cc:535
+#: src/tools/dcpomatic_batch.cc:87 src/tools/dcpomatic.cc:1332
+#: src/tools/dcpomatic_editor.cc:356 src/tools/dcpomatic_kdm.cc:291
+#: src/tools/dcpomatic_player.cc:572 src/tools/dcpomatic_playlist.cc:573
 msgid "&Exit"
 msgstr "&Sair"
 
-#: src/tools/dcpomatic.cc:1407 src/tools/dcpomatic_batch.cc:101
-#: src/tools/dcpomatic_kdm.cc:268 src/tools/dcpomatic_player.cc:560
-#: src/tools/dcpomatic_playlist.cc:552
+#: src/tools/dcpomatic_batch.cc:105 src/tools/dcpomatic.cc:1406
+#: src/tools/dcpomatic_editor.cc:368 src/tools/dcpomatic_kdm.cc:311
+#: src/tools/dcpomatic_player.cc:618 src/tools/dcpomatic_playlist.cc:590
 msgid "&File"
 msgstr "&Ficheiro"
 
-#: src/tools/dcpomatic.cc:1412 src/tools/dcpomatic_batch.cc:106
-#: src/tools/dcpomatic_kdm.cc:272 src/tools/dcpomatic_player.cc:566
-#: src/tools/dcpomatic_playlist.cc:556
+#: src/tools/dcpomatic_batch.cc:110 src/tools/dcpomatic.cc:1411
+#: src/tools/dcpomatic_editor.cc:369 src/tools/dcpomatic_kdm.cc:315
+#: src/tools/dcpomatic_player.cc:624 src/tools/dcpomatic_playlist.cc:594
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: src/tools/dcpomatic.cc:1409
+#: src/tools/dcpomatic.cc:1408
 msgid "&Jobs"
 msgstr "&Trabalhos"
 
-#: src/tools/dcpomatic.cc:1357
+#: src/tools/dcpomatic.cc:1356
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Criar DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_player.cc:501
+#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_editor.cc:351
+#: src/tools/dcpomatic_player.cc:559
 msgid "&Open...\tCtrl-O"
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:1348 src/tools/dcpomatic.cc:1352
-#: src/tools/dcpomatic_batch.cc:89 src/tools/dcpomatic_batch.cc:92
-#: src/tools/dcpomatic_kdm.cc:254 src/tools/dcpomatic_kdm.cc:257
-#: src/tools/dcpomatic_player.cc:520 src/tools/dcpomatic_player.cc:523
-#: src/tools/dcpomatic_playlist.cc:542
+#: src/tools/dcpomatic_batch.cc:93 src/tools/dcpomatic_batch.cc:96
+#: src/tools/dcpomatic.cc:1347 src/tools/dcpomatic.cc:1351
+#: src/tools/dcpomatic_kdm.cc:297 src/tools/dcpomatic_kdm.cc:300
+#: src/tools/dcpomatic_player.cc:578 src/tools/dcpomatic_player.cc:581
+#: src/tools/dcpomatic_playlist.cc:572 src/tools/dcpomatic_playlist.cc:580
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferências...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:1335 src/tools/dcpomatic_batch.cc:85
-#: src/tools/dcpomatic_kdm.cc:250 src/tools/dcpomatic_player.cc:516
-#: src/tools/dcpomatic_playlist.cc:537
+#: src/tools/dcpomatic_batch.cc:89 src/tools/dcpomatic.cc:1334
+#: src/tools/dcpomatic_editor.cc:358 src/tools/dcpomatic_kdm.cc:293
+#: src/tools/dcpomatic_player.cc:574 src/tools/dcpomatic_playlist.cc:575
 msgid "&Quit"
 msgstr "&Sair"
 
-#: src/tools/dcpomatic.cc:1316
+#: src/tools/dcpomatic.cc:1315 src/tools/dcpomatic_editor.cc:353
 msgid "&Save\tCtrl-S"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic_player.cc:505
+#: src/tools/dcpomatic_player.cc:563
 #, fuzzy
 msgid "&Save frame to file...\tCtrl-S"
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:1371
+#: src/tools/dcpomatic.cc:1370
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP para TMS"
 
-#: src/tools/dcpomatic.cc:1411 src/tools/dcpomatic_batch.cc:105
-#: src/tools/dcpomatic_player.cc:565
+#: src/tools/dcpomatic_batch.cc:109 src/tools/dcpomatic.cc:1410
+#: src/tools/dcpomatic_player.cc:623
 msgid "&Tools"
 msgstr "&Ferramentas"
 
-#: src/tools/dcpomatic.cc:1410 src/tools/dcpomatic_player.cc:564
+#: src/tools/dcpomatic.cc:1409 src/tools/dcpomatic_player.cc:622
 msgid "&View"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:265
+#: src/tools/dcpomatic_playlist.cc:315
 msgid "<b>Playlist:</b>"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:111
+#: src/tools/dcpomatic_playlist.cc:124
 msgid "<b>Playlists</b>"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1403 src/tools/dcpomatic_batch.cc:99
-#: src/tools/dcpomatic_kdm.cc:264 src/tools/dcpomatic_player.cc:556
-#: src/tools/dcpomatic_playlist.cc:549
+#: src/tools/dcpomatic_batch.cc:103 src/tools/dcpomatic.cc:1402
+#: src/tools/dcpomatic_editor.cc:365 src/tools/dcpomatic_kdm.cc:307
+#: src/tools/dcpomatic_player.cc:614 src/tools/dcpomatic_playlist.cc:587
 msgid "About"
 msgstr "Sobre"
 
-#: src/tools/dcpomatic.cc:1401 src/tools/dcpomatic_kdm.cc:262
-#: src/tools/dcpomatic_player.cc:554 src/tools/dcpomatic_playlist.cc:547
+#: src/tools/dcpomatic.cc:1400 src/tools/dcpomatic_editor.cc:363
+#: src/tools/dcpomatic_kdm.cc:305 src/tools/dcpomatic_player.cc:612
+#: src/tools/dcpomatic_playlist.cc:585
 msgid "About DCP-o-matic"
 msgstr "Sobre o DCP-o-matic"
 
-#: src/tools/dcpomatic_playlist.cc:297
+#: src/tools/dcpomatic_playlist.cc:339
 msgid "Add"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:503
+#: src/tools/dcpomatic_player.cc:561
 #, fuzzy
 msgid "Add &KDM..."
 msgstr "Adicionar Filme..."
 
-#: src/tools/dcpomatic_batch.cc:138
-msgid "Add Film..."
-msgstr "Adicionar Filme..."
-
-#: src/tools/dcpomatic_playlist.cc:66
+#: src/tools/dcpomatic_playlist.cc:77
 #, fuzzy
 msgid "Add content"
 msgstr "&Conteúdo"
 
-#: src/tools/dcpomatic_kdm.cc:171
+#: src/tools/dcpomatic_batch.cc:174
+#, fuzzy
+msgid "Add film"
+msgstr "Adicionar Filme..."
+
+#: src/tools/dcpomatic_batch.cc:174
+msgid "Add film for conversion"
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:211
 #, fuzzy
 msgid "Add folder..."
 msgstr "Adicionar Filme..."
 
-#: src/tools/dcpomatic_kdm.cc:169
+#: src/tools/dcpomatic_kdm.cc:209
 msgid "Add..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1767 src/tools/dcpomatic_kdm.cc:719
-#: src/tools/dcpomatic_player.cc:1255 src/tools/dcpomatic_playlist.cc:659
+#: src/tools/dcpomatic.cc:1781 src/tools/dcpomatic_combiner.cc:297
+#: src/tools/dcpomatic_disk.cc:553 src/tools/dcpomatic_editor.cc:527
+#: src/tools/dcpomatic_kdm.cc:899 src/tools/dcpomatic_player.cc:1326
+#: src/tools/dcpomatic_playlist.cc:697
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -175,7 +189,7 @@ msgstr ""
 "Ocorreu uma excepção: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1776
+#: src/tools/dcpomatic.cc:1790
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s (%s) (%s)\n"
@@ -184,8 +198,10 @@ msgstr ""
 "Ocorreu uma excepção: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1786 src/tools/dcpomatic_kdm.cc:728
-#: src/tools/dcpomatic_player.cc:1264 src/tools/dcpomatic_playlist.cc:668
+#: src/tools/dcpomatic.cc:1800 src/tools/dcpomatic_combiner.cc:306
+#: src/tools/dcpomatic_disk.cc:562 src/tools/dcpomatic_editor.cc:536
+#: src/tools/dcpomatic_kdm.cc:908 src/tools/dcpomatic_player.cc:1335
+#: src/tools/dcpomatic_playlist.cc:706
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -194,82 +210,126 @@ msgstr ""
 "Ocorreu uma excepção: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:354
+#: src/tools/dcpomatic_server.cc:355
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:971 src/tools/dcpomatic.cc:1791
-#: src/tools/dcpomatic_kdm.cc:403 src/tools/dcpomatic_kdm.cc:733
-#: src/tools/dcpomatic_kdm.cc:742 src/tools/dcpomatic_player.cc:1269
-#: src/tools/dcpomatic_playlist.cc:673 src/tools/dcpomatic_playlist.cc:682
+#: src/tools/dcpomatic.cc:984 src/tools/dcpomatic.cc:1805
+#: src/tools/dcpomatic_combiner.cc:311 src/tools/dcpomatic_disk.cc:567
+#: src/tools/dcpomatic_editor.cc:541 src/tools/dcpomatic_kdm.cc:471
+#: src/tools/dcpomatic_kdm.cc:913 src/tools/dcpomatic_kdm.cc:922
+#: src/tools/dcpomatic_player.cc:1340 src/tools/dcpomatic_playlist.cc:711
+#: src/tools/dcpomatic_playlist.cc:720
 msgid "An unknown exception occurred."
 msgstr "Ocorreu uma excepção desconhecida."
 
-#: src/tools/dcpomatic.cc:731
+#: src/tools/dcpomatic_combiner.cc:116 src/tools/dcpomatic_editor.cc:79
+#: src/tools/dcpomatic_editor.cc:198
+msgid "Annotation text"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:748
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:813
+#: src/tools/dcpomatic.cc:832
 #, fuzzy, c-format
 msgid "Bad setting for %s."
 msgstr "Má configuração de %s."
 
-#: src/tools/dcpomatic_player.cc:532 src/tools/dcpomatic_playlist.cc:278
+#: src/tools/dcpomatic_editor.cc:324 src/tools/dcpomatic_player.cc:590
+#: src/tools/dcpomatic_playlist.cc:330
 msgid "CPL"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:967 src/tools/dcpomatic_kdm.cc:399
+#: src/tools/dcpomatic.cc:980 src/tools/dcpomatic_kdm.cc:467
 msgid "CPL's content is not encrypted."
 msgstr "O conteúdo do CPL não é encriptado."
 
-#: src/tools/dcpomatic.cc:1391 src/tools/dcpomatic_player.cc:548
+#: src/tools/dcpomatic.cc:1390 src/tools/dcpomatic_player.cc:606
 msgid "Check for updates"
 msgstr "Procurar actualizações"
 
-#: src/tools/dcpomatic.cc:1892 src/tools/dcpomatic.cc:1909
+#: src/tools/dcpomatic_combiner.cc:64 src/tools/dcpomatic_disk.cc:81
+msgid "Choose a DCP folder"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1901 src/tools/dcpomatic.cc:1916
 #, fuzzy
 msgid "Close DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:159
 msgid "Close without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1384 src/tools/dcpomatic_player.cc:538
+#: src/tools/dcpomatic.cc:1383 src/tools/dcpomatic_player.cc:596
 msgid "Closed captions..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1340
+#: src/tools/dcpomatic_combiner.cc:124
+msgid "Combine"
+msgstr ""
+
+#: src/tools/dcpomatic_combiner.cc:178
+msgid "Combining DCPs"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:213
+msgid "Content title text"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:161
+msgid "Copy DCP"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1339
 msgid "Copy settings\tCtrl-C"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:548 src/tools/dcpomatic.cc:557
+#: src/tools/dcpomatic.cc:562 src/tools/dcpomatic.cc:571
 msgid "Could not create folder to store film."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:489
+#: src/tools/dcpomatic_kdm.cc:597
 msgid ""
 "Could not decrypt the DKDM.  Perhaps it was not created with the correct "
 "certificate."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:906
+#: src/tools/dcpomatic.cc:632 src/tools/dcpomatic.cc:649
+#, fuzzy
+msgid "Could not duplicate project."
+msgstr "Não foi possível encontrar o conversor de lote"
+
+#: src/tools/dcpomatic.cc:913
 msgid "Could not find batch converter."
 msgstr "Não foi possível encontrar o conversor de lote"
 
-#: src/tools/dcpomatic.cc:921
+#: src/tools/dcpomatic.cc:928
 #, fuzzy
 msgid "Could not find player."
 msgstr "Não foi possível encontrar o conversor de lote"
 
-#: src/tools/dcpomatic_player.cc:711 src/tools/dcpomatic_player.cc:1194
+#: src/tools/dcpomatic_batch.cc:478
+msgid ""
+"Could not listen for new batch jobs.  Perhaps another instance of the DCP-o-"
+"matic Batch Converter is running."
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:336
+#, fuzzy
+msgid "Could not load DCP"
+msgstr "Não foi possível produzir o DCP: %s"
+
+#: src/tools/dcpomatic_player.cc:774 src/tools/dcpomatic_player.cc:1265
 #, fuzzy
 msgid "Could not load DCP %1."
 msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic_player.cc:491
+#: src/tools/dcpomatic_player.cc:549
 #, fuzzy, c-format
 msgid ""
 "Could not load DCP.\n"
@@ -277,54 +337,68 @@ msgid ""
 "%s."
 msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic_player.cc:657
+#: src/tools/dcpomatic_player.cc:722
 #, fuzzy
 msgid "Could not load KDM."
 msgstr "Não foi possível mostrar o DCP"
 
-#: src/tools/dcpomatic_player.cc:354 src/tools/dcpomatic_player.cc:361
-#: src/tools/dcpomatic_player.cc:363
+#: src/tools/dcpomatic_player.cc:412 src/tools/dcpomatic_player.cc:419
+#: src/tools/dcpomatic_player.cc:421
 #, fuzzy, c-format
 msgid "Could not load a DCP from %s"
 msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic_batch.cc:461
+#: src/tools/dcpomatic_batch.cc:494
 #, fuzzy
 msgid "Could not load film %1"
 msgstr "Não foi possível carregar o filme %1 (%2)"
 
-#: src/tools/dcpomatic.cc:1676
+#: src/tools/dcpomatic.cc:1694
 msgid "Could not load film %1 (%2)"
 msgstr "Não foi possível carregar o filme %1 (%2)"
 
-#: src/tools/dcpomatic.cc:815
+#: src/tools/dcpomatic.cc:834
 #, fuzzy
 msgid "Could not make DCP."
 msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic.cc:473 src/tools/dcpomatic.cc:478
-#: src/tools/dcpomatic_batch.cc:222
+#: src/tools/dcpomatic_batch.cc:257 src/tools/dcpomatic.cc:487
+#: src/tools/dcpomatic.cc:492
 #, fuzzy, c-format
 msgid "Could not open film at %s"
 msgstr "Não foi possível abrir o filme em %s"
 
-#: src/tools/dcpomatic.cc:468
+#: src/tools/dcpomatic.cc:482
 msgid "Could not open this folder as a DCP-o-matic project."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:494
+#: src/tools/dcpomatic_kdm.cc:602
 msgid ""
 "Could not read file as a KDM.  It is much too large.  Make sure you are "
 "loading a DKDM (XML) file."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:482
+#: src/tools/dcpomatic_kdm.cc:590
 msgid ""
 "Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
 "at all."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1121
+#: src/tools/dcpomatic.cc:771
+msgid "Could not remove existing preferences file"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:605 src/tools/dcpomatic.cc:1278
+#, fuzzy
+msgid "Could not save project."
+msgstr "Não foi possível produzir o DCP: %s"
+
+#: src/tools/dcpomatic.cc:616
+#, fuzzy
+msgid "Could not save template."
+msgstr "Não foi possível encontrar o conversor de lote"
+
+#: src/tools/dcpomatic.cc:1123
 #, fuzzy
 msgid "Could not send translations"
 msgstr "Não foi possível mostrar o DCP (não foi possível executar o nautilus)"
@@ -334,420 +408,547 @@ msgstr "Não foi possível mostrar o DCP (não foi possível executar o nautilus
 msgid "Could not show DCP."
 msgstr "Não foi possível mostrar o DCP"
 
-#: src/tools/dcpomatic.cc:904
+#: src/tools/dcpomatic.cc:911
 msgid ""
 "Could not start the batch converter.  You may need to download it from "
 "dcpomatic.com."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:919
+#: src/tools/dcpomatic.cc:926
 msgid ""
 "Could not start the player.  You may need to download it from dcpomatic.com."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1425 src/tools/dcpomatic_batch.cc:333
+#: src/tools/dcpomatic_batch.cc:363 src/tools/dcpomatic.cc:1424
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1437 src/tools/dcpomatic_batch.cc:345
-#: src/tools/dcpomatic_player.cc:944 src/tools/dcpomatic_playlist.cc:568
+#: src/tools/dcpomatic_batch.cc:375 src/tools/dcpomatic.cc:1436
+#: src/tools/dcpomatic_player.cc:1010 src/tools/dcpomatic_playlist.cc:606
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:952
+#: src/tools/dcpomatic_player.cc:1018
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:188
+#: src/tools/dcpomatic_kdm.cc:228
 msgid "Create KDMs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1540 src/tools/dcpomatic.cc:1614
-#: src/tools/dcpomatic.cc:1655
+#: src/tools/dcpomatic_editor.cc:208
+msgid "Creator"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:132 src/tools/dcpomatic_disk.cc:136
+msgid "DCP"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1537 src/tools/dcpomatic.cc:1634
+#: src/tools/dcpomatic.cc:1673
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_batch.cc:401 src/tools/dcpomatic_batch.cc:437
+#: src/tools/dcpomatic_batch.cc:429 src/tools/dcpomatic_batch.cc:465
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic Conversor de Lote"
 
-#: src/tools/dcpomatic_server.cc:151
+#: 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"
+
+#: src/tools/dcpomatic_disk.cc:315 src/tools/dcpomatic_disk.cc:323
+#: src/tools/dcpomatic_disk.cc:356 src/tools/dcpomatic_disk.cc:444
+#: src/tools/dcpomatic_disk.cc:490
+#, fuzzy
+msgid "DCP-o-matic Disk Writer"
+msgstr "DCP-o-matic"
+
+#: src/tools/dcpomatic_editor.cc:293 src/tools/dcpomatic_editor.cc:447
+#, fuzzy
+msgid "DCP-o-matic Editor"
+msgstr "DCP-o-matic"
+
+#: src/tools/dcpomatic_editor.cc:498
+#, fuzzy
+msgid "DCP-o-matic Editor could not start."
+msgstr "DCP-o-matic"
+
+#: src/tools/dcpomatic_server.cc:152
 #, fuzzy
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Conversor de Lote"
 
-#: src/tools/dcpomatic_kdm.cc:653 src/tools/dcpomatic_kdm.cc:687
+#: src/tools/dcpomatic_kdm.cc:833 src/tools/dcpomatic_kdm.cc:867
 #, fuzzy
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_player.cc:155 src/tools/dcpomatic_player.cc:346
-#: src/tools/dcpomatic_player.cc:622 src/tools/dcpomatic_player.cc:856
-#: src/tools/dcpomatic_player.cc:1135
+#: src/tools/dcpomatic_player.cc:201 src/tools/dcpomatic_player.cc:401
+#: src/tools/dcpomatic_player.cc:683 src/tools/dcpomatic_player.cc:928
+#: src/tools/dcpomatic_player.cc:1206
 #, fuzzy
 msgid "DCP-o-matic Player"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_player.cc:1217
+#: src/tools/dcpomatic_player.cc:1288
 #, fuzzy
 msgid "DCP-o-matic Player could not start."
 msgstr "O servidor de descarga do DCP-o-matic não pode ser contactado."
 
-#: src/tools/dcpomatic_playlist.cc:600 src/tools/dcpomatic_playlist.cc:634
+#: src/tools/dcpomatic_playlist.cc:638 src/tools/dcpomatic_playlist.cc:672
 #, fuzzy
 msgid "DCP-o-matic Playlist Editor"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:704 src/tools/dcpomatic_playlist.cc:646
+#: src/tools/dcpomatic_kdm.cc:884 src/tools/dcpomatic_playlist.cc:684
 #, fuzzy
 msgid "DCP-o-matic could not start"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_combiner.cc:188
+msgid "DCPs combined successfully."
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:170
 msgid "DKDM"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:541
+#: src/tools/dcpomatic_kdm.cc:577
+#, c-format
+msgid "DKDM %s is already in the DKDM list and will not be added again."
+msgstr ""
+
+#: src/tools/dcpomatic_player.cc:599
 msgid "Decode at full resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:542
+#: src/tools/dcpomatic_player.cc:600
 msgid "Decode at half resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:543
+#: src/tools/dcpomatic_player.cc:601
 msgid "Decode at quarter resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:124
+#: src/tools/dcpomatic_playlist.cc:137
 msgid "Delete"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1861 src/tools/dcpomatic.cc:1878
+#: src/tools/dcpomatic_disk.cc:324
+msgid ""
+"Did you install the DCP-o-matic Disk Writer.pkg from the .dmg?  Please check "
+"and try again."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1874 src/tools/dcpomatic.cc:1889
+#: src/tools/dcpomatic.cc:1931
 msgid "Do nothing"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:800
+#: src/tools/dcpomatic_disk.cc:316
+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:819
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:159
 msgid "Don't close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:187
 msgid "Don't duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:296
+#: src/tools/dcpomatic_playlist.cc:338
 msgid "Down"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:535
+#: src/tools/dcpomatic_disk.cc:148
+msgid "Drive"
+msgstr ""
+
+#: src/tools/dcpomatic_player.cc:593
 msgid "Dual screen\tShift+F11"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:608 src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:623 src/tools/dcpomatic.cc:639
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1320
+#: src/tools/dcpomatic.cc:1319
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:187
 msgid "Duplicate without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1319
+#: src/tools/dcpomatic.cc:1318
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1389 src/tools/dcpomatic_batch.cc:96
+#: src/tools/dcpomatic_editor.cc:89
+msgid "Duration"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:149
+msgid "Edit reel"
+msgstr ""
+
+#: src/tools/dcpomatic_batch.cc:100 src/tools/dcpomatic.cc:1388
 msgid "Encoding servers..."
 msgstr "Servidores de codificação..."
 
-#: src/tools/dcpomatic_playlist.cc:280
+#: src/tools/dcpomatic_playlist.cc:332
 msgid "Encrypted"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1397
+#: src/tools/dcpomatic_editor.cc:84
+msgid "Entry point"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1396
 #, fuzzy
 msgid "Export preferences..."
 msgstr "Restaurar predefinições"
 
-#: src/tools/dcpomatic.cc:1369
+#: src/tools/dcpomatic.cc:1368
 #, fuzzy
 msgid "Export subtitles..."
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:1368
+#: src/tools/dcpomatic.cc:1367
 #, fuzzy
 msgid "Export video file...\tCtrl-E"
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:175
+#: src/tools/dcpomatic_kdm.cc:215
 #, fuzzy
 msgid "Export..."
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:996 src/tools/dcpomatic_kdm.cc:279
+#: src/tools/dcpomatic.cc:999 src/tools/dcpomatic_kdm.cc:328
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr ""
 "O directório %s já existe e não se encontra vazio. Tem a certeza que "
 "pretende utilizá-lo?"
 
-#. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
-#. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:152 src/tools/dcpomatic.cc:189
+#. TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
+#. project (Film) has been changed since it was last saved.
+#: src/tools/dcpomatic.cc:154 src/tools/dcpomatic.cc:182
 msgid "Film changed"
 msgstr "Filme modificado"
 
-#: src/tools/dcpomatic_server.cc:162
+#: src/tools/dcpomatic_kdm.cc:323
+#, fuzzy, c-format
+msgid "Folder %s already exists.  Do you want to overwrite it?"
+msgstr ""
+"O directório %s já existe e não se encontra vazio. Tem a certeza que "
+"pretende utilizá-lo?"
+
+#: src/tools/dcpomatic_server.cc:163
 msgid "Frames per second"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:534
+#: src/tools/dcpomatic_player.cc:592
 msgid "Full screen\tF11"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1388
+#: src/tools/dcpomatic.cc:1387
 msgid "Hints..."
 msgstr "Sugestões..."
 
-#: src/tools/dcpomatic.cc:469
+#: src/tools/dcpomatic_combiner.cc:101
+msgid "Input DCP"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:94
+msgid "Intrinsic duration"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:203
+msgid "Issuer"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:483
 msgid ""
 "It looks like you are trying to open a DCP.  File -> Open is for loading DCP-"
 "o-matic projects, not DCPs.  To import a DCP, create a new project with File "
 "-> New and then click the \"Add DCP...\" button."
 msgstr ""
 
-#. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:154
+#. TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
+#: src/tools/dcpomatic_kdm.cc:164
 msgid "KDM|Timing"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:119
+#: src/tools/dcpomatic_playlist.cc:132
 msgid "Length"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:346 src/tools/dcpomatic_player.cc:622
+#: src/tools/dcpomatic_player.cc:401 src/tools/dcpomatic_player.cc:683
 msgid "Loading content"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1364
+#: src/tools/dcpomatic.cc:1363
 #, fuzzy
 msgid "Make &DKDMs...\tCtrl-D"
 msgstr "Gerar &KDM...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:1362
+#: src/tools/dcpomatic.cc:1361
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Gerar &KDM...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:1359
+#: src/tools/dcpomatic.cc:1358
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Gerar DCP no &Conversor de Lote\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1365
+#: src/tools/dcpomatic.cc:1364
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Gerar DKDM para DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1390
+#: src/tools/dcpomatic.cc:1389
 msgid "Manage templates..."
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:118 src/tools/dcpomatic_playlist.cc:277
+#: src/tools/dcpomatic_playlist.cc:131 src/tools/dcpomatic_playlist.cc:329
 msgid "Name"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:122
+#: src/tools/dcpomatic_playlist.cc:135
 msgid "New"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:532
+#: src/tools/dcpomatic.cc:543
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:212
+#: src/tools/dcpomatic_playlist.cc:249
 msgid "New Playlist"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1311
+#: src/tools/dcpomatic.cc:1310
 msgid "New...\tCtrl-N"
 msgstr "Novo...\tCtrl-N"
 
-#: src/tools/dcpomatic_playlist.cc:525
+#: src/tools/dcpomatic_disk.cc:90
+msgid ""
+"No ASSETMAP or ASSETMAP.xml found in this folder.  Please choose a DCP "
+"folder."
+msgstr ""
+
+#: src/tools/dcpomatic_playlist.cc:245
 msgid ""
 "No playlist folder is specified in preferences.  Please set one and then try "
 "again."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1381
+#: src/tools/dcpomatic.cc:1380
 msgid "Open DCP in &player"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:182
+#: src/tools/dcpomatic_editor.cc:281
+msgid "Open a DCP using File -> Open"
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:222
 msgid "Output"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1342
+#: src/tools/dcpomatic_combiner.cc:120
+msgid "Output DCP folder"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1341
 #, fuzzy
 msgid "Paste settings...\tCtrl-V"
 msgstr "&Preferências...\tCtrl-P"
 
-#: src/tools/dcpomatic_batch.cc:141
-msgid "Pause"
+#: src/tools/dcpomatic_batch.cc:175
+msgid "Pause or resume conversion"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:553
+#: src/tools/dcpomatic_batch.cc:175
+msgid "Pause/resume"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:167
+msgid "Picture"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:567
 msgid ""
 "Please check that you do not have Windows controlled folder access enabled "
 "for DCP-o-matic."
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:364
+#: src/tools/dcpomatic_playlist.cc:416
 msgid "Question|N"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:364
+#: src/tools/dcpomatic_playlist.cc:416
 msgid "Question|Y"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1904
+#: src/tools/dcpomatic.cc:1911
 msgid "Recreate KDM decryption chain"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1857 src/tools/dcpomatic.cc:1874
-#: src/tools/dcpomatic.cc:1888
+#: src/tools/dcpomatic.cc:1870 src/tools/dcpomatic.cc:1885
+#: src/tools/dcpomatic.cc:1897 src/tools/dcpomatic.cc:1926
 msgid "Recreate signing certificates"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1702
+#: src/tools/dcpomatic_editor.cc:218
+msgid "Reels"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:152
+msgid "Refresh"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1720
 msgid "Release notes"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:173 src/tools/dcpomatic_playlist.cc:298
+#: src/tools/dcpomatic_kdm.cc:213 src/tools/dcpomatic_playlist.cc:340
 msgid "Remove"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1405 src/tools/dcpomatic_kdm.cc:266
-#: src/tools/dcpomatic_player.cc:558
+#: src/tools/dcpomatic.cc:1404 src/tools/dcpomatic_kdm.cc:309
+#: src/tools/dcpomatic_player.cc:616
 msgid "Report a problem..."
 msgstr "Comunicar um problema..."
 
-#: src/tools/dcpomatic.cc:732 src/tools/dcpomatic.cc:1395
+#: src/tools/dcpomatic.cc:749 src/tools/dcpomatic.cc:1394
 msgid "Restore default preferences"
 msgstr "Restaurar predefinições"
 
-#: src/tools/dcpomatic_batch.cc:144
-msgid "Resume"
-msgstr ""
-
-#: src/tools/dcpomatic.cc:1376
+#: src/tools/dcpomatic.cc:1375
 #, fuzzy
 msgid "S&how DCP in Explorer"
 msgstr "M&ostrar DCP"
 
-#: src/tools/dcpomatic.cc:1378
+#: src/tools/dcpomatic.cc:1377
 #, fuzzy
 msgid "S&how DCP in Files"
 msgstr "M&ostrar DCP"
 
-#: src/tools/dcpomatic.cc:1374
+#: src/tools/dcpomatic.cc:1373
 #, fuzzy
 msgid "S&how DCP in Finder"
 msgstr "M&ostrar DCP"
 
-#: src/tools/dcpomatic.cc:1318
+#: src/tools/dcpomatic_playlist.cc:319
+#, fuzzy
+msgid "Save"
+msgstr "&Enregistrer"
+
+#: src/tools/dcpomatic.cc:1317
 msgid "Save as &template..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:149
+#: src/tools/dcpomatic.cc:151
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Guardar as modificação ao filme \"%s\" antes de fechar?"
 
-#: src/tools/dcpomatic.cc:186
+#: src/tools/dcpomatic.cc:179
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Guardar as modificação ao filme \"%s\" antes de fechar?"
 
-#: src/tools/dcpomatic.cc:157
+#: src/tools/dcpomatic.cc:159
 msgid "Save film and close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:187
 msgid "Save film and duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:669
+#: src/tools/dcpomatic_player.cc:732
 msgid "Save frame to file"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:147
+#: src/tools/dcpomatic_kdm.cc:157
 msgid "Screens"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:576
+#: src/tools/dcpomatic_editor.cc:375 src/tools/dcpomatic_player.cc:634
 #, fuzzy
 msgid "Select DCP to open"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_player.cc:601
+#: src/tools/dcpomatic_player.cc:662
 #, fuzzy
 msgid "Select DCP to open as OV"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:602
+#: src/tools/dcpomatic_kdm.cc:766
 #, fuzzy
 msgid "Select DKDM File"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:453
+#: src/tools/dcpomatic_kdm.cc:552
 #, fuzzy
 msgid "Select DKDM file"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_player.cc:643
+#: src/tools/dcpomatic_player.cc:703
 #, fuzzy
 msgid "Select KDM"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic.cc:1345
+#: src/tools/dcpomatic.cc:1344
 msgid "Select all\tShift-Ctrl-A"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:569 src/tools/dcpomatic_batch.cc:299
+#: src/tools/dcpomatic_batch.cc:331 src/tools/dcpomatic.cc:580
 msgid "Select film to open"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:386
+#: src/tools/dcpomatic_kdm.cc:447
 msgid "Send KDM emails"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1392
+#: src/tools/dcpomatic.cc:1391
 msgid "Send translations..."
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:540
+#: src/tools/dcpomatic_player.cc:598
 msgid "Set decode resolution to match display"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:747
+#: src/tools/dcpomatic_editor.cc:170
+msgid "Sound"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:761
 msgid "Specify ZIP file"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1393 src/tools/dcpomatic_player.cc:550
+#: src/tools/dcpomatic_editor.cc:173
+msgid "Subtitle"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1392 src/tools/dcpomatic_player.cc:608
 msgid "System information..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:770
+#: src/tools/dcpomatic.cc:791
 #, fuzzy, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f GB, and "
@@ -760,7 +961,7 @@ msgstr ""
 "do espaço se o sistema de ficheiros suportasse enlaces físicos, mas não "
 "suporta. Pretende continuar?"
 
-#: src/tools/dcpomatic.cc:768
+#: src/tools/dcpomatic.cc:789
 #, fuzzy, c-format
 msgid ""
 "The DCP for this film will take up about %.1f GB, and the disk that you are "
@@ -769,11 +970,11 @@ msgstr ""
 "O DCP para este filme ocupará cerca de %.1f Gb, e o disco utilizado apenas "
 "dispõe de %.1f Gb. Pretende continuar?"
 
-#: src/tools/dcpomatic.cc:1499 src/tools/dcpomatic_player.cc:926
+#: src/tools/dcpomatic.cc:1497 src/tools/dcpomatic_player.cc:992
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "O servidor de descarga do DCP-o-matic não pode ser contactado."
 
-#: src/tools/dcpomatic_batch.cc:211
+#: src/tools/dcpomatic_batch.cc:246
 #, fuzzy, c-format
 msgid ""
 "The DCPs for this film and the films already in the queue will take up about "
@@ -783,11 +984,28 @@ msgstr ""
 "O DCP para este filme ocupará cerca de %.1f Gb, e o disco utilizado apenas "
 "dispõe de %.1f Gb. Pretende continuar?"
 
-#: src/tools/dcpomatic_player.cc:302
+#: src/tools/dcpomatic_player.cc:358
 msgid "The KDM does not allow playback of this content at this time."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1905
+#: src/tools/dcpomatic_kdm.cc:463
+msgid ""
+"The KDM end period is after (or close to) the end of the signing "
+"certificates' validity period.  Either use an earlier end time for this KDM "
+"or re-create your signing certificates in the DCP-o-matic preferences window."
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:461
+msgid ""
+"The KDM start period is before (or close to) the start of the signing "
+"certificate's validity period.  Use a later start time for this KDM."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:963
+msgid "The certificate chain for signing is invalid"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1912
 msgid ""
 "The certificate chain that DCP-o-matic uses for decrypting KDMs is "
 "inconsistent and\n"
@@ -798,7 +1016,7 @@ msgid ""
 "configuration before continuing."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1858
+#: src/tools/dcpomatic.cc:1871
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
 "contains a small error\n"
@@ -807,7 +1025,18 @@ msgid ""
 "the certificate chain for signing DCPs and KDMs?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1875
+#: src/tools/dcpomatic.cc:1927
+msgid ""
+"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
+"contains a small error\n"
+"which will prevent DCPs from being validated correctly on some systems.  "
+"This error was caused\n"
+"by a bug in DCP-o-matic which has now been fixed. Do you want to re-create "
+"the certificate chain\n"
+"for signing DCPs and KDMs?"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1886
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a "
 "validity period\n"
@@ -816,7 +1045,7 @@ msgid ""
 "Do you want to re-create the certificate chain for signing DCPs and KDMs?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1889
+#: src/tools/dcpomatic.cc:1898
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs is "
 "inconsistent and\n"
@@ -825,21 +1054,41 @@ msgid ""
 "the certificate chain for signing DCPs and KDMs?"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:1293
+#: 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 ""
+"O directório %1 já existe e não se encontra vazio. Tem a certeza que "
+"pretende utilizá-lo?"
+
+#: src/tools/dcpomatic_disk.cc:279
+msgid "The disk you selected is no longer available.  Please choose another."
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:358
+#, 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:531 src/tools/dcpomatic_player.cc:1364
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1501 src/tools/dcpomatic_player.cc:928
+#: src/tools/dcpomatic.cc:1499 src/tools/dcpomatic_player.cc:994
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Não há novas versões do DCP-o-matic disponíveis."
 
-#: src/tools/dcpomatic.cc:1153 src/tools/dcpomatic_batch.cc:241
+#: src/tools/dcpomatic_batch.cc:276 src/tools/dcpomatic.cc:1150
+#: src/tools/dcpomatic_disk.cc:255
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Há trabalhos não finalizados; tem a certeza que pretende sair?"
 
-#: src/tools/dcpomatic.cc:451
+#: src/tools/dcpomatic.cc:465
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -848,49 +1097,59 @@ msgstr ""
 "carregar correctamente nesta versão. Por favor verifique as definições do "
 "filme cuidadosamente."
 
-#: src/tools/dcpomatic_player.cc:356
+#: src/tools/dcpomatic_player.cc:414
 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."
+"the player.  Choose the DCP folder inside the DCP-o-matic project folder if "
+"that's what you want to play."
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:549
+#: src/tools/dcpomatic_player.cc:607
 msgid "Timing..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:551
+#: src/tools/dcpomatic_disk.cc:116
+#, fuzzy
+msgid "Tools"
+msgstr "&Ferramentas"
+
+#: src/tools/dcpomatic.cc:565
 #, c-format
 msgid "Try removing the %s characters from your folder name."
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:279
+#: src/tools/dcpomatic_playlist.cc:331
 msgid "Type"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1154 src/tools/dcpomatic_batch.cc:242
+#: src/tools/dcpomatic_batch.cc:277 src/tools/dcpomatic.cc:1151
+#: src/tools/dcpomatic_disk.cc:256
 msgid "Unfinished jobs"
 msgstr "Trabalhos não finalizados"
 
-#: src/tools/dcpomatic_playlist.cc:295
+#: src/tools/dcpomatic_disk.cc:115
+msgid "Uninstall..."
+msgstr ""
+
+#: src/tools/dcpomatic_playlist.cc:337
 msgid "Up"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:546
+#: src/tools/dcpomatic_player.cc:604
 msgid "Verify DCP..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1385
+#: src/tools/dcpomatic.cc:1384
 msgid "Video waveform..."
 msgstr "Forma de onda de vídeo..."
 
-#: src/tools/dcpomatic_kdm.cc:577
+#: src/tools/dcpomatic_kdm.cc:740
 msgid ""
 "You are about to remove a DKDM.  This will make it impossible to decrypt the "
 "DCP that the DKDM was made for, and it cannot be undone.  Are you sure?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:942
+#: src/tools/dcpomatic.cc:948
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -902,7 +1161,7 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:790
+#: src/tools/dcpomatic.cc:809
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -912,7 +1171,7 @@ msgid ""
 "size=\"larger\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1663
+#: src/tools/dcpomatic.cc:1681
 msgid ""
 "You are running the 32-bit version of DCP-o-matic on a 64-bit version of "
 "Windows.  This will limit the memory available to DCP-o-matic and may cause "
@@ -920,8 +1179,21 @@ msgid ""
 "matic."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:578 src/tools/dcpomatic_batch.cc:308
-#: src/tools/dcpomatic_player.cc:582 src/tools/dcpomatic_player.cc:610
+#: src/tools/dcpomatic_disk.cc:485
+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:374
+msgid ""
+"You did not correctly confirm that you read the warning that was just "
+"shown.  Please try again."
+msgstr ""
+
+#: src/tools/dcpomatic_batch.cc:340 src/tools/dcpomatic.cc:589
+#: src/tools/dcpomatic_editor.cc:381 src/tools/dcpomatic_player.cc:640
+#: src/tools/dcpomatic_player.cc:671
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -929,12 +1201,20 @@ msgstr ""
 "Não seleccionou uma pasta. Certifique-se que selecciona uma pasta antes de "
 "clicar Abrir."
 
-#: src/tools/dcpomatic.cc:1114
+#: src/tools/dcpomatic.cc:1116
 msgid ""
 "You must enter a valid email address when sending translations, otherwise "
 "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"
+
+#, fuzzy
+#~ msgid "DCP-o-matic Combine"
+#~ msgstr "DCP-o-matic"
+
 #, fuzzy
 #~ msgid "Could not run konqueror"
 #~ msgstr ""
@@ -956,20 +1236,6 @@ msgstr ""
 #~ msgid "Select playlist file"
 #~ msgstr "Seleccionar filme a abrir"
 
-#, fuzzy
-#~ msgid "Could not load DCP"
-#~ msgstr "Não foi possível produzir o DCP: %s"
-
-#~ msgid "%1 already exists as a file, so you cannot use it for a new film."
-#~ msgstr "O ficheiro %1 já existe, não o pode usar para um novo filme."
-
-#~ msgid ""
-#~ "The directory %1 already exists and is not empty.  Are you sure you want "
-#~ "to use it?"
-#~ msgstr ""
-#~ "O directório %1 já existe e não se encontra vazio. Tem a certeza que "
-#~ "pretende utilizá-lo?"
-
 #~ msgid "&Properties..."
 #~ msgstr "&Propriétés..."
 
@@ -988,9 +1254,6 @@ msgstr ""
 #~ "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 #~ "matic (carl@dcpomatic.com)."
 
-#~ msgid "&Save"
-#~ msgstr "&Enregistrer"
-
 #~ msgid ""
 #~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 #~ "Laursen"