diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html index d4d4b709b153a7fd4a7cce3a63b0a76d1b9bf21c..f0cfc07642eb59a979a01c4afeffa249466dcb94 100644 --- a/i2p2www/pages/global/nav.html +++ b/i2p2www/pages/global/nav.html @@ -62,7 +62,7 @@ </li> </ul> </li> - <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li> + <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact and Team') }}</span></div></a></li> </ul> <li><a href="{{ site_url('get-involved/donate') }}"><div class="menuitem"><span class="donateitem">{{ _('Donate') }}</span></div></a></li> <li class="has-sub"><div class="menuitem"><span>{{ _('Community') }}</span></div> diff --git a/i2p2www/pages/site/about/intro.html b/i2p2www/pages/site/about/intro.html index f47735361c2471bbd756d994febdd0b6e3b1b2bf..a37c296a5bc82e46558b86bbc97a38d6a48a69b4 100644 --- a/i2p2www/pages/site/about/intro.html +++ b/i2p2www/pages/site/about/intro.html @@ -70,9 +70,4 @@ The following are discussed on the <a href="{{ othernetworks }}">other networks <li>Haystack</li> </ul> -<p>{% trans trac='https://trac.i2p2.de/report/1' -%} -The content of this page is subject to update, discussion and dispute, and we welcome comments and additions. -You may contribute an analysis by entering a <a href="{{ trac }}">new ticket on Trac</a>. -{%- endtrans %}</p> - {% endblock %} diff --git a/i2p2www/pages/site/contact.html b/i2p2www/pages/site/contact.html index dc991a0b75810228e0e71feaeae88cb77f09fbc8..6e4477f9c1424c06a6f3a73f7ff1d4b484933fcf 100644 --- a/i2p2www/pages/site/contact.html +++ b/i2p2www/pages/site/contact.html @@ -21,7 +21,7 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B F47E CFCD C461 75E6 694A</tt> </ul> <h2>{{ _('Forums') }}</h2> -<p>{% trans -%}Please visit our I2P user forum, which is frequented by developers/contributors too - {%- endtrans %} <a href="http://{{ i2pconv('i2pforum.i2p') }}/">{{ i2pconv('i2pforum.i2p') }}</a> ({% trans -%}available on clearnet at https://i2pforum.net and on I2P at http://i2pforum.i2p{%- endtrans %})</p> +<p>{% trans -%}Please visit our I2P user forum - {%- endtrans %} <a href="http://{{ i2pconv('i2pforum.i2p') }}/">{{ i2pconv('i2pforum.i2p') }}</a> ({% trans -%}available on clearnet at https://i2pforum.net and on I2P at http://i2pforum.i2p{%- endtrans %})</p> <p>{% trans zzz=i2pconv('zzz.i2p') -%} Most of the discussion about I2P's development happens on the <a href="http://{{ zzz }}">I2P developer forum</a> (only reachable from within I2P network). This is usually the best place to start with inquiries, if the dev IRC channel is inactive. @@ -60,6 +60,7 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B F47E CFCD C461 75E6 694A</tt> {%- endtrans %}</p> <h3>{{ _('Lists') }}</h3> +<p> <ul> <li> <a href="http://{{ i2pconv('lists.i2p') }}/postorius/lists/i2p-browser-dev.{{ i2pconv('lists.i2p') }}/">i2p-browser-dev</a> (<a href="http://{{ i2pconv('lists.i2p') }}/hyperkitty/lists/i2p-browser-dev@{{ i2pconv('lists.i2p') }}/">{{ _('Archive') }}</a>)<br/> @@ -74,9 +75,9 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B F47E CFCD C461 75E6 694A</tt> {% trans %}General I2P discussion - anything that doesn't fit in a different list goes here{% endtrans %} </li> </ul> +</p> -{%- endtrans %}</p> - +<h3>{{ _('Team') }}</h3> <table border="0"> <tr> <td valign="top" rowspan="31"><b>{{ _('Admin') }}</b></td>