pot/merge.

1 files changed, 74 insertions, 65 deletions

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 404f2869c..72b43278d 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/lib/util.cc:534 src/lib/util.cc:535
 msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-24 16:46+0100\n"
+"POT-Creation-Date: 2016-08-27 20:36+0100\n"
 "PO-Revision-Date: 2016-08-26 21:38+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -113,7 +114,7 @@ msgstr "Débruitage 3D"
 msgid "4:3"
 msgstr "4:3"
 
-#: src/lib/hints.cc:99
+#: src/lib/hints.cc:101
 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 "
@@ -135,7 +136,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Advertisement"
 
-#: src/lib/hints.cc:91
+#: src/lib/hints.cc:93
 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) "
@@ -147,7 +148,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:87
+#: src/lib/hints.cc:89
 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.  "
@@ -163,7 +164,7 @@ msgstr ""
 msgid "An error occurred whilst handling the file %1."
 msgstr "Une erreur s'est produite lors du traitement du fichier %1."
 
-#: src/lib/analyse_audio_job.cc:81
+#: src/lib/analyse_audio_job.cc:84
 msgid "Analyse audio"
 msgstr "Analyse audio"
 
@@ -224,15 +225,15 @@ msgstr "BT709"
 msgid "Bits per pixel"
 msgstr "bits par pixel"
 
-#: src/lib/film.cc:1403
+#: src/lib/util.cc:530
 msgid "BsL"
 msgstr "BsL"
 
-#: src/lib/film.cc:1404
+#: src/lib/util.cc:531
 msgid "BsR"
 msgstr "BsR"
 
-#: src/lib/film.cc:1395
+#: src/lib/util.cc:522
 msgid "C"
 msgstr "C"
 
@@ -244,7 +245,7 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:493
+#: src/lib/util.cc:492
 msgid "Centre"
 msgstr "Centre"
 
@@ -313,11 +314,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:172
+#: src/lib/subtitle_content.cc:175
 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:168
+#: src/lib/subtitle_content.cc:171
 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'"
@@ -342,6 +343,11 @@ 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:203
+#, fuzzy
+msgid "Content to be joined must have the same outline width."
+msgstr "Le contenu ajouté doit avoir le même réglage de fondu."
+
 #: src/lib/video_content.cc:170
 msgid "Content to be joined must have the same picture size."
 msgstr "Le contenu à ajouter doit avoir la même taille d'image"
@@ -351,35 +357,35 @@ 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:176
+#: src/lib/subtitle_content.cc:179
 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:184
+#: src/lib/subtitle_content.cc:187
 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:180
+#: src/lib/subtitle_content.cc:183
 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:188
+#: src/lib/subtitle_content.cc:191
 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:196
+#: src/lib/subtitle_content.cc:199
 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:192
+#: src/lib/subtitle_content.cc:195
 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."
@@ -392,7 +398,7 @@ 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:201 src/lib/subtitle_content.cc:209
+#: src/lib/subtitle_content.cc:208 src/lib/subtitle_content.cc:216
 msgid "Content to be joined must use the same fonts."
 msgstr "Le contenu à ajouter doit avoir la même police de sous-titres"
 
@@ -464,21 +470,21 @@ msgstr "Transfert de fichier impossible"
 msgid "Could not write to remote file (%1)"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:502
 msgid "D-BOX primary"
 msgstr "D-BOX primaire"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:503
 msgid "D-BOX secondary"
 msgstr "D-BOX secondaire"
 
-#: src/lib/film.cc:1405
+#: src/lib/util.cc:532
 msgid "DBP"
 msgstr "DBP"
 
-#: src/lib/film.cc:1406
-msgid "DBS"
-msgstr "DBS"
+#: src/lib/util.cc:533
+msgid "DBPS"
+msgstr ""
 
 #: src/lib/dcp_subtitle_content.cc:100
 msgid "DCP XML subtitles"
@@ -513,7 +519,7 @@ msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
-#: src/lib/config.cc:527
+#: src/lib/config.cc:530
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -672,11 +678,11 @@ msgstr "Gamma 28 (BT470BG)"
 msgid "Gradient debander"
 msgstr "Corrections des bandes par dégradé"
 
-#: src/lib/film.cc:1399
+#: src/lib/util.cc:526
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:497
+#: src/lib/util.cc:496
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -700,7 +706,7 @@ msgstr "IEC61966-2-4"
 msgid "It is not known what caused this error."
 msgstr "Erreur indéterminée."
 
-#: src/lib/config.cc:238 src/lib/config.cc:524
+#: src/lib/config.cc:239 src/lib/config.cc:527
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envoi KDM: $CPL_NAME"
 
@@ -708,27 +714,27 @@ msgstr "Envoi KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Désentrelaceur noyau"
 
-#: src/lib/film.cc:1393
+#: src/lib/util.cc:520
 msgid "L"
 msgstr "G"
 
-#: src/lib/film.cc:1401
+#: src/lib/util.cc:528
 msgid "Lc"
 msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:491
