pot/merge.

1 files changed, 81 insertions, 57 deletions

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 666ab288e..6f64f8a8c 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: 2016-06-29 22:02+0100\n"
+"POT-Creation-Date: 2016-07-02 10:49+0100\n"
 "PO-Revision-Date: 2016-06-05 16:43+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -25,15 +25,15 @@ msgstr "%1 [Atmos]"
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/ffmpeg_content.cc:268
+#: src/lib/ffmpeg_content.cc:296
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:264
+#: src/lib/ffmpeg_content.cc:292
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
-#: src/lib/ffmpeg_content.cc:266 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
 msgid "%1 [video]"
 msgstr "%1 [vidéo]"
 
@@ -89,48 +89,48 @@ msgstr "Le son sera ré-échantillonné à %1kHz."
 msgid "Audio will not be resampled"
 msgstr "Le son ne sera pas ré-échantillonné."
 
-#: src/lib/ffmpeg_content.cc:513
+#: src/lib/ffmpeg_content.cc:541
 msgid "BT1361 extended colour gamut"
 msgstr "BT1361 gamme de couleurs étendue"
 
-#: src/lib/ffmpeg_content.cc:493
+#: src/lib/ffmpeg_content.cc:521
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:563
 msgid "BT2020 constant luminance"
 msgstr "BT2020 luminance constante"
 
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:543
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 pour un système 10-bit"
 
-#: src/lib/ffmpeg_content.cc:516
+#: src/lib/ffmpeg_content.cc:544
 msgid "BT2020 for a 12-bit system"
 msgstr "BT2020 pour un système 12-bit"
 
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:562
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 luminance non-constante"
 
-#: src/lib/ffmpeg_content.cc:489
+#: src/lib/ffmpeg_content.cc:517
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:558
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:488
+#: src/lib/ffmpeg_content.cc:516
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:485 src/lib/ffmpeg_content.cc:502
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:554
 msgid "BT709"
 msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:570
 msgid "Bits per pixel"
 msgstr "bits par pixel"
 
@@ -166,7 +166,7 @@ msgstr "Canaux"
 msgid "Checking existing image data"
 msgstr "Recherche de données images existantes"
 
-#: src/lib/ffmpeg_content.cc:498
+#: src/lib/ffmpeg_content.cc:526
 msgid "Colour primaries"
 msgstr "Couleurs primaires"
 
@@ -180,17 +180,17 @@ 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:442 src/lib/ffmpeg_content.cc:449
-#: src/lib/ffmpeg_content.cc:456 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:471 src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:477
+#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:499 src/lib/ffmpeg_content.cc:504
 msgid "Colour range"
 msgstr "Plage de couleurs"
 
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:550
 msgid "Colour transfer characteristic"
 msgstr "Caractéristique conversion colorimétrique"
 
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:567
 msgid "Colourspace"
 msgstr "Espace colorimétrique"
 
@@ -218,11 +218,28 @@ msgstr "VItesse du contenu audio"
 msgid "Content frame rate"
 msgstr "Cadence du contenu"
 
-#: src/lib/subtitle_content.cc:153
+#: src/lib/ffmpeg_content.cc:142
+#, fuzzy
+msgid "Content to be joined must all have or not have audio"
+msgstr "Le contenu à ajouter doit avoir le même gain audio"
+
+#: src/lib/ffmpeg_content.cc:145
+#, fuzzy
+msgid "Content to be joined must all have or not have subtitles"
+msgstr ""
+"Le contenu à ajouter doit avoir le même réglage d'échelle horizontale de "
+"sous-titres"
+
+#: src/lib/ffmpeg_content.cc:139
+#, fuzzy
+msgid "Content to be joined must all have or not have video"
+msgstr "Le contenu à ajouter doit avoir le même réglage de fondu."
+
+#: src/lib/subtitle_content.cc:156
 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:149
+#: src/lib/subtitle_content.cc:152
 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'"
@@ -256,30 +273,37 @@ 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:157
+#: src/lib/subtitle_content.cc:160
 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:165
+#: src/lib/subtitle_content.cc:168
 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:161
+#: src/lib/subtitle_content.cc:164
 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:169
+#: src/lib/subtitle_content.cc:172
 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:176
+#, fuzzy
+msgid "Content to be joined must have the same subtitle line spacing."
+msgstr ""
+"Le contenu à ajouter doit avoir le même réglage d'échelle horizontale de "
+"sous-titres"
+
 #: src/lib/content.cc:122 src/lib/content.cc:126
 msgid "Content to be joined must have the same video frame rate"
 msgstr "Le contenu à ajouter doit avoir la même cadence vidéo."
@@ -288,11 +312,11 @@ 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:174 src/lib/subtitle_content.cc:182
+#: src/lib/subtitle_content.cc:181 src/lib/subtitle_content.cc:189
 msgid "Content to be joined must use the same fonts."
 msgstr "Le contenu à ajouter doit avoir la même police de sous-titres"
 
