From 20b6346180fcc3339538e62e2c4a77e0be233878 Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@verizon.net>
Date: Tue, 17 Nov 2015 14:00:58 -0500
Subject: [PATCH] Update authors.txt and developer list in about dialog.

---
 AUTHORS.txt                              | 48 +++++++++--------
 common/dialog_about/AboutDialog_main.cpp | 65 ++++++++++++++----------
 2 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index c20122fa39..fed7f43b84 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,5 +1,5 @@
-* Copyright (C) 1992-2014 Jean-Pierre Charras
-* Copyright (C) 1992-2014 Kicad Developers Team
+* Copyright (C) 1992-2015 Jean-Pierre Charras
+* Copyright (C) 1992-2015 Kicad Developers Team
 * under GNU General Public License (see copyright.txt)
 
 == Main Authors
@@ -16,28 +16,34 @@ Marco Serantoni <marco.serantoni[at]gmail-dot-com>  (OSX maintener)
 Rok Markovic <rok[at]kanardia.eu>
 Tim Hanson <sideskate[at]gmail-dot-com>
 Vesa Solonen <vesa.solonen[at]hut-dot-fi>
-Alexander Zakamaldin <zaka62[at]mail.ru>
-Miguel Angel Ajo Pelayo <miguelangel[at]nbee.es> (Python Scripting)
-Alexander Lunev <al.lunev[at]yahoo.com>  (Pcad to Kicad converter)
-Jacobo Aragunde Perez <jaragunde[at]igalia.com> for Igalia and the CERN
-Brian Sidebotham <brian.sidebotham[at]gmail.com>
-Maciej Sumiński <maciej.suminski[at]cern.ch>
-Tomasz Wlostowski <tomasz.wlostowski[at]cern.ch>
-Henner Zeller <h.zeller[at]acm.org>
-Mark Roszko <mark.roszko[at]gmail.com>
-Daniel Majewski <lordblick[at]gmail.com>
-Konstantin Baranovskiy <baranovskiykonstantin[at]gmail.com>
-Torsten Hüter <torstenhtr[at]gmx.de>
-Nick Østergaard <oe.nick[at]gmail.com>
-Andrew Zonenberg <azonenberg[at]drawersteak.com>
-Cirilo Bernardo <cirilo_bernardo[at]yahoo.com>
+Alexander Zakamaldin <zaka62[at]mail-dot-ru>
+Miguel Angel Ajo Pelayo <miguelangel[at]nbee-dot-es> (Python Scripting)
+Alexander Lunev <al.lunev[at]yahoo-dot-com>  (Pcad to Kicad converter)
+Jacobo Aragunde Perez <jaragunde[at]igalia-dot-com> for Igalia and the CERN
+Brian Sidebotham <brian.sidebotham[at]gmail-dot-com>
+Maciej Sumiński <maciej.suminski[at]cern-dot-ch>
+Tomasz Wlostowski <tomasz.wlostowski[at]cern-dot-ch>
+Henner Zeller <h.zeller[at]acm-dot-org>
+Mark Roszko <mark.roszko[at]gmail-dot-com>
+Daniel Majewski <lordblick[at]gmail-dot-com>
+Konstantin Baranovskiy <baranovskiykonstantin[at]gmail-dot-com>
+Torsten Hüter <torstenhtr[at]gmx-dot-de>
+Nick Østergaard <oe.nick[at]gmail-dot-com>
+Andrew Zonenberg <azonenberg[at]drawersteak-dot-com>
+Cirilo Bernardo <cirilo_bernardo[at]yahoo-dot-com>
+Adam Wolfe <adamwolf[at]feelslikeburning-dot-com>
+Bernhard Stegmaier <stegmaier[at]sw-systems-dot-de>
+Chris Pavlina <pavlina.chris[at]gmail-dot-com>
+Mark Roszko <mark.roszko[at]gmail-dot-com>
+Simon Richter <Simon.Richter[at]hogyros-dot-de>
 
 See also CHANGELOG.txt for contributors.
 
 == Document Writers
