changeset 33963:335de7e0f6ed

Add the MPlayer title string to the about box. Additionally, indent URL less, put first names before surnames, add my name and revise some translation strings.
author ib
date Fri, 02 Sep 2011 09:58:55 +0000
parents c09e730ccf30
children d928b0d4500a
files Makefile gui/ui/gtk/about.c help/help_mp-de.h
diffstat 3 files changed, 218 insertions(+), 211 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Sep 01 21:49:22 2011 +0000
+++ b/Makefile	Fri Sep 02 09:58:55 2011 +0000
@@ -824,7 +824,7 @@
 # Make sure all generated header files are created.
 codec-cfg.o: codecs.conf.h
 $(DEP_FILES) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
-mpcommon.o osdep/mplayer-rc.o: version.h
+mpcommon.o osdep/mplayer-rc.o gui/ui/gtk/about.o: version.h
 
 osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
 
--- a/gui/ui/gtk/about.c	Thu Sep 01 21:49:22 2011 +0000
+++ b/gui/ui/gtk/about.c	Fri Sep 02 09:58:55 2011 +0000
@@ -19,6 +19,7 @@
 #include "config.h"
 #include "gui/app.h"
 #include "help_mp.h"
+#include "version.h"
 
 #include "gui/ui/pixmaps/emblem.xpm"
 #include "gui/ui/widgets.h"
@@ -56,6 +57,8 @@
 
   GtkAccelGroup * accel_group;
 
+  char title[128];
+
   accel_group=gtk_accel_group_new();
 
   About=gtk_window_new( GTK_WINDOW_TOPLEVEL );
@@ -102,235 +105,239 @@
   gtk_widget_set_name( AboutText,"AboutText" );
   gtk_widget_show( AboutText );
   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
+  snprintf(title, sizeof(title), MP_TITLE, "MPlayer");
 #ifdef CONFIG_GTK2
+  gtk_text_buffer_insert (AboutTextBuffer, &iter, title, -1);
   gtk_text_buffer_insert (AboutTextBuffer, &iter,
 #else
+  gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL, title, -1 );
   gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
 #endif
   	"\n"
 	MSGTR_ABOUT_UHU
-	"             (http://www.uhulinux.hu/)\n"
+	"       (http://www.uhulinux.hu/)\n"
 	"\n"
 	MSGTR_ABOUT_Contributors
 	"\n"
-	"     * Ackermann, Andreas\n"
+	"     * Andreas Ackermann\n"
 	"     * adland\n"
