X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fpo%2Fes_ES.po;h=146a90d2b00cc79ef7a233fbc1dd126e1ba38bbd;hb=4f0be04b28c3a4cfec9513db23f92a175d207dfb;hp=0dd855b8bbdd282a652c6787558b943f6d72e441;hpb=969546a2b566ff6918a7f1fa960438d2b5beed1a;p=dcpomatic.git

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 0dd855b8b..146a90d2b 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 09:40+0100\n"
+"POT-Creation-Date: 2023-03-29 01:56+0200\n"
 "PO-Revision-Date: 2021-10-17 22:46-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,144 +17,163 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.0\n"
 
-#: src/tools/dcpomatic_kdm.cc:388
+#: src/tools/dcpomatic_combiner.cc:171
+#, fuzzy
+msgid "%1 already exists as a file, so you cannot use it for a DCP."
+msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
+
+#: src/tools/dcpomatic_kdm.cc:451
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d KDM guardada en %s"
 
-#: src/tools/dcpomatic_kdm.cc:388
+#: src/tools/dcpomatic_kdm.cc:451
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d KDMs guardadas en %s"
 
-#: src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic_batch.cc:83
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Añadir película...\tCtrl-A"
 
-#: src/tools/dcpomatic_player.cc:490
+#: src/tools/dcpomatic_player.cc:547
 msgid "&Add OV..."
 msgstr "&Añadir DCP base  (OV)..."
 
-#: src/tools/dcpomatic_player.cc:496
+#: src/tools/dcpomatic_player.cc:555
 msgid "&Close"
 msgstr "&Cerrar"
 
-#: src/tools/dcpomatic.cc:1308
+#: src/tools/dcpomatic.cc:1320
 msgid "&Close\tCtrl-W"
 msgstr "&Cerrar\tCtrl-W"
 
-#: src/tools/dcpomatic.cc:1388 src/tools/dcpomatic_batch.cc:99
-#: src/tools/dcpomatic_kdm.cc:266 src/tools/dcpomatic_player.cc:548
-#: 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:1315 src/tools/dcpomatic_batch.cc:79
-#: src/tools/dcpomatic_kdm.cc:244 src/tools/dcpomatic_player.cc:500
-#: 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 "&Salir"
 
-#: src/tools/dcpomatic.cc:1387 src/tools/dcpomatic_batch.cc:97
-#: src/tools/dcpomatic_kdm.cc:264 src/tools/dcpomatic_player.cc:546
-#: 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 "&Archivo"
 
-#: src/tools/dcpomatic.cc:1392 src/tools/dcpomatic_batch.cc:102
-#: src/tools/dcpomatic_kdm.cc:268 src/tools/dcpomatic_player.cc:552
-#: 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 "&Ayuda"
 
-#: src/tools/dcpomatic.cc:1389
+#: src/tools/dcpomatic.cc:1403
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:1339
+#: src/tools/dcpomatic.cc:1351
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crear DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1295 src/tools/dcpomatic_player.cc:489
+#: 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:1330 src/tools/dcpomatic.cc:1334
-#: src/tools/dcpomatic_batch.cc:85 src/tools/dcpomatic_batch.cc:88
-#: src/tools/dcpomatic_kdm.cc:250 src/tools/dcpomatic_kdm.cc:253
-#: src/tools/dcpomatic_player.cc:506 src/tools/dcpomatic_player.cc:509
-#: 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 "&Preferencias...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:1317 src/tools/dcpomatic_batch.cc:81
-#: src/tools/dcpomatic_kdm.cc:246 src/tools/dcpomatic_player.cc:502
-#: 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 "&Salir"
 
-#: src/tools/dcpomatic.cc:1298
+#: 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 "Exportar…\tCtrl-E"
+
+#: src/tools/dcpomatic.cc:1365
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:1391 src/tools/dcpomatic_batch.cc:101
-#: src/tools/dcpomatic_player.cc:551
+#: src/tools/dcpomatic_batch.cc:107 src/tools/dcpomatic.cc:1405
+#: src/tools/dcpomatic_player.cc:610
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: src/tools/dcpomatic.cc:1390 src/tools/dcpomatic_player.cc:550
+#: src/tools/dcpomatic.cc:1404 src/tools/dcpomatic_player.cc:609
 msgid "&View"
 msgstr "&Ver"
 
