pot/merge.

1 files changed, 252 insertions, 174 deletions

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 70dbdf5a7..5384db13b 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-29 00:16+0100\n"
+"POT-Creation-Date: 2018-09-03 00:14+0100\n"
 "PO-Revision-Date: 2018-07-19 11:54+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -66,11 +66,11 @@ 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:443
+#: src/lib/job.cc:447
 msgid " on %1"
 msgstr " %1"
 
-#: src/lib/config.cc:918
+#: src/lib/config.cc:956
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -92,7 +92,7 @@ msgstr ""
 "Durée: $LENGTH\n"
 "Taille: $SIZE\n"
 
-#: src/lib/config.cc:896
+#: src/lib/config.cc:934
 msgid "$JOB_NAME: $JOB_STATUS"
 msgstr "$JOB_NAME: $JOB_STATUS"
 
@@ -100,19 +100,19 @@ msgstr "$JOB_NAME: $JOB_STATUS"
 msgid "%1 [Atmos]"
 msgstr "%1 [Atmos]"
 
-#: src/lib/dcp_content.cc:223
+#: src/lib/dcp_content.cc:241
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/ffmpeg_content.cc:328
+#: src/lib/ffmpeg_content.cc:329
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:324
+#: src/lib/ffmpeg_content.cc:325
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
-#: src/lib/ffmpeg_content.cc:326 src/lib/video_mxf_content.cc:90
+#: src/lib/ffmpeg_content.cc:327 src/lib/video_mxf_content.cc:90
 msgid "%1 [video]"
 msgstr "%1 [vidéo]"
 
@@ -121,43 +121,43 @@ msgstr "%1 [vidéo]"
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ", ratio des pixels %.2f:1"
 
-#: src/lib/ratio.cc:37
+#: src/lib/ratio.cc:38
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/ratio.cc:38
+#: src/lib/ratio.cc:39
 msgid "1.33 (4:3)"
 msgstr "1.33 (4:3)"
 
-#: src/lib/ratio.cc:39
+#: src/lib/ratio.cc:40
 msgid "1.38 (Academy)"
 msgstr "1.38 (Academy)"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:41
 msgid "1.43 (IMAX)"
 msgstr "1.43 (IMAX)"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ratio.cc:42
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:43
 msgid "1.78 (16:9 or HD)"
 msgstr "1.78 (16:9 ou HD)"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:44
 msgid "1.85 (Flat)"
 msgstr "1.85 (Flat)"
 
-#: src/lib/ratio.cc:46
+#: src/lib/ratio.cc:47
 msgid "1.90 (Full frame)"
 msgstr "1.90 (Plein cadre)"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:45
 msgid "2.35 (35mm Scope)"
 msgstr "2.35 (35mm Scope)"
 
-#: src/lib/ratio.cc:45
+#: src/lib/ratio.cc:46
 msgid "2.39 (Scope)"
 msgstr "2.39 (Scope)"
 
@@ -171,11 +171,11 @@ msgstr "Débruitage 3D"
 msgid "; %.1f fps"
 msgstr "; %.1f ips"
 
-#: src/lib/job.cc:448
+#: src/lib/job.cc:452
 msgid "; %1 remaining; finishing at %2%3"
 msgstr "; %1 restant; fin prévue à %2%3"
 
-#: src/lib/hints.cc:113
+#: src/lib/hints.cc:161
 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,7 +185,7 @@ msgstr ""
 "débit. Ce pourrait être une bonne idée d'abaisser la bande passante JPEG2000 "
 "sous les 200Mbit/s. ceci n'aura pas de conséquence visible sur l'image."
 
-#: src/lib/ffmpeg_content.cc:586
+#: src/lib/ffmpeg_content.cc:587
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr "ARIB STD-B67 ('Hybrid log-gamma')"
 
@@ -193,7 +193,7 @@ msgstr "ARIB STD-B67 ('Hybrid log-gamma')"
 msgid "Advertisement"
 msgstr "Advertisement"
 
-#: src/lib/hints.cc:105
+#: src/lib/hints.cc:153
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -205,7 +205,7 @@ msgstr ""
 "avec bordures noires à droite et gauche. Vous pourriez préférer choisir le "
 "format 1.85:1 dans l'onglet \"DCP\"."
 
-#: src/lib/hints.cc:101
+#: src/lib/hints.cc:149
 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.  "
@@ -237,52 +237,52 @@ msgstr "Le son sera ré-échantillonné à %1Hz."
 msgid "Audio will not be resampled"
 msgstr "Le son ne sera pas ré-échantillonné."
 
-#: src/lib/ffmpeg_content.cc:580
+#: src/lib/ffmpeg_content.cc:581
 msgid "BT1361 extended colour gamut"
 msgstr "BT1361 gamme de couleurs étendue"
 
-#: src/lib/ffmpeg_content.cc:548
+#: src/lib/ffmpeg_content.cc:549
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:603
+#: src/lib/ffmpeg_content.cc:604
 msgid "BT2020 constant luminance"
 msgstr "BT2020 luminance constante"
 
-#: src/lib/ffmpeg_content.cc:582
+#: src/lib/ffmpeg_content.cc:583
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 pour un système 10-bit"
 
