summaryrefslogtreecommitdiff
path: root/pages/install
diff options
context:
space:
mode:
Diffstat (limited to 'pages/install')
-rw-r--r--pages/install/linux/_via_packages.html.haml12
-rw-r--r--pages/install/linux/en.text8
-rw-r--r--pages/install/linux/ru.text8
3 files changed, 12 insertions, 16 deletions
diff --git a/pages/install/linux/_via_packages.html.haml b/pages/install/linux/_via_packages.html.haml
index d55927b..6a1c471 100644
--- a/pages/install/linux/_via_packages.html.haml
+++ b/pages/install/linux/_via_packages.html.haml
@@ -1,7 +1,6 @@
- if @locals[:os] == 'debian'
- %p.b
- #{@locals[:install]}
+ %p.b= t :to_install
%pre
:preserve
@@ -11,8 +10,7 @@
apt-get update
apt-get install bitmask leap-keyring
- %p.b
- #{@locals[:remove]}
+ %p.b= t :to_remove
%pre
:preserve
@@ -23,8 +21,7 @@
- else
- %p.b
- #{@locals[:install]}
+ %p.b= t :to_install
%pre
:preserve
@@ -34,8 +31,7 @@
apt-get update
apt-get install bitmask leap-keyring
- %p.b
- #{@locals[:remove]}
+ %p.b= t :to_remove
%pre
:preserve
diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text
index 050ffa2..482df21 100644
--- a/pages/install/linux/en.text
+++ b/pages/install/linux/en.text
@@ -24,19 +24,19 @@ This is the recommended method of installing Bitmask. If installed as a package,
h3. Ubuntu 15.04 (Vivid Vervet)
-<%= render({:partial => 'via_packages'}, {:distro => 'vivid', :install => 'To install', :remove => 'To remove'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %>
h3. Ubuntu 14.04 LTS (Trusty Tahr)
-<%= render({:partial => 'via_packages'}, {:distro => 'trusty', :install => 'To install', :remove => 'To remove'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %>
h3. Debian 7.0 (Wheezy)
-<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian', :install => 'To install', :remove => 'To remove'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %>
h3. Debian 8.0 (Jessie)
-<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian', :install => 'To install', :remove => 'To remove'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %>
h2. Install stand-alone bundle
diff --git a/pages/install/linux/ru.text b/pages/install/linux/ru.text
index 2a6acdb..d27ab91 100644
--- a/pages/install/linux/ru.text
+++ b/pages/install/linux/ru.text
@@ -24,19 +24,19 @@ h2. Установить как пакет
h3. Ubuntu 15.04 (Vivid Vervet)
-<%= render({:partial => 'via_packages'}, {:distro => 'vivid', :install => 'Для установки', :remove => 'Для удаления'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %>
h3. Ubuntu 14.04 LTS (Trusty Tahr)
-<%= render({:partial => 'via_packages'}, {:distro => 'trusty', :install => 'Для установки', :remove => 'Для удаления'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %>
h3. Debian 7.0 (Wheezy)
-<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian', :install => 'Для установки', :remove => 'Для удаления'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %>
h3. Debian 8.0 (Jessie)
-<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian', :install => 'Для установки', :remove => 'Для удаления'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %>
h2. Установить из архива