X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fabout.cc;h=280f72a8dcb46c434c56a589f741496bd2a65d5c;hb=90ea64d1fc9e64347aca9df8c64ff0aeb674410d;hp=a826510d5fcb29fa9bc68d4ed44200346284307f;hpb=9dc781114779009c4b3d962a28a721d2569eec74;p=ardour.git

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index a826510d5f..280f72a8dc 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -27,7 +27,7 @@
 
 #include "pbd/file_utils.h"
 
-#include "ardour/svn_revision.h"
+#include "ardour/revision.h"
 #include "ardour/version.h"
 #include "ardour/filesystem_paths.h"
 
@@ -136,7 +136,7 @@ static const char* authors[] = {
 	N_("Colin Fletcher"),
 	N_("Dave Flick"),
 	N_("Hans Fugal"),
-        N_("Robin Gareus"),
+	N_("Robin Gareus"),
 	N_("Christopher George"),
 	N_("Chris Goddard"),
 	N_("J. Abelardo Gutierrez"),
@@ -150,6 +150,7 @@ static const char* authors[] = {
 	N_("Robert Jordens"),
 	N_("Stefan Kersten"),
 	N_("Armand Klenk"),
+	N_("Julien de Kozak"),
 	N_("Matt Krai"),
 	N_("Nick Lanham"),
 	N_("Colin Law"),
@@ -184,7 +185,8 @@ static const char* translators[] = {
 \n\tRobert Schwede <schwede@ironshark.com>\
 \n\tBenjamin Scherrer <realhangman@web.de>\
 \n\tEdgar Aichinger <edogawa@aon.at>\
-\n\tRichard Oax <richard@pagliacciempire.de>\n"),
+\n\tRichard Oax <richard@pagliacciempire.de>\
+\n\tRobin Gloster <robin@loc-com.de>\n"),
 	N_("Italian:\n\tFilippo Pappalardo <filippo@email.it>\n\tRaffaele Morelli <raffaele.morelli@gmail.com>\n"),
 	N_("Portuguese:\n\tRui Nuno Capela <rncbc@rncbc.org>\n"),
 	N_("Brazilian Portuguese:\n\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\
@@ -197,12 +199,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\
@@ -574,20 +577,25 @@ About::About ()
 	}
 
 	set_translator_credits (t);
-	set_copyright (_("Copyright (C) 1999-2012 Paul Davis\n"));
+	set_copyright (_("Copyright (C) 1999-2013 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\n(built from revision %2)"),
 				     VERSIONSTRING,
-				     svn_revision)));
+				     revision)));
 
 	Gtk::Button* config_button = manage (new Button (_("Config")));
 
 	get_action_area()->add (*config_button);
 	get_action_area()->reorder_child (*config_button, 0);
 	config_button->signal_clicked().connect (mem_fun (*this, &About::show_config_info));
+
+	Gtk::Button *btn = static_cast<Gtk::Button*>(get_widget_for_response(Gtk::RESPONSE_CANCEL));
+	if (btn) {
+		btn->signal_clicked().connect(sigc::mem_fun(static_cast<Gtk::Window*>(this), &Gtk::Window::hide));
+	}
 }
 
 About::~About ()