[Marble-commits] KDE/kdeedu/marble/src

[Bastian Holst]

SVN commit 1108868 by bholst:

Adding 2009's GSoC projects to Marble's about dialog.
Better late than never!


 M  +10 -2     kdemain.cpp  
 M  +6 -1      lib/MarbleAboutDialog.cpp  


--- trunk/KDE/kdeedu/marble/src/kdemain.cpp #1108867:1108868
@@ -63,11 +63,11 @@
                           ki18n( "Marble Desktop Globe" ),
                           MARBLE_VERSION_STRING.toLatin1(), 
                           ki18n( "A World Atlas." ),
-                          KAboutData::License_LGPL, ki18n( "(c) 2007, 2008, 2009" ),
+                          KAboutData::License_LGPL, ki18n( "(c) 2007, 2008, 2009, 2010" ),
                           KLocalizedString(),
                           "http://edu.kde.org/marble" );
 
-    // Active Development Team of Marble 0.7
+    // Active Development Team of Marble 0.10
     aboutData.addAuthor( ki18n( "Torsten Rahn" ),
                          ki18n( "Core Developer and Original Author" ),
                          "rahn at kde.org" );
@@ -106,6 +106,14 @@
                          "kde at ewsoftware.de" );
 
     // Google Summer of Code
+    aboutData.addAuthor( ki18n( "Andrew Manson" ),
+                         ki18n( "Google Summer of Code 2009 Project:"
+                                " OSM Annotation",
+                         "g.real.ate at gmail.com" );
+    aboutData.addAuthor( ki18n( "Bastian Holst" ),
+                         ki18n( "Google Summer of Code 2009 Project:"
+                                " Online Services" ),
+                         "bastianholst at gmx.de" );
     aboutData.addAuthor( ki18n( "Patrick Spendrin" ),
                          ki18n( "Google Summer of Code 2008 Project:"
                                 " Vector Tiles for Marble" ),
--- trunk/KDE/kdeedu/marble/src/lib/MarbleAboutDialog.cpp #1108867:1108868
@@ -93,7 +93,7 @@
     {
         d->authorsLoaded = true;
         browser = d->uiWidget.m_pMarbleAuthorsBrowser;
-        browser->setHtml( tr("<b>Active Development Team of Marble 0.8 and 0.7</b>")+
+        browser->setHtml( tr("<b>Active Development Team of Marble 0.10</b>")+
         tr("<p>Torsten Rahn <a href=\"mailto:rahn at kde.org\">rahn at kde.org</a><br>"
            "<i>Core Developer and Original Author</i></p>")+
         tr("<p>Patrick Spendrin <a href=\"pspendrin at gmail.com\">pspendrin at gmail.com</a><br>"
@@ -120,6 +120,11 @@
         tr("<b>Google Summer of Code</b>")+
         tr("<p> The Marble Team would like to thank its members who participated "
            "in the Google Summer of Code for their successful work on Marble:</p>")+
+        tr( "<p><b>2009</b></p>" ) +
+        tr( "<p>Andrew Manson <a href=\"mailto:g.real.ate at gmail.com\">g.real.ate at gmail.com</a><br>"
+            "<i>Project: OSM Annotation</i></p>" ) +
+        tr( "<p>Bastian Holst <a href=\"mailto:bastianholst at gmx.de\">bastianholst at gmx.de</a><br>"
+            "<i>Project: Online Services</i></p>" ) +
         tr("<p><b>2008</b></p>")+
         tr("<p>Patrick Spendrin <a href=\"pspendrin at gmail.com\">pspendrin at gmail.com</a><br>"
            "<i>Project: Vector Tiles for Marble</i></p>")+