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

2 files changed, 11 insertions, 0 deletions

diff --git a/src/wx/markers.cc b/src/wx/markers.cc
index f6ca74a95..a2ef1e9e7 100644
--- a/src/wx/markers.cc
+++ b/src/wx/markers.cc
@@ -30,6 +30,8 @@ vector<pair<wxString, dcp::Marker>>
 all_editable_markers()
 {
 	return vector<pair<wxString, dcp::Marker>>{
+		{ _("First frame of ratings band"), dcp::Marker::FFOB },
+		{ _("Last frame of ratings band"), dcp::Marker::LFOB },
 		{ _("First frame of title credits"), dcp::Marker::FFTC },
 		{ _("Last frame of title credits"), dcp::Marker::LFTC },
 		{ _("First frame of intermission"), dcp::Marker::FFOI },
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc
index 2abcb5fdf..f8dd5f02d 100644
--- a/src/wx/supporters.cc
+++ b/src/wx/supporters.cc
@@ -101,6 +101,7 @@ supported_by.Add (wxT ("Nicolas Bilder"));
 supported_by.Add (wxT ("Travis Bird"));
 supported_by.Add (wxT ("Gregory Bishop"));
 supported_by.Add (wxT ("Kenneth Biswabic"));
+supported_by.Add (wxT ("Matt Blackwell"));
 supported_by.Add (wxT ("Mike Blakesley"));
 supported_by.Add (wxT ("Cyrille Blanc"));
 supported_by.Add (wxT ("Stijn De Blieck"));
@@ -140,6 +141,7 @@ supported_by.Add (wxT ("Eddy Briere"));
 supported_by.Add (wxT ("William Bright"));
 supported_by.Add (wxT ("Marcus Brockmeier"));
 supported_by.Add (wxT ("Warren Brown"));
+supported_by.Add (wxT ("Michael Bruce"));
 supported_by.Add (wxT ("Malia Bruker"));
 supported_by.Add (wxT ("Mike Southon BSC"));
 supported_by.Add (wxT ("Alexander Buchholz"));
@@ -234,6 +236,7 @@ supported_by.Add (wxT ("Marketplace Media Company"));
 supported_by.Add (wxT ("The Archetype Company"));
 supported_by.Add (wxT ("Conta'm"));
 supported_by.Add (wxT ("Mike Coombs"));
+supported_by.Add (wxT ("Kathy Corley"));
 supported_by.Add (wxT ("Xavier Cortes"));
 supported_by.Add (wxT ("Thomas Cosgrove"));
 supported_by.Add (wxT ("Adam Cousins"));
@@ -688,6 +691,7 @@ supported_by.Add (wxT ("Christian Kreil"));
 supported_by.Add (wxT ("Sebastian Kreis"));
 supported_by.Add (wxT ("Tobias Kremer"));
 supported_by.Add (wxT ("Indu Krishnan"));
+supported_by.Add (wxT ("Cabine Filmtheater Kriterion"));
 supported_by.Add (wxT ("Kino Krokodil"));
 supported_by.Add (wxT ("Jakub Królikowski"));
 supported_by.Add (wxT ("Cihan Kulaber"));
@@ -730,6 +734,7 @@ supported_by.Add (wxT ("Sean Leigh"));
 supported_by.Add (wxT ("Felix Leitermann"));
 supported_by.Add (wxT ("Cedric Lejeune"));
 supported_by.Add (wxT ("James LeJeune"));
+supported_by.Add (wxT ("Steven Lekowicz"));
 supported_by.Add (wxT ("Chris Lelidis"));
 supported_by.Add (wxT ("Olivier Lemaire"));
 supported_by.Add (wxT ("Tekanov Leonid"));
@@ -904,6 +909,7 @@ supported_by.Add (wxT ("Lindsay Morris"));
 supported_by.Add (wxT ("Christopher Morrison"));
 supported_by.Add (wxT ("Augusto Mory"));
 supported_by.Add (wxT ("Mia Movie"));
+supported_by.Add (wxT ("Nils Mückner"));
 supported_by.Add (wxT ("Lorenz Müller"));
 supported_by.Add (wxT ("Alexander Müller"));
 supported_by.Add (wxT ("Paul Müller-Hahl"));
@@ -917,6 +923,7 @@ supported_by.Add (wxT ("David Nedrow"));
 supported_by.Add (wxT ("Roger Nelson"));
 supported_by.Add (wxT ("Jary Nemo"));
 supported_by.Add (wxT ("Daniel Nestler"));
+supported_by.Add (wxT ("Hubert Neufeld"));
 supported_by.Add (wxT ("NT Next"));
 supported_by.Add (wxT ("Nguyen Le Khoi Nguyen"));
 supported_by.Add (wxT ("Robert Nichol"));
@@ -976,6 +983,7 @@ supported_by.Add (wxT ("Stanko Pavlica"));
 supported_by.Add (wxT ("Konstantinos Pavlidis"));
 supported_by.Add (wxT ("Shallum Ong Pe"));
 supported_by.Add (wxT ("Natalie Peart"));
+supported_by.Add (wxT ("Bernard Peasley"));
 supported_by.Add (wxT ("Cine Avenida Pedrajas"));
 supported_by.Add (wxT ("Voitek Pendrak"));
 supported_by.Add (wxT ("Gregory Penetrante"));
@@ -1092,6 +1100,7 @@ supported_by.Add (wxT ("Sascha Roll"));
 supported_by.Add (wxT ("Rollickin'"));
 supported_by.Add (wxT ("Janthony Roman"));
 supported_by.Add (wxT ("Daniel Roman"));
+supported_by.Add (wxT ("Simone Romboli"));
 supported_by.Add (wxT ("Jonatan Salgado Romero"));
 supported_by.Add (wxT ("Nicole Romine"));
 supported_by.Add (wxT ("Marian Romulis"));