X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fpo%2Fpt_PT.po;h=5d92f6df8f4903eb3a193104275a5e1c0be70f82;hb=4f0be04b28c3a4cfec9513db23f92a175d207dfb;hp=56d8a7e3eb44bba67316d37ec18597ded56789c1;hpb=c783cb134af8af6441665e229236800fe347b750;p=dcpomatic.git

diff --git a/src/tools/po/pt_PT.po b/src/tools/po/pt_PT.po
index 56d8a7e3e..5d92f6df8 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: 2021-06-07 00:58+0200\n"
+"POT-Creation-Date: 2023-03-29 01:56+0200\n"
 "PO-Revision-Date: 2016-03-19 13:01+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"
@@ -18,150 +18,169 @@ msgstr ""
 "X-Generator: Poedit 1.8.7.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic_kdm.cc:389
+#: 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:451
 #, c-format
 msgid "%d KDM written to %s"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:389
+#: src/tools/dcpomatic_kdm.cc:451
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr ""
 
-#: src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic_batch.cc:83
 #, fuzzy
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Adicionar Filme..."
 
-#: src/tools/dcpomatic_player.cc:526
+#: src/tools/dcpomatic_player.cc:547
 #, fuzzy
 msgid "&Add OV..."
 msgstr "Adicionar Filme..."
 
-#: src/tools/dcpomatic_player.cc:532
+#: src/tools/dcpomatic_player.cc:555
 msgid "&Close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1317
+#: src/tools/dcpomatic.cc:1320
 #, fuzzy
 msgid "&Close\tCtrl-W"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1388 src/tools/dcpomatic_batch.cc:99
-#: src/tools/dcpomatic_kdm.cc:267 src/tools/dcpomatic_player.cc:584
-#: src/tools/dcpomatic_playlist.cc:551
+#: 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 "&Editar"
 
-#: src/tools/dcpomatic.cc:1324 src/tools/dcpomatic_batch.cc:79
-#: src/tools/dcpomatic_kdm.cc:245 src/tools/dcpomatic_player.cc:536
-#: src/tools/dcpomatic_playlist.cc:532
+#: 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 "&Sair"
 
-#: src/tools/dcpomatic.cc:1387 src/tools/dcpomatic_batch.cc:97
-#: src/tools/dcpomatic_kdm.cc:265 src/tools/dcpomatic_player.cc:582
-#: src/tools/dcpomatic_playlist.cc:549
+#: 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 "&Ficheiro"
 
-#: src/tools/dcpomatic.cc:1392 src/tools/dcpomatic_batch.cc:102
-#: src/tools/dcpomatic_kdm.cc:269 src/tools/dcpomatic_player.cc:588
-#: src/tools/dcpomatic_playlist.cc:553
+#: 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 "&Ajuda"
 
-#: src/tools/dcpomatic.cc:1389
+#: src/tools/dcpomatic.cc:1403
 msgid "&Jobs"
 msgstr "&Trabalhos"
 
-#: src/tools/dcpomatic.cc:1343
+#: src/tools/dcpomatic.cc:1351
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Criar DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1306 src/tools/dcpomatic_player.cc:525
+#: src/tools/dcpomatic.cc:1307 src/tools/dcpomatic_editor.cc:341
+#: src/tools/dcpomatic_player.cc:546
 msgid "&Open...\tCtrl-O"
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:1336 src/tools/dcpomatic.cc:1339
-#: src/tools/dcpomatic_batch.cc:85 src/tools/dcpomatic_batch.cc:88
-#: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_kdm.cc:254
-#: src/tools/dcpomatic_player.cc:542 src/tools/dcpomatic_player.cc:545
-#: src/tools/dcpomatic_playlist.cc:539
+#: 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 "&Preferências...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:1326 src/tools/dcpomatic_batch.cc:81
-#: src/tools/dcpomatic_kdm.cc:247 src/tools/dcpomatic_player.cc:538
-#: src/tools/dcpomatic_playlist.cc:534
+#: 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 "&Sair"
 
-#: src/tools/dcpomatic.cc:1308
+#: src/tools/dcpomatic.cc:1310 src/tools/dcpomatic_editor.cc:343
 msgid "&Save\tCtrl-S"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1353
