Merge pulls #918 & #924

- 918: About-Us: History, Staff Updates, & Signed Commits
- 924: Add Wladimir's Releases Key
This commit is contained in:
David A. Harding 2015-06-29 09:53:53 -04:00
commit 930355a41a
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
10 changed files with 139 additions and 16 deletions

View file

@ -11,6 +11,13 @@ id: about-us
<h2 id="own">{% translate own %}</h2>
<p>{% translate owntxt %}</p>
{% case page.lang %}
{% when 'id' or 'da' or 'de' or 'es' or 'fr' or 'it' or 'hu' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'sl' or 'sv' or 'tr' or 'el' or 'bg' or 'ru' or 'uk' or 'ar' or 'fa' or 'hi' or 'ko' or 'ja' or 'zh_CN' or 'zh_TW' %}
{% else %}
<p>{% translate owntxt2 %}</p>
<p>{% translate owntxt3 %}</p>
<p>{% translate owntxt4 %}</p>
{% endcase %}
<h2 id="control">{% translate control %}</h2>
<p>{% translate controltxt %}</p>
@ -32,14 +39,15 @@ id: about-us
<h3 id="maintenance">{% translate maintenance %}</h3>
<div class="credit">
<p><a href="https://github.com/saivann/">Saïvann Carignan</a><span>Website maintenance<br>Translation coordination</span></p>
<p><a href="https://github.com/harding">David A. Harding</a><span>Website maintenance<br>Volunteer coordination<br>Documentation writing</span></p>
<p><a href="https://github.com/crwatkins">Craig Watkins</a><span>Wallet reviews</span></p>
<p><a href="https://github.com/saivann/">Saïvann Carignan</a><span>Website maintainer</span></p>
<p><a href="https://github.com/harding">David A. Harding</a><span>Documentation maintainer</span></p>
<p><a href="https://github.com/crwatkins">Craig Watkins</a><span>Wallet maintainer</span></p>
</div>
<h3 id="translation">{% translate translation %}</h3>
<div class="credit">
<p><a href="https://github.com/coderwill">Will Binns</a><span>Translation coordination</span></p>
<p>Ar Vicco<span>Russian</span></p>
<p>Simon Alexander Hinterreiter<span>German</span></p>
<p>Jacob Burenstam<span>Swedish</span></p>
@ -54,10 +62,16 @@ id: about-us
<h3 id="inactive-contributors">{% translate inactive_contributors %}</h3>
<div class="credit">
<p>Garland William Binns III<span>Translation maintenance</span></p>
<p>Greg Sanders<span>Documentation Writing</span></p>
</div>
<h3 id="owners">{% translate owners %} — {% translate partial_list %}</h3>
<div class="credit">
<p>Martti Malmi<span>(AKA Sirius)<br>Inactive</span></p>
<p><a href="https://github.com/theymos">Michael Marquardt</a><span>(AKA Theymos)</span></p>
</div>
<h3 id="github">{% translate github %}</h3>
<div class="contributors">

View file

@ -76,13 +76,20 @@ lin64: "linux64.tar.gz"
</span>
</div>
</div>
<p>
<p class="downloadmore">
<a href="{{ PATH_PREFIX }}/SHA256SUMS.asc" class="dl">{% translate downloadsig %}</a><br>
<a href="{{ PATH_PREFIX }}/{{ FILE_PREFIX }}.torrent" class="dl">{% translate downloadtorrent %}</a>
{% if site.DOWNLOAD_MAGNETLINK %} <a href="{{ site.DOWNLOAD_MAGNETLINK | replace: '&', '\&amp;'}}" class="magnetlink" data-proofer-ignore></a>{% endif %}<br>
<a href="/en/version-history">{% translate versionhistory %}</a>
</p>
<p class="downloadkeys">
<span>{% translate releasekeys %}</span>
<a href="/gavinandresen.asc">v0.8.6 - 0.9.2.1</a>
<a href="/laanwj.asc">v0.9.3 - 0.10.2</a>
<a href="/laanwj-releases.asc">v0.11.0+</a>
</p>
</div>
<h2><img src="/img/icons/note.svg" class="warningicon" alt="note">{% translate patient %}</h2>
<p>{% translate notesync %} {% translate full_node_guide %}</p>
<p>{% translate notelicense %}</p>