-	"     * Anholt, Eric\n"
-	"     * Ashberg, Folke\n"
-	"     * Balatoni, Dénes\n"
-	"     * Barat, Zsolt\n"
-	"     * Barbato, Luca\n"
-	"     * Baryshkov, Dmitry\n"
-	"     * Baudet, Bertrand\n"
-	"     * Bedel, Alban\n"
-	"     * Behrisch, Michael\n"
-	"     * Belev, Luchezar\n"
-	"     * Bérczi, Gábor\n"
-	"     * Berecz, Szabolcs\n"
-	"     * Beregszászi, Alex\n"
-	"     * Bitterberg, Tilmann\n"
-	"     * Biurrun, Diego\n"
-	"     * Blomenkamp, Marcsu\n"
-	"     * Buehler, Andrew\n"
-	"     * Bulgroz, Eviv\n"
-	"     * Bünemann, Felix\n"
-	"     * Bunkus, Moritz\n"
-	"     * Christiansen, Dan Villiom Podlaski\n"
-	"     * Clagg, Jeff\n"
-	"     * Compn\n"
-	"     * Comstedt, Marcus\n"
-	"     * Cook, Kees\n"
-	"     * Davies, Stephen\n"
-	"     * Di Vita, Piero\n"
-	"     * Diedrich, Tobias\n"
-	"     * Dietrich, Florian\n"
-	"     * Dobbelaere, Jeroen\n"
-	"     * Döffinger, Reimar\n"
-	"     * Dolbeau, Romain\n"
-	"     * Dönmez, Ismail\n"
-	"     * Edele, Robert\n"
-	"     * Egger, Christoph\n"
-	"     * Elsinghorst, Paul Wilhelm\n"
-	"     * Ernesti, Bernd\n"
-	"     * Falco, Salvatore\n"
-	"     * Feigl, Johannes\n"
-	"     * Felker, D Richard III\n"
-	"     * Ferguson, Tim\n"
-	"     * Finlayson, Ross\n"
-	"     * Forghieri, Daniele\n"
-	"     * Foth, Kilian A.\n"
-	"     * Franz, Fabian\n"
-	"     * Gansser, Martin\n"
-	"     * Gereöffy, Árpád\n"
-	"     * Giani, Matteo\n"
-	"     * Goethel, Sven\n"
-	"     * Gomez Garcia, German\n"
-	"     * Gottwald, Alexander\n"
-	"     * Graffam, Michael\n"
-	"     * Gritsenko, Andriy N.\n"
-	"     * Guyomarch, Rémi\n"
-	"     * Hammelmann, Jürgen\n"
-	"     * Hertel, Christopher R.\n"
-	"     * Hess, Andreas\n"
-	"     * Hickey, Corey\n"
-	"     * Hidvégi, Zoltán\n"
-	"     * Hoffmann, Jens\n"
-	"     * Holm, David\n"
-	"     * Horst, Bohdan\n"
-	"     * Hug, Hampa\n"
-	"     * Hurka, Tomas\n"
-	"     * Isani, Sidik\n"
-	"     * Issaris, Panagiotis\n"
-	"     * Jacobs, Aurelien\n"
-	"     * Jelveh, Reza\n"
-	"     * Jermann, Jonas\n"
-	"     * Johansson, Anders\n"
-	"     * Kain, Nicholas\n"
-	"     * Kalinski, Filip\n"
-	"     * Kalvachev, Ivan\n"
-	"     * Kaniewski, Wojtek\n"
-	"     * Kaplan, Kim Minh\n"
-	"     * Kärkkäinen, Samuli\n"
-	"     * Keil, Jürgen\n"
-	"     * Kesterson, Robert\n"
-	"     * Kinali, Attila\n"
-	"     * Kovriga, Gregory\n"
-	"     * Kühling, David\n"
-	"     * Kuivinen, Fredrik\n"
-	"     * Kurshev, Nick\n"
-	"     * Kuschak, Brian\n"
-	"     * Kushnir, Vladimir\n"
-	"     * Lambley, Dave\n"
-	"     * László, Gyula\n"
-	"     * Le Gaillart, Nicolas\n"
-	"     * Lénárt, Gábor\n"
-	"     * Leroy, Colin\n"
-	"     * Liljeblad, Oskar\n"
-	"     * Lin, Sam\n"
-	"     * Lombard, Pierre\n"
-	"     * Madick, Puk\n"
-	"     * Makovicka, Jindrich\n"
-	"     * Marek, Rudolf\n"
-	"     * Megyer, László\n"
-	"     * Melanson, Mike\n"
-	"     * von Merkatz, Arwed\n"
-	"     * Merritt, Loren\n"
-	"     * Mierzejewski, Dominik\n"
-	"     * Milushev, Mihail\n"
-	"     * Mistry, Nehal\n"
-	"     * Mohari, András\n"
-	"     * Mueller, Steven\n"
-	"     * Neundorf, Alexander\n"
-	"     * Niedermayer, Michael\n"
-	"     * Noring, Fredrik\n"
-	"     * Ohm, Christian\n"
-	"     * Parrish, Joey\n"
-	"     * Pietrzak, Dariusz\n"
-	"     * Plourde, Nicolas\n"
-	"     * Poettering, Lennart\n"
-	"     * Poirier, Guillaume\n"
-	"     * Ponekker, Zoltán\n"
-	"     * van Poorten, Ivo\n"
-	"     * Ran, Lu\n"
-	"     * Reder, Uwe\n"
+	"     * Eric Anholt\n"
+	"     * Folke Ashberg\n"
+	"     * Dénes Balatoni\n"
+	"     * Zsolt Barat\n"
+	"     * Luca Barbato\n"
+	"     * Dmitry Baryshkov\n"
+	"     * Bertrand Baudet\n"
+	"     * Alban Bedel\n"
+	"     * Michael Behrisch\n"
+	"     * Luchezar Belev\n"
+	"     * Gábor Bérczi\n"
+	"     * Szabolcs Berecz\n"
+	"     * Alex Beregszászi\n"
+	"     * Tilmann Bitterberg\n"
+	"     * Diego Biurrun\n"
+	"     * Marcsu Blomenkamp\n"
+	"     * Ingo Brückl\n"
+	"     * Andrew Buehler\n"
+	"     * Eviv Bulgroz\n"
+	"     * Felix Bünemann\n"
+	"     * Moritz Bunkus\n"
+	"     * Dan Villiom Podlaski Christiansen\n"
+	"     * Jeff Clagg\n"
+	"     * compn\n"
+	"     * Marcus Comstedt\n"
+	"     * Kees Cook\n"
+	"     * Stephen Davies\n"
+	"     * Piero Di Vita\n"
+	"     * Tobias Diedrich\n"
+	"     * Florian Dietrich\n"
+	"     * Jeroen Dobbelaere\n"
+	"     * Reimar Döffinger\n"
+	"     * Romain Dolbeau\n"
+	"     * Ismail Dönmez\n"
+	"     * Robert Edele\n"
+	"     * Christoph Egger\n"
+	"     * Paul Wilhelm Elsinghorst\n"
+	"     * Bernd Ernesti\n"
+	"     * Salvatore Falco\n"
+	"     * Johannes Feigl\n"
+	"     * D Richard III Felker\n"
+	"     * Tim Ferguson\n"
+	"     * Ross Finlayson\n"
+	"     * Daniele Forghieri\n"
+	"     * Kilian A. Foth\n"
+	"     * Fabian Franz\n"
+	"     * Martin Gansser\n"
+	"     * Árpád Gereöffy\n"
+	"     * Matteo Giani\n"
+	"     * Sven Goethel\n"
+	"     * German Gomez Garcia\n"
+	"     * Alexander Gottwald\n"
+	"     * Michael Graffam\n"
+	"     * Andriy N. Gritsenko\n"
+	"     * Rémi Guyomarch\n"
+	"     * Jürgen Hammelmann\n"
+	"     * Christopher R. Hertel\n"
+	"     * Andreas Hess\n"
+	"     * Corey Hickey\n"
+	"     * Zoltán Hidvégi\n"
+	"     * Jens Hoffmann\n"
+	"     * David Holm\n"
+	"     * Bohdan Horst\n"
+	"     * Hampa Hug\n"
+	"     * Tomas Hurka\n"
+	"     * Sidik Isani\n"
+	"     * Panagiotis Issaris\n"
+	"     * Aurelien Jacobs\n"
+	"     * Reza Jelveh\n"
+	"     * Jonas Jermann\n"
+	"     * Anders Johansson\n"
+	"     * Nicholas Kain\n"
+	"     * Filip Kalinski\n"
+	"     * Ivan Kalvachev\n"
+	"     * Wojtek Kaniewski\n"
+	"     * Kim Minh Kaplan\n"
+	"     * Samuli Kärkkäinen\n"
+	"     * Jürgen Keil\n"
+	"     * Robert Kesterson\n"
+	"     * Attila Kinali\n"
+	"     * Gregory Kovriga\n"
+	"     * David Kühling\n"
+	"     * Fredrik Kuivinen\n"
+	"     * Nick Kurshev\n"
+	"     * Brian Kuschak\n"
+	"     * Vladimir Kushnir\n"
+	"     * Dave Lambley\n"
+	"     * Gyula László\n"
+	"     * Nicolas Le Gaillart\n"
+	"     * Gábor Lénárt\n"
+	"     * Colin Leroy\n"
+	"     * Oskar Liljeblad\n"
+	"     * Sam Lin\n"
+	"     * Pierre Lombard\n"
+	"     * Puk Madick\n"
+	"     * Jindrich Makovicka\n"
+	"     * Rudolf Marek\n"
+	"     * László Megyer\n"
+	"     * Mike Melanson\n"
+	"     * Arwed von Merkatz\n"
+	"     * Loren Merritt\n"
+	"     * Dominik Mierzejewski\n"
+	"     * Mihail Milushev\n"
+	"     * Nehal Mistry\n"
+	"     * András Mohari\n"
+	"     * Steven Mueller\n"
+	"     * Alexander Neundorf\n"
+	"     * Michael Niedermayer\n"
+	"     * Fredrik Noring\n"
+	"     * Christian Ohm\n"
+	"     * Joey Parrish\n"
+	"     * Dariusz Pietrzak\n"
+	"     * Nicolas Plourde\n"
+	"     * Lennart Poettering\n"
+	"     * Guillaume Poirier\n"
+	"     * Zoltán Ponekker\n"
+	"     * Ivo van Poorten\n"
+	"     * Lu Ran\n"
+	"     * Uwe Reder\n"
 	"     * rgselk\n"
 	"     * Rune Petersen\n"
