pot/merge.

1 files changed, 98 insertions, 91 deletions

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 46c90a78a..e1265c085 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 11:18+0000\n"
+"POT-Creation-Date: 2017-04-27 11:57+0100\n"
 "PO-Revision-Date: 2016-10-26 09:26-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -66,7 +66,7 @@ msgstr " (%.2f:1)"
 
 #. / TRANSLATORS: the %1 in this string will be filled in with a day of the week
 #. / to say what day a job will finish.
-#: src/lib/job.cc:430
+#: src/lib/job.cc:432
 msgid " on %1"
 msgstr ""
 
@@ -99,15 +99,15 @@ msgstr ", proporción de aspecto de pixel %.2f:1"
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/ratio.cc:39
+#: src/lib/ratio.cc:40
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:41
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:43
 msgid "2.35"
 msgstr "2.35"
 
@@ -120,12 +120,12 @@ msgid "4:3"
 msgstr "4:3"
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:125
+#: src/lib/transcode_job.cc:124
 #, c-format
 msgid "; %.1f fps"
 msgstr "; %.1f fps"
 
-#: src/lib/job.cc:435
+#: src/lib/job.cc:437
 msgid "; %1 remaining; finishing at %2%3"
 msgstr ""
 
@@ -139,7 +139,7 @@ msgstr ""
 "banda muy alto. Es buena idea bajar el ancho de banda JPEG2000 a unos 200 "
 "Mbits/segundo, esto no debería afectar a la calidad de la imagen."
 
-#: src/lib/ffmpeg_content.cc:547
+#: src/lib/ffmpeg_content.cc:525
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr "ARIB STD-B67 ('Log-gamma híbrido')"
 
@@ -193,48 +193,48 @@ msgstr "EL audio será remuestreado a %1kHz."
 msgid "Audio will not be resampled"
 msgstr "El audio no será remuestreado."
 
-#: src/lib/ffmpeg_content.cc:541
+#: src/lib/ffmpeg_content.cc:519
 msgid "BT1361 extended colour gamut"
 msgstr "Gama de color extendido BT1361"
 
-#: src/lib/ffmpeg_content.cc:519
+#: src/lib/ffmpeg_content.cc:497
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:564
+#: src/lib/ffmpeg_content.cc:542
 msgid "BT2020 constant luminance"
 msgstr "BT2020 a luminosidad constante"
 
-#: src/lib/ffmpeg_content.cc:543
+#: src/lib/ffmpeg_content.cc:521
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 para un sistema de 10-bit"
 
-#: src/lib/ffmpeg_content.cc:544
+#: src/lib/ffmpeg_content.cc:522
 msgid "BT2020 for a 12-bit system"
 msgstr "BT2020 para un sistema de 12 bits"
 
-#: src/lib/ffmpeg_content.cc:563
+#: src/lib/ffmpeg_content.cc:541
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 a luminosidad no constante"
 
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:493
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:559
+#: src/lib/ffmpeg_content.cc:537
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:492
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:530
-#: src/lib/ffmpeg_content.cc:555
+#: src/lib/ffmpeg_content.cc:489 src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:533
 msgid "BT709"
 msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:572
+#: src/lib/ffmpeg_content.cc:550
 msgid "Bits per pixel"
 msgstr "Bits por pixel"
 
@@ -250,7 +250,7 @@ msgstr "BsR"
 msgid "C"
 msgstr "C"
 
-#: src/lib/job.cc:444
+#: src/lib/job.cc:446
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -270,7 +270,7 @@ msgstr "Canales"
 msgid "Checking existing image data"
 msgstr "Comprobando las imágenes existentes"
 
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:504
 msgid "Colour primaries"
 msgstr "Colores primarios"
 
@@ -284,17 +284,17 @@ msgstr "Colores primarios"
 #. / file is limited, so that not all possible values are valid.
 #. / TRANSLATORS: this means that the range of pixel values used in this
 #. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:475
-#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:492
-#: src/lib/ffmpeg_content.cc:497 src/lib/ffmpeg_content.cc:502
+#: src/lib/ffmpeg_content.cc:446 src/lib/ffmpeg_content.cc:453
+#: src/lib/ffmpeg_content.cc:460 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:480
 msgid "Colour range"
 msgstr "Rango de color"
 
