Cherry-pick 9964901 from v2.12.x

diff --git a/ChangeLog b/ChangeLog
index d126e0fb50a53fbad381c77f474bf4130dbf676a..89dd9c8f1ec206432458a13dec7e539c697d9051 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2018-03-23  Carl Hetherington  <cth@carlh.net>
+2018-03-24  Carl Hetherington  <cth@carlh.net>
+
+       * Updated fr_FR translation from Thierry Journet.
+
+2018-03-22  Carl Hetherington  <cth@carlh.net>
 
        * Add space shortcut to start/stop playback, arrows to go
        back/forward one frame and Ctrl-T to open timeline (#1201).

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index e30d749861140b34b29cd7a9b6280c6ca81df763..778db8cdcd5b771c7c9faee913aea88736075148 100644 (file)
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 16:50+0000\n"
-"PO-Revision-Date: 2018-02-24 14:30+0100\n"
+"POT-Creation-Date: 2018-03-17 10:22+0000\n"
+"PO-Revision-Date: 2018-03-24 16:17+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -298,7 +298,11 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:513
+#: src/lib/film.cc:1220
+msgid "Cannot make a KDM as this project is not encrypted."
+msgstr "Fabrication d'une KDM impossible car ce projet n'est pas crypté."
+
+#: src/lib/util.cc:514
 msgid "Centre"
 msgstr "Centre"
 
@@ -1296,7 +1300,17 @@ 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:138
+#: src/lib/hints.cc:82
+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 ""
+"Vous utilisez le surmixeur stéréo vers 5.1 de DCP-o-matic. Cet outil est "
+"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:144
 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."

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index c04b821436f9a2235d8089c747f0b91f7f67a762..79e236c98bf4aec7553d93a3d5f392f07a439bec 100644 (file)
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 16:50+0000\n"
-"PO-Revision-Date: 2018-02-24 14:42+0100\n"
+"POT-Creation-Date: 2018-03-17 10:22+0000\n"
+"PO-Revision-Date: 2018-03-24 16:21+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 485a1c5edf99c2bf42aba1f49cffa7b74704b8ee..09b047509533406574d872dde82ae4f541cdb04d 100644 (file)
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 16:50+0000\n"
-"PO-Revision-Date: 2018-02-24 14:54+0100\n"
+"POT-Creation-Date: 2018-03-17 10:22+0000\n"
+"PO-Revision-Date: 2018-03-24 16:21+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -384,6 +384,10 @@ msgstr "Annuler"
 msgid "Cannot reference this DCP.  "
 msgstr "Ne peut pas se référer à ce DCP"
 
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Certificate chain"
+msgstr "Chaîne de certificat"
+
 #: src/wx/dolby_doremi_certificate_panel.cc:204
 msgid "Certificate downloaded"
 msgstr "Certificat téléchargé"
@@ -658,6 +662,10 @@ msgstr "Délai"
 msgid "Details..."
 msgstr "Détails..."
 
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Do nothing"
+msgstr "Ne rien faire"
+
 #: src/wx/download_certificate_dialog.cc:37
 msgid "Dolby / Doremi"
 msgstr "Dolby / Doremi"
@@ -1526,6 +1534,10 @@ msgstr "Rec. 709"
 msgid "Recipient certificate"
 msgstr "Certificat récipient"
 
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Recreate signing certificates"
+msgstr "Recréer les Certificats"
+
 #: src/wx/isdcf_metadata_dialog.cc:64
 msgid "Red band"
 msgstr "Red Band"
@@ -1914,6 +1926,20 @@ msgstr "Testé par"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "la date de fin doit logiquement être plus tardive que la date de début"
 
+#: src/wx/recreate_chain_dialog.cc:33
+msgid ""
+"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
+"contains a small error\n"
+"which will prevent DCPs from being validated correctly on some systems.  Do "
+"you want to re-create\n"
+"the certificate chain for signing DCPs and KDMs?"
+msgstr ""
+"La chaîne de certificat que DCP-o-matic utilise pour signer les DCPs et KDMs "
+"contient une petite erreur\n"
+"qui peut enpecher des DCPs d'être validé correctement sur certains "
+"systèmes.  Souhaitez-vous recréer\n"
+"la chaîne de certificats pour signer les DCPs et KDMs?"
+
 #: src/wx/content_menu.cc:360
 msgid ""
 "The content file(s) you specified are not the same as those that are "