X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fpo%2Fes_ES.po;h=f463b8a9accb89058ac52b113c795683f614e018;hp=d94bd55c94ae72fbd03bf276bf368fa2257bc981;hb=054c8250b5157ce3b080c359c4ec3d1593f6b5c6;hpb=d0c1a424686345942bf916fd9fcfa0f399adfd11

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index d94bd55c9..f463b8a9a 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: 2019-03-18 17:30+0000\n"
+"POT-Creation-Date: 2021-05-27 14:46+0200\n"
 "PO-Revision-Date: 2018-02-25 14:29-0600\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: src/lib/video_content.cc:444
+#: src/lib/video_content.cc:486
 #, c-format
 msgid ""
 "\n"
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "Velocidad del contenido %.4f\n"
 
-#: src/lib/video_content.cc:409
+#: src/lib/video_content.cc:451
 msgid ""
 "\n"
 "Cropped to %1x%2"
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "Recortado a %1x%2"
 
-#: src/lib/video_content.cc:402
+#: src/lib/video_content.cc:444
 #, c-format
 msgid ""
 "\n"
@@ -43,7 +43,7 @@ msgstr ""
 "\n"
 "Proporción de aspecto mostrada %.2f:1"
 
-#: src/lib/video_content.cc:432
+#: src/lib/video_content.cc:474
 msgid ""
 "\n"
 "Padded with black to fit container %1 (%2x%3)"
@@ -51,7 +51,7 @@ msgstr ""
 "\n"
 "Completado con negro para cubrir el contenedor %1 (%2x%3)"
 
-#: src/lib/video_content.cc:422
+#: src/lib/video_content.cc:464
 msgid ""
 "\n"
 "Scaled to %1x%2"
@@ -59,18 +59,18 @@ msgstr ""
 "\n"
 "Redimensionado a %1x%2"
 
-#: src/lib/video_content.cc:426 src/lib/video_content.cc:437
+#: src/lib/video_content.cc:468 src/lib/video_content.cc:479
 #, c-format
 msgid " (%.2f:1)"
 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:458
+#: src/lib/job.cc:491
 msgid " on %1"
 msgstr " el %1"
 
-#: src/lib/config.cc:1158
+#: src/lib/config.cc:1121
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -92,90 +92,116 @@ msgstr ""
 "Longitud: $LENGTH\n"
 "Tamaño: $SIZE\n"
 
-#: src/lib/config.cc:1136
+#: src/lib/config.cc:1099
 msgid "$JOB_NAME: $JOB_STATUS"
 msgstr ""
 
-#: src/lib/atmos_mxf_content.cc:83
+#: src/lib/cross_common.cc:94
+msgid "%1 (%2 GB) [%3]"
+msgstr ""
+
+#: src/lib/atmos_mxf_content.cc:96
 msgid "%1 [Atmos]"
 msgstr "%1 [Atmos]"
 
-#: src/lib/dcp_content.cc:268
+#: src/lib/dcp_content.cc:319
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/ffmpeg_content.cc:337
+#: src/lib/ffmpeg_content.cc:345
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:333
+#: src/lib/ffmpeg_content.cc:341
 msgid "%1 [movie]"
 msgstr "%1 [película]"
 
-#: src/lib/ffmpeg_content.cc:335 src/lib/video_mxf_content.cc:96
+#: src/lib/ffmpeg_content.cc:343 src/lib/video_mxf_content.cc:105
 msgid "%1 [video]"
 msgstr "%1 [película]"
 
-#: src/lib/video_content.cc:397
+#: src/lib/video_content.cc:439
 #, c-format
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ", proporción de aspecto de pixel %.2f:1"
 
-#: src/lib/ratio.cc:38
+#: src/lib/ratio.cc:42
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/ratio.cc:39
+#: src/lib/ratio.cc:43
 msgid "1.33 (4:3)"
 msgstr "1.33 (4:3)"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:44
 msgid "1.38 (Academy)"
 msgstr "1.38 (Academia)"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ratio.cc:45
 msgid "1.43 (IMAX)"
 msgstr "1.43 (IMAX)"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:46
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:47
 msgid "1.78 (16:9 or HD)"
 msgstr "1.78 (16:9 o HD)"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:48
 msgid "1.85 (Flat)"
 msgstr "1.85 (Flat)"
 
-#: src/lib/ratio.cc:47
+#: src/lib/ratio.cc:51
 msgid "1.90 (Full frame)"
 msgstr "1.90 (Frame completo)"
 
-#: src/lib/ratio.cc:45
+#: src/lib/ratio.cc:49
 msgid "2.35 (35mm Scope)"
 msgstr "2.35 (Scope 35mm)"
 
-#: src/lib/ratio.cc:46
+#: src/lib/ratio.cc:50
 msgid "2.39 (Scope)"
 msgstr "2.39 (Scope)"
 
-#: src/lib/filter.cc:77
+#: src/lib/filter.cc:87
 msgid "3D denoiser"
 msgstr "reducción de ruido 3D"
 
+#: src/lib/hints.cc:211
+msgid ""
+"4K 3D is only supported by a very limited number of projectors.  Unless you "
+"know that you will play this DCP back on a capable projector, it is "
+"advisable to set the DCP to be 2K in the \"DCP→Video\" tab."
+msgstr ""
+
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:129
+#: src/lib/transcode_job.cc:155
 #, c-format
 msgid "; %.1f fps"
 msgstr "; %.1f fps"
 
-#: src/lib/job.cc:463
+#: src/lib/job.cc:496
 msgid "; %1 remaining; finishing at %2%3"
 msgstr "; faltan %1 ; terminará a las %2%3"
 
-#: src/lib/hints.cc:155
+#: src/lib/analytics.cc:64
+msgid ""
+"<h2>You have made %1 DCPs with DCP-o-matic!</h2><img width=\"20%%\" src="
+"\"memory:me.jpg\" align=\"center\"><p>Hello. I'm Carl and I'm the developer "
+"of DCP-o-matic. I work on it in my spare time (with the help of a fine "
+"volunteer team of testers and translators) and I release it as free software."
+"<p>If you find DCP-o-matic useful, please consider a donation to the "
+"project. Financial support will help me to spend more time developing DCP-o-"
+"matic and making it better!<p><ul><li><a href=\"https://dcpomatic.com/"
+"donate_amount?amount=40\">Go to Paypal to donate €40</a><li><a href="
+"\"https://dcpomatic.com/donate_amount?amount=20\">Go to Paypal to donate "
+"€20</a><li><a href=\"https://dcpomatic.com/donate_amount?amount=10\">Go to "
+"Paypal to donate €10</a></ul><p>Thank you!"
+msgstr ""
+
+#: src/lib/hints.cc:168
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
@@ -185,26 +211,15 @@ 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:615
+#: src/lib/ffmpeg_content.cc:635
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr "ARIB STD-B67 ('Log-gamma híbrido')"
 
-#: src/lib/dcp_content_type.cc:55
+#: src/lib/dcp_content_type.cc:60
 msgid "Advertisement"
 msgstr "Publicidad"
 
-#: src/lib/hints.cc:147
-#, fuzzy
-msgid ""
-"All of your content is 2.35:1 or narrower but your DCP's container is Scope "
-"(2.39:1).  This will pillar-box your content.  You may prefer to set your "
-"DCP's container to have the same ratio as your content."
-msgstr ""
-"Todo el contenido es 1.85:1 o más pequeño, pero tu contenedor DCP es Scope "
-"(2.39:1). Esto creará bandas negras verticales. Puede que prefieras "
-"seleccionar el contenedor DCP en Flat (1.85:1) en la pestaña \"DCP\"."
-
-#: src/lib/hints.cc:143
+#: src/lib/hints.cc:145
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -215,141 +230,217 @@ msgstr ""
 "(1.85:1). Esto creará bandas negras horizontales. Puede que prefieras "
 "seleccionar el contenedor DCP en Scope (2.39:1) en la pestaña \"DCP\"."
 
-#: src/lib/job.cc:103
+#: src/lib/hints.cc:149
+#, fuzzy
+msgid ""
+"All of your content narrower than 1.90:1 but your DCP's container is Scope "
+"(2.39:1).  This will pillar-box your content.  You may prefer to set your "
+"DCP's container to have the same ratio as your content."
+msgstr ""
+"Todo el contenido es 1.85:1 o más pequeño, pero tu contenedor DCP es Scope "
+"(2.39:1). Esto creará bandas negras verticales. Puede que prefieras "
+"seleccionar el contenedor DCP en Flat (1.85:1) en la pestaña \"DCP\"."
+
+#: src/lib/job.cc:106
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
-#: src/lib/analyse_audio_job.cc:96
+#: src/lib/analyse_audio_job.cc:70
 #, fuzzy
 msgid "Analysing audio"
 msgstr "Analizar audio"
 
