X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fabout.cc;h=02973cdfe6642fb2d981de508c64513e16c78243;hb=b2aaffadc51ad38939e52d5f792e3e9a098ff2d7;hp=051b13f575ba2a6d3d7743eec78b3ecabf40b34e;hpb=17baf9362641f024440b61cecc176ee9096e1418;p=ardour.git

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 051b13f575..02973cdfe6 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -36,7 +36,7 @@
 #include "configinfo.h"
 #include "rgb_macros.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef WAF_BUILD
 #include "gtk2ardour-version.h"
@@ -124,6 +124,7 @@ static const gchar * paypal_xpm[] = {
 #endif
 
 static const char* authors[] = {
+	N_("Fons Adriaensen"),
 	N_("Brian Ahr"),
 	N_("John Anderson"),
 	N_("Marcus Andersson"),
@@ -145,6 +146,7 @@ static const char* authors[] = {
 	N_("Dave Flick"),
 	N_("Hans Fugal"),
 	N_("Robin Gareus"),
+	N_("Nil Geisweiller"),
 	N_("Christopher George"),
 	N_("Chris Goddard"),
 	N_("J. Abelardo Gutierrez"),
@@ -169,9 +171,15 @@ static const char* authors[] = {
 	N_("Tim Mayberry"),
 	N_("Doug Mclain"),
 	N_("Todd Naugle"),
+	N_("André Nusser"),
+	N_("Bent Bisballe Nyeng"),
 	N_("Jack O'Quin"),
+	N_("Len Ovens"),
+	N_("Pavel Potocek"),
 	N_("Nimal Ratnayake"),
+	N_("Julien Rivaud"),
 	N_("David Robillard"),
+	N_("Julien Roger"),
 	N_("Taybin Rutkin"),
 	N_("Andreas Ruge"),
 	N_("Sampo Savolainen"),
@@ -180,6 +188,7 @@ static const char* authors[] = {
 	N_("Lincoln Spiteri"),
 	N_("Mike Start"),
 	N_("Mark Stewart"),
+	N_("Nathan Stewart"),
 	N_("Roland Stigge"),
 	N_("Petter Sundlöf"),
 	N_("Mike Täht"),
@@ -191,7 +200,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>\
@@ -576,8 +585,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;
@@ -591,33 +601,39 @@ About::About ()
 	}
 
 #if defined __x86_64__ || defined _M_X64
-	const std::string cpu_arch = _("Intel 64 bit");
+	const std::string cpu_arch = _("Intel 64-bit");
 #elif defined __i386__  || defined _M_IX86
-	const std::string cpu_arch = _("Intel 32 bit");
+	const std::string cpu_arch = _("Intel 32-bit");
 #elif defined __ppc__ && defined  __LP64__
-	const std::string cpu_arch = _("PowerPC 64bit");
+	const std::string cpu_arch = _("PowerPC 64-bit");
 #elif defined __ppc__
-	const std::string cpu_arch = _("PowerPC 32bit");
+	const std::string cpu_arch = _("PowerPC 32-bit");
 #elif defined  __LP64__
-	const std::string cpu_arch = _("64bit");
+	const std::string cpu_arch = _("64-bit");
 #else
-	const std::string cpu_arch = _("32bit"); // ARM, ALPHA,..
+	const std::string cpu_arch = _("32-bit"); // ARM, ALPHA,..
 #endif
 	std::string codename = CODENAME;
 	if (ARDOUR::Profile->get_mixbus() || ARDOUR::Profile->get_trx()) {
-		codename = " ";
+		codename = "";
 	}
 
+#ifndef NDEBUG
+	const std::string suffix = _(" - debug");
+#else
+	const std::string suffix = "";
+#endif
+
 	set_translator_credits (t);
-	set_copyright (_("Copyright (C) 1999-2015 Paul Davis\n"));
+	set_copyright (_("Copyright (C) 1999-2016 Paul Davis\n"));
 	set_license (gpl);
 	set_name (X_("Ardour"));
 	set_website (X_("http://ardour.org/"));
 	set_website_label (_("http://ardour.org/"));
-	set_version ((string_compose(_("%1%2\n(built from revision %3)\n%4"),
+	set_version ((string_compose(_("%1%2\n(rev %3)\n%4%5"),
 				     VERSIONSTRING,
 				     codename,
-				     revision, cpu_arch)));
+				     revision, cpu_arch, suffix)));
 
 	Gtk::Button* config_button = manage (new Button (_("Config")));