Skip to content

Commit f28e69b

Browse files
joerazjoeraz
committed
Updated credits and copyright.
1 parent e8bc34f commit f28e69b

File tree

13 files changed

+161
-105
lines changed

13 files changed

+161
-105
lines changed

‎AUTHORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Main Authors
1616
* [Roderik Ploszek](https://github.com/Programator2)
1717
* Fixes and enhancements
1818
* [Joe R.](https://github.com/joeraz)
19-
* Continued PySolFC maintenance and development.
19+
* Many new games and continued PySolFC maintenance and development.
2020

2121
Games contributors
2222
==================

‎html-src/credits.html

Lines changed: 28 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,36 @@
1-
<h2>PySol credits go to</h2>
1+
<h1>PySolFC Credits</h1>
2+
<h2>Main Authors</h2>
23
<ul>
3-
<li> Volker Weidner for getting me into Solitaire
4-
<li> Guido van Rossum for the initial example program
5-
<li> <a href="http://www.inetarena.com/~grania/">T. Kirk</a> for lots of contributed games and cardsets
6-
<li> the Gnome AisleRiot team for parts of the documentation
7-
<li> the AfterStep and KDE teams for some icons
8-
<li> the Python, Tcl/Tk &amp; Linux crews for making this program possible
4+
<li>Markus Franz Xaver Johannes Oberhumer <a href="https://www.oberhumer.com/">https://www.oberhumer.com/</a> - Author of PySol<ul>
5+
<li>T. Kirk - Author of Ultrasol</li>
6+
<li><a href="https://sourceforge.net/u/skomoroh/profile/">Skomoroh</a> - Author of PySolFC</li>
7+
<li><a href="https://sourceforge.net/u/brianl/profile/">Brian Lenihan</a> - MacOS package maintainer</li>
8+
<li><a href="https://www.shlomifish.org/">Shlomi Fish</a> - Continued PySolFC maintenance, port to python 3, test suite (Note: he places all his changes under the Expat licence).</li>
9+
<li><a href="https://github.com/lufebe16">https://github.com/lufebe16</a> - Added the Kivy toolkit</li>
10+
<li><a href="https://github.com/Programator2">Roderik Ploszek</a> - Fixes and enhancements</li>
11+
<li><a href="https://github.com/joeraz">Joe R.</a> - Many new games and continued PySolFC maintenance and development.</li>
912
</ul>
10-
11-
<h2>Game contributors are</h2>
13+
<h2>Games contributors</h2>
1214
<ul>
13-
<li> T. Kirk &lt;[email protected]&gt;<br>
14-
lots of Ganjifa
15-
<a href="ganjifa.html">Ganjifa</a>,
16-
<a href="hanafuda.html">Hanafuda</a>
17-
and Tarock type games.
18-
<li> Andrew Csillag &lt;[email protected]&gt;
19-
<ul>
20-
<li> <a href="rules/canfield.html">Canfield</a>
21-
</ul>
22-
<li> Deon Ramsey &lt;[email protected]&gt;
23-
<ul>
24-
<li> <a href="rules/nomad.html">Nomad</a>
25-
</ul>
26-
<li> Galen Brooks &lt;[email protected]&gt;
27-
<ul>
28-
<li> <a href="rules/numerica.html">Numerica</a>
29-
</ul>
30-
<li> Matthew Hohlfeld &lt;[email protected]&gt;
31-
<ul>
32-
<li> <a href="rules/larasgame.html">Lara's Game</a>
33-
</ul>
15+
<li>Mark Andrews</li>
16+
<li>Galen Brooks <galen@nine.com></li>
17+
<li>Andrew Csillag <drew@thecsillags.com>
18+
<li>Michael Foord</li>
19+
<li>Matthew Hohlfeld <hohlfeld@cs.ucsd.edu></li>
20+
<li>Nicola Larosa</li>
21+
<li>John Stoneham <obijohn99@aol.com></li>
22+
<li>David Svoboda <svoboda@users.sourceforge.net></li>
3423
</ul>
35-
36-
<h2>Cardset contributors are</h2>
24+
<h2>Enhancements</h2>
3725
<ul>
38-
<li> Bao Trinh &lt;[email protected]&gt;
39-
<li> DJ Delorie &lt;[email protected]&gt;
40-
<li> Donald R. Woods &lt;[email protected]&gt;
41-
<li> Felix Bellaby &lt;[email protected]&gt;
42-
<li> Heiko Eissfeldt &lt;[email protected]&gt;
43-
<li> Jochen Tuchbreiter &lt;[email protected]&gt;
44-
<li> John Fitzgibbon
45-
<li> John Heidemann &lt;[email protected]&gt;
46-
<li> Jonathan Blandford &lt;[email protected]&gt;
47-
<li> Joseph L. Traub &lt;[email protected]&gt;
48-
<li> Michael Bischoff &lt;[email protected]&gt;
49-
<li> Mike Naylor &lt;[email protected]&gt;
50-
<li> Oliver Xymoron &lt;[email protected]&gt;
51-
<li> Rene Seindal &lt;[email protected]&gt;
52-
<li> Rudy Muller &lt;[email protected]&gt;
53-
<li> Ryu Changwoo &lt;[email protected]&gt;
54-
<li> T. Kirk &lt;[email protected]&gt;
55-
<li> The Papa &lt;[email protected]&gt;
26+
<li><a href="https://github.com/ghostofiht">ghostofiht</a> - Contributed a new logo design.</li>
27+
<li><a href="https://fontlibrary.org/en/font/trueno">Trueno font</a> under the <a href="https://en.wikipedia.org/wiki/SIL_Open_Font_License">OFL</a> by <a href="http://www.zkysky.com.ar/">Julieta Ulanovsky</a> - used in the logo.</li>
5628
</ul>
57-
58-
<h2>Music contributors are</h2>
29+
<h2>Translations</h2>
5930
<ul>
60-
<li> <a href="http://hem.passagen.se/dachande/">Carl Larsson</a> aka <i>Nightbeat</i>
61-
&lt;[email protected]&gt;
62-
</ul>
63-
64-
<h2>Special thanks to</h2>
65-
<ul>
66-
<li> Andy Markebo &lt;[email protected]&gt;
67-
<li> Charles B. Dorsett
68-
<li> Christian Tismer &lt;[email protected]&gt;
69-
<li> Dylan Thurston &lt;[email protected]&gt;
70-
<li> Jan Nijtmans &lt;[email protected]&gt;
71-
<li> Jordan Russel &lt;[email protected]&gt;
72-
<li> Kevin O'Connor &lt;[email protected]&gt;
73-
<li> Marc-Andre Lemburg &lt;[email protected]&gt;
74-
<li> Mark Hammond &lt;[email protected]&gt;
75-
<li> Neil Schemenauer &lt;[email protected]&gt;
76-
<li> Thomas Gellekum &lt;[email protected]&gt;
77-
<li> Vladimir Marangozov &lt;[email protected]&gt;
78-
<li> Zachary Roadhouse &lt;[email protected]&gt;
79-
<li> Natascha
80-
</ul>
81-
82-
<h2>PySol uses the following OpenSource technologies</h2>
83-
<ul>
84-
<li> <a href="http://www.python.org/">The Python Programming Language</a>
85-
<li> <a href="http://www.scriptics.com/">The Tcl/Tk GUI Toolkit</a>
86-
<li> <a href="http://www.devolution.com/~slouken/projects/SDL/index.html">The SDL Simple DirectMedia Layer</a>
87-
<li> <a href="http://www.lokigames.com/development/smpeg.php3">The SDL MPEG Player Library</a>
88-
<li> <a href="http://mikmod.darkorb.net/">The MikMod Sound Library</a>
89-
</ul>
90-
91-
<h2>PySol was created using the following OpenSource technologies</h2>
92-
<ul>
93-
<li> <a href="http://www.linux.org/">The Linux Operating System</a>
94-
<li> <a href="http://www.xfree86.org/">The XFree86 X Window System</a>
95-
<li> <a href="http://www.kde.org/">The KDE Desktop Environment</a>
96-
<li> <a href="http://fte.sourceforge.net/">The FTE Text Editor</a>
97-
<li> <a href="http://www.jordanr.dhs.org/">The Inno Setup Win32 Installer</a>
31+
<li>Holger Schäkel <Holger@Schaekel-row.de> (de)</li>
32+
<li>Jerzy Trzeciak <artusek@wp.pl> (pl)</li>
9833
</ul>
34+
<p>
35+
<a href="credits_old.html">View original PySol credits</a>
36+
</p>

‎html-src/credits_old.html

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<h2>PySol credits go to</h2>
2+
<ul>
3+
<li> Volker Weidner for getting me into Solitaire
4+
<li> Guido van Rossum for the initial example program
5+
<li> <a href="http://www.inetarena.com/~grania/">T. Kirk</a> for lots of contributed games and cardsets
6+
<li> the Gnome AisleRiot team for parts of the documentation
7+
<li> the AfterStep and KDE teams for some icons
8+
<li> the Python, Tcl/Tk &amp; Linux crews for making this program possible
9+
</ul>
10+
11+
<h2>Game contributors are</h2>
12+
<ul>
13+
<li> T. Kirk &lt;[email protected]&gt;<br>
14+
<ul>
15+
<li>
16+
lots of
17+
<a href="ganjifa.html">Ganjifa</a>,
18+
<a href="hanafuda.html">Hanafuda</a>
19+
and Tarock type games.
20+
</ul>
21+
<li> Andrew Csillag &lt;[email protected]&gt;
22+
<ul>
23+
<li> <a href="rules/canfield.html">Canfield</a>
24+
</ul>
25+
<li> Deon Ramsey &lt;[email protected]&gt;
26+
<ul>
27+
<li> <a href="rules/nomad.html">Nomad</a>
28+
</ul>
29+
<li> Galen Brooks &lt;[email protected]&gt;
30+
<ul>
31+
<li> <a href="rules/numerica.html">Numerica</a>
32+
</ul>
33+
<li> Matthew Hohlfeld &lt;[email protected]&gt;
34+
<ul>
35+
<li> <a href="rules/larasgame.html">Lara's Game</a>
36+
</ul>
37+
</ul>
38+
39+
<h2>Cardset contributors are</h2>
40+
<ul>
41+
<li> Bao Trinh &lt;[email protected]&gt;
42+
<li> DJ Delorie &lt;[email protected]&gt;
43+
<li> Donald R. Woods &lt;[email protected]&gt;
44+
<li> Felix Bellaby &lt;[email protected]&gt;
45+
<li> Heiko Eissfeldt &lt;[email protected]&gt;
46+
<li> Jochen Tuchbreiter &lt;[email protected]&gt;
47+
<li> John Fitzgibbon
48+
<li> John Heidemann &lt;[email protected]&gt;
49+
<li> Jonathan Blandford &lt;[email protected]&gt;
50+
<li> Joseph L. Traub &lt;[email protected]&gt;
51+
<li> Michael Bischoff &lt;[email protected]&gt;
52+
<li> Mike Naylor &lt;[email protected]&gt;
53+
<li> Oliver Xymoron &lt;[email protected]&gt;
54+
<li> Rene Seindal &lt;[email protected]&gt;
55+
<li> Rudy Muller &lt;[email protected]&gt;
56+
<li> Ryu Changwoo &lt;[email protected]&gt;
57+
<li> T. Kirk &lt;[email protected]&gt;
58+
<li> The Papa &lt;[email protected]&gt;
59+
</ul>
60+
61+
<h2>Music contributors are</h2>
62+
<ul>
63+
<li> <a href="http://hem.passagen.se/dachande/">Carl Larsson</a> aka <i>Nightbeat</i>
64+
&lt;[email protected]&gt;
65+
</ul>
66+
67+
<h2>Special thanks to</h2>
68+
<ul>
69+
<li> Andy Markebo &lt;[email protected]&gt;
70+
<li> Charles B. Dorsett
71+
<li> Christian Tismer &lt;[email protected]&gt;
72+
<li> Dylan Thurston &lt;[email protected]&gt;
73+
<li> Jan Nijtmans &lt;[email protected]&gt;
74+
<li> Jordan Russel &lt;[email protected]&gt;
75+
<li> Kevin O'Connor &lt;[email protected]&gt;
76+
<li> Marc-Andre Lemburg &lt;[email protected]&gt;
77+
<li> Mark Hammond &lt;[email protected]&gt;
78+
<li> Neil Schemenauer &lt;[email protected]&gt;
79+
<li> Thomas Gellekum &lt;[email protected]&gt;
80+
<li> Vladimir Marangozov &lt;[email protected]&gt;
81+
<li> Zachary Roadhouse &lt;[email protected]&gt;
82+
<li> Natascha
83+
</ul>
84+
85+
<h2>PySol uses the following OpenSource technologies</h2>
86+
<ul>
87+
<li> <a href="http://www.python.org/">The Python Programming Language</a>
88+
<li> <a href="http://www.scriptics.com/">The Tcl/Tk GUI Toolkit</a>
89+
<li> <a href="http://www.devolution.com/~slouken/projects/SDL/index.html">The SDL Simple DirectMedia Layer</a>
90+
<li> <a href="http://www.lokigames.com/development/smpeg.php3">The SDL MPEG Player Library</a>
91+
<li> <a href="http://mikmod.darkorb.net/">The MikMod Sound Library</a>
92+
</ul>
93+
94+
<h2>PySol was created using the following OpenSource technologies</h2>
95+
<ul>
96+
<li> <a href="http://www.linux.org/">The Linux Operating System</a>
97+
<li> <a href="http://www.xfree86.org/">The XFree86 X Window System</a>
98+
<li> <a href="http://www.kde.org/">The KDE Desktop Environment</a>
99+
<li> <a href="http://fte.sourceforge.net/">The FTE Text Editor</a>
100+
<li> <a href="http://www.jordanr.dhs.org/">The Inno Setup Win32 Installer</a>
101+
</ul>

‎html-src/gen-html.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def merge_dicts(x, y):
4545

4646
files = [
4747
('credits.html', 'PySol Credits'),
48+
('credits_old.html', 'PySol Credits'),
4849
('ganjifa.html', 'PySol - General Ganjifa Card Rules'),
4950
('general_rules.html', 'PySol - General Rules'),
5051
('glossary.html', 'PySol - Glossary'),

‎html-src/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ <h2>Misc</h2>
2424
<li> <a href="news.html">What's new?</a>
2525
<li> <a href="report_bug.html">Report a Bug</a>
2626
<li> <a href="license.html">PySol license terms</a>
27+
<li> <a href="credits.html">PySol credits</a>
2728
</ul>
2829
<hr>
2930
<p> Visit the official <a href="http://pysolfc.sourceforge.net/">PySolFC Home

‎po/de_pysol.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,8 @@ msgid "&Nice"
646646
msgstr "&Nett"
647647

648648
#: pysollib/help.py:46
649-
msgid "&Credits..."
650-
msgstr "&Danksagung..."
649+
msgid "&Credits"
650+
msgstr "&Danksagung"
651651

652652
#: pysollib/help.py:48
653653
msgid "&Enjoy"
@@ -676,6 +676,7 @@ msgid ""
676676
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
677677
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
678678
"Copyright (C) 2005 - 2009 Skomoroh.\n"
679+
"Copyright (C) 2020 - 2024 PySolFC.\n"
679680
"All Rights Reserved.\n"
680681
"\n"
681682
"PySol is free software distributed under the terms\n"

‎po/fr_pysol.po

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,8 +652,8 @@ msgid "&Nice"
652652
msgstr "&Ok"
653653

654654
#: pysollib/help.py:46
655-
msgid "&Credits..."
656-
msgstr "Remer&ciements..."
655+
msgid "&Credits"
656+
msgstr "Remer&ciements"
657657

658658
#: pysollib/help.py:48
659659
msgid "&Enjoy"
@@ -682,6 +682,7 @@ msgid ""
682682
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
683683
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
684684
"Copyright (C) 2005 - 2009 Skomoroh.\n"
685+
"Copyright (C) 2020 - 2024 PySolFC.\n"
685686
"All Rights Reserved.\n"
686687
"\n"
687688
"PySol is free software distributed under the terms\n"
@@ -696,6 +697,7 @@ msgstr ""
696697
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
697698
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
698699
"Copyright (C) 2005 - 2009 Skomoroh.\n"
700+
"Copyright (C) 2020 - 2024 PySolFC.\n"
699701
"Tous droits réservés.\n"
700702
"\n"
701703
"PySol est un logiciel libre distribué sous la licence\n"

‎po/it_pysol.po

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ msgid "&Nice"
658658
msgstr "Be&ne"
659659

660660
#: pysollib/help.py:46
661-
msgid "&Credits..."
661+
msgid "&Credits"
662662
msgstr "Riconos&cimenti"
663663

664664
#: pysollib/help.py:48
@@ -688,6 +688,7 @@ msgid ""
688688
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
689689
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
690690
"Copyright (C) 2005 - 2009 Skomoroh.\n"
691+
"Copyright (C) 2020 - 2024 PySolFC.\n"
691692
"All Rights Reserved.\n"
692693
"\n"
693694
"PySol is free software distributed under the terms\n"
@@ -702,6 +703,7 @@ msgstr ""
702703
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
703704
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
704705
"Copyright (C) 2005 - 2009 Skomoroh.\n"
706+
"Copyright (C) 2020 - 2024 PySolFC.\n"
705707
"Tutti i diritti riservati.\n"
706708
"\n"
707709
"PySol è software libero distribuito alle condizioni\n"

‎po/pl_pysol.po

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,8 @@ msgid "&Nice"
650650
msgstr "Ład&nie"
651651

652652
#: pysollib/help.py:46
653-
msgid "&Credits..."
654-
msgstr "&Podziękowania..."
653+
msgid "&Credits"
654+
msgstr "&Podziękowania"
655655

656656
#: pysollib/help.py:48
657657
msgid "&Enjoy"
@@ -680,6 +680,7 @@ msgid ""
680680
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
681681
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
682682
"Copyright (C) 2005 - 2009 Skomoroh.\n"
683+
"Copyright (C) 2020 - 2024 PySolFC.\n"
683684
"All Rights Reserved.\n"
684685
"\n"
685686
"PySol is free software distributed under the terms\n"
@@ -694,6 +695,7 @@ msgstr ""
694695
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
695696
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
696697
"Copyright (C) 2005 - 2009 Skomoroh.\n"
698+
"Copyright (C) 2020 - 2024 PySolFC.\n"
697699
"All Rights Reserved.\n"
698700
"\n"
699701
"PySol jest wolnym oprogramowaniem rozprowadzanym\n"

‎po/pt_BR_pysol.po

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,8 @@ msgid "&Nice"
649649
msgstr "&Legal"
650650

651651
#: pysollib/help.py:46
652-
msgid "&Credits..."
653-
msgstr "&Créditos..."
652+
msgid "&Credits"
653+
msgstr "&Créditos"
654654

655655
#: pysollib/help.py:48
656656
msgid "&Enjoy"
@@ -679,6 +679,7 @@ msgid ""
679679
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
680680
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
681681
"Copyright (C) 2005 - 2009 Skomoroh.\n"
682+
"Copyright (C) 2020 - 2024 PySolFC.\n"
682683
"All Rights Reserved.\n"
683684
"\n"
684685
"PySol is free software distributed under the terms\n"
@@ -693,6 +694,7 @@ msgstr ""
693694
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
694695
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
695696
"Copyright (C) 2005 - 2009 Skomoroh.\n"
697+
"Copyright (C) 2020 - 2024 PySolFC.\n"
696698
"Todos os direitos reservados.\n"
697699
"\n"
698700
"PySol é um software livre distribuído sob os termos\n"

‎po/pysol.pot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ msgid "&Nice"
624624
msgstr ""
625625

626626
#: pysollib/help.py:46
627-
msgid "&Credits..."
627+
msgid "&Credits"
628628
msgstr ""
629629

630630
#: pysollib/help.py:48
@@ -654,6 +654,7 @@ msgid ""
654654
"Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
655655
"Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
656656
"Copyright (C) 2005 - 2009 Skomoroh.\n"
657+
"Copyright (C) 2020 - 2024 PySolFC.\n"
657658
"All Rights Reserved.\n"
658659
"\n"
659660
"PySol is free software distributed under the terms\n"

0 commit comments

Comments
 (0)