-#: src/lib/audio_content.cc:257
+#: src/lib/analyse_subtitles_job.cc:55
+#, fuzzy
+msgid "Analysing subtitles"
+msgstr "Buscando subtítulos"
+
+#: src/lib/hints.cc:367
+msgid ""
+"At least one marker comes after the end of the project and will be ignored."
+msgstr ""
+
+#: src/lib/hints.cc:471
+msgid "At least one of your closed caption files is larger than "
+msgstr ""
+
+#: src/lib/hints.cc:464
+msgid "At least one of your closed caption files' XML part is larger than "
+msgstr ""
+
+#: src/lib/hints.cc:479
+msgid "At least one of your subtitle files is larger than "
+msgstr ""
+
+#: src/lib/hints.cc:443
+msgid ""
+"At least one of your subtitle lines has more than 52 characters.  It is "
+"recommended to make each line 52 characters at most in length."
+msgstr ""
+
+#: src/lib/hints.cc:445
+msgid ""
+"At least one of your subtitle lines has more than 79 characters.  You should "
+"make each line 79 characters at most in length."
+msgstr ""
+
+#: src/lib/hints.cc:588
+msgid ""
+"At least one of your subtitles has more than 3 lines.  It is advisable to "
+"use no more than 3 lines."
+msgstr ""
+
+#: src/lib/hints.cc:578
+msgid ""
+"At least one of your subtitles lasts less than 15 frames.  It is advisable "
+"to make each subtitle at least 15 frames long."
+msgstr ""
+
+#: src/lib/hints.cc:583
+msgid ""
+"At least one of your subtitles starts less than 2 frames after the previous "
+"one.  It is advisable to make the gap between subtitles at least 2 frames."
+msgstr ""
+
+#: src/lib/hints.cc:631
+msgid ""
+"At least one piece of subtitle or closed caption content has no specified "
+"language.  It is advisable to set the language for each piece of subtitle or "
+"closed caption content in the \"Content→Timed text\", \"Content→Open "
+"subtitles\" or \"Content→Closed captions\" tab."
+msgstr ""
+
+#: src/lib/audio_content.cc:291
 msgid "Audio will be resampled from %1Hz to %2Hz"
 msgstr "EL audio será remuestreado de %1Hz a %2Hz"
 
-#: src/lib/audio_content.cc:259
+#: src/lib/audio_content.cc:293
 msgid "Audio will be resampled to %1Hz"
 msgstr "EL audio será remuestreado a %1Hz"
 
-#: src/lib/audio_content.cc:248
+#: src/lib/audio_content.cc:282
 msgid "Audio will not be resampled"
 msgstr "El audio no será remuestreado"
 
-#: src/lib/ffmpeg_content.cc:609
+#: src/lib/ffmpeg_content.cc:629
 msgid "BT1361 extended colour gamut"
 msgstr "Gama de color extendido BT1361"
 
-#: src/lib/ffmpeg_content.cc:577
+#: src/lib/ffmpeg_content.cc:597
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:632
+#: src/lib/ffmpeg_content.cc:652
 msgid "BT2020 constant luminance"
 msgstr "BT2020 a luminosidad constante"
 
-#: src/lib/ffmpeg_content.cc:611
+#: src/lib/ffmpeg_content.cc:631
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 para un sistema de 10-bit"
 
-#: src/lib/ffmpeg_content.cc:612
+#: src/lib/ffmpeg_content.cc:632
 msgid "BT2020 for a 12-bit system"
 msgstr "BT2020 para un sistema de 12 bits"
 
-#: src/lib/ffmpeg_content.cc:631
+#: src/lib/ffmpeg_content.cc:651
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 a luminosidad no constante"
 
-#: src/lib/ffmpeg_content.cc:636
+#: src/lib/ffmpeg_content.cc:656
 msgid "BT2100"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:573
+#: src/lib/ffmpeg_content.cc:593
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:627
+#: src/lib/ffmpeg_content.cc:647
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:572
+#: src/lib/ffmpeg_content.cc:592
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:569 src/lib/ffmpeg_content.cc:598
-#: src/lib/ffmpeg_content.cc:623
+#: src/lib/ffmpeg_content.cc:589 src/lib/ffmpeg_content.cc:618
+#: src/lib/ffmpeg_content.cc:643
 msgid "BT709"
 msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:643
+#: src/lib/ffmpeg_content.cc:663
 msgid "Bits per pixel"
 msgstr "Bits por pixel"
 
-#: src/lib/util.cc:578
+#: src/lib/filter.cc:83
+#, fuzzy
+msgid "Bob Weaver Deinterlacing Filter"
+msgstr "Yet Another Deinterlacing Filter"
+
+#: src/lib/util.cc:596
 msgid "BsL"
 msgstr "BsL"
 
-#: src/lib/util.cc:579
+#: src/lib/util.cc:597
 msgid "BsR"
 msgstr "BsR"
 
-#: src/lib/util.cc:570
+#: src/lib/util.cc:588
 msgid "C"
 msgstr "C"
 
-#: src/lib/job.cc:472
+#: src/lib/job.cc:505
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/lib/film.cc:304
+#: src/lib/film.cc:363
 #, fuzzy
 msgid "Cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/exceptions.cc:61
+#: src/lib/exceptions.cc:78
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "No se puede usar el formato de pixel %1 para %2"
 
-#: src/lib/film.cc:1324
+#: src/lib/film.cc:1654
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr ""
 
-#: src/lib/util.cc:539
+#: src/lib/util.cc:557
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/audio_content.cc:292
+#: src/lib/audio_content.cc:329
 msgid "Channels"
 msgstr "Canales"
 
-#: src/lib/check_content_change_job.cc:46
+#: src/lib/check_content_change_job.cc:52
 msgid "Checking content for changes"
 msgstr ""
 
-#: src/lib/reel_writer.cc:100
+#: src/lib/reel_writer.cc:250
 msgid "Checking existing image data"
 msgstr "Comprobando las imágenes existentes"
 
-#: src/lib/check_content_change_job.cc:90
+#: src/lib/check_content_change_job.cc:93
 msgid "Choose 'Make DCP' again when you have done this."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:635
+#: src/lib/ffmpeg_content.cc:655
 #, fuzzy
 msgid "Chroma-derived constant luminance"
 msgstr "BT2020 a luminosidad constante"
 
-#: src/lib/ffmpeg_content.cc:634
+#: src/lib/ffmpeg_content.cc:654
 #, fuzzy
 msgid "Chroma-derived non-constant luminance"
 msgstr "BT2020 a luminosidad no constante"
 
-#: src/lib/types.cc:139
+#: src/lib/types.cc:143
 #, fuzzy
 msgid "Closed captions"
 msgstr "Reducción de ruido"
 
-#: src/lib/ffmpeg_content.cc:594
+#: src/lib/ffmpeg_content.cc:614
 msgid "Colour primaries"
 msgstr "Colores primarios"
 
@@ -363,49 +454,69 @@ 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:526 src/lib/ffmpeg_content.cc:533
-#: src/lib/ffmpeg_content.cc:540 src/lib/ffmpeg_content.cc:550
-#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:560
+#: src/lib/ffmpeg_content.cc:546 src/lib/ffmpeg_content.cc:553
+#: src/lib/ffmpeg_content.cc:560 src/lib/ffmpeg_content.cc:570
+#: src/lib/ffmpeg_content.cc:575 src/lib/ffmpeg_content.cc:580
 msgid "Colour range"
 msgstr "Rango de color"
 
-#: src/lib/ffmpeg_content.cc:619
+#: src/lib/ffmpeg_content.cc:639
 msgid "Colour transfer characteristic"
 msgstr "Características de la transferencia de color"
 
-#: src/lib/ffmpeg_content.cc:640
+#: src/lib/ffmpeg_content.cc:660
 msgid "Colourspace"
 msgstr "Espacio de color"
 
-#: src/lib/content.cc:185
+#: src/lib/combine_dcp_job.cc:46
+msgid "Combine DCPs"
+msgstr ""
+
+#: src/lib/content.cc:190
 msgid "Computing digest"
 msgstr "Calculando la firma resumen"
 
-#: src/lib/writer.cc:519
+#: src/lib/writer.cc:535
 msgid "Computing digests"
 msgstr "Calculando la firma resumen"
 
-#: src/lib/frame_rate_change.cc:101
+#: src/lib/analytics.cc:62
+msgid "Congratulations!"
+msgstr ""
+
+#: src/lib/frame_rate_change.cc:90
 msgid "Content and DCP have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:330
 msgid "Content audio sample rate"
 msgstr "Velocidad del contenido de audio"
 
-#: src/lib/ffmpeg_content.cc:151
+#: src/lib/ffmpeg_content.cc:155
 msgid "Content to be joined must all have or not have audio"
 msgstr "Para unir contenido deben tener audio todos o ninguno"
 
-#: src/lib/ffmpeg_content.cc:154
+#: src/lib/ffmpeg_content.cc:158
 #, fuzzy
 msgid "Content to be joined must all have or not have subtitles or captions"
 msgstr "Para unir contenido deben tener subtítulos todos o ninguno"
 
-#: src/lib/ffmpeg_content.cc:148
+#: src/lib/ffmpeg_content.cc:152
 msgid "Content to be joined must all have or not have video"
 msgstr "Para unir contenido deben tener vídeo todos o ninguno"
 
+#: src/lib/text_content.cc:305
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr ""
+"Para unir contenido debe tener la misma separación de línea de subtítulos."
+
+#: src/lib/video_content.cc:207
+#, fuzzy
+msgid "Content to be joined must have all its video used or not used."
+msgstr "Para unir contenido debe tener la misma velocidad de imagen"
+
 #: src/lib/text_content.cc:260
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr "Para unir contenido debe tener la misma opción ‘grabar subtítulos’."
@@ -414,23 +525,43 @@ msgstr "Para unir contenido debe tener la misma opción ‘grabar subtítulos’
 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'."
 
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:118
 msgid "Content to be joined must have the same audio delay."
 msgstr "Para unir contenido debe tener el mismo retardo de audio."
 
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:114
 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:183
