part two of allow markup to be used in BoolOption items in an option editor

[ardour.git] / gtk2_ardour / about.cc

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 213dd488b16503a682a4ce9863a5c6d9e3f58e7b..0432974510af57419c24c5ad6515601e4e6e5368 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -28,7 +28,6 @@
 #include "pbd/file_utils.h"
 
 #include "ardour/svn_revision.h"
-#include "ardour/ardour.h"
 #include "ardour/version.h"
 #include "ardour/filesystem_paths.h"
 
@@ -152,6 +151,7 @@ static const char* authors[] = {
        N_("Stefan Kersten"),
        N_("Armand Klenk"),
        N_("Matt Krai"),
+       N_("Nick Lanham"),
        N_("Colin Law"),
        N_("Joshua Leach"),
        N_("Ben Loftis"),
@@ -164,6 +164,7 @@ static const char* authors[] = {
        N_("Taybin Rutkin"),
        N_("Andreas Ruge"),
        N_("Sampo Savolainen"),
+       N_("Rodrigo Severo"),
        N_("Per Sigmond"),
        N_("Lincoln Spiteri"),
        N_("Mike Start"),
@@ -196,12 +197,13 @@ static const char* translators[] = {
        N_("Polish:\n\t Piotr Zaryk <pzaryk@gmail.com>\n"),
        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"),
        0
 };
 
 static const char* gpl = X_("\n\
 Ardour comes with NO WARRANTY. It is free software, and you are welcome to redistribute it\n\
-under the terms of the GNU Public License, shown below.\n\
+under the terms of the GNU General Public License, shown below.\n\
 \n\
                    GNU GENERAL PUBLIC LICENSE\n\
                       Version 2, June 1991\n\
@@ -553,15 +555,14 @@ About::About ()
 {
        // set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
 
-       string path;
        string t;
 
-       sys::path splash_file;
+       std::string splash_file;
 
-       SearchPath spath(ardour_search_path() + system_data_search_path());
+       SearchPath spath(ardour_data_search_path());
 
        if (find_file_in_search_path (spath, "splash.png", splash_file)) {
-               set_logo (Gdk::Pixbuf::create_from_file (splash_file.to_string()));
+               set_logo (Gdk::Pixbuf::create_from_file (splash_file));
        } else {
                error << "Could not find splash file" << endmsg;
        }