+#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:490
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:498
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:500
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:495
+#: src/lib/util.cc:494
 msgid "Left surround"
 msgstr "Arrière gauche"
 
@@ -736,11 +742,11 @@ msgstr "Arrière gauche"
 msgid "Length"
 msgstr "Durée"
 
-#: src/lib/film.cc:1396
+#: src/lib/util.cc:523
 msgid "Lfe"
 msgstr "Bf"
 
-#: src/lib/util.cc:494
+#: src/lib/util.cc:493
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -764,7 +770,7 @@ msgstr "Logarithmique (plage 100:1)"
 msgid "Logarithmic (316:1 range)"
 msgstr "Logarithmique (plage 316:1)"
 
-#: src/lib/film.cc:1397
+#: src/lib/util.cc:524
 msgid "Ls"
 msgstr "ArG"
 
@@ -856,7 +862,7 @@ msgstr "Erreur de programme à %1:%2"
 msgid "Public Service Announcement"
 msgstr "Public Service Announcement"
 
-#: src/lib/film.cc:1394
+#: src/lib/util.cc:521
 msgid "R"
 msgstr "D"
 
@@ -868,7 +874,7 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/film.cc:1402
+#: src/lib/util.cc:529
 msgid "Rc"
 msgstr "Rc"
 
@@ -888,23 +894,23 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:492
+#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:491
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:499
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:501
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:496
+#: src/lib/util.cc:495
 msgid "Right surround"
 msgstr "Arrière droite"
 
-#: src/lib/film.cc:1398
+#: src/lib/util.cc:525
 msgid "Rs"
 msgstr "ArD"
 
@@ -981,7 +987,7 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Sous-titres textes"
 
-#: src/lib/film.cc:1522
+#: src/lib/film.cc:1510
 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 "
@@ -1126,7 +1132,7 @@ msgstr "Non-spécifié"
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/lib/util.cc:505 src/lib/util.cc:506
+#: src/lib/util.cc:504 src/lib/util.cc:505
 msgid "Unused"
 msgstr "Non-utilisé"
 
@@ -1138,11 +1144,11 @@ msgstr "Gauche sur-mixé"
 msgid "Upmix R"
 msgstr "Droit sur-mixé"
 
-#: src/lib/film.cc:1400
+#: src/lib/util.cc:527
 msgid "VI"
 msgstr "VI"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:497
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
@@ -1158,7 +1164,7 @@ msgstr "YCOCG"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/hints.cc:103
+#: src/lib/hints.cc:105
 msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
 "supported.  You are advised to make a SMPTE DCP instead."
@@ -1167,7 +1173,7 @@ msgstr ""
 "qui n'est pas officiellement supportée. Nous vous conseillons de créer "
 "plutôt un DCP SMPTE."
 
-#: src/lib/hints.cc:125
+#: src/lib/hints.cc:127
 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.)"
@@ -1176,7 +1182,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:114
+#: src/lib/hints.cc:116
 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."
@@ -1184,7 +1190,7 @@ 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:66
+#: src/lib/hints.cc:68
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
@@ -1196,7 +1202,7 @@ msgstr ""
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
-#: src/lib/hints.cc:95
+#: src/lib/hints.cc:97
 msgid ""
 "Your DCP frame rate (%1 fps) may cause problems in a few (mostly older) "
 "projectors.  Use 24 or 48 frames per second to be on the safe side."
@@ -1205,7 +1211,7 @@ msgstr ""
 "projecteurs (anciens). Utilisez plutôt une cadence de 24 ou 48 images par "
 "seconde pour les éviter."
 
-#: src/lib/hints.cc:70
+#: src/lib/hints.cc:72
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
@@ -1213,18 +1219,11 @@ msgstr ""
 "Votre DCP a moins de 6 canaux audio. Cela peut poser des problèmes sur "
 "certains projecteurs."
 
-#: src/lib/hints.cc:137
-msgid ""
-"Your audio level is very close to clipping.  You should reduce the gain of "
-"your audio content."
-msgstr ""
-"Votre volume sonore est proche de la saturation. Vous devriez réduire le "
-"gain de votre contenu audio."
-
-#: src/lib/hints.cc:135
+#: src/lib/hints.cc:152
+#, fuzzy
 msgid ""
-"Your audio level is very high.  You should reduce the gain of your audio "
-"content."
+"Your audio level is very high (on %1).  You should reduce the gain of your "
+"audio content."
 msgstr ""
 "Votre volume sonore est très élevé. Vous devriez réduire le dain de votre "
 "contenu audio."
@@ -1362,6 +1361,16 @@ msgstr "Inconnu"
 msgid "video frames"
 msgstr "images"
 
+#~ msgid "DBS"
+#~ msgstr "DBS"
+
+#~ msgid ""
+#~ "Your audio level is very close to clipping.  You should reduce the gain "
+#~ "of your audio content."
+#~ msgstr ""
+#~ "Votre volume sonore est proche de la saturation. Vous devriez réduire le "
+#~ "gain de votre contenu audio."
+
 #~ msgid "could not create file %1"
 #~ msgstr "Écriture vers fichier distant (%1) impossible"