summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2015-11-03 22:36:20 +0100
committerkwadronaut <kwadronaut@leap.se>2015-11-03 22:36:20 +0100
commita52c1395105fa2e75a2ad42bd49bec72f27a2f91 (patch)
tree1dcbaf5f4cd3cf9abd6fef5e7e3addfd354a433f /public
parente9a1d558defa1323e8e915ad236923b034e16d14 (diff)
regenerate
Diffstat (limited to 'public')
-rw-r--r--public/android/index.ru.html24
-rw-r--r--public/linux/index.en.html128
-rw-r--r--public/linux/index.es.html128
-rw-r--r--public/linux/index.pt.html128
-rw-r--r--public/linux/index.ru.html25
-rw-r--r--public/signature-verification/index.ru.html66
6 files changed, 230 insertions, 269 deletions
diff --git a/public/android/index.ru.html b/public/android/index.ru.html
index a16fa28..db9dbf2 100644
--- a/public/android/index.ru.html
+++ b/public/android/index.ru.html
@@ -19,13 +19,13 @@ Android - Скачать Bitmask
<div class='bm-main container'>
<div id="TOC"><ol>
<li>
- <a href="#install-from-google-play">Install from Google Play</a>
+ <a href="#%D0%A3%D1%81%D1%82%D0%B0%D0%BD%D0%BE%D0%B2%D0%B8%D1%82%D1%8C-%D1%81-google-play">Установить с Google Play</a>
</li>
<li>
- <a href="#download-app">Download app</a>
+ <a href="#%D0%A1%D0%BA%D0%B0%D1%87%D0%B0%D1%82%D1%8C-%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5">Скачать приложение</a>
</li>
<li>
- <a href="#download-other-versions">Download other versions</a>
+ <a href="#%D0%A1%D0%BA%D0%B0%D1%87%D0%B0%D1%82%D1%8C-%D0%B4%D1%80%D1%83%D0%B3%D0%B8%D0%B5-%D0%B2%D0%B5%D1%80%D1%81%D0%B8%D0%B8">Скачать другие версии</a>
</li>
</ol></div>
@@ -38,29 +38,29 @@ Android - Скачать Bitmask
</script><p><div class='row'>
<div class='col-sm-8 col-sm-offset-2'>
<div class='p alert alert-info'>
- <b>NOTE:</b> Bitmask for Android does not yet support encrypted email.
+ <b>ПРИМЕЧАНИЕ:</b> Bitmask для Android все еще не поддерживает зашифрованную электронную почту.
</div>
</div>
</div>
</p>
-<h2><a name="install-from-google-play"></a>Install from Google Play</h2>
-<p>You can search for &#8220;Bitmask&#8221; in the Google Play store or use this link:</p>
+<h2><a name="%D0%A3%D1%81%D1%82%D0%B0%D0%BD%D0%BE%D0%B2%D0%B8%D1%82%D1%8C-%D1%81-google-play"></a>Установить с Google Play</h2>
+<p>Вы можете поискать &#8220;Bitmask&#8221; в Google Play или использовать эти ссылки:</p>
<p class="android"><a class='btn btn-primary btn-large' href='https://play.google.com/store/apps/details?id=se.leap.bitmaskclient'>
<i class='fa fa-cloud-download fa-lg'></i>
- Install for Android
+ Установить для Android
</a>
</p>
<p class="non-android"><a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient"><img src="/assets/qr/market-se.leap.bitmaskclient.png" alt="" /></a></p>
-<h2><a name="download-app"></a>Download app</h2>
-<p>Alternately, you can download the Bitmask app directly from this website. You will need to enabled the option <b>Settings &gt; Security &gt; Unknown Sources</b> on your device for this method to work.</p>
+<h2><a name="%D0%A1%D0%BA%D0%B0%D1%87%D0%B0%D1%82%D1%8C-%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5"></a>Скачать приложение</h2>
+<p>Кроме того, вы можете скачать приложение Bitmask напрямую с этого сайта. Вам нужно будет включить в настройках <b>Settings &gt; Security &gt; Unknown Sources</b> на вашем устройстве для работы этого метода.</p>
<p class="android"><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk'>
<i class='fa fa-cloud-download fa-lg'></i>
- Download for Android
+ Скачать для Android
</a>
</p>
<p class="non-android"><a href="https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk"><img src="/assets/qr/dl.bitmask.net-bitmask-android-latest.png" alt="" /></a></p>
-<h2><a name="download-other-versions"></a>Download other versions</h2>
-<p>If you want to install an old version of Bitmask, you can <a href="https://dl.bitmask.net/client/android/">browse all releases</a>.</p>
+<h2><a name="%D0%A1%D0%BA%D0%B0%D1%87%D0%B0%D1%82%D1%8C-%D0%B4%D1%80%D1%83%D0%B3%D0%B8%D0%B5-%D0%B2%D0%B5%D1%80%D1%81%D0%B8%D0%B8"></a>Скачать другие версии</h2>
+<p>Если вы хотите скачать старые версии Bitmask, вы можете <a href="https://dl.bitmask.net/client/android/">просмотреть все версии</a>.</p>
</div>
<footer>
<div>
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index 4eab0b7..19e1faa 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -19,39 +19,33 @@ Bitmask Downloads
<div class='bm-main container'>
<div id="TOC"><ol>
<li>
- <a href="#upgrading">Upgrading</a>
- </li>
- <li>
- <a href="#install-as-packages">Install as packages</a>
+ <a href="#download-stand-alone-bundle">Download stand-alone bundle</a>
<ol>
<li>
- <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a>
- </li>
- <li>
- <a href="#ubuntu-1404-lts-trusty-tahr">Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</a>
- </li>
- <li>
- <a href="#debian-70-wheezy">Debian 7.0 (Wheezy)</a>
+ <a href="#64-bit-kernel">64 bit kernel</a>
</li>
<li>
- <a href="#debian-80-jessie">Debian 8.0 (Jessie)</a>
+ <a href="#32-bit-kernel">32 bit kernel</a>
</li>
</ol>
</li>
<li>
- <a href="#install-stand-alone-bundle">Install stand-alone bundle</a>
+ <a href="#install-as-packages">Install as packages</a>
<ol>
<li>
- <a href="#32-bit-kernel">32 bit kernel</a>
+ <a href="#ubuntu-1510-wily-werewolf">Ubuntu 15.10 (Wily Werewolf)</a>
</li>
<li>
- <a href="#64-bit-kernel">64 bit kernel</a>
+ <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a>
</li>
<li>
- <a href="#other-options">Other options</a>
+ <a href="#debian-80-jessie">Debian 8.0 (Jessie)</a>
</li>
</ol>
</li>
+ <li>
+ <a href="#upgrading">Upgrading</a>
+ </li>
</ol></div>
<p><div class='row'>
@@ -62,33 +56,52 @@ Bitmask Downloads
</div>
</div>
</p>
-<h2><a name="upgrading"></a>Upgrading</h2>
-<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the &#8220;config&#8221; folder from the old bundle directory.</p>
-<p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p>
-<pre><code>apt-get update
-apt-get dist-upgrade</code></pre>
-<p><span class="caps">NOTE</span>: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p>
-<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre>
-<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p>
+<p>There are two ways to install Bitmask &#8211; via the stand-alone bundles or via packages.</p>
+<h2><a name="download-stand-alone-bundle"></a>Download stand-alone bundle</h2>
+<h3><a name="64-bit-kernel"></a>64 bit kernel</h3>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2'>
+ <i class='fa fa-cloud-download fa-lg'></i>
+ Download 64 bit
+</a>
+</p>
+<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc">Signature file</a></p>
+<h3><a name="32-bit-kernel"></a>32 bit kernel</h3>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2'>
+ <i class='fa fa-cloud-download fa-lg'></i>
+ Download 32 bit
+</a>
+</p>
+<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
+<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download<br />
+you can <a href="/en/signature-verification">authenticate the signature</a>.</p>
+<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
+<pre><code>uname -m</code></pre>
+<p>If the result is:</p>
+<ul>
+ <li><code>x86_64</code>, you have <strong>64 bit</strong></li>
+ <li><code>i686</code>, you have <strong>32 bit</strong></li>
+ <li><code>i386</code>, you have <strong>32 bit</strong></li>
+</ul>
+<p><span class="caps">NOTE</span>:<br />
+ Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
+ There are two disadvantages to the stand-alone bundle:</p>
+<ul>
+ <li>The Bitmask app will be less well integrated with the desktop environment.</li>
+ <li>Running from the bundle is slower to start than via packages.</li>
+</ul>
<h2><a name="install-as-packages"></a>Install as packages</h2>
<p>This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p>
-<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
+<h3><a name="ubuntu-1510-wily-werewolf"></a>Ubuntu 15.10 (Wily Werewolf)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
-</p>
-<h3><a name="ubuntu-1404-lts-trusty-tahr"></a>Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian trusty main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian trusty main"</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
</p>
-<h3><a name="debian-70-wheezy"></a>Debian 7.0 (Wheezy)</h3>
+<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian wheezy main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
</p>
<h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3>
<p><p class='b'>To install</p>
@@ -96,39 +109,16 @@ apt-get dist-upgrade</code></pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h2><a name="install-stand-alone-bundle"></a>Install stand-alone bundle</h2>
-<p>Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, Trisquel, etc).</p>
-<p>There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
-<p>Optionally, you can <a href="/en/signature-verification">authenticate the signature</a> for the Bitmask files before you run them.</p>
-<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
-<pre><code>uname -m</code></pre>
-<p>If the result is:</p>
-<ul>
- <li><code>x86_64</code>, you have <strong>64 bit</strong></li>
- <li><code>i686</code>, you have <strong>32 bit</strong></li>
- <li><code>i386</code>, you have <strong>32 bit</strong></li>
-</ul>
-<h3><a name="32-bit-kernel"></a>32 bit kernel</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2'>
- <i class='fa fa-cloud-download fa-lg'></i>
- Download 32 bit
-</a>
-</p>
-<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
-<h3><a name="64-bit-kernel"></a>64 bit kernel</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2'>
- <i class='fa fa-cloud-download fa-lg'></i>
- Download 64 bit
-</a>
-</p>
-<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc">Signature file</a></p>
-<h3><a name="other-options"></a>Other options</h3>
-<p>You can <a href="https://dl.bitmask.net/client/linux/">browse all releases</a> for old or experimental downloads.</p>
-<p>You should install the latest stable release. Downloads tagged with &#8220;RC&#8221; are &#8220;Release Candidates&#8221; and receive frequent experimental updates that may break the application.</p>
+<h2><a name="upgrading"></a>Upgrading</h2>
+<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the &#8220;config&#8221; folder from the old bundle directory.</p>
+<p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p>
+<pre><code>apt-get update
+apt-get dist-upgrade</code></pre>
+<p><span class="caps">NOTE</span>: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p>
+<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre>
+<p>Similar is needed for the upgrade from 15.04 to 15.10 (Wily):</p>
+<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> wily main"</code></pre>
+<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p>
</div>
<footer>
<div>
diff --git a/public/linux/index.es.html b/public/linux/index.es.html
index 19a1188..724ebda 100644
--- a/public/linux/index.es.html
+++ b/public/linux/index.es.html
@@ -19,39 +19,33 @@ Bitmask Downloads
<div class='bm-main container'>
<div id="TOC"><ol>
<li>
- <a href="#upgrading">Upgrading</a>
- </li>
- <li>
- <a href="#install-as-packages">Install as packages</a>
+ <a href="#download-stand-alone-bundle">Download stand-alone bundle</a>
<ol>
<li>
- <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a>
- </li>
- <li>
- <a href="#ubuntu-1404-lts-trusty-tahr">Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</a>
- </li>
- <li>
- <a href="#debian-70-wheezy">Debian 7.0 (Wheezy)</a>
+ <a href="#64-bit-kernel">64 bit kernel</a>
</li>
<li>
- <a href="#debian-80-jessie">Debian 8.0 (Jessie)</a>
+ <a href="#32-bit-kernel">32 bit kernel</a>
</li>
</ol>
</li>
<li>
- <a href="#install-stand-alone-bundle">Install stand-alone bundle</a>
+ <a href="#install-as-packages">Install as packages</a>
<ol>
<li>
- <a href="#32-bit-kernel">32 bit kernel</a>
+ <a href="#ubuntu-1510-wily-werewolf">Ubuntu 15.10 (Wily Werewolf)</a>
</li>
<li>
- <a href="#64-bit-kernel">64 bit kernel</a>
+ <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a>
</li>
<li>
- <a href="#other-options">Other options</a>
+ <a href="#debian-80-jessie">Debian 8.0 (Jessie)</a>
</li>
</ol>
</li>
+ <li>
+ <a href="#upgrading">Upgrading</a>
+ </li>
</ol></div>
<p><div class='row'>
@@ -62,33 +56,52 @@ Bitmask Downloads
</div>
</div>
</p>
-<h2><a name="upgrading"></a>Upgrading</h2>
-<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the &#8220;config&#8221; folder from the old bundle directory.</p>
-<p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p>
-<pre><code>apt-get update
-apt-get dist-upgrade</code></pre>
-<p><span class="caps">NOTE</span>: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p>
-<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre>
-<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p>
+<p>There are two ways to install Bitmask &#8211; via the stand-alone bundles or via packages.</p>
+<h2><a name="download-stand-alone-bundle"></a>Download stand-alone bundle</h2>
+<h3><a name="64-bit-kernel"></a>64 bit kernel</h3>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2'>
+ <i class='fa fa-cloud-download fa-lg'></i>
+ Download 64 bit
+</a>
+</p>
+<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc">Signature file</a></p>
+<h3><a name="32-bit-kernel"></a>32 bit kernel</h3>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2'>
+ <i class='fa fa-cloud-download fa-lg'></i>
+ Download 32 bit
+</a>
+</p>
+<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
+<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download<br />
+you can <a href="/es/signature-verification">authenticate the signature</a>.</p>
+<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
+<pre><code>uname -m</code></pre>
+<p>If the result is:</p>
+<ul>
+ <li><code>x86_64</code>, you have <strong>64 bit</strong></li>
+ <li><code>i686</code>, you have <strong>32 bit</strong></li>
+ <li><code>i386</code>, you have <strong>32 bit</strong></li>
+</ul>
+<p><span class="caps">NOTE</span>:<br />
+ Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
+ There are two disadvantages to the stand-alone bundle:</p>
+<ul>
+ <li>The Bitmask app will be less well integrated with the desktop environment.</li>
+ <li>Running from the bundle is slower to start than via packages.</li>
+</ul>
<h2><a name="install-as-packages"></a>Install as packages</h2>
<p>This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p>
-<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
+<h3><a name="ubuntu-1510-wily-werewolf"></a>Ubuntu 15.10 (Wily Werewolf)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
-</p>
-<h3><a name="ubuntu-1404-lts-trusty-tahr"></a>Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian trusty main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian trusty main"</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
</p>
-<h3><a name="debian-70-wheezy"></a>Debian 7.0 (Wheezy)</h3>
+<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian wheezy main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
</p>
<h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3>
<p><p class='b'>To install</p>
@@ -96,39 +109,16 @@ apt-get dist-upgrade</code></pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h2><a name="install-stand-alone-bundle"></a>Install stand-alone bundle</h2>
-<p>Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, Trisquel, etc).</p>
-<p>There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
-<p>Optionally, you can <a href="/es/signature-verification">authenticate the signature</a> for the Bitmask files before you run them.</p>
-<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
-<pre><code>uname -m</code></pre>
-<p>If the result is:</p>
-<ul>
- <li><code>x86_64</code>, you have <strong>64 bit</strong></li>
- <li><code>i686</code>, you have <strong>32 bit</strong></li>
- <li><code>i386</code>, you have <strong>32 bit</strong></li>
-</ul>
-<h3><a name="32-bit-kernel"></a>32 bit kernel</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2'>
- <i class='fa fa-cloud-download fa-lg'></i>
- Download 32 bit
-</a>
-</p>
-<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
-<h3><a name="64-bit-kernel"></a>64 bit kernel</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2'>
- <i class='fa fa-cloud-download fa-lg'></i>
- Download 64 bit
-</a>
-</p>
-<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc">Signature file</a></p>
-<h3><a name="other-options"></a>Other options</h3>
-<p>You can <a href="https://dl.bitmask.net/client/linux/">browse all releases</a> for old or experimental downloads.</p>
-<p>You should install the latest stable release. Downloads tagged with &#8220;RC&#8221; are &#8220;Release Candidates&#8221; and receive frequent experimental updates that may break the application.</p>
+<h2><a name="upgrading"></a>Upgrading</h2>
+<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the &#8220;config&#8221; folder from the old bundle directory.</p>
+<p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p>
+<pre><code>apt-get update
+apt-get dist-upgrade</code></pre>
+<p><span class="caps">NOTE</span>: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p>
+<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre>
+<p>Similar is needed for the upgrade from 15.04 to 15.10 (Wily):</p>
+<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> wily main"</code></pre>
+<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p>
</div>
<footer>
<div>
diff --git a/public/linux/index.pt.html b/public/linux/index.pt.html
index 9604d25..f22d496 100644
--- a/public/linux/index.pt.html
+++ b/public/linux/index.pt.html
@@ -19,39 +19,33 @@ Bitmask Downloads
<div class='bm-main container'>
<div id="TOC"><ol>
<li>
- <a href="#upgrading">Upgrading</a>
- </li>
- <li>
- <a href="#install-as-packages">Install as packages</a>
+ <a href="#download-stand-alone-bundle">Download stand-alone bundle</a>
<ol>
<li>
- <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a>
- </li>
- <li>
- <a href="#ubuntu-1404-lts-trusty-tahr">Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</a>
- </li>
- <li>
- <a href="#debian-70-wheezy">Debian 7.0 (Wheezy)</a>
+ <a href="#64-bit-kernel">64 bit kernel</a>
</li>
<li>
- <a href="#debian-80-jessie">Debian 8.0 (Jessie)</a>
+ <a href="#32-bit-kernel">32 bit kernel</a>
</li>
</ol>
</li>
<li>
- <a href="#install-stand-alone-bundle">Install stand-alone bundle</a>
+ <a href="#install-as-packages">Install as packages</a>
<ol>
<li>
- <a href="#32-bit-kernel">32 bit kernel</a>
+ <a href="#ubuntu-1510-wily-werewolf">Ubuntu 15.10 (Wily Werewolf)</a>
</li>
<li>
- <a href="#64-bit-kernel">64 bit kernel</a>
+ <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a>
</li>
<li>
- <a href="#other-options">Other options</a>
+ <a href="#debian-80-jessie">Debian 8.0 (Jessie)</a>
</li>
</ol>
</li>
+ <li>
+ <a href="#upgrading">Upgrading</a>
+ </li>
</ol></div>
<p><div class='row'>
@@ -62,33 +56,52 @@ Bitmask Downloads
</div>
</div>
</p>
-<h2><a name="upgrading"></a>Upgrading</h2>
-<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the &#8220;config&#8221; folder from the old bundle directory.</p>
-<p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p>
-<pre><code>apt-get update
-apt-get dist-upgrade</code></pre>
-<p><span class="caps">NOTE</span>: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p>
-<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre>
-<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p>
+<p>There are two ways to install Bitmask &#8211; via the stand-alone bundles or via packages.</p>
+<h2><a name="download-stand-alone-bundle"></a>Download stand-alone bundle</h2>
+<h3><a name="64-bit-kernel"></a>64 bit kernel</h3>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2'>
+ <i class='fa fa-cloud-download fa-lg'></i>
+ Download 64 bit
+</a>
+</p>
+<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc">Signature file</a></p>
+<h3><a name="32-bit-kernel"></a>32 bit kernel</h3>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2'>
+ <i class='fa fa-cloud-download fa-lg'></i>
+ Download 32 bit
+</a>
+</p>
+<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
+<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download<br />
+you can <a href="/pt/signature-verification">authenticate the signature</a>.</p>
+<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
+<pre><code>uname -m</code></pre>
+<p>If the result is:</p>
+<ul>
+ <li><code>x86_64</code>, you have <strong>64 bit</strong></li>
+ <li><code>i686</code>, you have <strong>32 bit</strong></li>
+ <li><code>i386</code>, you have <strong>32 bit</strong></li>
+</ul>
+<p><span class="caps">NOTE</span>:<br />
+ Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
+ There are two disadvantages to the stand-alone bundle:</p>
+<ul>
+ <li>The Bitmask app will be less well integrated with the desktop environment.</li>
+ <li>Running from the bundle is slower to start than via packages.</li>
+</ul>
<h2><a name="install-as-packages"></a>Install as packages</h2>
<p>This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p>
-<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
+<h3><a name="ubuntu-1510-wily-werewolf"></a>Ubuntu 15.10 (Wily Werewolf)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
-</p>
-<h3><a name="ubuntu-1404-lts-trusty-tahr"></a>Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian trusty main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian trusty main"</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
</p>
-<h3><a name="debian-70-wheezy"></a>Debian 7.0 (Wheezy)</h3>
+<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian wheezy main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
</p>
<h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3>
<p><p class='b'>To install</p>
@@ -96,39 +109,16 @@ apt-get dist-upgrade</code></pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h2><a name="install-stand-alone-bundle"></a>Install stand-alone bundle</h2>
-<p>Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, Trisquel, etc).</p>
-<p>There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
-<p>Optionally, you can <a href="/pt/signature-verification">authenticate the signature</a> for the Bitmask files before you run them.</p>
-<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
-<pre><code>uname -m</code></pre>
-<p>If the result is:</p>
-<ul>
- <li><code>x86_64</code>, you have <strong>64 bit</strong></li>
- <li><code>i686</code>, you have <strong>32 bit</strong></li>
- <li><code>i386</code>, you have <strong>32 bit</strong></li>
-</ul>
-<h3><a name="32-bit-kernel"></a>32 bit kernel</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2'>
- <i class='fa fa-cloud-download fa-lg'></i>
- Download 32 bit
-</a>
-</p>
-<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
-<h3><a name="64-bit-kernel"></a>64 bit kernel</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2'>
- <i class='fa fa-cloud-download fa-lg'></i>
- Download 64 bit
-</a>
-</p>
-<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc">Signature file</a></p>
-<h3><a name="other-options"></a>Other options</h3>
-<p>You can <a href="https://dl.bitmask.net/client/linux/">browse all releases</a> for old or experimental downloads.</p>
-<p>You should install the latest stable release. Downloads tagged with &#8220;RC&#8221; are &#8220;Release Candidates&#8221; and receive frequent experimental updates that may break the application.</p>
+<h2><a name="upgrading"></a>Upgrading</h2>
+<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the &#8220;config&#8221; folder from the old bundle directory.</p>
+<p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p>
+<pre><code>apt-get update
+apt-get dist-upgrade</code></pre>
+<p><span class="caps">NOTE</span>: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p>
+<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre>
+<p>Similar is needed for the upgrade from 15.04 to 15.10 (Wily):</p>
+<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> wily main"</code></pre>
+<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p>
</div>
<footer>
<div>
diff --git a/public/linux/index.ru.html b/public/linux/index.ru.html
index 2b839e5..431b381 100644
--- a/public/linux/index.ru.html
+++ b/public/linux/index.ru.html
@@ -25,13 +25,10 @@ Linux - Скачать Bitmask
<a href="#%D0%A3%D1%81%D1%82%D0%B0%D0%BD%D0%BE%D0%B2%D0%B8%D1%82%D1%8C-%D0%BA%D0%B0%D0%BA-%D0%BF%D0%B0%D0%BA%D0%B5%D1%82">Установить как пакет</a>
<ol>
<li>
- <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a>
- </li>
- <li>
- <a href="#ubuntu-1404-lts-trusty-tahr">Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</a>
+ <a href="#ubuntu-1510-wily-werewolf">Ubuntu 15.10 (Wily Werewolf)</a>
</li>
<li>
- <a href="#debian-70-wheezy">Debian 7.0 (Wheezy)</a>
+ <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a>
</li>
<li>
<a href="#debian-80-jessie">Debian 8.0 (Jessie)</a>
@@ -66,23 +63,17 @@ apt-get dist-upgrade</code></pre>
<p>Это из-за того, что процесс обновления Ubuntu вероятно закомментировал все ваши предыдущие строки с пользовательскими репозиториями в <code>/etc/apt/sources.list</code>.</p>
<h2><a name="%D0%A3%D1%81%D1%82%D0%B0%D0%BD%D0%BE%D0%B2%D0%B8%D1%82%D1%8C-%D0%BA%D0%B0%D0%BA-%D0%BF%D0%B0%D0%BA%D0%B5%D1%82"></a>Установить как пакет</h2>
<p>Это рекомендуемый способ установки Bitmask. При установке в качестве пакета Bitmask будет работать быстрее, будет лучше интегрирована с системой, а также будет постоянно обновляться.</p>
-<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
-<p><p class='b'>Для установки</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>Для удаления</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
-</p>
-<h3><a name="ubuntu-1404-lts-trusty-tahr"></a>Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</h3>
+<h3><a name="ubuntu-1510-wily-werewolf"></a>Ubuntu 15.10 (Wily Werewolf)</h3>
<p><p class='b'>Для установки</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian trusty main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>Для удаления</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian trusty main"</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
</p>
-<h3><a name="debian-70-wheezy"></a>Debian 7.0 (Wheezy)</h3>
+<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
<p><p class='b'>Для установки</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian wheezy main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>Для удаления</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
</p>
<h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3>
<p><p class='b'>Для установки</p>
diff --git a/public/signature-verification/index.ru.html b/public/signature-verification/index.ru.html
index c15d154..8a6a2d4 100644
--- a/public/signature-verification/index.ru.html
+++ b/public/signature-verification/index.ru.html
@@ -2,7 +2,7 @@
<html lang='ru'>
<head>
<title>
-Signature Verification - Скачать Bitmask
+Проверка подписи - Скачать Bitmask
</title>
<meta content='width=device-width, initial-scale=1.0' name='viewport'>
<meta charset='utf-8'>
@@ -19,73 +19,73 @@ Signature Verification - Скачать Bitmask
<div class='bm-main container'>
<div id="TOC"><ol>
<li>
- <a href="#import-leaps-key">Import LEAP’s key</a>
+ <a href="#%D0%98%D0%BC%D0%BF%D0%BE%D1%80%D1%82%D0%B8%D1%80%D0%BE%D0%B2%D0%B0%D1%82%D1%8C-%D0%BA%D0%BB%D1%8E%D1%87-leap">Импортировать ключ <span class="caps">LEAP</span></a>
<ol>
<li>
- <a href="#option-1-wget">Option 1 – wget</a>
+ <a href="#%D0%A1%D0%BF%D0%BE%D1%81%D0%BE%D0%B1-1-wget">Способ 1 – wget</a>
</li>
<li>
- <a href="#option-2-search-keyservers">Option 2 – search keyservers</a>
+ <a href="#%D0%A1%D0%BF%D0%BE%D1%81%D0%BE%D0%B1-2-%D0%BD%D0%B0%D0%B9%D1%82%D0%B8-%D1%81%D0%B5%D1%80%D0%B2%D0%B5%D1%80-%D0%BA%D0%BB%D1%8E%D1%87%D0%B5%D0%B9">Способ 2 – найти сервер ключей</a>
</li>
</ol>
</li>
<li>
- <a href="#download-signature-file">Download signature file</a>
+ <a href="#%D0%A1%D0%BA%D0%B0%D1%87%D0%B0%D1%82%D1%8C-%D1%84%D0%B0%D0%B9%D0%BB-%D0%BF%D0%BE%D0%B4%D0%BF%D0%B8%D1%81%D0%B8">Скачать файл подписи</a>
</li>
<li>
- <a href="#verify-signature">Verify signature</a>
+ <a href="#%D0%9F%D1%80%D0%BE%D0%B2%D0%B5%D1%80%D0%B8%D1%82%D1%8C-%D0%BF%D0%BE%D0%B4%D0%BF%D0%B8%D1%81%D1%8C">Проверить подпись</a>
</li>
</ol></div>
-<p>Many of the files available for download from this site have been signed. This page will walk you through what you need to do in order to verify these signatures. This process is entirely optional.</p>
-<h2><a name="import-leaps-key"></a>Import LEAP’s key</h2>
-<p>All the files have been signed with the &#8220;<span class="caps">LEAP</span> archive signing key&#8221;. The first step is to import this key into your local keyring. These instructions will use <code>gpg</code>, a free implementation of OpenPGP that works on Mac, Windows, and Linux.</p>
-<h3><a name="option-1-wget"></a>Option 1 – wget</h3>
-<p>The easiest way to get the <span class="caps">LEAP</span> archive signing key is to just download it from the bitmask.net website and import into your keyring:</p>
+<p>Многие файлы, доступные для скачивания с этого сайта, были подписаны. Эта страница даст вам подробное разъяснение того, что вам нужно сделать, чтобы проверить эти подписи. Этот процесс полностью на ваше усмотрение.</p>
+<h2><a name="%D0%98%D0%BC%D0%BF%D0%BE%D1%80%D1%82%D0%B8%D1%80%D0%BE%D0%B2%D0%B0%D1%82%D1%8C-%D0%BA%D0%BB%D1%8E%D1%87-leap"></a>Импортировать ключ <span class="caps">LEAP</span></h2>
+<p>Все файлы были подписаны &#8220;ключом подписи архива <span class="caps">LEAP</span>&#8221;. Первый шаг заключается в импортировании этого ключа в ваше локальное хранилище ключей. Эти инструкции будут использовать <code>gpg</code>, свободную реализацию OpenPGP, которая работает на Mac, Windows и Linux.</p>
+<h3><a name="%D0%A1%D0%BF%D0%BE%D1%81%D0%BE%D0%B1-1-wget"></a>Способ 1 – wget</h3>
+<p>Самый простой способ получить ключ подписи архива <span class="caps">LEAP</span> &#8211; это просто скачать его с сайта bitmask.net и импортировать в ваше хранилище ключей:</p>
<pre><code>wget -O- <a href="https://dl.bitmask.net/apt.key">dl.bitmask.net/apt.key</a> | gpg --import</code></pre>
-<p>You should see output that looks like this:</p>
+<p>Вы должны увидеть результат выполнения, который будет выглядеть следующим образом:</p>
<pre><code>gpg: key 0x1E34A1828E207901: public key "LEAP archive signing key &lt;<a href="mailto:sysdev&#064leap&#046;se">sysdev&#064leap&#046;se</a>&gt;" imported
gpg: Total number processed: 1
gpg: imported: 1 (RSA: 1)
gpg: 3 marginal(s) needed, 1 complete(s) needed, classic trust model
gpg: depth: 0 valid: 4 signed: 7 trust: 0-, 0q, 0n, 0m, 0f, 4u
gpg: depth: 1 valid: 7 signed: 22 trust: 6-, 1q, 0n, 0m, 0f, 0u</code></pre>
-<h3><a name="option-2-search-keyservers"></a>Option 2 – search keyservers</h3>
-<p>Alternately, you can import the <span class="caps">LEAP</span> archive signing key by fetching from a keyserver:</p>
+<h3><a name="%D0%A1%D0%BF%D0%BE%D1%81%D0%BE%D0%B1-2-%D0%BD%D0%B0%D0%B9%D1%82%D0%B8-%D1%81%D0%B5%D1%80%D0%B2%D0%B5%D1%80-%D0%BA%D0%BB%D1%8E%D1%87%D0%B5%D0%B9"></a>Способ 2 – найти сервер ключей</h3>
+<p>Кроме того, вы можете импортировать ключ подписи архива <span class="caps">LEAP</span>, получив его с сервера ключей:</p>
<pre><code>gpg --recv-key 1E453B2CE87BEE2F7DFE99661E34A1828E207901</code></pre>
-<p>If you want to make the keyserver connection use <span class="caps">TLS</span>, you can use the sks-keyserver pool. To use this keyserver pool, you will need to <a href="https://sks-keyservers.net/sks-keyservers.netCA.pem">download the sks-keyservers.net CA</a> and save it somewhere on your machine. Additionally, you can <a href="https://sks-keyservers.net/verify_tls.php">verify the certificate’s finger print</a>.</p>
-<p>Once you have downloaded the <span class="caps">SKS</span> keyserver pool CA, the <code>recv-key</code> command looks like this:</p>
+<p>Если вы хотите соединиться с сервером ключей используя <span class="caps">TLS</span>, вы можете использовать пул синхронизирующего сервера ключей. Чтобы использовать этот пул сервера ключей, вам нужно скачать сертификат центра сертификации <a href="https://sks-keyservers.net/sks-keyservers.netCA.pem">sks-keyservers.net</a> и сохранить его где-нибудь на вашем компьютере. Дополнительно вы можете <a href="https://sks-keyservers.net/verify_tls.php">проверить отпечаток сертификата</a>.</p>
+<p>После того как вы скачали сертификат пула синхронизирующего сервера ключей, команда <code>recv-key</code> выглядит следующим образом:</p>
<pre><code>gpg --keyserver hkps://pool.sks-keyservers.net --keyserver-options 'ca-cert-file=sks-keyservers.netCA.pem' --recv-key 1E453B2CE87BEE2F7DFE99661E34A1828E207901</code></pre>
-<p>Assuming you saved the CA certificate to the file <code>sks-keyservers.netCA.pem</code>. For more information, see this <a href="https://help.riseup.net/en/gpg-best-practices">OpenPGP best practices page</a>.</p>
-<p>There is absolutely no guarentee that the key just imported with <code>recv-key</code> is the one you just requested. To confirm, you need to manually check the fingerprint:</p>
+<p>Предположим, что вы сохранили сертификат в файл <code>sks-keyservers.netCA.pem</code>. Для получения более подробной информации смотрите эту <a href="https://help.riseup.net/en/gpg-best-practices">страницу лучших практик по работе с OpenPGP</a>.</p>
+<p>Нет абсолютно никаких гарантий того, что ключ, только что импортированный с <code>recv-key</code>, является именно тем, который вы только что запросили. Чтобы это подтвердить, что вам нужно вручную проверить отпечаток:</p>
<pre><code>gpg --fingerprint 1E453B2CE87BEE2F7DFE99661E34A1828E207901</code></pre>
-<p>Which should produce output like so:</p>
+<p>Результат выполнения должен быть таким:</p>
<pre><code>pub 4096R/0x1E34A1828E207901 2013-02-06 [expires: 2015-02-07]
Key fingerprint = 1E45 3B2C E87B EE2F 7DFE 9966 1E34 A182 8E20 7901
uid [ undef ] LEAP archive signing key &lt;<a href="mailto:sysdev&#064leap&#046;se">sysdev&#064leap&#046;se</a>&gt;</code></pre>
-<h2><a name="download-signature-file"></a>Download signature file</h2>
-<p>The signature file for each download has the same name as the file but with <code>.asc</code> appended.</p>
-<p>For a listing of the available signature files, see:</p>
+<h2><a name="%D0%A1%D0%BA%D0%B0%D1%87%D0%B0%D1%82%D1%8C-%D1%84%D0%B0%D0%B9%D0%BB-%D0%BF%D0%BE%D0%B4%D0%BF%D0%B8%D1%81%D0%B8"></a>Скачать файл подписи</h2>
+<p>Файл подписи для каждого скачанного файла имеет то же имя, что и сам файл, но с добавленным <code>.asc</code>.</p>
+<p>Для просмотра доступных файлов сигнатур, смотрите:</p>
<ul>
- <li><a href="https://dl.bitmask.net/client/android/">All Android files</a></li>
- <li><a href="https://dl.bitmask.net/client/linux/">All Linux files</a></li>
- <li><a href="https://dl.bitmask.net/client/mac/">All Mac files</a></li>
- <li><a href="https://dl.bitmask.net/client/windows/">All Windows files</a></li>
+ <li><a href="https://dl.bitmask.net/client/android/">Все файлы для Android</a></li>
+ <li><a href="https://dl.bitmask.net/client/linux/">Все файлы для Linux</a></li>
+ <li><a href="https://dl.bitmask.net/client/mac/">Все файлы для ac</a></li>
+ <li><a href="https://dl.bitmask.net/client/windows/">Все файлы для Windows</a></li>
</ul>
-<p>Make sure you put the signature file and the download you want to authenticate in the same directory, and that they have the same name (other than the .asc suffix for the signature file).</p>
-<h2><a name="verify-signature"></a>Verify signature</h2>
-<p>Now, just run this command:</p>
+<p>Убедитесь, что вы поместили файл подписи и скачанный файл, который вы хотите аутентифицировать, в одну папку, и что они имеют одинаковое имя (кроме суффикса .asc для файла подписи).</p>
+<h2><a name="%D0%9F%D1%80%D0%BE%D0%B2%D0%B5%D1%80%D0%B8%D1%82%D1%8C-%D0%BF%D0%BE%D0%B4%D0%BF%D0%B8%D1%81%D1%8C"></a>Проверить подпись</h2>
+<p>Теперь просто выполните эту команду:</p>
<pre><code>gpg --verify FILE.asc</code></pre>
-<p>Where <span class="caps">FILE</span> is the name of the download you want to authenticate.</p>
-<p>You should see some output like so:</p>
+<p>Где <span class="caps">FILE</span> &#8211; это имя скачанного файла, который вы хотите аутентифицировать.</p>
+<p>Вы должны увидеть такой результат выполнения:</p>
<pre><code>gpg: Signature made Mon 15 Sep 2014 07:49:07 AM PDT
gpg: using RSA key 0x1E34A1828E207901
gpg: Good signature from "LEAP archive signing key &lt;<a href="mailto:sysdev&#064leap&#046;se">sysdev&#064leap&#046;se</a>&gt;" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 1E45 3B2C E87B EE2F 7DFE 9966 1E34 A182 8E20 7901</code></pre>
-<p>If you have trusted one of the keys that has signed the <span class="caps">LEAP</span> key, then you will not see the warning.</p>
-<p>If you do not see the text <code>Good signature from "LEAP archive signing key &lt;<a href="mailto:sysdev&#064leap&#046;se">sysdev&#064leap&#046;se</a>&gt;"</code> then something is wrong and you should not run the application you downloaded.</p>
+<p>Если вы доверились одному из ключей, который подписал ключ <span class="caps">LEAP</span>, то вы не увидите предупреждение.</p>
+<p>Если вы не видите текст <code>Good signature from "LEAP archive signing key &lt;<a href="mailto:sysdev&#064leap&#046;se">sysdev&#064leap&#046;se</a>&gt;"</code>, то что-то не так, и вы не должны запускать загруженное приложение.</p>
</div>
<footer>
<div>