+#: src/lib/audio_content.cc:122
+#, fuzzy
+msgid "Content to be joined must have the same audio language."
+msgstr "Para unir contenido debe tener la misma ganancia de audio."
+
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr "Para unir contenido debe tener la misma opción ‘grabar subtítulos’."
+
+#: src/lib/video_content.cc:231
 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:175
+#: src/lib/video_content.cc:219
 msgid "Content to be joined must have the same crop."
 msgstr "Para unir contenido debe tener el mismo recorte."
 
-#: src/lib/video_content.cc:187
+#: src/lib/video_content.cc:223
+#, fuzzy
+msgid "Content to be joined must have the same custom ratio setting."
+msgstr "Para unir contenido debe tener la misma redimensión."
+
+#: src/lib/video_content.cc:227
+#, fuzzy
+msgid "Content to be joined must have the same custom size setting."
+msgstr "Para unir contenido debe tener la misma redimensión."
+
+#: src/lib/video_content.cc:235
 msgid "Content to be joined must have the same fades."
 msgstr "Para unir contenido debe tener los mismos fundidos."
 
@@ -438,14 +569,10 @@ msgstr "Para unir contenido debe tener los mismos fundidos."
 msgid "Content to be joined must have the same outline width."
 msgstr "Para unir contenido debe tener la misma anchura de contorno."
 
-#: src/lib/video_content.cc:167
+#: src/lib/video_content.cc:211
 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:179
-msgid "Content to be joined must have the same scale setting."
-msgstr "Para unir contenido debe tener la misma redimensión."
-
 #: src/lib/text_content.cc:264
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
@@ -474,11 +601,11 @@ msgid "Content to be joined must have the same subtitle line spacing."
 msgstr ""
 "Para unir contenido debe tener la misma separación de línea de subtítulos."
 
-#: src/lib/content.cc:132 src/lib/content.cc:136
+#: src/lib/content.cc:134 src/lib/content.cc:138
 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:171
+#: src/lib/video_content.cc:215
 msgid "Content to be joined must have the same video frame type."
 msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
@@ -487,40 +614,54 @@ msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 msgid "Content to be joined must use the same DCP track."
 msgstr "Para unir contenido debe usar la misma fuente."
 
-#: src/lib/text_content.cc:293 src/lib/text_content.cc:305
+#: src/lib/text_content.cc:293 src/lib/text_content.cc:313
 msgid "Content to be joined must use the same fonts."
 msgstr "Para unir contenido debe usar la misma fuente."
 
-#: src/lib/ffmpeg_content.cc:175
+#: src/lib/ffmpeg_content.cc:179
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
 
-#: src/lib/video_content.cc:388
+#: src/lib/text_content.cc:301
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "Para unir contenido debe usar la misma fuente."
+
+#: src/lib/video_content.cc:430
 msgid "Content video is %1x%2"
 msgstr "El video es %1x%2"
 
-#: src/lib/upload_job.cc:52
+#: src/lib/upload_job.cc:60
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
 
-#: src/lib/scp_uploader.cc:51
+#: src/lib/reel_writer.cc:134
+msgid "Copying old video file"
+msgstr ""
+
+#: src/lib/reel_writer.cc:389
+#, fuzzy
+msgid "Copying video file into DCP"
+msgstr "El tamaño de los vídeos no coincide en el DCP"
+
+#: src/lib/scp_uploader.cc:55
 msgid "Could not connect to server %1 (%2)"
 msgstr "No se pudo conectar al servidor %1 (%2)"
 
-#: src/lib/scp_uploader.cc:88
+#: src/lib/scp_uploader.cc:96
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/image_examiner.cc:62
+#: src/lib/image_examiner.cc:65
 msgid "Could not decode JPEG2000 file %1 (%2)"
 msgstr "No se pudo descodificar el fichero JPEG2000 %1 (%2)"
 
-#: src/lib/ffmpeg_image_proxy.cc:152
+#: src/lib/ffmpeg_image_proxy.cc:163
 #, fuzzy
 msgid "Could not decode image (%1)"
 msgstr "No se pudo descodificar el fichero de imagen (%1)"
 
-#: src/lib/encode_server_finder.cc:193
+#: src/lib/encode_server_finder.cc:191
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
@@ -528,86 +669,87 @@ msgstr ""
 "No se pueden buscar servidores de codificación externos. Quizás haya otro "
 "DCP-o-matic ejecutándose."
 
-#: src/lib/job.cc:122 src/lib/job.cc:137
+#: src/lib/job.cc:161 src/lib/job.cc:176
 msgid "Could not open %1"
 msgstr "No se pudo abrir %1"
 
-#: src/lib/curl_uploader.cc:86 src/lib/scp_uploader.cc:101
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:110
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
-#: src/lib/internet.cc:115 src/lib/internet.cc:120
+#: src/lib/internet.cc:164 src/lib/internet.cc:169
 msgid "Could not open downloaded ZIP file"
 msgstr "No se puedo abrir el fichero ZIP descargado"
 
-#: src/lib/internet.cc:127
+#: src/lib/internet.cc:176
 #, fuzzy
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
 msgstr "No se puedo abrir el fichero ZIP descargado"
 
-#: src/lib/config.cc:1039
+#: src/lib/config.cc:985
 #, fuzzy
 msgid "Could not open file for writing"
 msgstr "no se pudo abrir el fichero %1 para escritura (%2)"
 
-#: src/lib/dcp_subtitle.cc:55
+#: src/lib/ffmpeg_file_encoder.cc:266
+#, fuzzy
+msgid "Could not open output file %1 (%2)"
+msgstr "no se pudo escribir en el fichero %1 (%2)"
+
+#: src/lib/dcp_subtitle.cc:59
 msgid "Could not read subtitles (%1 / %2)"
 msgstr "No se pudieron leer los subtítulos (%1 / %2)"
 
-#: src/lib/scp_uploader.cc:71
-msgid "Could not start SCP session (%1)"
-msgstr "No se pudo iniciar la sesión SCP (%1)"
-
-#: src/lib/curl_uploader.cc:49
+#: src/lib/curl_uploader.cc:50
 msgid "Could not start transfer"
 msgstr "No se pudo iniciar la transferencia"
 
-#: src/lib/curl_uploader.cc:93 src/lib/scp_uploader.cc:118
+#: src/lib/curl_uploader.cc:97 src/lib/scp_uploader.cc:127
 msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/util.cc:549
+#: src/lib/util.cc:567
 msgid "D-BOX primary"
 msgstr "Primario D-BOX"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:568
 msgid "D-BOX secondary"
 msgstr "Secundario D-BOX"
 
-#: src/lib/util.cc:580
+#: src/lib/util.cc:598
 msgid "DBP"
 msgstr "DBP"
 
-#: src/lib/util.cc:581
+#: src/lib/util.cc:599
 msgid "DBS"
 msgstr "DBS"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:48
 msgid "DCI Flat"
 msgstr "Flat DCI"
 
-#: src/lib/ratio.cc:46
+#: src/lib/ratio.cc:50
 msgid "DCI Scope"
 msgstr "Scope DCI"
 
-#: src/lib/dcp_subtitle_content.cc:106
+#: src/lib/dcp_subtitle_content.cc:103
 msgid "DCP XML subtitles"
 msgstr "Subtítulos DCP XML"
 
-#: src/lib/audio_content.cc:313
+#: src/lib/audio_content.cc:350
 msgid "DCP sample rate"
 msgstr "Velocidad del DCP"
 
-#: src/lib/frame_rate_change.cc:114
+#: src/lib/frame_rate_change.cc:103
 #, c-format
 msgid "DCP will run at %.1f%% of the content speed.\n"
 msgstr "El DCP se reproducirá al %.1f%% de la velocidad de la fuente.\n"
 
-#: src/lib/frame_rate_change.cc:104
+#: src/lib/frame_rate_change.cc:93
 msgid "DCP will use every other frame of the content.\n"
 msgstr "El DCP usará una de cada dos imágenes de la fuente.\n"
 
-#: src/lib/job.cc:124 src/lib/job.cc:139
+#: src/lib/job.cc:163 src/lib/job.cc:178
 msgid ""
 "DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
 "is in an unexpected format."
@@ -615,27 +757,37 @@ msgstr ""
 "DCP-o-matic no pudo abrir el fichero %1 (%2). Quizás no existe o está en un "
 "formato inesperado."
 
-#: src/lib/film.cc:1246
+#: src/lib/film.cc:1557
 msgid ""
 "DCP-o-matic had to change your settings for referring to DCPs as OV.  Please "
 "review those settings to make sure they are what you want."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:113
+#: src/lib/film.cc:1525
+msgid ""
+"DCP-o-matic had to change your settings so that the film's frame rate is the "
+"same as that of your Atmos content."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:118
 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."
 