-	"     * Saari, Ville\n"
-	"     * Sabbi, Nico\n"
-	"     * Sandell, Björn\n"
-	"     * Sauerbeck, Tilman\n"
-	"     * Scherthan, Frank\n"
-	"     * Schneider, Florian\n"
-	"     * Schoenbrunner, Oliver\n"
-	"     * Shimon, Oded\n"
-	"     * Simon, Peter\n"
-	"     * Snel, Rik\n"
-	"     * Sommer, Sascha\n"
-	"     * Strasser, Alexander\n"
-	"     * Strzelecki, Kamil\n"
-	"     * Svoboda, Jiri\n"
-	"     * Swain, Robert\n"
-	"     * Syrjälä, Ville\n"
-	"     * Szecsi, Gabor\n"
-	"     * Tackaberry, Jason\n"
-	"     * Tam, Howell\n"
-	"     * Tlalka, Adam\n"
-	"     * Tiesi, Gianluigi\n"
-	"     * Togni, Roberto\n"
-	"     * Tropea, Salvador Eduardo\n"
-	"     * Vajna, Miklós\n"
-	"     * Verdejo Pinochet, Reynaldo H.\n"
-	"     * Wigren, Per\n"
-	"     * Witt, Derek J\n"
-	"     * Young, Alan\n"
-	"     * Zaprzala, Artur\n"
-	"     * Zealey, Mark\n"
-	"     * Ziv-Av, Matan\n"
-	"     * Zoltán, Márk Vicián\n"
+	"     * Ville Saari\n"
+	"     * Nico Sabbi\n"
+	"     * Björn Sandell\n"
+	"     * Tilman Sauerbeck\n"
+	"     * Frank Scherthan\n"
+	"     * Florian Schneider\n"
+	"     * Oliver Schoenbrunner\n"
+	"     * Oded Shimon\n"
+	"     * Peter Simon\n"
+	"     * Rik Snel\n"
+	"     * Sascha Sommer\n"
+	"     * Alexander Strasser\n"
+	"     * Kamil Strzelecki\n"
+	"     * Jiri Svoboda\n"
+	"     * Robert Swain\n"
+	"     * Ville Syrjälä\n"
+	"     * Gabor Szecsi\n"
+	"     * Jason Tackaberry\n"
+	"     * Howell Tam\n"
+	"     * Adam Tlalka\n"
+	"     * Gianluigi Tiesi\n"
+	"     * Roberto Togni\n"
+	"     * Salvador Eduardo Tropea\n"
+	"     * Miklós Vajna\n"
+	"     * Reynaldo H. Verdejo Pinochet\n"
+	"     * Per Wigren\n"
+	"     * Derek J Witt\n"
+	"     * Alan Young\n"
+	"     * Artur Zaprzala\n"
+	"     * Mark Zealey\n"
+	"     * Matan Ziv-Av\n"
+	"     * Márk Vicián Zoltán\n"
 	"\n"
 	MSGTR_ABOUT_Codecs_libs_contributions
 	"\n"