-Jean-Pierre Charras <jean-pierre.charras[at]gipsa-lab.inpg.fr>
-Igor Plyatov <plyatov[at]gmail.com>
+Jean-Pierre Charras <jean-pierre.charras[at]gipsa-lab.inpg-dot-fr>
+Igor Plyatov <plyatov[at]gmail-dot-com>
 Fabrizio Tappero <fabrizio-dot-tappero[at]gmail-dot-com>
+Marco Ciampa <ciampix[at]libero-dot-it>
 
 == Translators
 Czech (CZ) Martin Kratoška <martin[at]ok1rr-dot-com>
@@ -53,8 +59,8 @@ Russian (RU) Eldar Khayrullin <eldar.khayrullin@mail.ru>
 Spanish (ES) Pedro Martin del Valle <pkicad[at]yahoo-dot-es>
 Spanish (ES) Iñigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es>
 German (DE) Rafael Sokolowski <Rafael.Sokolowski[at]web-dot-de
-Japanese (JA) Kenta Yonekura <midpika@hotmail.com>
-Japanese (JA) yoneken <midpika@hotmail.com>
+Japanese (JA) Kenta Yonekura <midpika@hotmail-dot-com>
+Japanese (JA) yoneken <midpika@hotmail-dot-com>
 
 Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke
 
diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp
index a3b2373ecf..996ba1a80f 100644
--- a/common/dialog_about/AboutDialog_main.cpp
+++ b/common/dialog_about/AboutDialog_main.cpp
@@ -141,20 +141,23 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
 
     // bullet-ed list with some http links
     description << wxT( "<ul>" );
-    description << wxT( "<li>" ) << HtmlHyperlink( wxT( "http://iut-tice.ujf-grenoble.fr/kicad" ),
-                                                   _( "The original site of the initiator of KiCad" ) )
+    description << wxT( "<li>" )
+                << HtmlHyperlink( wxT( "http://www.kicad-pcb.org" ),
+                                  _( "The official KiCad site" ) )
+                << wxT( "</li>" );
+    description << wxT( "<li>" )
+                << HtmlHyperlink( wxT( "http://iut-tice.ujf-grenoble.fr/kicad" ),
+                                  _( "The original site of the KiCad project founder" ) )
+                << wxT( "</li>" );
+    description << wxT( "<li>" )
+                << HtmlHyperlink( wxT( "https://launchpad.net/kicad" ),
+                                  _( "Developer's website on Launchpad" ) )
+                << wxT("</li>" );
+    description << wxT( "<li>" )
+                << HtmlHyperlink( wxT( "http://www.kicadlib.org" ),
+                                  _( "Repository with additional component libraries" ) )
                 << wxT( "</li>" );
-    description << wxT( "<li>" ) <<
-    HtmlHyperlink( wxT( "https://launchpad.net/kicad" ), _( "Project on Launchpad" ) ) << wxT(
-        "</li>" );
-    description << wxT( "<li>" ) <<
-    HtmlHyperlink( wxT( "http://www.kicad-pcb.org" ),
-                  _( "The new KiCad site" ) ) << wxT( "</li>" );
-    description << wxT( "<li>" ) <<
-    HtmlHyperlink( wxT( "http://www.kicadlib.org" ),
-                  _( "Repository with additional component libraries" ) ) << wxT( "</li>" );
     description << wxT( "</ul>" );
-
     description << wxT( "</p>" );
 
     description << wxT( "<p>" );
@@ -162,14 +165,18 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
 
     // bullet-ed list with some http links
     description << wxT( "<ul>" );