-#: src/lib/config.cc:364 src/lib/config.cc:1133
+#: src/lib/config.cc:352 src/lib/config.cc:1096
 msgid "DCP-o-matic notification"
 msgstr ""
 
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
-#: src/lib/filter.cc:74
+#: src/lib/datasat_ap2x.cc:28
+msgid "Datasat AP20 or AP25"
+msgstr ""
+
+#: src/lib/filter.cc:80 src/lib/filter.cc:81 src/lib/filter.cc:82
+#: src/lib/filter.cc:83 src/lib/filter.cc:84
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
-#: src/lib/config.cc:1121
+#: src/lib/config.cc:1084
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -661,496 +813,536 @@ msgstr ""
 "Atentamente,\n"
 "DCP-o-matic"
 
-#: src/lib/dolby_cp750.cc:28
-msgid "Dolby CP650 and CP750"
+#: src/lib/dolby_cp750.cc:31
+#, fuzzy
+msgid "Dolby CP650 or CP750"
 msgstr "Dolby CP650 and CP750"
 
-#: src/lib/internet.cc:73
+#: src/lib/internet.cc:121
 #, fuzzy
 msgid "Download failed (%1 error %2)"
 msgstr "Descarga fallida (%1/%2 error %3)"
 
-#: src/lib/frame_rate_change.cc:106
+#: src/lib/frame_rate_change.cc:95
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada imagen en el DCP.\n"
 
-#: src/lib/frame_rate_change.cc:108
+#: src/lib/frame_rate_change.cc:97
 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:61
+#: src/lib/send_kdm_email_job.cc:89
 msgid "Email KDMs"
 msgstr "Enviar las KDM"
 
-#: src/lib/send_kdm_email_job.cc:64
-msgid "Email KDMs for %1"
+#: src/lib/send_kdm_email_job.cc:92
+#, fuzzy
+msgid "Email KDMs for %2"
 msgstr "Enviar por email las KDM para %1"
 
-#: src/lib/send_notification_email_job.cc:46
+#: src/lib/send_notification_email_job.cc:55
 msgid "Email notification"
 msgstr ""
 
-#: src/lib/send_problem_report_job.cc:59
+#: src/lib/send_problem_report_job.cc:68
 msgid "Email problem report"
 msgstr "Enviar por correo el problema"
 
-#: src/lib/send_problem_report_job.cc:62
+#: src/lib/send_problem_report_job.cc:71
 msgid "Email problem report for %1"
 msgstr "Enviar por correo el problema para %1"
 
-#: src/lib/dcp_encoder.cc:96 src/lib/ffmpeg_encoder.cc:119
+#: src/lib/dcp_encoder.cc:103 src/lib/ffmpeg_encoder.cc:122
 msgid "Encoding"
 msgstr "Codificando"
 
-#: src/lib/exceptions.cc:67
+#: src/lib/dcp_content_type.cc:61
+msgid "Episode"
+msgstr ""
+
+#: src/lib/exceptions.cc:85
 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:470
+#: src/lib/job.cc:503
 msgid "Error: %1"
 msgstr "Error: %1"
 
-#: src/lib/hints.cc:265
+#: src/lib/hints.cc:406
 #, fuzzy
-msgid "Examining closed captions"
+msgid "Examining audio, subtitles and closed captions"
 msgstr "Examinar contenido"
 
-#: src/lib/examine_content_job.cc:44
+#: src/lib/examine_content_job.cc:49
 #, fuzzy
 msgid "Examining content"
 msgstr "Examinar contenido"
 
-#: src/lib/examine_ffmpeg_subtitles_job.cc:49
+#: src/lib/examine_ffmpeg_subtitles_job.cc:54
 #, fuzzy
 msgid "Examining subtitles"
 msgstr "Buscando subtítulos"
 
-#: src/lib/ffmpeg_content.cc:626
+#: src/lib/hints.cc:404
+#, fuzzy
+msgid "Examining subtitles and closed captions"
+msgstr "Examinar contenido"
+
+#: src/lib/subtitle_encoder.cc:98
+#, fuzzy
+msgid "Extracting"
+msgstr "Clasificación"
+
+#: src/lib/ffmpeg_content.cc:646
 msgid "FCC"
 msgstr "FCC"
 
-#: src/lib/scp_uploader.cc:61
+#: src/lib/scp_uploader.cc:67
 msgid "Failed to authenticate with server (%1)"
 msgstr "Fallo al identificarse con el servidor (%1)"
 
-#: src/lib/emailer.cc:222
+#: src/lib/job.cc:130 src/lib/job.cc:140
+#, fuzzy
+msgid "Failed to encode the DCP."
+msgstr "Error al enviar el correo electrónico (%1)"
+
+#: src/lib/emailer.cc:234
 #, fuzzy
 msgid "Failed to send email"
 msgstr "Error al enviar el correo electrónico (%1)"
 
-#: src/lib/dcp_content_type.cc:46
+#: src/lib/dcp_content_type.cc:51
 msgid "Feature"
 msgstr "Película"
 
-#: src/lib/content.cc:428
+#: src/lib/content.cc:464
 msgid "Filename"
 msgstr "Nombre de fichero"
 
-#: src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:596
 msgid "Film"
 msgstr "Película"
 
-#: src/lib/ffmpeg_examiner.cc:97
+#: src/lib/ffmpeg_examiner.cc:111
 msgid "Finding length"
 msgstr "Buscando la duración"
 
-#: src/lib/content.cc:435
+#: src/lib/content.cc:471
 msgid "Frame rate"
 msgstr "Velocidad"
 
-#: src/lib/util.cc:879
+#: src/lib/util.cc:941
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/lib/ffmpeg_content.cc:560
+#: src/lib/ffmpeg_content.cc:580
 msgid "Full"
 msgstr "Completo"
 
-#: src/lib/ffmpeg_content.cc:540
+#: src/lib/ffmpeg_content.cc:560
 msgid "Full (0-%1)"
 msgstr "Completo (0-%1)"
 
-#: src/lib/ratio.cc:47
+#: src/lib/ratio.cc:51
 msgid "Full frame"
 msgstr "Frame completo"
 
-#: src/lib/audio_content.cc:320
+#: src/lib/audio_content.cc:357
 msgid "Full length in audio samples at DCP rate"
 msgstr "Longitud total en frames de audio a la velocidad del DCP"
 
-#: src/lib/audio_content.cc:307
+#: src/lib/audio_content.cc:344
 msgid "Full length in audio samples at content rate"
 msgstr "Longitud total en frames de audio a la velocidad del contenido"
 
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:351
 msgid "Full length in video frames at DCP rate"
 msgstr "Longitud total en frames de vídeo a la velocidad del DCP"
 
-#: src/lib/audio_content.cc:300
+#: src/lib/audio_content.cc:337
 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:601
+#: src/lib/ffmpeg_content.cc:621
 msgid "Gamma 22 (BT470M)"
 msgstr "Gamma 22 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:602
+#: src/lib/ffmpeg_content.cc:622
 msgid "Gamma 28 (BT470BG)"
 msgstr "Gamma 28 (BT470BG)"
 
-#: src/lib/filter.cc:75
+#: src/lib/filter.cc:85
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:592
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:543
+#: src/lib/util.cc:561
 msgid "Hearing impaired"
 msgstr "Sordos"
 
-#: src/lib/filter.cc:78
+#: src/lib/filter.cc:88
 msgid "High quality 3D denoiser"
 msgstr "Reductor de ruido 3D de alta calidad"
 
-#: src/lib/filter.cc:68
+#: src/lib/filter.cc:77
 #, fuzzy
 msgid "Horizontal flip"
 msgstr "Horizontal deblocking filter"
 
-#: src/lib/audio_content.cc:293 src/lib/audio_content.cc:313
+#: src/lib/audio_content.cc:330 src/lib/audio_content.cc:350
 msgid "Hz"
 msgstr "Hz"
 
-#: src/lib/ffmpeg_content.cc:610
+#: src/lib/ffmpeg_content.cc:630
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB o sYCC)"
 
-#: src/lib/ffmpeg_content.cc:608
+#: src/lib/ffmpeg_content.cc:628
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
-#: src/lib/hints.cc:168
+#: src/lib/hints.cc:187
 msgid "If you do use 25fps you should change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/job.cc:147 src/lib/job.cc:203 src/lib/job.cc:213
+#: src/lib/hints.cc:250
+msgid ""
+"In general it is now advisable to make SMPTE DCPs unless you have a "
+"particular reason to use Interop.  You are advised to set your DCP to use "
+"the SMPTE standard in the \"DCP\" tab."
+msgstr ""
+
+#: src/lib/hints.cc:571
+msgid ""
+"It is advisable to put your first subtitle at least 4 seconds after the "
+"start of the DCP to make sure it is seen."
+msgstr ""
+
+#: src/lib/job.cc:151 src/lib/job.cc:186 src/lib/job.cc:236 src/lib/job.cc:246
 msgid "It is not known what caused this error."
 msgstr "Error desconocido."
 
-#: src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:610
 msgid "JEDEC P22"
 msgstr ""
 
-#: src/lib/config.cc:354 src/lib/config.cc:1118
+#: src/lib/config.cc:342 src/lib/config.cc:1081
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envío de KDM: $CPL_NAME"
 