-#: src/lib/ffmpeg_content.cc:551
+#: src/lib/ffmpeg_content.cc:529
 msgid "Colour transfer characteristic"
 msgstr "Características de la transferencia de color"
 
-#: src/lib/ffmpeg_content.cc:569
+#: src/lib/ffmpeg_content.cc:547
 msgid "Colourspace"
 msgstr "Espacio de color"
 
@@ -302,7 +302,7 @@ msgstr "Espacio de color"
 msgid "Computing digest"
 msgstr "Calculando la firma resumen"
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:485
 msgid "Computing digests"
 msgstr "Calculando la firma resumen"
 
@@ -434,7 +434,7 @@ msgstr "No se pudo descodificar el fichero JPEG2000 %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "No se pudo descodificar el fichero de imagen (%1)"
 
-#: src/lib/ffmpeg_examiner.cc:370
+#: src/lib/ffmpeg_examiner.cc:267
 msgid "Could not find pixel format for video."
 msgstr "No se pudo encontrar el formato de los píxeles del vídeo."
 
@@ -523,7 +523,7 @@ msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
-#: src/lib/config.cc:551
+#: src/lib/config.cc:580
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -565,23 +565,23 @@ msgstr "Se doblará cada imagen en el DCP.\n"
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Cada imagen será repetida otras %1 veces en el DCP.\n"
 
-#: src/lib/send_kdm_email_job.cc:56
+#: src/lib/send_kdm_email_job.cc:61
 msgid "Email KDMs"
 msgstr "Enviar las KDM"
 
-#: src/lib/send_kdm_email_job.cc:59
+#: src/lib/send_kdm_email_job.cc:64
 msgid "Email KDMs for %1"
 msgstr "Enviar por email las KDM para %1"
 
-#: src/lib/send_problem_report_job.cc:55
+#: src/lib/send_problem_report_job.cc:59
 msgid "Email problem report"
 msgstr "Enviar por correo el problema"
 
-#: src/lib/send_problem_report_job.cc:58
+#: src/lib/send_problem_report_job.cc:62
 msgid "Email problem report for %1"
 msgstr "Enviar por correo el problema para %1"
 
-#: src/lib/transcoder.cc:77
+#: src/lib/transcoder.cc:86
 msgid "Encoding"
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr ""
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr "Error en el fichero de subtítulos: encontrado %1 cuando se esperaba %2"
 
-#: src/lib/job.cc:442
+#: src/lib/job.cc:444
 msgid "Error: %1"
 msgstr "Error: (%1)"
 
@@ -597,7 +597,7 @@ msgstr "Error: (%1)"
 msgid "Examine content"
 msgstr "Examinar contenido"
 
-#: src/lib/ffmpeg_content.cc:558
+#: src/lib/ffmpeg_content.cc:536
 msgid "FCC"
 msgstr "FCC"
 
@@ -617,23 +617,15 @@ msgstr "Película"
 msgid "Filename"
 msgstr "Nombre de fichero"
 
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:496
 msgid "Film"
 msgstr "Película"
 
-#: src/lib/ffmpeg_examiner.cc:100
+#: src/lib/ffmpeg_examiner.cc:95
 msgid "Finding length"
 msgstr "Buscando la duración"
 
-#: src/lib/ffmpeg_examiner.cc:96
-msgid "Finding length and subtitles"
-msgstr "Buscando duración y subtítulos"
-
-#: src/lib/ffmpeg_examiner.cc:98
-msgid "Finding subtitles"
-msgstr "Buscando subtítulos"
-
-#: src/lib/ratio.cc:41
+#: src/lib/ratio.cc:42
 msgid "Flat"
 msgstr "Flat"
 
@@ -641,15 +633,15 @@ msgstr "Flat"
 msgid "Frame rate"
 msgstr "Velocidad"
 
-#: src/lib/ffmpeg_content.cc:502
+#: src/lib/ffmpeg_content.cc:480
 msgid "Full"
 msgstr "Completo"
 
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:460
 msgid "Full (0-%1)"
 msgstr "Completo (0-%1)"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:45
 msgid "Full frame"
 msgstr "Frame completo"
 
@@ -669,11 +661,11 @@ msgstr "Longitud total en frames de vídeo a la velocidad del DCP"
 msgid "Full length in video frames at content rate"
 msgstr "Longitud total en frames de vídeo a la velocidad del contenido"
 
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:511
 msgid "Gamma 22 (BT470M)"
 msgstr "Gamma 22 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:512
 msgid "Gamma 28 (BT470BG)"
 msgstr "Gamma 28 (BT470BG)"
 
@@ -697,19 +689,23 @@ msgstr "Reductor de ruido 3D de alta calidad"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:520
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB o sYCC)"
 
-#: src/lib/ffmpeg_content.cc:540
+#: src/lib/ffmpeg_content.cc:518
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
+#: src/lib/ratio.cc:39
+msgid "IMAX"
+msgstr ""
+
 #: src/lib/job.cc:144 src/lib/job.cc:176 src/lib/job.cc:186
 msgid "It is not known what caused this error."
 msgstr "Error desconocido."
 
-#: src/lib/config.cc:243 src/lib/config.cc:548
+#: src/lib/config.cc:254 src/lib/config.cc:577
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envío de KDM: $CPL_NAME"
 
@@ -753,23 +749,23 @@ msgstr "Lfe"
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:475
 msgid "Limited"
 msgstr "Limitado"
 
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:453
 msgid "Limited (%1-%2)"
 msgstr "Limitado (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:537
+#: src/lib/ffmpeg_content.cc:515
 msgid "Linear"
 msgstr "Lineal"
 
-#: src/lib/ffmpeg_content.cc:538
+#: src/lib/ffmpeg_content.cc:516
 msgid "Logarithmic (100:1 range)"
 msgstr "Logarítmico (rango 100:1)"
 
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:517
 msgid "Logarithmic (316:1 range)"
 msgstr "Logarítmico (rango 316:1)"
 
@@ -805,7 +801,7 @@ msgstr "El tamaño de los vídeos no coincide en el DCP"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/cinema_kdms.cc:151
+#: src/lib/cinema_kdms.cc:199
 msgid "No mail server configured in preferences"
 msgstr "Ningún servidor de correo configurado en las preferencias"
 
@@ -825,7 +821,7 @@ msgstr "No se encontraron imágenes válidas en la carpeta."
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/job.cc:440
+#: src/lib/job.cc:442
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
@@ -858,7 +854,7 @@ msgstr "Policy"
 msgid "Prepared for video frame rate"
 msgstr "Preparado para velocidad de vídeo"
 
-#: src/lib/exceptions.cc:79
+#: src/lib/exceptions.cc:85
 msgid "Programming error at %1:%2"
 msgstr "Error de programación en %1:%2"
 
@@ -870,7 +866,7 @@ msgstr "Anuncio de servicio público"
 msgid "R"
 msgstr "R"
 
-#: src/lib/ffmpeg_content.cc:554
+#: src/lib/ffmpeg_content.cc:532
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr "RGB / sRGB (IEC61966-2-1)"
 
@@ -922,41 +918,41 @@ msgstr "Rs"
 msgid "S-Gamut3/S-Log3"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:516 src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:494 src/lib/ffmpeg_content.cc:513
 msgid "SMPTE 170M (BT601)"
 msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:560
+#: src/lib/ffmpeg_content.cc:538
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:565
+#: src/lib/ffmpeg_content.cc:543
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:517 src/lib/ffmpeg_content.cc:536
-#: src/lib/ffmpeg_content.cc:561
+#: src/lib/ffmpeg_content.cc:495 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:539
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/ffmpeg_content.cc:545
+#: src/lib/ffmpeg_content.cc:523
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr "SMPTE ST 2084 para sistemas de 10, 12, 14 y 16 bits"
 
-#: src/lib/ffmpeg_content.cc:546
+#: src/lib/ffmpeg_content.cc:524
 msgid "SMPTE ST 428-1"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:520
+#: src/lib/ffmpeg_content.cc:498
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
 
-#: src/lib/ffmpeg_content.cc:521
+#: src/lib/ffmpeg_content.cc:499
 #, fuzzy
 msgid "SMPTE ST 431-2 (2011)"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:500
 #, fuzzy
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr "SMPTE ST 428-1"
@@ -965,11 +961,11 @@ msgstr "SMPTE ST 428-1"
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:44
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/send_problem_report_job.cc:70
+#: src/lib/send_problem_report_job.cc:74
 msgid "Sending email"
 msgstr "Enviando correo"
 
@@ -1009,7 +1005,7 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Subtítulos de texto"
 
-#: src/lib/film.cc:1560
+#: src/lib/film.cc:1559
 msgid ""
 "The DCP %1 was being referred to by this film.  This not now possible "
 "because the reel sizes in the film no longer agree with those in the "
@@ -1041,6 +1037,11 @@ msgstr "El DCP no tiene subtítulos en todas las bobinas."
 msgid "The certificate chain for signing is invalid"
 msgstr "La cadena de certificados para firmar no es válida"
 
+#: src/lib/exceptions.cc:79
+#, fuzzy
+msgid "The certificate chain for signing is invalid (%1)"
+msgstr "La cadena de certificados para firmar no es válida"
+
 #: src/lib/job.cc:108
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
@@ -1118,7 +1119,7 @@ msgstr ""
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:58
+#: src/lib/transcode_job.cc:57
 msgid "Transcode %1"
 msgstr "Codificar %1"
 
@@ -1138,7 +1139,7 @@ msgstr "El servidor recibió un tipo de imagen inesperada"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:289
+#: src/lib/ffmpeg_decoder.cc:281
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
@@ -1146,11 +1147,11 @@ msgstr "Formato de audio desconocido (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
-#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:492
-#: src/lib/ffmpeg_content.cc:510 src/lib/ffmpeg_content.cc:512
-#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:529
-#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
-#: src/lib/ffmpeg_content.cc:556 src/lib/ffmpeg_content.cc:557
+#: src/lib/ffmpeg_content.cc:446 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:488 src/lib/ffmpeg_content.cc:490
+#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:509 src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:534 src/lib/ffmpeg_content.cc:535
 msgid "Unspecified"
 msgstr "Sin especificar"
 
@@ -1182,7 +1183,7 @@ msgstr "Ciegos"
 msgid "Waiting"
 msgstr "Esperando"
 
-#: src/lib/ffmpeg_content.cc:562
+#: src/lib/ffmpeg_content.cc:540
 msgid "YCOCG"
 msgstr "YCOCG"
 
@@ -1271,7 +1272,7 @@ msgstr "[subtítulos]"
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/dcpomatic_socket.cc:68
+#: src/lib/dcpomatic_socket.cc:69
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -1323,15 +1324,15 @@ msgstr "no se pudo abrir la sesión SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir en el fichero (%1)"
 
-#: src/lib/dcpomatic_socket.cc:64
+#: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"
 msgstr "error durante async_connect (%1)"
 
-#: src/lib/dcpomatic_socket.cc:117
+#: src/lib/dcpomatic_socket.cc:118
 msgid "error during async_read (%1)"
 msgstr "error durante async_read (%1)"
 
-#: src/lib/dcpomatic_socket.cc:89
+#: src/lib/dcpomatic_socket.cc:90
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
@@ -1386,7 +1387,7 @@ msgstr ""
 msgid "still"
 msgstr "imagen fija"
 
-#: src/lib/ffmpeg_examiner.cc:337
+#: src/lib/ffmpeg_examiner.cc:234
 msgid "unknown"
 msgstr "desconocido"
 
@@ -1399,6 +1400,12 @@ msgstr "fotogramas"
 msgid "you must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
+#~ msgid "Finding length and subtitles"
+#~ msgstr "Buscando duración y subtítulos"
+
+#~ msgid "Finding subtitles"
+#~ msgstr "Buscando subtítulos"
+
 #~ msgid "Encoding picture and sound"
 #~ msgstr "Codificación de imagen y sonido"