-#: src/tools/dcpomatic_playlist.cc:262
+#: src/tools/dcpomatic_playlist.cc:312
 msgid "<b>Playlist:</b>"
 msgstr "<b>Lista:</b>"
 
-#: src/tools/dcpomatic_playlist.cc:108
+#: src/tools/dcpomatic_playlist.cc:123
 msgid "<b>Playlists</b>"
 msgstr "<b>Listas:</b>"
 
-#: src/tools/dcpomatic.cc:1383 src/tools/dcpomatic_batch.cc:95
-#: src/tools/dcpomatic_kdm.cc:260 src/tools/dcpomatic_player.cc:542
-#: 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 "Acerca de"
 
-#: src/tools/dcpomatic.cc:1381 src/tools/dcpomatic_kdm.cc:258
-#: src/tools/dcpomatic_player.cc:540 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 "Acerca de DVD-o-matic"
 
-#: src/tools/dcpomatic_playlist.cc:294
+#: src/tools/dcpomatic_playlist.cc:346
 msgid "Add"
 msgstr "Añadir"
 
-#: src/tools/dcpomatic_player.cc:491
+#: src/tools/dcpomatic_player.cc:548
 msgid "Add &KDM..."
 msgstr "Añadir &KDM..."
 
-#: src/tools/dcpomatic_batch.cc:134
-msgid "Add Film..."
-msgstr "Añadir película..."
-
-#: src/tools/dcpomatic_playlist.cc:63
+#: src/tools/dcpomatic_playlist.cc:76
 msgid "Add content"
 msgstr "Añadir contenido"
 
-#: src/tools/dcpomatic_kdm.cc:169
+#: src/tools/dcpomatic_batch.cc:172
+#, fuzzy
+msgid "Add film"
+msgstr "Añadir película..."
+
+#: src/tools/dcpomatic_batch.cc:172
+msgid "Add film for conversion"
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:208
 msgid "Add folder..."
 msgstr "Añadir carpeta..."
 
-#: src/tools/dcpomatic_kdm.cc:167
+#: src/tools/dcpomatic_kdm.cc:206
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/tools/dcpomatic.cc:1724 src/tools/dcpomatic_kdm.cc:701
-#: src/tools/dcpomatic_player.cc:1191 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"
@@ -163,7 +182,7 @@ msgstr ""
 "Ha ocurrido una excepción: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1733
+#: src/tools/dcpomatic.cc:1766
 #, c-format
 msgid ""
 "An exception occurred: %s (%s) (%s)\n"
@@ -172,8 +191,10 @@ msgstr ""
 "Ha ocurrido una excepción: %s (%s) (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1743 src/tools/dcpomatic_kdm.cc:710
-#: src/tools/dcpomatic_player.cc:1200 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"
@@ -182,18 +203,25 @@ msgstr ""
 "Ha ocurrido un error desconocido: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:352
+#: src/tools/dcpomatic_server.cc:354
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Un error desconocido ha ocurrido en el servidor de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:962 src/tools/dcpomatic.cc:1748
-#: src/tools/dcpomatic_kdm.cc:399 src/tools/dcpomatic_kdm.cc:715
-#: src/tools/dcpomatic_kdm.cc:724 src/tools/dcpomatic_player.cc:1205
-#: 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 "Ha ocurrido un error desconocido."
 
-#: src/tools/dcpomatic.cc:737
+#: 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."
@@ -201,44 +229,65 @@ msgstr ""
 "¿Estás seguro de que quieres restaurar los valores por defecto? Esta acción "
 "no se puede deshacer."
 
-#: src/tools/dcpomatic.cc:804
+#: src/tools/dcpomatic.cc:834
 #, c-format
 msgid "Bad setting for %s."
 msgstr "Configuración errónea para %s."
 
