Fix session-open after selecting new, template, then back

[ardour.git] / gtk2_ardour / about.cc

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index eb98398f26961f868ee59ade37e23897163115ed..fb706681ee1960582e531781c50826117eb8ea87 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -133,6 +133,7 @@ static const char* authors[] = {
        N_("Ben Bell"),
        N_("Sakari Bergen"),
        N_("Christian Borss"),
+       N_("Thomas Brand"),
        N_("Chris Cannam"),
        N_("Jeremy Carter"),
        N_("Jesse Chappell"),
@@ -170,6 +171,7 @@ static const char* authors[] = {
        N_("Nick Mainsbridge"),
        N_("Tim Mayberry"),
        N_("Doug Mclain"),
+       N_("Johannes Mueller"),
        N_("Todd Naugle"),
        N_("André Nusser"),
        N_("Bent Bisballe Nyeng"),
@@ -184,6 +186,7 @@ static const char* authors[] = {
        N_("Andreas Ruge"),
        N_("Sampo Savolainen"),
        N_("Rodrigo Severo"),
+       N_("Daniel Sheeler"),
        N_("Per Sigmond"),
        N_("Lincoln Spiteri"),
        N_("Mike Start"),
@@ -200,7 +203,7 @@ static const char* authors[] = {
 };
 
 static const char* translators[] = {
-       N_("French:\n\tAlain Fréhel <alain.frehel@free.fr>\n\tChristophe Combelles <ccomb@free.fr>\n\tMartin Blanchard\n\tRomain Arnaud <roming22@gmail.com>\n"),
+       N_("French:\n\tAlain Fréhel <alain.frehel@free.fr>\n\tChristophe Combelles <ccomb@free.fr>\n\tMartin Blanchard\n\tRomain Arnaud <roming22@gmail.com>\n\tOlivier Humbert <trebmuh@tuxfamily.org>\n"),
        N_("German:\n\tKarsten Petersen <kapet@kapet.de>\
 \n\tSebastian Arnold <mail@sebastian-arnold.net>\
 \n\tRobert Schwede <schwede@ironshark.com>\
@@ -221,6 +224,7 @@ static const char* translators[] = {
        N_("Czech:\n\t Pavel Fric <pavelfric@seznam.cz>\n"),
        N_("Norwegian:\n\t Eivind Ødegård\n"),
        N_("Chinese:\n\t Rui-huai Zhang <zrhzrh@mail.ustc.edu.cn>\n"),
+       N_("Japanese:\n\t Hiroki Inagaki <hiroki.ingk@gmail.com>\n"),
        0
 };
 
@@ -585,8 +589,9 @@ About::About ()
        std::string splash_file;
 
        Searchpath spath(ardour_data_search_path());
+       spath.add_subdirectory_to_paths ("resources");
 
-       if (find_file (spath, "splash.png", splash_file)) {
+       if (find_file (spath, PROGRAM_NAME "-splash.png", splash_file)) {
                set_logo (Gdk::Pixbuf::create_from_file (splash_file));
        } else {
                error << "Could not find splash file" << endmsg;
@@ -624,7 +629,7 @@ About::About ()
 #endif
 
        set_translator_credits (t);
-       set_copyright (_("Copyright (C) 1999-2016 Paul Davis\n"));
+       set_copyright (_("Copyright (C) 1999-2017 Paul Davis\n"));
        set_license (gpl);
        set_name (X_("Ardour"));
        set_website (X_("http://ardour.org/"));