-#: src/lib/ffmpeg_content.cc:583
+#: src/lib/ffmpeg_content.cc:584
 msgid "BT2020 for a 12-bit system"
 msgstr "BT2020 pour un système 12-bit"
 
-#: src/lib/ffmpeg_content.cc:602
+#: src/lib/ffmpeg_content.cc:603
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 luminance non-constante"
 
-#: src/lib/ffmpeg_content.cc:607
+#: src/lib/ffmpeg_content.cc:608
 msgid "BT2100"
 msgstr "BT2100"
 
-#: src/lib/ffmpeg_content.cc:544
+#: src/lib/ffmpeg_content.cc:545
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:598
+#: src/lib/ffmpeg_content.cc:599
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:543
+#: src/lib/ffmpeg_content.cc:544
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:540 src/lib/ffmpeg_content.cc:569
-#: src/lib/ffmpeg_content.cc:594
+#: src/lib/ffmpeg_content.cc:541 src/lib/ffmpeg_content.cc:570
+#: src/lib/ffmpeg_content.cc:595
 msgid "BT709"
 msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:614
+#: src/lib/ffmpeg_content.cc:615
 msgid "Bits per pixel"
 msgstr "bits par pixel"
 
@@ -298,11 +298,11 @@ msgstr "BsR"
 msgid "C"
 msgstr "C"
 
-#: src/lib/job.cc:457
+#: src/lib/job.cc:461
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/lib/film.cc:296
+#: src/lib/film.cc:301
 msgid "Cannot contain slashes"
 msgstr "slash non autorisés"
 
@@ -310,7 +310,7 @@ msgstr "slash non autorisés"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/film.cc:1231
+#: src/lib/film.cc:1268
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr "Fabrication d'une KDM impossible car ce projet n'est pas crypté."
 
@@ -322,19 +322,32 @@ msgstr "Centre"
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/lib/reel_writer.cc:100
+#: src/lib/check_content_change_job.cc:46
+msgid "Check content for changes"
+msgstr ""
+
+#: src/lib/reel_writer.cc:104
 msgid "Checking existing image data"
 msgstr "Recherche de données images existantes"
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/check_content_change_job.cc:90
+msgid "Choose 'Make DCP' again when you have done this."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:607
 msgid "Chroma-derived constant luminance"
 msgstr "Luminance constante dérivée de la chrominance"
 
-#: src/lib/ffmpeg_content.cc:605
+#: src/lib/ffmpeg_content.cc:606
 msgid "Chroma-derived non-constant luminance"
 msgstr "Luminance non constante dérivée de la chrominance"
 
-#: src/lib/ffmpeg_content.cc:565
+#: src/lib/types.cc:134
+#, fuzzy
+msgid "Closed captions"
+msgstr "Réduction de bruit"
+
+#: src/lib/ffmpeg_content.cc:566
 msgid "Colour primaries"
 msgstr "Couleurs primaires"
 
@@ -348,25 +361,25 @@ msgstr "Couleurs primaires"
 #. / 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:497 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:521
-#: src/lib/ffmpeg_content.cc:526 src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:498 src/lib/ffmpeg_content.cc:505
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:532
 msgid "Colour range"
 msgstr "Plage de couleurs"
 
-#: src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:591
 msgid "Colour transfer characteristic"
 msgstr "Caractéristique conversion colorimétrique"
 
-#: src/lib/ffmpeg_content.cc:611
+#: src/lib/ffmpeg_content.cc:612
 msgid "Colourspace"
 msgstr "Espace colorimétrique"
 
-#: src/lib/content.cc:164
+#: src/lib/content.cc:190
 msgid "Computing digest"
 msgstr "fabrication rendu"
 
-#: src/lib/writer.cc:517
+#: src/lib/writer.cc:526
 msgid "Computing digests"
 msgstr "sommes de calcul en cours"
 
@@ -383,7 +396,8 @@ msgid "Content to be joined must all have or not have audio"
 msgstr "Les contenus à ajouter doivent tous avoir ou ne pas avoir de son"
 
 #: src/lib/ffmpeg_content.cc:154
-msgid "Content to be joined must all have or not have subtitles"
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles or captions"
 msgstr ""
 "Les contenus à ajouter doivent tous avoir ou ne pas avoir de sous-titres"
 
@@ -391,11 +405,11 @@ msgstr ""
 msgid "Content to be joined must all have or not have video"
 msgstr "Les contenus à ajouter doivent tous avoir ou ne pas avoir de vidéo"
 
-#: src/lib/subtitle_content.cc:198
+#: src/lib/text_content.cc:260
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr "Le contenu à ajouter doit avoir le même réglage 'sous-titres gravés'"
 
-#: src/lib/subtitle_content.cc:194
+#: src/lib/text_content.cc:256
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr ""
 "Le contenu à ajouter doit avoir le même réglage 'utiliser les sous-titres'"
@@ -420,7 +434,7 @@ msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
 msgid "Content to be joined must have the same fades."
 msgstr "Le contenu à ajouter doit avoir le même réglage de fondu."
 
