From 4b85adb7d3883f7a1db567bfebe8f657cf75a88a Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Thu, 19 Nov 2015 10:04:12 -0500 Subject: [PATCH] Developer credit and copyright updates. * Remove duplicate developer credits added in last commit. * Update developer email addresses. * Change copyright.h from GPL2+ to GPL3+ per FSF. * Update newstroke license from CC-BY to CC0 with permission by author Vladimir Uryvaev which reflects the official license on the newstroke website http://vovanium.ru/sledy/newstroke/en. * Coding policy fixes in AboutDialog_main.cpp. --- AUTHORS.txt | 17 +- common/dialog_about/AboutDialog_main.cpp | 376 +++++++++++------- copyright.h | 16 +- .../tools_to_build_newstroke-font/README.txt | 2 +- 4 files changed, 246 insertions(+), 165 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index fed7f43b84..fd39edcfa7 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -5,7 +5,8 @@ == Main Authors Jean-Pierre Charras Dick Hollenbeck -Wayne Stambaugh +Wayne Stambaugh + == Contributors Hauptmech @@ -34,7 +35,6 @@ Cirilo Bernardo Adam Wolfe Bernhard Stegmaier Chris Pavlina -Mark Roszko Simon Richter See also CHANGELOG.txt for contributors. @@ -45,27 +45,28 @@ Igor Plyatov Fabrizio Tappero Marco Ciampa + == Translators Czech (CZ) Martin KratoÅ¡ka Dutch (NL) Jerry Jacobs Finnish (FI) Vesa Solonen French (FR) Jean-Pierre Charras Polish (PL) Mateusz Skowro¿ski -Polish (PL) Kerusey Karyu +Polish (PL) Kerusey Karyu Portuguese (PT) Renie Marquet " Russian (RU) Igor Plyatov -Russian (RU) Andrey Fedorushkov -Russian (RU) Eldar Khayrullin +Russian (RU) Andrey Fedorushkov +Russian (RU) Eldar Khayrullin Spanish (ES) Pedro Martin del Valle Spanish (ES) Iñigo Zuluaga German (DE) Rafael Sokolowski -Japanese (JA) yoneken +Japanese (JA) Kenta Yonekura Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke + == Programm credits for icons and others Icons by Iñigo Zuluagaz New Icons by Fabrizio Tappero -3D modules by Renie Marquet +3D modules by Renie Marquet 3D modules by Christophe Boschat diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 5aa09687d6..72e946eaaf 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -58,7 +58,8 @@ static wxString HtmlNewline( const unsigned int amount = 1 ); static void InitKiCadAboutNew( AboutAppInfo& info ) { // Set application specific icon - const wxTopLevelWindow* const tlw = wxDynamicCast( Pgm().App().GetTopWindow(), wxTopLevelWindow ); + const wxTopLevelWindow* const tlw = wxDynamicCast( Pgm().App().GetTopWindow(), + wxTopLevelWindow ); if( tlw ) info.SetIcon( tlw->GetIcon() ); @@ -92,17 +93,16 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) /* wxWidgets version */ wxString libVersion; - libVersion - << wxT( "wxWidgets " ) - << wxMAJOR_VERSION << wxT( "." ) - << wxMINOR_VERSION << wxT( "." ) - << wxRELEASE_NUMBER + libVersion << wxT( "wxWidgets " ) + << wxMAJOR_VERSION << wxT( "." ) + << wxMINOR_VERSION << wxT( "." ) + << wxRELEASE_NUMBER /* Unicode or ANSI version */ #if wxUSE_UNICODE - << wxT( " Unicode " ); + << wxT( " Unicode " ); #else - << wxT( " ANSI " ); + << wxT( " ANSI " ); #endif // Just in case someone builds KiCad with the platform native of Boost instead of @@ -127,17 +127,22 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) /* short description */ description << wxT( "

" ); - description << wxT( "" ) << _( "Description" ) << wxT( "" ); // bold & underlined font for caption + description << wxT( "" ) + << _( "Description" ) + << wxT( "" ); // bold & underlined font for caption - description << wxT( "

" ) << - _( "The KiCad EDA Suite is a set of open source applications for the creation of electronic schematics and to design printed circuit boards." ) + description << wxT( "

" ) + << _( "The KiCad EDA Suite is a set of open source applications for the " + "creation of electronic schematics and to design printed circuit boards." ) << wxT( "

" ); description << wxT( "

" ); /* websites */ description << wxT( "