+#: src/tools/dcpomatic_player.cc:550
+#, fuzzy
+msgid "&Save frame to file...\tCtrl-S"
+msgstr "&Abrir\tCtrl-O"
+
+#: src/tools/dcpomatic.cc:1365
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP para TMS"
 
-#: src/tools/dcpomatic.cc:1391 src/tools/dcpomatic_batch.cc:101
-#: src/tools/dcpomatic_player.cc:587
+#: src/tools/dcpomatic_batch.cc:107 src/tools/dcpomatic.cc:1405
+#: src/tools/dcpomatic_player.cc:610
 msgid "&Tools"
 msgstr "&Ferramentas"
 
-#: src/tools/dcpomatic.cc:1390 src/tools/dcpomatic_player.cc:586
+#: src/tools/dcpomatic.cc:1404 src/tools/dcpomatic_player.cc:609
 msgid "&View"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:262
+#: src/tools/dcpomatic_playlist.cc:312
 msgid "<b>Playlist:</b>"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:108
+#: src/tools/dcpomatic_playlist.cc:123
 msgid "<b>Playlists</b>"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1383 src/tools/dcpomatic_batch.cc:95
-#: src/tools/dcpomatic_kdm.cc:261 src/tools/dcpomatic_player.cc:578
-#: src/tools/dcpomatic_playlist.cc:546
+#: 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 "Sobre"
 
-#: src/tools/dcpomatic.cc:1381 src/tools/dcpomatic_kdm.cc:259
-#: src/tools/dcpomatic_player.cc:576 src/tools/dcpomatic_playlist.cc:544
+#: 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 "Sobre o DCP-o-matic"
 
-#: src/tools/dcpomatic_playlist.cc:294
+#: src/tools/dcpomatic_playlist.cc:346
 msgid "Add"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:527
+#: src/tools/dcpomatic_player.cc:548
 #, fuzzy
 msgid "Add &KDM..."
 msgstr "Adicionar Filme..."
 
-#: src/tools/dcpomatic_batch.cc:134
-msgid "Add Film..."
-msgstr "Adicionar Filme..."
-
-#: src/tools/dcpomatic_playlist.cc:63
+#: src/tools/dcpomatic_playlist.cc:76
 #, fuzzy
 msgid "Add content"
 msgstr "&Conteúdo"
 
-#: src/tools/dcpomatic_kdm.cc:169
+#: src/tools/dcpomatic_batch.cc:172
+#, fuzzy
+msgid "Add film"
+msgstr "Adicionar Filme..."
+
+#: src/tools/dcpomatic_batch.cc:172
+msgid "Add film for conversion"
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:208
 #, fuzzy
 msgid "Add folder..."
 msgstr "Adicionar Filme..."
 
-#: src/tools/dcpomatic_kdm.cc:167
+#: src/tools/dcpomatic_kdm.cc:206
 msgid "Add..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1724 src/tools/dcpomatic_kdm.cc:702
-#: src/tools/dcpomatic_player.cc:1228 src/tools/dcpomatic_playlist.cc:656
+#: 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"
@@ -170,7 +189,7 @@ msgstr ""
 "Ocorreu uma excepção: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1733
+#: src/tools/dcpomatic.cc:1766
 #, fuzzy, c-format
 msgid ""
 "An exception occurred: %s (%s) (%s)\n"
@@ -179,8 +198,10 @@ msgstr ""
 "Ocorreu uma excepção: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1743 src/tools/dcpomatic_kdm.cc:711
-#: src/tools/dcpomatic_player.cc:1237 src/tools/dcpomatic_playlist.cc:665
+#: 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"
@@ -189,41 +210,53 @@ msgstr ""
 "Ocorreu uma excepção: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:341
+#: src/tools/dcpomatic_server.cc:354
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:957 src/tools/dcpomatic.cc:1748
-#: src/tools/dcpomatic_kdm.cc:400 src/tools/dcpomatic_kdm.cc:716
-#: src/tools/dcpomatic_kdm.cc:725 src/tools/dcpomatic_player.cc:1242
-#: src/tools/dcpomatic_playlist.cc:670 src/tools/dcpomatic_playlist.cc:679
+#: src/tools/dcpomatic.cc:986 src/tools/dcpomatic.cc:1781
+#: 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 "Ocorreu uma excepção desconhecida."
 
-#: src/tools/dcpomatic.cc:732
+#: 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 "
 "be undone."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:799