-#: src/tools/dcpomatic_player.cc:518 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 "CPL"
 
-#: src/tools/dcpomatic.cc:958 src/tools/dcpomatic_kdm.cc:395
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_kdm.cc:465
 msgid "CPL's content is not encrypted."
 msgstr "El contenido del CPL no está encriptado."
 
-#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:534
+#: src/tools/dcpomatic.cc:1385 src/tools/dcpomatic_player.cc:593
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
-#: 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
 msgid "Close DCP-o-matic"
 msgstr "Cerrar DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:155
+#: src/tools/dcpomatic.cc:156
 msgid "Close without saving film"
 msgstr "Cerrar sin guardar la película"
 
-#: src/tools/dcpomatic.cc:1366 src/tools/dcpomatic_player.cc:524
+#: src/tools/dcpomatic.cc:1378 src/tools/dcpomatic_player.cc:583
 msgid "Closed captions..."
 msgstr "Subtítulos cerrados…"
 
-#: src/tools/dcpomatic.cc:1322
+#: 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 "Copiar configuración\tCtrl-C"
 
-#: src/tools/dcpomatic.cc:554 src/tools/dcpomatic.cc:563
+#: src/tools/dcpomatic.cc:577 src/tools/dcpomatic.cc:586
 msgid "Could not create folder to store film."
 msgstr "No se puedo crear la carpeta para guardar la película."
 
-#: src/tools/dcpomatic_kdm.cc:474
+#: src/tools/dcpomatic_kdm.cc:577
 msgid ""
 "Could not decrypt the DKDM.  Perhaps it was not created with the correct "
 "certificate."
@@ -246,20 +295,31 @@ msgstr ""
 "No se pudo descifrar el DKDM.  Tal vez no fué creado con el certificado "
 "correcto."
 
-#: src/tools/dcpomatic.cc:897
+#: src/tools/dcpomatic.cc:647 src/tools/dcpomatic.cc:664
+#, fuzzy
+msgid "Could not duplicate project."
+msgstr "No se puedo encontrar el convertidor por lotes."
+
+#: src/tools/dcpomatic.cc:915
 msgid "Could not find batch converter."
 msgstr "No se puedo encontrar el convertidor por lotes."
 
-#: src/tools/dcpomatic.cc:912
+#: src/tools/dcpomatic.cc:930
 #, fuzzy
 msgid "Could not find player."
 msgstr "No se puedo encontrar el convertidor por lotes."
 
-#: src/tools/dcpomatic_player.cc:661 src/tools/dcpomatic_player.cc:1130
+#: 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
 msgid "Could not load DCP %1."
 msgstr "No se pudo cargar el DCP %1."
 
-#: src/tools/dcpomatic_player.cc:479
+#: src/tools/dcpomatic_player.cc:536
 #, fuzzy, c-format
 msgid ""
 "Could not load DCP.\n"
@@ -267,39 +327,39 @@ msgid ""
 "%s."
 msgstr "No se pudo cargar el DCP %1."
 
-#: src/tools/dcpomatic_player.cc:643
+#: src/tools/dcpomatic_player.cc:704
 msgid "Could not load KDM."
 msgstr "No se pudo cargar la KDM."
 
-#: src/tools/dcpomatic_player.cc:341 src/tools/dcpomatic_player.cc:348
-#: src/tools/dcpomatic_player.cc:350
+#: src/tools/dcpomatic_player.cc:399 src/tools/dcpomatic_player.cc:406
+#: src/tools/dcpomatic_player.cc:408
 #, c-format
 msgid "Could not load a DCP from %s"
 msgstr ""
 
-#: src/tools/dcpomatic_batch.cc:457
+#: src/tools/dcpomatic_batch.cc:491
 msgid "Could not load film %1"
 msgstr "No se pudo cargar la película %1"
 
-#: src/tools/dcpomatic.cc:1641
+#: src/tools/dcpomatic.cc:1670
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %1 (%2)"
 
-#: src/tools/dcpomatic.cc:806
+#: src/tools/dcpomatic.cc:836
 msgid "Could not make DCP."
 msgstr "No se pudo crear el DCP."
 
-#: src/tools/dcpomatic.cc:471 src/tools/dcpomatic.cc:476
-#: src/tools/dcpomatic_batch.cc:218
+#: 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 "No se pudo abrir la película en %s"
 
-#: src/tools/dcpomatic.cc:466
+#: src/tools/dcpomatic.cc:497
 msgid "Could not open this folder as a DCP-o-matic project."
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:479
+#: src/tools/dcpomatic_kdm.cc:582
 #, fuzzy
 msgid ""
 "Could not read file as a KDM.  It is much too large.  Make sure you are "
@@ -308,7 +368,7 @@ msgstr ""
 "No se pudo leer el archivo como una KDM.  Tal vez está mal formateado, o no "
 "es un KDM en absoluto."
 
-#: src/tools/dcpomatic_kdm.cc:467
+#: 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."
@@ -316,27 +376,37 @@ msgstr ""
 "No se pudo leer el archivo como una KDM.  Tal vez está mal formateado, o no "
 "es un KDM en absoluto."
 
-#: src/tools/dcpomatic.cc:1112
+#: src/tools/dcpomatic.cc:620
+#, fuzzy
+msgid "Could not save project."
+msgstr "No se pudo crear el DCP."
+
+#: src/tools/dcpomatic.cc:631
+#, fuzzy
+msgid "Could not save template."
+msgstr "No se puedo encontrar el convertidor por lotes."
+
+#: src/tools/dcpomatic.cc:1126
 #, fuzzy
 msgid "Could not send translations"
 msgstr "No se pudo ejecutar nautilus"
 
-#: src/tools/dcpomatic.cc:1030
+#: src/tools/dcpomatic.cc:1041
 msgid "Could not show DCP."
 msgstr "No se pudo mostrar el DCP."
 
-#: src/tools/dcpomatic.cc:895
+#: 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:910
+#: 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."
@@ -344,8 +414,8 @@ msgstr ""
 "No se pudo escribir en el fichero de cines en %s.  Los cambios no se han "
 "salvado."
 
-#: src/tools/dcpomatic.cc:1417 src/tools/dcpomatic_batch.cc:341
-#: src/tools/dcpomatic_player.cc:882 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."
@@ -353,370 +423,522 @@ msgstr ""
 "No se pudo escribir en el archivo de configuración %s.  Los cambios no se "
 "han salvado."
 
-#: src/tools/dcpomatic_player.cc:890
+#: src/tools/dcpomatic_player.cc:991
 #, fuzzy
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""
 "No se pudo escribir en el archivo de configuración %s.  Los cambios no se "
 "han salvado."
 
-#: src/tools/dcpomatic_kdm.cc:186
+#: src/tools/dcpomatic_kdm.cc:225
 msgid "Create KDMs"
 msgstr "Crear KDMs"
 
-#: src/tools/dcpomatic.cc:528 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
+#, fuzzy
+msgid "DCP"
+msgstr "CPL"
+
+#: 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 "Convertidor por lotes DCP-o-matic"
 
-#: src/tools/dcpomatic_server.cc:149
+#: 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 "Reproductor 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 "Generador de KDM DCP-o-matic"
+
+#: src/tools/dcpomatic_editor.cc:288 src/tools/dcpomatic_editor.cc:437
+#, fuzzy
+msgid "DCP-o-matic Editor"
+msgstr "Reproductor DCP-o-matic"
+
+#: src/tools/dcpomatic_editor.cc:488
+#, fuzzy
+msgid "DCP-o-matic Editor could not start."
+msgstr "DCP-o-matic no pudo iniciarse"
+
+#: src/tools/dcpomatic_server.cc:151
 msgid "DCP-o-matic Encode Server"
 msgstr "Servidor de codificación DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:635 src/tools/dcpomatic_kdm.cc:669
