Skip to content

GitLab

Commit 29229299 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/web/10544-merge-clone' (Closes: #10544) 

Conflicts:
	wiki/src/install/debian/clone.de.po
	wiki/src/install/debian/clone.fr.po
	wiki/src/install/debian/clone.pt.po
	wiki/src/install/linux/clone.de.po
	wiki/src/install/linux/clone.fr.po
	wiki/src/install/linux/clone.pt.po
	wiki/src/install/win/clone.de.po
	wiki/src/install/win/clone.fr.po
	wiki/src/install/win/clone.pt.po
parents 13d5ab61 3fce2392
Hide whitespace changes
Inline Side-by-side
wiki/src/install/win/clone.mdwn → wiki/src/install/clone.mdwn
View file @ 29229299
[[!meta robots="noindex"]]
[[!meta title="Install from another Tails"]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/windows-clone" rel="stylesheet" title=""]]
[[Back|install/win]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
......
wiki/src/install/debian.mdwn
View file @ 29229299
......@@ -15,14 +15,6 @@
[[!inline pages="install/inc/router/clone" raw="yes"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from another Tails</h3>
</div>
</div>
|install/debian/clone]]
</div>
<div class="col-md-6">
......
wiki/src/install/debian/clone.de.po deleted 100644 → 0
View file @ 13d5ab61
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-16 15:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Install from another Tails\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/debian-clone\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
msgid "[[Back|install/debian]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/switch.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/verify_up-to-date.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_second_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\"]]\n"
msgstr ""
wiki/src/install/debian/clone.fr.po deleted 100644 → 0
View file @ 13d5ab61
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-16 15:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Install from another Tails\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/debian-clone\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
msgid "[[Back|install/debian]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/switch.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/verify_up-to-date.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_second_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\"]]\n"
msgstr ""
wiki/src/install/debian/clone.mdwn deleted 100644 → 0
View file @ 13d5ab61
[[!meta robots="noindex"]]
[[!meta title="Install from another Tails"]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian-clone" rel="stylesheet" title=""]]
[[Back|install/debian]]
[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/verify_up-to-date.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
wiki/src/install/debian/clone.pt.po deleted 100644 → 0
View file @ 13d5ab61
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-16 15:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Install from another Tails\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/debian-clone\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
msgid "[[Back|install/debian]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/switch.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/verify_up-to-date.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_second_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\"]]\n"
msgstr ""
wiki/src/install/inc/router/clone.mdwn
View file @ 29229299
......@@ -10,3 +10,11 @@ Tails is up-to-date.</p>
<li>1 USB stick <small>(at least 4 GB)</small></li>
<li>15 minutes to install</li>
</ul>
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from another Tails</h3>
</div>
</div>
|install/clone]]
wiki/src/install/inc/steps/install_final.inline.mdwn
View file @ 29229299
<span class="debian windows linux mac expert">Install <span class="windows-usb linux-usb mac-usb">the final</span> Tails<span class="dvd"> on a USB stick</span></span><span class="upgrade">Upgrade your Tails</span>
======================================================================================================================================================================================================================
<span class="debian windows linux mac expert install-clone">Install <span class="windows-usb linux-usb mac-usb">the final</span> Tails<span class="dvd"> on a USB stick</span></span><span class="upgrade">Upgrade your Tails</span>
====================================================================================================================================================================================================================================
<p class="debian windows linux mac">In this step, you will install <span class="windows-usb linux-usb mac-usb">the final</span> Tails
on a <span class="windows-usb linux-usb mac-usb">second</span><span class="clone">new</span> USB stick
<p class="debian windows linux mac expert">In this step, you will install <span class="windows-usb linux-usb mac-usb">the final</span> Tails
on a <span class="windows-usb linux-usb mac-usb">second</span><span class="install-clone mac-clone">new</span> USB stick
using <span class="application">Tails Installer</span>.</p>
<p class="upgrade">In this step, you will upgrade your Tails from the other Tails using <span class="application">Tails Installer</span>.</p>
......@@ -28,7 +28,7 @@ using <span class="application">Tails Installer</span>.</p>
1. Plug the <span class="windows-usb linux-usb mac-usb">second</span><span class="clone">new</span> USB stick in the computer.
1. <div class="windows linux mac upgrade"><p>
1. <div class="windows linux mac upgrade install-clone"><p>
Choose
<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
......@@ -43,12 +43,12 @@ using <span class="application">Tails Installer</span>.</p>
</p></div>
1. Click on the
<span class="button windows linux mac">Install by cloning</span>
<span class="button windows linux mac install-clone">Install by cloning</span>
<span class="button debian expert">Install</span>
<span class="button upgrade">Upgrade by cloning</span>
button.
[[!img inc/screenshots/tails_installer_in_tails.png link=no class="windows linux mac upgrade"]]
[[!img inc/screenshots/tails_installer_in_tails.png link=no class="windows linux mac upgrade install-clone"]]
[[!img inc/screenshots/tails_installer_in_debian.png link=no class="debian expert"]]
<div class="step-image">
......@@ -58,15 +58,15 @@ using <span class="application">Tails Installer</span>.</p>
</div>
1. Use the <span class="guilabel">Target Device</span> drop-down list to
specify <span class="windows-usb linux-usb mac-usb">the second</span><span class="debian-clone windows-clone linux-clone mac-clone">the new</span><span class="upgrade-clone">your</span> USB stick.
specify <span class="windows-usb linux-usb mac-usb">the second</span><span class="install-clone mac-clone">the new</span><span class="upgrade-clone">your</span> USB stick.
1. To start the <span class="debian windows linux mac">installation</span><span class="upgrade">upgrade</span>, click on the <span
1. To start the <span class="debian windows linux mac install-clone">installation</span><span class="upgrade">upgrade</span>, click on the <span
class="button">Install Tails</span> button.
1. Read the warning message in the pop-up window. Click on the <span
class="button">Yes</span> button to confirm.
The <span class="debian windows linux mac">installation</span><span class="upgrade">upgrade</span> takes a few minutes.
The <span class="debian windows linux mac install-clone">installation</span><span class="upgrade">upgrade</span> takes a few minutes.
<div class="bug">
<p>The progress bar usually freezes for some time around 95 percent
......@@ -74,7 +74,7 @@ using <span class="application">Tails Installer</span>.</p>
</div>
<div class="state-image usb">[[!img inc/infography/final-tails.png link="no"]]</div>
<div class="state-image debian-clone windows-clone linux-clone mac-clone">[[!img inc/infography/new-tails.png link="no"]]</div>
<div class="state-image install-clone mac-clone">[[!img inc/infography/new-tails.png link="no"]]</div>
<div class="trophy upgrade">
......
wiki/src/install/inc/steps/restart_second_time.inline.mdwn
View file @ 29229299
......@@ -55,14 +55,12 @@ list on the bottom left of the screen. Click **Login**.
<p>If you want to save some documents
and configuration in an encrypted storage on the <span class="usb">second</span><span class="clone">new</span> Tails USB stick, follow
our instructions until the end. Otherwise, have a look at our
<span class="install-clone">[[final recommendations|clone#recommendations]].</span>
<span class="windows-usb">[[final recommendations|win/usb#recommendations]].</span>
<span class="windows-clone">[[final recommendations|win/clone#recommendations]].</span>
<span class="mac-usb">[[final recommendations|mac/usb#recommendations]].</span>
<span class="mac-clone">[[final recommendations|mac/clone#recommendations]].</span>
<span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span>
<span class="debian-clone">[[final recommendations|debian/clone#recommendations]].</span>
<span class="linux-usb">[[final recommendations|linux/usb#recommendations]].</span>
<span class="linux-clone">[[final recommendations|linux/clone#recommendations]].</span>
</p>
</div>
wiki/src/install/inc/steps/switch.inline.mdwn
View file @ 29229299
......@@ -8,30 +8,26 @@ the rest of the instructions afterwards, we recommend you either:
- Open this page on your smartphone, tablet, or another computer (recommended).
[[!img inc/qrcodes/tails_boum_org_install_clone.png class="clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_win_usb.png class="windows-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_win_clone.png class="windows-clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_mac_usb.png class="mac-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_mac_clone.png class="mac-clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_mac_dvd.png class="mac-dvd" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_debian_usb.png class="debian-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_debian_clone.png class="debian-clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_expert_usb.png class="expert-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_linux_clone.png class="linux-clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_upgrade_clone.png class="upgrade-clone" link="no"]]
- Print the rest of the instructions on paper.
- Take note of the URL of this page to be able to come back later:
<a class="clone" href="https://tails.boum.org/install/clone/">https://tails.boum.org/install/clone/</a>
<a class="windows-usb" href="https://tails.boum.org/install/win/usb/">https://tails.boum.org/install/win/usb/</a>
<a class="windows-clone" href="https://tails.boum.org/install/win/clone/">https://tails.boum.org/install/win/clone/</a>
<a class="mac-usb" href="https://tails.boum.org/install/mac/usb/">https://tails.boum.org/install/mac/usb/</a>
<a class="mac-clone" href="https://tails.boum.org/install/mac/clone/">https://tails.boum.org/install/mac/clone/</a>
<a class="mac-dvd" href="https://tails.boum.org/install/mac/dvd/">https://tails.boum.org/install/mac/dvd/</a>
<a class="debian-usb" href="https://tails.boum.org/install/debian/usb/">https://tails.boum.org/install/debian/usb/</a>
<a class="debian-clone" href="https://tails.boum.org/install/debian/clone/">https://tails.boum.org/install/debian/clone/</a>
<a class="expert-usb" href="https://tails.boum.org/install/expert/usb/">https://tails.boum.org/install/expert/usb/</a>
<a class="linux-usb" href="https://tails.boum.org/install/linux/usb/">https://tails.boum.org/install/linux/usb/</a>
<a class="linux-clone" href="https://tails.boum.org/install/linux/clone/">https://tails.boum.org/install/linux/clone/</a>
<a class="upgrade-clone" href="https://tails.boum.org/upgrade/clone/">https://tails.boum.org/upgrade/clone/</a>
wiki/src/install/inc/steps/verify_up-to-date.inline.mdwn
View file @ 29229299
Verify that the other Tails is up-to-date
=========================================
To prevent <span class="debian windows linux mac">installing</span><span class="upgrade">upgrading to</span> an outdated version of Tails with known security
issues, make sure that the Tails you are <span class="debian windows linux mac">installing</span><span class="upgrade">upgrading</span> from is up-to-date:
To prevent <span class="install-clone mac-clone">installing</span><span class="upgrade-clone">upgrading to</span> an outdated version of Tails with known security
issues, make sure that the Tails you are <span class="install-clone">installing</span><span class="upgrade-clone">upgrading</span> from is up-to-date:
1. Choose <span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
......@@ -22,9 +22,7 @@ issues, make sure that the Tails you are <span class="debian windows linux mac">
<div class="bug">
<p>If at some point it is impossible to automatically upgrade, then
we recommend you
<span class="windows">[[choose a different installation method|win]].</span>
<span class="debian">[[choose a different installation method|debian]].</span>
<span class="linux">[[choose a different installation method|linux]].</span>
<span class="mac">[[choose a different installation method|mac]].</span>
<span class="upgrade">[[upgrade from Tails instead|upgrade/tails]].</span>
<span class="install-clone">[[choose a different installation method|install/os]].</span>
<span class="mac-clone">[[choose a different installation method|install/mac]].</span>
<span class="upgrade-clone">[[upgrade from Tails instead|upgrade/tails]].</span>
</div>
wiki/src/install/inc/stylesheets/debian-clone.css deleted 100644 → 0
View file @ 13d5ab61
@import url("debian.css");
@import url("clone.css");
span.debian-clone, a.debian-clone {
display: inline;
}
div.debian-clone, img.debian-clone, p.debian-clone {
display: block;
}
li.debian-clone {
display: list-item;
}
wiki/src/install/inc/stylesheets/linux-clone.css → wiki/src/install/inc/stylesheets/install-clone.css
View file @ 29229299
@import url("linux.css");
@import url("clone.css");
span.linux-clone, a.linux-clone {
span.install-clone, a.install-clone {
display: inline;
}
div.linux-clone, img.linux-clone, p.linux-clone {
div.install-clone, img.install-clone, p.install-clone {
display: block;
}
li.linux-clone {
li.install-clone {
display: list-item;
}
wiki/src/install/inc/stylesheets/steps.css
View file @ 29229299
......@@ -24,11 +24,12 @@
/* Hide all scenario-dependent bits by default. */
.clone, .usb, .dvd,
.windows, .windows-clone, .windows-usb,
.install-clone,
.windows, .windows-usb,
.mac, .mac-usb, .mac-dvd, .mac-clone,
.debian, .debian-clone, .debian-usb,
.debian, .debian-usb,
.expert, .expert-usb,
.linux, .linux-clone, .linux-usb,
.linux, .linux-usb,
.upgrade, .upgrade-clone {
display: none;
}
wiki/src/install/inc/stylesheets/windows-clone.css deleted 100644 → 0
View file @ 13d5ab61
@import url("windows.css");
@import url("clone.css");
span.windows-clone, a.windows-clone {
display: inline;
}
div.windows-clone, img.windows-clone, p.windows-clone {
display: block;
}
li.windows-clone {
display: list-item;
}
wiki/src/install/linux.mdwn
View file @ 29229299
......@@ -14,14 +14,6 @@
[[!inline pages="install/inc/router/clone" raw="yes"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from another Tails</h3>
</div>
</div>
|install/linux/clone]]
</div>
<div class="col-md-6">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment