X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpo%2Fes_ES.po;h=c0598beae08c666e441309f8c7fcb2a4c2330ea5;hb=adf17f9e07ac913321fcd379882a15e49e295237;hp=a56589eec89f24fcf384756a544eecd53c66fe6c;hpb=2f12c68b60d2b788f21a8005616eb74379e32b53;p=dcpomatic.git

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index a56589eec..c0598beae 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,25 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-30 10:07+0100\n"
-"PO-Revision-Date: 2015-07-06 15:44+0100\n"
+"POT-Creation-Date: 2015-10-29 00:40+0000\n"
+"PO-Revision-Date: 2015-08-29 03:34-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.4\n"
 
-#: src/lib/dcp_content.cc:112
+#: src/lib/dcp_content.cc:126
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/sndfile_content.cc:66
+#: src/lib/sndfile_content.cc:68
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:225
+#: src/lib/ffmpeg_content.cc:227
 msgid "%1 [movie]"
 msgstr "%1 [película]"
 
@@ -57,17 +57,17 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Publicidad"
 
-#: src/lib/job.cc:74
+#: src/lib/job.cc:89
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
-#: src/lib/analyse_audio_job.cc:54
+#: src/lib/analyse_audio_job.cc:62
 msgid "Analyse audio"
 msgstr "Analizar audio"
 
-#: src/lib/single_stream_audio_content.cc:93
+#: src/lib/single_stream_audio_content.cc:95
 msgid "Audio channels"
-msgstr ""
+msgstr "Canales de audio"
 
 #: src/lib/audio_content.cc:257
 msgid "Audio will be resampled from %1kHz to %2kHz"
@@ -81,106 +81,118 @@ msgstr "EL audio será remuestreado a %1kHz."
 msgid "Audio will not be resampled"
 msgstr "El audio no será remuestreado."
 
-#: src/lib/ffmpeg_content.cc:433
+#: src/lib/ffmpeg_content.cc:447
 msgid "BT1361 extended colour gamut"
-msgstr ""
+msgstr "Gama de color extendido BT1361"
 
-#: src/lib/ffmpeg_content.cc:414
+#: src/lib/ffmpeg_content.cc:428
 msgid "BT2020"
-msgstr ""
+msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:453
+#: src/lib/ffmpeg_content.cc:467
 msgid "BT2020 constant luminance"
-msgstr ""
+msgstr "BT2020 a luminosidad constante"
 
-#: src/lib/ffmpeg_content.cc:435
+#: src/lib/ffmpeg_content.cc:449
 msgid "BT2020 for a 10-bit system"
-msgstr ""
+msgstr "BT2020 para un sistema de 10-bit"
 
-#: src/lib/ffmpeg_content.cc:436
+#: src/lib/ffmpeg_content.cc:450
 msgid "BT2020 for a 12-bit system"
-msgstr ""
+msgstr "BT2020 para un sistema de 12 bits"
 
-#: src/lib/ffmpeg_content.cc:452
+#: src/lib/ffmpeg_content.cc:466
 msgid "BT2020 non-constant luminance"
-msgstr ""
+msgstr "BT2020 a luminosidad no constante"
 
-#: src/lib/ffmpeg_content.cc:410
+#: src/lib/ffmpeg_content.cc:424
 msgid "BT470BG"
-msgstr ""
+msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:448
+#: src/lib/ffmpeg_content.cc:462
 msgid "BT470BG (BT601-6)"
-msgstr ""
+msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:409
+#: src/lib/ffmpeg_content.cc:423
 msgid "BT470M"
-msgstr ""
+msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:406 src/lib/ffmpeg_content.cc:422
-#: src/lib/ffmpeg_content.cc:444
+#: src/lib/ffmpeg_content.cc:420 src/lib/ffmpeg_content.cc:436
+#: src/lib/ffmpeg_content.cc:458
 msgid "BT709"
-msgstr ""
+msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:460
+#: src/lib/ffmpeg_content.cc:474
 msgid "Bits per pixel"
-msgstr ""
+msgstr "Bits por pixel"
 
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1267
 msgid "BsL"
-msgstr ""
+msgstr "BsL"
 
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1268
 msgid "BsR"
-msgstr ""
+msgstr "BsR"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1259
 msgid "C"
-msgstr ""
+msgstr "C"
 
-#: src/lib/job.cc:335
+#: src/lib/job.cc:371
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/lib/exceptions.cc:60
+#: src/lib/exceptions.cc:61
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "No se puede usar el formato de pixel %1 para %2"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:485
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:118
+#: src/lib/reel_writer.cc:89
 msgid "Checking existing image data"
 msgstr "Comprobando las imágenes existentes"
 
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:432
 msgid "Colour primaries"
-msgstr ""
-
-#: src/lib/ffmpeg_content.cc:377 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:391
-#: src/lib/ffmpeg_content.cc:394 src/lib/ffmpeg_content.cc:397
+msgstr "Colores primarios"
+
+#. / TRANSLATORS: this means that the range of pixel values used in this
+#. / file is unknown (not specified in the file).
+#. / TRANSLATORS: this means that the range of pixel values used in this
+#. / 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.
+#. / TRANSLATORS: this means that the range of pixel values used in this
+#. / file is unknown (not specified in the file).
+#. / TRANSLATORS: this means that the range of pixel values used in this
+#. / 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:381 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:391 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:406 src/lib/ffmpeg_content.cc:411
 msgid "Colour range"
-msgstr ""
+msgstr "Rango de color"
 
-#: src/lib/ffmpeg_content.cc:440
+#: src/lib/ffmpeg_content.cc:454
 msgid "Colour transfer characteristic"
-msgstr ""
+msgstr "Características de la transferencia de color"
 
-#: src/lib/ffmpeg_content.cc:457
+#: src/lib/ffmpeg_content.cc:471
 msgid "Colourspace"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/lib/writer.cc:591
+#: src/lib/reel_writer.cc:427
 msgid "Computing audio digest"
 msgstr "Calculando la firma resumen del audio"
 
-#: src/lib/content.cc:136
+#: src/lib/content.cc:138
 msgid "Computing digest"
 msgstr "Calculando la firma resumen"
 
-#: src/lib/writer.cc:587
+#: src/lib/reel_writer.cc:421
 msgid "Computing image digest"
 msgstr "Calculando la firma resumen de imagen"
 
@@ -192,11 +204,11 @@ msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 msgid "Content frame rate"
 msgstr "Velocidad del contenido"
 
-#: src/lib/subtitle_content.cc:124
+#: src/lib/subtitle_content.cc:127
 msgid "Content to be joined must have the same 'burn subtitles' setting."
-msgstr ""
+msgstr "Para unir contenido debe tener la misma opción ‘grabar subtítulos’."
 
-#: src/lib/subtitle_content.cc:120
+#: src/lib/subtitle_content.cc:123
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr "Para unir contenido debe tener la misma opción 'usar subtítulos'."
 
@@ -208,58 +220,58 @@ msgstr "Para unir contenido debe tener el mismo retardo de audio."
 msgid "Content to be joined must have the same audio gain."
 msgstr "Para unir contenido debe tener la misma ganancia de audio."
 
-#: src/lib/video_content.cc:167
+#: src/lib/video_content.cc:169
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Para unir contenido debe tener la misma conversión de color."
 
-#: src/lib/video_content.cc:159
+#: src/lib/video_content.cc:161
 msgid "Content to be joined must have the same crop."
 msgstr "Para unir contenido debe tener el mismo recorte."
 
-#: src/lib/video_content.cc:171
+#: src/lib/video_content.cc:173
 msgid "Content to be joined must have the same fades."
 msgstr "Para unir contenido debe tener los mismos fundidos."
 
-#: src/lib/video_content.cc:147
+#: src/lib/video_content.cc:149
 msgid "Content to be joined must have the same picture size."
 msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
-#: src/lib/video_content.cc:163
+#: src/lib/video_content.cc:165
 msgid "Content to be joined must have the same scale setting."
 msgstr "Para unir contenido debe tener la misma redimensión."
 
-#: src/lib/subtitle_content.cc:128
+#: src/lib/subtitle_content.cc:131
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Para unir contenido debe tener el mismo desplazamiento de subtítulo en X."
 
-#: src/lib/subtitle_content.cc:136
+#: src/lib/subtitle_content.cc:139
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr ""
 "Para unir contenido debe tener la misma redimensión de subtítulo en  X."
 
-#: src/lib/subtitle_content.cc:132
+#: src/lib/subtitle_content.cc:135
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Para unir contenido debe tener el mismo desplazamiento de subtítulo en Y."
 
-#: src/lib/subtitle_content.cc:140
+#: src/lib/subtitle_content.cc:143
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Para unir contenido debe tener la misma redimensión de subtítulo en Y."
 
-#: src/lib/video_content.cc:151
+#: src/lib/video_content.cc:153
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Para unir contenido debe tener la misma velocidad de imagen."
 
-#: src/lib/video_content.cc:155
+#: src/lib/video_content.cc:157
 msgid "Content to be joined must have the same video frame type."
 msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
-#: src/lib/subtitle_content.cc:145 src/lib/subtitle_content.cc:153
+#: src/lib/subtitle_content.cc:148 src/lib/subtitle_content.cc:156
 msgid "Content to be joined must use the same fonts."
-msgstr ""
+msgstr "Para unir contenido debe usar la misma fuente."
 
-#: src/lib/ffmpeg_content.cc:128
+#: src/lib/ffmpeg_content.cc:130
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
 
@@ -279,15 +291,15 @@ msgstr "No se pudo conectar al servidor %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/image_examiner.cc:61
+#: src/lib/image_examiner.cc:62
 msgid "Could not decode JPEG2000 file %1 (%2)"
-msgstr ""
+msgstr "No se pudo descodificar el fichero JPEG2000 %1 (%2)"
 
-#: src/lib/magick_image_proxy.cc:99
+#: src/lib/magick_image_proxy.cc:101
 msgid "Could not decode image file (%1)"
 msgstr "No se pudo descodificar el fichero de imagen (%1)"
 
-#: src/lib/server_finder.cc:126
+#: src/lib/server_finder.cc:139
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -295,11 +307,11 @@ msgstr ""
 "No se pueden buscar servidores de codificación externos. Quizás haya otro "
 "DCP-o-matic ejecutándose."
 
-#: src/lib/job.cc:93
+#: src/lib/job.cc:108 src/lib/job.cc:119
 msgid "Could not open %1"
 msgstr "No se pudo abrir %1"
 
-#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
+#: src/lib/curl_uploader.cc:84 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
@@ -309,18 +321,17 @@ msgstr "No se puedo abrir el fichero ZIP descargado"
 
 #: src/lib/dcp_subtitle.cc:49
 msgid "Could not read subtitles"
-msgstr ""
+msgstr "No se pudieron leer los subtítulos"
 
 #: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "No se pudo iniciar la sesión SCP (%1)"
 
-#: src/lib/curl_uploader.cc:47
-#, fuzzy
+#: src/lib/curl_uploader.cc:48
 msgid "Could not start transfer"
-msgstr "no se pudo abrir la sesión SSH"
+msgstr "No se pudo iniciar la transferencia"
 
-#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
+#: src/lib/curl_uploader.cc:91 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
@@ -328,7 +339,7 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cropped to %1x%2"
 msgstr "Recortado a %1x%2"
 
-#: src/lib/dcp_subtitle_content.cc:96
+#: src/lib/dcp_subtitle_content.cc:100
 msgid "DCP XML subtitles"
 msgstr "Subtítulos DCP XML"
 
@@ -340,7 +351,7 @@ msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente.\n"
 msgid "DCP will use every other frame of the content.\n"
 msgstr "El DCP usará imágenes alternas de la fuente.\n"
 
-#: src/lib/job.cc:94
+#: src/lib/job.cc:109 src/lib/job.cc:120
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -348,7 +359,7 @@ msgstr ""
 "DCP-o-matic no pudo abrir el fichero %1. Quizás no existe o está en un "
 "formato inesperado."
 
-#: src/lib/ffmpeg_content.cc:97
+#: src/lib/ffmpeg_content.cc:99
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
@@ -357,7 +368,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:437
+#: src/lib/config.cc:462
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -403,88 +414,102 @@ 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:52
+#: src/lib/send_kdm_email_job.cc:56
+#, fuzzy
+msgid "Email KDMs"
+msgstr "Enviar por email las KDM para %1"
+
+#: src/lib/send_kdm_email_job.cc:59
 msgid "Email KDMs for %1"
 msgstr "Enviar por email las KDM para %1"
 
-#: src/lib/send_problem_report_job.cc:49
+#: src/lib/send_problem_report_job.cc:52
+#, fuzzy
+msgid "Email problem report"
+msgstr "Enviar por correo el problema para %1"
+
+#: src/lib/send_problem_report_job.cc:55
 msgid "Email problem report for %1"
-msgstr ""
+msgstr "Enviar por correo el problema para %1"
 
-#: src/lib/writer.cc:152
+#: src/lib/writer.cc:99
 msgid "Encoding image data"
 msgstr "Codificando imagen"
 
-#: src/lib/exceptions.cc:66
+#: src/lib/exceptions.cc:67
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr "Error en el fichero SubRip: encontrado %1 cuando se esperaba %2"
 
-#: src/lib/job.cc:333
-#, fuzzy
+#: src/lib/job.cc:369
 msgid "Error: %1"
-msgstr "Error (%1)"
+msgstr "Error: (%1)"
 
-#: src/lib/examine_content_job.cc:46
+#: src/lib/examine_content_job.cc:47
 msgid "Examine content"
 msgstr "Examinar contenido"
 
-#: src/lib/ffmpeg_content.cc:447
+#: src/lib/ffmpeg_content.cc:461
 msgid "FCC"
-msgstr ""
+msgstr "FCC"
 
 #: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "Fallo al identificarse con el servidor (%1)"
 
+#: src/lib/emailer.cc:284
+msgid "Failed to send KDM email (timed out)"
+msgstr ""
+
 #: src/lib/dcp_content_type.cc:45
 msgid "Feature"
 msgstr "Película"
 
-#: src/lib/ffmpeg_content.cc:413
+#: src/lib/ffmpeg_content.cc:427
 msgid "Film"
-msgstr ""
-
-#: src/lib/ffmpeg_examiner.cc:78
-msgid "Finding length"
-msgstr ""
+msgstr "Película"
 
 #: src/lib/ffmpeg_examiner.cc:83
+#, fuzzy
+msgid "Finding length and subtitles"
+msgstr "Buscando subtítulos"
+
+#: src/lib/ffmpeg_examiner.cc:85
 msgid "Finding subtitles"
-msgstr ""
+msgstr "Buscando subtítulos"
 
 #: src/lib/ratio.cc:40
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:411
 msgid "Full"
-msgstr ""
+msgstr "Completo"
 
-#: src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:391
 msgid "Full (0-%1)"
-msgstr ""
+msgstr "Completo (0-%1)"
 
 #: src/lib/ratio.cc:42
 msgid "Full frame"
 msgstr "Frame completo"
 
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:439
 msgid "Gamma 22 (BT470M)"
-msgstr ""
+msgstr "Gamma 22 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:426
+#: src/lib/ffmpeg_content.cc:440
 msgid "Gamma 28 (BT470BG)"
-msgstr ""
+msgstr "Gamma 28 (BT470BG)"
 
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1263
 msgid "HI"
-msgstr ""
+msgstr "HI"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:489
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -492,24 +517,23 @@ msgstr "Sordos"
 msgid "High quality 3D denoiser"
 msgstr "Reductor de ruido 3D de alta calidad"
 
-#: src/lib/ffmpeg_content.cc:434
+#: src/lib/ffmpeg_content.cc:448
 msgid "IEC61966-2-1 (sRGB or sYCC)"
-msgstr ""
+msgstr "IEC61966-2-1 (sRGB o sYCC)"
 
-#: src/lib/ffmpeg_content.cc:432
+#: src/lib/ffmpeg_content.cc:446
 msgid "IEC61966-2-4"
-msgstr ""
+msgstr "IEC61966-2-4"
 
-#: src/lib/job.cc:114 src/lib/job.cc:124
+#: src/lib/job.cc:125 src/lib/job.cc:146 src/lib/job.cc:156
 msgid "It is not known what caused this error."
-msgstr ""
+msgstr "Error desconocido."
 
-#: src/lib/config.cc:88
-#, fuzzy
+#: src/lib/config.cc:94
 msgid "KDM delivery"
-msgstr "Envío de KDM: $CPL_NAME"
+msgstr "Envío de KDM"
 
-#: src/lib/config.cc:213
+#: src/lib/config.cc:240
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envío de KDM: $CPL_NAME"
 
@@ -517,61 +541,61 @@ msgstr "Envío de KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1257
 msgid "L"
-msgstr ""
+msgstr "L"
 
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1265
 msgid "Lc"
-msgstr ""
+msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:474
+#: src/lib/mid_side_decoder.cc:97 src/lib/util.cc:483
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:491
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:484
+#: src/lib/util.cc:493
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:487
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1260
 msgid "Lfe"
-msgstr ""
+msgstr "Lfe"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:486
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
-#: src/lib/ffmpeg_content.cc:394
+#: src/lib/ffmpeg_content.cc:406
 msgid "Limited"
-msgstr ""
+msgstr "Limitado"
 
-#: src/lib/ffmpeg_content.cc:380
+#: src/lib/ffmpeg_content.cc:386
 msgid "Limited (%1-%2)"
-msgstr ""
+msgstr "Limitado (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:443
 msgid "Linear"
-msgstr ""
+msgstr "Lineal"
 
-#: src/lib/ffmpeg_content.cc:430
+#: src/lib/ffmpeg_content.cc:444
 msgid "Logarithmic (100:1 range)"
-msgstr ""
+msgstr "Logarítmico (rango 100:1)"
 
-#: src/lib/ffmpeg_content.cc:431
+#: src/lib/ffmpeg_content.cc:445
 msgid "Logarithmic (316:1 range)"
-msgstr ""
+msgstr "Logarítmico (rango 316:1)"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1261
 msgid "Ls"
-msgstr ""
+msgstr "Ls"
 
 #: src/lib/mid_side_decoder.cc:34
 msgid "Mid-side decoder"
@@ -581,19 +605,19 @@ msgstr "Decodificación medio-lateral"
 msgid "Misc"
 msgstr "Miscelánea"
 
-#: src/lib/dcp_examiner.cc:93
+#: src/lib/dcp_examiner.cc:96
 msgid "Mismatched audio channel counts in DCP"
 msgstr "El número de canales de audio no coincide en el DCP"
 
-#: src/lib/dcp_examiner.cc:99
+#: src/lib/dcp_examiner.cc:102
 msgid "Mismatched audio frame rates in DCP"
 msgstr "La velocidad de reproducción de audio no coincide en el DCP"
 
-#: src/lib/dcp_examiner.cc:74
+#: src/lib/dcp_examiner.cc:77
 msgid "Mismatched frame rates in DCP"
 msgstr "La velocidad de reproducción no coincide en el DCP"
 
-#: src/lib/dcp_examiner.cc:81
+#: src/lib/dcp_examiner.cc:84
 msgid "Mismatched video sizes in DCP"
 msgstr "El tamaño de los vídeos no coincide en el DCP"
 
@@ -601,15 +625,15 @@ msgstr "El tamaño de los vídeos no coincide en el DCP"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content_scale.cc:108
+#: src/lib/video_content_scale.cc:109
 msgid "No scale"
 msgstr "No redimensionar"
 
-#: src/lib/video_content_scale.cc:105
+#: src/lib/video_content_scale.cc:106
 msgid "No stretch"
 msgstr "Sin deformación"
 
-#: src/lib/image_content.cc:59
+#: src/lib/image_content.cc:55
 msgid "No valid image files were found in the folder."
 msgstr "No se encontraron imágenes válidas en la carpeta."
 
@@ -617,20 +641,20 @@ msgstr "No se encontraron imágenes válidas en la carpeta."
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/job.cc:331
+#: src/lib/job.cc:367
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
-#: src/lib/content.cc:105
+#: src/lib/content.cc:107
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
 "Solo la primera pieza a ser unida puede tener un recorte en su comienzo."
 
-#: src/lib/content.cc:109
+#: src/lib/content.cc:111
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Solo la última pieza a ser unida puede tener un recorte en su final."
 
-#: src/lib/job.cc:106
+#: src/lib/job.cc:138
 msgid "Out of memory"
 msgstr "Falta de memoria"
 
@@ -638,19 +662,19 @@ msgstr "Falta de memoria"
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
 
-#: src/lib/colour_conversion.cc:265
+#: src/lib/colour_conversion.cc:266
 msgid "P3"
-msgstr ""
+msgstr "P3"
 
 #: src/lib/video_content.cc:558
 msgid "Padded with black to fit container %1 (%2x%3)"
-msgstr ""
+msgstr "Completado con negro para cubrir el contenedor %1 (%2x%3)"
 
 #: src/lib/dcp_content_type.cc:52
 msgid "Policy"
 msgstr "Policy"
 
-#: src/lib/exceptions.cc:78
+#: src/lib/exceptions.cc:79
 msgid "Programming error at %1:%2"
 msgstr "Error de programación en %1:%2"
 
@@ -658,62 +682,68 @@ msgstr "Error de programación en %1:%2"
 msgid "Public Service Announcement"
 msgstr "Anuncio de servicio público"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1258
 msgid "R"
-msgstr ""
+msgstr "R"
 
-#: src/lib/ffmpeg_content.cc:443
+#: src/lib/ffmpeg_content.cc:457
 msgid "RGB / sRGB (IEC61966-2-1)"
-msgstr ""
+msgstr "RGB / sRGB (IEC61966-2-1)"
 
 #: src/lib/dcp_content_type.cc:50
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1266
 msgid "Rc"
-msgstr ""
+msgstr "Rc"
 
-#: src/lib/colour_conversion.cc:263
+#: src/lib/colour_conversion.cc:264
 msgid "Rec. 601"
-msgstr ""
+msgstr "Rec. 601"
 
-#: src/lib/colour_conversion.cc:264
+#: src/lib/colour_conversion.cc:265
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:475
+#: src/lib/dcp_content.cc:295
+msgid ""
+"Reel lengths in the project differ from those in the DCP; set the reel mode "
+"to `split by video content'."
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:484
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:492
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:485
+#: src/lib/util.cc:494
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:488
 msgid "Right surround"
 msgstr "Surround derecha"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1262
 msgid "Rs"
-msgstr ""
+msgstr "Rs"
 
-#: src/lib/ffmpeg_content.cc:411 src/lib/ffmpeg_content.cc:427
+#: src/lib/ffmpeg_content.cc:425 src/lib/ffmpeg_content.cc:441
 msgid "SMPTE 170M (BT601)"
-msgstr ""
+msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:463
 msgid "SMPTE 170M (BT601-6)"
-msgstr ""
+msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:412 src/lib/ffmpeg_content.cc:428
-#: src/lib/ffmpeg_content.cc:450
+#: src/lib/ffmpeg_content.cc:426 src/lib/ffmpeg_content.cc:442
+#: src/lib/ffmpeg_content.cc:464
 msgid "SMPTE 240M"
-msgstr ""
+msgstr "SMPTE 240M"
 
 #: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
@@ -727,9 +757,9 @@ msgstr "Redimensionado a %1x%2"
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/send_problem_report_job.cc:61
+#: src/lib/send_problem_report_job.cc:67
 msgid "Sending email"
-msgstr ""
+msgstr "Enviando correo"
 
 #: src/lib/dcp_content_type.cc:46
 msgid "Short"
@@ -737,13 +767,18 @@ msgstr "Cortometraje"
 
 #: src/lib/audio_content.cc:252
 msgid "Some audio will be resampled to %1kHz"
-msgstr ""
+msgstr "El audio será remuestreado a %1kHz"
 
 #: src/lib/upmixer_a.cc:45
 msgid "Stereo to 5.1 up-mixer A"
 msgstr "Upmix de estéreo a 5.1 A"
 
-#: src/lib/subrip_content.cc:79
+#: src/lib/upmixer_b.cc:41
+#, fuzzy
+msgid "Stereo to 5.1 up-mixer B"
+msgstr "Upmix de estéreo a 5.1 A"
+
+#: src/lib/subrip_content.cc:77
 msgid "SubRip subtitles"
 msgstr "Subtítulos SubRip"
 
@@ -759,19 +794,18 @@ msgstr "Filtro telecine"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/dcp_examiner.cc:131
-#, fuzzy
+#: src/lib/dcp_examiner.cc:134
 msgid ""
 "The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."
 msgstr ""
 "La KDM no puede desencriptar el DCP. Puede que corresponda a un CPL "
 "incorrecto"
 
-#: src/lib/exceptions.cc:72
+#: src/lib/exceptions.cc:73
 msgid "The certificate chain for signing is invalid"
 msgstr "La cadena de certificados para firmar no es válida"
 
-#: src/lib/job.cc:80
+#: src/lib/job.cc:95
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -779,11 +813,26 @@ msgstr ""
 "En el dispositivo donde se encuentra la película queda poco espacio. Libere "
 "espacio en el disco y pruebe de nuevo."
 
-#: src/lib/job.cc:106
-msgid "There was not enough memory to do this."
-msgstr "No hubo suficiente memoria para hacer esto."
+#: src/lib/dcp_content.cc:318
+msgid "There is other audio content overlapping this DCP; remove it."
+msgstr ""
+
+#: src/lib/dcp_content.cc:324
+msgid "There is other subtitle content overlapping this DCP; remove it."
+msgstr ""
+
+#: src/lib/dcp_content.cc:312
+msgid "There is other video content overlapping this DCP; remove it."
+msgstr ""
 
-#: src/lib/film.cc:372
+#: src/lib/job.cc:138
+msgid ""
+"There was not enough memory to do this.  If you are running a 32-bit "
+"operating system try reducing the number of encoding threads in the General "
+"tab of Preferences."
+msgstr ""
+
+#: src/lib/film.cc:382
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -792,7 +841,7 @@ msgstr ""
 "desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
 "volver a añadir y configurar ton contenido. ¡Lo siento!"
 
-#: src/lib/film.cc:364
+#: src/lib/film.cc:374
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -806,7 +855,7 @@ msgstr ""
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:54
+#: src/lib/transcode_job.cc:55
 msgid "Transcode %1"
 msgstr "Codificar %1"
 
@@ -818,15 +867,15 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:47
+#: src/lib/image_proxy.cc:48
 msgid "Unexpected image type received by server"
 msgstr "El servidor recibió un tipo de imagen inesperada"
 
-#: src/lib/job.cc:123
+#: src/lib/job.cc:155
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:282
+#: src/lib/ffmpeg_decoder.cc:234
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
@@ -834,43 +883,43 @@ msgstr "Formato de audio desconocido (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
-#: src/lib/ffmpeg_content.cc:377 src/lib/ffmpeg_content.cc:391
-#: src/lib/ffmpeg_content.cc:405 src/lib/ffmpeg_content.cc:407
-#: src/lib/ffmpeg_content.cc:408 src/lib/ffmpeg_content.cc:421
-#: src/lib/ffmpeg_content.cc:423 src/lib/ffmpeg_content.cc:424
-#: src/lib/ffmpeg_content.cc:445 src/lib/ffmpeg_content.cc:446
+#: src/lib/ffmpeg_content.cc:381 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:419 src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:422 src/lib/ffmpeg_content.cc:435
+#: src/lib/ffmpeg_content.cc:437 src/lib/ffmpeg_content.cc:438
+#: src/lib/ffmpeg_content.cc:459 src/lib/ffmpeg_content.cc:460
 msgid "Unspecified"
-msgstr ""
+msgstr "Sin especificar"
 
-#: src/lib/colour_conversion.cc:221
+#: src/lib/colour_conversion.cc:222
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/upmixer_a.cc:128
+#: src/lib/upmixer_a.cc:126 src/lib/upmixer_b.cc:136
 msgid "Upmix L"
-msgstr ""
+msgstr "Upmix L"
 
-#: src/lib/upmixer_a.cc:129
+#: src/lib/upmixer_a.cc:127 src/lib/upmixer_b.cc:137
 msgid "Upmix R"
-msgstr ""
+msgstr "Upmix R"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1264
 msgid "VI"
-msgstr ""
+msgstr "VI"
 
 #: src/lib/video_content.cc:580
 msgid "Video frame rate"
-msgstr ""
+msgstr "Velocidad de imagen"
 
 #: src/lib/video_content.cc:578
 msgid "Video length"
-msgstr ""
+msgstr "Duración del video"
 
 #: src/lib/video_content.cc:579
 msgid "Video size"
-msgstr ""
+msgstr "Tamaño del video"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:490
 msgid "Visually impaired"
 msgstr "Ciegos"
 
@@ -878,31 +927,31 @@ msgstr "Ciegos"
 msgid "Waiting"
 msgstr "Esperando"
 
-#: src/lib/ffmpeg_content.cc:451
+#: src/lib/ffmpeg_content.cc:465
 msgid "YCOCG"
-msgstr ""
+msgstr "YCOCG"
 
 #: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:287
+#: src/lib/film.cc:295
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:78
 msgid "[moving images]"
 msgstr "[imágenes en movimiento]"
 
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:76
 msgid "[still]"
 msgstr "[imagen fija]"
 
-#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
+#: src/lib/dcp_subtitle_content.cc:94 src/lib/subrip_content.cc:71
 msgid "[subtitles]"
 msgstr "[subtítulos]"
 
-#: src/lib/film.cc:268
+#: src/lib/film.cc:272
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
@@ -914,11 +963,11 @@ msgstr "tiempo de conexión agotado"
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:283
+#: src/lib/film.cc:291
 msgid "container"
 msgstr "continente"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:299
 msgid "content type"
 msgstr "tipo de contenido"
 
@@ -926,46 +975,38 @@ msgstr "tipo de contenido"
 msgid "copying %1"
 msgstr "copiando %1"
 
-#: src/lib/exceptions.cc:36
+#: src/lib/exceptions.cc:37
 msgid "could not create file %1"
 msgstr "No se pudo crear el fichero (%1)"
 
-#: src/lib/ffmpeg.cc:132
+#: src/lib/ffmpeg.cc:137
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/writer.cc:520
+#: src/lib/reel_writer.cc:314
 msgid "could not move audio asset into the DCP (%1)"
