Merge.

[dcpomatic.git] / src / wx / about_dialog.cc

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index efc4e6f5989cda0994f8a529b298ee358e6a24b7..aa05076c1d8afb7f5b40965fff984f93a33de8a5 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
        t = new wxStaticText (
                this, wxID_ANY,
-               _("(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+               _("(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
                wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
                );
 
@@ -101,18 +101,23 @@ AboutDialog::AboutDialog (wxWindow* parent)
        translated_by.Add (wxT ("Grégoire Ausina"));
        translated_by.Add (wxT ("Cherif Ben Brahim"));
        translated_by.Add (wxT ("Massimiliano Broggi"));
+       translated_by.Add (wxT ("Davide Dall'AraCiao"));
        translated_by.Add (wxT ("William Fanelli"));
+       translated_by.Add (wxT ("Tomáš Hlaváč"));
        translated_by.Add (wxT ("Thierry Journet"));
        translated_by.Add (wxT ("Adam Klotblixt"));
        translated_by.Add (wxT ("Theo Kooijmans"));
        translated_by.Add (wxT ("Carsten Kurz"));
        translated_by.Add (wxT ("Lilian Lefranc"));
        translated_by.Add (wxT ("Gérald Maruccia"));
+       translated_by.Add (wxT ("Anders Uhl Pedersen"));
        translated_by.Add (wxT ("Olivier Perriere"));
        translated_by.Add (wxT ("Markus Raab"));
+       translated_by.Add (wxT ("Tiago Casal Ribeiro"));
        translated_by.Add (wxT ("Davide Sanvito"));
        translated_by.Add (wxT ("Marek Skrzelowski"));
        translated_by.Add (wxT ("Igor Voytovich"));
+       translated_by.Add (wxT ("Rob van Nieuwkerk"));
        add_section (_("Translated by"), translated_by);
 
        wxArrayString with_help_from;
@@ -128,6 +133,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Eric Audurier"));
        supported_by.Add (wxT ("Louis Belloisy"));
        supported_by.Add (wxT ("Mike Blakesley"));
+       supported_by.Add (wxT ("Silvio Bonomi"));
        supported_by.Add (wxT ("Jeff Boot"));
        supported_by.Add (wxT ("Kieran Carroll"));
        supported_by.Add (wxT ("Matt Carter"));
@@ -144,10 +150,12 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Jose Angel Velasco Fernandez"));
        supported_by.Add (wxT ("Traverso City Film Festival"));
        supported_by.Add (wxT ("Andres Fink"));
+       supported_by.Add (wxT ("Dave Fleegel"));
        supported_by.Add (wxT ("Evan Freeze"));
        supported_by.Add (wxT ("Silvio Giuliano"));
        supported_by.Add (wxT ("Alan Gouger"));
        supported_by.Add (wxT ("Christopher Gray"));
+       supported_by.Add (wxT ("Vincent Grenier"));
        supported_by.Add (wxT ("Flor Guillaume"));
        supported_by.Add (wxT ("Patrick Haderer"));
        supported_by.Add (wxT ("Jeff Hemingway"));
@@ -156,22 +164,28 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Zbigniew Kamiński"));
        supported_by.Add (wxT ("Chris Kay"));
        supported_by.Add (wxT ("Lars Kelto"));
+       supported_by.Add (wxT ("Erwan Kerzanet"));
+       supported_by.Add (wxT ("Kert Kiima"));
        supported_by.Add (wxT ("Adam Klotblixt"));
        supported_by.Add (wxT ("Filip Kovcin"));
        supported_by.Add (wxT ("Cihan Kulaber"));
        supported_by.Add (wxT ("Carsten Kurz"));
+       supported_by.Add (wxT ("Daniel Martinez Lara"));
        supported_by.Add (wxT ("Lilian Lefranc"));
        supported_by.Add (wxT ("Sean Leigh"));
        supported_by.Add (wxT ("Olivier Lemaire"));
        supported_by.Add (wxT ("Gavin Lewarne"));
        supported_by.Add (wxT ("Theo Lipfert"));
+       supported_by.Add (wxT ("Paweł Lipiński"));
        supported_by.Add (wxT ("Adrian Manolescu"));
        supported_by.Add (wxT ("Mattias Mattsson"));
        supported_by.Add (wxT ("Kjarten Michaelsen"));
        supported_by.Add (wxT ("Aldo Midali"));
        supported_by.Add (wxT ("Sylvain Mielle"));
+       supported_by.Add (wxT ("Howard Molton"));
        supported_by.Add (wxT ("Lindsay Morris"));
        supported_by.Add (wxT ("David Nedrow"));
+       supported_by.Add (wxT ("Casablanca Nuernberg"));
        supported_by.Add (wxT ("Tim O'Brien"));
        supported_by.Add (wxT ("Jerome Cohen Olivar"));
        supported_by.Add (wxT ("Kevin Orman"));
@@ -182,9 +196,11 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("David Rozenthal"));
        supported_by.Add (wxT ("Lasse Salling"));
        supported_by.Add (wxT ("Jussi Siponen"));
+       supported_by.Add (wxT ("Peter Sprenger"));
        supported_by.Add (wxT ("Randy Stankey"));
        supported_by.Add (wxT ("Andrä Steiner"));
        supported_by.Add (wxT ("Mike Stiebing"));
+       supported_by.Add (wxT ("Christian Suhren"));
        supported_by.Add (wxT ("Bruce Taylor"));
        supported_by.Add (wxT ("Lawrence Towers"));
        supported_by.Add (wxT ("Richard Turner"));
@@ -192,6 +208,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Raoul Walzer"));
        supported_by.Add (wxT ("Wolfram Weber"));
        supported_by.Add (wxT ("Frank Wenz"));
+       supported_by.Add (wxT ("Anja Wenz"));
        supported_by.Add (wxT ("Johannes Wilbrand"));
        supported_by.Add (wxT ("Roland Wirtz"));
        supported_by.Add (wxT ("Wolfgang Woehl"));
@@ -199,6 +216,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Pavel Zhdanko"));
        supported_by.Add (wxT ("Cinéma de la Neuveville"));
        supported_by.Add (wxT ("Frechen-Film e.V."));
+       supported_by.Add (wxT ("Mobiles Kino e.V."));
        supported_by.Add (wxT ("Daniel Židek"));
        supported_by.Add (wxT ("Гуляев Михаил"));
        add_section (_("Supported by"), supported_by);
@@ -246,6 +264,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Greg Rooke"));
        tested_by.Add (wxT ("Elad Saad"));
        tested_by.Add (wxT ("Karim Senoucci"));
+       tested_by.Add (wxT ("Hordur Valgardsson"));
        tested_by.Add (wxT ("Simon Vannarath"));
        tested_by.Add (wxT ("Igor Voytovich"));
        tested_by.Add (wxT ("Andrew Walls"));