+#: src/tools/dcpomatic.cc:834
 #, fuzzy, c-format
 msgid "Bad setting for %s."
 msgstr "Má configuração de %s."
 
-#: src/tools/dcpomatic_player.cc:554 src/tools/dcpomatic_playlist.cc:275
+#: src/tools/dcpomatic_editor.cc:319 src/tools/dcpomatic_player.cc:577
+#: src/tools/dcpomatic_playlist.cc:327
 msgid "CPL"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:953 src/tools/dcpomatic_kdm.cc:396
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_kdm.cc:465
 msgid "CPL's content is not encrypted."
 msgstr "O conteúdo do CPL não é encriptado."
 
-#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:570
+#: src/tools/dcpomatic.cc:1385 src/tools/dcpomatic_player.cc:593
 msgid "Check for updates"
 msgstr "Procurar actualizações"
 
-#: src/tools/dcpomatic.cc:1832 src/tools/dcpomatic.cc:1849
+#: 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"
 msgstr "DCP-o-matic"
@@ -232,39 +265,66 @@ msgstr "DCP-o-matic"
 msgid "Close without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1366 src/tools/dcpomatic_player.cc:560
+#: src/tools/dcpomatic.cc:1378 src/tools/dcpomatic_player.cc:583
 msgid "Closed captions..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1330
+#: 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 ""
 
-#: src/tools/dcpomatic.cc:549 src/tools/dcpomatic.cc:558
+#: src/tools/dcpomatic.cc:577 src/tools/dcpomatic.cc:586
 msgid "Could not create folder to store film."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:475
+#: src/tools/dcpomatic_kdm.cc:577
 msgid ""
 "Could not decrypt the DKDM.  Perhaps it was not created with the correct "
 "certificate."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:892
+#: src/tools/dcpomatic.cc:647 src/tools/dcpomatic.cc:664
+#, fuzzy
+msgid "Could not duplicate project."
+msgstr "Não foi possível encontrar o conversor de lote"
+
+#: src/tools/dcpomatic.cc:915
 msgid "Could not find batch converter."
 msgstr "Não foi possível encontrar o conversor de lote"
 
-#: src/tools/dcpomatic.cc:907
+#: src/tools/dcpomatic.cc:930
 #, fuzzy
 msgid "Could not find player."
 msgstr "Não foi possível encontrar o conversor de lote"
 
-#: src/tools/dcpomatic_player.cc:697 src/tools/dcpomatic_player.cc:1167
+#: src/tools/dcpomatic_batch.cc:475
+msgid ""
+"Could not listen for new batch jobs.  Perhaps another instance of the DCP-o-"
+"matic Batch Converter is running."
+msgstr ""
+
+#: src/tools/dcpomatic_player.cc:756 src/tools/dcpomatic_player.cc:1233
 #, fuzzy
 msgid "Could not load DCP %1."
 msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic_player.cc:515
+#: src/tools/dcpomatic_player.cc:536
 #, fuzzy, c-format
 msgid ""
 "Could not load DCP.\n"
@@ -272,170 +332,218 @@ msgid ""
 "%s."
 msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic_player.cc:679
+#: src/tools/dcpomatic_player.cc:704
 #, fuzzy
 msgid "Could not load KDM."
 msgstr "Não foi possível mostrar o DCP"
 
-#: src/tools/dcpomatic_player.cc:377 src/tools/dcpomatic_player.cc:384
-#: src/tools/dcpomatic_player.cc:386
+#: src/tools/dcpomatic_player.cc:399 src/tools/dcpomatic_player.cc:406
+#: src/tools/dcpomatic_player.cc:408
 #, 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:457
+#: src/tools/dcpomatic_batch.cc:491
 #, fuzzy
 msgid "Could not load film %1"
 msgstr "Não foi possível carregar o filme %1 (%2)"
 
-#: src/tools/dcpomatic.cc:1641
+#: src/tools/dcpomatic.cc:1670
 msgid "Could not load film %1 (%2)"
 msgstr "Não foi possível carregar o filme %1 (%2)"
 
-#: src/tools/dcpomatic.cc:801
+#: src/tools/dcpomatic.cc:836
 #, fuzzy
 msgid "Could not make DCP."
 msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic.cc:466 src/tools/dcpomatic.cc:471