-#: src/lib/subtitle_content.cc:226
+#: src/lib/text_content.cc:288
 msgid "Content to be joined must have the same outline width."
 msgstr "Le contenu ajouté doit avoir la même taille de contour."
 
@@ -433,40 +447,40 @@ msgid "Content to be joined must have the same scale setting."
 msgstr ""
 "Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
 
-#: src/lib/subtitle_content.cc:202
+#: src/lib/text_content.cc:264
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Le contenu à ajouter doit avoir le même positionnement horizontal des sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:210
+#: src/lib/text_content.cc:272
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr ""
 "Le contenu à ajouter doit avoir le même réglage d'échelle horizontale de "
 "sous-titres"
 
-#: src/lib/subtitle_content.cc:206
+#: src/lib/text_content.cc:268
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Le contenu à ajouter doit avoir le même positionnement vertical des sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:214
+#: src/lib/text_content.cc:276
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr ""
 "Le contenu à ajouter doit avoir le même réglage d'échelle verticale de sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:222
+#: src/lib/text_content.cc:284
 msgid "Content to be joined must have the same subtitle fades."
 msgstr "Le contenu ajouté doit avoir le même réglage de fondu."
 
-#: src/lib/subtitle_content.cc:218
+#: src/lib/text_content.cc:280
 msgid "Content to be joined must have the same subtitle line spacing."
 msgstr ""
 "Les contenus à ajouter doivent tous avoir le même espacement de lignes."
 
-#: src/lib/content.cc:128 src/lib/content.cc:132
+#: src/lib/content.cc:137 src/lib/content.cc:141
 msgid "Content to be joined must have the same video frame rate"
 msgstr "Le contenu à ajouter doit avoir la même cadence vidéo."
 
@@ -474,7 +488,12 @@ msgstr "Le contenu à ajouter doit avoir la même cadence vidéo."
 msgid "Content to be joined must have the same video frame type."
 msgstr "Le contenu à ajouter doit avoir le même type de trame vidéo"
 
-#: src/lib/subtitle_content.cc:231 src/lib/subtitle_content.cc:239
+#: src/lib/text_content.cc:297
+#, fuzzy
+msgid "Content to be joined must use the same DCP track."
+msgstr "Le contenu à ajouter doit avoir la même police de sous-titres"
+
+#: src/lib/text_content.cc:293 src/lib/text_content.cc:305
 msgid "Content to be joined must use the same fonts."
 msgstr "Le contenu à ajouter doit avoir la même police de sous-titres"
 
@@ -502,7 +521,12 @@ msgstr "Création du dossier distant %1 (%2) impossible"
 msgid "Could not decode JPEG2000 file %1 (%2)"
 msgstr "Ne parvient pas à décoder le fichier JPEG2000 %1 (%2)"
 
-#: src/lib/magick_image_proxy.cc:104
+#: src/lib/magick_image_proxy.cc:106
+#, fuzzy
+msgid "Could not decode image file %1 (%2)"
+msgstr "Ne parvient pas à décoder le fichier image (%1)"
+
+#: src/lib/magick_image_proxy.cc:108
 msgid "Could not decode image file (%1)"
 msgstr "Ne parvient pas à décoder le fichier image (%1)"
 
@@ -522,7 +546,7 @@ msgstr "lecture du fichier %1 impossible"
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
-#: src/lib/internet.cc:90 src/lib/internet.cc:95 src/lib/internet.cc:100
+#: src/lib/internet.cc:115 src/lib/internet.cc:120 src/lib/internet.cc:125
 msgid "Could not open downloaded ZIP file"
 msgstr "Ouverture du fichier Zip téléchargé impossible"
 
@@ -558,11 +582,11 @@ msgstr "DBP"
 msgid "DBS"
 msgstr "DBS"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:44
 msgid "DCI Flat"
 msgstr "DCI Flat"
 
-#: src/lib/ratio.cc:45
+#: src/lib/ratio.cc:46
 msgid "DCI Scope"
 msgstr "DCI Scope"
 
@@ -595,7 +619,7 @@ msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
 
-#: src/lib/config.cc:328 src/lib/config.cc:893
+#: src/lib/config.cc:335 src/lib/config.cc:931
 msgid "DCP-o-matic notification"
 msgstr "Notification DCP-o-matic"
 
@@ -604,7 +628,7 @@ msgstr "Notification DCP-o-matic"
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
-#: src/lib/config.cc:881
+#: src/lib/config.cc:919
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -634,8 +658,9 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 et CP750"
 
-#: src/lib/internet.cc:77
-msgid "Download failed (%1/%2 error %3)"
+#: src/lib/internet.cc:73
+#, fuzzy
+msgid "Download failed (%1 error %2)"
 msgstr "Echec de téléchargement (%1/%2 erreur %3)"
 
 #: src/lib/frame_rate_change.cc:72
@@ -666,7 +691,7 @@ msgstr "Rapport de bug email"
 msgid "Email problem report for %1"
 msgstr "Envoi par mail du rapport de bug pour %1"
 
-#: src/lib/dcp_encoder.cc:93 src/lib/ffmpeg_encoder.cc:201
+#: src/lib/dcp_encoder.cc:96 src/lib/ffmpeg_encoder.cc:202
 msgid "Encoding"
 msgstr "Encodage"
 