-#: src/lib/dcp.cc:82
-msgid "KDM was made for DCP-o-matic but not for its leaf certificate."
-msgstr ""
-
-#: src/lib/dcp.cc:80
-msgid "KDM was not made for DCP-o-matic's decryption certificate."
-msgstr ""
-
-#: src/lib/filter.cc:72
+#: src/lib/filter.cc:81
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
-#: src/lib/ffmpeg_encoder.cc:203 src/lib/util.cc:568
+#: src/lib/ffmpeg_encoder.cc:251 src/lib/util.cc:586
 msgid "L"
 msgstr "L"
 
-#: src/lib/util.cc:576
+#: src/lib/util.cc:594
 msgid "Lc"
 msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:537
+#: src/lib/mid_side_decoder.cc:107 src/lib/util.cc:555
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:545
+#: src/lib/util.cc:563
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:547
+#: src/lib/util.cc:565
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:541
+#: src/lib/util.cc:559
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:499
 msgid "Length"
 msgstr "Duración"
 
-#: src/lib/util.cc:571
+#: src/lib/util.cc:589
 msgid "Lfe"
 msgstr "Lfe"
 
-#: src/lib/util.cc:540
+#: src/lib/util.cc:558
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
-#: src/lib/ffmpeg_content.cc:555
+#: src/lib/ffmpeg_content.cc:575
 msgid "Limited"
 msgstr "Limitado"
 
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:553
 msgid "Limited (%1-%2)"
 msgstr "Limitado (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:605
+#: src/lib/ffmpeg_content.cc:625
 msgid "Linear"
 msgstr "Lineal"
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/ffmpeg_content.cc:626
 msgid "Logarithmic (100:1 range)"
 msgstr "Logarítmico (rango 100:1)"
 
-#: src/lib/ffmpeg_content.cc:607
+#: src/lib/ffmpeg_content.cc:627
 msgid "Logarithmic (316:1 range)"
 msgstr "Logarítmico (rango 316:1)"
 
-#: src/lib/util.cc:572
+#: src/lib/exceptions.cc:145
+msgid "Lost communication between main and writer processes"
+msgstr ""
+
+#: src/lib/util.cc:590
 msgid "Ls"
 msgstr "Ls"
 
-#: src/lib/mid_side_decoder.cc:35
+#: src/lib/mid_side_decoder.cc:39
 msgid "Mid-side decoder"
 msgstr "Decodificación medio-lateral"
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:79
+#: src/lib/filter.cc:85 src/lib/filter.cc:86 src/lib/filter.cc:89
 msgid "Misc"
 msgstr "Miscelánea"
 
-#: src/lib/dcp_examiner.cc:154
+#: src/lib/dcp_examiner.cc:164
 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:160
+#: src/lib/dcp_examiner.cc:170
 msgid "Mismatched audio sample rates in DCP"
 msgstr "La velocidad de reproducción de audio no coincide en el DCP"
 
-#: src/lib/dcp_examiner.cc:127
+#: src/lib/dcp_examiner.cc:137
 msgid "Mismatched frame rates in DCP"
 msgstr "La velocidad de reproducción no coincide en el DCP"
 
-#: src/lib/dcp_examiner.cc:135
+#: src/lib/dcp_examiner.cc:145
 msgid "Mismatched video sizes in DCP"
 msgstr "El tamaño de los vídeos no coincide en el DCP"
 
-#: src/lib/exceptions.cc:55
+#: src/lib/exceptions.cc:71
 #, fuzzy
 msgid "Missing required setting %1"
 msgstr "falta una configuración obligatoria %1"
 
-#: src/lib/util.cc:871
+#: src/lib/util.cc:933
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/lib/writer.cc:618
+#: src/lib/writer.cc:757
 msgid "Mono"
 msgstr "Mono"
 
-#: src/lib/filter.cc:71
+#: src/lib/filter.cc:80
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/dcp_decoder.cc:77
+#: src/lib/dcp_decoder.cc:104
 msgid "No CPLs found in DCP."
 msgstr ""
 
-#: src/lib/cinema_kdms.cc:201 src/lib/send_notification_email_job.cc:61
+#: src/lib/kdm_with_metadata.cc:208 src/lib/send_notification_email_job.cc:72
 msgid "No mail server configured in preferences"
 msgstr "Ningún servidor de correo configurado en las preferencias"
 
-#: src/lib/video_content_scale.cc:105
-msgid "No scale"
-msgstr "No redimensionar"
-
-#: src/lib/video_content_scale.cc:102
-msgid "No stretch"
-msgstr "Sin deformación"
-
 #: src/lib/image_content.cc:121
 msgid "No valid image files were found in the folder."
 msgstr "No se encontraron imágenes válidas en la carpeta."
 
-#: src/lib/filter.cc:77 src/lib/filter.cc:78 src/lib/filter.cc:80
+#: src/lib/filter.cc:87 src/lib/filter.cc:88 src/lib/filter.cc:90
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/writer.cc:616
+#: src/lib/writer.cc:725 src/lib/writer.cc:732 src/lib/writer.cc:755
 msgid "None"
 msgstr "Ninguno"
 
-#: src/lib/job.cc:468
+#: src/lib/job.cc:501
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
-#: src/lib/content.cc:121
+#: src/lib/content.cc:123
 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:125
+#: src/lib/content.cc:127
 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/types.cc:137
+#: src/lib/types.cc:141
 #, fuzzy
 msgid "Open subtitles"
 msgstr "Subtítulos de texto"
 
-#: src/lib/filter.cc:67 src/lib/filter.cc:68 src/lib/filter.cc:69
-#: src/lib/filter.cc:70
+#: src/lib/filter.cc:76 src/lib/filter.cc:77 src/lib/filter.cc:78
+#: src/lib/filter.cc:79
 msgid "Orientation"
 msgstr ""
 
-#: src/lib/job.cc:171
+#: src/lib/job.cc:210
 msgid "Out of memory"
 msgstr "Falta de memoria"
 
-#: src/lib/filter.cc:80
+#: src/lib/filter.cc:90
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
 
-#: src/lib/colour_conversion.cc:284
+#: src/lib/colour_conversion.cc:287
 msgid "P3"
 msgstr "P3"
 
-#: src/lib/util.h:58
+#: src/lib/util.h:59
 msgid ""
 "Please report this problem by using Help -> Report a problem or via email to "
 "carl@dcpomatic.com"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:53
+#: src/lib/dcp_content_type.cc:58
 msgid "Policy"
 msgstr "Policy"
 
-#: src/lib/content.cc:444
+#: src/lib/content.cc:480
 msgid "Prepared for video frame rate"
 msgstr "Preparado para velocidad de vídeo"
 
-#: src/lib/exceptions.cc:85
+#: src/lib/exceptions.cc:106
 msgid "Programming error at %1:%2 %3"
 msgstr "Error de programación en %1:%2 %3"
 
-#: src/lib/dcp_content_type.cc:54
+#: src/lib/dcp_content_type.cc:62
+msgid "Promo"
+msgstr ""
+
+#: src/lib/dcp_content_type.cc:59
 msgid "Public Service Announcement"
 msgstr "Anuncio de servicio público"
 
-#: src/lib/ffmpeg_encoder.cc:207 src/lib/util.cc:569
+#: src/lib/ffmpeg_encoder.cc:256 src/lib/util.cc:587
 msgid "R"
 msgstr "R"
 
-#: src/lib/ffmpeg_content.cc:622
+#: src/lib/ffmpeg_content.cc:642
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr "RGB / sRGB (IEC61966-2-1)"
 
-#: src/lib/dcp_content_type.cc:51
+#: src/lib/dcp_content_type.cc:56
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:595
 msgid "Rc"
 msgstr "Rc"
 
-#: src/lib/colour_conversion.cc:285
+#: src/lib/colour_conversion.cc:288
 msgid "Rec. 1886"
 msgstr "Rec. 1886"
 
-#: src/lib/colour_conversion.cc:286
+#: src/lib/colour_conversion.cc:289
 msgid "Rec. 2020"
 msgstr "Rec. 2020"
 
-#: src/lib/colour_conversion.cc:282
+#: src/lib/colour_conversion.cc:285
 msgid "Rec. 601"
 msgstr "Rec. 601"
 
-#: src/lib/colour_conversion.cc:283
+#: src/lib/colour_conversion.cc:286
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:538
+#: src/lib/mid_side_decoder.cc:108 src/lib/util.cc:556
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:546
+#: src/lib/util.cc:564
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:566
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:542
+#: src/lib/util.cc:560
 msgid "Right surround"
 msgstr "Surround derecha"
 
-#: src/lib/filter.cc:70
+#: src/lib/filter.cc:79
 msgid "Rotate 90 degrees anti-clockwise"
 msgstr ""
 
-#: src/lib/filter.cc:69
+#: src/lib/filter.cc:78
 msgid "Rotate 90 degrees clockwise"
 msgstr ""
 
-#: src/lib/util.cc:573
+#: src/lib/util.cc:591
 msgid "Rs"
 msgstr "Rs"
 
-#: src/lib/colour_conversion.cc:287
+#: src/lib/colour_conversion.cc:290
 msgid "S-Gamut3/S-Log3"
 msgstr "S-Gamut3/S-Log3"
 
-#: src/lib/ffmpeg_content.cc:574 src/lib/ffmpeg_content.cc:603
+#: src/lib/ffmpeg_content.cc:594 src/lib/ffmpeg_content.cc:623
 msgid "SMPTE 170M (BT601)"
 msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:628