-    description << wxT( "<li>" ) <<
-    HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ),
-                  _( "Report bugs if you found any" ) ) << wxT( "</li>" );
-    description << wxT( "<li>" ) << HtmlHyperlink( wxT( "https://blueprints.launchpad.net/kicad" ),
-                                                   _( "File an idea for improvement" ) ) << wxT( "</li>" );
-    description << wxT( "<li>" ) <<
-    HtmlHyperlink( wxT( "http://www.kicadlib.org/Kicad_related_links.html" ),
-                   _( "KiCad links to user groups, tutorials and much more" ) ) << wxT( "</li>" );
+    description << wxT( "<li>" )
+                <<HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ),
+                                 _( "Report bugs if you found any" ) )
+                << wxT( "</li>" );
+    description << wxT( "<li>" )
+                << HtmlHyperlink( wxT( "https://blueprints.launchpad.net/kicad" ),
+                                  _( "File an idea for improvement" ) )
+                << wxT( "</li>" );
+    description << wxT( "<li>" )
+                << HtmlHyperlink( wxT( "http://www.kicadlib.org/Kicad_related_links.html" ),
+                                  _( "KiCad links to user groups, tutorials and much more" ) )
+                << wxT( "</li>" );
     description << wxT( "</ul>" );
 
     description << wxT( "</p>" );
@@ -217,10 +224,6 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
         new Contributor( wxT( "Cirilo Bernardo" ),         wxT( "cirilo_bernardo@yahoo.com" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Jonas Diemer" ),            wxT( "diemer@gmx.de" ) ) );
-    info.AddDeveloper(
-        new Contributor( wxT( "Tim Hanson" ),              wxT( "sideskate@gmail.com" ) ) );
-    info.AddDeveloper(
-        new Contributor( wxT( "Hauptmech" ),               wxT( "hauptmech@gmail.com" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Torsten Hüter" ),           wxT( "torstenhtr@gmx.de" ) ) );
     info.AddDeveloper(
@@ -229,8 +232,6 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
         new Contributor( wxT( "Daniel Majewski" ),         wxT( "lordblick@gmail.com" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Lorenzo Marcantonio" ),     wxT( "lomarcan@tin.it" ) ) );
-    info.AddDeveloper(
-        new Contributor( wxT( "Rok Markovic" ),            wxT( "rok@kanardia.eu" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Marco Mattila" ),           wxT( "marcom99@gmail.com" ) ) );
     info.AddDeveloper(
@@ -259,6 +260,16 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
         new Contributor( wxT( "Andrew Zonenberg" ),        wxT( "azonenberg@drawersteak.com" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Nick Østergaard" ),         wxT( "oe.nick@gmail.com" ) ) );
+    info.AddDeveloper(
+        new Contributor( wxT( "Adam Wolfe" ),              wxT( "adamwolf@feelslikeburning.com" ) ) );
+    info.AddDeveloper(
+        new Contributor( wxT( "Bernhard Stegmaier" ),      wxT( "stegmaier@sw-systems.de" ) ) );
+    info.AddDeveloper(
+        new Contributor( wxT( "Chris Pavlina" ),           wxT( "pavlina.chris@gmail.com" ) ) );
+    info.AddDeveloper(
+        new Contributor( wxT( "Mark Roszko" ),             wxT( "mark.roszko@gmail.com" ) ) );
+    info.AddDeveloper(
+        new Contributor( wxT( "Simon Richter" ),           wxT( "Simon.Richter@hogyros.de" ) ) );
 
     // The document writers
     info.AddDocWriter(
@@ -267,6 +278,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
         new Contributor( wxT( "Igor Plyatov" ),            wxT( "plyatov@gmail.com" ) ) );
     info.AddDocWriter(
         new Contributor( wxT( "Fabrizio Tappero" ),        wxT( "fabrizio.tappero@gmail.com" ) ) );
+    info.AddDocWriter(
+        new Contributor( wxT( "Marco Ciampa" ),            wxT( "ciampix@libero.it" ) ) );
 
     /* The translators
      * As category the language to which the translation was done is used