@@ -675,7 +700,7 @@ msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr ""
 "Erreur dans le fichier sous-titres : lecture de %1 alors que %2 était attendu"
 
-#: src/lib/job.cc:455
+#: src/lib/job.cc:459
 msgid "Error: %1"
 msgstr "Erreur: %1"
 
@@ -683,7 +708,12 @@ msgstr "Erreur: %1"
 msgid "Examine content"
 msgstr "Examen du contenu"
 
-#: src/lib/ffmpeg_content.cc:597
+#: src/lib/hints.cc:264
+#, fuzzy
+msgid "Examining closed captions"
+msgstr "Examen du contenu"
+
+#: src/lib/ffmpeg_content.cc:598
 msgid "FCC"
 msgstr "FCC"
 
@@ -692,18 +722,19 @@ msgid "Failed to authenticate with server (%1)"
 msgstr "L'authentification du serveur (%1) a échouée"
 
 #: src/lib/emailer.cc:222
-msgid "Failed to send email (%1)"
+#, fuzzy
+msgid "Failed to send email"
 msgstr "Echec d'envoi email (%1)"
 
 #: src/lib/dcp_content_type.cc:46
 msgid "Feature"
 msgstr "Feature"
 
-#: src/lib/content.cc:398
+#: src/lib/content.cc:441
 msgid "Filename"
 msgstr "Nom de Fichier"
 
-#: src/lib/ffmpeg_content.cc:547
+#: src/lib/ffmpeg_content.cc:548
 msgid "Film"
 msgstr "Film"
 
@@ -711,19 +742,19 @@ msgstr "Film"
 msgid "Finding length"
 msgstr "Recherche durée"
 
-#: src/lib/content.cc:405
+#: src/lib/content.cc:448
 msgid "Frame rate"
 msgstr "Cadence"
 
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:532
 msgid "Full"
 msgstr "Complet"
 
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:512
 msgid "Full (0-%1)"
 msgstr "en cours (0-%1)"
 
-#: src/lib/ratio.cc:46
+#: src/lib/ratio.cc:47
 msgid "Full frame"
 msgstr "Full frame"
 
@@ -743,11 +774,11 @@ msgstr "Pleine durée en images vidéo à la cadence du DCP"
 msgid "Full length in video frames at content rate"
 msgstr "Pleine durée en images vidéo à la cadence du contenu"
 
-#: src/lib/ffmpeg_content.cc:572
+#: src/lib/ffmpeg_content.cc:573
 msgid "Gamma 22 (BT470M)"
 msgstr "Gamma 22 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:573
+#: src/lib/ffmpeg_content.cc:574
 msgid "Gamma 28 (BT470BG)"
 msgstr "Gamma 28 (BT470BG)"
 
@@ -771,7 +802,7 @@ msgstr "Débruiteur 3D haute qualité"
 msgid "Horizontal flip"
 msgstr "Inversion horizontale"
 
-#: src/lib/hints.cc:128
+#: src/lib/hints.cc:176
 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 projectors."
@@ -780,7 +811,7 @@ msgstr ""
 "provoquera un ralentissement significatif de votre contenu source, et les "
 "DCPs SMPTE ne sont pas acceptés par tous les projecteurs."
 
-#: src/lib/hints.cc:125
+#: src/lib/hints.cc:173
 msgid ""
 "However, setting your DCP frame rate to 24 or 48 will cause a significant "
 "speed-up of your content, and SMPTE DCPs are not supported by all projectors."
@@ -793,26 +824,34 @@ msgstr ""
 msgid "Hz"
 msgstr "Hz"
 
-#: src/lib/ffmpeg_content.cc:581
+#: src/lib/ffmpeg_content.cc:582
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB or sYCC)"
 
-#: src/lib/ffmpeg_content.cc:579
+#: src/lib/ffmpeg_content.cc:580
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
-#: src/lib/job.cc:149 src/lib/job.cc:187 src/lib/job.cc:197
+#: src/lib/job.cc:149 src/lib/job.cc:193 src/lib/job.cc:203
 msgid "It is not known what caused this error."
 msgstr "Erreur indéterminée."
 
-#: src/lib/ffmpeg_content.cc:561
+#: src/lib/ffmpeg_content.cc:562
 msgid "JEDEC P22"
 msgstr "JEDEC P22"
 
-#: src/lib/config.cc:318 src/lib/config.cc:878
+#: src/lib/config.cc:325 src/lib/config.cc:916
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envoi KDM: $CPL_NAME"
 
+#: src/lib/dcp.cc:76
+msgid "KDM was made for DCP-o-matic but not for its leaf certificate."
+msgstr ""
+
+#: src/lib/dcp.cc:74
+msgid "KDM was not made for DCP-o-matic's decryption certificate."
+msgstr ""
+
 #: src/lib/filter.cc:72
 msgid "Kernel deinterlacer"
 msgstr "Désentrelaceur noyau"
@@ -853,23 +892,23 @@ msgstr "Bf"
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:527
 msgid "Limited"
 msgstr "Limité"
 