-#: src/tools/dcpomatic_batch.cc:218
+#: src/tools/dcpomatic_batch.cc:255 src/tools/dcpomatic.cc:502
+#: src/tools/dcpomatic.cc:507
 #, 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:461
+#: src/tools/dcpomatic.cc:497
 msgid "Could not open this folder as a DCP-o-matic project."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:480
+#: src/tools/dcpomatic_kdm.cc:582
 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:468
+#: src/tools/dcpomatic_kdm.cc:570
 msgid ""
 "Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
 "at all."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1042
+#: src/tools/dcpomatic.cc:620
 #, fuzzy
-msgid "Could not run konqueror"
-msgstr "Não foi possível mostrar o DCP (não foi possível executar o konqueror)"
+msgid "Could not save project."
+msgstr "Não foi possível produzir o DCP: %s"
 
-#: src/tools/dcpomatic.cc:1035
+#: src/tools/dcpomatic.cc:631
 #, fuzzy
-msgid "Could not run nautilus"
-msgstr "Não foi possível mostrar o DCP (não foi possível executar o nautilus)"
+msgid "Could not save template."
+msgstr "Não foi possível encontrar o conversor de lote"
 
-#: src/tools/dcpomatic.cc:1042 src/tools/dcpomatic.cc:1051
-msgid "Could not show DCP"
-msgstr "Não foi possível mostrar o DCP"
+#: src/tools/dcpomatic.cc:1126
+#, fuzzy
+msgid "Could not send translations"
+msgstr "Não foi possível mostrar o DCP (não foi possível executar o nautilus)"
 
-#: src/tools/dcpomatic.cc:1035
+#: src/tools/dcpomatic.cc:1041
 #, fuzzy
 msgid "Could not show DCP."
 msgstr "Não foi possível mostrar o DCP"
 
-#: src/tools/dcpomatic.cc:890
+#: src/tools/dcpomatic.cc:913
 msgid ""
 "Could not start the batch converter.  You may need to download it from "
 "dcpomatic.com."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:905
+#: src/tools/dcpomatic.cc:928
 msgid ""
 "Could not start the player.  You may need to download it from dcpomatic.com."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1405 src/tools/dcpomatic_batch.cc:329
+#: 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 ""
 
-#: src/tools/dcpomatic.cc:1417 src/tools/dcpomatic_batch.cc:341
-#: src/tools/dcpomatic_player.cc:918 src/tools/dcpomatic_playlist.cc:565
+#: 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 ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:926
+#: src/tools/dcpomatic_player.cc:991
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:187
+#: src/tools/dcpomatic_kdm.cc:225
 msgid "Create KDMs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:523 src/tools/dcpomatic.cc:1579
-#: src/tools/dcpomatic.cc:1620
+#: src/tools/dcpomatic_editor.cc:203
+msgid "Creator"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:131 src/tools/dcpomatic_disk.cc:135
+msgid "DCP"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1532 src/tools/dcpomatic.cc:1608
+#: src/tools/dcpomatic.cc:1649
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_batch.cc:397 src/tools/dcpomatic_batch.cc:433
+#: src/tools/dcpomatic_batch.cc:427 src/tools/dcpomatic_batch.cc:463
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic Conversor de Lote"
 
-#: src/tools/dcpomatic_server.cc:146
+#: 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: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"
+
+#: src/tools/dcpomatic_editor.cc:288 src/tools/dcpomatic_editor.cc:437
+#, fuzzy
+msgid "DCP-o-matic Editor"
+msgstr "DCP-o-matic"
+
+#: src/tools/dcpomatic_editor.cc:488
+#, fuzzy
+msgid "DCP-o-matic Editor could not start."
+msgstr "DCP-o-matic"
+
+#: src/tools/dcpomatic_server.cc:151
 #, fuzzy
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Conversor de Lote"
 
-#: src/tools/dcpomatic_kdm.cc:636 src/tools/dcpomatic_kdm.cc:670
+#: src/tools/dcpomatic_kdm.cc:811 src/tools/dcpomatic_kdm.cc:845
 #, fuzzy
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_player.cc:141 src/tools/dcpomatic_player.cc:369
-#: src/tools/dcpomatic_player.cc:644 src/tools/dcpomatic_player.cc:830
-#: src/tools/dcpomatic_player.cc:1108
+#: src/tools/dcpomatic_player.cc:197 src/tools/dcpomatic_player.cc:388
+#: src/tools/dcpomatic_player.cc:670 src/tools/dcpomatic_player.cc:901
+#: src/tools/dcpomatic_player.cc:1174
 #, fuzzy
 msgid "DCP-o-matic Player"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_player.cc:1190