-	"     * Bellard, Fabrice\n"
-	"     * Chappelier, Vivien and Vincent, Damien\n"
-	"     * Hipp, Michael\n"
-	"     * Holtzman, Aaron\n"
-	"     * Janovetz, Jake\n"
-	"     * Kabelac, Zdenek\n"
-	"     * Kuznetsov, Eugene\n"
-	"     * Lespinasse, Michel\n"
-	"     * Podlipec, Mark\n"
+	"     * Fabrice Bellard\n"
+	"     * Vivien Chappelier\n"
+	"     * Michael Hipp\n"
+	"     * Aaron Holtzman\n"
+	"     * Jake Janovetz\n"
+	"     * Zdenek Kabelac\n"
+	"     * Eugene Kuznetsov\n"
+	"     * Michel Lespinasse\n"
+	"     * Mark Podlipec\n"
+	"     * Damien Vincent\n"
 	"\n"
 	MSGTR_ABOUT_Translations
 	"\n"
-	"     * Biernat, Marcin\n"
-	"     * Fargas, Marc\n"
-	"     * Heryan, Jiri\n"
-	"     * Jarycki, Marek\n"
-	"     * Kaplita, Leszek\n"
-	"     * Krämer, Sebastian\n"
-	"     * López, Juan Martin\n"
-	"     * Michniewski, Piotr\n"
-	"     * Misiorny, Jakub\n"
-	"     * Mizda, Gábor\n"
-	"     * Paszta, Maciej\n"
-	"     * Proszek, Łukasz\n"
-	"     * Schiller, Wacław\n"
-	"     * Zubimendi, Andoni\n"
+	"     * Marcin Biernat\n"
+	"     * Marc Fargas\n"
+	"     * Jiri Heryan\n"
+	"     * Marek Jarycki\n"
+	"     * Leszek Kaplita\n"
+	"     * Sebastian Krämer\n"
+	"     * Juan Martin López\n"
+	"     * Piotr Michniewski\n"
+	"     * Jakub Misiorny\n"
+	"     * Gábor Mizda\n"
+	"     * Maciej Paszta\n"
+	"     * Łukasz Proszek\n"
+	"     * Wacław Schiller\n"
+	"     * Andoni Zubimendi\n"
 	"\n"
 	MSGTR_ABOUT_Skins
 	"\n"
 	"     * Azrael\n"