+#: src/lib/ffmpeg_content.cc:648
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:633
+#: src/lib/ffmpeg_content.cc:653
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr "SMPTE 2085, Y’D’zD’x"
 
-#: src/lib/ffmpeg_content.cc:575 src/lib/ffmpeg_content.cc:604
-#: src/lib/ffmpeg_content.cc:629
+#: src/lib/ffmpeg_content.cc:595 src/lib/ffmpeg_content.cc:624
+#: src/lib/ffmpeg_content.cc:649
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/ffmpeg_content.cc:613
+#: src/lib/hints.cc:613
+msgid ""
+"SMPTE DCPs with the type FTR (feature) should have markers for the first "
+"frame of end credits (FFEC) and the first frame of moving credits (FFMC).  "
+"You should add these markers using the 'Markers' button in the \"DCP\" tab."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:633
 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:614
+#: src/lib/ffmpeg_content.cc:634
 msgid "SMPTE ST 428-1"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:578
+#: src/lib/ffmpeg_content.cc:598
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
 
-#: src/lib/ffmpeg_content.cc:579
+#: src/lib/ffmpeg_content.cc:599
 msgid "SMPTE ST 431-2 (2011)"
 msgstr "SMPTE ST 431-2 (2011)"
 
-#: src/lib/ffmpeg_content.cc:580
+#: src/lib/ffmpeg_content.cc:600
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr "SMPTE ST 432-1 D65 (2010)"
 
-#: src/lib/scp_uploader.cc:56
-msgid "SSH error (%1)"
+#: src/lib/scp_uploader.cc:45
+#, fuzzy
+msgid "SSH error [%1]"
+msgstr "Error SSH (%1)"
+
+#: src/lib/scp_uploader.cc:61 src/lib/scp_uploader.cc:72
+#: src/lib/scp_uploader.cc:77
+#, fuzzy
+msgid "SSH error [%1] (%2)"
 msgstr "Error SSH (%1)"
 
-#: src/lib/util.cc:881
+#: src/lib/util.cc:943
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -1158,92 +1350,103 @@ msgstr "Sábado"
 msgid "Scanning image files"
 msgstr "Revisando los ficheros de imagen"
 
-#: src/lib/send_problem_report_job.cc:74
+#: src/lib/send_problem_report_job.cc:85
 msgid "Sending email"
 msgstr "Enviando correo"
 
-#: src/lib/dcp_content_type.cc:47
+#: src/lib/dcp_content_type.cc:52
 msgid "Short"
 msgstr "Cortometraje"
 
-#: src/lib/video_content.cc:458
+#: src/lib/video_content.cc:500
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/lib/audio_content.cc:252
+#: src/lib/audio_content.cc:286
 msgid "Some audio will be resampled to %1Hz"
 msgstr "El audio será remuestreado a %1Hz"
 
-#: src/lib/check_content_change_job.cc:86
+#: src/lib/check_content_change_job.cc:89
 msgid ""
 "Some files have been changed since they were added to the project.\n"
 "\n"
 "These files will now be re-examined, so you may need to check their settings."
 msgstr ""
 
-#: src/lib/hints.cc:313
+#: src/lib/check_content_change_job.cc:100
 msgid ""
-"Some of your closed captions have lines longer than %1 characters, so they "
-"will probably be word-wrapped."
+"Some files have been changed since they were added to the project.  Open the "
+"project in DCP-o-matic, check the settings, then save it before trying again."
 msgstr ""
 
-#: src/lib/hints.cc:319
+#: src/lib/hints.cc:552
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
 msgstr ""
 
-#: src/lib/film.cc:329
+#: src/lib/film.cc:392
 #, fuzzy
 msgid "Some of your content needs a KDM"
 msgstr "parte de su contenido necesita una KDM"
 
-#: src/lib/film.cc:332
+#: src/lib/film.cc:395
 #, fuzzy
 msgid "Some of your content needs an OV"
 msgstr "parte de su contenido necesita una OV"
 
-#: src/lib/writer.cc:620
+#: src/lib/writer.cc:759
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/lib/upmixer_a.cc:46
+#: src/lib/upmixer_a.cc:51
 msgid "Stereo to 5.1 up-mixer A"
 msgstr "Upmix de estéreo a 5.1 A"
 
-#: src/lib/upmixer_b.cc:42
+#: src/lib/upmixer_b.cc:47
 msgid "Stereo to 5.1 up-mixer B"
 msgstr "Upmix B de estéreo a 5.1"
 
-#: src/lib/util.cc:869
+#: src/lib/util.cc:931
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/lib/dcp_content_type.cc:52
+#: src/lib/dcp_content_type.cc:57
 msgid "Teaser"
 msgstr "Teaser"
 
-#: src/lib/filter.cc:79
+#: src/lib/filter.cc:89
 msgid "Telecine filter"
 msgstr "Filtro telecine"
 
-#: src/lib/dcp_content_type.cc:49
+#: src/lib/dcp_content_type.cc:54
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/string_text_file_content.cc:75
+#: src/lib/string_text_file_content.cc:85
 msgid "Text subtitles"
 msgstr "Subtítulos de texto"
 
-#: src/lib/exceptions.cc:73
+#: src/lib/film.cc:375
+msgid "The DCP is empty, perhaps because all the content has zero length."
+msgstr ""
+
+#: src/lib/exceptions.cc:92
 msgid "The certificate chain for signing is invalid"
 msgstr "La cadena de certificados para firmar no es válida"
 
-#: src/lib/exceptions.cc:79
+#: src/lib/exceptions.cc:99
 msgid "The certificate chain for signing is invalid (%1)"
 msgstr "La cadena de certificados para firmar no es válida (%1)"
 
-#: src/lib/job.cc:109
+#: src/lib/video_decoder.cc:86
+msgid ""
+"The content file %1 is set as 3D but does not appear to contain 3D images.  "
+"Please set it to 2D.  You can still make a 3D DCP from this content by "
+"ticking the 3D option in the DCP video tab."
+msgstr ""
+
+#: src/lib/job.cc:112
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -1251,23 +1454,23 @@ msgstr ""
 "En el dispositivo donde se encuentra la película queda poco espacio. Libere "
 "espacio en el disco y pruebe de nuevo."
 
-#: src/lib/playlist.cc:223
+#: src/lib/playlist.cc:228
 msgid "The file %1 has been moved %2 milliseconds earlier."
 msgstr "El fichero %1 ha sido desplazado %2 milisegundos antes."
 
-#: src/lib/playlist.cc:218
+#: src/lib/playlist.cc:223
 msgid "The file %1 has been moved %2 milliseconds later."
 msgstr "El fichero %1 ha sido desplazado %2 milisegundos después."
 
-#: src/lib/playlist.cc:243
+#: src/lib/playlist.cc:248
 msgid "The file %1 has been trimmed by %2 milliseconds less."
 msgstr "El fichero %1 ha sido recortado en %2 milisegundos."
 
-#: src/lib/playlist.cc:238
+#: src/lib/playlist.cc:243
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr "El fichero %1 ha sido alargado con %2 milisegundos."
 
-#: src/lib/hints.cc:206
+#: src/lib/hints.cc:240
 msgid ""
 "There is a large difference between the frame rate of your DCP and that of "
 "some of your content.  This will cause your audio to play back at a much "
@@ -1276,11 +1479,11 @@ msgid ""
 "systems support your chosen DCP rate."
 msgstr ""
 
-#: src/lib/dcp_content.cc:588
+#: src/lib/dcp_content.cc:658
 msgid "There is no video in this DCP"
 msgstr ""
 
-#: src/lib/job.cc:171
+#: src/lib/job.cc:210
 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 "
@@ -1290,7 +1493,30 @@ msgstr ""
 "sistema operativo de 32 bits, trate de reducir el número de hilos de "
 "codificación en la sección General de las preferencias."
 
-#: src/lib/exceptions.cc:91
+#: src/lib/util.cc:1144
+msgid "This KDM was made for DCP-o-matic but not for its leaf certificate."
+msgstr ""
+
+#: src/lib/util.cc:1142
+msgid "This KDM was not made for DCP-o-matic's decryption certificate."
+msgstr ""
+
+#: src/lib/job.cc:131
+msgid ""
+"This error has probably occurred because you are running the 32-bit version "
+"of DCP-o-matic and trying to use too many encoding threads.  Please reduce "
+"the 'number of threads DCP-o-matic should use' in the General tab of "
+"Preferences and try again."
+msgstr ""
+
+#: src/lib/job.cc:141
+msgid ""
+"This error has probably occurred because you are running the 32-bit version "
+"of DCP-o-matic.  Please re-install DCP-o-matic with the 64-bit installer and "
+"try again."
+msgstr ""
+
+#: src/lib/exceptions.cc:113
 msgid ""
 "This file is a KDM.  KDMs should be added to DCP content by right-clicking "
 "the content and choosing \"Add KDM\"."
@@ -1298,7 +1524,7 @@ msgstr ""
 "Este fichero es una KDM. Las KDM pueden añadirse al DCP pinchando con el "
 "botón derecho sobre el contenido y eligiendo “Añadir KDM”"
 
-#: src/lib/film.cc:457
+#: src/lib/film.cc:561
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -1307,7 +1533,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:446
+#: src/lib/film.cc:546
 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 "