+#: src/tools/dcpomatic_kdm.cc:811 src/tools/dcpomatic_kdm.cc:845
 msgid "DCP-o-matic KDM Creator"
 msgstr "Generador de KDM DCP-o-matic"
 
-#: src/tools/dcpomatic_player.cc:142 src/tools/dcpomatic_player.cc:333
-#: src/tools/dcpomatic_player.cc:608 src/tools/dcpomatic_player.cc:794
-#: src/tools/dcpomatic_player.cc:1071
+#: 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
 msgid "DCP-o-matic Player"
 msgstr "Reproductor DCP-o-matic"
 
-#: src/tools/dcpomatic_player.cc:1153
+#: src/tools/dcpomatic_player.cc:1256
 msgid "DCP-o-matic Player could not start."
 msgstr "No puedo iniciarse el reproductor DCP-o-matic."
 
-#: 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 "Reproductor DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:686 src/tools/dcpomatic_playlist.cc:643
+#: src/tools/dcpomatic_kdm.cc:862 src/tools/dcpomatic_playlist.cc:691
 msgid "DCP-o-matic could not start"
 msgstr "DCP-o-matic no pudo iniciarse"
 
-#: 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 "DKDM"
 
-#: src/tools/dcpomatic_player.cc:527
+#: src/tools/dcpomatic_player.cc:586
 msgid "Decode at full resolution"
 msgstr "Decodificar en resolución completa"
 
-#: src/tools/dcpomatic_player.cc:528
+#: src/tools/dcpomatic_player.cc:587
 msgid "Decode at half resolution"
 msgstr "Descodificar en media resolución"
 
-#: src/tools/dcpomatic_player.cc:529
+#: src/tools/dcpomatic_player.cc:588
 msgid "Decode at quarter resolution"
 msgstr "Decodificar a un cuarto de la resolución"
 
-#: 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:791
+#: 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 "¿Desea sobreescribir el DCP existente  %s?"
 
-#: src/tools/dcpomatic.cc:155
+#: src/tools/dcpomatic.cc:156
 msgid "Don't close"
 msgstr "No cerrar"
 
-#: src/tools/dcpomatic.cc:192
+#: src/tools/dcpomatic.cc:184
 msgid "Don't duplicate"
 msgstr "No duplicar"
 
-#: src/tools/dcpomatic_playlist.cc:293
+#: src/tools/dcpomatic_playlist.cc:345
 msgid "Down"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:521
+#: 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:614 src/tools/dcpomatic.cc:629
+#: src/tools/dcpomatic.cc:638 src/tools/dcpomatic.cc:654
 msgid "Duplicate Film"
 msgstr "Duplicar película"
 
-#: src/tools/dcpomatic.cc:1302
+#: src/tools/dcpomatic.cc:1314
 msgid "Duplicate and open..."
 msgstr "Duplicar y abrir..."
 
-#: src/tools/dcpomatic.cc:192
+#: src/tools/dcpomatic.cc:184
 msgid "Duplicate without saving film"
 msgstr "Duplicar sin guardar la película"
 
-#: src/tools/dcpomatic.cc:1301
+#: src/tools/dcpomatic.cc:1313
 msgid "Duplicate..."
 msgstr "Duplicar..."
 
-#: 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 codificación..."
 
-#: 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 las preferencias por defecto"
+
+#: src/tools/dcpomatic.cc:1363
 #, fuzzy
 msgid "Export subtitles..."
 msgstr "Exportar…\tCtrl-E"
 
-#: src/tools/dcpomatic.cc:1350
+#: src/tools/dcpomatic.cc:1362
 #, fuzzy
 msgid "Export video file...\tCtrl-E"
 msgstr "Exportar…\tCtrl-E"
 
-#: src/tools/dcpomatic_kdm.cc:173
+#: src/tools/dcpomatic_kdm.cc:212
 #, fuzzy
 msgid "Export..."
 msgstr "Exportar…\tCtrl-E"
 
-#: src/tools/dcpomatic.cc:987 src/tools/dcpomatic_kdm.cc:275
+#: src/tools/dcpomatic.cc:1001 src/tools/dcpomatic_kdm.cc:323
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "El fichero %s ya existe. ¿Quiere sobreescribirlo?"
 
-#. / 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:150 src/tools/dcpomatic.cc:187
+#. 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 "Película cambiada"
 
-#: src/tools/dcpomatic_server.cc:160
+#: src/tools/dcpomatic_kdm.cc:318
+#, fuzzy, c-format
+msgid "Folder %s already exists.  Do you want to overwrite it?"
+msgstr "El fichero %s ya existe. ¿Quiere sobreescribirlo?"
+
+#: 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 "Imágenes por segundo"
 
-#: src/tools/dcpomatic_player.cc:520
+#: src/tools/dcpomatic_player.cc:579
 msgid "Full screen\tF11"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1370
+#: src/tools/dcpomatic.cc:1382
 msgid "Hints..."
 msgstr "Pistas…"
 
-#: src/tools/dcpomatic.cc:467
+#: 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 "Tiempo"
 
-#: src/tools/dcpomatic_playlist.cc:116
+#: src/tools/dcpomatic_playlist.cc:131
 msgid "Length"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:333 src/tools/dcpomatic_player.cc:608
+#: src/tools/dcpomatic_player.cc:388 src/tools/dcpomatic_player.cc:670
 #, fuzzy
 msgid "Loading content"
 msgstr "Cargando DCP"
 
-#: src/tools/dcpomatic.cc:1346
+#: src/tools/dcpomatic.cc:1358
 #, fuzzy
 msgid "Make &DKDMs...\tCtrl-D"
 msgstr "Crear &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:1344
+#: src/tools/dcpomatic.cc:1356
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Crear &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:1341
+#: src/tools/dcpomatic.cc:1353
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Crear DCP in &batch converter\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1347
+#: src/tools/dcpomatic.cc:1359
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Producir un DKDM para DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1372
+#: src/tools/dcpomatic.cc:1384
 msgid "Manage templates..."
 msgstr "Gestionar plantillas…"
 
-#: 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:538
+#: src/tools/dcpomatic.cc:558
 msgid "New Film"
 msgstr "Nueva película"
 
-#: src/tools/dcpomatic_playlist.cc:209
+#: src/tools/dcpomatic_playlist.cc:246
 msgid "New Playlist"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1293
+#: src/tools/dcpomatic.cc:1305
 msgid "New...\tCtrl-N"
 msgstr "Nuevo...\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 "Salida"
 
-#: src/tools/dcpomatic.cc:1324
+#: src/tools/dcpomatic_combiner.cc:120
+msgid "Output DCP folder"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1336
 msgid "Paste settings...\tCtrl-V"
 msgstr "Pegar configuración…\tCtrl-V"
 
-#: 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_editor.cc:166
+msgid "Picture"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:559
+#: 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 "Quitar"
 
-#: src/tools/dcpomatic.cc:1385 src/tools/dcpomatic_kdm.cc:262
-#: src/tools/dcpomatic_player.cc:544
+#: src/tools/dcpomatic.cc:1399 src/tools/dcpomatic_kdm.cc:304
+#: src/tools/dcpomatic_player.cc:603
 msgid "Report a problem..."
 msgstr "Comunicar un problema…"
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:1377
+#: src/tools/dcpomatic.cc:761 src/tools/dcpomatic.cc:1389
 msgid "Restore default preferences"
 msgstr "Restaurar las preferencias por defecto"
 
-#: 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 "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:1360
+#: src/tools/dcpomatic.cc:1372
 #, fuzzy
 msgid "S&how DCP in Files"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:1356
+#: src/tools/dcpomatic.cc:1368
 #, fuzzy
 msgid "S&how DCP in Finder"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:1300
+#: src/tools/dcpomatic_playlist.cc:316
+#, fuzzy
+msgid "Save"
+msgstr "&Guardar"
+
+#: src/tools/dcpomatic.cc:1312
 msgid "Save as &template..."
 msgstr "Guardar como &plantilla…"
 
