Merge remote-tracking branch 'origin/main' into v2.17.x

6 files changed, 44 insertions, 46 deletions

diff --git a/cscript b/cscript
index c1a5bebcb..96ed51e53 100644
--- a/cscript
+++ b/cscript
@@ -554,7 +554,7 @@ def configure_options(target, options, for_package=False):
     opt = ' --warnings-are-errors'
 
     if for_package or not (
-            (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04']) or
+            (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04', '24.04']) or
             (target.platform == 'osx') or
             (target.platform == 'windows')
         ):
diff --git a/src/lib/digester.cc b/src/lib/digester.cc
index 09214c3de..67a3e2398 100644
--- a/src/lib/digester.cc
+++ b/src/lib/digester.cc
@@ -67,7 +67,7 @@ Digester::get () const
 
 		char hex[MD5_DIGEST_SIZE * 2 + 1];
 		for (int i = 0; i < MD5_DIGEST_SIZE; ++i) {
-			snprintf(hex + i * 2, MD5_DIGEST_SIZE * 2 + 1, "%02x", digest[i]);
+			snprintf(hex + i * 2, 3, "%02x", digest[i]);
 		}
 
 		_digest = hex;
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 49e2854af..e353a4aee 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-12 00:54+0100\n"
-"PO-Revision-Date: 2019-05-07 14:28+0100\n"
+"PO-Revision-Date: 2024-06-18 00:17+0200\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.2\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: src/lib/video_content.cc:503
 #, c-format
@@ -209,17 +209,17 @@ msgstr "; %1 restant ; fin prévue à %2%3"
 
 #: src/lib/analytics.cc:65
 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!"
+"<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 ""
 "<h2>Vous venez de produire %1 DCPs avec DCP-o-matic !</h2><img width=\"20%%"
 "\" src=\"memory:me.jpg\" align=\"center\"><p>Bonjour. Je m'appelle Carl et "
@@ -229,8 +229,8 @@ msgstr ""
 "trouvez DCP-o-matic utile, merci de penser à faire un don au projet. Une "
 "aide financière m'aidera à passer plus de temps sur DCP-o-matic et à "
 "l'améliorer !<p><ul><li><a href=\"https://dcpomatic.com/donate_amount?"
-"amount=40\">Aller sur Paypal pour faire un don de €40</a><li><a "
-"href=\"https://dcpomatic.com/donate_amount?amount=20\">Aller sur Paypal pour "
+"amount=40\">Aller sur Paypal pour faire un don de €40</a><li><a href="
+"\"https://dcpomatic.com/donate_amount?amount=20\">Aller sur Paypal pour "
 "faire un don de €20</a><li><a href=\"https://dcpomatic.com/donate_amount?"
 "amount=10\">Aller sur Paypal pour faire un don de €10</a></ul><p>Merci !"
 
@@ -1648,7 +1648,6 @@ 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:239
-#, fuzzy
 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 "
@@ -1656,12 +1655,12 @@ msgid ""
 "rate to one closer to your content, provided that your target projection "
 "systems support your chosen DCP rate."
 msgstr ""
-"Il existe une grande différence entre la fréquence d'images de votre DCP et "
-"celle de certains de vos contenus.  De ce fait, votre audio sera lu à une "
-"hauteur beaucoup plus basse ou plus haute qu'elle ne devrait.  Nous vous "
-"conseillons de régler la fréquence d'images de votre DCP sur une fréquence "
-"plus proche de celle de votre contenu, à condition que vos systèmes de "
-"projection cibles supportent la fréquence DCP choisie."
+"Il y a une grande différence entre la cadence d'images de votre DCP et celle "
+"de certaines de vos sources.  Le son de ces sources sera lu à une hauteur "
+"beaucoup plus basse ou plus haute qu'elle ne le devrait.  Nous vous "
+"conseillons de rapprocher la cadence de votre DCP à celle des vos sources en "
+"vous assurant que vos systèmes de projection supportent la cadence DCP "
+"choisie."
 
 #: src/lib/dcp_content.cc:675
 msgid "There is no video in this DCP"
@@ -1850,15 +1849,14 @@ msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
 #: src/lib/hints.cc:199
-#, fuzzy
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
 "supported by all projectors.  It is advisable to change the DCP frame rate "
 "to %2 fps."
 msgstr ""
-"Vous êtes sur le point de créer un DCP à une fréquence d'images de %1 ips.  "
-"Cette fréquence d'images n'est pas supportée par tous les projecteurs.  Nous "
-"vous conseillons de modifier la fréquence d'images de votre DCP à %2 ips."
+"Vous allez créer un DCP à une cadence de %1 ips.  Elle n'est pas supportée "
+"par tous les projecteurs.  Nous vous conseillons de modifier la cadence "
+"d'images de votre DCP à %2 ips."
 
 #: src/lib/hints.cc:183
 msgid ""
@@ -1941,6 +1939,9 @@ msgid ""
 "distributors to raise QC errors when they check your DCP.  To avoid this, "
 "set the DCP audio channels to 8 or 16."
 msgstr ""
+"Votre DCP a %1 canaux audio au lieu de 8 ou 16. Cela peut engendrer une "
+"erreur lors de la vérification par votre distributeur. Sélectionnez 8 ou 16 "
+"canaux audio pour éviter cela."
 
 #: src/lib/hints.cc:110
 msgid ""
@@ -2182,10 +2183,8 @@ msgid "still"
 msgstr "fixe"
 
 #: src/lib/dcp_content.cc:779
-#, fuzzy
 msgid "they overlap other text content; remove the other content."
-msgstr ""
-"il se superpose à un autre contenu textuel ; supprimez cet autre contenu."
+msgstr "Superposition de texte. Supprimer l'autre élément."
 
 #: src/lib/ffmpeg_examiner.cc:342
 msgid "unknown"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 8a1f02c05..e2e4b5cb9 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/wx/custom_scale_dialog.cc:45
 msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-12 00:54+0100\n"
-"PO-Revision-Date: 2019-05-07 14:29+0100\n"
+"PO-Revision-Date: 2024-06-18 00:22+0200\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.2\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: src/wx/player_information.cc:112
 #, c-format
@@ -479,7 +478,7 @@ msgstr "Autoriser le mappage à tous les canaux audio"
 
 #: src/wx/full_config_dialog.cc:1548
 msgid "Allow use of SMPTE Bv2.0"
-msgstr ""
+msgstr "Activer l'utilisation de la norme SMPTE Bv2.0"
 
 #: src/wx/rgba_colour_picker.cc:37
 msgid "Alpha   0"
@@ -728,14 +727,12 @@ msgid "Certificate downloaded"
 msgstr "Certificat téléchargé"
 
 #: src/wx/invalid_certificate_period_dialog.cc:63
-#, fuzzy
 msgid "Certificate end"
-msgstr "Certificat"
+msgstr "Début certificat"
 
 #: src/wx/invalid_certificate_period_dialog.cc:55
-#, fuzzy
 msgid "Certificate start"
-msgstr "Certificat"
+msgstr "Fin certificat"
 
 #: src/wx/metadata_dialog.cc:298
 msgid "Chain"
@@ -751,7 +748,7 @@ msgstr "Canaux "
 
 #: src/wx/screens_panel.cc:99
 msgid "Check all"
-msgstr "Tout vérifier"
+msgstr "Tout cocher"
 
 #: src/wx/config_dialog.cc:170
 msgid "Check for testing updates on startup"
@@ -1172,14 +1169,12 @@ msgid "Default studio"
 msgstr "Studio par défaut"
 
 #: src/wx/full_config_dialog.cc:343
-#, fuzzy
 msgid "Default territory"
-msgstr "Distributeur par défaut "
+msgstr "Territoire par défaut "
 
 #: src/wx/full_config_dialog.cc:345
-#, fuzzy
 msgid "Default territory to use for new DCPs"
-msgstr "Dossier par défaut pour les nouveaux films "
+msgstr "Territoire par défaut pour les nouveaux DCPs "
 
 #: src/wx/full_config_dialog.cc:274
 msgid "Defaults"
@@ -1594,12 +1589,13 @@ msgid ""
 "How the DCP should be split into parts internally.  If in doubt, choose "
 "'Single reel'"
 msgstr ""
+"Mode de découpage de votre DCP. En cas de doute, choisissez \"bobine unique\""
 
 #. TRANSLATORS: the user will be asked to type this phrase into a text entry to confirm that they have read
 #. the warning about using the disk writer.
 #: src/wx/disk_warning_dialog.cc:45 src/wx/disk_warning_dialog.cc:57
 msgid "I am sure"
-msgstr ""
+msgstr "J'en suis sûr"
 
 #: src/wx/gain_calculator_dialog.cc:35
 msgid "I want to play this back at fader"
diff --git a/src/wx/subscribers.cc b/src/wx/subscribers.cc
index 16b2bcdfd..868fc21b0 100644
--- a/src/wx/subscribers.cc
+++ b/src/wx/subscribers.cc
@@ -14,10 +14,10 @@ subscribers.Add (wxT ("Lichtspiele Kalk"));
 subscribers.Add (wxT ("Zbigniew Kamiński"));
 subscribers.Add (wxT ("Timm Kröger"));
 subscribers.Add (wxT ("Carlos Lagido"));
-subscribers.Add (wxT ("LightBender Post"));
 subscribers.Add (wxT ("Ross Meyer"));
 subscribers.Add (wxT ("Owen Morgan"));
 subscribers.Add (wxT ("Austrian Film Museum"));
+subscribers.Add (wxT ("LightBender Post"));
 subscribers.Add (wxT ("Irving Shapiro"));
 subscribers.Add (wxT ("Jussi Siponen"));
 subscribers.Add (wxT ("Jeremy Spracklen"));
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc
index 73fab0483..cb595eb5e 100644
--- a/src/wx/supporters.cc
+++ b/src/wx/supporters.cc
@@ -515,6 +515,7 @@ supported_by.Add (wxT ("Niels-Erik Constantin Hansen"));
 supported_by.Add (wxT ("Richard Hansen"));
 supported_by.Add (wxT ("Jozef Hardos"));
 supported_by.Add (wxT ("Filmschuur Harlem"));
+supported_by.Add (wxT ("Jens Harms"));
 supported_by.Add (wxT ("Momoyo Harris"));
 supported_by.Add (wxT ("Robert Harrison"));
 supported_by.Add (wxT ("Tim Harrison"));
@@ -658,6 +659,7 @@ supported_by.Add (wxT ("Fosnavåg konserthus"));
 supported_by.Add (wxT ("Arnold Kopff"));
 supported_by.Add (wxT ("Frank Koppelmans"));
 supported_by.Add (wxT ("Jernej Koren"));
+supported_by.Add (wxT ("Bear Kosik"));
 supported_by.Add (wxT ("Dieter Kovacic"));
 supported_by.Add (wxT ("Filip Kovcin"));
 supported_by.Add (wxT ("Alan Kraemer"));
@@ -1290,6 +1292,7 @@ supported_by.Add (wxT ("Laura Waddington"));
 supported_by.Add (wxT ("Matthew Wade"));
 supported_by.Add (wxT ("Nela Wagman"));
 supported_by.Add (wxT ("Stéphane Wagneur"));
+supported_by.Add (wxT ("Christine Walker"));
 supported_by.Add (wxT ("Andrew Walls"));
 supported_by.Add (wxT ("Dan Walls"));
 supported_by.Add (wxT ("Christoph Walther"));