+#: src/tools/dcpomatic_player.cc:1256
 #, 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:597 src/tools/dcpomatic_playlist.cc:631
+#: src/tools/dcpomatic_playlist.cc:645 src/tools/dcpomatic_playlist.cc:679
 #, fuzzy
 msgid "DCP-o-matic Playlist Editor"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:687 src/tools/dcpomatic_playlist.cc:643
+#: src/tools/dcpomatic_kdm.cc:862 src/tools/dcpomatic_playlist.cc:691
 #, fuzzy
 msgid "DCP-o-matic could not start"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:158
+#: src/tools/dcpomatic_combiner.cc:188
+msgid "DCPs combined successfully."
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:167
 msgid "DKDM"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:563
+#: src/tools/dcpomatic_player.cc:586
 msgid "Decode at full resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:564
+#: src/tools/dcpomatic_player.cc:587
 msgid "Decode at half resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:565
+#: src/tools/dcpomatic_player.cc:588
 msgid "Decode at quarter resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:121
+#: src/tools/dcpomatic_playlist.cc:136
 msgid "Delete"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1818
+#: 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.cc:786
+#: 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?"
 msgstr ""
@@ -444,136 +552,183 @@ msgstr ""
 msgid "Don't close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:184
 msgid "Don't duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:293
+#: src/tools/dcpomatic_playlist.cc:345
 msgid "Down"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:557
+#: src/tools/dcpomatic_disk.cc:147
+msgid "Drive"
+msgstr ""
+
+#: src/tools/dcpomatic_player.cc:580
 msgid "Dual screen\tShift+F11"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:609 src/tools/dcpomatic.cc:624
+#: src/tools/dcpomatic.cc:638 src/tools/dcpomatic.cc:654
 msgid "Duplicate Film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1312
+#: src/tools/dcpomatic.cc:1314
 msgid "Duplicate and open..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:184
 msgid "Duplicate without saving film"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1311
+#: src/tools/dcpomatic.cc:1313
 msgid "Duplicate..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1371 src/tools/dcpomatic_batch.cc:92
+#: 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 "Servidores de codificação..."
 
-#: src/tools/dcpomatic_playlist.cc:277
+#: src/tools/dcpomatic_playlist.cc:329
 msgid "Encrypted"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1351
+#: src/tools/dcpomatic_editor.cc:83
+msgid "Entry point"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1391
+#, fuzzy
+msgid "Export preferences..."
+msgstr "Restaurar predefinições"
+
+#: src/tools/dcpomatic.cc:1363
 #, fuzzy
 msgid "Export subtitles..."
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1362
 #, fuzzy
 msgid "Export video file...\tCtrl-E"
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic_kdm.cc:173
+#: src/tools/dcpomatic_kdm.cc:212
 #, fuzzy
 msgid "Export..."
 msgstr "&Abrir\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_kdm.cc:276
+#: src/tools/dcpomatic.cc:1001 src/tools/dcpomatic_kdm.cc:323
 #, 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:151 src/tools/dcpomatic.cc:188
+#. 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:151 src/tools/dcpomatic.cc:179
 msgid "Film changed"
 msgstr "Filme modificado"
 
-#: src/tools/dcpomatic_server.cc:157
+#: src/tools/dcpomatic_kdm.cc:318
+#, 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_kdm.cc:431
+msgid ""
+"For some of these KDMs the recipient certificate's validity period will not "
+"cover the whole of the KDM validity period.  This might cause problems with "
+"the KDMs."
+msgstr ""
+
+#: src/tools/dcpomatic_server.cc:162
 msgid "Frames per second"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:556
+#: src/tools/dcpomatic_player.cc:579
 msgid "Full screen\tF11"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1370
+#: src/tools/dcpomatic.cc:1382
 msgid "Hints..."
 msgstr "Sugestões..."
 
-#: src/tools/dcpomatic.cc:462
+#: 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-"
 "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:152
+#. TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
+#: src/tools/dcpomatic_kdm.cc:161
 msgid "KDM|Timing"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:116
+#: src/tools/dcpomatic_playlist.cc:131
 msgid "Length"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:369 src/tools/dcpomatic_player.cc:644