@@ -1317,113 +1543,122 @@ msgstr ""
 "desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
 "volver a añadir y configurar ton contenido. ¡Lo siento!"
 
-#: src/lib/util.cc:877
+#: src/lib/util.cc:939
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/lib/types.cc:135
+#: src/lib/types.cc:139
 msgid "Timed text"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:48
+#: src/lib/dcp_content_type.cc:53
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:55
+#: src/lib/transcode_job.cc:71
 #, fuzzy
 msgid "Transcoding %1"
 msgstr "Codificar %1"
 
-#: src/lib/dcp_content_type.cc:50
+#: src/lib/dcp_content_type.cc:55
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/util.cc:873
+#: src/lib/util.cc:935
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/lib/internet.cc:136
+#: src/lib/usl.cc:28
+msgid "USL"
+msgstr ""
+
+#: src/lib/internet.cc:185
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:49
+#: src/lib/image_proxy.cc:53
 msgid "Unexpected image type received by server"
 msgstr "El servidor recibió un tipo de imagen inesperada"
 
-#: src/lib/job.cc:212
+#: src/lib/cross_common.cc:91 src/lib/dcp_text_track.cc:53
+#, fuzzy
+msgid "Unknown"
+msgstr "desconocido"
+
+#: src/lib/job.cc:245
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:322
+#: src/lib/ffmpeg_decoder.cc:343
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
-#: src/lib/filter.cc:76
+#: src/lib/filter.cc:86
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
-#: src/lib/ffmpeg_content.cc:526 src/lib/ffmpeg_content.cc:550
-#: src/lib/ffmpeg_content.cc:568 src/lib/ffmpeg_content.cc:570
-#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:597
-#: src/lib/ffmpeg_content.cc:599 src/lib/ffmpeg_content.cc:600
-#: src/lib/ffmpeg_content.cc:624 src/lib/ffmpeg_content.cc:625
+#: src/lib/ffmpeg_content.cc:546 src/lib/ffmpeg_content.cc:570
+#: src/lib/ffmpeg_content.cc:588 src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:591 src/lib/ffmpeg_content.cc:617
+#: src/lib/ffmpeg_content.cc:619 src/lib/ffmpeg_content.cc:620
+#: src/lib/ffmpeg_content.cc:644 src/lib/ffmpeg_content.cc:645
 msgid "Unspecified"
 msgstr "Sin especificar"
 
-#: src/lib/colour_conversion.cc:240
+#: src/lib/colour_conversion.cc:243
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/util.cc:551 src/lib/util.cc:552
+#: src/lib/util.cc:569 src/lib/util.cc:570
 msgid "Unused"
 msgstr "Sin uso"
 
-#: src/lib/upmixer_a.cc:127 src/lib/upmixer_b.cc:137
+#: src/lib/upmixer_a.cc:138 src/lib/upmixer_b.cc:148
 msgid "Upmix L"
 msgstr "Upmix L"
 
-#: src/lib/upmixer_a.cc:128 src/lib/upmixer_b.cc:138
+#: src/lib/upmixer_a.cc:139 src/lib/upmixer_b.cc:149
 msgid "Upmix R"
 msgstr "Upmix R"
 
-#: src/lib/util.cc:575
+#: src/lib/util.cc:593
 msgid "VI"
 msgstr "VI"
 
-#: src/lib/verify_dcp_job.cc:41
+#: src/lib/verify_dcp_job.cc:55
 msgid "Verify DCP"
 msgstr ""
 
-#: src/lib/filter.cc:67
+#: src/lib/filter.cc:76
 msgid "Vertical flip"
 msgstr ""
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:562
 msgid "Visually impaired"
 msgstr "Ciegos"
 
-#: src/lib/upload_job.cc:44
+#: src/lib/upload_job.cc:47
 msgid "Waiting"
 msgstr "Esperando"
 
-#: src/lib/filter.cc:74
+#: src/lib/filter.cc:84
 #, fuzzy
 msgid "Weave filter"
 msgstr "Filtro telecine"
 
-#: src/lib/util.cc:875
+#: src/lib/util.cc:937
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/lib/ffmpeg_content.cc:630
+#: src/lib/ffmpeg_content.cc:650
 msgid "YCOCG"
 msgstr "YCOCG"
 
-#: src/lib/filter.cc:73
+#: src/lib/filter.cc:82
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/hints.cc:181
+#: src/lib/hints.cc:200
 #, fuzzy
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
@@ -1433,7 +1668,7 @@ msgstr ""
 "Intenta hacer un DCP Interop con una velocidad que no está permitida "
 "oficialmente. Le recomendamos hacer un DCP SMPTE en su lugar."
 
-#: src/lib/hints.cc:165
+#: src/lib/hints.cc:184
 #, fuzzy
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
@@ -1443,7 +1678,7 @@ msgstr ""
 "Intenta hacer un DCP Interop con una velocidad que no está permitida "
 "oficialmente. Le recomendamos hacer un DCP SMPTE en su lugar."
 
-#: src/lib/hints.cc:175
+#: src/lib/hints.cc:194
 #, fuzzy
 msgid ""
 "You are set up for a DCP frame rate of 30fps, which is not supported by all "
@@ -1452,7 +1687,7 @@ msgstr ""
 "Intenta hacer un DCP Interop con una velocidad que no está permitida "
 "oficialmente. Le recomendamos hacer un DCP SMPTE en su lugar."
 
-#: src/lib/hints.cc:228
+#: src/lib/hints.cc:305
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1460,14 +1695,14 @@ msgstr ""
 "Estás usando contenido 3D pero el DCP es 2D. Cambia el DCP a 3D si quieres "
 "que funcione en un sistema 3D (ej.: Real-D, MasterImage, etc.)"
 
-#: src/lib/hints.cc:124
+#: src/lib/hints.cc:121
 msgid ""
 "You are using DCP-o-matic's stereo-to-5.1 upmixer.  This is experimental and "
 "may result in poor-quality audio.  If you continue, you should listen to the "
 "resulting DCP in a cinema to make sure that it sounds good."
 msgstr ""
 
-#: src/lib/hints.cc:217
+#: src/lib/hints.cc:289
 msgid ""
 "You have %1 files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."
@@ -1475,11 +1710,19 @@ msgstr ""
 "Hay %1 ficheros que parecen VOBs de un DVD. Deberías unirlos para asegurarte "
 "transiciones suaves."
 
-#: src/lib/hints.cc:325
-msgid "You have overlapping closed captions, which are not allowed."
+#: src/lib/film.cc:1521
+msgid ""
+"You have more than one piece of Atmos content, and they do not have the same "
+"frame rate.  You must remove some Atmos content."
 msgstr ""
 
-#: src/lib/hints.cc:115
+#: src/lib/hints.cc:559
+msgid ""
+"You have overlapping closed captions, which are not allowed in Interop "
+"DCPs.  Change your DCP standard to SMPTE."
+msgstr ""
+
+#: src/lib/hints.cc:273
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
@@ -1487,20 +1730,20 @@ msgstr ""
 "Has seleccionado una fuente de más de 640 Kb. Es muy posible que cause "
 "problemas en la reproducción."
 
-#: src/lib/film.cc:312
+#: src/lib/film.cc:371
 #, fuzzy
 msgid "You must add some content to the DCP before creating it"
 msgstr "tiene que añadir contenido al DCP antes de crearlo"
 
-#: src/lib/hints.cc:119
+#: src/lib/hints.cc:111
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
-"projectors."
+"projectors.  You may want to set the DCP to have 6 channels.  It does not "
+"matter if your content has fewer channels, as DCP-o-matic will fill the "
+"extras with silence."
 msgstr ""
-"Tu DCP tiene menos de 6 canales de audio. Esto puede causar problemas con "
-"algunos proyectores."
 
-#: src/lib/hints.cc:151
+#: src/lib/hints.cc:159
 msgid ""
 "Your DCP uses an unusual container ratio.  This may cause problems on some "
 "projectors.  If possible, use Flat or Scope for the DCP container ratio"
@@ -1508,7 +1751,7 @@ msgstr ""
 "El DCP utiliza un contenedor inusual.  Esto puede causar problemas en "
 "algunos proyectores.  Si es posible, utilice Flat o Scope como contenedor"
 
-#: src/lib/hints.cc:253
+#: src/lib/hints.cc:339
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
@@ -1516,18 +1759,18 @@ msgstr ""
 "El nivel de sonido es muy alto (en %1). Deberías reducir la ganancia del "
 "audio."
 
-#: src/lib/config.cc:313
+#: src/lib/config.cc:287
 msgid ""
 "Your default container is not valid and has been changed to Flat (1.85:1)"
 msgstr ""
 "El contenedor por defecto no es válido y ha sido modificado a Flat (1.85:1)"
 
-#: src/lib/playlist.cc:214
+#: src/lib/playlist.cc:219
 msgid ""
 "Your project contains video content that was not aligned to a frame boundary."
 msgstr "El proyecto contiene video que no está alineado a un cuadro."
 
-#: src/lib/playlist.cc:234
+#: src/lib/playlist.cc:239
 msgid ""
 "Your project contains video content whose trim was not aligned to a frame "
 "boundary."
@@ -1541,157 +1784,167 @@ msgstr "[imágenes en movimiento]"
 msgid "[still]"
 msgstr "[imagen fija]"
 