-#: src/lib/ffmpeg_content.cc:138
+#: src/lib/ffmpeg_content.cc:166
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Le contenu à ajouter doit avoir le même flux sous titre"
 
@@ -494,7 +518,7 @@ msgstr "Erreur: %1"
 msgid "Examine content"
 msgstr "Examen du contenu"
 
-#: src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:557
 msgid "FCC"
 msgstr "FCC"
 
@@ -514,7 +538,7 @@ msgstr "Feature"
 msgid "Filename"
 msgstr "Nom de Fichier"
 
-#: src/lib/ffmpeg_content.cc:492
+#: src/lib/ffmpeg_content.cc:520
 msgid "Film"
 msgstr "Film"
 
@@ -538,11 +562,11 @@ msgstr "Flat"
 msgid "Frame rate"
 msgstr "Cadence"
 
-#: src/lib/ffmpeg_content.cc:476
+#: src/lib/ffmpeg_content.cc:504
 msgid "Full"
 msgstr "Complet"
 
-#: src/lib/ffmpeg_content.cc:456
+#: src/lib/ffmpeg_content.cc:484
 msgid "Full (0-%1)"
 msgstr "en cours (0-%1)"
 
@@ -566,11 +590,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:505
+#: src/lib/ffmpeg_content.cc:533
 msgid "Gamma 22 (BT470M)"
 msgstr "Gamma 22 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:506
+#: src/lib/ffmpeg_content.cc:534
 msgid "Gamma 28 (BT470BG)"
 msgstr "Gamma 28 (BT470BG)"
 
@@ -594,11 +618,11 @@ msgstr "Débruiteur 3D haute qualité"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:542
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB or sYCC)"
 
-#: src/lib/ffmpeg_content.cc:512
+#: src/lib/ffmpeg_content.cc:540
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
@@ -650,23 +674,23 @@ msgstr "Bf"
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
-#: src/lib/ffmpeg_content.cc:471
+#: src/lib/ffmpeg_content.cc:499
 msgid "Limited"
 msgstr "Limité"
 
-#: src/lib/ffmpeg_content.cc:449
+#: src/lib/ffmpeg_content.cc:477
 msgid "Limited (%1-%2)"
 msgstr "Limité (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:509
+#: src/lib/ffmpeg_content.cc:537
 msgid "Linear"
 msgstr "Linéaire"
 
-#: src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:538
 msgid "Logarithmic (100:1 range)"
 msgstr "Logarithmique (plage 100:1)"
 
-#: src/lib/ffmpeg_content.cc:511
+#: src/lib/ffmpeg_content.cc:539
 msgid "Logarithmic (316:1 range)"
 msgstr "Logarithmique (plage 316:1)"
 
@@ -770,7 +794,7 @@ msgstr "Public Service Announcement"
 msgid "R"
 msgstr "D"
 
-#: src/lib/ffmpeg_content.cc:525
+#: src/lib/ffmpeg_content.cc:553
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr "RGB / sRGB (IEC61966-2-1)"
 
@@ -826,28 +850,28 @@ msgstr "Arrière droite"
 msgid "Rs"
 msgstr "ArD"
 
-#: src/lib/ffmpeg_content.cc:490 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:518 src/lib/ffmpeg_content.cc:535
 msgid "SMPTE 170M (BT601)"
 msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:531
+#: src/lib/ffmpeg_content.cc:559
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:519 src/lib/ffmpeg_content.cc:536
+#: src/lib/ffmpeg_content.cc:560
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/ffmpeg_content.cc:517
+#: src/lib/ffmpeg_content.cc:545
 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:518
+#: src/lib/ffmpeg_content.cc:546
 msgid "SMPTE ST 428-1"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:522
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
 
@@ -1008,11 +1032,11 @@ msgstr "Échantillonnage audio (%1) inconnu"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Adoucissement et flou Gaussien"
 
-#: src/lib/ffmpeg_content.cc:442 src/lib/ffmpeg_content.cc:466
-#: src/lib/ffmpeg_content.cc:484 src/lib/ffmpeg_content.cc:486
-#: src/lib/ffmpeg_content.cc:487 src/lib/ffmpeg_content.cc:501
-#: src/lib/ffmpeg_content.cc:503 src/lib/ffmpeg_content.cc:504
-#: src/lib/ffmpeg_content.cc:527 src/lib/ffmpeg_content.cc:528
+#: src/lib/ffmpeg_content.cc:470 src/lib/ffmpeg_content.cc:494
+#: src/lib/ffmpeg_content.cc:512 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:529
+#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:556
 msgid "Unspecified"
 msgstr "Non-spécifié"
 
@@ -1044,7 +1068,7 @@ msgstr "Déficients Visuels"
 msgid "Waiting"
 msgstr "En cours"
 
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:561
 msgid "YCOCG"
 msgstr "YCOCG"