+#: src/tools/dcpomatic_player.cc:388 src/tools/dcpomatic_player.cc:670
 msgid "Loading content"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1347
+#: src/tools/dcpomatic.cc:1358
 #, fuzzy
 msgid "Make &DKDMs...\tCtrl-D"
 msgstr "Gerar &KDM...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:1346
+#: src/tools/dcpomatic.cc:1356
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Gerar &KDM...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:1344
+#: src/tools/dcpomatic.cc:1353
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Gerar DCP no &Conversor de Lote\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1348
+#: src/tools/dcpomatic.cc:1359
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Gerar DKDM para DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1372
+#: src/tools/dcpomatic.cc:1384
 msgid "Manage templates..."
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:115 src/tools/dcpomatic_playlist.cc:274
+#: src/tools/dcpomatic_playlist.cc:130 src/tools/dcpomatic_playlist.cc:326
 msgid "Name"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:119
+#: src/tools/dcpomatic_playlist.cc:134
 msgid "New"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:558
 msgid "New Film"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:209
+#: src/tools/dcpomatic_playlist.cc:246
 msgid "New Playlist"
 msgstr ""
 
@@ -581,84 +736,120 @@ msgstr ""
 msgid "New...\tCtrl-N"
 msgstr "Novo...\tCtrl-N"
 
-#: src/tools/dcpomatic_playlist.cc:522
+#: 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 "
 "again."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1363
+#: src/tools/dcpomatic.cc:1375
 msgid "Open DCP in &player"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:180
+#: src/tools/dcpomatic_editor.cc:276
+msgid "Open a DCP using File -> Open"
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:219
 msgid "Output"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1331
+#: src/tools/dcpomatic_combiner.cc:120
+msgid "Output DCP folder"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1336
 #, fuzzy
 msgid "Paste settings...\tCtrl-V"
 msgstr "&Preferências...\tCtrl-P"
 
-#: src/tools/dcpomatic_batch.cc:137
-msgid "Pause"
+#: src/tools/dcpomatic_batch.cc:173
+msgid "Pause or resume conversion"
+msgstr ""
+
+#: src/tools/dcpomatic_batch.cc:173
+msgid "Pause/resume"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:554
+#: 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 "
 "for DCP-o-matic."
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:361
+#: src/tools/dcpomatic_playlist.cc:423
 msgid "Question|N"
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:361
+#: src/tools/dcpomatic_playlist.cc:423
 msgid "Question|Y"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1844
+#: src/tools/dcpomatic.cc:1884
 msgid "Recreate KDM decryption chain"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1814 src/tools/dcpomatic.cc:1828
+#: src/tools/dcpomatic.cc:1843 src/tools/dcpomatic.cc:1858
+#: src/tools/dcpomatic.cc:1870
 msgid "Recreate signing certificates"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:171 src/tools/dcpomatic_playlist.cc:295
+#: 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 ""
+
+#: src/tools/dcpomatic_kdm.cc:210 src/tools/dcpomatic_playlist.cc:347
 msgid "Remove"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1385 src/tools/dcpomatic_kdm.cc:263
-#: src/tools/dcpomatic_player.cc:580
+#: src/tools/dcpomatic.cc:1399 src/tools/dcpomatic_kdm.cc:304
+#: src/tools/dcpomatic_player.cc:603
 msgid "Report a problem..."
 msgstr "Comunicar um problema..."
 
-#: src/tools/dcpomatic.cc:733 src/tools/dcpomatic.cc:1377
+#: src/tools/dcpomatic.cc:761 src/tools/dcpomatic.cc:1389
 msgid "Restore default preferences"
 msgstr "Restaurar predefinições"
 
-#: src/tools/dcpomatic_batch.cc:140
-msgid "Resume"
-msgstr ""
-
-#: src/tools/dcpomatic.cc:1358
+#: src/tools/dcpomatic.cc:1370
 #, fuzzy
 msgid "S&how DCP in Explorer"
 msgstr "M&ostrar DCP"
 
-#: src/tools/dcpomatic.cc:1360
+#: src/tools/dcpomatic.cc:1372
 #, fuzzy
 msgid "S&how DCP in Files"
 msgstr "M&ostrar DCP"
 