-#: src/lib/ffmpeg_content.cc:504
+#: src/lib/ffmpeg_content.cc:505
 msgid "Limited (%1-%2)"
 msgstr "Limité (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:577
 msgid "Linear"
 msgstr "Linéaire"
 
-#: src/lib/ffmpeg_content.cc:577
+#: src/lib/ffmpeg_content.cc:578
 msgid "Logarithmic (100:1 range)"
 msgstr "Logarithmique (plage 100:1)"
 
-#: src/lib/ffmpeg_content.cc:578
+#: src/lib/ffmpeg_content.cc:579
 msgid "Logarithmic (316:1 range)"
 msgstr "Logarithmique (plage 316:1)"
 
@@ -885,19 +924,19 @@ msgstr "codage demi-canal"
 msgid "Misc"
 msgstr "Divers"
 
-#: src/lib/dcp_examiner.cc:149
+#: src/lib/dcp_examiner.cc:153
 msgid "Mismatched audio channel counts in DCP"
 msgstr "Problème de décompte de canaux audio dans le DCP"
 
-#: src/lib/dcp_examiner.cc:155
+#: src/lib/dcp_examiner.cc:159
 msgid "Mismatched audio sample rates in DCP"
 msgstr "Taux d'échantillonnage audio différents dans le DCP"
 
-#: src/lib/dcp_examiner.cc:122
+#: src/lib/dcp_examiner.cc:126
 msgid "Mismatched frame rates in DCP"
 msgstr "Problème de cadence image dans le DCP"
 
-#: src/lib/dcp_examiner.cc:130
+#: src/lib/dcp_examiner.cc:134
 msgid "Mismatched video sizes in DCP"
 msgstr "Problème de taille d'images dans le DCP"
 
@@ -905,7 +944,7 @@ msgstr "Problème de taille d'images dans le DCP"
 msgid "Missing required setting %1"
 msgstr "Paramètre requis %1 manquant"
 
-#: src/lib/writer.cc:616
+#: src/lib/writer.cc:625
 msgid "Mono"
 msgstr "Mono"
 
@@ -913,7 +952,7 @@ msgstr "Mono"
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
-#: src/lib/dcp_decoder.cc:73
+#: src/lib/dcp_decoder.cc:75
 msgid "No CPLs found in DCP."
 msgstr "Aucune CPL trouvée dans le DCP"
 
@@ -929,7 +968,7 @@ msgstr "Pas de mise à l'échelle"
 msgid "No stretch"
 msgstr "Sans déformation"
 
-#: src/lib/image_content.cc:120
+#: src/lib/image_content.cc:122
 msgid "No valid image files were found in the folder."
 msgstr "Aucun fichier image valide dans ce dossier."
 
@@ -937,22 +976,27 @@ msgstr "Aucun fichier image valide dans ce dossier."
 msgid "Noise reduction"
 msgstr "Réduction de bruit"
 
-#: src/lib/writer.cc:614
+#: src/lib/writer.cc:623
 msgid "None"
 msgstr "Aucun"
 
-#: src/lib/job.cc:453
+#: src/lib/job.cc:457
 msgid "OK (ran for %1)"
 msgstr "OK (processus %1)"
 
-#: src/lib/content.cc:117
+#: src/lib/content.cc:126
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr "Seul le premier contenu à ajouter peut être rogné au point d'entrée."
 
-#: src/lib/content.cc:121
+#: src/lib/content.cc:130
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Seul le dernier contenu à ajouter peut être rogné au point de sortie."
 
+#: src/lib/types.cc:132
+#, fuzzy
+msgid "Open subtitles"
+msgstr "Sous-titres textes"
+
 #: src/lib/filter.cc:67 src/lib/filter.cc:68 src/lib/filter.cc:69
 #: src/lib/filter.cc:70
 msgid "Orientation"
@@ -974,7 +1018,7 @@ msgstr "P3"
 msgid "Policy"
 msgstr "Policy"
 
-#: src/lib/content.cc:414
+#: src/lib/content.cc:457
 msgid "Prepared for video frame rate"
 msgstr "Préparé pour la cadence image"
 
@@ -990,7 +1034,7 @@ msgstr "Public Service Announcement"
 msgid "R"
 msgstr "D"
 
-#: src/lib/ffmpeg_content.cc:593
+#: src/lib/ffmpeg_content.cc:594
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr "RGB / sRGB (IEC61966-2-1)"
 
@@ -1050,40 +1094,40 @@ msgstr "ArD"
 msgid "S-Gamut3/S-Log3"
 msgstr "S-Gamut3/S-Log3"
 
-#: src/lib/ffmpeg_content.cc:545 src/lib/ffmpeg_content.cc:574
+#: src/lib/ffmpeg_content.cc:546 src/lib/ffmpeg_content.cc:575
 msgid "SMPTE 170M (BT601)"
 msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:599
+#: src/lib/ffmpeg_content.cc:600
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:604
+#: src/lib/ffmpeg_content.cc:605
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr "SMPTE 2085, Y'D'zD'x"
 