-#: src/tools/dcpomatic.cc:147
+#: src/tools/dcpomatic.cc:148
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Guardar cambios de la película \"%s\" antes de cerrar?"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:176
 #, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "¿Guardar los cambios de la película \"%s\" antes de duplicar?"
 
-#: src/tools/dcpomatic.cc:155
+#: src/tools/dcpomatic.cc:156
 msgid "Save film and close"
 msgstr "Guardar la película y cerrar"
 
-#: src/tools/dcpomatic.cc:192
+#: src/tools/dcpomatic.cc:184
 msgid "Save film and duplicate"
 msgstr "Guardar la película y duplicar"
 
-#: 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 "Pantallas"
 
-#: src/tools/dcpomatic_player.cc:562
+#: src/tools/dcpomatic_editor.cc:365 src/tools/dcpomatic_player.cc:621
 msgid "Select DCP to open"
 msgstr "Selecciona el DCP a abrir"
 
-#: src/tools/dcpomatic_player.cc:587
+#: src/tools/dcpomatic_player.cc:649
 msgid "Select DCP to open as OV"
 msgstr "Selecciona el DCP a abrir como base (OV)"
 
-#: src/tools/dcpomatic_kdm.cc:584
+#: src/tools/dcpomatic_kdm.cc:744
 #, fuzzy
 msgid "Select DKDM File"
 msgstr "Selecciona el fichero DKDM"
 
-#: src/tools/dcpomatic_kdm.cc:447
+#: src/tools/dcpomatic_kdm.cc:541
 msgid "Select DKDM file"
 msgstr "Selecciona el fichero DKDM"
 
-#: src/tools/dcpomatic_player.cc:629
+#: src/tools/dcpomatic_player.cc:690
 msgid "Select KDM"
 msgstr "Selecciona el KDM"
 
-#: src/tools/dcpomatic.cc:1327
+#: src/tools/dcpomatic.cc:1339
 msgid "Select all\tShift-Ctrl-A"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:295
+#: src/tools/dcpomatic_batch.cc:329 src/tools/dcpomatic.cc:595
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic_kdm.cc:382
+#: src/tools/dcpomatic_kdm.cc:445
 msgid "Send KDM emails"
 msgstr "Enviar los KDM por email"
 
-#: src/tools/dcpomatic.cc:1374
+#: src/tools/dcpomatic.cc:1386
 msgid "Send translations..."
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:526
+#: src/tools/dcpomatic_player.cc:585
 msgid "Set decode resolution to match display"
 msgstr "Adaptar la resolución de descodificación a la pantalla"
 
-#: src/tools/dcpomatic.cc:1375 src/tools/dcpomatic_player.cc:536
+#: 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:761
+#: src/tools/dcpomatic.cc:793
 #, fuzzy, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f GB, and "
@@ -729,7 +951,7 @@ msgstr ""
 "disponibles. Necesitarías la mitad de espacio si el sistema de ficheros "
 "soportara enlaces duros, pero no es así. Quieres continuar de todas formas?"
 
-#: src/tools/dcpomatic.cc:759
+#: 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 "
@@ -739,11 +961,11 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:1479 src/tools/dcpomatic_player.cc:864
+#: src/tools/dcpomatic.cc:1492 src/tools/dcpomatic_player.cc:965
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
-#: 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 "
@@ -754,11 +976,28 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic_player.cc:289
+#: 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"
@@ -769,7 +1008,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"
@@ -778,7 +1017,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"
@@ -787,9 +1035,25 @@ 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:734 src/tools/dcpomatic_server.cc:364
-#: src/tools/dcpomatic_player.cc:1229
+#: 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 ""
+"El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
+
+#: 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."
@@ -797,15 +1061,16 @@ msgstr ""
 "La configuración existente no pudo cargarse. Los valores por defecto serán "
 "utilizados. Debería ser rápido."
 