-#: src/tools/dcpomatic.cc:1356
+#: src/tools/dcpomatic.cc:1368
 #, fuzzy
 msgid "S&how DCP in Finder"
 msgstr "M&ostrar DCP"
 
-#: src/tools/dcpomatic.cc:1310
+#: src/tools/dcpomatic_playlist.cc:316
+#, fuzzy
+msgid "Save"
+msgstr "&Enregistrer"
+
+#: src/tools/dcpomatic.cc:1312
 msgid "Save as &template..."
 msgstr ""
 
@@ -667,7 +858,7 @@ msgstr ""
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Guardar as modificação ao filme \"%s\" antes de fechar?"
 
-#: src/tools/dcpomatic.cc:185
+#: src/tools/dcpomatic.cc:176
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "Guardar as modificação ao filme \"%s\" antes de fechar?"
@@ -676,64 +867,87 @@ msgstr "Guardar as modificação ao filme \"%s\" antes de fechar?"
 msgid "Save film and close"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:184
 msgid "Save film and duplicate"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:145
+#: src/tools/dcpomatic_player.cc:714
+msgid "Save frame to file"
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:154
 msgid "Screens"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:598
+#: src/tools/dcpomatic_editor.cc:365 src/tools/dcpomatic_player.cc:621
 #, fuzzy
 msgid "Select DCP to open"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_player.cc:623
+#: src/tools/dcpomatic_player.cc:649
 #, fuzzy
 msgid "Select DCP to open as OV"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:585
+#: src/tools/dcpomatic_kdm.cc:744
 #, fuzzy
 msgid "Select DKDM File"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:541
 #, fuzzy
 msgid "Select DKDM file"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_player.cc:665
+#: src/tools/dcpomatic_player.cc:690
 #, fuzzy
 msgid "Select KDM"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic.cc:1333
+#: src/tools/dcpomatic.cc:1339
 msgid "Select all\tShift-Ctrl-A"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:570 src/tools/dcpomatic_batch.cc:295
+#: src/tools/dcpomatic_batch.cc:329 src/tools/dcpomatic.cc:595
 msgid "Select film to open"
 msgstr "Seleccionar filme a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:383
+#: src/tools/dcpomatic_kdm.cc:445
 msgid "Send KDM emails"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1374
+#: src/tools/dcpomatic.cc:1386
 msgid "Send translations..."
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:562
+#: src/tools/dcpomatic_player.cc:585
 msgid "Set decode resolution to match display"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1375 src/tools/dcpomatic_player.cc:572
+#: src/tools/dcpomatic_kdm.cc:423
+msgid ""
+"Some KDMs would have validity periods which are completely outside the "
+"recipient certificate periods.  Such KDMs are very unlikely to work, so will "
+"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 ""
 
-#: src/tools/dcpomatic.cc:756
+#: src/tools/dcpomatic.cc:793
 #, fuzzy, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f GB, and "
@@ -746,7 +960,7 @@ msgstr ""
 "do espaço se o sistema de ficheiros suportasse enlaces físicos, mas não "
 "suporta. Pretende continuar?"
 
-#: src/tools/dcpomatic.cc:754
+#: src/tools/dcpomatic.cc:791
 #, fuzzy, c-format
 msgid ""
 "The DCP for this film will take up about %.1f GB, and the disk that you are "
@@ -755,11 +969,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:1479 src/tools/dcpomatic_player.cc:900
+#: src/tools/dcpomatic.cc:1492 src/tools/dcpomatic_player.cc:965
 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:207
+#: src/tools/dcpomatic_batch.cc:244
 #, fuzzy, c-format
 msgid ""
 "The DCPs for this film and the films already in the queue will take up about "
@@ -769,11 +983,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:299
+#: src/tools/dcpomatic_player.cc:345
 msgid "The KDM does not allow playback of this content at this time."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1845
+#: src/tools/dcpomatic_kdm.cc:461
+msgid ""
+"The KDM end period is after (or close to) the end of the signing "
+"certficates' 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:459
+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:965
+msgid "The certificate chain for signing is invalid"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1885
 msgid ""
 "The certificate chain that DCP-o-matic uses for decrypting KDMs is "
 "inconsistent and\n"
@@ -784,7 +1015,7 @@ msgid ""
 "configuration before continuing."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1815
+#: src/tools/dcpomatic.cc:1844
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
 "contains a small error\n"