-	"     * Bekesi, Viktor\n"
+	"     * Viktor Bekesi\n"
+	"     * Ingo Brückl\n"
+	"     * Andrew Carpenter\n"
+	"     * Charles Foucault\n"
+	"     * Attila Gyimesi\n"
+	"     * Alban Hertroys\n"
+	"     * Balint Kiss\n"
+	"     * Andre Kuehne\n"
+	"     * Rüdiger Kuhlmann\n"
+	"     * Dan Naumov\n"
+	"     * Ryan Northam\n"
+	"     * Juan Pablo Oyarzun Arroyo\n"
+	"     * DongCheon Park\n"
+	"     * Jurgen Pehrson\n"
+	"     * Nikola Pizurica\n"
+	"     * Oliwier Ptak\n"
+	"     * Pasquale Riccio\n"
 	"     * Burt.S.\n"
-	"     * Carpenter, Andrew\n"
-	"     * Foucault, Charles\n"
-	"     * Gyimesi, Attila\n"
-	"     * Hertroys, Alban\n"
-	"     * Juan Pablo\n"
-	"     * Kiss, Balint\n"
-	"     * Kuehne, Andre\n"
-	"     * Kuhlmann, Rüdiger\n"
-	"     * Naumov, Dan\n"
-	"     * Northam, Ryan\n"
-	"     * Oyarzun Arroyo\n"
-	"     * Park, DongCheon\n"
-	"     * Pehrson, Jurgen\n"
-	"     * Pizurica, Nikola\n"
-	"     * Ptak, Oliwier\n"
-	"     * Riccio, Pasquale\n"
-	"     * Schultz, Jesper\n"
-	"     * Szumiela, Marcin\n"
-	"     * Tisi, Massimo\n"
-	"     * Tyr, Jiri jun.\n"
-	"     * Vasilev, Ognian\n"
-	"     * Veres, Imre\n"
-	"     * Vesko, Radic\n"
-	"     * Vigvary, Balasz\n"
-	"     * Weber, Andrew\n"
-	"     * Whitmore, Gary Jr.\n"
-	"     * Wilamowski, Franciszek\n"
-	"     * Zeising, Michael\n"
-	"\n",-1 );
+	"     * Jesper Schultz\n"
+	"     * Marcin Szumiela\n"
+	"     * Massimo Tisi\n"
+	"     * Jiri jun. Tyr\n"
+	"     * Ognian Vasilev\n"
+	"     * Imre Veres\n"
+	"     * Radic Vesko\n"
+	"     * Balasz Vigvary\n"
+	"     * Andrew Weber\n"
+	"     * Gary Jr. Whitmore\n"
+	"     * Franciszek Wilamowski\n"
+	"     * Michael Zeising", -1 );
 
   AddHSeparator( vbox );
   Ok=AddButton( MSGTR_Ok,AddHButtonBox( vbox ) );
--- a/help/help_mp-de.h	Thu Sep 01 21:49:22 2011 +0000
+++ b/help/help_mp-de.h	Fri Sep 02 09:58:55 2011 +0000
@@ -968,11 +968,11 @@
 "Neuere Versionen von aRts sind mit GTK 1.x nicht kompatibel und bringen \n"\
 "GMPlayer zum Absturz!"
 
-#define MSGTR_ABOUT_UHU "GUI-Entwicklung wurde von UHU Linux gesponsert.\n"
-#define MSGTR_ABOUT_Contributors "Mitwirkende am Programm und der Dokumentation\n"
-#define MSGTR_ABOUT_Codecs_libs_contributions "Codecs und externe Bibliotheken\n"
-#define MSGTR_ABOUT_Translations "Übersetzungen\n"
-#define MSGTR_ABOUT_Skins "Skins\n"
+#define MSGTR_ABOUT_UHU "Die GUI-Entwicklung wurde von UHU-Linux gesponsert.\n"
+#define MSGTR_ABOUT_Contributors "Mitwirkende am Programm und der Dokumentation:\n"
+#define MSGTR_ABOUT_Codecs_libs_contributions "Codecs und externe Bibliotheken:\n"
+#define MSGTR_ABOUT_Translations "Übersetzungen:\n"
+#define MSGTR_ABOUT_Skins "Skins:\n"
 
 // --- messagebox
 #define MSGTR_MSGBOX_LABEL_FatalError "Fataler Fehler!"