-msgstr ""
+msgstr "no se puede mover el audio en el DCP (%1)"
 
 #: src/lib/sndfile_base.cc:47
 msgid "could not open audio file for reading"
 msgstr "no se pudo abrir el fichero de audio para lectura"
 
-#: src/lib/exceptions.cc:29
+#: src/lib/exceptions.cc:30
 msgid "could not open file %1"
 msgstr "no se pudo abrir el fichero %1"
 
-#: src/lib/data.cc:55
+#: src/lib/data.cc:56
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/data.cc:61
+#: src/lib/data.cc:62
 msgid "could not read from file"
-msgstr ""
+msgstr "No se pudo leer del fichero %1 (%2)"
 
-#: src/lib/exceptions.cc:42
+#: src/lib/exceptions.cc:43
 msgid "could not read from file %1 (%2)"
 msgstr "No se pudo leer del fichero %1 (%2)"
 
-#: src/lib/resampler.cc:96
-msgid "could not run sample-rate converter"
-msgstr "no se pudo ejecutar el conversor de velocidad"
-
-#: src/lib/resampler.cc:77
-msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
-msgstr "no se pudo ejecutar el conversor de velocidad"
-
 #: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "no se pudo abrir la sesión SCP (%1)"
@@ -974,7 +1015,7 @@ msgstr "no se pudo abrir la sesión SCP (%1)"
 msgid "could not start SSH session"
 msgstr "no se pudo abrir la sesión SSH"
 
-#: src/lib/exceptions.cc:48
+#: src/lib/exceptions.cc:49
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir en el fichero (%1)"
 
@@ -990,71 +1031,86 @@ msgstr "error durante async_read (%1)"
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
-#. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:102
+#: src/lib/transcode_job.cc:105
 msgid "fps"
-msgstr ""
+msgstr "fps"
+
+#: src/lib/transcode_job.cc:104
+#, fuzzy
+msgid "frames"
+msgstr "fotogramas"
 
 #: src/lib/video_content.cc:580
 msgid "frames per second"
 msgstr "imágenes por segundo"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:142 src/lib/util.cc:145
 msgid "h"
-msgstr ""
+msgstr "h"
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:157 src/lib/util.cc:160
 msgid "m"
-msgstr ""
+msgstr "m"
 
-#: src/lib/exceptions.cc:54
+#: src/lib/exceptions.cc:55
 msgid "missing required setting %1"
 msgstr "falta una configuración obligatoria %1"
 
-#: src/lib/image_content.cc:102
+#: src/lib/image_content.cc:93
 msgid "moving"
 msgstr "moviendo"
 
-#: src/lib/ffmpeg_decoder.cc:452
-msgid "multi-part subtitles not yet supported"
-msgstr "todavía no se soportan subtítulos en múltiples partes"
-
-#: src/lib/film.cc:268 src/lib/film.cc:295
+#: src/lib/film.cc:272 src/lib/film.cc:303
 msgid "name"
 msgstr "nombre"
 
 #: src/lib/video_content.cc:524
 msgid "pixel aspect ratio"
-msgstr ""
+msgstr "proporción de aspecto de pixel"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:328
+#: src/lib/job.cc:364
 msgid "remaining"
 msgstr "pendiente"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:171
 msgid "s"
-msgstr ""
+msgstr "s"
 
-#: src/lib/colour_conversion.cc:262
+#: src/lib/colour_conversion.cc:263
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/image_content.cc:100
+#: src/lib/image_content.cc:91
 msgid "still"
 msgstr "imagen fija"
 
-#: src/lib/ffmpeg_examiner.cc:252
+#: src/lib/ffmpeg_examiner.cc:301
 msgid "unknown"
 msgstr "desconocido"
 
 #: src/lib/video_content.cc:578
 msgid "video frames"
-msgstr ""
+msgstr "fotogramas"
+
+#~ msgid "Finding length"
+#~ msgstr "Buscando la duración"
+
+#~ msgid "multi-part subtitles not yet supported"
+#~ msgstr "todavía no se soportan subtítulos en múltiples partes"
+
+#~ msgid "There was not enough memory to do this."
+#~ msgstr "No hubo suficiente memoria para hacer esto."
+
+#~ msgid "could not run sample-rate converter"
+#~ msgstr "no se pudo ejecutar el conversor de velocidad"
+
+#~ msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
+#~ msgstr "no se pudo ejecutar el conversor de velocidad"
 
 #~ msgid "1.375"
 #~ msgstr "1.375"