@@ -793,7 +1024,16 @@ msgid ""
 "the certificate chain for signing DCPs and KDMs?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1829
+#: src/tools/dcpomatic.cc:1859
+msgid ""
+"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a "
+"validity period\n"
+"that is too long.  This will cause problems playing back DCPs on some "
+"systems.\n"
+"Do you want to re-create the certificate chain for signing DCPs and KDMs?"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1871
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs is "
 "inconsistent and\n"
@@ -802,23 +1042,41 @@ msgid ""
 "the certificate chain for signing DCPs and KDMs?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1790 src/tools/dcpomatic_batch.cc:489
-#: src/tools/dcpomatic_kdm.cc:735 src/tools/dcpomatic_server.cc:353
-#: src/tools/dcpomatic_player.cc:1266
+#: 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: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."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1481 src/tools/dcpomatic_player.cc:902
+#: src/tools/dcpomatic.cc:1494 src/tools/dcpomatic_player.cc:967
 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:1157 src/tools/dcpomatic_batch.cc:237
+#: 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 "Há trabalhos não finalizados; tem a certeza que pretende sair?"
 
-#: src/tools/dcpomatic.cc:444
+#: src/tools/dcpomatic.cc:480
 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."
@@ -827,49 +1085,59 @@ msgstr ""
 "carregar correctamente nesta versão. Por favor verifique as definições do "
 "filme cuidadosamente."
 
-#: src/tools/dcpomatic_player.cc:379
+#: src/tools/dcpomatic_player.cc:401
 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:571
+#: src/tools/dcpomatic_player.cc:594
 msgid "Timing..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:552
+#: src/tools/dcpomatic_disk.cc:115
+#, fuzzy
+msgid "Tools"
+msgstr "&Ferramentas"
+
+#: src/tools/dcpomatic.cc:580
 #, c-format
 msgid "Try removing the %s characters from your folder name."
 msgstr ""
 
-#: src/tools/dcpomatic_playlist.cc:276
+#: src/tools/dcpomatic_playlist.cc:328
 msgid "Type"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1158 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic_batch.cc:275 src/tools/dcpomatic.cc:1154
+#: src/tools/dcpomatic_disk.cc:255
 msgid "Unfinished jobs"
 msgstr "Trabalhos não finalizados"
 
-#: src/tools/dcpomatic_playlist.cc:292
+#: src/tools/dcpomatic_disk.cc:114
+msgid "Uninstall..."
+msgstr ""
+
+#: src/tools/dcpomatic_playlist.cc:344
 msgid "Up"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:568
+#: src/tools/dcpomatic_player.cc:591
 msgid "Verify DCP..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1367
+#: src/tools/dcpomatic.cc:1379
 msgid "Video waveform..."
 msgstr "Forma de onda de vídeo..."
 
-#: src/tools/dcpomatic_kdm.cc:560
+#: src/tools/dcpomatic_kdm.cc:719
 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:928
+#: src/tools/dcpomatic.cc:950
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -881,17 +1149,17 @@ msgid ""
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:776
+#: src/tools/dcpomatic.cc:811
 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 "
 "film and the metadata files within the DCP.\n"
 "\n"
-"You should ensure that these files are <span weight=\"bold\" size=\"larger"
-"\">BACKED UP</span> if you want to make KDMs for this film."
+"You should ensure that these files are <span weight=\"bold\" "
+"size=\"larger\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1628
+#: src/tools/dcpomatic.cc:1657
 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 "
@@ -899,8 +1167,21 @@ msgid ""
 "matic."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:579 src/tools/dcpomatic_batch.cc:304
-#: src/tools/dcpomatic_player.cc:604 src/tools/dcpomatic_player.cc:632
+#: 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."
@@ -908,6 +1189,28 @@ msgstr ""
 "Não seleccionou uma pasta. Certifique-se que selecciona uma pasta antes de "
 "clicar Abrir."
 
+#: src/tools/dcpomatic.cc:1119
+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 ""
+#~ "Não foi possível mostrar o DCP (não foi possível executar o konqueror)"
+
+#~ msgid "Could not show DCP"
+#~ msgstr "Não foi possível mostrar o DCP"
+
 #~ msgid "&Content"
 #~ msgstr "&Conteúdo"
 
@@ -925,16 +1228,6 @@ msgstr ""
 #~ 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..."
 
@@ -953,9 +1246,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"