propagate from branch 'i2p.www' (head 114708fc5836389206fe26e04905a1887f34a228)

to branch 'i2p.www.revamp' (head 061377e9345d8848b120576d4174d4274a2e5ca3)
This commit is contained in:
str4d
2013-05-24 02:01:41 +00:00
32 changed files with 376 additions and 100 deletions

View File

@@ -8,14 +8,10 @@ The packages hosted on <a href="https://launchpad.net/%7Ei2p-maintainers/+archiv
have been tested and <em>should </em>work on x86/x86_64 platforms running:
{%- endtrans %}
<ul>
<li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Hardy <em>8.04</em> and newer){% endtrans %}</li>
<li><a href="#ubuntu">Mint</a> <em>11</em></li>
<li>{% trans %}<a href="#debian">Debian Linux</a> (Lenny and newer) &amp; <a href="#nonlinux">kFreeBSD</a> (Wheezy){% endtrans %}</li>
<li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Precise <em>12.04</em> and newer){% endtrans %}</li>
<li><a href="#ubuntu">Mint</a></li>
<li>{% trans %}<a href="#debian">Debian Linux</a> (Wheezy and newer) &amp; <a href="#nonlinux">kFreeBSD</a>{% endtrans %}</li>
<li><a href="#debian">Knoppix</a></li>
<li><a href="#debian">Simply MEPIS</a> <em>8.5.03-rel1</em></li>
<li><a href="#ubuntu">Trisque</a>l <em>4.5.1</em></li>
<li><a href="#debian">gNewSense</a> <em>2.3</em></li>
<li><a href="#nonlinux">Nexenta</a> <em>3.0.1</em></li>
</ul>
{% trans trac=i2pconv('trac.i2p2.i2p') -%}
@@ -25,11 +21,11 @@ with these packages on <a href="http://{{ trac }}">Trac</a> at
{%- endtrans %}
<ul>
<li>{% trans %}Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<em>Try this if you're not using Debian)</em>{% endtrans %}</li>
<li>{% trans %}Option 2: <a href="#debian">Debian</a> (including systems based on Debian and older versions of Ubuntu){% endtrans %}</li>
<li>{% trans %}Option 2: <a href="#debian">Debian</a> (including Debian-derivatives){% endtrans %}</li>
<li>{% trans %}Option 3: <a href="#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures){% endtrans %}</li>
</ul>
<h2 id="ubuntu">{{ _('Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint &amp; Trisquel') }}</h2>
<h2 id="ubuntu">{{ _('Instructions for Ubuntu Precise Pangolin (and newer) and derivatives like Linux Mint &amp; Trisquel') }}</h2>
<h5>{{ _('Adding the PPA via the command line and installing I2P') }}</h5>
<ol>
<li>
@@ -76,7 +72,7 @@ was added with the earlier command.
In the Quick Filter box, type in <code>i2p</code> and press enter. When <code>i2p</code> is returned in the results list, right click <code>i2p</code> and select <em>Mark for Installation</em>. After doing so you may see a <em>Mark additional required changes?</em> popup. If so, click <em>Mark</em> then <em>Apply</em>.
{%- endtrans %}
</li>
</ol>
</ol>
{% trans -%}
After the installation process completes you can move on to the next
@@ -85,6 +81,8 @@ part of <a href="#Post-install_work">starting I2P</a> and configuring it for you
<h2 id="debian">{{ _('Instructions for Debian Lenny and newer') }}</h2>
<p>(<em>{% trans %}For Squeeze you can follow the instructions <a href="#nonlinux">here</a>.{% endtrans %}</em>)</p>
{% trans -%}
The steps below should be performed with root access (i.e., switching
user to root with "su" or by prefixing each command with "sudo").
@@ -97,13 +95,9 @@ user to root with "su" or by prefixing each command with "sudo").
&nbsp;&nbsp;&nbsp;&nbsp;<img src="{{ url_for('static', filename='images/add-key-terminal.png') }}" alt="" />
</li>
<li>
{% trans %}For Debian Oldstable (Lenny) and Stable (Squeeze): Add the following entries to <code>/etc/apt/sources.list.d/i2p.list</code>{% endtrans %}<br />
<code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main <br />
&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main </code><br />
<br />
{% trans %}For Debian Testing (Wheezy) or Unstable (Sid), use the following:{% endtrans %}<br />
<code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main <br />
&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main </code><br />
{% trans %}Add the following entries to <code>/etc/apt/sources.list.d/i2p.list</code>{% endtrans %}<br />
<code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu raring main <br />
&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu raring main </code><br />
</li>
<li>
{% trans %}Notify your package manager of the new PPA by entering{% endtrans %}<br />
@@ -131,8 +125,10 @@ user to root with "<code>su</code>" or by prefixing each command with "<code>sud
{%- endtrans %}<br />
<ol>
<li>
{% trans -%}
Download the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">i2p-router</a> package from the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">PPA</a>.
{% trans ppa='http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/',
kytv='http://'+i2pconv('killyourtv.i2p')+'/debian/' -%}
Download the <a href="{{ ppa }}">i2p-router</a> package from the <a href="{{ ppa }}">PPA</a>.
Alternatively, there are unofficial packages available <a href="{{ kytv }}">here</a> for <code>armel, armhf, and kfreebsd</code>.
{%- endtrans %}
</li>
<li>

View File

@@ -23,12 +23,12 @@ or type <tt>java -version</tt> at your command prompt.
<div class="package">
<h1>Windows</h1>
<div class="file">
<a href="{{ url_for('downloads_redirect', protocol='https', file=ver('i2pinstall_%s_windows.exe'), mirror=1) }}">i2pinstall_{{ ver() }}_windows.exe</a> (Google Code)
(<a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s_windows.exe')) }}">{{ _('select alternate link') }}</a>)
<a href="{{ url_for('downloads_redirect', protocol='https', file='i2pinstall_0.9.5-win1_windows.exe', mirror=1) }}">i2pinstall_0.9.5-win1_windows.exe</a> (Google Code)
(<a href="{{ get_url('downloads_select', file='i2pinstall_0.9.5-win1_windows.exe') }}">{{ _('select alternate link') }}</a>)
<div class="sig">
(SHA256
<code>d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e</code>
<a href="{{ url_for('downloads_redirect', protocol='https', file=ver('i2pinstall_%s_windows.exe.sig'), mirror=1) }}">sig</a>)
<code>d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8</code>
<a href="{{ url_for('downloads_redirect', protocol='https', file='i2pinstall_0.9.5-win1_windows.exe.sig', mirror=1) }}">sig</a>)
</div>
</div>
<div class="details">