pot/merge.

1 files changed, 62 insertions, 62 deletions

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 3e0b22ee7..34988648d 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: 2019-03-18 17:30+0000\n"
+"POT-Creation-Date: 2019-03-24 00:53+0000\n"
 "PO-Revision-Date: 2018-02-25 14:35-0600\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -43,82 +43,82 @@ msgstr "&Añadir DCP base  (OV)..."
 msgid "&Close"
 msgstr "&Cerrar"
 
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:1221
 #, fuzzy
 msgid "&Close\tCtrl-W"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1281
+#: src/tools/dcpomatic.cc:1283
 msgid "&Content"
 msgstr "&Contenido"
 
-#: src/tools/dcpomatic.cc:1280 src/tools/dcpomatic_batch.cc:91
+#: src/tools/dcpomatic.cc:1282 src/tools/dcpomatic_batch.cc:91
 #: src/tools/dcpomatic_kdm.cc:253 src/tools/dcpomatic_player.cc:509
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:1226 src/tools/dcpomatic_batch.cc:71
+#: src/tools/dcpomatic.cc:1228 src/tools/dcpomatic_batch.cc:71
 #: src/tools/dcpomatic_kdm.cc:231 src/tools/dcpomatic_player.cc:461
 msgid "&Exit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:1279 src/tools/dcpomatic_batch.cc:89
+#: src/tools/dcpomatic.cc:1281 src/tools/dcpomatic_batch.cc:89
 #: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_player.cc:507
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:1285 src/tools/dcpomatic_batch.cc:94
+#: src/tools/dcpomatic.cc:1287 src/tools/dcpomatic_batch.cc:94
 #: src/tools/dcpomatic_kdm.cc:255 src/tools/dcpomatic_player.cc:513
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:1282
+#: src/tools/dcpomatic.cc:1284
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:1246
+#: src/tools/dcpomatic.cc:1248
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crear DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1208 src/tools/dcpomatic_player.cc:450
+#: src/tools/dcpomatic.cc:1210 src/tools/dcpomatic_player.cc:450
 msgid "&Open...\tCtrl-O"
 msgstr "&Abrir...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:1236 src/tools/dcpomatic.cc:1238
+#: src/tools/dcpomatic.cc:1238 src/tools/dcpomatic.cc:1240
 #: src/tools/dcpomatic_batch.cc:77 src/tools/dcpomatic_batch.cc:80
 #: src/tools/dcpomatic_kdm.cc:237 src/tools/dcpomatic_kdm.cc:240
 #: src/tools/dcpomatic_player.cc:467 src/tools/dcpomatic_player.cc:470
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferencias...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:1228 src/tools/dcpomatic_batch.cc:73
+#: src/tools/dcpomatic.cc:1230 src/tools/dcpomatic_batch.cc:73
 #: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_player.cc:463
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:1210
+#: src/tools/dcpomatic.cc:1212
 msgid "&Save\tCtrl-S"
 msgstr "&Guardar\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1254
+#: src/tools/dcpomatic.cc:1256
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:1284 src/tools/dcpomatic_batch.cc:93
+#: src/tools/dcpomatic.cc:1286 src/tools/dcpomatic_batch.cc:93
 #: src/tools/dcpomatic_player.cc:512
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: src/tools/dcpomatic.cc:1283 src/tools/dcpomatic_player.cc:511
+#: src/tools/dcpomatic.cc:1285 src/tools/dcpomatic_player.cc:511
 msgid "&View"
 msgstr "&Ver"
 
-#: src/tools/dcpomatic.cc:1275 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic.cc:1277 src/tools/dcpomatic_batch.cc:87
 #: src/tools/dcpomatic_kdm.cc:247 src/tools/dcpomatic_player.cc:503
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:1273 src/tools/dcpomatic_kdm.cc:245
+#: src/tools/dcpomatic.cc:1275 src/tools/dcpomatic_kdm.cc:245
 #: src/tools/dcpomatic_player.cc:501
 msgid "About DCP-o-matic"
 msgstr "Acerca de DVD-o-matic"
@@ -145,7 +145,7 @@ msgstr "Añadir carpeta..."
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/tools/dcpomatic.cc:1589 src/tools/dcpomatic_kdm.cc:639
+#: src/tools/dcpomatic.cc:1591 src/tools/dcpomatic_kdm.cc:639
 #: src/tools/dcpomatic_player.cc:1093 src/tools/dcpomatic_playlist.cc:408
 #, c-format
 msgid ""
@@ -155,7 +155,7 @@ msgstr ""
 "Ha ocurrido una excepción: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1598 src/tools/dcpomatic_kdm.cc:648
+#: src/tools/dcpomatic.cc:1600 src/tools/dcpomatic_kdm.cc:648
 #: src/tools/dcpomatic_player.cc:1102 src/tools/dcpomatic_playlist.cc:417
 #, c-format
 msgid ""
@@ -169,7 +169,7 @@ msgstr ""
 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:883 src/tools/dcpomatic.cc:1603