-#: src/lib/ffmpeg_content.cc:546 src/lib/ffmpeg_content.cc:575
-#: src/lib/ffmpeg_content.cc:600
+#: src/lib/ffmpeg_content.cc:547 src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:601
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/ffmpeg_content.cc:584
+#: src/lib/ffmpeg_content.cc:585
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr "SMPTE ST 2084 pour systèmes 10, 12, 14 et 16 bits"
 
-#: src/lib/ffmpeg_content.cc:585
+#: src/lib/ffmpeg_content.cc:586
 msgid "SMPTE ST 428-1"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:549
+#: src/lib/ffmpeg_content.cc:550
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
 
-#: src/lib/ffmpeg_content.cc:550
+#: src/lib/ffmpeg_content.cc:551
 msgid "SMPTE ST 431-2 (2011)"
 msgstr "SMPTE ST 431-2 (2011)"
 
-#: src/lib/ffmpeg_content.cc:551
+#: src/lib/ffmpeg_content.cc:552
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr "SMPTE ST 432-1 D65 (2010)"
 
@@ -1091,7 +1135,7 @@ msgstr "SMPTE ST 432-1 D65 (2010)"
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
-#: src/lib/image_content.cc:107
+#: src/lib/image_content.cc:108
 msgid "Scanning image files"
 msgstr "Vérification des fichiers images"
 
@@ -1111,15 +1155,34 @@ msgstr "Taille"
 msgid "Some audio will be resampled to %1Hz"
 msgstr "Certains sons seront ré-échantillonné à %1Hz"
 
-#: src/lib/film.cc:321
+#: src/lib/check_content_change_job.cc:86
+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:296
+msgid ""
+"Some of your closed captions have lines longer than %1 characters, so they "
+"will probably be word-wrapped."
+msgstr ""
+
+#: src/lib/hints.cc:302
+msgid ""
+"Some of your closed captions span more than %1 lines, so they will be "
+"truncated."
+msgstr ""
+
+#: src/lib/film.cc:326
 msgid "Some of your content needs a KDM"
 msgstr "Certains de vos contenus nécessitent une clé"
 
-#: src/lib/film.cc:324
+#: src/lib/film.cc:329
 msgid "Some of your content needs an OV"
 msgstr "Certains de vos contenus nécessitent une OV"
 
-#: src/lib/writer.cc:618
+#: src/lib/writer.cc:627
 msgid "Stereo"
 msgstr "Stéréo"
 
@@ -1143,7 +1206,7 @@ msgstr "Filtre télécinéma"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/text_subtitle_content.cc:74
+#: src/lib/string_text_file_content.cc:75
 msgid "Text subtitles"
 msgstr "Sous-titres textes"
 
@@ -1179,7 +1242,7 @@ msgstr "Le fichier %1 a été raccourci de %2 millisecondes."
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr "Le fichier %1 a été allongé de %2 millisecondes."
 
-#: src/lib/hints.cc:157
+#: src/lib/hints.cc:205
 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 "
@@ -1193,7 +1256,7 @@ msgstr ""
 "votre DCP à une vitesse plus proche de la cadence de vos contenus, en "
 "espérant que serveurs et projecteurs cibles supportent cette cadence."
 
-#: src/lib/dcp_content.cc:521
+#: src/lib/dcp_content.cc:549
 msgid "There is no video in this DCP"
 msgstr "Il n'y a aucune vidéo dans ce DCP"
 
@@ -1215,7 +1278,7 @@ msgstr ""
 "Ce fichier est une KDM. Les KDM doivent être ajoutées au contenu du DCP en "
 "cliquant droit sur le contenu et en sélectionnant \"Add KDM\"."
 
-#: src/lib/film.cc:439
+#: src/lib/film.cc:445
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -1223,7 +1286,7 @@ msgstr ""
 "Ce film a été créé avec une nouvelle version de DCP-o-matic et il ne peut "
 "être ouvert dans cette version du programme. Désolé!"
 
-#: src/lib/film.cc:428
+#: src/lib/film.cc:434
 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 "
@@ -1233,6 +1296,10 @@ msgstr ""
 "impossible. Créez un nouveau projet, ajoutez du contenu et reparamétrez. "
 "Désolé !"
 
+#: src/lib/types.cc:130
+msgid "Timed text"
+msgstr ""
+
 #: src/lib/dcp_content_type.cc:48
 msgid "Trailer"
 msgstr "Trailer"
@@ -1245,7 +1312,7 @@ msgstr "Transcodage %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/internet.cc:109
+#: src/lib/internet.cc:134
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
@@ -1253,7 +1320,7 @@ msgstr "Contenu de fichier ZIP non géré."
 msgid "Unexpected image type received by server"
 msgstr "Type d'image non conforme reçu par le serveur"
 
-#: src/lib/job.cc:196
+#: src/lib/job.cc:202
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -1265,11 +1332,11 @@ msgstr "Échantillonnage audio (%1) inconnu"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Adoucissement et flou Gaussien"
 