-#: src/tools/dcpomatic.cc:1481 src/tools/dcpomatic_player.cc:866
+#: src/tools/dcpomatic.cc:1494 src/tools/dcpomatic_player.cc:967
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:1144 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 "Hay trabajos sin finalizar; ¿estás seguro de querer cerrar?"
 
-#: src/tools/dcpomatic.cc:449
+#: 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."
@@ -814,50 +1079,60 @@ msgstr ""
 "cargue correctamente en esta versión. Por favor revisa cuidadosamente las "
 "opciones."
 
-#: src/tools/dcpomatic_player.cc:343
+#: 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:535
+#: src/tools/dcpomatic_player.cc:594
 #, fuzzy
 msgid "Timing..."
 msgstr "Tiempo"
 
-#: src/tools/dcpomatic.cc:557
+#: src/tools/dcpomatic_disk.cc:115
+#, fuzzy
+msgid "Tools"
+msgstr "&Herramientas"
+
+#: 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:1145 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 "Trabajos sin finalizar"
 
-#: 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:532
+#: 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 de onda del vídeo…"
 
-#: src/tools/dcpomatic_kdm.cc:559
+#: 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:933
+#: src/tools/dcpomatic.cc:950
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -878,14 +1153,14 @@ msgstr ""
 "que desde if se perdió sus DKDMs (y protegen a los DCPs) se convertirá en "
 "inútil."
 
-#: src/tools/dcpomatic.cc:781
+#: 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 ""
 "Está creando un DCP encintado. No será posible hacer KDMs para este DCP "
 "salvo que tenga copias del fichero <tt>metadata.xml</tt> del proyecto y los "
@@ -894,7 +1169,7 @@ msgstr ""
 "Debe asegurarse que existe una <span weight=\"bold\" size=\"larger\">COPIA "
 "DE SEGURIDAD</span> si quiere hacer KDMs para esta película."
 
-#: 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 "
@@ -902,8 +1177,21 @@ msgid ""
 "matic."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:304
-#: src/tools/dcpomatic_player.cc:568 src/tools/dcpomatic_player.cc:596
+#: 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."
@@ -911,12 +1199,20 @@ msgstr ""
 "No has seleccionado una carpeta. Asegúrate de seleccionar una antes de "
 "pinchar sobre Abrir."
 
-#: src/tools/dcpomatic.cc:1105
+#: 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 "Generador de KDM DCP-o-matic"
+
+#, fuzzy
+#~ msgid "DCP-o-matic Combine"
+#~ msgstr "DCP-o-matic"
+
 #~ msgid "Could not run konqueror"
 #~ msgstr "No se pudo ejecutar konqueror"
 
@@ -932,10 +1228,6 @@ msgstr ""
 #~ msgid "Scale to fit &width"
 #~ msgstr "Redimensionar ajustando &anchura"
 
-#, fuzzy
-#~ msgid "DCP"
-#~ msgstr "CPL"
-
 #, fuzzy
 #~ msgid "Select playlist file"
 #~ msgstr "Selecciona el fichero DKDM"
@@ -943,17 +1235,6 @@ msgstr ""
 #~ msgid "Could not load DCP"
 #~ msgstr "No se pudo cargar el DCP"
 
-#~ msgid "%1 already exists as a file, so you cannot use it for a new film."
-#~ msgstr ""
-#~ "%1 ya existe como fichero, no puedes usarlo para una nueva película."
-
-#~ msgid ""
-#~ "The directory %1 already exists and is not empty.  Are you sure you want "
-#~ "to use it?"
-#~ msgstr ""
-#~ "El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer "
-#~ "usarlo?"
-
 #~ msgid "&Properties..."
 #~ msgstr "&Propiedades..."
 
@@ -971,9 +1252,6 @@ msgstr ""
 #~ "Ha ocurrido una excepción desconocida. Por favor informe del problema al "
 #~ "creador de DCP-o-matic (carl@dcpomatic.com)"
 
-#~ msgid "&Save"
-#~ msgstr "&Guardar"
-
 #~ msgid ""
 #~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 #~ "Laursen"