+#: src/tools/dcpomatic.cc:883 src/tools/dcpomatic.cc:1605
 #: src/tools/dcpomatic_kdm.cc:371 src/tools/dcpomatic_kdm.cc:653
 #: src/tools/dcpomatic_kdm.cc:662 src/tools/dcpomatic_player.cc:1107
 #: src/tools/dcpomatic_playlist.cc:422 src/tools/dcpomatic_playlist.cc:431
@@ -197,7 +197,7 @@ msgstr "CPL"
 msgid "CPL's content is not encrypted."
 msgstr "El contenido del CPL no está encriptado."
 
-#: src/tools/dcpomatic.cc:1266 src/tools/dcpomatic_player.cc:497
+#: src/tools/dcpomatic.cc:1268 src/tools/dcpomatic_player.cc:497
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
@@ -205,11 +205,11 @@ msgstr "Buscar actualizaciones"
 msgid "Close without saving film"
 msgstr "Cerrar sin guardar la película"
 
-#: src/tools/dcpomatic.cc:1259 src/tools/dcpomatic_player.cc:487
+#: src/tools/dcpomatic.cc:1261 src/tools/dcpomatic_player.cc:487
 msgid "Closed captions..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1232
+#: src/tools/dcpomatic.cc:1234
 msgid "Copy settings\tCtrl-C"
 msgstr "Copiar configuración\tCtrl-C"
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid "Could not load film %1"
 msgstr "No se pudo cargar la película %1"
 
-#: src/tools/dcpomatic.cc:1514
+#: src/tools/dcpomatic.cc:1516
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
@@ -297,7 +297,7 @@ msgstr "No se pudo mostrar el DCP"
 msgid "Could not show DCP."
 msgstr "No se pudo mostrar el DCP."
 
-#: src/tools/dcpomatic.cc:1298 src/tools/dcpomatic_batch.cc:322
+#: src/tools/dcpomatic.cc:1300 src/tools/dcpomatic_batch.cc:322
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
@@ -305,7 +305,7 @@ msgstr ""
 "No se pudo escribir en el fichero de cines en %s.  Los cambios no se han "
 "salvado."
 
-#: src/tools/dcpomatic.cc:1310 src/tools/dcpomatic_batch.cc:334
+#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_batch.cc:334
 #: src/tools/dcpomatic_player.cc:822
 #, c-format
 msgid ""
@@ -330,8 +330,8 @@ msgstr "Crear KDMs"
 msgid "DCP"
 msgstr "CPL"
 
-#: src/tools/dcpomatic.cc:484 src/tools/dcpomatic.cc:1455
-#: src/tools/dcpomatic.cc:1493
+#: src/tools/dcpomatic.cc:484 src/tools/dcpomatic.cc:1457
+#: src/tools/dcpomatic.cc:1495
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -412,7 +412,7 @@ msgstr ""
 msgid "Duplicate Film"
 msgstr "Duplicar película"
 
-#: src/tools/dcpomatic.cc:1214
+#: src/tools/dcpomatic.cc:1216
 msgid "Duplicate and open..."
 msgstr "Duplicar y abrir..."
 
@@ -420,7 +420,7 @@ msgstr "Duplicar y abrir..."
 msgid "Duplicate without saving film"
 msgstr "Duplicar sin guardar la película"
 
-#: src/tools/dcpomatic.cc:1213
+#: src/tools/dcpomatic.cc:1215
 msgid "Duplicate..."
 msgstr "Duplicar..."
 
@@ -428,7 +428,7 @@ msgstr "Duplicar..."
 msgid "E-cinema"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1264 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic.cc:1266 src/tools/dcpomatic_batch.cc:84
 msgid "Encoding servers..."
 msgstr "Servidores de codificación..."
 
@@ -436,7 +436,7 @@ msgstr "Servidores de codificación..."
 msgid "Encrypted"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1252
+#: src/tools/dcpomatic.cc:1254
 msgid "Export...\tCtrl-E"
 msgstr "Exportar…\tCtrl-E"
 
@@ -463,7 +463,7 @@ msgstr "Imágenes por segundo"
 msgid "Full screen\tF11"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1263
+#: src/tools/dcpomatic.cc:1265
 msgid "Hints..."
 msgstr "Pistas…"
 
@@ -481,26 +481,22 @@ msgstr ""
 msgid "Loading content"
 msgstr "Cargando DCP"
 
-#: src/tools/dcpomatic.cc:1249
+#: src/tools/dcpomatic.cc:1251
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Crear &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:1247
+#: src/tools/dcpomatic.cc:1249
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Crear DCP in &batch converter\tCtrl-B"
 
-#: src/tools/dcpomatic.cc:1250
+#: src/tools/dcpomatic.cc:1252
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Producir un DKDM para DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1265
+#: src/tools/dcpomatic.cc:1267
 msgid "Manage templates..."
 msgstr "Gestionar plantillas…"
 