-#: src/lib/ffmpeg_content.cc:497 src/lib/ffmpeg_content.cc:521
-#: src/lib/ffmpeg_content.cc:539 src/lib/ffmpeg_content.cc:541
-#: src/lib/ffmpeg_content.cc:542 src/lib/ffmpeg_content.cc:568
-#: src/lib/ffmpeg_content.cc:570 src/lib/ffmpeg_content.cc:571
-#: src/lib/ffmpeg_content.cc:595 src/lib/ffmpeg_content.cc:596
+#: src/lib/ffmpeg_content.cc:498 src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:540 src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:543 src/lib/ffmpeg_content.cc:569
+#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:572
+#: src/lib/ffmpeg_content.cc:596 src/lib/ffmpeg_content.cc:597
 msgid "Unspecified"
 msgstr "Non-spécifié"
 
@@ -1313,7 +1380,7 @@ msgstr "En cours"
 msgid "Weave filter"
 msgstr "Canevas"
 
-#: src/lib/ffmpeg_content.cc:601
+#: src/lib/ffmpeg_content.cc:602
 msgid "YCOCG"
 msgstr "YCOCG"
 
@@ -1321,7 +1388,7 @@ msgstr "YCOCG"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/hints.cc:130
+#: src/lib/hints.cc:178
 msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
 "supported.  You are advised either to change the frame rate of your DCP or "
@@ -1333,7 +1400,7 @@ msgstr ""
 "cadence de votre DCP ou de créer plutôt un DCP SMPTE. (Cependant, les DCPs "
 "SMPTE ne sont pas acceptés par tous les projecteurs.)"
 
-#: src/lib/hints.cc:117
+#: src/lib/hints.cc:165
 msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
 "supported.  You are advised either to change the frame rate of your DCP or "
@@ -1343,7 +1410,7 @@ msgstr ""
 "qui n'est pas officiellement supportée. Nous vous conseillons de modifier la "
 "cadence de votre DCP ou de créer plutôt un DCP SMPTE."
 
-#: src/lib/hints.cc:179
+#: src/lib/hints.cc:227
 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.)"
@@ -1352,7 +1419,7 @@ msgstr ""
 "sortie DCP sur 3D si vous souhaitez le projeter sur un système 3D (par "
 "exemple : Real-D, MasterImage etc.)"
 
-#: src/lib/hints.cc:82
+#: src/lib/hints.cc:130
 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 "
@@ -1362,7 +1429,7 @@ msgstr ""
 "expérimental et un son de mauvaise qualité pourrait en résulter. Si vous "
 "continuez, essayez d'écouter le résultat dans un cinéma afin de vérifier."
 
-#: src/lib/hints.cc:168
+#: src/lib/hints.cc:216
 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."
@@ -1370,7 +1437,11 @@ msgstr ""
 "Vous avez  %1 fichiers qui ressemblent à des fichiers VOB issus de DVD. Vous "
 "devriez les assembler pour vous assurer des transitions fluides."
 
-#: src/lib/hints.cc:73
+#: src/lib/hints.cc:308
+msgid "You have overlapping closed captions, which are not allowed."
+msgstr ""
+
+#: src/lib/hints.cc:121
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
@@ -1378,11 +1449,11 @@ msgstr ""
 "Vous avez choisi un fichier police de caractère qui est plus lourd que 640 "
 "kB. Cela peut poser des problèmes en lecture."
 
-#: src/lib/film.cc:304
+#: src/lib/film.cc:309
 msgid "You must add some content to the DCP before creating it"
 msgstr "Vous devez ajouter des contenus au DCP avant de le créer"
 
-#: src/lib/hints.cc:77
+#: src/lib/hints.cc:125
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
@@ -1390,7 +1461,7 @@ msgstr ""
 "Votre DCP a moins de 6 canaux audio. Cela peut poser des problèmes sur "
 "certains projecteurs."
 
-#: src/lib/hints.cc:109
+#: src/lib/hints.cc:157
 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"
@@ -1399,7 +1470,7 @@ msgstr ""
 "problèmes sur certains projecteurs. Si possible, utilisez le Flat ou le "
 "Scope comme format image pour le DCP."
 
-#: src/lib/hints.cc:205
+#: src/lib/hints.cc:252
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
@@ -1407,7 +1478,7 @@ msgstr ""
 "Votre volume sonore est très élevé (sur %1). Vous devriez réduire le dain de "
 "votre contenu audio."
 
-#: src/lib/config.cc:277
+#: src/lib/config.cc:284
 msgid ""
 "Your default container is not valid and has been changed to Flat (1.85:1)"
 msgstr ""
@@ -1428,15 +1499,15 @@ msgstr ""
 "Votre projet contient une vidéo dont la longueur n'est pas correspondante à "
 "la limite de trame."
 
-#: src/lib/image_content.cc:71
+#: src/lib/image_content.cc:72
 msgid "[moving images]"
 msgstr "[séquence d'images]"
 
-#: src/lib/image_content.cc:69
+#: src/lib/image_content.cc:70
 msgid "[still]"
 msgstr "[image fixe]"
 
-#: src/lib/dcp_subtitle_content.cc:94 src/lib/text_subtitle_content.cc:68
+#: src/lib/dcp_subtitle_content.cc:94 src/lib/string_text_file_content.cc:69
 msgid "[subtitles]"
 msgstr "[sous-titres]"
 