" ); - description << wxT( "" ) << _( "KiCad on the web" ) << wxT( "" ); // bold & underlined font for caption + description << wxT( "" ) + << _( "KiCad on the web" ) + << wxT( "" ); // bold & underlined font for caption // bullet-ed list with some http links description << wxT( "

    " ); @@ -161,7 +166,9 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) description << wxT( "

    " ); description << wxT( "

    " ); - description << wxT( "" ) << _( "Contribute to KiCad" ) << wxT( "" ); // bold & underlined font caption + description << wxT( "" ) + << _( "Contribute to KiCad" ) + << wxT( "" ); // bold & underlined font caption // bullet-ed list with some http links description << wxT( "

      " ); @@ -191,7 +198,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) << HtmlNewline( 4 ) << _( "The complete KiCad EDA Suite is released under the" ) << HtmlNewline( 2 ) << HtmlHyperlink( wxT( "http://www.gnu.org/licenses" ), - _( "GNU General Public License (GPL) version 2 or any later version" ) ) + _( "GNU General Public License (GPL) version 3 or any later version" ) ) << wxT( "" ); info.SetLicense( license ); @@ -210,140 +217,209 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) */ // The core developers - info.AddDeveloper( - new Contributor( wxT( "Jean-Pierre Charras" ), wxT( "jp.charras@wanadoo.fr" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Dick Hollenbeck" ), wxT( "dick@softplc.com" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Wayne Stambaugh" ), wxT( "stambaughw@verizon.net" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Jean-Pierre Charras" ), + wxT( "jp.charras@wanadoo.fr" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Dick Hollenbeck" ), + wxT( "dick@softplc.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Wayne Stambaugh" ), + wxT( "stambaughw@gmail.com" ) ) ); // alphabetically by last name after main 3 above: - info.AddDeveloper( - new Contributor( wxT( "Frank Bennett" ), wxT( "bennett78@lpbroadband.net" ) ) ); - info.AddDeveloper( - 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( "Torsten Hüter" ), wxT( "torstenhtr@gmx.de" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Jerry Jacobs" ), wxT( "xor.gate.engineering@gmail.com" ) ) ); - info.AddDeveloper( - 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( "Marco Mattila" ), wxT( "marcom99@gmail.com" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Miguel Angel Ajo Pelayo" ), wxT( "miguelangel@nbee.es" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Jacobo Aragunde Perez" ), wxT( "jaragunde@igalia.com" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Mark Roszko" ), wxT( "mark.roszko@gmail.com" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Marco Serantoni" ), wxT( "marco.serantoni@gmail.com" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Brian Sidebotham" ), wxT( "brian.sidebotham@gmail.com" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Orson (Maciej Sumiński)" ), wxT( "maciej.suminski@cern.ch" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Rafael Sokolowski" ), wxT( "rafael.sokolowski@web.de" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Tomasz Wlostowski" ), wxT( "tomasz.wlostowski@cern.ch" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Alexander Zakamaldin" ), wxT( "zaka62@mail.ru" ) ) ); - info.AddDeveloper( - new Contributor( wxT( "Henner Zeller" ), wxT( "h.zeller@acm.org" ) ) ); - info.AddDeveloper( - 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" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Frank Bennett" ), + wxT( "bennett78@lpbroadband.net" ) ) ); + info.AddDeveloper( 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( "Torsten Hüter" ), + wxT( "torstenhtr@gmx.de" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Jerry Jacobs" ), + wxT( "xor.gate.engineering@gmail.com" ) ) ); + info.AddDeveloper( 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( "Marco Mattila" ), + wxT( "marcom99@gmail.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Chris Pavlina" ), + wxT( "pavlina.chris@gmail.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Miguel Angel Ajo Pelayo" ), + wxT( "miguelangel@nbee.es" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Jacobo Aragunde Perez" ), + wxT( "jaragunde@igalia.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Simon Richter" ), + wxT( "Simon.Richter@hogyros.de" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Mark Roszko" ), + wxT( "mark.roszko@gmail.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Marco Serantoni" ), + wxT( "marco.serantoni@gmail.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Brian Sidebotham" ), + wxT( "brian.sidebotham@gmail.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Orson (Maciej Sumiński)" ), + wxT( "maciej.suminski@cern.ch" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Rafael Sokolowski" ), + wxT( "rafael.sokolowski@web.de" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Vesa Solonen" ), + wxT( "vesa.solonen@hut.fi" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Bernhard Stegmaier" ), + wxT( "stegmaier@sw-systems.de" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Tomasz Wlostowski" ), + wxT( "tomasz.wlostowski@cern.ch" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Adam Wolfe" ), + wxT( "adamwolf@feelslikeburning.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Alexander Zakamaldin" ), + wxT( "zaka62@mail.ru" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Henner Zeller" ), + wxT( "h.zeller@acm.org" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Andrew Zonenberg" ), + wxT( "azonenberg@drawersteak.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Nick Østergaard" ), + wxT( "oe.nick@gmail.com" ) ) ); // The document writers - info.AddDocWriter( - new Contributor( wxT( "Jean-Pierre Charras" ), wxT( "jp.charras@wanadoo.fr" ) ) ); - info.AddDocWriter( - 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" ) ) ); + info.AddDocWriter( new Contributor( wxT( "Jean-Pierre Charras" ), + wxT( "jp.charras@wanadoo.fr" ) ) ); + info.AddDocWriter( new Contributor( wxT( "Marco Ciampa" ), + wxT( "ciampix@libero.it" ) ) ); + info.AddDocWriter( new Contributor( wxT( "Dick Hollenbeck" ), + wxT( "dick@softplc.com" ) ) ); + info.AddDocWriter( new Contributor( wxT( "Igor Plyatov" ), + wxT( "plyatov@gmail.com" ) ) ); + info.AddDocWriter( new Contributor( wxT( "Wayne Stambaugh" ), + wxT( "stambaughw@gmail.com" ) ) ); + info.AddDocWriter( new Contributor( wxT( "Fabrizio Tappero" ), + wxT( "fabrizio.tappero@gmail.com" ) ) ); /* The translators * As category the language to which the translation was done is used * and as icon the national flag of the corresponding country. */ - info.AddTranslator( - new Contributor( wxT( "Martin Kratoška" ), wxT( "martin@ok1rr.com" ), wxT( "Czech (CZ)" ), KiBitmapNew( lang_cs_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Jerry Jacobs" ), wxT( "xor.gate.engineering@gmail.com" ),wxT( "Dutch (NL)" ), KiBitmapNew( lang_nl_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ), wxT( "Finnish (FI)" ), KiBitmapNew( lang_fi_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Jean-Pierre Charras" ), wxT( "jp.charras@wanadoo.fr" ), wxT( "French (FR)" ), KiBitmapNew( lang_fr_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Mateusz Skowroński" ), wxT( "skowri@gmail.com" ), wxT( "Polish (PL)" ), KiBitmapNew( lang_pl_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Kerusey Karyu" ), wxT( "keruseykaryu@o2.pl" ), wxT( "Polish (PL)" ), KiBitmapNew( lang_pl_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), wxT( "Portuguese (PT)" ), KiBitmapNew( lang_pt_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ), wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Andrey Fedorushkov" ), wxT( "andrf@mail.ru" ), wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Eldar Khayrullin" ), wxT( "eldar.khayrullin@mail.ru" ), wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Pedro Martin del Valle" ), wxT( "pkicad@yahoo.es" ), wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Iñigo Zuluaga" ), wxT( "inigo_zuluaga@yahoo.es" ), wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Rafael Sokolowski" ), wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ), KiBitmapNew( lang_de_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Kenta Yonekura" ), wxT( "yoneken@kicad.jp" ), wxT( "Japanese (JA)" ), KiBitmapNew( lang_jp_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Manolis Stefanis" ), wxT( "" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Athanasios Vlastos" ), wxT( "" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Milonas Kostas" ), wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Michail Misirlis" ), wxT( "mmisirlis@gmail.com" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Massimo Cioce" ), wxT( "ciocemax@alice.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Marco Ciampa" ), wxT( "ciampix@libero.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) ); - info.AddTranslator( - new Contributor( wxT( "Evgeniy Ivanov" ), wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ), KiBitmapNew( lang_bg_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Martin Kratoška" ), + wxT( "martin@ok1rr.com" ), + wxT( "Czech (CZ)" ), + KiBitmapNew( lang_cs_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Jerry Jacobs" ), + wxT( "xor.gate.engineering@gmail.com" ), + wxT( "Dutch (NL)" ), + KiBitmapNew( lang_nl_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Vesa Solonen" ), + wxT( "vesa.solonen@hut.fi" ), + wxT( "Finnish (FI)" ), + KiBitmapNew( lang_fi_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Jean-Pierre Charras" ), + wxT( "jp.charras@wanadoo.fr" ), + wxT( "French (FR)" ), + KiBitmapNew( lang_fr_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Mateusz Skowroński" ), + wxT( "skowri@gmail.com" ), + wxT( "Polish (PL)" ), + KiBitmapNew( lang_pl_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Kerusey Karyu" ), + wxT( "keruseykaryu@o2.pl" ), + wxT( "Polish (PL)" ), + KiBitmapNew( lang_pl_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Renie Marquet" ), + wxT( "reniemarquet@uol.com.br" ), + wxT( "Portuguese (PT)" ), + KiBitmapNew( lang_pt_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Igor Plyatov" ), + wxT( "plyatov@gmail.com" ), + wxT( "Russian (RU)" ), + KiBitmapNew( lang_ru_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Andrey Fedorushkov" ), + wxT( "andrf@mail.ru" ), + wxT( "Russian (RU)" ), + KiBitmapNew( lang_ru_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Eldar Khayrullin" ), + wxT( "eldar.khayrullin@mail.ru" ), + wxT( "Russian (RU)" ), + KiBitmapNew( lang_ru_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Pedro Martin del Valle" ), + wxT( "pkicad@yahoo.es" ), + wxT( "Spanish (ES)" ), + KiBitmapNew( lang_es_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Iñigo Zuluaga" ), + wxT( "inigo_zuluaga@yahoo.es" ), + wxT( "Spanish (ES)" ), + KiBitmapNew( lang_es_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Iñigo Figuero" ), + wxT( "ifs@elektroquark.com" ), + wxT( "Spanish (ES)" ), + KiBitmapNew( lang_es_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Rafael Sokolowski" ), + wxT( "rafael.sokolowski@web.de" ), + wxT( "German (DE)" ), + KiBitmapNew( lang_de_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Kenta Yonekura" ), + wxT( "yoneken@kicad.jp" ), + wxT( "Japanese (JA)" ), + KiBitmapNew( lang_jp_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Manolis Stefanis" ), + wxT( "" ), + wxT( "Greek (el_GR)" ), + KiBitmapNew( lang_gr_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Athanasios Vlastos" ), + wxT( "" ), + wxT( "Greek (el_GR)" ), + KiBitmapNew( lang_gr_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Milonas Kostas" ), + wxT( "milonas.ko@gmail.com" ), + wxT( "Greek (el_GR)" ), + KiBitmapNew( lang_gr_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Michail Misirlis" ), + wxT( "mmisirlis@gmail.com" ), + wxT( "Greek (el_GR)" ), + KiBitmapNew( lang_gr_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Massimo Cioce" ), + wxT( "ciocemax@alice.it" ), + wxT( "Italian (IT)" ), + KiBitmapNew( lang_it_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Marco Ciampa" ), + wxT( "ciampix@libero.it" ), + wxT( "Italian (IT)" ), + KiBitmapNew( lang_it_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Evgeniy Ivanov" ), + wxT( "evgeniy_p_ivanov@yahoo.ca" ), + wxT( "Bulgarian (BG)" ), + KiBitmapNew( lang_bg_xpm ) ) ); - info.AddTranslator( new Contributor( wxT( "Remy Halvick" ), wxEmptyString, wxT( "Others" ) ) ); - info.AddTranslator( new Contributor( wxT( "David Briscoe" ), wxEmptyString, wxT( "Others" ) ) ); - info.AddTranslator( new Contributor( wxT( "Dominique Laigle" ), wxEmptyString, wxT( "Others" ) ) ); - info.AddTranslator( new Contributor( wxT( "Paul Burke" ), wxEmptyString, wxT( "Others" ) ) ); + // TODO: are these all russian translators, + // placed them here now, + // or else align them below other language maintainer with mail adress + info.AddTranslator( new Contributor( wxT( "Remy Halvick" ), + wxEmptyString, + wxT( "Others" ) ) ); + info.AddTranslator( new Contributor( wxT( "David Briscoe" ), + wxEmptyString, + wxT( "Others" ) ) ); + info.AddTranslator( new Contributor( wxT( "Dominique Laigle" ), + wxEmptyString, + wxT( "Others" ) ) ); + info.AddTranslator( new Contributor( wxT( "Paul Burke" ), + wxEmptyString, + wxT( "Others" ) ) ); // Programm credits for icons - info.AddArtist( - new Contributor( wxT( "Iñigo Zuluagaz" ), wxT( "inigo_zuluaga@yahoo.es" ), wxT( "Icons by" ), KiBitmapNew( edit_module_xpm ) ) ); - info.AddArtist( - new Contributor( wxT( "Fabrizio Tappero" ), wxT( "fabrizio.tappero@gmail.com" ), wxT( "New icons by" ), KiBitmapNew( edit_module_xpm ) ) ); - info.AddArtist( - new Contributor( wxT( "Konstantin Baranovskiy" ), wxT( "baranovskiykonstantin@gmail.com" ), wxT( "New icons by" ), KiBitmapNew( edit_module_xpm ) ) ); - info.AddArtist( - new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) ); - info.AddArtist( - new Contributor( wxT( "Christophe Boschat" ), wxT( "nox454@hotmail.fr" ), wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) ); + info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ), + wxT( "inigo_zuluaga@yahoo.es" ), + wxT( "Icons by" ), + KiBitmapNew( edit_module_xpm ) ) ); + info.AddArtist( new Contributor( wxT( "Fabrizio Tappero" ), + wxT( "fabrizio.tappero@gmail.com" ), + wxT( "New icons by" ), + KiBitmapNew( edit_module_xpm ) ) ); + info.AddArtist( new Contributor( wxT( "Konstantin Baranovskiy" ), + wxT( "baranovskiykonstantin@gmail.com" ), + wxT( "New icons by" ), + KiBitmapNew( edit_module_xpm ) ) ); + info.AddArtist( new Contributor( wxT( "Renie Marquet" ), + wxT( "reniemarquet@uol.com.br" ), + wxT( "3D modules by" ), + KiBitmapNew( three_d_xpm ) ) ); + info.AddArtist( new Contributor( wxT( "Christophe Boschat" ), + wxT( "nox454@hotmail.fr" ), + wxT( "3D modules by" ), + KiBitmapNew( three_d_xpm ) ) ); } @@ -366,39 +442,43 @@ bool ShowAboutDialog( wxWindow* parent ) /////////////////////////////////////////////////////////////////////////////// /** - * Wraps the given url with a HTML anchor tag containing a hyperlink text reference + * Function HtmlHyperlink + * + * wraps \a aUrl with a HTML anchor tag containing a hyperlink text reference * to form a HTML hyperlink. * - * @param url the url that will be embedded in an anchor tag containing a hyperlink reference - * @param description the optional describing text that will be represented as a hyperlink. + * @param aUrl the url that will be embedded in an anchor tag containing a hyperlink reference + * @param aDescription the optional describing text that will be represented as a hyperlink. * If not specified the url will be used as hyperlink. * @return a HTML conform hyperlink like description */ -static wxString HtmlHyperlink( const wxString& url, const wxString& description ) +static wxString HtmlHyperlink( const wxString& aUrl, const wxString& aDescription ) { wxString hyperlink = wxEmptyString; - if( description.IsEmpty() ) - hyperlink << wxT( "" ) << url << wxT( "" ); + if( aDescription.IsEmpty() ) + hyperlink << wxT( "" ) << aUrl << wxT( "" ); else - hyperlink << wxT( "" ) << description << wxT( "" ); + hyperlink << wxT( "" ) << aDescription << wxT( "" ); return hyperlink; } /** - * Creates a HTML newline character sequence. + * Function HtmlNewline * - * @param amount - the amount of HTML newline tags to concatenate, default is to return just - * one
      tag + * creates an HTML newline character sequence of \a aCount. + * + * @param aCount the number of HTML newline tags to concatenate, default is to return just + * one
      tag. * @return the concatenated amount of HTML newline tag(s)
      */ -static wxString HtmlNewline( const unsigned int amount ) +static wxString HtmlNewline( const unsigned int aCount ) { wxString newlineTags = wxEmptyString; - for( size_t i = 0; i" ); return newlineTags; diff --git a/copyright.h b/copyright.h index 79a50ecc4d..c99a81b2a8 100644 --- a/copyright.h +++ b/copyright.h @@ -1,23 +1,23 @@ Copyright template -A copyright message which may be added to all source files -at their top. There is one line that represents the main copyright holder which -is its original author. +A copyright message which may be added to all source files at their top. +There is one line that represents the main copyright holder which is its +original author. -Workers who earn partial copyright holder status of a source module -may choose to document this corresponding work in the CHANGELOG.txt file. +Workers who earn partial copyright holder status of a source module may +choose to document this corresponding work in the CHANGELOG.txt file. /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2014 - * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors. + * Copyright (C) 2015 + * Copyright (C) 2015 KiCad Developers, see CHANGELOG.TXT for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/helpers/tools_to_build_newstroke-font/README.txt b/helpers/tools_to_build_newstroke-font/README.txt index dcf7b3bb3c..152b34f965 100644 --- a/helpers/tools_to_build_newstroke-font/README.txt +++ b/helpers/tools_to_build_newstroke-font/README.txt @@ -29,4 +29,4 @@ Usage awk -f fontconv.awk symbol.lib font.lib charlist.txt >newstroke_font.h -Released under CC-BY licence. +Released under CC0 licence.