-#: src/tools/dcpomatic_playlist.cc:180
-msgid "N"
-msgstr ""
-
 #: src/tools/dcpomatic_playlist.cc:101
 msgid "Name"
 msgstr ""
@@ -509,11 +505,11 @@ msgstr ""
 msgid "New Film"
 msgstr "Nueva película"
 
-#: src/tools/dcpomatic.cc:1207
+#: src/tools/dcpomatic.cc:1209
 msgid "New...\tCtrl-N"
 msgstr "Nuevo...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:1256
+#: src/tools/dcpomatic.cc:1258
 msgid "Open DCP in &player"
 msgstr ""
 
@@ -521,7 +517,7 @@ msgstr ""
 msgid "Output"
 msgstr "Salida"
 
-#: src/tools/dcpomatic.cc:1233
+#: src/tools/dcpomatic.cc:1235
 msgid "Paste settings...\tCtrl-V"
 msgstr "Pegar configuración…\tCtrl-V"
 
@@ -529,16 +525,24 @@ msgstr "Pegar configuración…\tCtrl-V"
 msgid "Pause"
 msgstr ""
 
+#: src/tools/dcpomatic_playlist.cc:180
+msgid "Question|N"
+msgstr ""
+
+#: src/tools/dcpomatic_playlist.cc:180
+msgid "Question|Y"
+msgstr ""
+
 #: src/tools/dcpomatic_kdm.cc:160 src/tools/dcpomatic_playlist.cc:133
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/tools/dcpomatic.cc:1277 src/tools/dcpomatic_kdm.cc:249
+#: src/tools/dcpomatic.cc:1279 src/tools/dcpomatic_kdm.cc:249
 #: src/tools/dcpomatic_player.cc:505
 msgid "Report a problem..."
 msgstr "Comunicar un problema…"
 
-#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic.cc:1269
+#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic.cc:1271
 msgid "Restore default preferences"
 msgstr "Restaurar las preferencias por defecto"
 
@@ -546,11 +550,11 @@ msgstr "Restaurar las preferencias por defecto"
 msgid "Resume"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1255
+#: src/tools/dcpomatic.cc:1257
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:1212
+#: src/tools/dcpomatic.cc:1214
 msgid "Save as &template..."
 msgstr "Guardar como &plantilla…"
 
@@ -576,11 +580,11 @@ msgstr "Guardar la película y duplicar"
 msgid "Save playlist"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1243
+#: src/tools/dcpomatic.cc:1245
 msgid "Scale to fit &height"
 msgstr "Redimensionar ajustando &altura"
 
-#: src/tools/dcpomatic.cc:1242
+#: src/tools/dcpomatic.cc:1244
 msgid "Scale to fit &width"
 msgstr "Redimensionar ajustando &anchura"
 
@@ -617,7 +621,7 @@ msgstr "Selecciona el fichero DKDM"
 msgid "Send KDM emails"
 msgstr "Enviar los KDM por email"
 
-#: src/tools/dcpomatic.cc:1267
+#: src/tools/dcpomatic.cc:1269
 msgid "Send translations..."
 msgstr ""
 
@@ -660,7 +664,7 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:1372 src/tools/dcpomatic_player.cc:804
+#: src/tools/dcpomatic.cc:1374 src/tools/dcpomatic_player.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
@@ -679,7 +683,7 @@ msgstr ""
 msgid "The KDM does not allow playback of this content at this time."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1636 src/tools/dcpomatic_batch.cc:477
+#: src/tools/dcpomatic.cc:1638 src/tools/dcpomatic_batch.cc:477
 #: src/tools/dcpomatic_kdm.cc:672 src/tools/dcpomatic_server.cc:350
 #: src/tools/dcpomatic_player.cc:1131
 msgid ""
@@ -697,11 +701,11 @@ msgstr ""
 msgid "The required display devices are not connected correctly."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1374 src/tools/dcpomatic_player.cc:806
+#: src/tools/dcpomatic.cc:1376 src/tools/dcpomatic_player.cc:806
 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:1062 src/tools/dcpomatic_batch.cc:230
+#: src/tools/dcpomatic.cc:1064 src/tools/dcpomatic_batch.cc:230
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Hay trabajos sin finalizar; ¿estás seguro de querer cerrar?"
 
@@ -723,7 +727,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1063 src/tools/dcpomatic_batch.cc:231
+#: src/tools/dcpomatic.cc:1065 src/tools/dcpomatic_batch.cc:231
 msgid "Unfinished jobs"
 msgstr "Trabajos sin finalizar"
 
@@ -739,14 +743,10 @@ msgstr ""
 msgid "Verifying DCP"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1260
+#: src/tools/dcpomatic.cc:1262
 msgid "Video waveform..."
 msgstr "Forma de de onda del vídeo…"
 
-#: src/tools/dcpomatic_playlist.cc:180
-msgid "Y"
-msgstr ""
-
 #: src/tools/dcpomatic.cc:859
 #, c-format
 msgid ""