@@ -1448,11 +1519,11 @@ msgstr "temps de connexion expiré"
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:300
+#: src/lib/film.cc:305
 msgid "container"
 msgstr "conteneur"
 
-#: src/lib/film.cc:308
+#: src/lib/film.cc:313
 msgid "content type"
 msgstr "type de contenu"
 
@@ -1464,7 +1535,7 @@ msgstr "copie de %1"
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/reel_writer.cc:325
+#: src/lib/reel_writer.cc:329
 msgid "could not move audio asset into the DCP (%1)"
 msgstr "ne peut pas transférer l'asset audio dans le DCP (%1)"
 
@@ -1504,7 +1575,7 @@ msgstr "erreur pendant async_read (%1)"
 msgid "error during async_write (%1)"
 msgstr "erreur pendant async_write (%1)"
 
-#: src/lib/content.cc:407 src/lib/content.cc:416
+#: src/lib/content.cc:450 src/lib/content.cc:459
 msgid "frames per second"
 msgstr "images par seconde"
 
@@ -1514,47 +1585,55 @@ msgid "h"
 msgstr "h"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:555
-msgid "it does not have sound in all its reels."
+#: src/lib/dcp_content.cc:626
+#, fuzzy
+msgid "it does not have closed captions in all its reels."
 msgstr "Pas de son dans toutes ses bobines"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:581
-msgid "it does not have subtitles in all its reels."
+#: src/lib/dcp_content.cc:621
+#, fuzzy
+msgid "it does not have open subtitles in all its reels."
 msgstr "Pas de sous-titres dans toutes ses bobines"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:480
+#: src/lib/dcp_content.cc:589
+msgid "it does not have sound in all its reels."
+msgstr "Pas de son dans toutes ses bobines"
+
+#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:502
 msgid "it has a different frame rate to the film."
 msgstr "Vitesse de défilement différente du film"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:468
+#: src/lib/dcp_content.cc:490
 msgid "it is Interop and the film is set to SMPTE."
 msgstr "Format Interop alors que le DCP est SMPTE."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:472
+#: src/lib/dcp_content.cc:494
 msgid "it is SMPTE and the film is set to Interop."
 msgstr "Format SMPTE alors que le DCP est interop."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:561
+#: src/lib/dcp_content.cc:595
 msgid "it overlaps other audio content; remove the other content."
 msgstr "Contenus audio superposés, enlevez les autres contenus."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:587
-msgid "it overlaps other subtitle content; remove the other content."
-msgstr "Sous-titres superposés, enlevez les autres contenus."
+#: src/lib/dcp_content.cc:632
+#, fuzzy
+msgid "it overlaps other text content; remove the other content."
+msgstr "Contenus vidéo superposés, enlevez les autres contenus."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:532
+#: src/lib/dcp_content.cc:560
 msgid "it overlaps other video content; remove the other content."
 msgstr "Contenus vidéo superposés, enlevez les autres contenus."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:503
+#: src/lib/dcp_content.cc:525
 msgid ""
 "its reel lengths differ from those in the film; set the reel mode to 'split "
 "by video content'."
@@ -1563,7 +1642,7 @@ msgstr ""
 "le mode 'découper par contenu vidéo'. "
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:527
+#: src/lib/dcp_content.cc:555
 msgid "its video frame size differs from the film's."
 msgstr "La taille de l'image du film diffère de celle du DCP"
 
@@ -1572,11 +1651,11 @@ msgstr "La taille de l'image du film diffère de celle du DCP"
 msgid "m"
 msgstr "m"
 
-#: src/lib/image_content.cc:86
+#: src/lib/image_content.cc:87
 msgid "moving"
 msgstr "séquence"
 
-#: src/lib/film.cc:296
+#: src/lib/film.cc:301
 msgid "name"
 msgstr "nom"
 
@@ -1589,11 +1668,11 @@ msgstr "s"
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/film.cc:317
+#: src/lib/film.cc:322
 msgid "some of your content is missing"
 msgstr "Certains de vos contenus sont manquants"
 
-#: src/lib/image_content.cc:84
+#: src/lib/image_content.cc:85
 msgid "still"
 msgstr "fixe"
 
@@ -1605,6 +1684,9 @@ msgstr "Inconnu"
 msgid "video frames"
 msgstr "images"
 
+#~ msgid "it overlaps other subtitle content; remove the other content."
+#~ msgstr "Sous-titres superposés, enlevez les autres contenus."
+
 #~ msgid ""
 #~ "The DCP %1 was being referred to by this film.  This not now possible "
 #~ "because the reel sizes in the film no longer agree with those in the "
@@ -1878,10 +1960,6 @@ msgstr "images"
 #~ msgid "there are %1 images in the directory but the last one is number %2"
 #~ msgstr "il y a %1 images dans le dossier mais la dernière est la numéro %2"
 
-#, fuzzy
-#~ msgid "Examining content"
-#~ msgstr "Examen du contenu"
-
 #~ msgid "only %1 file(s) found in moving image directory"
 #~ msgstr "Seulement %1 fichier(s) trouvé(s) dans le dossier de diaporama"