-#: src/lib/dcp_subtitle_content.cc:100 src/lib/string_text_file_content.cc:69
+#: src/lib/dcp_subtitle_content.cc:97 src/lib/string_text_file_content.cc:78
 msgid "[subtitles]"
 msgstr "[subtítulos]"
 
 #. / TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
 #. / which reel it is.  Preserve the %1; it will be replaced with the reel number.
-#: src/lib/ffmpeg_encoder.cc:67
+#: src/lib/ffmpeg_encoder.cc:139
 msgid "_reel%1"
 msgstr ""
 
-#: src/lib/dcpomatic_socket.cc:69
+#: src/lib/dcpomatic_socket.cc:73
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
-#: src/lib/uploader.cc:35
+#: src/lib/uploader.cc:38
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:308
+#: src/lib/film.cc:367
 msgid "container"
 msgstr "continente"
 
-#: src/lib/film.cc:316
+#: src/lib/film.cc:379
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: src/lib/uploader.cc:73
+#: src/lib/uploader.cc:79
 msgid "copying %1"
 msgstr "copiando %1"
 
-#: src/lib/ffmpeg.cc:135 src/lib/ffmpeg_image_proxy.cc:157
+#: src/lib/ffmpeg.cc:137
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/reel_writer.cc:325
+#: src/lib/reel_writer.cc:435
+#, fuzzy
+msgid "could not move atmos asset into the DCP (%1)"
+msgstr "no se puede mover el audio en el DCP (%1)"
+
+#: src/lib/reel_writer.cc:418
 msgid "could not move audio asset into the DCP (%1)"
 msgstr "no se puede mover el audio en el DCP (%1)"
 
-#: src/lib/exceptions.cc:33
-msgid "could not open file %1 for reading (%2)"
+#: src/lib/exceptions.cc:38
+#, fuzzy
+msgid "could not open file %1 for read (%2)"
 msgstr "no se pudo abrir el fichero %1 para lectura (%2)"
 
-#: src/lib/exceptions.cc:33
-msgid "could not open file %1 for writing (%2)"
+#: src/lib/exceptions.cc:37
+#, fuzzy
+msgid "could not open file %1 for read/write (%2)"
+msgstr "no se pudo abrir el fichero %1 para lectura (%2)"
+
+#: src/lib/exceptions.cc:38
+#, fuzzy
+msgid "could not open file %1 for write (%2)"
 msgstr "no se pudo abrir el fichero %1 para escritura (%2)"
 
-#: src/lib/exceptions.cc:43
+#: src/lib/exceptions.cc:57
 msgid "could not read from file %1 (%2)"
 msgstr "no se pudo leer del fichero %1 (%2)"
 
-#: src/lib/scp_uploader.cc:66
-msgid "could not start SCP session (%1)"
-msgstr "no se pudo abrir la sesión SCP (%1)"
-
-#: src/lib/scp_uploader.cc:41
-msgid "could not start SSH session"
-msgstr "no se pudo abrir la sesión SSH"
-
-#: src/lib/exceptions.cc:49
+#: src/lib/exceptions.cc:64
 msgid "could not write to file %1 (%2)"
-msgstr "no se pudo escribir en el fichero (%1)"
+msgstr "no se pudo escribir en el fichero %1 (%2)"
 
-#: src/lib/dcpomatic_socket.cc:65
+#: src/lib/dcpomatic_socket.cc:69
 msgid "error during async_connect (%1)"
 msgstr "error durante async_connect (%1)"
 
-#: src/lib/dcpomatic_socket.cc:118
+#: src/lib/dcpomatic_socket.cc:126
 msgid "error during async_read (%1)"
 msgstr "error durante async_read (%1)"
 
-#: src/lib/dcpomatic_socket.cc:90
+#: src/lib/dcpomatic_socket.cc:94
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
-#: src/lib/content.cc:437 src/lib/content.cc:446
+#: src/lib/content.cc:473 src/lib/content.cc:482
 msgid "frames per second"
 msgstr "imágenes por segundo"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:185
+#: src/lib/util.cc:200
 msgid "h"
 msgstr "h"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:679
+#: src/lib/dcp_content.cc:751
 #, fuzzy
 msgid "it does not have closed captions in all its reels."
 msgstr "El DCP no tiene sonido en todas las bobinas."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:674
+#: src/lib/dcp_content.cc:740
 #, fuzzy
 msgid "it does not have open subtitles in all its reels."
 msgstr "El DCP no tiene subtítulos en todas las bobinas."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:642
+#: src/lib/dcp_content.cc:707
 #, fuzzy
 msgid "it does not have sound in all its reels."
 msgstr "El DCP no tiene sonido en todas las bobinas."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:541
+#: src/lib/dcp_content.cc:611
 #, fuzzy
 msgid "it has a different frame rate to the film."
 msgstr "La película tiene una velocidad diferente a este DCP."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:603
+#: src/lib/dcp_content.cc:766
+msgid ""
+"it has a start trim so its subtitles or closed captions must be re-written."
+msgstr ""
+
+#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:668
 #, fuzzy
 msgid "it is 2K and the film is 4K."
 msgstr "La película es Interop y este DCP es SMPTE."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:600
+#: src/lib/dcp_content.cc:665
 #, fuzzy
 msgid "it is 4K and the film is 2K."
 msgstr "La película es Interop y este DCP es SMPTE."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:529
+#: src/lib/dcp_content.cc:599
 #, fuzzy
 msgid "it is Interop and the film is set to SMPTE."
 msgstr "La película es Interop y este DCP es SMPTE."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:533
+#: src/lib/dcp_content.cc:603
 #, fuzzy
 msgid "it is SMPTE and the film is set to Interop."
 msgstr "La película es SMPTE y este DCP es Interop."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:648
+#: src/lib/dcp_content.cc:713
 #, fuzzy
 msgid "it overlaps other audio content; remove the other content."
 msgstr "Hay otro contenido de audio superpuesto a este DCP; elimínelo."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:685
+#: src/lib/dcp_content.cc:771
 #, fuzzy
 msgid "it overlaps other text content; remove the other content."
 msgstr "Hay otro contenido de vídeo superpuesto a este DCP; elimínelo."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:613
+#: src/lib/dcp_content.cc:678
 #, fuzzy
 msgid "it overlaps other video content; remove the other content."
 msgstr "Hay otro contenido de vídeo superpuesto a este DCP; elimínelo."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:564
+#: src/lib/dcp_content.cc:634
 #, fuzzy
 msgid ""
 "its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1701,13 +1954,13 @@ msgstr ""
 "seleccione el modo de bobinas ‘dividir por contenido’."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:608
+#: src/lib/dcp_content.cc:673
 #, fuzzy
 msgid "its video frame size differs from the film's."
 msgstr "El tamaño de imagen de vídeo en la película es diferente en el DCP."
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:194
+#: src/lib/util.cc:209
 msgid "m"
 msgstr "m"
 
@@ -1715,20 +1968,34 @@ msgstr "m"
 msgid "moving"
 msgstr "moviendo"
 
-#: src/lib/film.cc:304
+#: src/lib/film.cc:363
 msgid "name"
 msgstr "nombre"
 
+#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:757
+msgid ""
+"one if its closed caption has a non-zero entry point so it must be re-"
+"written."
+msgstr ""
+
+#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:744
+msgid ""
+"one if its subtitle reels has a non-zero entry point so it must be re-"
+"written."
+msgstr ""
+
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:204
+#: src/lib/util.cc:219
 msgid "s"
 msgstr "s"
 
-#: src/lib/colour_conversion.cc:281
+#: src/lib/colour_conversion.cc:284
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/film.cc:325
+#: src/lib/film.cc:388
 msgid "some of your content is missing"
 msgstr "falta parte de su contenido"
 
@@ -1736,14 +2003,36 @@ msgstr "falta parte de su contenido"
 msgid "still"
 msgstr "imagen fija"
 
-#: src/lib/ffmpeg_examiner.cc:256
+#: src/lib/ffmpeg_examiner.cc:337
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:499
 msgid "video frames"
 msgstr "fotogramas"
 
+#~ msgid "Could not start SCP session (%1)"
+#~ msgstr "No se pudo iniciar la sesión SCP (%1)"
+
+#~ msgid "could not start SCP session (%1)"
+#~ 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"
+
+#~ msgid "No scale"
+#~ msgstr "No redimensionar"
+
+#~ msgid "No stretch"
+#~ msgstr "Sin deformación"
+
+#~ msgid ""
+#~ "Your DCP has fewer than 6 audio channels.  This may cause problems on "
+#~ "some projectors."
+#~ msgstr ""
+#~ "Tu DCP tiene menos de 6 canales de audio. Esto puede causar problemas con "
+#~ "algunos proyectores."
+
 #~ msgid ""
 #~ "However, setting your DCP frame rate to 24 or 48 will cause a significant "
 #~ "slowdown of your content, and SMPTE DCPs are not supported by all "
@@ -1885,9 +2174,6 @@ msgstr "fotogramas"
 #~ msgid "Video size"
 #~ msgstr "Tamaño del video"
 
-#~ msgid "could not read from file"
-#~ msgstr "No se pudo leer del fichero %1 (%2)"
-
 #, fuzzy
 #~ msgid "NC"
 #~ msgstr "C"
@@ -1904,9 +2190,6 @@ msgstr "fotogramas"
 #~ 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"