summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-02-11 22:35:20 +0100
committerTails developers <amnesia@boum.org>2015-02-11 22:35:20 +0100
commit149aab32fb869bdca06ba3293371f3643ba0a4a2 (patch)
tree1ce4161a20ed1e4531794910d093301a9b8ec3d3
parentbfa1657de4788baf7a10be75d575e28e2038c0bc (diff)
parent0d6c10c4a19e73f322bba208d8d669ffa908d616 (diff)
Merge remote-tracking branch 'origin/devel' into testing
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-virt-notify-user2
-rw-r--r--po/fr.po4
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool.mdwn4
-rw-r--r--wiki/src/blueprint/bootstrapping.mdwn131
-rw-r--r--wiki/src/blueprint/bootstrapping/2014.fodg (renamed from wiki/src/blueprint/bootstrapping_workflow/2014.fodg)0
-rw-r--r--wiki/src/blueprint/bootstrapping/2015-compare-proposals.ods (renamed from wiki/src/blueprint/bootstrapping_workflow/2015-compare-proposals.ods)bin13113 -> 13113 bytes
-rw-r--r--wiki/src/blueprint/bootstrapping/2015.fodg (renamed from wiki/src/blueprint/bootstrapping_workflow/2015.fodg)676
-rw-r--r--wiki/src/blueprint/bootstrapping/booting.mdwn (renamed from wiki/src/blueprint/bootstrapping_workflow/booting.mdwn)0
-rw-r--r--wiki/src/blueprint/bootstrapping/extension.mdwn (renamed from wiki/src/blueprint/download_extension.mdwn)19
-rw-r--r--wiki/src/blueprint/bootstrapping/installer.mdwn72
-rw-r--r--wiki/src/blueprint/bootstrapping/iso_verification_automation_proposals.ods (renamed from wiki/src/blueprint/bootstrapping_workflow/iso_verification_automation_proposals.ods)bin19961 -> 19961 bytes
-rw-r--r--wiki/src/blueprint/bootstrapping/tools.fodg (renamed from wiki/src/blueprint/bootstrapping_workflow/tools.fodg)30
-rw-r--r--wiki/src/blueprint/bootstrapping/tools.pngbin0 -> 67954 bytes
-rw-r--r--wiki/src/blueprint/bootstrapping/upgrade.mdwn60
-rw-r--r--wiki/src/blueprint/bootstrapping/upgrade/scenarios.pngbin0 -> 22727 bytes
-rw-r--r--wiki/src/blueprint/bootstrapping/upgrade/scenarios.svg297
-rw-r--r--wiki/src/blueprint/bootstrapping/verification.mdwn98
-rw-r--r--wiki/src/blueprint/bootstrapping/verification_tools.png (renamed from wiki/src/blueprint/bootstrapping_workflow/verification_tools.png)bin41075 -> 41075 bytes
-rw-r--r--wiki/src/blueprint/bootstrapping_workflow.mdwn470
-rw-r--r--wiki/src/blueprint/bootstrapping_workflow/tools.pngbin68337 -> 0 bytes
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn6
-rw-r--r--wiki/src/blueprint/replace_Pidgin.mdwn23
-rw-r--r--wiki/src/blueprint/sandbox_the_web_browser.mdwn217
-rw-r--r--wiki/src/contribute/build.mdwn2
-rw-r--r--wiki/src/contribute/calendar.mdwn14
-rw-r--r--wiki/src/contribute/design/Time_syncing.mdwn2
-rw-r--r--wiki/src/contribute/how/documentation.mdwn8
-rw-r--r--wiki/src/contribute/how/documentation/guidelines.mdwn6
-rw-r--r--wiki/src/contribute/how/translate/with_Git.mdwn2
-rw-r--r--wiki/src/contribute/meetings/201502.mdwn33
-rw-r--r--wiki/src/contribute/working_together/roles/sysadmins.mdwn2
-rw-r--r--wiki/src/doc.de.po19
-rw-r--r--wiki/src/doc.fr.po19
-rw-r--r--wiki/src/doc.mdwn7
-rw-r--r--wiki/src/doc.pt.po27
-rw-r--r--wiki/src/doc/advanced_topics.index.de.po15
-rw-r--r--wiki/src/doc/advanced_topics.index.fr.po26
-rw-r--r--wiki/src/doc/advanced_topics.index.mdwn3
-rw-r--r--wiki/src/doc/advanced_topics.index.pt.po26
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.caution.de.po35
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.caution.fr.po35
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.caution.mdwn7
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.caution.pt.po35
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.de.po205
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.fr.po359
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.mdwn146
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.pt.po205
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/boxes.de.po157
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/boxes.fr.po157
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/boxes.mdwn60
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/boxes.pt.po157
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tails-in-jessie.pngbin0 -> 87581 bytes
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tails_within_windows.de.po49
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tails_within_windows.fr.po49
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tails_within_windows.mdwn20
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tails_within_windows.pt.po52
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tips.de.po81
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tips.fr.po81
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tips.mdwn38
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/tips.pt.po82
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virt-manager.de.po347
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po347
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virt-manager.mdwn195
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virt-manager.pt.po347
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po239
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po239
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn114
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po239
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po91
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po91
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn48
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po91
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po29
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po50
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn10
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po49
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/help-browser.pngbin0 -> 5073 bytes
-rw-r--r--wiki/src/doc/first_steps/persistence.de.po58
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.de.po13
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fr.po11
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.mdwn3
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.pt.po11
-rw-r--r--wiki/src/download.de.po38
-rw-r--r--wiki/src/local.css8
-rw-r--r--wiki/src/support/known_issues.de.po22
-rw-r--r--wiki/src/support/known_issues.fr.po74
-rw-r--r--wiki/src/support/known_issues.mdwn12
-rw-r--r--wiki/src/support/known_issues.pt.po33
88 files changed, 5323 insertions, 1816 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
index 32f4fc7..ef61683 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
+++ b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
@@ -54,7 +54,7 @@ my $summary = gettext("Warning: virtual machine detected!");
my $body =
gettext("Both the host operating system and the virtualization software are able to monitor what you are doing in Tails.")
. " "
- . gettext("<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn more...</a>")
+ . gettext("<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn more...</a>")
. " "; # Workaround: else the last line of the notification is not displayed
$notify->create(summary => $summary,
diff --git a/po/fr.po b/po/fr.po
index d3ce1de..202ed1e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -433,10 +433,10 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-"virtualization.en.html'>Learn more...</a>"
+"virtualization.en.html#security'>Learn more...</a>"
msgstr ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
-"virtualization.fr.html'>En savoir plus...</a>"
+"virtualization.fr.html#security'>En savoir plus...</a>"
#: config/chroot_local-includes/usr/local/bin/tor-browser:18
msgid "Tor is not ready"
diff --git a/wiki/src/blueprint/HTTP_mirror_pool.mdwn b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
index 0ec3c69..d242e5e 100644
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
@@ -123,7 +123,9 @@ There is a few drawbacks on this approach:
unavailable (down, blocked...), downloads will be blocked (but in this
case the site will be too).
* It would require to develop the script or to install one such as
- mirrorbrain.
+ mirrorbrain (which is feature-full, available as [3rd party Debian
+ packages](http://download.opensuse.org/repositories/Apache:/MirrorBrain/),
+ and requires PostgreSQL).
On the other side it has a few advantage:
diff --git a/wiki/src/blueprint/bootstrapping.mdwn b/wiki/src/blueprint/bootstrapping.mdwn
new file mode 100644
index 0000000..f3d16a3
--- /dev/null
+++ b/wiki/src/blueprint/bootstrapping.mdwn
@@ -0,0 +1,131 @@
+[[!meta title="Bootstrapping workflow"]]
+
+This blueprint analyses and proposes simplifications to the workflow of
+a new user discovering Tails until she gets a full-featured Tails USB
+stick with persistence.
+
+Big logical steps are:
+
+ - Learn what Tails is
+ - Download the ISO
+ - Verify the ISO
+ - Install medium (might require going through a bootstrapping medium)
+ - Create persistence
+
+Subpages
+========
+
+Check the following subpages to see the improvements that we proposed in
+different area of that process:
+
+ - [[ISO verification|verification]]
+ - [[Browser extension|extension]]
+ - [[Tails Installer|installer]]
+ - [[Booting|booting]]
+ - [[Upgrades|upgrade]]
+
+Table of content
+================
+
+[[!toc levels=3]]
+
+2014
+====
+
+[[Diagram of the detailed workflow as of December 2014|2014.fodg]]
+
+2015
+====
+
+Over 2015 we will work on several improvements to simplify greatly this
+workflow:
+
+ - Tails Installer in Debian
+ - [[Browser extensions|download_extension]] for automatic verification of the ISO
+ - [[Web assistant|web_assistant]] to guide the user throughout this process
+
+[[Diagram of the detailed workflow as of December 2015|2015.fodg]] (work in progress)
+
+<a id="tools"></a>
+
+Involved tools
+--------------
+
+[[!img tools.png link=tools.fodg]]
+
+Notes:
+
+- **Debian Hacker** corresponds to a path on the command line only. This
+ main benefit is to go through the **Debian keyring** verification.
+- **Debian** is a path for Debian derivatives where Tails Installer is
+ available. That should be the case of Ubuntu starting from 15.10, and
+ Debian Stretch unless we backport it for Jessie ([[!tails_ticket 8805]]).
+- **Other OS** is Windows, Mac OS X, Fedora, etc.
+- **Debian keyring** are command line instructions for verifying the
+ Tails signing key against the Debian keyring.
+- **Extension from Debian** takes for granted that the ISO verification
+ extension will be available in Debian ([[!tails_ticket 8822]]. That
+ might not be the case and then people would fallback on "Extension
+ from browser".
+- **GNOME Disks** now has a "Restore Disk Image" feature which should do the
+ trick and is widely available, see [[!tails_ticket 8664]].
+- **UUI** has been our canonical installer for years, but we should also test
+ **Rufus**, see [[!tails_ticket 7034]].
+- **DiskUtils** should be tested on Mac, see [[!tails_ticket 8802]].
+
+Use cases
+=========
+
+This is a brainstorming on the different use cases dealing with
+downloading, verifying, installing, and upgrading Tails.
+This list should be useful to check whether all scenarios are covered.
+The comments, placed after ':' correspond to our rough objectives for
+2015.
+
+- Download
+ - HTTP
+ - Successful: 15 to 60 minutes
+ - Failed: ?
+ - Corrupted: ?
+ - Torrent
+ - Corrupted: ?
+ - Nightly
+- Verify
+ - Checksum
+ - Firefox: extension, what's up with Torrents?
+ - Chrome: extension? [[!tails_ticket 8803]], [[!tails_ticket 8531]]
+ - Other browsers:
+ - Windows: fallback on OpenPGP?
+ - Mac: fallback on OpenPGP?
+ - Linux: fallback on OpenPGP?
+ - OpenPGP
+ - GNOME: seahorse-nautilus
+ - Other Linux: command line
+ - Windows: Gpg4Win
+ - Mac: GPGTools [[!tails_ticket 8807]]
+- Install
+ - DVD
+ - USB
+ - Tails: friend + Tails Installer
+ - Debian
+ - Jessie: Tails Installer backport? [[!tails_ticket 8005]]
+ - Stretch: Tails Installer [[!tails_ticket 8549]]
+ - Ubuntu
+ - Latest LTS, 14.04: Tails Installer? [[!tails_ticket 8806]]
+ - Latest, 15.04: Tails Installer? [[!tails_ticket 8806]]
+ - Next LTS, 16.04: Tails Installer? [[!tails_ticket 8806]]
+ - Next, 15.10: Tails Installer? [[!tails_ticket 8806]]
+ - Windows: UUI
+ - Mac OS X: command line or new graphical tool? [[!tails_ticket 8802]]
+ - Virtualization: VirtualBox, GNOME Boxes, virt-manager
+- Upgrade from ISO (full upgrade or nightly)
+ - Full upgrade
+ - From Debian, Ubuntu if available
+ - From Tails otherwise: need bootstrapping device
+ - Incremental upgrade
+ - Virtualization: virt-manager
+- Misc
+ - Newsletter
+ - Donation: [[!tails_ticket 7176]]?
+ - Backups: [[!tails_ticket 8812]]?
+ - Signing key revocation or change
diff --git a/wiki/src/blueprint/bootstrapping_workflow/2014.fodg b/wiki/src/blueprint/bootstrapping/2014.fodg
index f27aaed..f27aaed 100644
--- a/wiki/src/blueprint/bootstrapping_workflow/2014.fodg
+++ b/wiki/src/blueprint/bootstrapping/2014.fodg
diff --git a/wiki/src/blueprint/bootstrapping_workflow/2015-compare-proposals.ods b/wiki/src/blueprint/bootstrapping/2015-compare-proposals.ods
index dd26764..dd26764 100644
--- a/wiki/src/blueprint/bootstrapping_workflow/2015-compare-proposals.ods
+++ b/wiki/src/blueprint/bootstrapping/2015-compare-proposals.ods
Binary files differ
diff --git a/wiki/src/blueprint/bootstrapping_workflow/2015.fodg b/wiki/src/blueprint/bootstrapping/2015.fodg
index 952e7c9..6238c18 100644
--- a/wiki/src/blueprint/bootstrapping_workflow/2015.fodg
+++ b/wiki/src/blueprint/bootstrapping/2015.fodg
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.graphics">
- <office:meta><meta:initial-creator>Debian user</meta:initial-creator><meta:creation-date>2015-01-26T17:54:22</meta:creation-date><meta:generator>LibreOffice/3.5$Linux_X86_64 LibreOffice_project/350m1$Build-2</meta:generator><meta:document-statistic meta:object-count="163"/></office:meta>
+ <office:meta><meta:initial-creator>Debian user</meta:initial-creator><meta:creation-date>2015-01-26T17:54:22</meta:creation-date><meta:generator>LibreOffice/3.5$Linux_x86 LibreOffice_project/350m1$Build-2</meta:generator><meta:document-statistic meta:object-count="170"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
- <config:config-item config:name="VisibleAreaTop" config:type="int">101600</config:config-item>
- <config:config-item config:name="VisibleAreaLeft" config:type="int">44847</config:config-item>
- <config:config-item config:name="VisibleAreaWidth" config:type="int">70026</config:config-item>
- <config:config-item config:name="VisibleAreaHeight" config:type="int">36204</config:config-item>
+ <config:config-item config:name="VisibleAreaTop" config:type="int">-31456</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">-97602</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">41261</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">16276</config:config-item>
<config:config-item-map-indexed config:name="Views">
<config:config-item-map-entry>
<config:config-item config:name="ViewId" config:type="string">view1</config:config-item>
@@ -37,10 +37,10 @@
<config:config-item config:name="EditModeStandard" config:type="int">0</config:config-item>
<config:config-item config:name="EditModeNotes" config:type="int">0</config:config-item>
<config:config-item config:name="EditModeHandout" config:type="int">1</config:config-item>
- <config:config-item config:name="VisibleAreaTop" config:type="int">101600</config:config-item>
- <config:config-item config:name="VisibleAreaLeft" config:type="int">44847</config:config-item>
- <config:config-item config:name="VisibleAreaWidth" config:type="int">70027</config:config-item>
- <config:config-item config:name="VisibleAreaHeight" config:type="int">36205</config:config-item>
+ <config:config-item config:name="VisibleAreaTop" config:type="int">-2315</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">-165695</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">407459</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">160735</config:config-item>
<config:config-item config:name="GridCoarseWidth" config:type="int">1270</config:config-item>
<config:config-item config:name="GridCoarseHeight" config:type="int">1270</config:config-item>
<config:config-item config:name="GridFineWidth" config:type="int">127</config:config-item>
@@ -51,7 +51,7 @@
<config:config-item config:name="GridSnapWidthYDenominator" config:type="int">1</config:config-item>
<config:config-item config:name="IsAngleSnapEnabled" config:type="boolean">false</config:config-item>
<config:config-item config:name="SnapAngle" config:type="int">1500</config:config-item>
- <config:config-item config:name="ZoomOnPage" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ZoomOnPage" config:type="boolean">true</config:config-item>
</config:config-item-map-entry>
</config:config-item-map-indexed>
</config:config-item-set>
@@ -90,8 +90,8 @@
<config:config-item config:name="ParagraphSummation" config:type="boolean">false</config:config-item>
<config:config-item config:name="PrintQuality" config:type="int">0</config:config-item>
<config:config-item config:name="PrinterIndependentLayout" config:type="string">low-resolution</config:config-item>
- <config:config-item config:name="PrinterName" config:type="string">MG6200LAN</config:config-item>
- <config:config-item config:name="PrinterSetup" config:type="base64Binary">lQH+/01HNjIwMExBTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpNRzYyMDBMQU4AAAAAAAAAAAAAAAAAAAAAAAAWAAMAuwAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TUc2MjAwTEFOCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MQpjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKRHVwbGV4Ok5vbmUASW5wdXRTbG90OmF1dG8AUGFnZVNpemU6QTQAABIAQ09NUEFUX0RVUExFWF9NT0RFCgBEVVBMRVhfT0ZG</config:config-item>
+ <config:config-item config:name="PrinterName" config:type="string">Generic Printer</config:config-item>
+ <config:config-item config:name="PrinterSetup" config:type="base64Binary">kAH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAtgAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6TGV0dGVyAER1cGxleDpOb25lAAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==</config:config-item>
<config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item>
<config:config-item config:name="ScaleDenominator" config:type="int">1</config:config-item>
<config:config-item config:name="ScaleNumerator" config:type="int">1</config:config-item>
@@ -223,7 +223,7 @@
</office:styles>
<office:automatic-styles>
<style:page-layout style:name="PM0">
- <style:page-layout-properties fo:margin-top="1cm" fo:margin-bottom="1cm" fo:margin-left="1cm" fo:margin-right="1cm" fo:page-width="200cm" fo:page-height="200cm" style:print-orientation="portrait"/>
+ <style:page-layout-properties fo:margin-top="1cm" fo:margin-bottom="1cm" fo:margin-left="1cm" fo:margin-right="1cm" fo:page-width="76.2cm" fo:page-height="152.4cm" style:print-orientation="portrait"/>
</style:page-layout>
<style:style style:name="dp1" style:family="drawing-page">
<style:drawing-page-properties draw:background-size="border" draw:fill="none"/>
@@ -242,7 +242,7 @@
<style:graphic-properties svg:stroke-width="0cm" draw:marker-start-width="0.2cm" draw:marker-end-width="0.2cm" draw:fill="solid" draw:fill-color="#cfe7f5" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm"/>
</style:style>
<style:style style:name="gr5" style:family="graphic" style:parent-style-name="standard">
- <style:graphic-properties draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#ff8080" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
</style:style>
<style:style style:name="gr6" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:fill="solid" draw:fill-color="#ff00ff" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
@@ -250,35 +250,35 @@
<style:style style:name="gr7" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties draw:marker-end="Arrow" draw:marker-end-width="0.3cm" draw:fill="none" draw:textarea-vertical-align="middle"/>
</style:style>
- <style:style style:name="gr8" style:family="graphic" style:parent-style-name="standard">
- <style:graphic-properties draw:fill="solid" draw:fill-color="#ff8080" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
- </style:style>
- <style:style style:name="gr9" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr8" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties draw:marker-end="Arrow" draw:marker-end-width="0.3cm" draw:fill="none" draw:fill-color="#ff00ff" draw:textarea-vertical-align="middle"/>
</style:style>
- <style:style style:name="gr10" style:family="graphic" style:parent-style-name="standard">
+ <style:style style:name="gr9" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties svg:stroke-width="0cm" draw:marker-start-width="0.2cm" draw:marker-end-width="0.2cm" draw:fill="solid" draw:fill-color="#ffcc99" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm"/>
</style:style>
- <style:style style:name="gr11" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr10" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties draw:marker-end="Arrow" draw:marker-end-width="0.3cm" draw:fill="none" draw:fill-color="#ff00ff" draw:textarea-vertical-align="middle"/>
</style:style>
- <style:style style:name="gr12" style:family="graphic" style:parent-style-name="standard">
+ <style:style style:name="gr11" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:fill="solid" draw:fill-color="#993366" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
</style:style>
- <style:style style:name="gr13" style:family="graphic" style:parent-style-name="objectwithoutfill">
+ <style:style style:name="gr12" style:family="graphic" style:parent-style-name="objectwithoutfill">
<style:graphic-properties draw:marker-end="Arrow" draw:marker-end-width="0.3cm" draw:fill="none" draw:textarea-vertical-align="middle"/>
</style:style>
- <style:style style:name="gr14" style:family="graphic" style:parent-style-name="standard">
+ <style:style style:name="gr13" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:fill="solid" draw:fill-color="#3deb3d" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
</style:style>
- <style:style style:name="gr15" style:family="graphic" style:parent-style-name="standard">
+ <style:style style:name="gr14" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:fill="solid" draw:fill-color="#cccccc" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
</style:style>
- <style:style style:name="gr16" style:family="graphic" style:parent-style-name="standard">
+ <style:style style:name="gr15" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:min-height="0cm" fo:min-width="0cm" fo:wrap-option="no-wrap"/>
</style:style>
+ <style:style style:name="gr16" style:family="graphic" style:parent-style-name="standard">
+ <style:graphic-properties svg:stroke-width="0cm" draw:marker-start-width="0.2cm" draw:marker-end-width="0.2cm" draw:fill="solid" draw:fill-color="#ff00ff" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm"/>
+ </style:style>
<style:style style:name="gr17" style:family="graphic" style:parent-style-name="standard">
- <style:graphic-properties svg:stroke-width="0cm" draw:marker-start-width="0.2cm" draw:marker-end-width="0.2cm" draw:fill="solid" draw:fill-color="#ffffff" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm"/>
+ <style:graphic-properties draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
</style:style>
<style:style style:name="gr18" style:family="graphic" style:parent-style-name="standard">
<style:graphic-properties draw:fill="solid" draw:fill-color="#355e00" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
@@ -379,173 +379,161 @@
<office:body>
<office:drawing>
<draw:page draw:name="page1" draw:style-name="dp2" draw:master-page-name="Default">
- <draw:custom-shape draw:style-name="gr1" draw:text-style-name="P1" draw:layer="layout" svg:width="9.271cm" svg:height="5.08cm" svg:x="67.294cm" svg:y="128.762cm">
+ <draw:custom-shape draw:style-name="gr1" draw:text-style-name="P1" draw:layer="layout" svg:width="9.271cm" svg:height="5.08cm" svg:x="18.939cm" svg:y="133.696cm">
<text:p/>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr1" draw:text-style-name="P1" draw:layer="layout" svg:width="9.271cm" svg:height="3.429cm" svg:x="67.294cm" svg:y="134.477cm">
+ <draw:custom-shape draw:style-name="gr1" draw:text-style-name="P1" draw:layer="layout" svg:width="9.271cm" svg:height="3.429cm" svg:x="19.119cm" svg:y="139.811cm">
<text:p/>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr1" draw:text-style-name="P1" draw:layer="layout" svg:width="9.271cm" svg:height="6.985cm" svg:x="80.883cm" svg:y="123.555cm">
+ <draw:custom-shape draw:style-name="gr1" draw:text-style-name="P1" draw:layer="layout" svg:width="9.271cm" svg:height="6.985cm" svg:x="32.273cm" svg:y="128.489cm">
<text:p/>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr2" draw:text-style-name="P1" draw:layer="layout" svg:width="9.144cm" svg:height="27.686cm" svg:x="81.01cm" svg:y="95.234cm">
+ <draw:custom-shape draw:style-name="gr2" draw:text-style-name="P1" draw:layer="layout" svg:width="11.303cm" svg:height="27.686cm" svg:x="30.241cm" svg:y="100.168cm">
<text:p/>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr3" draw:text-style-name="P1" draw:layer="layout" svg:width="14.351cm" svg:height="26.162cm" svg:x="101.203cm" svg:y="96.25cm">
+ <draw:custom-shape draw:style-name="gr3" draw:text-style-name="P1" draw:layer="layout" svg:width="14.351cm" svg:height="26.162cm" svg:x="52.593cm" svg:y="101.184cm">
<text:p/>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id10" draw:id="id10" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="94.98cm" svg:y="9.382cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id10" draw:id="id10" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="43.391cm" svg:y="14.816cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">About section</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id11" draw:id="id11" draw:layer="layout" svg:width="4.953cm" svg:height="1.524cm" svg:x="94.726cm" svg:y="12.049cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id11" draw:id="id11" draw:layer="layout" svg:width="4.953cm" svg:height="1.524cm" svg:x="43.582cm" svg:y="17.029cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Warnings section</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id1" draw:id="id1" draw:layer="layout" svg:width="3.302cm" svg:height="3.048cm" svg:x="86.217cm" svg:y="17.844cm">
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id1" draw:id="id1" draw:layer="layout" svg:width="3.302cm" svg:height="3.048cm" svg:x="37.841cm" svg:y="22.778cm">
<text:p text:style-name="P1"><text:span text:style-name="T2">Choose a download</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">Method</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T2">method</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="flowchart-decision" draw:enhanced-path="M 0 10800 L 10800 0 21600 10800 10800 21600 0 10800 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr6" draw:text-style-name="P3" xml:id="id2" draw:id="id2" draw:layer="layout" svg:width="4.064cm" svg:height="1.397cm" svg:x="77.835cm" svg:y="18.653cm">
+ <draw:custom-shape draw:style-name="gr6" draw:text-style-name="P3" xml:id="id2" draw:id="id2" draw:layer="layout" svg:width="4.064cm" svg:height="1.397cm" svg:x="29.225cm" svg:y="23.587cm">
<text:p text:style-name="P1"><text:span text:style-name="T2">Download</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T2">through HTTP</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="86.217cm" svg:y1="19.368cm" svg:x2="81.899cm" svg:y2="19.352cm" draw:start-shape="id1" draw:start-glue-point="5" draw:end-shape="id2" draw:end-glue-point="7" svg:d="m86217 19368h-2261v-16h-2057">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="37.841cm" svg:y1="24.302cm" svg:x2="33.289cm" svg:y2="24.286cm" draw:start-shape="id1" draw:start-glue-point="5" draw:end-shape="id2" draw:end-glue-point="7" svg:d="m37841 24302h-2379v-16h-2173">
<text:p text:style-name="P1"><text:span text:style-name="T2">HTTP</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr6" draw:text-style-name="P3" xml:id="id3" draw:id="id3" draw:layer="layout" svg:width="4.064cm" svg:height="1.397cm" svg:x="94.218cm" svg:y="18.653cm">
+ <draw:custom-shape draw:style-name="gr6" draw:text-style-name="P3" xml:id="id3" draw:id="id3" draw:layer="layout" svg:width="4.064cm" svg:height="1.397cm" svg:x="45.608cm" svg:y="23.587cm">
<text:p text:style-name="P1"><text:span text:style-name="T2">Download through</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T2">Torrent</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="89.519cm" svg:y1="19.368cm" svg:x2="94.218cm" svg:y2="19.352cm" draw:start-shape="id1" draw:start-glue-point="7" draw:end-shape="id3" draw:end-glue-point="5" svg:d="m89519 19368h2440v-16h2259">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="41.143cm" svg:y1="24.302cm" svg:x2="45.608cm" svg:y2="24.286cm" draw:start-shape="id1" draw:start-glue-point="7" draw:end-shape="id3" draw:end-glue-point="5" svg:d="m41143 24302h2322v-16h2143">
<text:p text:style-name="P1"><text:span text:style-name="T2">Torrent</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P3" xml:id="id6" draw:id="id6" draw:layer="layout" svg:width="4.191cm" svg:height="3.81cm" svg:x="102.6cm" svg:y="36.814cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Install or </text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">Switch to supported browser</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id6" draw:id="id6" draw:layer="layout" svg:width="4.191cm" svg:height="3.81cm" svg:x="55.99cm" svg:y="42.748cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Install or switch to</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T2">supported browser</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="flowchart-decision" draw:enhanced-path="M 0 10800 L 10800 0 21600 10800 10800 21600 0 10800 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id4" draw:id="id4" draw:layer="layout" svg:width="7.493cm" svg:height="1.257cm" svg:x="81.264cm" svg:y="44.688cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id4" draw:id="id4" draw:layer="layout" svg:width="7.493cm" svg:height="1.257cm" svg:x="32.599cm" svg:y="49.622cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Browse ISO</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr9" draw:text-style-name="P1" draw:layer="layout" svg:x1="88.757cm" svg:y1="45.316cm" svg:x2="90.726cm" svg:y2="46.72cm" draw:start-shape="id4" draw:end-shape="id5" draw:end-glue-point="4" svg:d="m88757 45316h1969v1404">
+ <draw:connector draw:style-name="gr8" draw:text-style-name="P1" draw:layer="layout" svg:x1="40.092cm" svg:y1="50.25cm" svg:x2="42.116cm" svg:y2="51.654cm" draw:start-shape="id4" draw:end-shape="id5" draw:end-glue-point="4" svg:d="m40092 50250h2024v1404">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr10" draw:text-style-name="P2" xml:id="id7" draw:id="id7" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="97.393cm" svg:y="42.161cm">
+ <draw:custom-shape draw:style-name="gr9" draw:text-style-name="P2" xml:id="id7" draw:id="id7" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="50.783cm" svg:y="48.095cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">OpenPGP documentation</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr11" draw:text-style-name="P1" draw:layer="layout" svg:x1="104.696cm" svg:y1="40.624cm" svg:x2="102.727cm" svg:y2="42.79cm" draw:start-shape="id6" draw:start-glue-point="6" draw:end-shape="id7" draw:end-glue-point="7" svg:d="m104696 40624v2166h-1969">
+ <draw:connector draw:style-name="gr10" draw:text-style-name="P1" draw:layer="layout" svg:x1="58.086cm" svg:y1="46.558cm" svg:x2="56.117cm" svg:y2="48.724cm" draw:start-shape="id6" draw:start-glue-point="6" draw:end-shape="id7" draw:end-glue-point="7" svg:d="m58086 46558v2166h-1969">
<text:p text:style-name="P1">no</text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id8" draw:id="id8" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="88.884cm" svg:y="51.178cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id8" draw:id="id8" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="39.464cm" svg:y="55.612cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Display OK</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id9" draw:id="id9" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="64.627cm" svg:y="45.45cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Error, try with this mirror (Tor)</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id9" draw:id="id9" draw:layer="layout" svg:width="8.89cm" svg:height="1.638cm" svg:x="11.239cm" svg:y="50.284cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Download <text:s/>again</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">from https://archive.torproject.org/</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr11" draw:text-style-name="P1" draw:layer="layout" svg:x1="90.726cm" svg:y1="49.229cm" svg:x2="91.551cm" svg:y2="51.178cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id8" draw:end-glue-point="0" svg:d="m90726 49229v1053h825v896">
+ <draw:connector draw:style-name="gr10" draw:text-style-name="P1" draw:layer="layout" svg:x1="42.116cm" svg:y1="54.163cm" svg:x2="42.131cm" svg:y2="55.612cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id8" draw:end-glue-point="0" svg:d="m42116 54163v803h15v646">
<text:p text:style-name="P1">success</text:p>
</draw:connector>
- <draw:connector draw:style-name="gr11" draw:text-style-name="P1" draw:layer="layout" svg:x1="88.503cm" svg:y1="48.054cm" svg:x2="67.739cm" svg:y2="47.088cm" draw:start-shape="id5" draw:start-glue-point="5" draw:end-shape="id9" draw:end-glue-point="6" svg:d="m88503 48054h-20764v-966">
+ <draw:connector draw:style-name="gr10" draw:text-style-name="P1" draw:layer="layout" svg:x1="39.893cm" svg:y1="52.988cm" svg:x2="15.684cm" svg:y2="51.922cm" draw:start-shape="id5" draw:start-glue-point="5" draw:end-shape="id9" draw:end-glue-point="6" svg:d="m39893 52988h-24209v-1066">
<text:p text:style-name="P1">failure</text:p>
</draw:connector>
- <draw:connector draw:style-name="gr9" draw:text-style-name="P1" draw:layer="layout" svg:x1="67.739cm" svg:y1="45.45cm" svg:x2="77.835cm" svg:y2="19.352cm" draw:start-shape="id9" draw:start-glue-point="4" draw:end-shape="id2" draw:end-glue-point="5" svg:d="m67739 45450v-26098h10096">
+ <draw:connector draw:style-name="gr8" draw:text-style-name="P1" draw:layer="layout" svg:x1="15.684cm" svg:y1="50.284cm" svg:x2="29.225cm" svg:y2="24.286cm" draw:start-shape="id9" draw:start-glue-point="4" draw:end-shape="id2" draw:end-glue-point="5" svg:d="m15684 50284v-25998h13541">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr9" draw:text-style-name="P1" draw:layer="layout" svg:x1="97.647cm" svg:y1="10.639cm" svg:x2="97.203cm" svg:y2="12.049cm" draw:start-shape="id10" draw:start-glue-point="6" draw:end-shape="id11" draw:end-glue-point="4" svg:d="m97647 10639v705h-444v705">
+ <draw:connector draw:style-name="gr8" draw:text-style-name="P1" draw:layer="layout" svg:x1="46.058cm" svg:y1="16.073cm" svg:x2="46.059cm" svg:y2="17.029cm" draw:start-shape="id10" draw:start-glue-point="6" draw:end-shape="id11" draw:end-glue-point="4" svg:d="m46058 16073v478h1v478">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr9" draw:text-style-name="P1" draw:layer="layout" svg:x1="100.06cm" svg:y1="28.536cm" svg:x2="100.06cm" svg:y2="29.448cm" draw:start-shape="id12" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m100060 28536v912">
+ <draw:connector draw:style-name="gr8" draw:text-style-name="P1" draw:layer="layout" svg:x1="53.45cm" svg:y1="34.47cm" svg:x2="53.45cm" svg:y2="35.382cm" draw:start-shape="id12" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m53450 34470v912">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P3" xml:id="id14" draw:id="id14" draw:layer="layout" svg:width="5.207cm" svg:height="4.572cm" svg:x="85.328cm" svg:y="6.588cm">
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id16" draw:id="id16" draw:layer="layout" svg:width="5.207cm" svg:height="4.572cm" svg:x="36.718cm" svg:y="11.522cm">
<text:p text:style-name="P1"><text:span text:style-name="T2">First time user?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="diamond" draw:enhanced-path="M 10800 0 L 21600 10800 10800 21600 0 10800 10800 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="90.535cm" svg:y1="8.874cm" svg:x2="97.647cm" svg:y2="9.382cm" draw:start-shape="id14" draw:end-shape="id10" draw:end-glue-point="4" svg:d="m90535 8874h501l6611 6v502">
- <text:p text:style-name="P1">yes</text:p>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr12" draw:text-style-name="P1" xml:id="id15" draw:id="id15" draw:layer="layout" svg:width="4.826cm" svg:height="2.413cm" svg:x="85.328cm" svg:y="1.461cm">
- <text:p text:style-name="P1"><text:span text:style-name="T3">Enter the assitant</text:span></text:p>
- <text:p text:style-name="P1"/>
+ <draw:custom-shape draw:style-name="gr11" draw:text-style-name="P1" xml:id="id14" draw:id="id14" draw:layer="layout" svg:width="5.969cm" svg:height="2.413cm" svg:x="36.41cm" svg:y="6.395cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T3">Enter the assistant</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="1060 3180 20540 18420" draw:type="flowchart-terminator" draw:enhanced-path="M 3470 21600 X 0 10800 3470 0 L 18130 0 X 21600 10800 18130 21600 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P4" xml:id="id16" draw:id="id16" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="85.201cm" svg:y="4.569cm">
- <text:p text:style-name="P1"><text:span text:style-name="T4">0 - welcome</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P4" xml:id="id15" draw:id="id15" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="36.681cm" svg:y="9.503cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T4">0 - Welcome</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="87.741cm" svg:y1="3.874cm" svg:x2="87.868cm" svg:y2="4.569cm" draw:start-shape="id15" draw:end-shape="id16" draw:end-glue-point="4" svg:d="m87741 3874v501l127-308v502">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="39.394cm" svg:y1="8.808cm" svg:x2="39.348cm" svg:y2="9.503cm" draw:start-shape="id14" draw:end-shape="id15" draw:end-glue-point="4" svg:d="m39394 8808v501l-46-308v502">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="87.868cm" svg:y1="5.826cm" svg:x2="87.931cm" svg:y2="6.588cm" draw:start-shape="id16" draw:end-shape="id14" svg:d="m87868 5826v501l63-240v501">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="39.348cm" svg:y1="10.76cm" svg:x2="39.321cm" svg:y2="11.522cm" draw:start-shape="id15" draw:end-shape="id16" svg:d="m39348 10760v501l-27-240v501">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P4" xml:id="id17" draw:id="id17" draw:layer="layout" svg:width="5.842cm" svg:height="1.778cm" svg:x="85.201cm" svg:y="14.589cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P4" xml:id="id17" draw:id="id17" draw:layer="layout" svg:width="5.842cm" svg:height="1.778cm" svg:x="36.591cm" svg:y="19.523cm">
<text:p text:style-name="P1"><text:span text:style-name="T4">1 - Download ISO</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="94.726cm" svg:y1="12.811cm" svg:x2="88.122cm" svg:y2="14.589cm" draw:start-shape="id11" draw:end-shape="id17" draw:end-glue-point="4" svg:d="m94726 12811h-502l-6102 1277v501">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="39.512cm" svg:y1="21.301cm" svg:x2="39.492cm" svg:y2="22.778cm" draw:start-shape="id17" draw:end-shape="id1" draw:end-glue-point="4" svg:d="m39512 21301v502l-20 474v501">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="88.122cm" svg:y1="16.367cm" svg:x2="87.868cm" svg:y2="17.844cm" draw:start-shape="id17" draw:end-shape="id1" draw:end-glue-point="4" svg:d="m88122 16367v502l-254 474v501">
- <text:p/>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P5" xml:id="id12" draw:id="id12" draw:layer="layout" svg:width="4.318cm" svg:height="2.54cm" svg:x="97.901cm" svg:y="26.146cm">
+ <draw:custom-shape draw:style-name="gr13" draw:text-style-name="P5" xml:id="id12" draw:id="id12" draw:layer="layout" svg:width="4.318cm" svg:height="2.54cm" svg:x="51.291cm" svg:y="32.08cm">
<text:p text:style-name="P1"><text:span text:style-name="T5">Detect browser</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 20320 21600 10800" draw:text-areas="0 0 21600 17360" draw:type="flowchart-document" draw:enhanced-path="M 0 0 L 21600 0 21600 17360 C 13050 17220 13340 20770 5620 21600 2860 21100 1850 20700 0 20120 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P3" xml:id="id19" draw:id="id19" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="85.074cm" svg:y="27.289cm">
+ <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P3" xml:id="id19" draw:id="id19" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="37.464cm" svg:y="31.323cm">
<text:p text:style-name="P1"><text:span text:style-name="T2">Detect extension</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P4" xml:id="id18" draw:id="id18" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="84.439cm" svg:y="23.987cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P4" xml:id="id18" draw:id="id18" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="36.829cm" svg:y="27.921cm">
<text:p text:style-name="P1"><text:span text:style-name="T4">2 - Verify ISO</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="87.868cm" svg:y1="20.892cm" svg:x2="87.106cm" svg:y2="23.987cm" draw:start-shape="id1" draw:end-shape="id18" draw:end-glue-point="0" svg:d="m87868 20892v502l-762 2091v502">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="39.492cm" svg:y1="25.826cm" svg:x2="39.496cm" svg:y2="27.921cm" draw:start-shape="id1" draw:end-shape="id18" draw:end-glue-point="0" svg:d="m39492 25826v502l4 1091v502">
<text:p text:style-name="P1"><text:span text:style-name="T2">I already have an ISO</text:span></text:p>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="87.106cm" svg:y1="25.244cm" svg:x2="87.106cm" svg:y2="27.289cm" draw:start-shape="id18" draw:start-glue-point="6" draw:end-shape="id19" draw:end-glue-point="4" svg:d="m87106 25244v501 1043 501">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="39.496cm" svg:y1="29.178cm" svg:x2="39.496cm" svg:y2="31.323cm" draw:start-shape="id18" draw:start-glue-point="6" draw:end-shape="id19" draw:end-glue-point="4" svg:d="m39496 29178v501 1143 501">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" draw:line-skew="-4.325cm" svg:x1="86.09cm" svg:y1="29.321cm" svg:x2="81.264cm" svg:y2="45.317cm" draw:start-shape="id19" draw:start-glue-point="5" draw:end-shape="id4" draw:end-glue-point="5" svg:d="m86090 29321h-5842l514 15996h502">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" draw:line-skew="-4.817cm" svg:x1="38.48cm" svg:y1="33.355cm" svg:x2="32.599cm" svg:y2="50.251cm" draw:start-shape="id19" draw:start-glue-point="5" draw:end-shape="id4" draw:end-glue-point="5" svg:d="m38480 33355h-6334l-49 16896h502">
<text:p text:style-name="P1">Yes</text:p>
</draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="88.122cm" svg:y1="29.321cm" svg:x2="100.06cm" svg:y2="26.146cm" draw:start-shape="id19" draw:start-glue-point="7" draw:end-shape="id12" draw:end-glue-point="4" svg:d="m88122 29321h1518l10420-3676v501">
- <text:p text:style-name="P1">No</text:p>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id13" draw:id="id13" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="97.393cm" svg:y="29.448cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id13" draw:id="id13" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="50.783cm" svg:y="35.382cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Confirm browser</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P3" xml:id="id20" draw:id="id20" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="98.028cm" svg:y="31.861cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Supported browser?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P3" xml:id="id20" draw:id="id20" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="51.418cm" svg:y="37.795cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Extension available</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T2">in browser?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="100.06cm" svg:y1="30.705cm" svg:x2="100.06cm" svg:y2="31.861cm" draw:start-shape="id13" draw:start-glue-point="6" draw:end-shape="id20" draw:end-glue-point="4" svg:d="m100060 30705v501 154 501">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="53.45cm" svg:y1="36.639cm" svg:x2="53.45cm" svg:y2="37.795cm" draw:start-shape="id13" draw:start-glue-point="6" draw:end-shape="id20" draw:end-glue-point="4" svg:d="m53450 36639v501 154 501">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr12" draw:text-style-name="P1" xml:id="id21" draw:id="id21" draw:layer="layout" svg:width="4.826cm" svg:height="2.413cm" svg:x="109.204cm" svg:y="41.894cm">
+ <draw:custom-shape draw:style-name="gr11" draw:text-style-name="P1" xml:id="id21" draw:id="id21" draw:layer="layout" svg:width="4.826cm" svg:height="2.413cm" svg:x="62.594cm" svg:y="43.468cm">
<text:p text:style-name="P1"><text:span text:style-name="T3">Exit the assistant</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="1060 3180 20540 18420" draw:type="flowchart-terminator" draw:enhanced-path="M 3470 21600 X 0 10800 3470 0 L 18130 0 X 21600 10800 18130 21600 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="101.076cm" svg:y1="33.893cm" svg:x2="104.695cm" svg:y2="36.814cm" draw:start-shape="id20" draw:start-glue-point="7" draw:end-shape="id6" svg:d="m101076 33893h1518l2101 2420v501">
- <text:p text:style-name="P1">No</text:p>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr16" draw:text-style-name="P1" draw:layer="layout" svg:width="7.62cm" svg:height="3.937cm" svg:x="111.998cm" svg:y="45.45cm">
+ <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P1" draw:layer="layout" svg:width="7.62cm" svg:height="3.937cm" svg:x="65.388cm" svg:y="46.979cm">
<text:p text:style-name="P1">Do we give them, a special</text:p>
<text:p text:style-name="P1">URL to come back?</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-vertical="false" draw:text-areas="800 800 20800 20800" draw:type="round-rectangular-callout" draw:modifiers="518.672090276867 -5989.63941086846" draw:enhanced-path="M 3590 0 X 0 3590 L ?f2 ?f3 0 8970 0 12630 ?f4 ?f5 0 18010 Y 3590 21600 L ?f6 ?f7 8970 21600 12630 21600 ?f8 ?f9 18010 21600 X 21600 18010 L ?f10 ?f11 21600 12630 21600 8970 ?f12 ?f13 21600 3590 Y 18010 0 L ?f14 ?f15 12630 0 8970 0 ?f16 ?f17 Z N">
@@ -594,32 +582,21 @@
<draw:handle draw:handle-position="$0 $1"/>
</draw:enhanced-geometry>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="106.791cm" svg:y1="38.719cm" svg:x2="109.204cm" svg:y2="43.1cm" draw:start-shape="id6" draw:end-shape="id21" svg:d="m106791 38719h1059l853 4381h501">
- <text:p text:style-name="P1"><text:span text:style-name="T2">yes</text:span></text:p>
- </draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" draw:line-skew="8.613cm 22.231cm" svg:x1="114.03cm" svg:y1="43.101cm" svg:x2="90.154cm" svg:y2="2.668cm" draw:start-shape="id21" draw:start-glue-point="7" draw:end-shape="id15" draw:end-glue-point="7" svg:d="m114030 43101h9115l-10258-40433h-22733">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" draw:line-skew="0.419cm 25.596cm" svg:x1="67.42cm" svg:y1="44.675cm" svg:x2="42.379cm" svg:y2="7.602cm" draw:start-shape="id21" draw:start-glue-point="7" draw:end-shape="id14" draw:end-glue-point="7" svg:d="m67420 44675h921l135-37073h-26097">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="99.044cm" svg:y1="33.893cm" svg:x2="95.933cm" svg:y2="36.814cm" draw:start-shape="id20" draw:start-glue-point="5" draw:end-shape="id22" draw:end-glue-point="4" svg:d="m99044 33893h-1517l-1594 2419v502">
- <text:p text:style-name="P1">yes</text:p>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P3" xml:id="id22" draw:id="id22" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="93.837cm" svg:y="36.814cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Do you wnant to install</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2"><text:s/></text:span><text:span text:style-name="T2">the super extension ?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id68" draw:id="id68" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="47.227cm" svg:y="42.748cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Do you want to install</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T2"><text:s/></text:span><text:span text:style-name="T2">the extension?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="flowchart-decision" draw:enhanced-path="M 0 10800 L 10800 0 21600 10800 10800 21600 0 10800 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="95.933cm" svg:y1="40.497cm" svg:x2="97.393cm" svg:y2="42.79cm" draw:start-shape="id22" draw:start-glue-point="6" draw:end-shape="id7" draw:end-glue-point="5" svg:d="m95933 40497v501l959 1792h501">
- <text:p text:style-name="P1">no</text:p>
- </draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="84.914cm" svg:y1="43.062cm" svg:x2="85.011cm" svg:y2="44.688cm" draw:start-shape="id23" draw:start-glue-point="6" draw:end-shape="id4" draw:end-glue-point="4" svg:d="m84914 43062v501l97 623v502">
- <text:p/>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P5" xml:id="id5" draw:id="id5" draw:layer="layout" svg:width="4.445cm" svg:height="2.667cm" svg:x="88.503cm" svg:y="46.72cm">
- <text:p text:style-name="P1"><text:span text:style-name="T5">Extension</text:span><text:span text:style-name="T5"><text:line-break/></text:span><text:span text:style-name="T5">Verify ISO</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr13" draw:text-style-name="P5" xml:id="id5" draw:id="id5" draw:layer="layout" svg:width="4.445cm" svg:height="2.667cm" svg:x="39.893cm" svg:y="51.654cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T5">Verify ISO</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T5">using extension</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 20320 21600 10800" draw:text-areas="0 0 21600 17360" draw:type="flowchart-document" draw:enhanced-path="M 0 0 L 21600 0 21600 17360 C 13050 17220 13340 20770 5620 21600 2860 21100 1850 20700 0 20120 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr16" draw:text-style-name="P1" draw:layer="layout" svg:width="7.62cm" svg:height="2.159cm" svg:x="67.802cm" svg:y="49.26cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">What to do with wrong iso ?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P1" draw:layer="layout" svg:width="7.62cm" svg:height="2.159cm" svg:x="19.192cm" svg:y="54.194cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">What to do with wrong ISO ?</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T1">Send a feedback to Tails Bugs ?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-vertical="false" draw:text-areas="800 800 20800 20800" draw:type="round-rectangular-callout" draw:modifiers="20202.7030573416 -9520" draw:enhanced-path="M 3590 0 X 0 3590 L ?f2 ?f3 0 8970 0 12630 ?f4 ?f5 0 18010 Y 3590 21600 L ?f6 ?f7 8970 21600 12630 21600 ?f8 ?f9 18010 21600 X 21600 18010 L ?f10 ?f11 21600 12630 21600 8970 ?f12 ?f13 21600 3590 Y 18010 0 L ?f14 ?f15 12630 0 8970 0 ?f16 ?f17 Z N">
<draw:equation draw:name="f0" draw:formula="$0 -10800"/>
@@ -667,418 +644,447 @@
<draw:handle draw:handle-position="$0 $1"/>
</draw:enhanced-geometry>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P5" xml:id="id24" draw:id="id24" draw:layer="layout" svg:width="4.318cm" svg:height="2.54cm" svg:x="86.725cm" svg:y="32.877cm">
+ <draw:custom-shape draw:style-name="gr13" draw:text-style-name="P5" xml:id="id60" draw:id="id60" draw:layer="layout" svg:width="4.318cm" svg:height="2.032cm" svg:x="37.371cm" svg:y="37.119cm">
<text:p text:style-name="P1"><text:span text:style-name="T5">Detect if Debian</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 20320 21600 10800" draw:text-areas="0 0 21600 17360" draw:type="flowchart-document" draw:enhanced-path="M 0 0 L 21600 0 21600 17360 C 13050 17220 13340 20770 5620 21600 2860 21100 1850 20700 0 20120 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="93.837cm" svg:y1="38.655cm" svg:x2="91.043cm" svg:y2="34.147cm" draw:start-shape="id22" draw:end-shape="id24" svg:d="m93837 38655h-504l-1788-4508h-502">
- <text:p text:style-name="P1">yes</text:p>
- </draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="88.884cm" svg:y1="35.417cm" svg:x2="88.059cm" svg:y2="37.068cm" draw:start-shape="id24" draw:end-shape="id25" draw:end-glue-point="4" svg:d="m88884 35417v502l-825 648v501">
- <text:p/>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P3" xml:id="id25" draw:id="id25" draw:layer="layout" svg:width="4.191cm" svg:height="3.81cm" svg:x="85.963cm" svg:y="37.068cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Confirm if debian</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id59" draw:id="id59" draw:layer="layout" svg:width="4.191cm" svg:height="3.81cm" svg:x="37.443cm" svg:y="42.002cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Confirm if Debian</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T2">(and version) ?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="flowchart-decision" draw:enhanced-path="M 0 10800 L 10800 0 21600 10800 10800 21600 0 10800 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id26" draw:id="id26" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="88.249cm" svg:y="41.767cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id70" draw:id="id70" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="39.729cm" svg:y="46.701cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Install extension</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">With Debian Store</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">from Debian Store</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="90.154cm" svg:y1="38.973cm" svg:x2="90.916cm" svg:y2="41.767cm" draw:start-shape="id25" draw:start-glue-point="7" draw:end-shape="id26" draw:end-glue-point="4" svg:d="m90154 38973h501l261 2292v502">
- <text:p text:style-name="P1">yes</text:p>
- </draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="85.963cm" svg:y1="38.973cm" svg:x2="84.914cm" svg:y2="41.805cm" draw:start-shape="id25" draw:end-shape="id23" draw:end-glue-point="4" svg:d="m85963 38973h-502l-547 2330v502">
- <text:p text:style-name="P1">no</text:p>
- </draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="90.916cm" svg:y1="43.024cm" svg:x2="85.011cm" svg:y2="44.688cm" draw:start-shape="id26" draw:start-glue-point="6" draw:end-shape="id4" draw:end-glue-point="4" svg:d="m90916 43024v501l-5905 661v502">
- <text:p/>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr17" draw:text-style-name="P2" xml:id="id66" draw:id="id66" draw:layer="layout" svg:width="5.334cm" svg:height="3.162cm" svg:x="73.263cm" svg:y="14.475cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Debian Hacker</text:span><text:span text:style-name="T1"><text:line-break/></text:span><text:span text:style-name="T1">aka full cmd line path</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr16" draw:text-style-name="P2" xml:id="id55" draw:id="id55" draw:layer="layout" svg:width="5.334cm" svg:height="3.162cm" svg:x="26.812cm" svg:y="16.361cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Debian Hacker:</text:span><text:span text:style-name="T1"><text:line-break/></text:span><text:span text:style-name="T1">full command line path</text:span></text:p>
<text:p text:style-name="P1"><text:span text:style-name="T1">Easy and secure</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P3" xml:id="id28" draw:id="id28" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="83.423cm" svg:y="54.467cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Final Tails medium <text:s/>is:</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
+ <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P3" xml:id="id23" draw:id="id23" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="33.813cm" svg:y="59.401cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Final Tails medium is</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P4" xml:id="id27" draw:id="id27" draw:layer="layout" svg:width="6.223cm" svg:height="1.778cm" svg:x="92.694cm" svg:y="53.324cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P4" xml:id="id22" draw:id="id22" draw:layer="layout" svg:width="6.223cm" svg:height="1.778cm" svg:x="39.034cm" svg:y="57.703cm">
<text:p text:style-name="P1"><text:span text:style-name="T4">4 - Install Tails</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="94.218cm" svg:y1="51.806cm" svg:x2="95.806cm" svg:y2="53.324cm" draw:start-shape="id8" draw:end-shape="id27" draw:end-glue-point="4" svg:d="m94218 51806h1588v1518">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="42.131cm" svg:y1="56.869cm" svg:x2="42.146cm" svg:y2="57.703cm" draw:start-shape="id8" draw:start-glue-point="6" draw:end-shape="id22" draw:end-glue-point="4" svg:d="m42131 56869v417h15v417">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="95.805cm" svg:y1="55.102cm" svg:x2="85.455cm" svg:y2="54.467cm" draw:start-shape="id27" draw:start-glue-point="2" draw:end-shape="id28" draw:end-glue-point="4" svg:d="m95805 55102v502h-5690v-1638h-4660v501">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="39.034cm" svg:y1="58.592cm" svg:x2="35.845cm" svg:y2="59.401cm" draw:start-shape="id22" draw:start-glue-point="5" draw:end-shape="id23" draw:end-glue-point="4" svg:d="m39034 58592h-3189v809">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="84.439cm" svg:y1="56.499cm" svg:x2="78.089cm" svg:y2="59.293cm" draw:start-shape="id28" draw:start-glue-point="5" draw:end-shape="id29" draw:end-glue-point="7" svg:d="m84439 56499h-3132v2794h-3218">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="34.829cm" svg:y1="61.433cm" svg:x2="28.463cm" svg:y2="62.195cm" draw:start-shape="id23" draw:start-glue-point="5" draw:end-shape="id24" draw:end-glue-point="4" svg:d="m34829 61433h-6366v762">
<text:p text:style-name="P1"><text:span text:style-name="T2">usb</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id30" draw:id="id30" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="101.457cm" svg:y="57.782cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Instructions for DVD</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
- </draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="86.471cm" svg:y1="56.499cm" svg:x2="101.457cm" svg:y2="58.41cm" draw:start-shape="id28" draw:start-glue-point="7" draw:end-shape="id30" svg:d="m86471 56499h8026v1911h6960">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="36.861cm" svg:y1="61.433cm" svg:x2="53.006cm" svg:y2="62.751cm" draw:start-shape="id23" draw:start-glue-point="7" draw:end-shape="id25" draw:end-glue-point="4" svg:d="m36861 61433h16145v1318">
<text:p text:style-name="P1"><text:span text:style-name="T2">dvd</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P3" xml:id="id29" draw:id="id29" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="75.041cm" svg:y="57.261cm">
+ <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P3" xml:id="id24" draw:id="id24" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="26.431cm" svg:y="62.195cm">
<text:p text:style-name="P1"><text:span text:style-name="T2">Tails Installer available</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">On this kind of OS</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T2">on OS</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P3" xml:id="id31" draw:id="id31" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="69.453cm" svg:y="61.579cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Is Tails Installer installed ?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id26" draw:id="id26" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="20.843cm" svg:y="66.513cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Is Tails Installer installed?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="flowchart-decision" draw:enhanced-path="M 0 10800 L 10800 0 21600 10800 10800 21600 0 10800 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="76.057cm" svg:y1="59.293cm" svg:x2="71.549cm" svg:y2="61.579cm" draw:start-shape="id29" draw:start-glue-point="5" draw:end-shape="id31" draw:end-glue-point="4" svg:d="m76057 59293h-4508v2286">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="27.447cm" svg:y1="64.227cm" svg:x2="22.939cm" svg:y2="66.513cm" draw:start-shape="id24" draw:start-glue-point="5" draw:end-shape="id26" draw:end-glue-point="4" svg:d="m27447 64227h-4508v2286">
<text:p text:style-name="P1">yes</text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id40" draw:id="id40" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="82.28cm" svg:y="82.039cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Temp Tails is created</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">on the USB KEY 1</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id35" draw:id="id35" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="33.67cm" svg:y="86.973cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Temporary Tails is created</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">on the USB Key 1</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id34" draw:id="id34" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="82.407cm" svg:y="59.674cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">We gonna have to install</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">A Temps Tails on a First USB Key</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id29" draw:id="id29" draw:layer="layout" svg:width="5.334cm" svg:height="1.778cm" svg:x="33.661cm" svg:y="66.608cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Need to install</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">temp Tails on a first USB</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id32" draw:id="id32" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="62.087cm" svg:y="64.386cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Instal Tails Installer</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id27" draw:id="id27" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="13.477cm" svg:y="69.32cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Install Tails Installer</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="69.453cm" svg:y1="63.42cm" svg:x2="65.199cm" svg:y2="64.386cm" draw:start-shape="id31" draw:start-glue-point="5" draw:end-shape="id32" draw:end-glue-point="4" svg:d="m69453 63420h-4254v966">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="20.843cm" svg:y1="68.354cm" svg:x2="16.589cm" svg:y2="69.32cm" draw:start-shape="id26" draw:start-glue-point="5" draw:end-shape="id27" draw:end-glue-point="4" svg:d="m20843 68354h-4254v966">
<text:p text:style-name="P1">no</text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id33" draw:id="id33" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="65.262cm" svg:y="70.99cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Run Tails Installer</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id28" draw:id="id28" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="16.652cm" svg:y="75.924cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Open Tails Installer</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="73.644cm" svg:y1="63.42cm" svg:x2="68.374cm" svg:y2="70.99cm" draw:start-shape="id31" draw:start-glue-point="7" draw:end-shape="id33" draw:end-glue-point="4" svg:d="m73644 63420h889v4706h-6159v2864">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" draw:line-skew="0cm 0.396cm" svg:x1="25.034cm" svg:y1="68.354cm" svg:x2="19.764cm" svg:y2="75.924cm" draw:start-shape="id26" draw:start-glue-point="7" draw:end-shape="id28" draw:end-glue-point="4" svg:d="m25034 68354h832v5102h-6102v2468">
<text:p text:style-name="P1">yes</text:p>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="65.199cm" svg:y1="66.024cm" svg:x2="68.373cm" svg:y2="70.99cm" draw:start-shape="id32" draw:start-glue-point="6" draw:end-shape="id33" svg:d="m65199 66024v2484h3174v2482">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="16.589cm" svg:y1="70.958cm" svg:x2="19.763cm" svg:y2="75.924cm" draw:start-shape="id27" draw:start-glue-point="6" draw:end-shape="id28" svg:d="m16589 70958v2484h3174v2482">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P3" xml:id="id38" draw:id="id38" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="83.042cm" svg:y="65.77cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">OS ?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P3" xml:id="id33" draw:id="id33" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="34.296cm" svg:y="70.704cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">OS?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="79.105cm" svg:y1="59.293cm" svg:x2="82.407cm" svg:y2="60.302cm" draw:start-shape="id29" draw:end-shape="id34" svg:d="m79105 59293h1460v1009h1842">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="29.479cm" svg:y1="64.227cm" svg:x2="36.328cm" svg:y2="66.608cm" draw:start-shape="id24" draw:start-glue-point="7" draw:end-shape="id29" draw:end-glue-point="4" svg:d="m29479 64227h6849v2381">
<text:p text:style-name="P1">no</text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id36" draw:id="id36" draw:layer="layout" svg:width="3.683cm" svg:height="1.257cm" svg:x="70.977cm" svg:y="75.689cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Instal UUI</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id31" draw:id="id31" draw:layer="layout" svg:width="3.683cm" svg:height="1.257cm" svg:x="22.367cm" svg:y="79.823cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Install UUI</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="73.517cm" svg:y1="73.072cm" svg:x2="72.818cm" svg:y2="75.689cm" draw:start-shape="id35" draw:start-glue-point="5" draw:end-shape="id36" svg:d="m73517 73072h-699v2617">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="24.907cm" svg:y1="78.006cm" svg:x2="24.208cm" svg:y2="79.823cm" draw:start-shape="id30" draw:start-glue-point="5" draw:end-shape="id31" svg:d="m24907 78006h-699v1817">
<text:p text:style-name="P1">no</text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id37" draw:id="id37" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="75.168cm" svg:y="78.102cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id32" draw:id="id32" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="26.558cm" svg:y="83.036cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Run UUI</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="77.708cm" svg:y1="73.072cm" svg:x2="78.28cm" svg:y2="78.102cm" draw:start-shape="id35" draw:start-glue-point="7" draw:end-shape="id37" draw:end-glue-point="4" svg:d="m77708 73072h572v5030">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="29.098cm" svg:y1="78.006cm" svg:x2="29.67cm" svg:y2="83.036cm" draw:start-shape="id30" draw:start-glue-point="7" draw:end-shape="id32" draw:end-glue-point="4" svg:d="m29098 78006h572v5030">
<text:p text:style-name="P1">yes</text:p>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="72.818cm" svg:y1="76.946cm" svg:x2="78.279cm" svg:y2="78.102cm" draw:start-shape="id36" draw:start-glue-point="6" draw:end-shape="id37" svg:d="m72818 76946v578h5461v578">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="24.208cm" svg:y1="81.08cm" svg:x2="29.669cm" svg:y2="83.036cm" draw:start-shape="id31" draw:start-glue-point="6" draw:end-shape="id32" svg:d="m24208 81080v978h5461v978">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P3" xml:id="id35" draw:id="id35" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="73.517cm" svg:y="71.231cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">UUI is Installed ?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id30" draw:id="id30" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="24.907cm" svg:y="76.165cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">UUI is Installed?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="flowchart-decision" draw:enhanced-path="M 0 10800 L 10800 0 21600 10800 10800 21600 0 10800 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="85.074cm" svg:y1="60.931cm" svg:x2="85.074cm" svg:y2="65.77cm" draw:start-shape="id34" draw:start-glue-point="6" draw:end-shape="id38" draw:end-glue-point="4" svg:d="m85074 60931v4839">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.328cm" svg:y1="68.386cm" svg:x2="36.328cm" svg:y2="70.704cm" draw:start-shape="id29" draw:start-glue-point="6" draw:end-shape="id33" draw:end-glue-point="4" svg:d="m36328 68386v2318">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="84.058cm" svg:y1="67.802cm" svg:x2="75.613cm" svg:y2="71.231cm" draw:start-shape="id38" draw:start-glue-point="5" draw:end-shape="id35" draw:end-glue-point="4" svg:d="m84058 67802h-8445v3429">
- <text:p text:style-name="P1"><text:span text:style-name="T2">windows</text:span></text:p>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="35.312cm" svg:y1="72.736cm" svg:x2="27.003cm" svg:y2="76.165cm" draw:start-shape="id33" draw:start-glue-point="5" draw:end-shape="id30" draw:end-glue-point="4" svg:d="m35312 72736h-8309v3429">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Windows</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id39" draw:id="id39" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="81.899cm" svg:y="78.102cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id34" draw:id="id34" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="33.221cm" svg:y="83.036cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Run Disk Utility</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="85.074cm" svg:y1="69.834cm" svg:x2="85.01cm" svg:y2="78.102cm" draw:start-shape="id38" draw:start-glue-point="6" draw:end-shape="id39" svg:d="m85074 69834v4135h-64v4133">
- <text:p text:style-name="P1">mac</text:p>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.328cm" svg:y1="74.768cm" svg:x2="36.332cm" svg:y2="83.036cm" draw:start-shape="id33" draw:start-glue-point="6" draw:end-shape="id34" svg:d="m36328 74768v4135h4v4133">
+ <text:p text:style-name="P1">Mac</text:p>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="78.28cm" svg:y1="79.74cm" svg:x2="82.28cm" svg:y2="82.668cm" draw:start-shape="id37" draw:start-glue-point="6" draw:end-shape="id40" draw:end-glue-point="5" svg:d="m78280 79740v2928h4000">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="29.67cm" svg:y1="84.674cm" svg:x2="33.67cm" svg:y2="87.602cm" draw:start-shape="id32" draw:start-glue-point="6" draw:end-shape="id35" draw:end-glue-point="5" svg:d="m29670 84674v2928h4000">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="85.011cm" svg:y1="79.74cm" svg:x2="84.947cm" svg:y2="82.039cm" draw:start-shape="id39" draw:start-glue-point="6" draw:end-shape="id40" svg:d="m85011 79740v1150h-64v1149">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.333cm" svg:y1="84.674cm" svg:x2="36.337cm" svg:y2="86.973cm" draw:start-shape="id34" draw:start-glue-point="6" draw:end-shape="id35" svg:d="m36333 84674v1150h4v1149">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id41" draw:id="id41" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="89.011cm" svg:y="78.102cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Run GNOME DIsk</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id36" draw:id="id36" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="40.401cm" svg:y="83.036cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Run GNOME Disk</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="86.09cm" svg:y1="67.802cm" svg:x2="92.123cm" svg:y2="78.102cm" draw:start-shape="id38" draw:start-glue-point="7" draw:end-shape="id41" draw:end-glue-point="4" svg:d="m86090 67802h6033v10300">
- <text:p text:style-name="P3"><text:span text:style-name="T2">Linux (fedora...)</text:span></text:p>
- </draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="92.123cm" svg:y1="79.74cm" svg:x2="87.614cm" svg:y2="82.668cm" draw:start-shape="id41" draw:start-glue-point="6" draw:end-shape="id40" draw:end-glue-point="7" svg:d="m92123 79740v2928h-4509">
- <text:p/>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="37.344cm" svg:y1="72.736cm" svg:x2="43.513cm" svg:y2="83.036cm" draw:start-shape="id33" draw:start-glue-point="7" draw:end-shape="id36" draw:end-glue-point="4" svg:d="m37344 72736h6169v10300">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Other Linux</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id51" draw:id="id51" draw:layer="layout" svg:width="5.461cm" svg:height="1.143cm" svg:x="82.153cm" svg:y="111.617cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Minimal Tails on the</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">Second USB KEY</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
- </draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id42" draw:id="id42" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="82.28cm" svg:y="85.455cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Need to reboot on a Temp Tails</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
- </draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="84.947cm" svg:y1="83.296cm" svg:x2="84.947cm" svg:y2="85.455cm" draw:start-shape="id40" draw:start-glue-point="2" draw:end-shape="id42" draw:end-glue-point="4" svg:d="m84947 83296v2159">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="43.513cm" svg:y1="84.674cm" svg:x2="39.004cm" svg:y2="87.602cm" draw:start-shape="id36" draw:start-glue-point="6" draw:end-shape="id35" draw:end-glue-point="7" svg:d="m43513 84674v2928h-4509">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="84.947cm" svg:y1="86.712cm" svg:x2="84.947cm" svg:y2="88.249cm" draw:start-shape="id42" draw:start-glue-point="2" draw:end-shape="id43" draw:end-glue-point="4" svg:d="m84947 86712v1537">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.337cm" svg:y1="88.23cm" svg:x2="36.34cm" svg:y2="92.167cm" draw:start-shape="id35" draw:start-glue-point="2" draw:end-shape="id37" draw:end-glue-point="4" svg:d="m36337 88230v1968h3v1969">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id60" draw:id="id60" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="82.28cm" svg:y="91.805cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">You need to boot on</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">Key XXX</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id38" draw:id="id38" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="33.67cm" svg:y="96.739cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Reboot on temporary Tails</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Try boot menu key XXX</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id44" draw:id="id44" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="82.28cm" svg:y="94.472cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Boot on Temp Tails</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
- </draw:custom-shape>
- <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P3" xml:id="id45" draw:id="id45" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="82.915cm" svg:y="97.393cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Is it a Temp Tails ?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P3" xml:id="id39" draw:id="id39" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="34.305cm" svg:y="102.327cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Is it a temporary Tails?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="84.947cm" svg:y1="95.729cm" svg:x2="84.947cm" svg:y2="97.393cm" draw:start-shape="id44" draw:start-glue-point="6" draw:end-shape="id45" draw:end-glue-point="4" svg:d="m84947 95729v1664">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.337cm" svg:y1="97.996cm" svg:x2="36.337cm" svg:y2="102.327cm" draw:start-shape="id38" draw:start-glue-point="6" draw:end-shape="id39" draw:end-glue-point="4" svg:d="m36337 97996v4331">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id46" draw:id="id46" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="82.28cm" svg:y="103.235cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">Pop up: Go to “Tails installer”</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
- </draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="84.947cm" svg:y1="101.457cm" svg:x2="84.947cm" svg:y2="103.235cm" draw:start-shape="id45" draw:start-glue-point="6" draw:end-shape="id46" draw:end-glue-point="0" svg:d="m84947 101457v1778">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="36.337cm" svg:y1="106.391cm" svg:x2="36.274cm" svg:y2="108.236cm" draw:start-shape="id39" draw:start-glue-point="6" draw:end-shape="id40" draw:end-glue-point="4" svg:d="m36337 106391v923h-63v922">
<text:p text:style-name="P1"><text:span text:style-name="T2">yes</text:span></text:p>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="84.947cm" svg:y1="104.492cm" svg:x2="84.883cm" svg:y2="105.902cm" draw:start-shape="id46" draw:start-glue-point="2" draw:end-shape="id47" svg:d="m84947 104492v705h-64v705">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="30.307cm" svg:y1="117.469cm" svg:x2="30.305cm" svg:y2="119.599cm" draw:start-shape="id41" draw:start-glue-point="6" draw:end-shape="id42" draw:end-glue-point="4" svg:d="m30307 117469v1118h-2v1012">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="73.771cm" svg:y1="112.62cm" svg:x2="78.915cm" svg:y2="114.665cm" draw:start-shape="id48" draw:start-glue-point="6" draw:end-shape="id49" draw:end-glue-point="4" svg:d="m73771 112620v1022h5144v1023">
- <text:p/>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id48" draw:id="id48" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="71.104cm" svg:y="111.363cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Minimal Tails is created</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">on the USB KEY</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id43" draw:id="id43" draw:layer="layout" svg:width="5.461cm" svg:height="1.143cm" svg:x="33.51cm" svg:y="111.003cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Plug destination USB key</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="68.373cm" svg:y1="72.628cm" svg:x2="71.104cm" svg:y2="111.992cm" draw:start-shape="id33" draw:end-shape="id48" draw:end-glue-point="5" svg:d="m68373 72628v39364h2731">
- <text:p/>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id50" draw:id="id50" draw:layer="layout" svg:width="5.461cm" svg:height="1.143cm" svg:x="82.153cm" svg:y="108.569cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Plug a second USB Key</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id40" draw:id="id40" draw:layer="layout" svg:width="6.223cm" svg:height="1.257cm" svg:x="33.162cm" svg:y="108.236cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Open Tails Installer</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id47" draw:id="id47" draw:layer="layout" svg:width="6.223cm" svg:height="1.257cm" svg:x="81.772cm" svg:y="105.902cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Run Tails Installer</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
- </draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="84.883cm" svg:y1="107.159cm" svg:x2="84.884cm" svg:y2="108.569cm" draw:start-shape="id47" draw:start-glue-point="2" draw:end-shape="id50" draw:end-glue-point="4" svg:d="m84883 107159v705h1v705">
- <text:p/>
- </draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="84.884cm" svg:y1="109.712cm" svg:x2="84.883cm" svg:y2="111.617cm" draw:start-shape="id50" draw:start-glue-point="6" draw:end-shape="id51" draw:end-glue-point="0" svg:d="m84884 109712v952h-1v953">
- <text:p/>
- </draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="84.884cm" svg:y1="112.76cm" svg:x2="78.915cm" svg:y2="114.665cm" draw:start-shape="id51" draw:start-glue-point="6" draw:end-shape="id49" draw:end-glue-point="4" svg:d="m84884 112760v952h-5969v953">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.273cm" svg:y1="109.493cm" svg:x2="36.241cm" svg:y2="111.003cm" draw:start-shape="id40" draw:start-glue-point="2" draw:end-shape="id43" draw:end-glue-point="4" svg:d="m36273 109493v755h-32v755">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P3" xml:id="id49" draw:id="id49" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="76.819cm" svg:y="114.665cm">
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id42" draw:id="id42" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="28.209cm" svg:y="119.599cm">
<text:p text:style-name="P1"><text:span text:style-name="T2">Do you want to have</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">Persitant data ?</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">(add this message in Tails Installer too ?)</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Persistence?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="flowchart-decision" draw:enhanced-path="M 0 10800 L 10800 0 21600 10800 10800 21600 0 10800 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P1" draw:layer="layout" svg:width="6.985cm" svg:height="4.826cm" svg:x="81.899cm" svg:y="124.444cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Boot on your Minimal Tail</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr17" draw:text-style-name="P1" xml:id="id62" draw:id="id62" draw:layer="layout" svg:width="6.985cm" svg:height="4.826cm" svg:x="33.356cm" svg:y="129.378cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Boot on minimal Tails</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="1060 3180 20540 18420" draw:type="flowchart-terminator" draw:enhanced-path="M 3470 21600 X 0 10800 3470 0 L 18130 0 X 21600 10800 18130 21600 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="81.01cm" svg:y1="116.506cm" svg:x2="85.963cm" svg:y2="120.38cm" draw:start-shape="id49" draw:start-glue-point="7" draw:end-shape="id52" draw:end-glue-point="4" svg:d="m81010 116506h4953v3874">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="32.4cm" svg:y1="121.44cm" svg:x2="36.846cm" svg:y2="123.84cm" draw:start-shape="id42" draw:start-glue-point="7" draw:end-shape="id44" draw:end-glue-point="4" svg:d="m32400 121440h4446v2400">
<text:p text:style-name="P1"><text:span text:style-name="T2">no</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id62" draw:id="id62" draw:layer="layout" svg:width="8.89cm" svg:height="2.286cm" svg:x="67.929cm" svg:y="124.952cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">You will have to boot on the minimal Tails</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">And go to persistance</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">And reebot one more time</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id52" draw:id="id52" draw:layer="layout" svg:width="8.89cm" svg:height="2.286cm" svg:x="19.319cm" svg:y="126.886cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">- Reboot on the minimal Tails</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">- Go to persistence</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">- Reboot one more time</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P3" xml:id="id57" draw:id="id57" draw:layer="layout" svg:width="4.036cm" svg:height="4.036cm" svg:x="107.934cm" svg:y="96.659cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Is the startup key stored ?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P3" xml:id="id49" draw:id="id49" draw:layer="layout" svg:width="4.036cm" svg:height="4.036cm" svg:x="58.695cm" svg:y="101.993cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Is the boot menu key stored ?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id53" draw:id="id53" draw:layer="layout" svg:width="5.334cm" svg:height="1.13cm" svg:x="69.453cm" svg:y="129.397cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id45" draw:id="id45" draw:layer="layout" svg:width="5.334cm" svg:height="1.13cm" svg:x="21.098cm" svg:y="134.331cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Boot on </text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">The Minimal Tails</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">minimal Tails</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id54" draw:id="id54" draw:layer="layout" svg:width="5.334cm" svg:height="1.13cm" svg:x="69.453cm" svg:y="131.823cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Configure Persistance</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id46" draw:id="id46" draw:layer="layout" svg:width="5.334cm" svg:height="1.13cm" svg:x="21.098cm" svg:y="136.757cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Configure Persistence</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="72.12cm" svg:y1="130.527cm" svg:x2="72.12cm" svg:y2="131.823cm" draw:start-shape="id53" draw:start-glue-point="6" draw:end-shape="id54" draw:end-glue-point="4" svg:d="m72120 130527v1296">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="23.765cm" svg:y1="135.461cm" svg:x2="23.765cm" svg:y2="136.757cm" draw:start-shape="id45" draw:start-glue-point="6" draw:end-shape="id46" draw:end-glue-point="4" svg:d="m23765 135461v1296">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P3" xml:id="id55" draw:id="id55" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="102.854cm" svg:y="105.14cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">What&apos;s the model</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">Of your PC ?</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id47" draw:id="id47" draw:layer="layout" svg:width="4.191cm" svg:height="3.683cm" svg:x="55.235cm" svg:y="110.474cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Brand and model</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T2">of the computer?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="5400 5400 16200 16200" draw:type="flowchart-decision" draw:enhanced-path="M 0 10800 L 10800 0 21600 10800 10800 21600 0 10800 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P5" xml:id="id56" draw:id="id56" draw:layer="layout" svg:width="4.445cm" svg:height="2.413cm" svg:x="102.727cm" svg:y="110.474cm">
+ <draw:custom-shape draw:style-name="gr13" draw:text-style-name="P5" xml:id="id48" draw:id="id48" draw:layer="layout" svg:width="4.445cm" svg:height="2.413cm" svg:x="55.108cm" svg:y="115.808cm">
<text:p text:style-name="P1"><text:span text:style-name="T5">Search the good key</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 20320 21600 10800" draw:text-areas="0 0 21600 17360" draw:type="flowchart-document" draw:enhanced-path="M 0 0 L 21600 0 21600 17360 C 13050 17220 13340 20770 5620 21600 2860 21100 1850 20700 0 20120 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="104.95cm" svg:y1="108.823cm" svg:x2="104.95cm" svg:y2="110.474cm" draw:start-shape="id55" draw:start-glue-point="6" draw:end-shape="id56" draw:end-glue-point="4" svg:d="m104950 108823v1651">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="57.331cm" svg:y1="114.157cm" svg:x2="57.331cm" svg:y2="115.808cm" draw:start-shape="id47" draw:start-glue-point="6" draw:end-shape="id48" draw:end-glue-point="4" svg:d="m57331 114157v1651">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P1" draw:layer="layout" svg:width="6.985cm" svg:height="2.667cm" svg:x="68.437cm" svg:y="134.858cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Boot on Full-Features tails</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr17" draw:text-style-name="P1" xml:id="id67" draw:id="id67" draw:layer="layout" svg:width="6.985cm" svg:height="2.667cm" svg:x="20.262cm" svg:y="140.192cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Boot on full-featured Tails</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="1060 3180 20540 18420" draw:type="flowchart-terminator" draw:enhanced-path="M 3470 21600 X 0 10800 3470 0 L 18130 0 X 21600 10800 18130 21600 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" draw:layer="layout" svg:width="3.556cm" svg:height="1.905cm" svg:x="99.806cm" svg:y="95.615cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Find the boot menu</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">Key wizard</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="0 0 21600 17150" draw:type="flowchart-off-page-connector" draw:enhanced-path="M 0 0 L 21600 0 21600 17150 10800 21600 0 17150 0 0 Z N"/>
- </draw:custom-shape>
- <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id52" draw:id="id52" draw:layer="layout" svg:width="3.556cm" svg:height="1.905cm" svg:x="84.185cm" svg:y="120.38cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Find the boot menu</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">Key wizard</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="0 0 21600 17150" draw:type="flowchart-off-page-connector" draw:enhanced-path="M 0 0 L 21600 0 21600 17150 10800 21600 0 17150 0 0 Z N"/>
+ <draw:custom-shape draw:style-name="gr17" draw:text-style-name="P3" draw:layer="layout" svg:width="5.461cm" svg:height="1.905cm" svg:x="49.291cm" svg:y="100.549cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Boot menu key assistant</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="0 0 21600 17150" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:type="flowchart-off-page-connector" draw:enhanced-path="M 0 0 L 21600 0 21600 17150 10800 21600 0 17150 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id58" draw:id="id58" draw:layer="layout" svg:width="5.334cm" svg:height="1.27cm" svg:x="104.632cm" svg:y="119.491cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Display the Keys</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id50" draw:id="id50" draw:layer="layout" svg:width="7.112cm" svg:height="1.27cm" svg:x="53.741cm" svg:y="124.571cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Display boot menu key options</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="108.943cm" svg:y1="98.677cm" svg:x2="104.95cm" svg:y2="105.14cm" draw:start-shape="id57" draw:start-glue-point="5" draw:end-shape="id55" draw:end-glue-point="4" svg:d="m108943 98677h-3993v6463">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="59.704cm" svg:y1="104.011cm" svg:x2="57.331cm" svg:y2="110.474cm" draw:start-shape="id49" draw:start-glue-point="5" draw:end-shape="id47" draw:end-glue-point="4" svg:d="m59704 104011h-2373v6463">
<text:p text:style-name="P1"><text:span text:style-name="T2">no</text:span></text:p>
</draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="110.961cm" svg:y1="98.677cm" svg:x2="109.966cm" svg:y2="120.126cm" draw:start-shape="id57" draw:start-glue-point="7" draw:end-shape="id58" draw:end-glue-point="7" svg:d="m110961 98677h1903v21449h-2898">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="61.722cm" svg:y1="104.011cm" svg:x2="60.853cm" svg:y2="125.206cm" draw:start-shape="id49" draw:start-glue-point="7" draw:end-shape="id50" draw:end-glue-point="7" svg:d="m61722 104011h2249v21195h-3118">
<text:p text:style-name="P1"><text:span text:style-name="T2">yes</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id59" draw:id="id59" draw:layer="layout" svg:width="5.334cm" svg:height="1.13cm" svg:x="103.489cm" svg:y="115.681cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Save (or print) the key</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id51" draw:id="id51" draw:layer="layout" svg:width="5.334cm" svg:height="1.13cm" svg:x="54.655cm" svg:y="121.015cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Save (or print) key</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="104.95cm" svg:y1="112.744cm" svg:x2="106.156cm" svg:y2="115.681cm" draw:start-shape="id56" draw:start-glue-point="6" draw:end-shape="id59" draw:end-glue-point="4" svg:d="m104950 112744v1540h1206v1397">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="57.331cm" svg:y1="118.078cm" svg:x2="57.322cm" svg:y2="121.015cm" draw:start-shape="id48" draw:start-glue-point="6" draw:end-shape="id51" draw:end-glue-point="4" svg:d="m57331 118078v1540h-9v1397">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="106.156cm" svg:y1="116.811cm" svg:x2="107.299cm" svg:y2="119.491cm" draw:start-shape="id59" draw:start-glue-point="6" draw:end-shape="id58" svg:d="m106156 116811v1341h1143v1339">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="57.322cm" svg:y1="122.145cm" svg:x2="57.297cm" svg:y2="124.571cm" draw:start-shape="id51" draw:start-glue-point="6" draw:end-shape="id50" svg:d="m57322 122145v1214h-25v1212">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id43" draw:id="id43" draw:layer="layout" svg:width="3.556cm" svg:height="1.905cm" svg:x="83.169cm" svg:y="88.249cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Find the key</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T2">wizard</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="0 0 21600 17150" draw:type="flowchart-off-page-connector" draw:enhanced-path="M 0 0 L 21600 0 21600 17150 10800 21600 0 17150 0 0 Z N"/>
- </draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="84.947cm" svg:y1="90.154cm" svg:x2="84.947cm" svg:y2="91.805cm" draw:start-shape="id43" draw:start-glue-point="6" draw:end-shape="id60" draw:end-glue-point="4" svg:d="m84947 90154v1651">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.34cm" svg:y1="94.072cm" svg:x2="36.337cm" svg:y2="96.739cm" draw:start-shape="id37" draw:start-glue-point="6" draw:end-shape="id38" draw:end-glue-point="4" svg:d="m36340 94072v1333h-3v1334">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr5" draw:text-style-name="P3" xml:id="id61" draw:id="id61" draw:layer="layout" svg:width="3.556cm" svg:height="1.905cm" svg:x="70.596cm" svg:y="120.634cm">
- <text:p text:style-name="P1"><text:span text:style-name="T2">Find the boot menu</text:span><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T2">key wizard</text:span></text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="0 0 21600 17150" draw:type="flowchart-off-page-connector" draw:enhanced-path="M 0 0 L 21600 0 21600 17150 10800 21600 0 17150 0 0 Z N"/>
- </draw:custom-shape>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="76.819cm" svg:y1="116.506cm" svg:x2="72.374cm" svg:y2="120.634cm" draw:start-shape="id49" draw:start-glue-point="5" draw:end-shape="id61" draw:end-glue-point="4" svg:d="m76819 116506h-4445v4128">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="28.209cm" svg:y1="121.44cm" svg:x2="23.764cm" svg:y2="126.886cm" draw:start-shape="id42" draw:start-glue-point="5" draw:end-shape="id52" draw:end-glue-point="4" svg:d="m28209 121440h-4445v5446">
<text:p text:style-name="P1"><text:span text:style-name="T2">yes</text:span></text:p>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="72.374cm" svg:y1="122.539cm" svg:x2="72.374cm" svg:y2="124.952cm" draw:start-shape="id61" draw:start-glue-point="6" draw:end-shape="id62" draw:end-glue-point="4" svg:d="m72374 122539v2413">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="47.64cm" svg:y1="24.984cm" svg:x2="42.163cm" svg:y2="28.55cm" draw:start-shape="id3" draw:start-glue-point="6" draw:end-shape="id18" draw:end-glue-point="7" svg:d="m47640 24984v3566h-5477">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="96.25cm" svg:y1="20.05cm" svg:x2="89.773cm" svg:y2="24.616cm" draw:start-shape="id3" draw:start-glue-point="6" draw:end-shape="id18" draw:end-glue-point="7" svg:d="m96250 20050v4566h-6477">
- <text:p/>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr15" draw:text-style-name="P3" xml:id="id63" draw:id="id63" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="101.584cm" svg:y="60.817cm">
+ <draw:custom-shape draw:style-name="gr14" draw:text-style-name="P3" xml:id="id25" draw:id="id25" draw:layer="layout" svg:width="4.064cm" svg:height="4.064cm" svg:x="50.974cm" svg:y="62.751cm">
<text:p text:style-name="P1"><text:span text:style-name="T2">OS ?</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 5400 10800 10800 21600 16200 10800" draw:text-areas="5400 10800 16200 21600" draw:type="flowchart-extract" draw:enhanced-path="M 10800 0 L 21600 21600 0 21600 10800 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="104.124cm" svg:y1="59.039cm" svg:x2="103.616cm" svg:y2="60.817cm" draw:start-shape="id30" draw:start-glue-point="2" draw:end-shape="id63" draw:end-glue-point="4" svg:d="m104124 59039v889h-508v889">
- <text:p/>
- </draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id64" draw:id="id64" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="100.568cm" svg:y="73.644cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Use or install tools </text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id53" draw:id="id53" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="49.881cm" svg:y="73.578cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Use or install tools</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="103.616cm" svg:y1="64.881cm" svg:x2="103.68cm" svg:y2="73.644cm" draw:start-shape="id63" draw:start-glue-point="6" draw:end-shape="id64" draw:end-glue-point="4" svg:d="m103616 64881v4382h64v4381">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="53.006cm" svg:y1="66.815cm" svg:x2="52.993cm" svg:y2="73.578cm" draw:start-shape="id25" draw:start-glue-point="6" draw:end-shape="id53" draw:end-glue-point="4" svg:d="m53006 66815v3382h-13v3381">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id65" draw:id="id65" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="100.568cm" svg:y="81.531cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id54" draw:id="id54" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="49.89cm" svg:y="82.692cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Temp Tails is burn</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">On DVD</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">on DVD</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="103.68cm" svg:y1="75.282cm" svg:x2="103.68cm" svg:y2="81.531cm" draw:start-shape="id64" draw:start-glue-point="6" draw:end-shape="id65" draw:end-glue-point="4" svg:d="m103680 75282v6249">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="52.993cm" svg:y1="75.216cm" svg:x2="53.002cm" svg:y2="82.692cm" draw:start-shape="id53" draw:start-glue-point="6" draw:end-shape="id54" draw:end-glue-point="4" svg:d="m52993 75216v3739h9v3737">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="103.68cm" svg:y1="83.169cm" svg:x2="87.614cm" svg:y2="86.084cm" draw:start-shape="id65" draw:start-glue-point="6" draw:end-shape="id42" draw:end-glue-point="7" svg:d="m103680 83169v2915h-16066">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="53.002cm" svg:y1="84.33cm" svg:x2="39.07cm" svg:y2="93.12cm" draw:start-shape="id54" draw:start-glue-point="6" draw:end-shape="id37" draw:end-glue-point="7" svg:d="m53002 84330v8790h-13932">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="85.328cm" svg:y1="8.874cm" svg:x2="88.122cm" svg:y2="14.589cm" draw:start-shape="id14" draw:start-glue-point="5" draw:end-shape="id17" draw:end-glue-point="4" svg:d="m85328 8874h-502v4001h3296v1714">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P3" draw:layer="layout" svg:x1="36.718cm" svg:y1="13.808cm" svg:x2="39.512cm" svg:y2="19.523cm" draw:start-shape="id16" draw:start-glue-point="5" draw:end-shape="id17" draw:end-glue-point="4" svg:d="m36718 13808h-502v4001h3296v1714">
<text:p text:style-name="P1"><text:span text:style-name="T2">no</text:span></text:p>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id23" draw:id="id23" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="82.247cm" svg:y="41.805cm">
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id69" draw:id="id69" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="33.637cm" svg:y="46.739cm">
<text:p text:style-name="P1"><text:span text:style-name="T1">Install extension</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1">With Debian Store</text:span></text:p>
+ <text:p text:style-name="P1"><text:span text:style-name="T1">from browser store</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="79.867cm" svg:y1="20.05cm" svg:x2="84.439cm" svg:y2="24.616cm" draw:start-shape="id2" draw:start-glue-point="6" draw:end-shape="id18" draw:end-glue-point="5" svg:d="m79867 20050v4566h4572">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="31.257cm" svg:y1="24.984cm" svg:x2="36.829cm" svg:y2="28.55cm" draw:start-shape="id2" draw:start-glue-point="6" draw:end-shape="id18" draw:end-glue-point="5" svg:d="m31257 24984v3566h5572">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr18" draw:text-style-name="P1" draw:layer="layout" svg:width="1.651cm" svg:height="2.413cm" svg:x="87.741cm" svg:y="107.934cm">
+ <draw:custom-shape draw:style-name="gr18" draw:text-style-name="P1" draw:layer="layout" svg:width="2.192cm" svg:height="2.413cm" svg:x="39.098cm" svg:y="110.368cm">
<text:p text:style-name="P1">KEY 2</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr19" draw:text-style-name="P1" draw:layer="layout" svg:width="1.617cm" svg:height="3.087cm" svg:x="107.079cm" svg:y="80.463cm">
+ <draw:custom-shape draw:style-name="gr19" draw:text-style-name="P1" draw:layer="layout" svg:width="1.617cm" svg:height="3.087cm" svg:x="56.401cm" svg:y="81.624cm">
<text:p text:style-name="P1">DVD</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr19" draw:text-style-name="P1" draw:layer="layout" svg:width="1.871cm" svg:height="2.921cm" svg:x="95.361cm" svg:y="77.581cm">
+ <draw:custom-shape draw:style-name="gr19" draw:text-style-name="P1" draw:layer="layout" svg:width="1.871cm" svg:height="2.921cm" svg:x="46.751cm" svg:y="82.515cm">
<text:p text:style-name="P1">KEY 1</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr18" draw:text-style-name="P1" draw:layer="layout" svg:width="1.651cm" svg:height="3.937cm" svg:x="70.596cm" svg:y="69.453cm">
- <text:p text:style-name="P1">KEY</text:p>
- <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
- </draw:custom-shape>
- <draw:frame draw:style-name="gr20" draw:layer="layout" svg:width="5.55cm" svg:height="2.308cm" svg:x="85.836cm" svg:y="96.123cm">
+ <draw:frame draw:style-name="gr20" draw:layer="layout" svg:width="5.55cm" svg:height="2.308cm" svg:x="36.426cm" svg:y="100.757cm">
<draw:text-box>
- <text:p>TMP TAILS</text:p>
+ <text:p>Temporary Tails</text:p>
<text:p><text:s/>(DVD or KEY 1)</text:p>
</draw:text-box>
</draw:frame>
- <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="86.217cm" svg:y1="19.368cm" svg:x2="78.597cm" svg:y2="16.056cm" draw:start-shape="id1" draw:end-shape="id66" draw:end-glue-point="7" svg:d="m86217 19368h-3912v-3312h-3708">
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="37.841cm" svg:y1="24.302cm" svg:x2="32.146cm" svg:y2="17.942cm" draw:start-shape="id1" draw:end-shape="id55" draw:end-glue-point="7" svg:d="m37841 24302h-2950v-6360h-2745">
<text:p text:style-name="P1">wget</text:p>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="73.263cm" svg:y1="16.056cm" svg:x2="56.944cm" svg:y2="35.43cm" draw:start-shape="id66" draw:start-glue-point="5" draw:end-shape="id67" draw:end-glue-point="4" svg:d="m73263 16056h-16319v19374">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="26.812cm" svg:y1="17.942cm" svg:x2="8.434cm" svg:y2="40.364cm" draw:start-shape="id55" draw:start-glue-point="5" draw:end-shape="id56" draw:end-glue-point="4" svg:d="m26812 17942h-18378v22422">
<text:p/>
</draw:connector>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id68" draw:id="id68" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="53.959cm" svg:y="64.373cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Apt-get install Tails Installer</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id57" draw:id="id57" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="5.349cm" svg:y="69.307cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">apt-get install tails-installer</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id67" draw:id="id67" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="53.832cm" svg:y="35.43cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Cmd line Keyring</text:span></text:p>
- <text:p text:style-name="P1"><text:span text:style-name="T1"/></text:p>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id56" draw:id="id56" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="5.322cm" svg:y="40.364cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Verify using Debian keyring</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="56.944cm" svg:y1="37.068cm" svg:x2="57.071cm" svg:y2="64.373cm" draw:start-shape="id67" draw:start-glue-point="6" draw:end-shape="id68" draw:end-glue-point="4" svg:d="m56944 37068v13653h127v13652">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="8.434cm" svg:y1="42.002cm" svg:x2="8.461cm" svg:y2="69.307cm" draw:start-shape="id56" draw:start-glue-point="6" draw:end-shape="id57" draw:end-glue-point="4" svg:d="m8434 42002v13653h27v13652">
+ <text:p/>
+ </draw:connector>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id58" draw:id="id58" draw:layer="layout" svg:width="5.334cm" svg:height="1.257cm" svg:x="36.881cm" svg:y="39.983cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Confirm Debian version</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="39.548cm" svg:y1="41.24cm" svg:x2="39.539cm" svg:y2="42.002cm" draw:start-shape="id58" draw:start-glue-point="6" draw:end-shape="id59" draw:end-glue-point="4" svg:d="m39548 41240v381h-9v381">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="39.53cm" svg:y1="39.031cm" svg:x2="39.548cm" svg:y2="39.983cm" draw:start-shape="id60" draw:start-glue-point="6" draw:end-shape="id58" draw:end-glue-point="4" svg:d="m39530 39031v536h18v416">
+ <text:p/>
+ </draw:connector>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id61" draw:id="id61" draw:layer="layout" svg:width="8.89cm" svg:height="1.638cm" svg:x="21.859cm" svg:y="50.263cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Download again</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="39.893cm" svg:y1="52.988cm" svg:x2="26.304cm" svg:y2="51.901cm" draw:start-shape="id5" draw:start-glue-point="5" draw:end-shape="id61" draw:end-glue-point="6" svg:d="m39893 52988h-13589v-1087">
+ <text:p text:style-name="P1">Incomplete</text:p>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="26.304cm" svg:y1="50.263cm" svg:x2="36.591cm" svg:y2="20.412cm" draw:start-shape="id61" draw:start-glue-point="4" draw:end-shape="id17" draw:end-glue-point="5" svg:d="m26304 50263v-29851h10287">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.241cm" svg:y1="112.146cm" svg:x2="32.529cm" svg:y2="116.685cm" draw:start-shape="id43" draw:start-glue-point="6" draw:end-shape="id41" draw:end-glue-point="7" svg:d="m36241 112146v4539h-3712">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.846cm" svg:y1="125.745cm" svg:x2="36.849cm" svg:y2="129.378cm" draw:start-shape="id44" draw:start-glue-point="6" draw:end-shape="id62" draw:end-glue-point="4" svg:d="m36846 125745v1817h3v1816">
+ <text:p/>
+ </draw:connector>
+ <draw:custom-shape draw:style-name="gr13" draw:text-style-name="P5" xml:id="id41" draw:id="id41" draw:layer="layout" svg:width="4.445cm" svg:height="1.778cm" svg:x="28.084cm" svg:y="115.796cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T5">Run Tails Installer</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 20320 21600 10800" draw:text-areas="0 0 21600 17360" draw:type="flowchart-document" draw:enhanced-path="M 0 0 L 21600 0 21600 17360 C 13050 17220 13340 20770 5620 21600 2860 21100 1850 20700 0 20120 Z N"/>
+ </draw:custom-shape>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id63" draw:id="id63" draw:layer="layout" svg:width="6.223cm" svg:height="1.638cm" svg:x="5.318cm" svg:y="82.655cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Tails Installer command line</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="8.43cm" svg:y1="84.293cm" svg:x2="28.084cm" svg:y2="116.685cm" draw:start-shape="id63" draw:start-glue-point="6" draw:end-shape="id41" draw:end-glue-point="5" svg:d="m8430 84293v32392h19654">
+ <text:p/>
+ </draw:connector>
+ <draw:custom-shape draw:style-name="gr18" draw:text-style-name="P1" draw:layer="layout" svg:width="2.174cm" svg:height="2.413cm" svg:x="11.259cm" svg:y="74.768cm">
+ <text:p text:style-name="P1">KEY 1</text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id64" draw:id="id64" draw:layer="layout" svg:width="5.461cm" svg:height="1.143cm" svg:x="5.686cm" svg:y="75.403cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Plug destination USB key</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="8.461cm" svg:y1="70.945cm" svg:x2="8.417cm" svg:y2="75.403cm" draw:start-shape="id57" draw:start-glue-point="6" draw:end-shape="id64" draw:end-glue-point="4" svg:d="m8461 70945v2229h-44v2229">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="8.417cm" svg:y1="76.546cm" svg:x2="8.43cm" svg:y2="82.655cm" draw:start-shape="id64" draw:start-glue-point="6" draw:end-shape="id63" draw:end-glue-point="4" svg:d="m8417 76546v3055h13v3054">
+ <text:p/>
+ </draw:connector>
+ <draw:custom-shape draw:style-name="gr18" draw:text-style-name="P1" draw:layer="layout" svg:width="2.174cm" svg:height="2.413cm" svg:x="22.626cm" svg:y="84.167cm">
+ <text:p text:style-name="P1">KEY 1</text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id65" draw:id="id65" draw:layer="layout" svg:width="5.461cm" svg:height="1.143cm" svg:x="17.053cm" svg:y="84.802cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Plug destination USB key</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="19.764cm" svg:y1="77.562cm" svg:x2="19.784cm" svg:y2="84.802cm" draw:start-shape="id28" draw:start-glue-point="6" draw:end-shape="id65" draw:end-glue-point="4" svg:d="m19764 77562v3620h20v3620">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="19.784cm" svg:y1="85.945cm" svg:x2="28.084cm" svg:y2="116.685cm" draw:start-shape="id65" draw:start-glue-point="6" draw:end-shape="id41" draw:end-glue-point="5" svg:d="m19784 85945v30740h8300">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="23.764cm" svg:y1="129.172cm" svg:x2="23.752cm" svg:y2="130.494cm" draw:start-shape="id52" draw:start-glue-point="6" draw:end-shape="id66" draw:end-glue-point="4" svg:d="m23764 129172v661h-12v661">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="23.752cm" svg:y1="132.399cm" svg:x2="23.765cm" svg:y2="134.331cm" draw:start-shape="id66" draw:start-glue-point="6" draw:end-shape="id45" draw:end-glue-point="4" svg:d="m23752 132399v966h13v966">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="23.765cm" svg:y1="137.887cm" svg:x2="23.755cm" svg:y2="140.192cm" draw:start-shape="id46" draw:start-glue-point="6" draw:end-shape="id67" draw:end-glue-point="4" svg:d="m23765 137887v1153h-10v1152">
+ <text:p/>
+ </draw:connector>
+ <draw:custom-shape draw:style-name="gr17" draw:text-style-name="P3" xml:id="id37" draw:id="id37" draw:layer="layout" svg:width="5.461cm" svg:height="1.905cm" svg:x="33.609cm" svg:y="92.167cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Boot menu key assistant</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="0 0 21600 17150" draw:type="flowchart-off-page-connector" draw:enhanced-path="M 0 0 L 21600 0 21600 17150 10800 21600 0 17150 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:custom-shape draw:style-name="gr17" draw:text-style-name="P3" xml:id="id44" draw:id="id44" draw:layer="layout" svg:width="5.461cm" svg:height="1.905cm" svg:x="34.115cm" svg:y="123.84cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Boot menu key assistant</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="0 0 21600 17150" draw:type="flowchart-off-page-connector" draw:enhanced-path="M 0 0 L 21600 0 21600 17150 10800 21600 0 17150 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:custom-shape draw:style-name="gr17" draw:text-style-name="P3" xml:id="id66" draw:id="id66" draw:layer="layout" svg:width="5.461cm" svg:height="1.905cm" svg:x="21.021cm" svg:y="130.494cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T2">Boot menu key assistant</text:span></text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:text-areas="0 0 21600 17150" draw:type="flowchart-off-page-connector" draw:enhanced-path="M 0 0 L 21600 0 21600 17150 10800 21600 0 17150 0 0 Z N"/>
+ </draw:custom-shape>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="43.582cm" svg:y1="17.791cm" svg:x2="39.512cm" svg:y2="19.523cm" draw:start-shape="id11" draw:start-glue-point="5" draw:end-shape="id17" draw:end-glue-point="4" svg:d="m43582 17791h-4070v1732">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="41.925cm" svg:y1="13.808cm" svg:x2="46.058cm" svg:y2="14.816cm" draw:start-shape="id16" draw:start-glue-point="7" draw:end-shape="id10" draw:end-glue-point="4" svg:d="m41925 13808h4133v1008">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="49.323cm" svg:y1="46.431cm" svg:x2="50.783cm" svg:y2="48.724cm" draw:start-shape="id68" draw:start-glue-point="6" draw:end-shape="id7" draw:end-glue-point="5" svg:d="m49323 46431v2293h1460">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="60.181cm" svg:y1="44.653cm" svg:x2="62.594cm" svg:y2="44.674cm" draw:start-shape="id6" draw:start-glue-point="7" draw:end-shape="id21" svg:d="m60181 44653h1207v21h1206">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="54.466cm" svg:y1="39.827cm" svg:x2="58.086cm" svg:y2="42.748cm" draw:start-shape="id20" draw:start-glue-point="7" draw:end-shape="id6" draw:end-glue-point="4" svg:d="m54466 39827h3620v2921">
+ <text:p text:style-name="P1">No</text:p>
+ </draw:connector>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="40.512cm" svg:y1="33.355cm" svg:x2="51.291cm" svg:y2="33.35cm" draw:start-shape="id19" draw:start-glue-point="7" draw:end-shape="id12" svg:d="m40512 33355h5898v-5h4881">
+ <text:p text:style-name="P1">no</text:p>
+ </draw:connector>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="52.434cm" svg:y1="39.827cm" svg:x2="49.323cm" svg:y2="42.748cm" draw:start-shape="id20" draw:start-glue-point="5" draw:end-shape="id68" draw:end-glue-point="4" svg:d="m52434 39827h-3111v2921">
+ <text:p text:style-name="P1">Yes</text:p>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="47.227cm" svg:y1="44.589cm" svg:x2="41.689cm" svg:y2="38.135cm" draw:start-shape="id68" draw:start-glue-point="5" draw:end-shape="id60" draw:end-glue-point="7" svg:d="m47227 44589h-2769v-6454h-2769">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="39.496cm" svg:y1="35.387cm" svg:x2="39.53cm" svg:y2="37.119cm" draw:start-shape="id19" draw:start-glue-point="6" draw:end-shape="id60" draw:end-glue-point="4" svg:d="m39496 35387v867h34v865">
+ <text:p/>
+ </draw:connector>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="37.443cm" svg:y1="43.907cm" svg:x2="36.304cm" svg:y2="46.739cm" draw:start-shape="id59" draw:start-glue-point="5" draw:end-shape="id69" draw:end-glue-point="4" svg:d="m37443 43907h-1139v2832">
+ <text:p text:style-name="P1">no</text:p>
+ </draw:connector>
+ <draw:connector draw:style-name="gr7" draw:text-style-name="P1" draw:layer="layout" svg:x1="41.634cm" svg:y1="43.907cm" svg:x2="42.396cm" svg:y2="46.701cm" draw:start-shape="id59" draw:start-glue-point="7" draw:end-shape="id70" draw:end-glue-point="4" svg:d="m41634 43907h762v2794">
+ <text:p text:style-name="P1">yes</text:p>
+ </draw:connector>
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="42.396cm" svg:y1="47.958cm" svg:x2="36.346cm" svg:y2="49.622cm" draw:start-shape="id70" draw:start-glue-point="6" draw:end-shape="id4" draw:end-glue-point="4" svg:d="m42396 47958v832h-6050v832">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr13" draw:text-style-name="P1" draw:layer="layout" svg:x1="57.071cm" svg:y1="66.011cm" svg:x2="71.104cm" svg:y2="111.992cm" draw:start-shape="id68" draw:start-glue-point="6" draw:end-shape="id48" draw:end-glue-point="5" svg:d="m57071 66011v45981h14033">
+ <draw:connector draw:style-name="gr12" draw:text-style-name="P1" draw:layer="layout" svg:x1="36.304cm" svg:y1="47.996cm" svg:x2="36.346cm" svg:y2="49.622cm" draw:start-shape="id69" draw:start-glue-point="6" draw:end-shape="id4" draw:end-glue-point="4" svg:d="m36304 47996v813h42v813">
<text:p/>
</draw:connector>
</draw:page>
diff --git a/wiki/src/blueprint/bootstrapping_workflow/booting.mdwn b/wiki/src/blueprint/bootstrapping/booting.mdwn
index 38fcfe8..38fcfe8 100644
--- a/wiki/src/blueprint/bootstrapping_workflow/booting.mdwn
+++ b/wiki/src/blueprint/bootstrapping/booting.mdwn
diff --git a/wiki/src/blueprint/download_extension.mdwn b/wiki/src/blueprint/bootstrapping/extension.mdwn
index 50efbe3..4dfb39a 100644
--- a/wiki/src/blueprint/download_extension.mdwn
+++ b/wiki/src/blueprint/bootstrapping/extension.mdwn
@@ -16,6 +16,12 @@ Objectives
This would fix the main stumbling block for Tails verification (and thus
installation) for the vast majority of users.
+No objectives
+=============
+
+ - Download ISO images not for the latest release version.
+ - Verify ISO images downloaded from nightly.tails.boum.org.
+
Security considerations
=======================
@@ -70,11 +76,22 @@ ISO verification
- Otherwise it shows the result in a popup message and points to the
appropriate page.
+ISO verification mechanisms
+===========================
+
+We're considering three possible verification mechanisms, each of those
+have to be checked against feasibility. By order of preference:
+
+ A. OpenPGP signature verification, against our signing key included in
+ the extension.
+ B. Checksum correlation against boum.org and an other site.
+ C. Checksum against boum.org
+
Other desirable features
========================
- Be able to use that extension, once installed to verify ISO images
- downloaded using BitTorrent or nightly.tails.boum.org.
+ downloaded using BitTorrent.
- Be able to use that extension to verify other ISO images, testing images,
older ISO images, etc. In that case the user would be warned about the
deprectated or experimental status of the ISO image.
diff --git a/wiki/src/blueprint/bootstrapping/installer.mdwn b/wiki/src/blueprint/bootstrapping/installer.mdwn
new file mode 100644
index 0000000..1986ace
--- /dev/null
+++ b/wiki/src/blueprint/bootstrapping/installer.mdwn
@@ -0,0 +1,72 @@
+[[!meta title="Tails Installer"]]
+
+Vision
+======
+
+Installing Tails onto a USB stick is probably the most common and
+recommended scenario when started with Tails as this allows incremental
+upgrades and persistence.
+
+But as of 2014, getting Tails installed on a USB stick requires having a
+first temporary Tails to boot from and then running Tails Installer.
+Also, due to the way Tails Installer partitions the USB stick, this
+requires having two USB sticks and going through manual installation
+steps, often using command line.
+
+We want to eliminate the need for a first temporary Tails and have Tails
+Installer available on Linux, Windows, and Mac OS.
+
+As part of the ISO verification process we also want to push more
+verification logic to Tails Installer. See the [[blueprint on ISO
+verification|verification]].
+
+Tails Installer is also used to do full upgrades. We want to move this
+to Tails Upgrader. See the [[blueprint on Tails Upgrader|upgrade]].
+
+Roadmap
+=======
+
+2015
+----
+
+In 2015 we will work on porting Tails Installer to Debian. This is a
+first step before having Tails available on other platform. This
+requires rethinking the scenarios in which Tails Installer is used
+([[!tails_ticket 7046]]) and adapting its interface accordingly.
+
+Those are the improvements that we propose for 2015:
+
+- Remove the splash screen:
+ - Outside of Tails
+ - In Tails, add a "Clone" button to the main interface
+- Implement "Install from ISO".
+- Autodetect if the destination key has Tails already.
+ - Then display "Install" and "Upgrade" buttons accordingly.
+- Make it possible to do "Install from ISO" and "Upgrade from ISO" from
+ the command line. See the [[Debian Hacker|bootstrapping#tools]] bootstrapping path.
+- Rework the wording of the main interface.
+- Add visual and textual context to main interface.
+- Point to website to download ISO if outside of Tails.
+- Add second button "Upgrade" below or side-by-side with "Install"
+ button.
+- Add a splash about creating persistence after rebooting.
+
+This will have to be coordinated with the Ubuntu release calendar.
+Ubuntu 15.10 is planned to be freezed in August 2015.
+
+Bonus for 2015
+--------------
+
+The following improvements would be nice addition to the roadmap for
+2015, if possible:
+
+- Store version of Tails on destination key after install and upgrade.
+ - This would allow to display version in "Target Device".
+- Have Tails Installer available on Mac as it seems hard to find a
+ graphical installation technique.
+
+Future
+------
+
+- Push more ISO verification logic pushed to Tails Installer. See the
+ [[blueprint on ISO verification|verification]].
diff --git a/wiki/src/blueprint/bootstrapping_workflow/iso_verification_automation_proposals.ods b/wiki/src/blueprint/bootstrapping/iso_verification_automation_proposals.ods
index 82aee29..82aee29 100644
--- a/wiki/src/blueprint/bootstrapping_workflow/iso_verification_automation_proposals.ods
+++ b/wiki/src/blueprint/bootstrapping/iso_verification_automation_proposals.ods
Binary files differ
diff --git a/wiki/src/blueprint/bootstrapping_workflow/tools.fodg b/wiki/src/blueprint/bootstrapping/tools.fodg
index 317c637..8346df4 100644
--- a/wiki/src/blueprint/bootstrapping_workflow/tools.fodg
+++ b/wiki/src/blueprint/bootstrapping/tools.fodg
@@ -4,10 +4,10 @@
<office:meta><meta:initial-creator>Debian user</meta:initial-creator><meta:creation-date>2015-02-02T10:48:46</meta:creation-date><meta:generator>LibreOffice/3.5$Linux_x86 LibreOffice_project/350m1$Build-2</meta:generator><meta:document-statistic meta:object-count="38"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
- <config:config-item config:name="VisibleAreaTop" config:type="int">11032</config:config-item>
- <config:config-item config:name="VisibleAreaLeft" config:type="int">-5740</config:config-item>
- <config:config-item config:name="VisibleAreaWidth" config:type="int">42512</config:config-item>
- <config:config-item config:name="VisibleAreaHeight" config:type="int">21793</config:config-item>
+ <config:config-item config:name="VisibleAreaTop" config:type="int">-2339</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">-2684</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">42511</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">21792</config:config-item>
<config:config-item-map-indexed config:name="Views">
<config:config-item-map-entry>
<config:config-item config:name="ViewId" config:type="string">view1</config:config-item>
@@ -37,10 +37,10 @@
<config:config-item config:name="EditModeStandard" config:type="int">0</config:config-item>
<config:config-item config:name="EditModeNotes" config:type="int">0</config:config-item>
<config:config-item config:name="EditModeHandout" config:type="int">1</config:config-item>
- <config:config-item config:name="VisibleAreaTop" config:type="int">11032</config:config-item>
- <config:config-item config:name="VisibleAreaLeft" config:type="int">-5740</config:config-item>
- <config:config-item config:name="VisibleAreaWidth" config:type="int">42514</config:config-item>
- <config:config-item config:name="VisibleAreaHeight" config:type="int">21795</config:config-item>
+ <config:config-item config:name="VisibleAreaTop" config:type="int">-2339</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">-2684</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">36352</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">18637</config:config-item>
<config:config-item config:name="GridCoarseWidth" config:type="int">1270</config:config-item>
<config:config-item config:name="GridCoarseHeight" config:type="int">1270</config:config-item>
<config:config-item config:name="GridFineWidth" config:type="int">127</config:config-item>
@@ -366,8 +366,8 @@
<text:p text:style-name="P1"><text:span text:style-name="T1">Debian Hacker</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr3" draw:text-style-name="P2" xml:id="id8" draw:id="id8" draw:layer="layout" svg:width="4.4cm" svg:height="1.505cm" svg:x="19.566cm" svg:y="1.043cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">Other OS</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr3" draw:text-style-name="P2" xml:id="id8" draw:id="id8" draw:layer="layout" svg:width="5.945cm" svg:height="1.505cm" svg:x="18.842cm" svg:y="1.043cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">Other OS + TBB</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
<draw:custom-shape draw:style-name="gr4" draw:text-style-name="P2" xml:id="id2" draw:id="id2" draw:layer="layout" svg:width="8.721cm" svg:height="1.474cm" svg:x="7.627cm" svg:y="5.155cm">
@@ -408,7 +408,7 @@
<draw:connector draw:style-name="gr11" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="6.665cm" svg:y1="10.688cm" svg:x2="12.749cm" svg:y2="13.205cm" draw:start-shape="id7" draw:start-glue-point="6" draw:end-shape="id5" svg:d="m6665 10688v513l5571 2004h513">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr10" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="21.766cm" svg:y1="2.548cm" svg:x2="21.783cm" svg:y2="5.155cm" draw:start-shape="id8" draw:start-glue-point="6" draw:end-shape="id3" draw:end-glue-point="4" svg:d="m21766 2548v551l17 1542v514">
+ <draw:connector draw:style-name="gr10" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="21.815cm" svg:y1="2.548cm" svg:x2="21.783cm" svg:y2="5.155cm" draw:start-shape="id8" draw:start-glue-point="6" draw:end-shape="id3" draw:end-glue-point="4" svg:d="m21815 2548v551l-32 1542v514">
<text:p/>
</draw:connector>
<draw:connector draw:style-name="gr12" draw:text-style-name="P3" draw:layer="layout" draw:type="lines" svg:x1="11.988cm" svg:y1="6.629cm" svg:x2="9.826cm" svg:y2="9.974cm" draw:start-shape="id2" draw:start-glue-point="6" draw:end-shape="id7" draw:end-glue-point="7" svg:d="m11988 6629v514l-1649 2831h-513">
@@ -421,8 +421,8 @@
<text:p text:style-name="P1"><text:span text:style-name="T1">Tails Installer</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id10" draw:id="id10" draw:layer="layout" svg:width="4.572cm" svg:height="1.683cm" svg:x="20.102cm" svg:y="18.296cm">
- <text:p text:style-name="P1"><text:span text:style-name="T1">UUI or Rufus</text:span></text:p>
+ <draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id10" draw:id="id10" draw:layer="layout" svg:width="2.996cm" svg:height="1.683cm" svg:x="20.902cm" svg:y="18.296cm">
+ <text:p text:style-name="P1"><text:span text:style-name="T1">UUI</text:span></text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:mirror-horizontal="false" draw:mirror-vertical="false" draw:glue-points="10800 0 0 10800 10800 21600 21600 10800" draw:type="flowchart-process" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/>
</draw:custom-shape>
<draw:custom-shape draw:style-name="gr8" draw:text-style-name="P2" xml:id="id9" draw:id="id9" draw:layer="layout" svg:width="4.397cm" svg:height="1.684cm" svg:x="25.035cm" svg:y="18.263cm">
@@ -447,7 +447,7 @@
<draw:connector draw:style-name="gr14" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="27.234cm" svg:y2="18.263cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id9" draw:end-glue-point="4" svg:d="m14948 14047v514l12286 3189v513">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr14" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="22.388cm" svg:y2="18.296cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id10" draw:end-glue-point="4" svg:d="m14948 14047v514l7440 3221v514">
+ <draw:connector draw:style-name="gr14" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="14.047cm" svg:x2="22.4cm" svg:y2="18.296cm" draw:start-shape="id5" draw:start-glue-point="6" draw:end-shape="id10" draw:end-glue-point="4" svg:d="m14948 14047v514l7452 3221v514">
<text:p/>
</draw:connector>
<draw:connector draw:style-name="gr15" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="14.948cm" svg:y1="12.363cm" svg:x2="14.948cm" svg:y2="12.363cm" draw:start-shape="id5" draw:start-glue-point="0" draw:end-shape="id5" svg:d="m14948 12363v-513 0">
@@ -462,7 +462,7 @@
<draw:connector draw:style-name="gr17" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="27.234cm" svg:y1="19.947cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id9" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m27234 19947v514l-10161 2526v514">
<text:p/>
</draw:connector>
- <draw:connector draw:style-name="gr17" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="22.388cm" svg:y1="19.979cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id10" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m22388 19979v513l-5315 2495v514">
+ <draw:connector draw:style-name="gr17" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="22.4cm" svg:y1="19.979cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id10" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m22400 19979v513l-5327 2495v514">
<text:p/>
</draw:connector>
<draw:connector draw:style-name="gr17" draw:text-style-name="P1" draw:layer="layout" draw:type="lines" svg:x1="16.686cm" svg:y1="19.966cm" svg:x2="17.073cm" svg:y2="23.501cm" draw:start-shape="id12" draw:start-glue-point="6" draw:end-shape="id13" draw:end-glue-point="4" svg:d="m16686 19966v513l387 2508v514">
diff --git a/wiki/src/blueprint/bootstrapping/tools.png b/wiki/src/blueprint/bootstrapping/tools.png
new file mode 100644
index 0000000..ddf77e0
--- /dev/null
+++ b/wiki/src/blueprint/bootstrapping/tools.png
Binary files differ
diff --git a/wiki/src/blueprint/bootstrapping/upgrade.mdwn b/wiki/src/blueprint/bootstrapping/upgrade.mdwn
new file mode 100644
index 0000000..81540fe
--- /dev/null
+++ b/wiki/src/blueprint/bootstrapping/upgrade.mdwn
@@ -0,0 +1,60 @@
+[[!meta title="Full upgrades"]]
+
+Vision
+======
+
+As of 2014, incremental upgrades are available inside Tails if running
+from a USB device installed using Tails Installer. Full upgrades have to
+be done using a second USB stick and cloning using Tails Installer.
+
+On the long run we want to have all upgrade scenarios, both incremental
+and full, handled by Tails Upgrader and done directly from Tails. This
+will make it easier to understand which software does what, and will
+also improve the overall security of full upgrades by removing the need
+or the possibility to do them from a different operating system.
+
+Full upgrade scenarios
+----------------------
+
+The following diagram shows all possible upgrade scenarios (implemented
+or not) given a running Tails (origin), an ISO image, and a destination
+Tails.
+
+[[!img scenarios.png]]
+
+- **Upgrade from ISO** and **Clone and upgrade** are what we already
+ have in Tails Installer.
+- **Self full upgrade** should be the ideal scenario for full upgrades,
+ that would then be conducted like IUK. See [[!tails_ticket 7499]].
+- **Hot clone** could be a fallback scenario for full upgrades in case
+ you can't download a full ISO. Still, as any clone operation, this
+ introduces the possibility of cross contamination between Tails keys
+ and should be discouraged in favor of self upgrades.
+
+Roadmap
+=======
+
+2015
+----
+
+In 2015, we want to clarify the possible upgrade scenarios to the user,
+when asking for a full upgrade. We will present them as follows:
+
+ - *Slow and secure*: download, verify in Tails, upgrade from ISO,
+ clone and upgrade: 1'30.
+ - *Fast*: clone and upgrade from a friend: 0'15.
+ - *Fast and insecure*: reboot in host operating system download,
+ upgrade from ISO: 0'30.
+
+Bonus for 2015
+--------------
+
+- Automate the download and verification steps of the *slow and secure*
+ scenario in Tails Upgrader. This could be adapted from the existing
+ mechanisms for IUK.
+
+Future
+------
+
+- Allow self full upgrades from inside Tails and automate that in Tails
+ Upgrader. See [[!tails_ticket 7499]].
diff --git a/wiki/src/blueprint/bootstrapping/upgrade/scenarios.png b/wiki/src/blueprint/bootstrapping/upgrade/scenarios.png
new file mode 100644
index 0000000..8051ef8
--- /dev/null
+++ b/wiki/src/blueprint/bootstrapping/upgrade/scenarios.png
Binary files differ
diff --git a/wiki/src/blueprint/bootstrapping/upgrade/scenarios.svg b/wiki/src/blueprint/bootstrapping/upgrade/scenarios.svg
new file mode 100644
index 0000000..33cd966
--- /dev/null
+++ b/wiki/src/blueprint/bootstrapping/upgrade/scenarios.svg
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="391.06287"
+ height="271.73157"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="scenarios.svg"
+ inkscape:export-filename="/home/amnesia/Persistent/master/wiki/src/blueprint/bootstrapping_workflow/installer/upgrade_scenarios.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path3771"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="matrix(0.8,0,0,0.8,10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart-3"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3771-6"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="matrix(0.8,0,0,0.8,10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart-1"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3771-1"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="matrix(0.8,0,0,0.8,10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart-4"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3771-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="matrix(0.8,0,0,0.8,10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart-9"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3771-2"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="matrix(0.8,0,0,0.8,10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart-6"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3771-13"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="matrix(0.8,0,0,0.8,10,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4"
+ inkscape:cx="244.63057"
+ inkscape:cy="136.21405"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="10"
+ fit-margin-left="10"
+ fit-margin-right="10"
+ fit-margin-bottom="10"
+ inkscape:window-width="1280"
+ inkscape:window-height="713"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-46.125709,-203.96962)">
+ <text
+ xml:space="preserve"
+ style="font-size:12.70937347px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="207.51237"
+ y="388.65912"
+ id="text4603-3"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.99997828,0.00659158,-0.00659158,0.99997828,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan4605-6"
+ x="207.51237"
+ y="388.65912">Hot clone?</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:12.70937347px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="160.7253"
+ y="443.08328"
+ id="text4603-3-3"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.99997828,0.00659158,-0.00659158,0.99997828,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan4605-6-2"
+ x="160.7253"
+ y="443.08328">Clone and upgrade</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:25.41874695px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="207.28969"
+ y="232.8351"
+ id="text2985"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan2987"
+ x="207.28969"
+ y="232.8351">ISO</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:25.41874695px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="283.46344"
+ y="413.71973"
+ id="text2989"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan2991"
+ x="283.46344"
+ y="413.71973">Destination</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:25.41874695px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="54.698387"
+ y="418.96753"
+ id="text2993"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan2995"
+ x="54.698387"
+ y="418.96753">Origin</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);marker-mid:none"
+ d="M 220.09679,245.37152 C 232.16615,357.12961 124.00654,390.20056 107.76074,384.66823"
+ id="path2997"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 199.39269,318.75455 3.14661,29.6187"
+ id="path4575"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 182.74766,332.70997 36.55479,-3.46612"
+ id="path4577"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);marker-mid:none"
+ d="M 83.73688,382.08011 C 88.103192,275.58531 148.1267,230.34198 197.99869,222.88388"
+ id="path2997-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-size:12.70937347px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="-220.48318"
+ y="239.13588"
+ id="text4603"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.54987745,-0.83524535,0.83524535,0.54987745,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan4605"
+ x="-220.48318"
+ y="239.13588">Self full upgrade</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);marker-mid:none"
+ d="M 326.59606,424.29148 C 240.18572,486.6891 167.51821,467.4742 130.82731,432.88205"
+ id="path2997-7-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);marker-mid:none"
+ d="m 142.095,398.9448 c 47.49742,-33.79929 119.31549,-38.98827 175.10543,-15.95815"
+ id="path2997-7-9-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);marker-mid:none"
+ d="m 242.23456,245.41776 c 3.84684,90.09132 62.34034,128.06675 109.78531,139.54231"
+ id="path2997-7-9-1-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);marker-mid:none"
+ d="M 372.54439,382.7887 C 378.9589,308.54843 327.68403,224.55901 258.29952,225.76385"
+ id="path2997-7-9-1-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 277.52108,329.41789 3.14662,29.6187"
+ id="path4575-9"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1.27093732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 260.87606,343.37331 36.55478,-3.46612"
+ id="path4577-6"
+ inkscape:connector-curvature="0" />
+ <text
+ xml:space="preserve"
+ style="font-size:12.70937347px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="373.47791"
+ y="-148.94458"
+ id="text4603-6"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.53956122,0.84194637,-0.84194637,0.53956122,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan4605-0"
+ x="373.47791"
+ y="-148.94458">Upgrade from ISO</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:12.70937347px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="-198.01234"
+ y="269.49597"
+ id="text4603-37"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.54987745,-0.83524535,0.83524535,0.54987745,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan4605-4"
+ x="-198.01234"
+ y="269.49597">#7499</tspan></text>
+ </g>
+</svg>
diff --git a/wiki/src/blueprint/bootstrapping/verification.mdwn b/wiki/src/blueprint/bootstrapping/verification.mdwn
new file mode 100644
index 0000000..0a08ef9
--- /dev/null
+++ b/wiki/src/blueprint/bootstrapping/verification.mdwn
@@ -0,0 +1,98 @@
+[[!meta title="ISO verification"]]
+
+Vision
+======
+
+We have always pushed our users to verify our ISO images. But so far
+this has been a complicated tasks, as it mainly relies on OpenPGP. But
+we cannot ask newcomers to know OpenPGP before they get an ISO image
+they can trust. So we want to automated this verification as much as
+possible, while leaving the room for expert users to do more extensive
+verification if they want to.
+
+Over 2015, we will be working on a [[browser extension|extension]] to
+integrate ISO verification in the download process.
+
+In this blueprint, we propose to go even further and imagine what we
+could do next. We initially considered two scenarios:
+
+ - Pushing more verification logic into the browser extension.
+ - Pushing some verification logic into Tails Installer. This goes
+ along with having a multiplatform installer, which would be a huge
+ UX improvement of its own.
+ - Automating inside Tails the download and verification of ISO images
+ for full upgrades.
+
+We're currently considering more seriously the option of pushing more
+verification logic into Tails Installer. It could then:
+
+ - Automate OpenPGP verification. That would be easy to achieve on
+ Linux and would need more research for other platforms. Note that
+ having a super secure verification process on Windows might not be
+ relevant.
+ - Do download correlation of our signing key, and check it against the
+ Debian keyring on Debian and derivatives.
+ - Allow people to burn DVDs from Tails Installer as well. If Tails
+ Installer becomes the recommended tool for verifying Tails, people
+ should be able to burn DVDs from it.
+ - Allow expert users to build more trust in our signing key through
+ the OpenPGP WoT.
+
+The advantages of going this way instead of pushing more verification
+logic into the browser extension are that:
+
+ - More people will be able to work on such code.
+ - We will no rely on browsers for serious cryptography.
+ - We will have less restrictions than inside browser extensions.
+
+The cons:
+
+ - The verification using OpenPGP might be harder to port to Windows
+ and OS X. But we are ready to provide lower standards of
+ verification for them.
+ - How would people verify Tails Installer on Windows and OS X? Maybe
+ the browser extension could do that by then.
+ - The browser extension will loose some of its relevance. It will
+ still be useful until we get there, and maybe to verify Tails
+ Installer.
+
+<a id="seahorse"></a>
+
+About the removal of Seahorse Nautilus
+======================================
+
+As of now, we are explaining how to [[verify ISO images using
+`seahorse-nautilus` for GNOME|doc/get/verify_the_iso_image_using_gnome]].
+While reworking the ISO verification scenarios, we pretty much settled on the
+idea of removing Seahorse Nautilus as a verification option, at least from the
+assistant. Here is why.
+
+Once we get the Firefox extension for ISO verification, Seahorse Nautilus will
+partly duplicate its work. We could then recommend one, the other, or both to
+people with GNOME.
+
+The idea behind Seahorse Nautilus was to allow an OpenPGP verification even for
+people with no or little understanding of OpenPGP. The advantages are:
+
+ - seahorse-nautilus runs from outside of the browser.
+ - seahorse-nautilus can be authenticated through APT even in Debian Jessie.
+ - If you get the right OpenPGP key, you rely on the developers and not on the
+ boum.org website.
+
+But documenting Seahorse Nautilus has we have been doing until now is only
+stronger than the Firefox extension if TOFU is done well. And we believe that
+this requires explaining much more that what is intended for a first-time Linux
+user:
+
+ - TOFU only work if trusted once :) While with Seahorse Nautilus, importing
+ the same key, or a different key for the same email address several times
+ produces the same notification: "Key Imported". In order to have our users do
+ TOFU for real, we would have to go through the list of existing keys and
+ check whether it's imported or not.
+ - What happen if we revoke our signing key? We'd have to explain how to
+ remove the old key and how to import the new key. Whereas the browser
+ extension (either through HTTPS or OpenPGP) could do that job on its own.
+
+So we think that this is too much for the assistant, and everybody should
+instead go through the browser extension. Still, Seahorse Nautilus might still
+fit in the advanced documentation for OpenPGP verification.
diff --git a/wiki/src/blueprint/bootstrapping_workflow/verification_tools.png b/wiki/src/blueprint/bootstrapping/verification_tools.png
index 36e7ca4..36e7ca4 100644
--- a/wiki/src/blueprint/bootstrapping_workflow/verification_tools.png
+++ b/wiki/src/blueprint/bootstrapping/verification_tools.png
Binary files differ
diff --git a/wiki/src/blueprint/bootstrapping_workflow.mdwn b/wiki/src/blueprint/bootstrapping_workflow.mdwn
deleted file mode 100644
index 13aaf4a..0000000
--- a/wiki/src/blueprint/bootstrapping_workflow.mdwn
+++ /dev/null
@@ -1,470 +0,0 @@
-[[!meta title="Bootstrapping workflow"]]
-
-This blueprint analyses and proposes simplifications to the workflow of
-a new user discovering Tails until she gets a full-featured Tails USB
-stick with persistence.
-
-Big logical steps are:
-
- - Learn what Tails is
- - Download the ISO
- - Verify the ISO
- - Install medium (might require going through a bootstrapping medium)
- - Create persistence
-
-[[!toc levels=3]]
-
-2014
-====
-
-[[Diagram of the detailed workflow as of January 2014|2014.fodg]]
-
-2015
-====
-
-Over 2015 we will work on several improvements to simplify greatly this
-workflow:
-
- - Tails Installer in Debian
- - [[Browser extensions|download_extension]] for automatic verification of the ISO
- - [[Web assistant|web_assistant]] to guide the user throughout this process
-
-<a id="tools"></a>
-
-Involved tools
---------------
-
-[[!img tools.png link=tools.fodg]]
-
-Notes:
-
-- **Debian Hacker** corresponds to a path on the command line only. This
- main benefit is to go through the **Debian keyring** verification.
-- **Debian** is a path for Debian derivatives where Tails Installer is
- available. That should be the case of Ubuntu starting from 15.10, and
- Debian Stretch unless we backport it for Jessie ([[!tails_ticket 8805]]).
-- **Other OS** is Windows, Mac OS X, Fedora, etc.
-- **Debian keyring** are command line instructions for verifying the
- Tails signing key against the Debian keyring.
-- **Extension from Debian** takes for granted that the ISO verification
- extension will be available in Debian ([[!tails_ticket 8822]]. That
- might not be the case and then people would fallback on "Extension
- from browser".
-- **GNOME Disks** now has a "Restore Disk Image" feature which should do the
- trick and is widely available, see [[!tails_ticket 8664]].
-- **UUI** has been our canonical installer for years, but we should also test
- **Rufus**, see [[!tails_ticket 7034]].
-- **DiskUtils** should be tested on Mac, see [[!tails_ticket 8802]].
-
-[[Diagram of the detailed workflow as of January 2015|2015.fodg]] (work in progress)
-
-<a id="verification"></a>
-
-ISO verification
-================
-
-Who's who
----------
-
-- Objective: installing a genuine Tails system
-
-- Simplified workflow: WWW → Download/Torrent → ISO → Install/Burn → Tails
-
-- Possible attacks:
- - Faulty download
- - Rogue mirror
- - Censorship
- - Targeted malware on the OS
- - Targeted malware download of third-party software
- - SSL MitM
-
-- Possible defenses:
- - HTTPS
- - HTTPS pinning
- - OpenPGP TOFU
- - OpenPGP download correlation
- - OpenPGP WoT
-
-- Tools involved:
- - HTTPS on Tails website
- - Browser app store
- - Written documentation
- - Third-party software
- - Browser extension
- - Tails Installer (future)
-
-- Scenarios
- - Windows
- - Mac
- - Debian
- - Other Linux
-
-<a id="automation"></a>
-
-Automation proposals
---------------------
-
-The idea behind this section is to understand better what to in 2015
-regarding the UX of ISO verification, and try to envision what can
-happen after we get the technical improvements described for
-[[2015|bootstrapping_workflow#index2h1]].
-
-### Questions we are trying to answer
-
- - How far shall we go regarding ISO verification in the [[browser
- extension|download extension]] over 2015? For example, do we add
- OpenPGP support to the extension?
- - What additional techniques do we still need to document on the
- website?
- - What do we need to integrate to the [[web assistant]]?
- - Are there any technical improvements that could be done over 2015
- and would make a big difference?
- - What should come next? As this might influence what to do today.
-
-### Hypothesis
-
- - We call "basic verification" techniques: HTTPS, HTTPS with pinning,
- and OpenPGP with TOFU (by order of strength).
- - We call "extended verification" techniques: OpenPGP with download
- correlation, OpenPGP with WoT (by order of strength).
- - We can't rely on people doing OpenPGP verification properly, even
- "basic" (thinks about downgrade attacks). So both "basic" and
- "extended" verification are currently broken for all operating
- systems (maybe not that much on Debian, ok).
- - We want to automate ISO verification as much as we can.
- - We can automate OpenPGP download correlation and WoT, at least in
- some environments.
- - Global verification level is as high as the least verified tool
- involved.
-
-### Proposals
-
-To further automate ISO verification we considered two options:
-
- - Pushing more verification logic into the browser extension.
- - Pushing some verification logic into Tails Installer (as it is getting
- multiplatform). This goes along with having a multiplatform
- installer, which would be a huge UX improvement of its own.
-
-We did a quick thread modelling on 5 scenarios:
-
- - [[Proposal 0: Minimum improvements over 2015|bootstrapping_workflow#index6h3]]
- - [[Proposal 1: Extended verification in extension|bootstrapping_workflow#index7h3]]
- - [[Proposal 1bis: Extended verification in extension + multiplatform installer|bootstrapping_workflow#index8h3]]
- - [[Proposal 2: Extended verification in installer|bootstrapping_workflow#index9h3]]
- - [[Proposal 2bis: Extended verification in multiplatform installer|bootstrapping_workflow#index10h3]]
-
-### Graphical summary
-
-We [[summarized graphically|iso_verification_automation_proposals.ods]]
-the possible attacks on someone willing to install Tails on USB stick on
-Mac, Windows, and Debian (Stretch).
-
-According to this, proposal 1bis and 2bis are similarly secure.
-
-### Open technical questions
-
- - For all operating systems, is it safer to build extended verification in the
- host operating system or to rely on a first Tails to install others?
- - Is it easier or better to port code across browsers (in the case of
- the extension) or across operating system (in the case of the
- installer)?
- - How secure, widespread, and reactive to upgrades are the Mozilla, Chrome,
- Windows, and Apple app stores?
- [[!tails_ticket 8815]] [[!tails_ticket 8816]] [[!tails_ticket 8817]]
- - How technically feasible is it to push OpenPGP verification to browser
- extensions or a multiplatform installer?
- - How easy and safe is it to do simple or complex OpenPGP operations in the
- browser?
-
-Below come the details for each proposal.
-
-### Proposal 0: Minimum improvements over 2015
-
-Description:
-
- - Browser extension does HTTPS pinning.
- - Tails Installer does no verification (as of now).
- - Tails Installer is packaged in Debian.
-
-Possible attacks:
-
- - Windows:
- - SSL MitM on:
- - Browser app store (#8815)
- - boum.org (on each use)
- - if USB, HTTP MitM on UUI
- - Targeted malware (easy)
-
- - Mac:
- - SSL MitM on:
- - Browser app store (#8815)
- - boum.org (on each use)
- - if USB, no graphical solution so far (#8802)
- - Targeted malware (harder)
-
- - Debian:
- - SSL MitM on:
- - Browser app store (#8815)
- - boum.org (on each use)
- - Targeted malware (hard)
-
-UX questions:
-
- - How do we go beyond HTTPS pinning?
- - What do we do with seahorse-nautilus, Gpg4win and GPGTools?
- - Do we do that in the assistant?
- - We need a multiplatform installer!
- - Controlled environment
- - No more bootstrapping medium
-
-### Proposal 1: Extended verification in extension
-
-Description (on top of proposal 0):
-
- - Browser extension does TOFU OpenPGP, OpenPGP correlation, and WoT.
- - Browser extension is packaged in Debian.
-
-Possible attacks:
-
- - Windows:
- - SSL MitM:
- - Browser app store (#8815)
- - if USB, HTTP MitM on UUI
- - Targeted malware (easy)
-
- - Mac:
- - SSL MitM:
- - Browser app store (#8815)
- - if USB, no graphical solution so far (#8802)
- - Targeted malware (harder)
-
- - Debian:
- - Debian app store :)
- - Targeted malware (hard)
-
-UX questions:
-
- - What happen if people are in TBB?
- - Based on which keys do we do WoT on Windows and Mac?
- - How far do we want to automate?
- - What do we make transparent?
-
-Pros (over proposal 2):
-
- - Verification logic is in one place and multiplatform.
- - Verification logic can grow more complex and robust than HTTPS with
- pinning.
- - Stronger to SSL MitM on boum.org as we rely on OpenPGP WoT.
- - It might make more sense to reuse the verification mechanisms from the
- extension to verify other downloads, for example of the installer if not
- installed automatically from OS app store.
-
-Cons:
-
- - Put security code in browser.
- - Less autonomy regarding development (we need external help).
-
-### Proposal 1bis: Extended verification in extension + multiplatform installer
-
-Description (on top of proposal 1):
-
- - Tails Installer is available on Windows and Mac.
-
-Possible attacks:
-
- - Windows:
- - SSL MitM on:
- - Browser app store (#8815)
- - boum.org
- - Targeted malware (easy)
-
- - Mac:
- - SSL MitM on:
- - Browser app store (#8815)
- - boum.org
- - Targeted malware (harder)
-
- - Debian:
- - Debian app store :)
- - Targeted malware (hard)
-
-Pros (on top of proposal 1):
-
- - Stronger to malware attack on UUI.
-
-Cons (over proposal 2bis):
-
- - Rely on both Browser app store and Tails Installer.
-
-### Proposal 2: Extended verification in installer
-
-Description (on top of proposal 0):
-
- - Tails Installer does TOFU OpenPGP, OpenPGP correlation, and WoT.
- - Browser extension is packaged in Debian.
- - People burning DVD can check their ISO with Tails Installer if
- available :)
-
-Possible attacks:
-
- - Windows:
- - SSL MitM on:
- - Browser app store (#8815)
- - boum.org
- - if USB, HTTP MitM on UUI
- - Targeted malware (easy)
-
- - Mac:
- - SSL MitM:
- - Browser app store (#8815)
- - boum.org
- - if USB, no graphical solution so far (#8802)
- - Targeted malware (harder)
-
- - Debian:
- - Debian app store
- - Targeted malware (hard)
-
-UX questions:
-
- - People using DVD or virtualization need to download and run an
- unrelated software to verify the ISO.
-
-Pros (over proposal 1):
-
- - More autonomy regarding development (we know how to do that).
- - Independent from browser vendor (except for DVD users).
-
-Cons:
-
- - HTTPS pinning verification at best on Windows and Mac.
- - Verification logic is partly duplicated in browser extension and
- installer.
-
-### Proposal 2bis: Extended verification in multiplatform installer
-
-Description (on top of proposal 2):
-
- - Tails Installer is available on Windows and Mac.
-
-Possible attacks:
-
- - Windows:
- - SSL MitM:
- - boum.org
- - Targeted malware (easy)
-
- - Mac:
- - SSL MitM:
- - boum.org
- - Targeted malware (harder)
-
- - Debian:
- - Debian app store
- - Targeted malware (hard)
-
-Pros (on top of proposal 2):
-
- - Don't rely on UUI anymore.
-
-Cons:
-
- - Harder to port to Windows and Mac than current Tails Installer.
-
-<a id="seahorse"></a>
-
-About the removal of Seahorse Nautilus
---------------------------------------
-
-As of now, we are explaining how to [[verify ISO images using
-`seahorse-nautilus` for GNOME|doc/get/verify_the_iso_image_using_gnome]].
-While reworking the ISO verification scenarios, we pretty much settled on the
-idea of removing Seahorse Nautilus as a verification option, at least from the
-assistant. Here is why.
-
-Once we get the Firefox extension for ISO verification, Seahorse Nautilus will
-partly duplicate its work. We could then recommend one, the other, or both to
-people with GNOME.
-
-The idea behind Seahorse Nautilus was to allow an OpenPGP verification even for
-people with no or little understanding of OpenPGP. The advantages are:
-
- - seahorse-nautilus runs from outside of the browser.
- - seahorse-nautilus can be authenticated through APT even in Debian Jessie.
- - If you get the right OpenPGP key, you rely on the developers and not on the
- boum.org website.
-
-But documenting Seahorse Nautilus has we have been doing until now is only
-stronger than the Firefox extension if TOFU is done well. And we believe that
-this requires explaining much more that what is intended for a first-time Linux
-user:
-
- - TOFU only work if trusted once :) While with Seahorse Nautilus, importing
- the same key, or a different key for the same email address several times
- produces the same notification: "Key Imported". In order to have our users do
- TOFU for real, we would have to go through the list of existing keys and
- check whether it's imported or not.
- - What happen if we revoke our signing key? We'd have to explain how to
- remove the old key and how to import the new key. Whereas the browser
- extension (either through HTTPS or OpenPGP) could do that job on its own.
-
-So we think that this is too much for the assistant, and everybody should
-instead go through the browser extension. Still, Seahorse Nautilus might still
-fit in the advanced documentation for OpenPGP verification.
-
-Use cases
-=========
-
-This is a brainstorming on the different use cases dealing with
-downloading, verifying, and installing (or upgrading) Tails from ISO.
-This list should be useful to check whether all scenarios are covered.
-The comments, placed after ':' correspond to our rough objectives for
-2015.
-
-- Download
- - HTTP
- - Successful: 15 to 60 minutes
- - Failed: ?
- - Corrupted: ?
- - Torrent
- - Corrupted: ?
- - Nightly
-- Verify
- - Checksum
- - Firefox: extension, what's up with Torrents?
- - Chrome: extension? #8803, #8531
- - Other browsers:
- - Windows: fallback on OpenPGP?
- - Mac: fallback on OpenPGP?
- - Linux: fallback on OpenPGP?
- - OpenPGP
- - GNOME: seahorse-nautilus
- - Other Linux: command line
- - Windows: Gpg4Win
- - Mac: GPGTools #8807
-- Install
- - DVD
- - USB
- - Tails: friend + Tails Installer
- - Debian
- - Jessie: Tails Installer backport? #8005
- - Stretch: Tails Installer #8549
- - Ubuntu
- - Latest LTS, 14.04: Tails Installer? #8806
- - Latest, 15.04: Tails Installer? #8806
- - Next LTS, 16.04: Tails Installer? #8806
- - Next, 15.10: Tails Installer? #8806
- - Windows: UUI
- - Mac OS X: command line or new graphical tool? #8802
- - Virtualization: VirtualBox, GNOME Boxes, virt-manager
-- Upgrade from ISO (full upgrade or nightly)
- - Tails Installer
- - From Debian, Ubuntu if available
- - From Tails otherwise: need bootstrapping device
- - Virtualization: virt-manager
-- Misc
- - Newsletter
- - Donation: #7176?
- - Backups: #8812?
- - Signing key revocation or change
diff --git a/wiki/src/blueprint/bootstrapping_workflow/tools.png b/wiki/src/blueprint/bootstrapping_workflow/tools.png
deleted file mode 100644
index 180026f..0000000
--- a/wiki/src/blueprint/bootstrapping_workflow/tools.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index a9cc59d..44141df 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -11,8 +11,4 @@ Availability and plans for the next weeks
Discussions
===========
- - [[!tails_ticket 8244 desc="Greeter revamp: Decide if we want to keep the wording 'Quick setup'"]]
- - [[!tails_ticket 6432 desc="WhisperBack launcher in the applications menu should give a hint about its function"]]
- - [[!tails_ticket 7076 desc="Warn against plugging a Tails device in untrusted systems"]]
- - [[!tails_ticket 8253 desc="a tool to quickly edit (resize...) pictures"]]
- - [[!tails_ticket 8796 desc="Consider using the purple of the logo as background color"]]
+ - [[!tails_ticket 8586 desc="Create a directory of organizations doing Tails training"]]
diff --git a/wiki/src/blueprint/replace_Pidgin.mdwn b/wiki/src/blueprint/replace_Pidgin.mdwn
new file mode 100644
index 0000000..88e4020
--- /dev/null
+++ b/wiki/src/blueprint/replace_Pidgin.mdwn
@@ -0,0 +1,23 @@
+Corresponding ticket: [[!tails_ticket 8573]]
+
+It would be nice to replace Pidgin with another secure IM client. Unfortunately no good alternative seems to exist today. To be able to decide, if another IM client would be a suitable replacement this document should list the requirements a client needs to fulfill to fit the bill.
+
+The document can also list candidate clients together with some indication where they are lacking (and where they shine).
+
+# Requirements
+
+## General requirements
+
+### Tor
+
+### OTR support
+
+## XMPP (Jabber)
+
+## IRC
+
+# Candidate alternatives
+
+## Tor Messenger
+
+## xmpp-client
diff --git a/wiki/src/blueprint/sandbox_the_web_browser.mdwn b/wiki/src/blueprint/sandbox_the_web_browser.mdwn
index 0b68228..7be3a77 100644
--- a/wiki/src/blueprint/sandbox_the_web_browser.mdwn
+++ b/wiki/src/blueprint/sandbox_the_web_browser.mdwn
@@ -6,14 +6,14 @@ Related pages
* [[!tails_ticket 5525]]
* [[blueprint/Mandatory_Access_Control]]
* [[contribute/design/application_isolation]]
+* `feature/5525-sandbox-web-browser` branch
+* [nightly built images](http://nightly.tails.boum.org/build_Tails_ISO_feature-5525-sandbox-web-browser/)
Status
======
## automated test passes
-(needs to be run again with current status of the branch at some point)
-
* feature/i2p (unconfined)
* feature/torified_browsing
* feature/unsafe_browser (unconfined)
@@ -22,6 +22,24 @@ Status
* relevant bits of feature/usb_install
- view persistent bookmarks, in read-only persistence mode ([[!tails_ticket 8787]])
- persistent bookmarks, RW
+* "Tails documentation" link on the Desktop ([[!tails_ticket 8788]])
+* default download directory is `~/Tor Browser`
+* HTML5 audio playback
+* WebM video and audio playback
+* download to amnesiac `~/Tor Browser`
+* read from amnesiac `~/Tor Browser`
+* default upload directory is `~/Tor Browser/`
+* `~/Tor Browser/` must always exist
+* there must always be a GTK bookmark to `~/Tor Browser/`
+* import OpenPGP key from website
+* printing to file
+* download to persistent `~/Persistent/Tor Browser`, in
+ read-write persistence mode
+* read from persistent `~/Persistent/Tor Browser`, in read-write
+ persistence mode
+* when `~/Persistent/` is persistent read-write, then
+ `~/Persistent/Tor Browser` must exist and there must be
+ a GNOME bookmark pointing to it
## manual test OK
@@ -32,157 +50,48 @@ Status
* manually update AdBlock Plus lists
* add a bookmark, with persistent bookmarks feature enabled, in
read-only persistence mode
+* install a Firefox add-on (this does not mean we actively support that, right? :)
+* read from persistent `~/Persistent/Tor Browser`, in read-only
+ persistence mode
## manual test OK, maybe needs automated test
-* YouTube audio and video playback
-* non-YouTube HTML5 video playback
-* "Tails documentation" link on the Desktop ([[!tails_ticket 8788]])
-* download to persistent `~/Downloads`, in read-write persistence mode
-* read from persistent `~/Downloads`, in read-write persistence mode
-* download to persistent `~/Downloads`, in read-only persistence mode
-* read from persistent `~/Downloads`, in read-only persistence mode
-* default download directory is `~/Downloads`
-* download to non-persistent `~/Downloads`
-* read from non-persistent `~/Downloads`
## known issues
-None currently.
## needs testing
-* default upload directory is `~/Downloads`
-* import OpenPGP key from website:
- - clicking on the "Tails signing key" link in Tails 1.2.3 leads in
- a dialog whose default is "Open with Import Key"
- - this is provided by `seahorse-pgp-keys.desktop`, that execs
- `seahorse-tool --import`
-* install a Firefox add-on (this does not mean we actively support that, right? :)
+* printing to real printer
<a id="ux"></a>
User experience matters
=======================
-Downloading files
------------------
-
-No good way exists (yet) to let the user choose a specific file to
-upload, or download directory, each time they want to do that (this is
-work-in-progress in AppArmor upstream, with a mediation layer between
-applications, the GTK file chooser and the filesystem -- some day we
-can solve this problem in better ways, but we're not there yet).
-
-So, once we confine Tor Browser with AppArmor in Tails 1.3:
-
-* either we allow the Tor Browser to read and write everywhere in
- the home and persistent directory: would entirely defeat the purpose
- of confining it in the first place, so that's a no-no;
-* or, we allow the Tor Browser to read/write files from/to one
- specific directory (e.g. `/home/amnesia/Downloads/`).
-
-I see no better solution than the latter, so the following assumes
-that we'll go with it. So, a first question is: what name should this
-directory have? (Wait, other constraints about this are exposed
-below).
-
-Now, let's say we have a downloads/uploads directory that's shared
-between the Tor Browser, the file browser, and all non-confined
-applications. We have a usability issue: the space available in that
-directory is limited by the free system memory (RAM). So in practice,
-if one starts downloading a large file in there, worst case the
-download will fail at some point during the download, best case the
-browser will tell the user that there's not enough space available
-there before they are allowed to confirm the destination directory for
-the download.
-
-[Side-note: I believe we have no simple mean to adjust the browser's
-behaviour in this area, at least not on the short term, so I've not
-checked how exactly it behaves right now — perhaps that would be
-a good research project on the long term, but on the other hand on the
-long term we'll have even better solutions showing up, as explained
-above, so IMO this shouldn't block confining the Tor Browser
-in Tails.]
-
-The obvious (and easiest to implement) solution to this, from my
-perspective, was to add a persistence setting for `~/Downloads/`
-(called "Browser Downloads", subtitled "Downloads from the Tor
-Browser", akin to the "Browser Bookmarks" we already have), and to add
-a GNOME bookmark called "Downloads" when the Downloads persistence
-feature is enabled. This is implemented in the
-`feature/5525-sandbox-web-browser` branch, and can be tested using the
-latest nightly built image from that branch:
-<http://nightly.tails.boum.org/build_Tails_ISO_feature-5525-sandbox-web-browser/>.
-
-Then sajolida submitted another idea:
-
-> Then could we imagine giving the browser access to two places: a
-> non-persistent place (~/Downloads) and a persistent place (maybe
-> ~/Persistent/Downloads) and let the user decide when stuff gets downloaded?
->
-> This is pretty much the case as of today: when I download something it
-> proposes to download to ~/Downloads by default but if I want to save it
-> for real I have to browser my myself to somewhere under ~/Persistent.
->
-> Then we don't need a new persistence feature.
-
-Indeed this would work. And then, the questions that are speficic to
-sajolida's proposal are:
-
-* What should be the _default_ download directory proposed to the
- user? `~/Downloads/` in all cases? `~/Persistent/Downloads/` iff.
- this directory is persistent in read-write mode? I've not looked at
- how hard it is to change this at runtime, but I guess it's easy.
-
-* Implementation-wise, we have to create `~/Persistent/Downloads/`
- whenever `~/Persistent/` is made persistent.
-
-Now, here are some remaining questions that apply to both proposals.
-Below, I'll use the term "persistent downloads directory" for both the
-persistent `~/Downloads/` I've implemented, and the persistent
-`~/Persistent/Downloads/` sajolida suggested.
-
-1. Take a step back. Think. Do you see a better general solution to
- this problem? [AFAIK no other Live OS has AppArmor enabled by
- default, so there's no source of inspiration available.] Feel free
- to dream awake: worst case I'll tell you that it's impossible, too
- hard, or only good for the long term, and it'll still be useful.
-
-2. Shall we display a Downloads bookmark in GNOME even if
- `~/Downloads/` is not persistent? I guess we should not.
-
-3. Shall we rename the bookmark pointing to the default persistent
- downloads directory "Persistent Downloads"? But then users may lose
- data by mistake when they use read-only persistence option,
- believing it'll be persistent. OTOH, we have had a "Persistent"
- bookmark for years, even in read-only persistence mode, and 1.
- nobody complained; 2. the read-only persistence mode is barely used
- at all anyway.
-
-4. Shall we rename the persistent uploads directory and the
- corresponding bookmark to include the "Uploading files" use case?
- E.g. maybe we can find a name that conveys the "files shared with
- Tor Browser" concept. See below for more bits about this uploading
- files topic.
-
-5. What to do about alternative browsers (I2P and Unsafe Browser)?
+Until the `feature/5525-sandbox-web-browser` branch is merged, see the
+"User experience matters" section on
+<https://git-tails.immerda.ch/tails/tree/wiki/src/contribute/design/application_isolation.mdwn?h=feature/5525-sandbox-web-browser>.
+
+Later, see [[contribute/design/application_isolation#ux]].
+
+Remaining questions:
+
+1. What to do about alternative browsers (I2P and Unsafe Browser)?
We have [[!tails_ticket 8280 desc="a ticket"]] about allowing the
- I2P Browser to access local files. Shall we use e.g.
- `~/Downloads/Tor Browser/`, `~/Downloads/I2P Browser/` and
- `~/Downloads/Unsafe Brower/` (the latter may make sense now that we
- plan to move the LAN browsing support into the Unsafe Browser) —
- and equivalently, if we go with sajolida's idea,
- `~/Persistent/Downloads/Tor Browser/`, etc.?
- If we go this way, IMO we should:
- * have a single persistent feature for the persistent downloads
- directory (`~/Downloads/` or `~/Persistent/Downloads/`)
- * have a single bookmark to that directory
- * _not_ allow a given browser to access files in other browsers'
- own download directory (this would be too much of a linkability
- and de-anonymization risk)
-
-6. The "New Identity" problem. The Tor Browser tries hard to prevent
+ I2P Browser to access local files. Shall we use e.g. `~/Tor Browser
+ files/`, `~/I2P Browser files/` and `~/Unsafe Brower files/` (the
+ latter may make sense now that we plan to move the LAN browsing
+ support into the Unsafe Browser) — and equivalently,
+ `~/Persistent/Tor Browser/`, etc.? or rather a single
+ shared namespace, with e.g. `~/Browser files/Tor Browser`,
+ `~/Browser files/I2P Browser`, etc.?
+
+ In any case, of course we should _not_ allow a given browser to
+ access files in other browsers' own download directory (this would
+ be too much of a linkability and de-anonymization risk)
+
+2. The "New Identity" problem. The Tor Browser tries hard to prevent
data to persist once its "New Identity" button has been clicked, to
prevent activities performed before and after this action to be
linked with each other. As boyska (a Freepto developer) made me
@@ -200,28 +109,14 @@ persistent `~/Downloads/` I've implemented, and the persistent
users in my experience, see [[!tails_ticket 7709]]), warns them
that their previous downloads will be deleted, or rather moved to
a directory where that the Tor Browser hasn't access to.
+ Another idea is to block the "New Identity" until the user has
+ themselves emptied the browser files directory, e.g.:
+
+ When I click on "New Identity" while there are files in one
+ of the downloads directories
+ Then I'm told "Tor Browser will be reset to a New Identity
+ once you have emptied folders $x and $y"
+ And then, once I have emptied the download directories
+ Then Tor Browser is reset to a New Identity
+
Food for thought.
-
-7. Ideally, we should not need any documentation, but in this case
- I believe we do: users _will_ try to download to directories that
- the browser don't have access to, and wonder why the browser says
- "No read permission" or similar. I guess that at least
- doc/anonymous_internet/Tor_Browser should have a new section
- about this.
-
-Uploading files
----------------
-
-Basically, the same problems apply as for downloading files. Is it
-better to share a common directory with downloads, or to add
-a different one to the whitelist?
-
-In any case, I guess we have to:
-
-* document that one should put files in that specific directory before
- submitting them for upload in the Tor Browser
-* make sure that this directory is selected by default when clicking
- a "Browse" upload button on a website
-
-I didn't think much about this uploading problem, so all ideas
-are welcome.
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index 0e33bc0..6a5b43b 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -101,7 +101,7 @@ Debian Wheezy and Jessie:
Once all dependencies are installed, get the Tails sources and
checkout the development branch:
- git clone git://git.tails.boum.org/tails
+ git clone https://git-tails.immerda.ch/tails
cd tails
git checkout devel
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index bf62372..9a5679e 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -29,19 +29,23 @@
* 2015-03-12: [[Low-hanging fruits session|contribute/low-hanging_fruit_sessions]]
-* 2015-04-07: Release 1.3.1.
+* 2015-04-07: Release 1.3.1 (anonym is the RM)
-* 2015-05-19: Release 1.4.
+* 2015-05-19: Release 1.4 (anonym is the RM)
* 2015-06-30: Release 1.4.1
+ - anonym is the RM until June 10
+ - intrigeri is the RM from June 10 to the release
* 2015-08-11: Release 1.5
+ - intrigeri is the RM until July 10
+ - anonym is the RM from July 10 to the release
-* 2015-09-22: Release 1.5.1
+* 2015-09-22: Release 1.5.1 (anonym is the RM)
-* 2015-11-03: Release 1.6
+* 2015-11-03: Release 1.6 (anonym is the RM)
-* 2015-12-22: Release 1.6.1
+* 2015-12-22: Release 1.6.1 (anonym is the RM)
* 2016-02-02: Release 1.7
diff --git a/wiki/src/contribute/design/Time_syncing.mdwn b/wiki/src/contribute/design/Time_syncing.mdwn
index ad1f59e..1113bc2 100644
--- a/wiki/src/contribute/design/Time_syncing.mdwn
+++ b/wiki/src/contribute/design/Time_syncing.mdwn
@@ -127,7 +127,7 @@ custom version of the Perl HTP client into
[[!tails_gitweb config/chroot_local-includes/usr/local/sbin/htpdate]].
The repository we copied this script from can be found there:
- git://git.tails.boum.org/htp
+ https://git-tails.immerda.ch/htp
For reasons detailed bellow, this version of htpdate uses curl for all
of its HTTP operations.
diff --git a/wiki/src/contribute/how/documentation.mdwn b/wiki/src/contribute/how/documentation.mdwn
index 46e150a..db2a55e 100644
--- a/wiki/src/contribute/how/documentation.mdwn
+++ b/wiki/src/contribute/how/documentation.mdwn
@@ -23,7 +23,7 @@ translations that were made of the previous version.
But there are still many ways you can start contributing:
- We maintain a list of [documentation
- tasks](https://labs.riseup.net/code/projects/tails/issues?query_id=118).
+ tasks](https://labs.riseup.net/code/projects/tails/issues?query_id=172).
You can start writing a draft in the corresponding ticket and then
[[ask us for review|contribute/talk]].
@@ -39,9 +39,9 @@ Documentation writers coordinate themselves using our usual
Documentation writers should also read our [[documentation
guidelines|guidelines]].
-If you want to test your contributions before to sharing them with us,
-you can [[build and update the documentation
-offline|contribute/build/website]].
+We recommend you to [[build an offline version of the
+documentation|contribute/build/website]] to test your contributions
+before sharing them with us.
# Translating
diff --git a/wiki/src/contribute/how/documentation/guidelines.mdwn b/wiki/src/contribute/how/documentation/guidelines.mdwn
index 77a563e..ef4d02b 100644
--- a/wiki/src/contribute/how/documentation/guidelines.mdwn
+++ b/wiki/src/contribute/how/documentation/guidelines.mdwn
@@ -137,6 +137,12 @@ using <span class="application">Tails OpenPGP Applet</span>.
</div>
+Ikiwiki shortcuts
+=================
+
+The `\[[!wikipedia ..]]` strings you can find in some files are ikiwiki [[shortcuts]].
+You might also need to understand [[ikiwiki directives|ikiwiki/directive]].
+
Related online resources
========================
diff --git a/wiki/src/contribute/how/translate/with_Git.mdwn b/wiki/src/contribute/how/translate/with_Git.mdwn
index 15bd8fd..c42daf1 100644
--- a/wiki/src/contribute/how/translate/with_Git.mdwn
+++ b/wiki/src/contribute/how/translate/with_Git.mdwn
@@ -176,7 +176,7 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
Each [[language team|translate#language-teams]] keeps track of their contributors' repositories.
To add one of these repositories as a `remote` in Git, use the following command line:
- git remote add [name] git://git.tails.boum.org/[name].git
+ git remote add [name] https://git-tails.immerda.ch/[name].git
For example:
diff --git a/wiki/src/contribute/meetings/201502.mdwn b/wiki/src/contribute/meetings/201502.mdwn
new file mode 100644
index 0000000..d2f6cb8
--- /dev/null
+++ b/wiki/src/contribute/meetings/201502.mdwn
@@ -0,0 +1,33 @@
+[[!meta title="February 2015 meeting"]]
+
+[[!toc levels=1]]
+
+
+# [[!tails_ticket 8244 desc="Greeter revamp: Decide if we want to keep the wording 'Quick setup'"]]
+
+Postpone: the ticket was not relevant to discuss according to the latest
+discussions and mockups.
+
+# [[!tails_ticket 6432 desc="WhisperBack launcher in the applications menu should give a hint about its function"]]
+
+We choose to go with the "WhisperBack Error Reporting" wording.
+
+# [[!tails_ticket 7076 desc="Warn against plugging a Tails device in untrusted systems"]]
+
+We choose to put the warn in the "Warnings" page, and see later if this page
+grows too big.
+
+# [[!tails_ticket 8253 desc="Ship a tool to quickly edit (resize...) pictures"]]
+
+This could fit in the use cases, so we need a GUI tool for that. There are a
+bunch of nautilus plugins that can do that, so next step is to test them and
+pick one or none. Requirements: sanely developed and maintained upstream.
+
+# [[!tails_ticket 8796 desc="Consider using the purple of the logo as background color"]]
+
+We decided to ship a darker blue blackground. Someone building a proposal or
+willing to lead a discussion about visual identity would be welcome.
+
+# [[!tails_ticket 8696 desc="Consider hiding the TBB logo in Tor Launcher "]]
+
+We will remove this logo, so ticket about using that envvar for that.
diff --git a/wiki/src/contribute/working_together/roles/sysadmins.mdwn b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
index 6ae5d27..e98c5c1 100644
--- a/wiki/src/contribute/working_together/roles/sysadmins.mdwn
+++ b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
@@ -165,7 +165,7 @@ We use Redmine tickets for public discussion and tasks management:
for testing
* access: anyone who gets it from
[BridgeDB](https://bridges.torproject.org/)
-* tools: [[!debpts tor]], [[!debpts obfsproxy]]
+* tools: [[!debpts tor]], [[!debpts obfs4proxy]]
* configuration:
- `tails::apt::repository::torproject` in
[[!tails_gitweb_repo puppet-tails]]
diff --git a/wiki/src/doc.de.po b/wiki/src/doc.de.po
index e382b9d..8800d73 100644
--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails website\n"
-"POT-Creation-Date: 2014-07-23 00:01+0300\n"
+"POT-Creation-Date: 2015-02-09 16:04+0100\n"
"PO-Revision-Date: 2014-07-18 23:32+0100\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,6 +27,23 @@ msgstr ""
"Diese Dokumentation ist ständig in Bearbeitung und eine kollektive Aufgabe."
#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If this section doesn't answer your questions, you can also look at our\n"
+"[[FAQ|support/faq]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
"Read about how you can help [[improving Tails documentation|/contribute/how/"
"documentation]]."
diff --git a/wiki/src/doc.fr.po b/wiki/src/doc.fr.po
index 2f6b4d5..64d3e5d 100644
--- a/wiki/src/doc.fr.po
+++ b/wiki/src/doc.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-02 02:49+0300\n"
+"POT-Creation-Date: 2015-02-09 16:04+0100\n"
"PO-Revision-Date: 2014-04-25 06:01-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -28,6 +28,23 @@ msgstr ""
"collectif."
#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If this section doesn't answer your questions, you can also look at our\n"
+"[[FAQ|support/faq]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
"Read about how you can help [[improving Tails documentation|/contribute/how/"
"documentation]]."
diff --git a/wiki/src/doc.mdwn b/wiki/src/doc.mdwn
index 38628a4..02713ef 100644
--- a/wiki/src/doc.mdwn
+++ b/wiki/src/doc.mdwn
@@ -2,6 +2,13 @@
This documentation is a work in progress and a collective task.
+<div class="tip">
+
+<p>If this section doesn't answer your questions, you can also look at our
+[[FAQ|support/faq]].</p>
+
+</div>
+
Read about how you can help [[improving Tails
documentation|/contribute/how/documentation]].
diff --git a/wiki/src/doc.pt.po b/wiki/src/doc.pt.po
index 7d2fe07..646834b 100644
--- a/wiki/src/doc.pt.po
+++ b/wiki/src/doc.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-30 18:10-0300\n"
+"POT-Creation-Date: 2015-02-09 16:04+0100\n"
"PO-Revision-Date: 2014-07-31 11:42-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -28,8 +28,29 @@ msgid "This documentation is a work in progress and a collective task."
msgstr "Esta documentação é um trabalho em progresso e uma tarefa coletiva."
#. type: Plain text
-msgid "Read about how you can help [[improving Tails documentation|/contribute/how/documentation]]."
-msgstr "Leia sobre como você pode ajudar a [[melhorar a documentação do Tails|/contribute/how/documentation]]."
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If this section doesn't answer your questions, you can also look at our\n"
+"[[FAQ|support/faq]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Read about how you can help [[improving Tails documentation|/contribute/how/"
+"documentation]]."
+msgstr ""
+"Leia sobre como você pode ajudar a [[melhorar a documentação do Tails|/"
+"contribute/how/documentation]]."
#. type: Plain text
msgid "- [[Introduction to this documentation|introduction]]"
diff --git a/wiki/src/doc/advanced_topics.index.de.po b/wiki/src/doc/advanced_topics.index.de.po
index 45d3957..4e9d70b 100644
--- a/wiki/src/doc/advanced_topics.index.de.po
+++ b/wiki/src/doc/advanced_topics.index.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-18 02:28+0100\n"
+"POT-Creation-Date: 2015-02-10 13:52+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"
@@ -21,11 +21,12 @@ msgid ""
"cold_boot_attacks]]"
msgstr ""
-#. type: Bullet: ' - '
-msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
-msgstr ""
-
-#. type: Bullet: ' - '
+#. type: Plain text
+#, no-wrap
msgid ""
-"[[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]"
+" - [[!traillink Virtualization|advanced_topics/virtualization]]\n"
+" - [[!traillink <span_class=\"application\">VirtualBox</span>|advanced_topics/virtualization/virtualbox]]\n"
+" - [[!traillink <span_class=\"application\">GNOME_Boxes</span>|advanced_topics/virtualization/boxes]]\n"
+" - [[!traillink <span_class=\"application\">virt-manager</span>|advanced_topics/virtualization/virt-manager]]\n"
+" - [[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]\n"
msgstr ""
diff --git a/wiki/src/doc/advanced_topics.index.fr.po b/wiki/src/doc/advanced_topics.index.fr.po
index 6e5f361..5d90ab7 100644
--- a/wiki/src/doc/advanced_topics.index.fr.po
+++ b/wiki/src/doc/advanced_topics.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2014-06-08 19:38+0300\n"
+"POT-Creation-Date: 2015-02-10 13:52+0100\n"
"PO-Revision-Date: 2014-05-10 21:02-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -24,16 +24,24 @@ msgstr ""
"[[!traillink Protection_contre_les_attaques_par_démarrage_à_froid|"
"advanced_topics/cold_boot_attacks]]"
-#. type: Bullet: ' - '
-msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
-msgstr "[[!traillink Virtualisation|advanced_topics/virtualization]]"
-
-#. type: Bullet: ' - '
+#. type: Plain text
+#, no-wrap
msgid ""
-"[[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]"
+" - [[!traillink Virtualization|advanced_topics/virtualization]]\n"
+" - [[!traillink <span_class=\"application\">VirtualBox</span>|advanced_topics/virtualization/virtualbox]]\n"
+" - [[!traillink <span_class=\"application\">GNOME_Boxes</span>|advanced_topics/virtualization/boxes]]\n"
+" - [[!traillink <span_class=\"application\">virt-manager</span>|advanced_topics/virtualization/virt-manager]]\n"
+" - [[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]\n"
msgstr ""
-"[[!traillink Activer_un_périphérique_sans-fil|advanced_topics/"
-"wireless_devices]]"
+
+#~ msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
+#~ msgstr "[[!traillink Virtualisation|advanced_topics/virtualization]]"
+
+#~ msgid ""
+#~ "[[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]"
+#~ msgstr ""
+#~ "[[!traillink Activer_un_périphérique_sans-fil|advanced_topics/"
+#~ "wireless_devices]]"
#~ msgid "[[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]"
#~ msgstr "[[!traillink Activer_MAC_Changer|advanced_topics/mac_changer]]"
diff --git a/wiki/src/doc/advanced_topics.index.mdwn b/wiki/src/doc/advanced_topics.index.mdwn
index 3b86c51..24f1e1b 100644
--- a/wiki/src/doc/advanced_topics.index.mdwn
+++ b/wiki/src/doc/advanced_topics.index.mdwn
@@ -1,3 +1,6 @@
- [[!traillink Protection_against_cold_boot_attacks|advanced_topics/cold_boot_attacks]]
- [[!traillink Virtualization|advanced_topics/virtualization]]
+ - [[!traillink <span_class="application">VirtualBox</span>|advanced_topics/virtualization/virtualbox]]
+ - [[!traillink <span_class="application">GNOME_Boxes</span>|advanced_topics/virtualization/boxes]]
+ - [[!traillink <span_class="application">virt-manager</span>|advanced_topics/virtualization/virt-manager]]
- [[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]
diff --git a/wiki/src/doc/advanced_topics.index.pt.po b/wiki/src/doc/advanced_topics.index.pt.po
index 99a6dcc..a2a19c4 100644
--- a/wiki/src/doc/advanced_topics.index.pt.po
+++ b/wiki/src/doc/advanced_topics.index.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-18 02:28+0100\n"
+"POT-Creation-Date: 2015-02-10 13:52+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"
@@ -23,16 +23,24 @@ msgstr ""
"[[!traillink Proteção_contra_ataques_*cold_boot*|advanced_topics/"
"cold_boot_attacks]]"
-#. type: Bullet: ' - '
-msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
-msgstr "[[!traillink Virtualização|advanced_topics/virtualization]]"
+#. type: Plain text
+#, no-wrap
+msgid ""
+" - [[!traillink Virtualization|advanced_topics/virtualization]]\n"
+" - [[!traillink <span_class=\"application\">VirtualBox</span>|advanced_topics/virtualization/virtualbox]]\n"
+" - [[!traillink <span_class=\"application\">GNOME_Boxes</span>|advanced_topics/virtualization/boxes]]\n"
+" - [[!traillink <span_class=\"application\">virt-manager</span>|advanced_topics/virtualization/virt-manager]]\n"
+" - [[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]\n"
+msgstr ""
+
+#~ msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
+#~ msgstr "[[!traillink Virtualização|advanced_topics/virtualization]]"
-#. type: Bullet: ' - '
#, fuzzy
-#| msgid "[[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]"
-msgid ""
-"[[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]"
-msgstr "[[!traillink Habilitar_MAC_Changer|advanced_topics/mac_changer]]"
+#~| msgid "[[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]"
+#~ msgid ""
+#~ "[[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]"
+#~ msgstr "[[!traillink Habilitar_MAC_Changer|advanced_topics/mac_changer]]"
#~ msgid "[[!traillink Enable_MAC_Changer|advanced_topics/mac_changer]]"
#~ msgstr "[[!traillink Habilitar_MAC_Changer|advanced_topics/mac_changer]]"
diff --git a/wiki/src/doc/advanced_topics/virtualization.caution.de.po b/wiki/src/doc/advanced_topics/virtualization.caution.de.po
new file mode 100644
index 0000000..738831f
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization.caution.de.po
@@ -0,0 +1,35 @@
+# 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-02-10 13:52+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 "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Running Tails inside a virtual machine has [[various security "
+"implications|virtualization#security]]. Depending on the host operating "
+"system and your security needs, running Tails in a virtual machine might be "
+"dangerous."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization.caution.fr.po b/wiki/src/doc/advanced_topics/virtualization.caution.fr.po
new file mode 100644
index 0000000..738831f
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization.caution.fr.po
@@ -0,0 +1,35 @@
+# 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-02-10 13:52+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 "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Running Tails inside a virtual machine has [[various security "
+"implications|virtualization#security]]. Depending on the host operating "
+"system and your security needs, running Tails in a virtual machine might be "
+"dangerous."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization.caution.mdwn b/wiki/src/doc/advanced_topics/virtualization.caution.mdwn
new file mode 100644
index 0000000..b7b4f90
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization.caution.mdwn
@@ -0,0 +1,7 @@
+<div class="caution">
+
+Running Tails inside a virtual machine has [[various security
+implications|virtualization#security]]. Depending on the host operating system and your security
+needs, running Tails in a virtual machine might be dangerous.
+
+</div>
diff --git a/wiki/src/doc/advanced_topics/virtualization.caution.pt.po b/wiki/src/doc/advanced_topics/virtualization.caution.pt.po
new file mode 100644
index 0000000..738831f
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization.caution.pt.po
@@ -0,0 +1,35 @@
+# 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-02-10 13:52+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 "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Running Tails inside a virtual machine has [[various security "
+"implications|virtualization#security]]. Depending on the host operating "
+"system and your security needs, running Tails in a virtual machine might be "
+"dangerous."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization.de.po b/wiki/src/doc/advanced_topics/virtualization.de.po
index c9547fc..1d2a701 100644
--- a/wiki/src/doc/advanced_topics/virtualization.de.po
+++ b/wiki/src/doc/advanced_topics/virtualization.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 01:48+0300\n"
+"POT-Creation-Date: 2015-02-10 13:52+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"
@@ -28,84 +28,219 @@ msgstr ""
#. type: Plain text
msgid ""
-"Certain users might not want to restart the computer every time they wish to "
-"use the Internet anonymously with Tails. For those, a so called [virtual "
-"machine](http://en.wikipedia.org/wiki/Virtual_machine) can be used to run "
-"Tails inside the \"host\" operating system installed on the computer (e.g. "
-"Microsoft Windows, Mac OS X, etc.). Essentially these programs emulate real "
-"computers that you can run \"guest\" operating systems (in this case Tails) "
-"in so they appear in a window within the host operating system. Using one of "
-"these technologies allows for convenient access to Tails's features in a "
-"protected environment while you at the same time have access to your normal "
-"operation system."
+"It is sometimes convenient to be able to run Tails without having to restart "
+"your computer every time. This is possible using [[!wikipedia "
+"Virtual_machine desc=\"virtual machines\"]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"With virtual machines, it is possible to run Tails inside a *host* operating "
+"system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine emulates a real "
+"computer and its operating system, called *guest* which appears in a window "
+"on the *host* operating system."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"When running Tails in a virtual machine, you can use most features of Tails "
+"from your usual operating system and use both in parallel without the need "
+"to restart the computer."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"This is how Tails looks like when run in a virtual machine on Debian using "
+"*VirtualBox*:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img tails-in-jessie.png alt=\"Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3\" link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>We do not currently provide a solution for running a virtual machine\n"
+"inside a Tails host. See [[!tails_ticket 5606]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"security\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Security issues\n"
+msgid "Security considerations\n"
msgstr ""
#. type: Plain text
-msgid "There are a few security issues with this approach though."
+#, no-wrap
+msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
msgid ""
-"When running Tails inside a virtual machine, both the host operating system "
-"and the virtualization software are able to monitor what you are doing in "
-"Tails."
+"Running Tails inside a virtual machine has various security implications. "
+"Depending on the host operating system and your security needs, running "
+"Tails in a virtual machine might be dangerous."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"trustworthy\"></a>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Both the host operating system and the [[virtualization software|"
+"virtualization#software]] are able to monitor what you are doing in Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If the host operating system is compromised with a software\n"
+" keylogger or other malware, then it can break the security features\n"
+" of Tails.\n"
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " <div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
-"The main issue is if the host operating system is compromised with a "
-"software keylogger or other malware, which Tails does not provide any "
-"protection against – in fact, that is impossible."
+" Only run Tails in a virtual machine if the host operating system is\n"
+" trustworthy.\n"
msgstr ""
#. type: Plain text
-msgid "Moreover traces are likely to be left on the local hard disk."
+#, no-wrap
+msgid " </div>\n"
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid "<a id=\"traces\"></a>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"As such, this is only recommended when the other alternative is not an "
-"option or when you are absolutely sure that your host system is clean."
+"Traces of your Tails session are likely to be left on the local hard disk. "
+"For example, host operating systems usually use swapping (or *paging*) which "
+"copies part of the RAM to the hard disk."
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
-"That's why Tails warns you when you are running it inside a virtual machine. "
-"Do not expect Tails to protect you if you run it in a virtual machine if you "
-"do not trust the host computer, Tails is not magical!"
+" Only run Tails in a virtual machine if leaving traces on the hard disk\n"
+" is not a concern for you.\n"
msgstr ""
#. type: Plain text
msgid ""
-"If you read this warning while you are not aware to be using a virtual "
-"machine: there could be a [[bug|support/found_a_problem]] in the "
-"virtualization detection software Tails uses... or something really weird is "
-"happening."
+"This is why Tails warns you when it is running inside a virtual machine."
msgstr ""
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, run Tails from a DVD, USB stick "
-"or SD card instead."
+"The Tails virtual machine does not modify the behaviour of the host "
+"operating system and the network traffic of the host is not anonymized. The "
+"MAC address of the computer is not modified by the [[MAC address spoofing|"
+"first_steps/startup_options/mac_spoofing]] feature of Tails when run in a "
+"virtual machine."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"software\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Tips and tricks\n"
+msgid "Virtualization solutions\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To run Tails inside a virtual machine, you need to have virtualization "
+"software installed on the host operating system. Different virtualization "
+"software exist for Linux, Windows, and Mac OS&nbsp;X."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>The following list includes only free software as we believe that\n"
+"this is a necessary condition for it to be trustworthy. See the\n"
+"[[previous warning|virtualization#trustworthy]] and our statement about\n"
+"[[free software and public scrutiny|about/trust#free_software]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Proprietary virtualization software solutions exist such as <span\n"
+"class=\"application\">VMWare</span> but are not listed here on\n"
+"purpose.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*VirtualBox* is available for Linux, Windows, and Mac. Its free software "
+"version does not include support for USB devices and does not allow to use a "
+"persistent volume."
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|virtualbox]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"Some [[tips]] can help making the host operating system and virtualization "
-"software a tiny bit more secure."
+"*GNOME Boxes* is available for Linux. It has a simple user interface but "
+"does not allow to use a persistent volume."
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|boxes]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"In the future, it will be possible to easily start [[Tails within Windows]]."
+"*virt-manager* is available for Linux. It has a more complex user interface "
+"and allows to use a persistent volume, either by:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "Starting Tails from a USB stick or SD card."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Creating a virtual USB storage volume saved as a single file on the host "
+"operating system."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|virt-manager]]\n"
msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization.fr.po b/wiki/src/doc/advanced_topics/virtualization.fr.po
index 4dda380..93af0bd 100644
--- a/wiki/src/doc/advanced_topics/virtualization.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2013-10-24 01:48+0300\n"
+"POT-Creation-Date: 2015-02-10 13:52+0100\n"
"PO-Revision-Date: 2013-06-17 19:11-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,126 +28,337 @@ msgstr "[[!toc levels=2]]\n"
#. type: Plain text
msgid ""
-"Certain users might not want to restart the computer every time they wish to "
-"use the Internet anonymously with Tails. For those, a so called [virtual "
-"machine](http://en.wikipedia.org/wiki/Virtual_machine) can be used to run "
-"Tails inside the \"host\" operating system installed on the computer (e.g. "
-"Microsoft Windows, Mac OS X, etc.). Essentially these programs emulate real "
-"computers that you can run \"guest\" operating systems (in this case Tails) "
-"in so they appear in a window within the host operating system. Using one of "
-"these technologies allows for convenient access to Tails's features in a "
-"protected environment while you at the same time have access to your normal "
-"operation system."
-msgstr ""
-"Certains utilisateurs pourraient ne pas vouloir redémarrer l'ordinateur à "
-"chaque fois qu'ils souhaitent utiliser internet anonymement avec Tails. Pour "
-"ces personnes, une [machine virtuelle](http://fr.wikipedia.org/wiki/"
-"machine_virtuelle) peut être utilisée pour démarrer Tails à l'intérieur du "
-"système d'exploitation \"hôte\" installé dans l'ordinateur (e.x. Microsoft "
-"Windows, Mac OS X, etc.). Globalement, ces programmes simulent des "
-"ordinateurs réels à l'intérieur desquels vous pouvez démarrer des systèmes "
-"d'exploitation \"invités\" (dans ce cas Tails). Ils apparaissent alors dans "
-"une fenêtre à l'intérieur du système d'exploitation hôte. Utiliser une de "
-"ces technologies permet un accès commode aux fonctionnalités de Tails dans "
-"un environnement protégé tout en ayant accès à votre système d'exploitation "
-"habituel."
+"It is sometimes convenient to be able to run Tails without having to restart "
+"your computer every time. This is possible using [[!wikipedia "
+"Virtual_machine desc=\"virtual machines\"]]."
+msgstr ""
-#. type: Title =
+#. type: Plain text
+msgid ""
+"With virtual machines, it is possible to run Tails inside a *host* operating "
+"system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine emulates a real "
+"computer and its operating system, called *guest* which appears in a window "
+"on the *host* operating system."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "When running Tails inside a virtual machine, both the host operating "
+#| "system and the virtualization software are able to monitor what you are "
+#| "doing in Tails."
+msgid ""
+"When running Tails in a virtual machine, you can use most features of Tails "
+"from your usual operating system and use both in parallel without the need "
+"to restart the computer."
+msgstr ""
+"Lorsque vous utilisez Tails au sein d'une machine virtuelle, le système "
+"d'exploitation hôte ainsi que le logiciel de virtualisation sont capables "
+"d'observer et d'analyser ce que vous faites dans Tails."
+
+#. type: Plain text
+msgid ""
+"This is how Tails looks like when run in a virtual machine on Debian using "
+"*VirtualBox*:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img tails-in-jessie.png alt=\"Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3\" link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>We do not currently provide a solution for running a virtual machine\n"
+"inside a Tails host. See [[!tails_ticket 5606]].</p>\n"
+msgstr ""
+
+#. type: Plain text
#, no-wrap
-msgid "Security issues\n"
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"security\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, fuzzy, no-wrap
+#| msgid "Security issues\n"
+msgid "Security considerations\n"
msgstr "Problèmes de sécurité\n"
#. type: Plain text
-msgid "There are a few security issues with this approach though."
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Running Tails inside a virtual machine has various security implications. "
+"Depending on the host operating system and your security needs, running "
+"Tails in a virtual machine might be dangerous."
msgstr ""
-"Cependant, il y a certains problèmes de sécurité lorsque l'on choisit cette "
-"technique."
#. type: Plain text
+#, no-wrap
+msgid "<a id=\"trustworthy\"></a>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "When running Tails inside a virtual machine, both the host operating "
+#| "system and the virtualization software are able to monitor what you are "
+#| "doing in Tails."
msgid ""
-"When running Tails inside a virtual machine, both the host operating system "
-"and the virtualization software are able to monitor what you are doing in "
-"Tails."
+"Both the host operating system and the [[virtualization software|"
+"virtualization#software]] are able to monitor what you are doing in Tails."
msgstr ""
"Lorsque vous utilisez Tails au sein d'une machine virtuelle, le système "
"d'exploitation hôte ainsi que le logiciel de virtualisation sont capables "
"d'observer et d'analyser ce que vous faites dans Tails."
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "The main issue is if the host operating system is compromised with a software keylogger or other malware, which Tails does not provide any protection against – in fact, that is impossible."
msgid ""
-"The main issue is if the host operating system is compromised with a "
-"software keylogger or other malware, which Tails does not provide any "
-"protection against – in fact, that is impossible."
+" If the host operating system is compromised with a software\n"
+" keylogger or other malware, then it can break the security features\n"
+" of Tails.\n"
+msgstr "Le principal risque est que le système d'exploitation hôte soit compromis par un logiciel keylogger ou un autre logiciel malveillant, contre lesquels Tails ne fournit aucune protection - et pour cause : c'est impossible."
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Only run Tails in a virtual machine if the host operating system is\n"
+" trustworthy.\n"
msgstr ""
-"Le principal risque est que le système d'exploitation hôte soit compromis "
-"par un logiciel keylogger ou un autre logiciel malveillant, contre lesquels "
-"Tails ne fournit aucune protection - et pour cause : c'est impossible."
#. type: Plain text
-msgid "Moreover traces are likely to be left on the local hard disk."
+#, no-wrap
+msgid " </div>\n"
msgstr ""
-"De plus, des traces pourront potentiellement être laissées sur votre disque "
-"dur local."
#. type: Plain text
+#, no-wrap
+msgid "<a id=\"traces\"></a>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"As such, this is only recommended when the other alternative is not an "
-"option or when you are absolutely sure that your host system is clean."
+"Traces of your Tails session are likely to be left on the local hard disk. "
+"For example, host operating systems usually use swapping (or *paging*) which "
+"copies part of the RAM to the hard disk."
msgstr ""
-"Ainsi, cette pratique n'est recommandée que s'il n'y a pas d'alternative, ou "
-"si vous êtes absolument certain que votre système hôte est sûr et propre."
#. type: Plain text
+#, no-wrap
msgid ""
-"That's why Tails warns you when you are running it inside a virtual machine. "
-"Do not expect Tails to protect you if you run it in a virtual machine if you "
-"do not trust the host computer, Tails is not magical!"
+" Only run Tails in a virtual machine if leaving traces on the hard disk\n"
+" is not a concern for you.\n"
msgstr ""
-"C'est pourquoi Tails tient à vous prévenir, si vous utilisez une machine "
-"virtuelle. N'espérez pas que Tails vous protège si vous l'utilisez sur une "
-"machine virtuelle et que vous ne faites pas confiance à l'ordinateur hôte. "
-"Tails ne peut pas faire de miracle !"
#. type: Plain text
msgid ""
-"If you read this warning while you are not aware to be using a virtual "
-"machine: there could be a [[bug|support/found_a_problem]] in the "
-"virtualization detection software Tails uses... or something really weird is "
-"happening."
+"This is why Tails warns you when it is running inside a virtual machine."
msgstr ""
-"Si vous lisez cet avertissement alors que vous n'êtes pas au courant que "
-"vous utilisez une machine virtuelle : il pourrait y avoir un [[bug|support/"
-"found_a_problem]] dans le logiciel de détection de virtualisation que Tails "
-"utilise... Ou bien quelque chose de vraiment étrange est en train de se "
-"produire."
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, run Tails from a DVD, USB stick "
-"or SD card instead."
+"The Tails virtual machine does not modify the behaviour of the host "
+"operating system and the network traffic of the host is not anonymized. The "
+"MAC address of the computer is not modified by the [[MAC address spoofing|"
+"first_steps/startup_options/mac_spoofing]] feature of Tails when run in a "
+"virtual machine."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"software\"></a>\n"
msgstr ""
-"Si vous n'êtes pas sûr, et si vous pouvez vous le permettre, utilisez Tails "
-"depuis un DVD, une clé USB ou un carte SD."
#. type: Title =
#, no-wrap
-msgid "Tips and tricks\n"
-msgstr "Astuces\n"
+msgid "Virtualization solutions\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "When running Tails inside a virtual machine, both the host operating "
+#| "system and the virtualization software are able to monitor what you are "
+#| "doing in Tails."
+msgid ""
+"To run Tails inside a virtual machine, you need to have virtualization "
+"software installed on the host operating system. Different virtualization "
+"software exist for Linux, Windows, and Mac OS&nbsp;X."
+msgstr ""
+"Lorsque vous utilisez Tails au sein d'une machine virtuelle, le système "
+"d'exploitation hôte ainsi que le logiciel de virtualisation sont capables "
+"d'observer et d'analyser ce que vous faites dans Tails."
#. type: Plain text
+#, no-wrap
msgid ""
-"Some [[tips]] can help making the host operating system and virtualization "
-"software a tiny bit more secure."
+"<p>The following list includes only free software as we believe that\n"
+"this is a necessary condition for it to be trustworthy. See the\n"
+"[[previous warning|virtualization#trustworthy]] and our statement about\n"
+"[[free software and public scrutiny|about/trust#free_software]].</p>\n"
msgstr ""
-"Plusieurs [[astuces|tips]] peuvent aider à rendre le système d'exploitation "
-"hôte un peu plus sécurisé."
#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Proprietary virtualization software solutions exist such as <span\n"
+"class=\"application\">VMWare</span> but are not listed here on\n"
+"purpose.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*VirtualBox* is available for Linux, Windows, and Mac. Its free software "
+"version does not include support for USB devices and does not allow to use a "
+"persistent volume."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|virtualbox]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*GNOME Boxes* is available for Linux. It has a simple user interface but "
+"does not allow to use a persistent volume."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|boxes]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*virt-manager* is available for Linux. It has a more complex user interface "
+"and allows to use a persistent volume, either by:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "Starting Tails from a USB stick or SD card."
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"In the future, it will be possible to easily start [[Tails within Windows]]."
+"Creating a virtual USB storage volume saved as a single file on the host "
+"operating system."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|virt-manager]]\n"
msgstr ""
-"À l'avenir, il sera possible de lancer facilement [[Tails sous Windows|"
-"tails_within_windows]]."
+
+#~ msgid ""
+#~ "Certain users might not want to restart the computer every time they wish "
+#~ "to use the Internet anonymously with Tails. For those, a so called "
+#~ "[virtual machine](http://en.wikipedia.org/wiki/Virtual_machine) can be "
+#~ "used to run Tails inside the \"host\" operating system installed on the "
+#~ "computer (e.g. Microsoft Windows, Mac OS X, etc.). Essentially these "
+#~ "programs emulate real computers that you can run \"guest\" operating "
+#~ "systems (in this case Tails) in so they appear in a window within the "
+#~ "host operating system. Using one of these technologies allows for "
+#~ "convenient access to Tails's features in a protected environment while "
+#~ "you at the same time have access to your normal operation system."
+#~ msgstr ""
+#~ "Certains utilisateurs pourraient ne pas vouloir redémarrer l'ordinateur à "
+#~ "chaque fois qu'ils souhaitent utiliser internet anonymement avec Tails. "
+#~ "Pour ces personnes, une [machine virtuelle](http://fr.wikipedia.org/wiki/"
+#~ "machine_virtuelle) peut être utilisée pour démarrer Tails à l'intérieur "
+#~ "du système d'exploitation \"hôte\" installé dans l'ordinateur (e.x. "
+#~ "Microsoft Windows, Mac OS X, etc.). Globalement, ces programmes simulent "
+#~ "des ordinateurs réels à l'intérieur desquels vous pouvez démarrer des "
+#~ "systèmes d'exploitation \"invités\" (dans ce cas Tails). Ils apparaissent "
+#~ "alors dans une fenêtre à l'intérieur du système d'exploitation hôte. "
+#~ "Utiliser une de ces technologies permet un accès commode aux "
+#~ "fonctionnalités de Tails dans un environnement protégé tout en ayant "
+#~ "accès à votre système d'exploitation habituel."
+
+#~ msgid "There are a few security issues with this approach though."
+#~ msgstr ""
+#~ "Cependant, il y a certains problèmes de sécurité lorsque l'on choisit "
+#~ "cette technique."
+
+#~ msgid "Moreover traces are likely to be left on the local hard disk."
+#~ msgstr ""
+#~ "De plus, des traces pourront potentiellement être laissées sur votre "
+#~ "disque dur local."
+
+#~ msgid ""
+#~ "As such, this is only recommended when the other alternative is not an "
+#~ "option or when you are absolutely sure that your host system is clean."
+#~ msgstr ""
+#~ "Ainsi, cette pratique n'est recommandée que s'il n'y a pas d'alternative, "
+#~ "ou si vous êtes absolument certain que votre système hôte est sûr et "
+#~ "propre."
+
+#~ msgid ""
+#~ "That's why Tails warns you when you are running it inside a virtual "
+#~ "machine. Do not expect Tails to protect you if you run it in a virtual "
+#~ "machine if you do not trust the host computer, Tails is not magical!"
+#~ msgstr ""
+#~ "C'est pourquoi Tails tient à vous prévenir, si vous utilisez une machine "
+#~ "virtuelle. N'espérez pas que Tails vous protège si vous l'utilisez sur "
+#~ "une machine virtuelle et que vous ne faites pas confiance à l'ordinateur "
+#~ "hôte. Tails ne peut pas faire de miracle !"
+
+#~ msgid ""
+#~ "If you read this warning while you are not aware to be using a virtual "
+#~ "machine: there could be a [[bug|support/found_a_problem]] in the "
+#~ "virtualization detection software Tails uses... or something really weird "
+#~ "is happening."
+#~ msgstr ""
+#~ "Si vous lisez cet avertissement alors que vous n'êtes pas au courant que "
+#~ "vous utilisez une machine virtuelle : il pourrait y avoir un [[bug|"
+#~ "support/found_a_problem]] dans le logiciel de détection de virtualisation "
+#~ "que Tails utilise... Ou bien quelque chose de vraiment étrange est en "
+#~ "train de se produire."
+
+#~ msgid ""
+#~ "If you are unsure, and if you can afford it, run Tails from a DVD, USB "
+#~ "stick or SD card instead."
+#~ msgstr ""
+#~ "Si vous n'êtes pas sûr, et si vous pouvez vous le permettre, utilisez "
+#~ "Tails depuis un DVD, une clé USB ou un carte SD."
+
+#~ msgid "Tips and tricks\n"
+#~ msgstr "Astuces\n"
+
+#~ msgid ""
+#~ "Some [[tips]] can help making the host operating system and "
+#~ "virtualization software a tiny bit more secure."
+#~ msgstr ""
+#~ "Plusieurs [[astuces|tips]] peuvent aider à rendre le système "
+#~ "d'exploitation hôte un peu plus sécurisé."
+
+#~ msgid ""
+#~ "In the future, it will be possible to easily start [[Tails within "
+#~ "Windows]]."
+#~ msgstr ""
+#~ "À l'avenir, il sera possible de lancer facilement [[Tails sous Windows|"
+#~ "tails_within_windows]]."
#~ msgid ""
#~ "There are a few security issues with this approach though. The main issue "
diff --git a/wiki/src/doc/advanced_topics/virtualization.mdwn b/wiki/src/doc/advanced_topics/virtualization.mdwn
index 137b1b0..6f7c405 100644
--- a/wiki/src/doc/advanced_topics/virtualization.mdwn
+++ b/wiki/src/doc/advanced_topics/virtualization.mdwn
@@ -2,52 +2,124 @@
[[!toc levels=2]]
-Certain users might not want to restart the computer every time they
-wish to use the Internet anonymously with Tails. For those, a so
-called [virtual machine](http://en.wikipedia.org/wiki/Virtual_machine)
-can be used to run Tails inside the "host" operating system
-installed on the computer (e.g. Microsoft Windows, Mac OS X, etc.).
-Essentially these programs emulate real computers that you can run
-"guest" operating systems (in this case Tails) in so they appear in
-a window within the host operating system. Using one of these
-technologies allows for convenient access to Tails's features in a
-protected environment while you at the same time have access to your
-normal operation system.
+It is sometimes convenient to be able to run Tails without having to
+restart your computer every time. This is possible using
+[[!wikipedia Virtual_machine desc="virtual machines"]].
-Security issues
-===============
+With virtual machines, it is possible to run Tails inside a *host*
+operating system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine
+emulates a real computer and its operating system, called *guest* which
+appears in a window on the *host* operating system.
-There are a few security issues with this approach though.
+When running Tails in a virtual machine, you can use most features of
+Tails from your usual operating system and use both in parallel
+without the need to restart the computer.
-When running Tails inside a virtual machine, both the host operating system
-and the virtualization software are able to monitor what you are doing in
-Tails.
+This is how Tails looks like when run in a virtual machine on Debian using *VirtualBox*:
-The main issue is if the host operating system is compromised with a software
-keylogger or other malware, which Tails does not provide any protection against
-– in fact, that is impossible.
+[[!img tails-in-jessie.png alt="Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3" link=no]]
-Moreover traces are likely to be left on the local hard disk.
+<div class="note">
-As such, this is only recommended when the other alternative is not an option
-or when you are absolutely sure that your host system is clean.
+<p>We do not currently provide a solution for running a virtual machine
+inside a Tails host. See [[!tails_ticket 5606]].</p>
-That's why Tails warns you when you are running it inside a virtual
-machine. Do not expect Tails to protect you if you run it in a virtual
-machine if you do not trust the host computer, Tails is not magical!
+</div>
-If you read this warning while you are not aware to be using a virtual
-machine: there could be a [[bug|support/found_a_problem]] in the
-virtualization detection software Tails uses... or something really
-weird is happening.
+<a id="security"></a>
-If you are unsure, and if you can afford it, run Tails from a DVD,
-USB stick or SD card instead.
+Security considerations
+=======================
-Tips and tricks
-===============
+<div class="caution">
-Some [[tips]] can help making the host
-operating system and virtualization software a tiny bit more secure.
+Running Tails inside a virtual machine has various security
+implications. Depending on the host operating system and your security
+needs, running Tails in a virtual machine might be dangerous.
-In the future, it will be possible to easily start [[Tails within Windows]].
+</div>
+
+<a id="trustworthy"></a>
+
+ - Both the host operating system and the [[virtualization
+ software|virtualization#software]] are able to monitor what you are
+ doing in Tails.
+
+ If the host operating system is compromised with a software
+ keylogger or other malware, then it can break the security features
+ of Tails.
+
+ <div class="caution">
+
+ Only run Tails in a virtual machine if the host operating system is
+ trustworthy.
+
+ </div>
+
+<a id="traces"></a>
+
+ - Traces of your Tails session are likely to be left on the local hard
+ disk. For example, host operating systems usually use swapping (or *paging*) which
+ copies part of the RAM to the hard disk.
+
+ <div class="caution">
+
+ Only run Tails in a virtual machine if leaving traces on the hard disk
+ is not a concern for you.
+
+ </div>
+
+This is why Tails warns you when it is running inside a virtual machine.
+
+<div class="note">
+
+The Tails virtual machine does not modify the behaviour of the host
+operating system and the network traffic of the host is not anonymized. The MAC
+address of the computer is not modified by the [[MAC address
+spoofing|first_steps/startup_options/mac_spoofing]] feature of Tails
+when run in a virtual machine.
+
+</div>
+
+<a id="software"></a>
+
+Virtualization solutions
+========================
+
+To run Tails inside a virtual machine, you need to have
+virtualization software installed on the host operating system.
+Different virtualization software exist for Linux, Windows, and Mac OS&nbsp;X.
+
+<div class="note">
+
+<p>The following list includes only free software as we believe that
+this is a necessary condition for it to be trustworthy. See the
+[[previous warning|virtualization#trustworthy]] and our statement about
+[[free software and public scrutiny|about/trust#free_software]].</p>
+
+<p>Proprietary virtualization software solutions exist such as <span
+class="application">VMWare</span> but are not listed here on
+purpose.</p>
+
+</div>
+
+ - *VirtualBox* is available for Linux, Windows, and Mac. Its
+ free software version does not include support for USB devices and
+ does not allow to use a persistent volume.
+
+ [[See the corresponding documentation.|virtualbox]]
+
+ - *GNOME Boxes* is available for Linux. It has a simple user
+ interface but does not allow to use a persistent volume.
+
+ [[See the corresponding documentation.|boxes]]
+
+ - *virt-manager* is available for Linux. It has a more
+ complex user interface and allows to use a persistent volume, either
+ by:
+
+ - Starting Tails from a USB stick or SD card.
+ - Creating a virtual USB storage volume saved as a single file on the host
+ operating system.
+
+ [[See the corresponding documentation.|virt-manager]]
diff --git a/wiki/src/doc/advanced_topics/virtualization.pt.po b/wiki/src/doc/advanced_topics/virtualization.pt.po
index c9547fc..1d2a701 100644
--- a/wiki/src/doc/advanced_topics/virtualization.pt.po
+++ b/wiki/src/doc/advanced_topics/virtualization.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 01:48+0300\n"
+"POT-Creation-Date: 2015-02-10 13:52+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"
@@ -28,84 +28,219 @@ msgstr ""
#. type: Plain text
msgid ""
-"Certain users might not want to restart the computer every time they wish to "
-"use the Internet anonymously with Tails. For those, a so called [virtual "
-"machine](http://en.wikipedia.org/wiki/Virtual_machine) can be used to run "
-"Tails inside the \"host\" operating system installed on the computer (e.g. "
-"Microsoft Windows, Mac OS X, etc.). Essentially these programs emulate real "
-"computers that you can run \"guest\" operating systems (in this case Tails) "
-"in so they appear in a window within the host operating system. Using one of "
-"these technologies allows for convenient access to Tails's features in a "
-"protected environment while you at the same time have access to your normal "
-"operation system."
+"It is sometimes convenient to be able to run Tails without having to restart "
+"your computer every time. This is possible using [[!wikipedia "
+"Virtual_machine desc=\"virtual machines\"]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"With virtual machines, it is possible to run Tails inside a *host* operating "
+"system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine emulates a real "
+"computer and its operating system, called *guest* which appears in a window "
+"on the *host* operating system."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"When running Tails in a virtual machine, you can use most features of Tails "
+"from your usual operating system and use both in parallel without the need "
+"to restart the computer."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"This is how Tails looks like when run in a virtual machine on Debian using "
+"*VirtualBox*:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img tails-in-jessie.png alt=\"Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3\" link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>We do not currently provide a solution for running a virtual machine\n"
+"inside a Tails host. See [[!tails_ticket 5606]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"security\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Security issues\n"
+msgid "Security considerations\n"
msgstr ""
#. type: Plain text
-msgid "There are a few security issues with this approach though."
+#, no-wrap
+msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
msgid ""
-"When running Tails inside a virtual machine, both the host operating system "
-"and the virtualization software are able to monitor what you are doing in "
-"Tails."
+"Running Tails inside a virtual machine has various security implications. "
+"Depending on the host operating system and your security needs, running "
+"Tails in a virtual machine might be dangerous."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"trustworthy\"></a>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Both the host operating system and the [[virtualization software|"
+"virtualization#software]] are able to monitor what you are doing in Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If the host operating system is compromised with a software\n"
+" keylogger or other malware, then it can break the security features\n"
+" of Tails.\n"
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " <div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
-"The main issue is if the host operating system is compromised with a "
-"software keylogger or other malware, which Tails does not provide any "
-"protection against – in fact, that is impossible."
+" Only run Tails in a virtual machine if the host operating system is\n"
+" trustworthy.\n"
msgstr ""
#. type: Plain text
-msgid "Moreover traces are likely to be left on the local hard disk."
+#, no-wrap
+msgid " </div>\n"
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid "<a id=\"traces\"></a>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"As such, this is only recommended when the other alternative is not an "
-"option or when you are absolutely sure that your host system is clean."
+"Traces of your Tails session are likely to be left on the local hard disk. "
+"For example, host operating systems usually use swapping (or *paging*) which "
+"copies part of the RAM to the hard disk."
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
-"That's why Tails warns you when you are running it inside a virtual machine. "
-"Do not expect Tails to protect you if you run it in a virtual machine if you "
-"do not trust the host computer, Tails is not magical!"
+" Only run Tails in a virtual machine if leaving traces on the hard disk\n"
+" is not a concern for you.\n"
msgstr ""
#. type: Plain text
msgid ""
-"If you read this warning while you are not aware to be using a virtual "
-"machine: there could be a [[bug|support/found_a_problem]] in the "
-"virtualization detection software Tails uses... or something really weird is "
-"happening."
+"This is why Tails warns you when it is running inside a virtual machine."
msgstr ""
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, run Tails from a DVD, USB stick "
-"or SD card instead."
+"The Tails virtual machine does not modify the behaviour of the host "
+"operating system and the network traffic of the host is not anonymized. The "
+"MAC address of the computer is not modified by the [[MAC address spoofing|"
+"first_steps/startup_options/mac_spoofing]] feature of Tails when run in a "
+"virtual machine."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"software\"></a>\n"
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Tips and tricks\n"
+msgid "Virtualization solutions\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To run Tails inside a virtual machine, you need to have virtualization "
+"software installed on the host operating system. Different virtualization "
+"software exist for Linux, Windows, and Mac OS&nbsp;X."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>The following list includes only free software as we believe that\n"
+"this is a necessary condition for it to be trustworthy. See the\n"
+"[[previous warning|virtualization#trustworthy]] and our statement about\n"
+"[[free software and public scrutiny|about/trust#free_software]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Proprietary virtualization software solutions exist such as <span\n"
+"class=\"application\">VMWare</span> but are not listed here on\n"
+"purpose.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*VirtualBox* is available for Linux, Windows, and Mac. Its free software "
+"version does not include support for USB devices and does not allow to use a "
+"persistent volume."
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|virtualbox]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"Some [[tips]] can help making the host operating system and virtualization "
-"software a tiny bit more secure."
+"*GNOME Boxes* is available for Linux. It has a simple user interface but "
+"does not allow to use a persistent volume."
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|boxes]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"In the future, it will be possible to easily start [[Tails within Windows]]."
+"*virt-manager* is available for Linux. It has a more complex user interface "
+"and allows to use a persistent volume, either by:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "Starting Tails from a USB stick or SD card."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Creating a virtual USB storage volume saved as a single file on the host "
+"operating system."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[See the corresponding documentation.|virt-manager]]\n"
msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/boxes.de.po b/wiki/src/doc/advanced_topics/virtualization/boxes.de.po
new file mode 100644
index 0000000..7737a98
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/boxes.de.po
@@ -0,0 +1,157 @@
+# 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-02-10 13:52+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 title=\"GNOME Boxes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[<span class=\"application\">GNOME "
+"Boxes</span>](https://wiki.gnome.org/Boxes) aims at providing a simple\n"
+"interface to create and use virtual machines for Linux with GNOME.\n"
+"*GNOME Boxes* does not allow to use a persistent volume.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In Debian Wheezy, Ubuntu 14.04, and earlier,\n"
+"<span class=\"application\">GNOME Boxes</span> allocates only 512 MiB of\n"
+"RAM to new virtual machines by default. This is too little to allow\n"
+"Tails to run smoothly. We recommend you to reconfigure the virtual\n"
+"machine and allocate at least 1 GiB of RAM.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To install *GNOME Boxes* in Debian or Ubuntu, execute the following command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install gnome-boxes\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Start *GNOME Boxes*."
+msgstr ""
+
+#. type: Bullet: ' 2. '
+msgid "Click on the **New** button on the top of the window."
+msgstr ""
+
+#. type: Bullet: ' 3. '
+msgid ""
+"In the **Source Selection** dialog, choose **Select a file** and browse for "
+"the ISO image that you want to start from."
+msgstr ""
+
+#. type: Bullet: ' 4. '
+msgid ""
+"In the **Review** dialog, click on the **Create** button on the top of the "
+"window."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Shared clipboard\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>The shared clipboard of <span class=\"application\">GNOME Boxes</span>\n"
+"is enabled by default. This can allow sensitive data to be copied by\n"
+"mistake from the virtual machine onto the host operating system or vice\n"
+"versa.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>We recommend you to disable the shared clipboard.</p>\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To disable the shared clipboard:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click on the"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img preferences-system-symbolic.png alt=\"Preferences\" "
+"class=symbolic link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" button on the top-right corner of the window.\n"
+" 2. Select the **Display** screen in the left pane.\n"
+" 3. Deactivate **Share clipboard** in the right pane.\n"
+" 4. Click on the\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img go-previous-symbolic.png alt=\"Previous\" class=symbolic "
+"link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " button to go back to the display of the virtual machine.\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/boxes.fr.po b/wiki/src/doc/advanced_topics/virtualization/boxes.fr.po
new file mode 100644
index 0000000..7737a98
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/boxes.fr.po
@@ -0,0 +1,157 @@
+# 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-02-10 13:52+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 title=\"GNOME Boxes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[<span class=\"application\">GNOME "
+"Boxes</span>](https://wiki.gnome.org/Boxes) aims at providing a simple\n"
+"interface to create and use virtual machines for Linux with GNOME.\n"
+"*GNOME Boxes* does not allow to use a persistent volume.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In Debian Wheezy, Ubuntu 14.04, and earlier,\n"
+"<span class=\"application\">GNOME Boxes</span> allocates only 512 MiB of\n"
+"RAM to new virtual machines by default. This is too little to allow\n"
+"Tails to run smoothly. We recommend you to reconfigure the virtual\n"
+"machine and allocate at least 1 GiB of RAM.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To install *GNOME Boxes* in Debian or Ubuntu, execute the following command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install gnome-boxes\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Start *GNOME Boxes*."
+msgstr ""
+
+#. type: Bullet: ' 2. '
+msgid "Click on the **New** button on the top of the window."
+msgstr ""
+
+#. type: Bullet: ' 3. '
+msgid ""
+"In the **Source Selection** dialog, choose **Select a file** and browse for "
+"the ISO image that you want to start from."
+msgstr ""
+
+#. type: Bullet: ' 4. '
+msgid ""
+"In the **Review** dialog, click on the **Create** button on the top of the "
+"window."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Shared clipboard\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>The shared clipboard of <span class=\"application\">GNOME Boxes</span>\n"
+"is enabled by default. This can allow sensitive data to be copied by\n"
+"mistake from the virtual machine onto the host operating system or vice\n"
+"versa.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>We recommend you to disable the shared clipboard.</p>\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To disable the shared clipboard:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click on the"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img preferences-system-symbolic.png alt=\"Preferences\" "
+"class=symbolic link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" button on the top-right corner of the window.\n"
+" 2. Select the **Display** screen in the left pane.\n"
+" 3. Deactivate **Share clipboard** in the right pane.\n"
+" 4. Click on the\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img go-previous-symbolic.png alt=\"Previous\" class=symbolic "
+"link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " button to go back to the display of the virtual machine.\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/boxes.mdwn b/wiki/src/doc/advanced_topics/virtualization/boxes.mdwn
new file mode 100644
index 0000000..9e4c31e
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/boxes.mdwn
@@ -0,0 +1,60 @@
+[[!meta title="GNOME Boxes"]]
+
+[<span class="application">GNOME Boxes</span>](https://wiki.gnome.org/Boxes) aims at providing a simple
+interface to create and use virtual machines for Linux with GNOME.
+*GNOME Boxes* does not allow to use a persistent volume.
+
+[[!inline pages="doc/advanced_topics/virtualization.caution" raw="yes"]]
+
+<div class="note">
+
+<p>In Debian Wheezy, Ubuntu 14.04, and earlier,
+<span class="application">GNOME Boxes</span> allocates only 512 MiB of
+RAM to new virtual machines by default. This is too little to allow
+Tails to run smoothly. We recommend you to reconfigure the virtual
+machine and allocate at least 1 GiB of RAM.</p>
+
+</div>
+
+Installation
+============
+
+To install *GNOME Boxes* in Debian or Ubuntu, execute the following
+command:
+
+ sudo apt-get install gnome-boxes
+
+Running Tails from an ISO image
+===============================
+
+ 1. Start *GNOME Boxes*.
+ 2. Click on the **New** button on the top of the window.
+ 3. In the **Source Selection** dialog, choose **Select a file** and
+ browse for the ISO image that you want to start from.
+ 4. In the **Review** dialog, click on the **Create** button on the top
+ of the window.
+
+Shared clipboard
+================
+
+<div class="caution">
+
+<p>The shared clipboard of <span class="application">GNOME Boxes</span>
+is enabled by default. This can allow sensitive data to be copied by
+mistake from the virtual machine onto the host operating system or vice
+versa.</p>
+
+<p>We recommend you to disable the shared clipboard.</p>
+
+</div>
+
+To disable the shared clipboard:
+
+ 1. Click on the
+ [[!img preferences-system-symbolic.png alt="Preferences" class=symbolic link=no]]
+ button on the top-right corner of the window.
+ 2. Select the **Display** screen in the left pane.
+ 3. Deactivate **Share clipboard** in the right pane.
+ 4. Click on the
+ [[!img go-previous-symbolic.png alt="Previous" class=symbolic link=no]]
+ button to go back to the display of the virtual machine.
diff --git a/wiki/src/doc/advanced_topics/virtualization/boxes.pt.po b/wiki/src/doc/advanced_topics/virtualization/boxes.pt.po
new file mode 100644
index 0000000..7737a98
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/boxes.pt.po
@@ -0,0 +1,157 @@
+# 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-02-10 13:52+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 title=\"GNOME Boxes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[<span class=\"application\">GNOME "
+"Boxes</span>](https://wiki.gnome.org/Boxes) aims at providing a simple\n"
+"interface to create and use virtual machines for Linux with GNOME.\n"
+"*GNOME Boxes* does not allow to use a persistent volume.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In Debian Wheezy, Ubuntu 14.04, and earlier,\n"
+"<span class=\"application\">GNOME Boxes</span> allocates only 512 MiB of\n"
+"RAM to new virtual machines by default. This is too little to allow\n"
+"Tails to run smoothly. We recommend you to reconfigure the virtual\n"
+"machine and allocate at least 1 GiB of RAM.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To install *GNOME Boxes* in Debian or Ubuntu, execute the following command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install gnome-boxes\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Start *GNOME Boxes*."
+msgstr ""
+
+#. type: Bullet: ' 2. '
+msgid "Click on the **New** button on the top of the window."
+msgstr ""
+
+#. type: Bullet: ' 3. '
+msgid ""
+"In the **Source Selection** dialog, choose **Select a file** and browse for "
+"the ISO image that you want to start from."
+msgstr ""
+
+#. type: Bullet: ' 4. '
+msgid ""
+"In the **Review** dialog, click on the **Create** button on the top of the "
+"window."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Shared clipboard\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>The shared clipboard of <span class=\"application\">GNOME Boxes</span>\n"
+"is enabled by default. This can allow sensitive data to be copied by\n"
+"mistake from the virtual machine onto the host operating system or vice\n"
+"versa.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>We recommend you to disable the shared clipboard.</p>\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To disable the shared clipboard:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click on the"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img preferences-system-symbolic.png alt=\"Preferences\" "
+"class=symbolic link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" button on the top-right corner of the window.\n"
+" 2. Select the **Display** screen in the left pane.\n"
+" 3. Deactivate **Share clipboard** in the right pane.\n"
+" 4. Click on the\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img go-previous-symbolic.png alt=\"Previous\" class=symbolic "
+"link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " button to go back to the display of the virtual machine.\n"
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/tails-in-jessie.png b/wiki/src/doc/advanced_topics/virtualization/tails-in-jessie.png
new file mode 100644
index 0000000..3cb1f38
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/tails-in-jessie.png
Binary files differ
diff --git a/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.de.po b/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.de.po
deleted file mode 100644
index d101b01..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.de.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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: 2011-06-18 22:40+0300\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 title=\"Running Tails from within Microsoft Windows\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**FIXME**: This section have not been adapted from old incognito documentation\n"
-"now so please do not take it into account. It is currently possible to start\n"
-"Tails under Windows with QEMU.\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Thanks to QEMU, Tails can be run within Microsoft Windows without the need to "
-"restart the computer. QEMU ships with Tails, and is set up so you only have "
-"to insert the media when Windows is running and a menu should appear with the "
-"option to start Tails through it. This is especially useful when you are "
-"using a computer you are not allowed to shut-down, which can be the case for "
-"public computers in certain Internet cafés, libraries or other public "
-"computers. Also, for some some general remarks on QEMU and Tails, and some "
-"security concerns about this mode of operation, see the above section on "
-"[[virtualization]]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Since the Tails developers do not have access to any Windows computers at the "
-"moment, any input if this actually works and how it performs etc. is welcome."
-msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.fr.po b/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.fr.po
deleted file mode 100644
index d101b01..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.fr.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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: 2011-06-18 22:40+0300\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 title=\"Running Tails from within Microsoft Windows\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**FIXME**: This section have not been adapted from old incognito documentation\n"
-"now so please do not take it into account. It is currently possible to start\n"
-"Tails under Windows with QEMU.\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Thanks to QEMU, Tails can be run within Microsoft Windows without the need to "
-"restart the computer. QEMU ships with Tails, and is set up so you only have "
-"to insert the media when Windows is running and a menu should appear with the "
-"option to start Tails through it. This is especially useful when you are "
-"using a computer you are not allowed to shut-down, which can be the case for "
-"public computers in certain Internet cafés, libraries or other public "
-"computers. Also, for some some general remarks on QEMU and Tails, and some "
-"security concerns about this mode of operation, see the above section on "
-"[[virtualization]]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Since the Tails developers do not have access to any Windows computers at the "
-"moment, any input if this actually works and how it performs etc. is welcome."
-msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.mdwn b/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.mdwn
deleted file mode 100644
index a58abe6..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-[[!meta title="Running Tails from within Microsoft Windows"]]
-
-**FIXME**: This section have not been adapted from old incognito documentation
-now so please do not take it into account. It is currently possible to start
-Tails under Windows with QEMU.
-
-Thanks to QEMU, Tails can be run within
-Microsoft Windows without the need to restart the computer. QEMU ships
-with Tails, and is set up so you only have to insert the media when
-Windows is running and a menu should appear with the option to start
-Tails through it. This is especially useful when you are using a
-computer you are not allowed to shut-down, which can be the case for
-public computers in certain Internet cafés, libraries or other public
-computers. Also, for some some general remarks on QEMU and Tails,
-and some security concerns about this mode of operation, see the above
-section on [[virtualization]].
-
-Since the Tails developers do not have access to any Windows
-computers at the moment, any input if this actually works and how it
-performs etc. is welcome.
diff --git a/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.pt.po b/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.pt.po
deleted file mode 100644
index d98038e..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/tails_within_windows.pt.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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: 2012-05-17 15:08+0300\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 title=\"Running Tails from within Microsoft Windows\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**FIXME**: This section have not been adapted from old incognito "
-"documentation\n"
-"now so please do not take it into account. It is currently possible to "
-"start\n"
-"Tails under Windows with QEMU.\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Thanks to QEMU, Tails can be run within Microsoft Windows without the need "
-"to restart the computer. QEMU ships with Tails, and is set up so you only "
-"have to insert the media when Windows is running and a menu should appear "
-"with the option to start Tails through it. This is especially useful when "
-"you are using a computer you are not allowed to shut-down, which can be the "
-"case for public computers in certain Internet cafés, libraries or other "
-"public computers. Also, for some some general remarks on QEMU and Tails, and "
-"some security concerns about this mode of operation, see the above section "
-"on [[virtualization]]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Since the Tails developers do not have access to any Windows computers at "
-"the moment, any input if this actually works and how it performs etc. is "
-"welcome."
-msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/tips.de.po b/wiki/src/doc/advanced_topics/virtualization/tips.de.po
deleted file mode 100644
index f4fec4a..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/tips.de.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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: 2011-11-20 16:40+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 title=\"Virtualization: tips and tricks\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=2]]\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"As explained on the [[virtualization warning page|advanced_topics/"
-"virtualization]], using Tails in a Virtual Machine involves you put great "
-"trust into the host operating system and the virtualization software."
-msgstr ""
-
-#. type: Plain text
-msgid "Here are some tips may help hardening (a bit) the host operating system."
-msgstr ""
-
-#. type: Title #
-#, no-wrap
-msgid "Operating systems"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "Microsoft Windows"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"You should NOT trust Windows to be secure if you use Tails for anything you "
-"consider risky. Windows could be made a tiny bit more trustworthy if you "
-"installed a HIPS (Host Intrusion Prevention System) with high security "
-"settings instantly after installing Windows. If Windows not is installed from "
-"a genuine Windows CD/DVD you can not trust it enough, not even if it's a "
-"preinstalled copy of Windows (there have been cases of computers being "
-"shipped with malware). If you install a HIPS first after using Windows for "
-"some time (less then an hour online is enough) you could already have a "
-"rootkit that the HIPS can't detect. Even with a HIPS you should not use "
-"Windows as a host OS if you risk personal harm for your use of Tails."
-msgstr ""
-
-#. type: Title #
-#, no-wrap
-msgid "Virtualization solutions"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "VirtualBox"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Tails runs in [VirtualBox](http://virtualbox.org) without any major "
-"configuration necessary. VirtualBox is distributed both as a closed-source "
-"and as an open-source (the so called OSE or Open Source Edition), the latter "
-"which the Tails developer's encourages (although it currently lacks USB "
-"support compared to the closed-source version)."
-msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/tips.fr.po b/wiki/src/doc/advanced_topics/virtualization/tips.fr.po
deleted file mode 100644
index f4fec4a..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/tips.fr.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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: 2011-11-20 16:40+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 title=\"Virtualization: tips and tricks\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=2]]\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"As explained on the [[virtualization warning page|advanced_topics/"
-"virtualization]], using Tails in a Virtual Machine involves you put great "
-"trust into the host operating system and the virtualization software."
-msgstr ""
-
-#. type: Plain text
-msgid "Here are some tips may help hardening (a bit) the host operating system."
-msgstr ""
-
-#. type: Title #
-#, no-wrap
-msgid "Operating systems"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "Microsoft Windows"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"You should NOT trust Windows to be secure if you use Tails for anything you "
-"consider risky. Windows could be made a tiny bit more trustworthy if you "
-"installed a HIPS (Host Intrusion Prevention System) with high security "
-"settings instantly after installing Windows. If Windows not is installed from "
-"a genuine Windows CD/DVD you can not trust it enough, not even if it's a "
-"preinstalled copy of Windows (there have been cases of computers being "
-"shipped with malware). If you install a HIPS first after using Windows for "
-"some time (less then an hour online is enough) you could already have a "
-"rootkit that the HIPS can't detect. Even with a HIPS you should not use "
-"Windows as a host OS if you risk personal harm for your use of Tails."
-msgstr ""
-
-#. type: Title #
-#, no-wrap
-msgid "Virtualization solutions"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "VirtualBox"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Tails runs in [VirtualBox](http://virtualbox.org) without any major "
-"configuration necessary. VirtualBox is distributed both as a closed-source "
-"and as an open-source (the so called OSE or Open Source Edition), the latter "
-"which the Tails developer's encourages (although it currently lacks USB "
-"support compared to the closed-source version)."
-msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/tips.mdwn b/wiki/src/doc/advanced_topics/virtualization/tips.mdwn
deleted file mode 100644
index a80a592..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/tips.mdwn
+++ /dev/null
@@ -1,38 +0,0 @@
-[[!meta title="Virtualization: tips and tricks"]]
-
-[[!toc levels=2]]
-
-As explained on the [[virtualization warning
-page|advanced_topics/virtualization]], using Tails in a Virtual Machine
-involves you put great trust into the host operating system and the
-virtualization software.
-
-Here are some tips may help hardening (a bit) the host operating
-system.
-
-# Operating systems
-
-## Microsoft Windows
-
-You should NOT trust Windows to be secure if you use Tails for
-anything you consider risky. Windows could be made a tiny bit more
-trustworthy if you installed a HIPS (Host Intrusion Prevention System)
-with high security settings instantly after installing Windows. If
-Windows not is installed from a genuine Windows CD/DVD you can not
-trust it enough, not even if it's a preinstalled copy of Windows
-(there have been cases of computers being shipped with malware). If
-you install a HIPS first after using Windows for some time (less then
-an hour online is enough) you could already have a rootkit that the
-HIPS can't detect. Even with a HIPS you should not use Windows as a
-host OS if you risk personal harm for your use of Tails.
-
-# Virtualization solutions
-
-## VirtualBox
-
-Tails runs in [VirtualBox](http://virtualbox.org) without any major configuration
-necessary. VirtualBox is distributed both as a closed-source and as an
-open-source (the so called OSE or Open Source Edition), the latter which the
-Tails developer's encourages (although it currently lacks USB support compared
-to the closed-source version).
-
diff --git a/wiki/src/doc/advanced_topics/virtualization/tips.pt.po b/wiki/src/doc/advanced_topics/virtualization/tips.pt.po
deleted file mode 100644
index 4488f16..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/tips.pt.po
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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: 2012-05-17 15:08+0300\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 title=\"Virtualization: tips and tricks\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!toc levels=2]]\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"As explained on the [[virtualization warning "
-"page|advanced_topics/virtualization]], using Tails in a Virtual Machine "
-"involves you put great trust into the host operating system and the "
-"virtualization software."
-msgstr ""
-
-#. type: Plain text
-msgid "Here are some tips may help hardening (a bit) the host operating system."
-msgstr ""
-
-#. type: Title #
-#, no-wrap
-msgid "Operating systems"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "Microsoft Windows"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"You should NOT trust Windows to be secure if you use Tails for anything you "
-"consider risky. Windows could be made a tiny bit more trustworthy if you "
-"installed a HIPS (Host Intrusion Prevention System) with high security "
-"settings instantly after installing Windows. If Windows not is installed "
-"from a genuine Windows CD/DVD you can not trust it enough, not even if it's "
-"a preinstalled copy of Windows (there have been cases of computers being "
-"shipped with malware). If you install a HIPS first after using Windows for "
-"some time (less then an hour online is enough) you could already have a "
-"rootkit that the HIPS can't detect. Even with a HIPS you should not use "
-"Windows as a host OS if you risk personal harm for your use of Tails."
-msgstr ""
-
-#. type: Title #
-#, no-wrap
-msgid "Virtualization solutions"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "VirtualBox"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Tails runs in [VirtualBox](http://virtualbox.org) without any major "
-"configuration necessary. VirtualBox is distributed both as a closed-source "
-"and as an open-source (the so called OSE or Open Source Edition), the latter "
-"which the Tails developer's encourages (although it currently lacks USB "
-"support compared to the closed-source version)."
-msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/virt-manager.de.po b/wiki/src/doc/advanced_topics/virtualization/virt-manager.de.po
new file mode 100644
index 0000000..067e1c1
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/virt-manager.de.po
@@ -0,0 +1,347 @@
+# 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-02-10 13:52+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 title=\"virt-manager\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[<span class=\"application\">virt-manager</span>](http://virt-manager.org/) "
+"is a free software\n"
+"virtualization solution for Linux. *virt-manager* has a more complex\n"
+"interface than *VirtualBox* or *GNOME Boxes* but it also has a more\n"
+"complete set of features.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">virt-manager</span> is the only virtualization\n"
+"solution that we present that allows the use of a persistent\n"
+"volume.</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Terminology\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"*virt-manager* is based on a set of lower level virtualization tools,\n"
+"going from the user interface to the hardware interactions with the\n"
+"processor. This terminology is a bit confusing and other documentation\n"
+"might mention the following tools:\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*KVM* is the module of the Linux kernel that interacts with the "
+"virtualization features of the processor."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*QEMU* is the virtualization software that emulates virtual processors and "
+"peripherals based on *KVM* and that starts and stops virtual machines."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*libvirt* is a library that allows *virt-manager* to interact with the "
+"virtualization capabilities provides by *QEMU*."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*SPICE* is a protocol that allows to visualize the desktop of virtual "
+"machines."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*virt-manager* is the graphical interface that allows to create, configure, "
+"and run virtual machines."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"iso\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To install *virt-manager* in Debian or Ubuntu, execute the following "
+"command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install virt-manager libvirt-daemon-system\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Start *virt-manager*."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Double-click on **localhost (QEMU)** to connect to the *QEMU*\n"
+" system of your host.\n"
+" 1. To create a new virtual machine, choose\n"
+" <span class=\"menuchoice\"> <span\n"
+" class=\"guimenu\">File</span>&nbsp;▸ <span\n"
+" class=\"guimenuitem\">New Virtual Machine</span></span>.\n"
+" 1. In *step 1*, choose **Local install media (ISO image or CDROM)**.\n"
+" 1. In *step 2*, choose:\n"
+" - **Use ISO image**, then **Browse...**, and **Browse Local** to\n"
+" browse for the ISO image that you want to start from.\n"
+" - **OS type**: **Linux**.\n"
+" - **Version**: **Debian Wheezy**.\n"
+" 1. In *step 3*, allocate at least 1024 MB of RAM.\n"
+" 1. In *step 4*, disable storage for this virtual machine.\n"
+" 1. In *step 5*:\n"
+" - Type a name for the new virtual machine.\n"
+" - Click **Finish** to start the virtual machine.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you get the error message \"<span class=\"guilabel\">Error starting\n"
+"domain: Requested operation is not valid: network 'default' is not\n"
+"active</span>\", then try to start the default virtual network:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ol>\n"
+"<li>Click on <span class=\"guilabel\">localhost (QEMU)</span>.</li>\n"
+"<li>Choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Connection details</span></span> to\n"
+" administer the connection to your local\n"
+" <span class=\"application\">QEMU</span> system.</li>\n"
+"<li>Click on <span class=\"guilabel\">Virtual Networks</span> tab, then\n"
+" select the <span class=\"guilabel\">default</span> virtual network in\n"
+" the left pane.</li>\n"
+"<li>Click on the [[!img media-playback-start.png alt=\"Start Network\"\n"
+" link=no class=symbolic]] icon on the bottom of the left pane to\n"
+" start the default virtual network.</li>\n"
+"</ol>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"usb\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from a USB stick or SD card\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To run Tails from a USB stick or SD card using *virt-manager*, first create "
+"a virtual machine running from an ISO image as described "
+"[[above|virt-manager#iso]]."
+msgstr ""
+
+#. type: Plain text
+msgid "Then do the following:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"From the virtual machine window, choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">Virtual Machine</span>&nbsp;▸ <span "
+"class=\"guisubmenuitem\">Shut Down</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Force Off</span></span> to shut down the virtual "
+"machine."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Plug in the USB stick or insert the SD card from which you want to run "
+"Tails."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">View</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Details</span></span> to edit the configuration of the "
+"virtual machine."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click on the **Add Hardware** button on the bottom of the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **USB Host Device** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane, click on the device from which you want to run Tails, and "
+"click **Finish**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can keep the original ISO image connected as a virtual DVD to install "
+"Tails onto the USB stick or SD card if needed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disconnect\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can also disconnect the original ISO image and start directly from the "
+"USB stick once Tails is already installed on it. To do so:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Shut down the virtual machine."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. In the configuration of the virtual machine, click on **IDE CDROM\n"
+" 1** in the left pane.\n"
+" 1. Click on the **Disconnect** button in the right pane.\n"
+" 1. To enable the USB stick or SD card as a boot option:\n"
+" 1. Click on **Boot Options** in the left pane.\n"
+" 1. Select the **USB** boot option corresponding to your USB device.\n"
+" 1. Click **Apply**.\n"
+" 1. To start the virtual machine choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Console</span></span> and then\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Virtual Machine</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Run</span></span>.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Once you started from the USB device you can [[create a persistent "
+"volume|first_steps/persistence/configure]] on it."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"virtual_usb\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from a virtual USB storage\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can also run Tails from a virtual USB storage, saved as a single file on "
+"the host operating system."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To run Tails from a virtual USB device using *virt-manager*, first create a "
+"virtual machine running from an ISO image as described "
+"[[above|virt-manager#iso]]."
+msgstr ""
+
+#. type: Plain text
+msgid "Then do the following to create a virtual USB storage:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **Storage** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "In the right pane, change the **Bus type** to USB and click **Finish**."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **USB Disk 1** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "In the right pane, select the **Removable** option and click **Apply**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Then start the virtual machine from the virtual DVD to install Tails onto "
+"the virtual USB storage. The virtual USB storage appears in *Tails "
+"Installer* as **QEMU HARDDISK**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"After that you can disconnect the original ISO image and start directly from "
+"the virtual USB stick [[as described in the previous "
+"section|virt-manager#disconnect]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Once you started from the virtual USB device you can [[create a persistent "
+"volume|first_steps/persistence/configure]] on it."
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po b/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po
new file mode 100644
index 0000000..067e1c1
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po
@@ -0,0 +1,347 @@
+# 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-02-10 13:52+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 title=\"virt-manager\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[<span class=\"application\">virt-manager</span>](http://virt-manager.org/) "
+"is a free software\n"
+"virtualization solution for Linux. *virt-manager* has a more complex\n"
+"interface than *VirtualBox* or *GNOME Boxes* but it also has a more\n"
+"complete set of features.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">virt-manager</span> is the only virtualization\n"
+"solution that we present that allows the use of a persistent\n"
+"volume.</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Terminology\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"*virt-manager* is based on a set of lower level virtualization tools,\n"
+"going from the user interface to the hardware interactions with the\n"
+"processor. This terminology is a bit confusing and other documentation\n"
+"might mention the following tools:\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*KVM* is the module of the Linux kernel that interacts with the "
+"virtualization features of the processor."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*QEMU* is the virtualization software that emulates virtual processors and "
+"peripherals based on *KVM* and that starts and stops virtual machines."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*libvirt* is a library that allows *virt-manager* to interact with the "
+"virtualization capabilities provides by *QEMU*."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*SPICE* is a protocol that allows to visualize the desktop of virtual "
+"machines."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*virt-manager* is the graphical interface that allows to create, configure, "
+"and run virtual machines."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"iso\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To install *virt-manager* in Debian or Ubuntu, execute the following "
+"command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install virt-manager libvirt-daemon-system\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Start *virt-manager*."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Double-click on **localhost (QEMU)** to connect to the *QEMU*\n"
+" system of your host.\n"
+" 1. To create a new virtual machine, choose\n"
+" <span class=\"menuchoice\"> <span\n"
+" class=\"guimenu\">File</span>&nbsp;▸ <span\n"
+" class=\"guimenuitem\">New Virtual Machine</span></span>.\n"
+" 1. In *step 1*, choose **Local install media (ISO image or CDROM)**.\n"
+" 1. In *step 2*, choose:\n"
+" - **Use ISO image**, then **Browse...**, and **Browse Local** to\n"
+" browse for the ISO image that you want to start from.\n"
+" - **OS type**: **Linux**.\n"
+" - **Version**: **Debian Wheezy**.\n"
+" 1. In *step 3*, allocate at least 1024 MB of RAM.\n"
+" 1. In *step 4*, disable storage for this virtual machine.\n"
+" 1. In *step 5*:\n"
+" - Type a name for the new virtual machine.\n"
+" - Click **Finish** to start the virtual machine.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you get the error message \"<span class=\"guilabel\">Error starting\n"
+"domain: Requested operation is not valid: network 'default' is not\n"
+"active</span>\", then try to start the default virtual network:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ol>\n"
+"<li>Click on <span class=\"guilabel\">localhost (QEMU)</span>.</li>\n"
+"<li>Choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Connection details</span></span> to\n"
+" administer the connection to your local\n"
+" <span class=\"application\">QEMU</span> system.</li>\n"
+"<li>Click on <span class=\"guilabel\">Virtual Networks</span> tab, then\n"
+" select the <span class=\"guilabel\">default</span> virtual network in\n"
+" the left pane.</li>\n"
+"<li>Click on the [[!img media-playback-start.png alt=\"Start Network\"\n"
+" link=no class=symbolic]] icon on the bottom of the left pane to\n"
+" start the default virtual network.</li>\n"
+"</ol>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"usb\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from a USB stick or SD card\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To run Tails from a USB stick or SD card using *virt-manager*, first create "
+"a virtual machine running from an ISO image as described "
+"[[above|virt-manager#iso]]."
+msgstr ""
+
+#. type: Plain text
+msgid "Then do the following:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"From the virtual machine window, choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">Virtual Machine</span>&nbsp;▸ <span "
+"class=\"guisubmenuitem\">Shut Down</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Force Off</span></span> to shut down the virtual "
+"machine."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Plug in the USB stick or insert the SD card from which you want to run "
+"Tails."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">View</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Details</span></span> to edit the configuration of the "
+"virtual machine."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click on the **Add Hardware** button on the bottom of the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **USB Host Device** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane, click on the device from which you want to run Tails, and "
+"click **Finish**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can keep the original ISO image connected as a virtual DVD to install "
+"Tails onto the USB stick or SD card if needed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disconnect\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can also disconnect the original ISO image and start directly from the "
+"USB stick once Tails is already installed on it. To do so:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Shut down the virtual machine."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. In the configuration of the virtual machine, click on **IDE CDROM\n"
+" 1** in the left pane.\n"
+" 1. Click on the **Disconnect** button in the right pane.\n"
+" 1. To enable the USB stick or SD card as a boot option:\n"
+" 1. Click on **Boot Options** in the left pane.\n"
+" 1. Select the **USB** boot option corresponding to your USB device.\n"
+" 1. Click **Apply**.\n"
+" 1. To start the virtual machine choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Console</span></span> and then\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Virtual Machine</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Run</span></span>.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Once you started from the USB device you can [[create a persistent "
+"volume|first_steps/persistence/configure]] on it."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"virtual_usb\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from a virtual USB storage\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can also run Tails from a virtual USB storage, saved as a single file on "
+"the host operating system."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To run Tails from a virtual USB device using *virt-manager*, first create a "
+"virtual machine running from an ISO image as described "
+"[[above|virt-manager#iso]]."
+msgstr ""
+
+#. type: Plain text
+msgid "Then do the following to create a virtual USB storage:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **Storage** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "In the right pane, change the **Bus type** to USB and click **Finish**."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **USB Disk 1** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "In the right pane, select the **Removable** option and click **Apply**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Then start the virtual machine from the virtual DVD to install Tails onto "
+"the virtual USB storage. The virtual USB storage appears in *Tails "
+"Installer* as **QEMU HARDDISK**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"After that you can disconnect the original ISO image and start directly from "
+"the virtual USB stick [[as described in the previous "
+"section|virt-manager#disconnect]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Once you started from the virtual USB device you can [[create a persistent "
+"volume|first_steps/persistence/configure]] on it."
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/virt-manager.mdwn b/wiki/src/doc/advanced_topics/virtualization/virt-manager.mdwn
new file mode 100644
index 0000000..407093a
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/virt-manager.mdwn
@@ -0,0 +1,195 @@
+[[!meta title="virt-manager"]]
+
+[<span class="application">virt-manager</span>](http://virt-manager.org/) is a free software
+virtualization solution for Linux. *virt-manager* has a more complex
+interface than *VirtualBox* or *GNOME Boxes* but it also has a more
+complete set of features.
+
+[[!inline pages="doc/advanced_topics/virtualization.caution" raw="yes"]]
+
+<div class="tip">
+
+<span class="application">virt-manager</span> is the only virtualization
+solution that we present that allows the use of a persistent
+volume.</span>
+
+</div>
+
+[[!toc]]
+
+Terminology
+===========
+
+*virt-manager* is based on a set of lower level virtualization tools,
+going from the user interface to the hardware interactions with the
+processor. This terminology is a bit confusing and other documentation
+might mention the following tools:
+
+ - *KVM* is the module of the Linux kernel that interacts with the
+ virtualization features of the processor.
+ - *QEMU* is the virtualization software that emulates virtual
+ processors and peripherals based on *KVM* and that starts and stops
+ virtual machines.
+ - *libvirt* is a library that allows *virt-manager* to interact with
+ the virtualization capabilities provides by *QEMU*.
+ - *SPICE* is a protocol that allows to visualize the desktop of
+ virtual machines.
+ - *virt-manager* is the graphical interface that allows to create,
+ configure, and run virtual machines.
+
+<a id="iso"></a>
+
+Installation
+============
+
+To install *virt-manager* in Debian or Ubuntu, execute the following
+command:
+
+ sudo apt-get install virt-manager libvirt-daemon-system
+
+Running Tails from an ISO image
+===============================
+
+ 1. Start *virt-manager*.
+ 1. Double-click on **localhost (QEMU)** to connect to the *QEMU*
+ system of your host.
+ 1. To create a new virtual machine, choose
+ <span class="menuchoice"> <span
+ class="guimenu">File</span>&nbsp;▸ <span
+ class="guimenuitem">New Virtual Machine</span></span>.
+ 1. In *step 1*, choose **Local install media (ISO image or CDROM)**.
+ 1. In *step 2*, choose:
+ - **Use ISO image**, then **Browse...**, and **Browse Local** to
+ browse for the ISO image that you want to start from.
+ - **OS type**: **Linux**.
+ - **Version**: **Debian Wheezy**.
+ 1. In *step 3*, allocate at least 1024 MB of RAM.
+ 1. In *step 4*, disable storage for this virtual machine.
+ 1. In *step 5*:
+ - Type a name for the new virtual machine.
+ - Click **Finish** to start the virtual machine.
+
+<div class="tip">
+
+If you get the error message "<span class="guilabel">Error starting
+domain: Requested operation is not valid: network 'default' is not
+active</span>", then try to start the default virtual network:
+
+<ol>
+<li>Click on <span class="guilabel">localhost (QEMU)</span>.</li>
+<li>Choose <span class="menuchoice">
+ <span class="guimenu">Edit</span>&nbsp;▸
+ <span class="guimenuitem">Connection details</span></span> to
+ administer the connection to your local
+ <span class="application">QEMU</span> system.</li>
+<li>Click on <span class="guilabel">Virtual Networks</span> tab, then
+ select the <span class="guilabel">default</span> virtual network in
+ the left pane.</li>
+<li>Click on the [[!img media-playback-start.png alt="Start Network"
+ link=no class=symbolic]] icon on the bottom of the left pane to
+ start the default virtual network.</li>
+</ol>
+
+</div>
+
+<a id="usb"></a>
+
+Running Tails from a USB stick or SD card
+=========================================
+
+To run Tails from a USB stick or SD card using *virt-manager*, first
+create a virtual machine running from an ISO image as described
+[[above|virt-manager#iso]].
+
+Then do the following:
+
+ 1. From the virtual machine window, choose
+ <span class="menuchoice">
+ <span class="guimenu">Virtual Machine</span>&nbsp;▸
+ <span class="guisubmenuitem">Shut Down</span>&nbsp;▸
+ <span class="guimenuitem">Force Off</span></span> to shut down the
+ virtual machine.
+ 1. Plug in the USB stick or insert the SD card from which you want to
+ run Tails.
+ 1. Choose
+ <span class="menuchoice">
+ <span class="guimenu">View</span>&nbsp;▸
+ <span class="guimenuitem">Details</span></span> to edit the
+ configuration of the virtual machine.
+ 1. Click on the **Add Hardware** button on the bottom of the left
+ pane.
+ 1. Select **USB Host Device** in the left pane.
+ 1. In the right pane, click on the device from which you want to run
+ Tails, and click **Finish**.
+
+You can keep the original ISO image connected as a virtual DVD to
+install Tails onto the USB stick or SD card if needed.
+
+<a id="disconnect"></a>
+
+You can also disconnect the original ISO image and start directly from the
+USB stick once Tails is already installed on it. To do so:
+
+ 1. Shut down the virtual machine.
+ 1. In the configuration of the virtual machine, click on **IDE CDROM
+ 1** in the left pane.
+ 1. Click on the **Disconnect** button in the right pane.
+ 1. To enable the USB stick or SD card as a boot option:
+ 1. Click on **Boot Options** in the left pane.
+ 1. Select the **USB** boot option corresponding to your USB device.
+ 1. Click **Apply**.
+ 1. To start the virtual machine choose
+ <span class="menuchoice">
+ <span class="guimenu">View</span>&nbsp;▸
+ <span class="guimenuitem">Console</span></span> and then
+ <span class="menuchoice">
+ <span class="guimenu">Virtual Machine</span>&nbsp;▸
+ <span class="guimenuitem">Run</span></span>.
+
+Once you started from the USB device you can [[create a persistent
+volume|first_steps/persistence/configure]] on it.
+
+<a id="virtual_usb"></a>
+
+Running Tails from a virtual USB storage
+========================================
+
+You can also run Tails from a virtual USB storage, saved as a single
+file on the host operating system.
+
+To run Tails from a virtual USB device using *virt-manager*, first
+create a virtual machine running from an ISO image as described
+[[above|virt-manager#iso]].
+
+Then do the following to create a virtual USB storage:
+
+ 1. From the virtual machine window, choose
+ <span class="menuchoice">
+ <span class="guimenu">Virtual Machine</span>&nbsp;▸
+ <span class="guisubmenuitem">Shut Down</span>&nbsp;▸
+ <span class="guimenuitem">Force Off</span></span> to shut down the
+ virtual machine.
+ 1. Choose
+ <span class="menuchoice">
+ <span class="guimenu">View</span>&nbsp;▸
+ <span class="guimenuitem">Details</span></span> to edit the
+ configuration of the virtual machine.
+ 1. Click on the **Add Hardware** button on the bottom of the left
+ pane.
+ 1. Select **Storage** in the left pane.
+ 1. In the right pane, change the **Bus type** to USB and click
+ **Finish**.
+ 1. Select **USB Disk 1** in the left pane.
+ 1. In the right pane, select the **Removable** option and click
+ **Apply**.
+
+Then start the virtual machine from the virtual DVD to install Tails
+onto the virtual USB storage. The virtual USB storage appears in *Tails
+Installer* as **QEMU HARDDISK**.
+
+After that you can disconnect the original ISO image and start directly
+from the virtual USB stick [[as described
+in the previous section|virt-manager#disconnect]].
+
+Once you started from the virtual USB device you can [[create a persistent
+volume|first_steps/persistence/configure]] on it.
diff --git a/wiki/src/doc/advanced_topics/virtualization/virt-manager.pt.po b/wiki/src/doc/advanced_topics/virtualization/virt-manager.pt.po
new file mode 100644
index 0000000..067e1c1
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/virt-manager.pt.po
@@ -0,0 +1,347 @@
+# 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-02-10 13:52+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 title=\"virt-manager\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[<span class=\"application\">virt-manager</span>](http://virt-manager.org/) "
+"is a free software\n"
+"virtualization solution for Linux. *virt-manager* has a more complex\n"
+"interface than *VirtualBox* or *GNOME Boxes* but it also has a more\n"
+"complete set of features.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">virt-manager</span> is the only virtualization\n"
+"solution that we present that allows the use of a persistent\n"
+"volume.</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Terminology\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"*virt-manager* is based on a set of lower level virtualization tools,\n"
+"going from the user interface to the hardware interactions with the\n"
+"processor. This terminology is a bit confusing and other documentation\n"
+"might mention the following tools:\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*KVM* is the module of the Linux kernel that interacts with the "
+"virtualization features of the processor."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*QEMU* is the virtualization software that emulates virtual processors and "
+"peripherals based on *KVM* and that starts and stops virtual machines."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*libvirt* is a library that allows *virt-manager* to interact with the "
+"virtualization capabilities provides by *QEMU*."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*SPICE* is a protocol that allows to visualize the desktop of virtual "
+"machines."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"*virt-manager* is the graphical interface that allows to create, configure, "
+"and run virtual machines."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"iso\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To install *virt-manager* in Debian or Ubuntu, execute the following "
+"command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install virt-manager libvirt-daemon-system\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Start *virt-manager*."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Double-click on **localhost (QEMU)** to connect to the *QEMU*\n"
+" system of your host.\n"
+" 1. To create a new virtual machine, choose\n"
+" <span class=\"menuchoice\"> <span\n"
+" class=\"guimenu\">File</span>&nbsp;▸ <span\n"
+" class=\"guimenuitem\">New Virtual Machine</span></span>.\n"
+" 1. In *step 1*, choose **Local install media (ISO image or CDROM)**.\n"
+" 1. In *step 2*, choose:\n"
+" - **Use ISO image**, then **Browse...**, and **Browse Local** to\n"
+" browse for the ISO image that you want to start from.\n"
+" - **OS type**: **Linux**.\n"
+" - **Version**: **Debian Wheezy**.\n"
+" 1. In *step 3*, allocate at least 1024 MB of RAM.\n"
+" 1. In *step 4*, disable storage for this virtual machine.\n"
+" 1. In *step 5*:\n"
+" - Type a name for the new virtual machine.\n"
+" - Click **Finish** to start the virtual machine.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you get the error message \"<span class=\"guilabel\">Error starting\n"
+"domain: Requested operation is not valid: network 'default' is not\n"
+"active</span>\", then try to start the default virtual network:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ol>\n"
+"<li>Click on <span class=\"guilabel\">localhost (QEMU)</span>.</li>\n"
+"<li>Choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Edit</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Connection details</span></span> to\n"
+" administer the connection to your local\n"
+" <span class=\"application\">QEMU</span> system.</li>\n"
+"<li>Click on <span class=\"guilabel\">Virtual Networks</span> tab, then\n"
+" select the <span class=\"guilabel\">default</span> virtual network in\n"
+" the left pane.</li>\n"
+"<li>Click on the [[!img media-playback-start.png alt=\"Start Network\"\n"
+" link=no class=symbolic]] icon on the bottom of the left pane to\n"
+" start the default virtual network.</li>\n"
+"</ol>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"usb\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from a USB stick or SD card\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To run Tails from a USB stick or SD card using *virt-manager*, first create "
+"a virtual machine running from an ISO image as described "
+"[[above|virt-manager#iso]]."
+msgstr ""
+
+#. type: Plain text
+msgid "Then do the following:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"From the virtual machine window, choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">Virtual Machine</span>&nbsp;▸ <span "
+"class=\"guisubmenuitem\">Shut Down</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Force Off</span></span> to shut down the virtual "
+"machine."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Plug in the USB stick or insert the SD card from which you want to run "
+"Tails."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">View</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Details</span></span> to edit the configuration of the "
+"virtual machine."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click on the **Add Hardware** button on the bottom of the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **USB Host Device** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane, click on the device from which you want to run Tails, and "
+"click **Finish**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can keep the original ISO image connected as a virtual DVD to install "
+"Tails onto the USB stick or SD card if needed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disconnect\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can also disconnect the original ISO image and start directly from the "
+"USB stick once Tails is already installed on it. To do so:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Shut down the virtual machine."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. In the configuration of the virtual machine, click on **IDE CDROM\n"
+" 1** in the left pane.\n"
+" 1. Click on the **Disconnect** button in the right pane.\n"
+" 1. To enable the USB stick or SD card as a boot option:\n"
+" 1. Click on **Boot Options** in the left pane.\n"
+" 1. Select the **USB** boot option corresponding to your USB device.\n"
+" 1. Click **Apply**.\n"
+" 1. To start the virtual machine choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">View</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Console</span></span> and then\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Virtual Machine</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Run</span></span>.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Once you started from the USB device you can [[create a persistent "
+"volume|first_steps/persistence/configure]] on it."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"virtual_usb\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from a virtual USB storage\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can also run Tails from a virtual USB storage, saved as a single file on "
+"the host operating system."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"To run Tails from a virtual USB device using *virt-manager*, first create a "
+"virtual machine running from an ISO image as described "
+"[[above|virt-manager#iso]]."
+msgstr ""
+
+#. type: Plain text
+msgid "Then do the following to create a virtual USB storage:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **Storage** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "In the right pane, change the **Bus type** to USB and click **Finish**."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **USB Disk 1** in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "In the right pane, select the **Removable** option and click **Apply**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Then start the virtual machine from the virtual DVD to install Tails onto "
+"the virtual USB storage. The virtual USB storage appears in *Tails "
+"Installer* as **QEMU HARDDISK**."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"After that you can disconnect the original ISO image and start directly from "
+"the virtual USB stick [[as described in the previous "
+"section|virt-manager#disconnect]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Once you started from the virtual USB device you can [[create a persistent "
+"volume|first_steps/persistence/configure]] on it."
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po
new file mode 100644
index 0000000..7b30e7e
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po
@@ -0,0 +1,239 @@
+# 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-02-10 13:52+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 title=\"VirtualBox\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"It is possible to run Tails in a virtual machine using [<span\n"
+"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) from "
+"a\n"
+"Windows, Linux, or Mac OS&nbsp;X host operating system.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">VirtualBox</span> has a free software version,\n"
+"called <span class=\"application\">VirtualBox Open Source Edition</span>\n"
+"and some proprietary components, for example to add support for USB\n"
+"devices.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"For security reasons, we recommend you to use only the <span "
+"class=\"application\">Open Source Edition</span>,\n"
+"though it does not allow to use a persistent volume.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>With the <a "
+"href=\"https://www.virtualbox.org/manual/ch04.html#sharedfolders\">\n"
+"<span class=\"guilabel\">shared folders</span></a> feature of\n"
+"<span class=\"application\">VirtualBox</span> you can access files of your\n"
+"host system from within the guest system.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Make sure to understand the security implications of [[accessing\n"
+"internal hard "
+"disks|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]\n"
+"from Tails before using this feature.</p>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Security considerations for Windows and Mac OS X\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In our [[security warnings about virtualization|virtualization#security]] we "
+"recommend to run Tails in a virtual machine only if the host operating "
+"system is trustworthy."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Microsoft Windows and Mac OS X being proprietary software, they cannot be "
+"considered trustworthy. Only run Tails in a virtual machine on Windows or OS "
+"X for testing purposes and do not rely on it for security."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To install *VirtualBox* in Debian or Ubuntu, execute the following command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For instructions on how to install *VirtualBox* on other operating systems, "
+"refer to the [VirtualBox "
+"documentation](https://www.virtualbox.org/wiki/End-user_documentation)."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Plain text
+msgid "First, start *VirtualBox*."
+msgstr ""
+
+#. type: Plain text
+msgid "To create a new virtual machine:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Machine</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">New...</span></span>.\n"
+" 1. In the **Name and operating system** screen, specify:\n"
+" - A name of your choice.\n"
+" - **Type**: **Linux**.\n"
+" - **Version**: **Other Linux (32 bit)**.\n"
+" - Click **Next**.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> "
+"guest\n"
+" modules allow for additional features when using Tails in a virtual\n"
+" machine: shared folders, resizable display, shared clipboard, "
+"etc.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>But due to <a hreg=\"https://www.virtualbox.org/ticket/11037\">a bug "
+"in\n"
+" <span class=\"application\">VirtualBox</span></a>, the resizable "
+"display\n"
+" and shared clipboard only work in Tails if the virtual machine is "
+"configured to\n"
+" have a 32-bit processor. The shared folders work both on 32-bit and\n"
+" 64-bit guests.</p></div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. In the **Memory size screen**:\n"
+" - Allocate at least 1024 MB of RAM.\n"
+" - Click **Next**.\n"
+" 1. In the **Hard drive** screen:\n"
+" - Choose **Do not add a virtual hard drive**.\n"
+" - Click **Create**.\n"
+" - Click **Continue** in the warning dialog about creating a virtual\n"
+" machine without a hard drive.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To configure the virtual machine to start from an ISO image:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select the new virtual machine in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">Machine</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Settings...</span></span>."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **Storage** in left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Select **Empty** below **Contoller IDE** in the **Storage Tree** selection "
+"list in the right pane."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Click on the **CD** icon on the left of the window and select\n"
+" **Choose a virtual CD/DVD disk file...** to browse for the ISO image\n"
+" you want to start Tails from.\n"
+" 1. Select the **Check Live CD/DVD** option.\n"
+" 1. Click **OK**.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To start the new virtual machine:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select the virtual machine in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click **Start**."
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po
new file mode 100644
index 0000000..7b30e7e
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po
@@ -0,0 +1,239 @@
+# 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-02-10 13:52+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 title=\"VirtualBox\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"It is possible to run Tails in a virtual machine using [<span\n"
+"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) from "
+"a\n"
+"Windows, Linux, or Mac OS&nbsp;X host operating system.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">VirtualBox</span> has a free software version,\n"
+"called <span class=\"application\">VirtualBox Open Source Edition</span>\n"
+"and some proprietary components, for example to add support for USB\n"
+"devices.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"For security reasons, we recommend you to use only the <span "
+"class=\"application\">Open Source Edition</span>,\n"
+"though it does not allow to use a persistent volume.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>With the <a "
+"href=\"https://www.virtualbox.org/manual/ch04.html#sharedfolders\">\n"
+"<span class=\"guilabel\">shared folders</span></a> feature of\n"
+"<span class=\"application\">VirtualBox</span> you can access files of your\n"
+"host system from within the guest system.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Make sure to understand the security implications of [[accessing\n"
+"internal hard "
+"disks|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]\n"
+"from Tails before using this feature.</p>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Security considerations for Windows and Mac OS X\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In our [[security warnings about virtualization|virtualization#security]] we "
+"recommend to run Tails in a virtual machine only if the host operating "
+"system is trustworthy."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Microsoft Windows and Mac OS X being proprietary software, they cannot be "
+"considered trustworthy. Only run Tails in a virtual machine on Windows or OS "
+"X for testing purposes and do not rely on it for security."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To install *VirtualBox* in Debian or Ubuntu, execute the following command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For instructions on how to install *VirtualBox* on other operating systems, "
+"refer to the [VirtualBox "
+"documentation](https://www.virtualbox.org/wiki/End-user_documentation)."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Plain text
+msgid "First, start *VirtualBox*."
+msgstr ""
+
+#. type: Plain text
+msgid "To create a new virtual machine:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Machine</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">New...</span></span>.\n"
+" 1. In the **Name and operating system** screen, specify:\n"
+" - A name of your choice.\n"
+" - **Type**: **Linux**.\n"
+" - **Version**: **Other Linux (32 bit)**.\n"
+" - Click **Next**.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> "
+"guest\n"
+" modules allow for additional features when using Tails in a virtual\n"
+" machine: shared folders, resizable display, shared clipboard, "
+"etc.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>But due to <a hreg=\"https://www.virtualbox.org/ticket/11037\">a bug "
+"in\n"
+" <span class=\"application\">VirtualBox</span></a>, the resizable "
+"display\n"
+" and shared clipboard only work in Tails if the virtual machine is "
+"configured to\n"
+" have a 32-bit processor. The shared folders work both on 32-bit and\n"
+" 64-bit guests.</p></div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. In the **Memory size screen**:\n"
+" - Allocate at least 1024 MB of RAM.\n"
+" - Click **Next**.\n"
+" 1. In the **Hard drive** screen:\n"
+" - Choose **Do not add a virtual hard drive**.\n"
+" - Click **Create**.\n"
+" - Click **Continue** in the warning dialog about creating a virtual\n"
+" machine without a hard drive.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To configure the virtual machine to start from an ISO image:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select the new virtual machine in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">Machine</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Settings...</span></span>."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **Storage** in left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Select **Empty** below **Contoller IDE** in the **Storage Tree** selection "
+"list in the right pane."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Click on the **CD** icon on the left of the window and select\n"
+" **Choose a virtual CD/DVD disk file...** to browse for the ISO image\n"
+" you want to start Tails from.\n"
+" 1. Select the **Check Live CD/DVD** option.\n"
+" 1. Click **OK**.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To start the new virtual machine:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select the virtual machine in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click **Start**."
+msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn b/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
new file mode 100644
index 0000000..de61cc8
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
@@ -0,0 +1,114 @@
+[[!meta title="VirtualBox"]]
+
+It is possible to run Tails in a virtual machine using [<span
+class="application">VirtualBox</span>](https://www.virtualbox.org/) from a
+Windows, Linux, or Mac OS&nbsp;X host operating system.
+
+[[!inline pages="doc/advanced_topics/virtualization.caution" raw="yes"]]
+
+<span class="application">VirtualBox</span> has a free software version,
+called <span class="application">VirtualBox Open Source Edition</span>
+and some proprietary components, for example to add support for USB
+devices.
+
+<div class="caution">
+
+For security reasons, we recommend you to use only the <span class="application">Open Source Edition</span>,
+though it does not allow to use a persistent volume.
+
+</div>
+
+<div class="tip">
+
+<p>With the <a href="https://www.virtualbox.org/manual/ch04.html#sharedfolders">
+<span class="guilabel">shared folders</span></a> feature of
+<span class="application">VirtualBox</span> you can access files of your
+host system from within the guest system.</p>
+
+<p>Make sure to understand the security implications of [[accessing
+internal hard disks|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]
+from Tails before using this feature.</p>
+
+</div>
+
+Security considerations for Windows and Mac OS X
+================================================
+
+In our [[security warnings about
+virtualization|virtualization#security]] we recommend to run Tails in
+a virtual machine only if the host operating system is trustworthy.
+
+<div class="caution">
+
+Microsoft Windows and Mac OS X being proprietary software, they cannot be considered
+trustworthy. Only run Tails in a virtual machine on Windows or OS X for testing
+purposes and do not rely on it for security.
+
+</div>
+
+Installation
+============
+
+To install *VirtualBox* in Debian or Ubuntu, execute the following
+command:
+
+ sudo apt-get install virtualbox
+
+For instructions on how to install *VirtualBox* on other operating
+systems, refer to the [VirtualBox documentation](https://www.virtualbox.org/wiki/End-user_documentation).
+
+Running Tails from an ISO image
+===============================
+
+First, start *VirtualBox*.
+
+To create a new virtual machine:
+
+ 1. Choose
+ <span class="menuchoice">
+ <span class="guimenu">Machine</span>&nbsp;▸
+ <span class="guimenuitem">New...</span></span>.
+ 1. In the **Name and operating system** screen, specify:
+ - A name of your choice.
+ - **Type**: **Linux**.
+ - **Version**: **Other Linux (32 bit)**.
+ - Click **Next**.
+
+ <div class="bug"><p><span class="application">VirtualBox</span> guest
+ modules allow for additional features when using Tails in a virtual
+ machine: shared folders, resizable display, shared clipboard, etc.</p>
+
+ <p>But due to <a hreg="https://www.virtualbox.org/ticket/11037">a bug in
+ <span class="application">VirtualBox</span></a>, the resizable display
+ and shared clipboard only work in Tails if the virtual machine is configured to
+ have a 32-bit processor. The shared folders work both on 32-bit and
+ 64-bit guests.</p></div>
+
+ 1. In the **Memory size screen**:
+ - Allocate at least 1024 MB of RAM.
+ - Click **Next**.
+ 1. In the **Hard drive** screen:
+ - Choose **Do not add a virtual hard drive**.
+ - Click **Create**.
+ - Click **Continue** in the warning dialog about creating a virtual
+ machine without a hard drive.
+
+To configure the virtual machine to start from an ISO image:
+
+ 1. Select the new virtual machine in the left pane.
+ 1. Choose <span class="menuchoice">
+ <span class="guimenu">Machine</span>&nbsp;▸
+ <span class="guimenuitem">Settings...</span></span>.
+ 1. Select **Storage** in left pane.
+ 1. Select **Empty** below **Contoller IDE** in the **Storage Tree**
+ selection list in the right pane.
+ 1. Click on the **CD** icon on the left of the window and select
+ **Choose a virtual CD/DVD disk file...** to browse for the ISO image
+ you want to start Tails from.
+ 1. Select the **Check Live CD/DVD** option.
+ 1. Click **OK**.
+
+To start the new virtual machine:
+
+ 1. Select the virtual machine in the left pane.
+ 1. Click **Start**.
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po
new file mode 100644
index 0000000..7b30e7e
--- /dev/null
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po
@@ -0,0 +1,239 @@
+# 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-02-10 13:52+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 title=\"VirtualBox\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"It is possible to run Tails in a virtual machine using [<span\n"
+"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) from "
+"a\n"
+"Windows, Linux, or Mac OS&nbsp;X host operating system.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"doc/advanced_topics/virtualization.caution\" "
+"raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<span class=\"application\">VirtualBox</span> has a free software version,\n"
+"called <span class=\"application\">VirtualBox Open Source Edition</span>\n"
+"and some proprietary components, for example to add support for USB\n"
+"devices.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"For security reasons, we recommend you to use only the <span "
+"class=\"application\">Open Source Edition</span>,\n"
+"though it does not allow to use a persistent volume.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>With the <a "
+"href=\"https://www.virtualbox.org/manual/ch04.html#sharedfolders\">\n"
+"<span class=\"guilabel\">shared folders</span></a> feature of\n"
+"<span class=\"application\">VirtualBox</span> you can access files of your\n"
+"host system from within the guest system.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Make sure to understand the security implications of [[accessing\n"
+"internal hard "
+"disks|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]\n"
+"from Tails before using this feature.</p>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Security considerations for Windows and Mac OS X\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In our [[security warnings about virtualization|virtualization#security]] we "
+"recommend to run Tails in a virtual machine only if the host operating "
+"system is trustworthy."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Microsoft Windows and Mac OS X being proprietary software, they cannot be "
+"considered trustworthy. Only run Tails in a virtual machine on Windows or OS "
+"X for testing purposes and do not rely on it for security."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Installation\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To install *VirtualBox* in Debian or Ubuntu, execute the following command:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " sudo apt-get install virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For instructions on how to install *VirtualBox* on other operating systems, "
+"refer to the [VirtualBox "
+"documentation](https://www.virtualbox.org/wiki/End-user_documentation)."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Running Tails from an ISO image\n"
+msgstr ""
+
+#. type: Plain text
+msgid "First, start *VirtualBox*."
+msgstr ""
+
+#. type: Plain text
+msgid "To create a new virtual machine:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Machine</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">New...</span></span>.\n"
+" 1. In the **Name and operating system** screen, specify:\n"
+" - A name of your choice.\n"
+" - **Type**: **Linux**.\n"
+" - **Version**: **Other Linux (32 bit)**.\n"
+" - Click **Next**.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> "
+"guest\n"
+" modules allow for additional features when using Tails in a virtual\n"
+" machine: shared folders, resizable display, shared clipboard, "
+"etc.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>But due to <a hreg=\"https://www.virtualbox.org/ticket/11037\">a bug "
+"in\n"
+" <span class=\"application\">VirtualBox</span></a>, the resizable "
+"display\n"
+" and shared clipboard only work in Tails if the virtual machine is "
+"configured to\n"
+" have a 32-bit processor. The shared folders work both on 32-bit and\n"
+" 64-bit guests.</p></div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. In the **Memory size screen**:\n"
+" - Allocate at least 1024 MB of RAM.\n"
+" - Click **Next**.\n"
+" 1. In the **Hard drive** screen:\n"
+" - Choose **Do not add a virtual hard drive**.\n"
+" - Click **Create**.\n"
+" - Click **Continue** in the warning dialog about creating a virtual\n"
+" machine without a hard drive.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To configure the virtual machine to start from an ISO image:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select the new virtual machine in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Choose <span class=\"menuchoice\"> <span "
+"class=\"guimenu\">Machine</span>&nbsp;▸ <span "
+"class=\"guimenuitem\">Settings...</span></span>."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select **Storage** in left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Select **Empty** below **Contoller IDE** in the **Storage Tree** selection "
+"list in the right pane."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" 1. Click on the **CD** icon on the left of the window and select\n"
+" **Choose a virtual CD/DVD disk file...** to browse for the ISO image\n"
+" you want to start Tails from.\n"
+" 1. Select the **Check Live CD/DVD** option.\n"
+" 1. Click **OK**.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To start the new virtual machine:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Select the virtual machine in the left pane."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Click **Start**."
+msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po
index 62924b7..674cb6d 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-25 20:07+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+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"
@@ -44,3 +44,92 @@ msgid ""
"device (other USB stick, other DVD or any device you would choose), or use "
"the [[persistence feature|first_steps/persistence]]."
msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Accessing internal hard disks\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Accessing internal disks of the computer has security implications:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ul>\n"
+" <li>You can leave traces of your activities in Tails on the hard disks.</li>\n"
+" <li>If Tails is compromised, a malware could install itself on your usual operating system.</li>\n"
+" <li>If an application in Tails is compromised, it could access private data on your disks and use it to de-anonymize you.</li>\n"
+"</ul>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To access internal hard disks:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"When starting Tails, [[set up an administration password|doc/first_steps/"
+"startup_options/administration_password/]]."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Open the *Nautilus* file manager."
+msgstr ""
+
+#. type: Bullet: '3. '
+msgid "Click on the hard disk of your choice in the left pane."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If your usual operating system is in\n"
+"hibernation, accessing it might corrupt your file system. Only access your disk\n"
+"if your system was shut down properly.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If your disks use LVM (Logical Volume Manager), you can start the\n"
+"volume groups on the disks and mount logical volumes using\n"
+"<span class=\"application\">GNOME Disk Utility</span>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If you have a GNU/Linux system on your disks, you can only access\n"
+"files owned by the first user (<code>uid=1000</code>) on that system.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In all cases, you might encounter permissions problems. To bypass\n"
+"permission limitations, you can run <span class=\"application\">Nautilus</span>\n"
+"with administration rights.</p>\n"
+msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
index de8c7c9..a40ed26 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-25 20:07+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2013-01-10 09:53-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,6 +68,95 @@ msgstr ""
"tout autre périphérique de votre choix), ou utilisez la [[persistance|"
"first_steps/persistence]]."
+#. type: Title =
+#, no-wrap
+msgid "Accessing internal hard disks\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Accessing internal disks of the computer has security implications:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ul>\n"
+" <li>You can leave traces of your activities in Tails on the hard disks.</li>\n"
+" <li>If Tails is compromised, a malware could install itself on your usual operating system.</li>\n"
+" <li>If an application in Tails is compromised, it could access private data on your disks and use it to de-anonymize you.</li>\n"
+"</ul>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To access internal hard disks:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"When starting Tails, [[set up an administration password|doc/first_steps/"
+"startup_options/administration_password/]]."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Open the *Nautilus* file manager."
+msgstr ""
+
+#. type: Bullet: '3. '
+msgid "Click on the hard disk of your choice in the left pane."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If your usual operating system is in\n"
+"hibernation, accessing it might corrupt your file system. Only access your disk\n"
+"if your system was shut down properly.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If your disks use LVM (Logical Volume Manager), you can start the\n"
+"volume groups on the disks and mount logical volumes using\n"
+"<span class=\"application\">GNOME Disk Utility</span>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If you have a GNU/Linux system on your disks, you can only access\n"
+"files owned by the first user (<code>uid=1000</code>) on that system.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In all cases, you might encounter permissions problems. To bypass\n"
+"permission limitations, you can run <span class=\"application\">Nautilus</span>\n"
+"with administration rights.</p>\n"
+msgstr ""
+
#~ msgid ""
#~ "A consequence of this amnesia is that you can't save anything on the "
#~ "device containing Tails, be it files you create or download or any "
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn
index 326b8ed..297c23b 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn
@@ -14,3 +14,51 @@ operating system.
You should save anything you want to keep for later access into a
separate device (other USB stick, other DVD or any device you would choose),
or use the [[persistence feature|first_steps/persistence]].
+
+Accessing internal hard disks
+=============================
+
+<div class="caution">
+
+<p>Accessing internal disks of the computer has security implications:
+
+<ul>
+ <li>You can leave traces of your activities in Tails on the hard disks.</li>
+ <li>If Tails is compromised, a malware could install itself on your usual operating system.</li>
+ <li>If an application in Tails is compromised, it could access private data on your disks and use it to de-anonymize you.</li>
+</ul>
+
+</p>
+
+</div>
+
+To access internal hard disks:
+
+1. When starting Tails, [[set up an administration password|doc/first_steps/startup_options/administration_password/]].
+
+2. Open the *Nautilus* file manager.
+
+3. Click on the hard disk of your choice in the left pane.
+
+<div class="caution">
+
+<p>If your usual operating system is in
+hibernation, accessing it might corrupt your file system. Only access your disk
+if your system was shut down properly.</p>
+
+</div>
+
+<div class="note">
+
+<p>If your disks use LVM (Logical Volume Manager), you can start the
+volume groups on the disks and mount logical volumes using
+<span class="application">GNOME Disk Utility</span>.</p>
+
+<p>If you have a GNU/Linux system on your disks, you can only access
+files owned by the first user (<code>uid=1000</code>) on that system.</p>
+
+<p>In all cases, you might encounter permissions problems. To bypass
+permission limitations, you can run <span class="application">Nautilus</span>
+with administration rights.</p>
+
+</div>
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po
index 62924b7..674cb6d 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-25 20:07+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+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"
@@ -44,3 +44,92 @@ msgid ""
"device (other USB stick, other DVD or any device you would choose), or use "
"the [[persistence feature|first_steps/persistence]]."
msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Accessing internal hard disks\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Accessing internal disks of the computer has security implications:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ul>\n"
+" <li>You can leave traces of your activities in Tails on the hard disks.</li>\n"
+" <li>If Tails is compromised, a malware could install itself on your usual operating system.</li>\n"
+" <li>If an application in Tails is compromised, it could access private data on your disks and use it to de-anonymize you.</li>\n"
+"</ul>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+msgid "To access internal hard disks:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"When starting Tails, [[set up an administration password|doc/first_steps/"
+"startup_options/administration_password/]]."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Open the *Nautilus* file manager."
+msgstr ""
+
+#. type: Bullet: '3. '
+msgid "Click on the hard disk of your choice in the left pane."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If your usual operating system is in\n"
+"hibernation, accessing it might corrupt your file system. Only access your disk\n"
+"if your system was shut down properly.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If your disks use LVM (Logical Volume Manager), you can start the\n"
+"volume groups on the disks and mount logical volumes using\n"
+"<span class=\"application\">GNOME Disk Utility</span>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If you have a GNU/Linux system on your disks, you can only access\n"
+"files owned by the first user (<code>uid=1000</code>) on that system.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>In all cases, you might encounter permissions problems. To bypass\n"
+"permission limitations, you can run <span class=\"application\">Nautilus</span>\n"
+"with administration rights.</p>\n"
+msgstr ""
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
index ffa82b4..e98c7bc 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-09 00:01+0300\n"
+"POT-Creation-Date: 2015-02-10 09:16+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"
@@ -73,6 +73,28 @@ msgstr ""
msgid "[[!img applications.png link=no alt=\"Applications menu\"]]\n"
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"icon\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img help-browser.png link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Help</span></span>\n"
+" </div>\n"
+"</div>\n"
+msgstr ""
+
#. type: Title ###
#, no-wrap
msgid "System Tools submenu"
@@ -108,11 +130,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"icon\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
index 85b4a1d..aecfe77 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-15 18:40+0300\n"
+"POT-Creation-Date: 2015-02-10 09:16+0100\n"
"PO-Revision-Date: 2015-01-18 11:09-0000\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"
@@ -79,6 +80,48 @@ msgstr ""
msgid "[[!img applications.png link=no alt=\"Applications menu\"]]\n"
msgstr "[[!img applications.png link=no alt=\"Menu des applications\"]]\n"
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"icon\">\n"
+msgstr "<div class=\"icon\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img seahorse.png link=no]]\n"
+msgid "[[!img help-browser.png link=no]]\n"
+msgstr "[[!img seahorse.png link=no]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">Seahorse</span>:\n"
+#| " to manage your OpenPGP keys choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
+msgid ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Help</span></span>\n"
+" </div>\n"
+"</div>\n"
+msgstr ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Seahorse</span>:\n"
+" pour gérer vos clés OpenPGP, choisissez\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Outils système</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Préférences</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Mots de passe et clés</span></span>\n"
+" </div>\n"
+"</div>\n"
+
#. type: Title ###
#, no-wrap
msgid "System Tools submenu"
@@ -120,11 +163,6 @@ msgstr "Entre autres utilitaires, ce menu contient :"
#. type: Plain text
#, no-wrap
-msgid "<div class=\"icon\">\n"
-msgstr "<div class=\"icon\">\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
index 7d6c621..83c4e11 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
@@ -24,6 +24,16 @@ The <span class="guimenu">Applications</span> menu provides shortcuts to the
[[!img applications.png link=no alt="Applications menu"]]
+<div class="icon">
+[[!img help-browser.png link=no]]
+<div class="text">
+ <span class="guimenuitem">Help</span>: to access the GNOME Desktop Help choose
+ <span class="menuchoice">
+ <span class="guisubmenu">Accessories</span>&nbsp;▸
+ <span class="guimenuitem">Help</span></span>
+ </div>
+</div>
+
### System Tools submenu
The <span class="guisubmenu">System Tools</span> submenu allows you to customize
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
index d0898e8..28ae520 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-09 00:01+0300\n"
+"POT-Creation-Date: 2015-02-10 09:16+0100\n"
"PO-Revision-Date: 2014-08-06 07:18-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,6 +77,48 @@ msgstr "O menu <span class=\"guimenu\">Aplicações</span> provê atalhos para o
msgid "[[!img applications.png link=no alt=\"Applications menu\"]]\n"
msgstr "[[!img applications.png link=no alt=\"Menu de Aplicações\"]]\n"
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"icon\">\n"
+msgstr "<div class=\"icon\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img tor-on.png link=no]]\n"
+msgid "[[!img help-browser.png link=no]]\n"
+msgstr "[[!img tor-on.png link=no]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\">\n"
+#| " <span class=\"guimenuitem\">Seahorse</span>:\n"
+#| " to manage your OpenPGP keys choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Passwords and Keys</span></span>\n"
+#| " </div>\n"
+#| "</div>\n"
+msgid ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Help</span>: to access the GNOME Desktop Help choose\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Help</span></span>\n"
+" </div>\n"
+"</div>\n"
+msgstr ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Seahorse</span>:\n"
+" para gerenciar suas chaves OpenPGP, escolha\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Ferramentas de Sistema</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Preferências</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Senhas e Chaves</span></span>\n"
+" </div>\n"
+"</div>\n"
+
#. type: Title ###
#, no-wrap
msgid "System Tools submenu"
@@ -116,11 +158,6 @@ msgstr "Entre outros utilitários, estão incluídos:"
#. type: Plain text
#, no-wrap
-msgid "<div class=\"icon\">\n"
-msgstr "<div class=\"icon\">\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
msgstr "[[!img preferences-system.png link=no]]\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/help-browser.png b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/help-browser.png
new file mode 100644
index 0000000..f3edf2c
--- /dev/null
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/help-browser.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/persistence.de.po b/wiki/src/doc/first_steps/persistence.de.po
index 0f28296..864a9f4 100644
--- a/wiki/src/doc/first_steps/persistence.de.po
+++ b/wiki/src/doc/first_steps/persistence.de.po
@@ -3,23 +3,23 @@
# 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"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2014-10-08 16:51+0300\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"
+"PO-Revision-Date: 2015-02-03 22:46+0100\n"
+"Last-Translator: Tails developers <tails@boum.org>\n"
+"Language-Team: Tails Translators <tails-l10n@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Encrypted persistence\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Verschlüsselter beständiger Speicherbereich\"]]\n"
#. type: Plain text
#, no-wrap
@@ -29,11 +29,16 @@ msgid ""
"class=\"application\">Tails Installer</span>. The files in the persistent\n"
"volume are saved encrypted and remain available across separate working sessions.\n"
msgstr ""
+"Falls Sie Tails von einem USB-Stick oder einer SD-Karte starten, können Sie einen\n"
+"beständigen Speicherbereich auf dem freien Platz, der vom <span\n"
+"class=\"application\">Tails Installer</span> auf dem Speichermedium freigelassen wurde, erstellen.\n"
+" Die Daten in dem beständigen Speicherbereich werden verschlüsselt gespeichert und\n"
+"bleiben über mehrere Sitzungen hinweg erhalten.\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
@@ -42,52 +47,62 @@ msgid ""
"SD card, was installed using <span class=\"application\">[[Tails\n"
"Installer|doc/first_steps/installation]]</span>.</p>\n"
msgstr ""
+"<p>Es ist nur möglich, einen beständigen Speicherbereich zu erstellen, wenn das\n"
+"Speichermedium, USB-Stick oder SD-Karte, mit dem <span class=\"application\">\n"
+"[[Tails Installer|doc/first_steps/installation]]</span> erstellt wurde.</p>\n"
#. type: Plain text
#, no-wrap
msgid "<p>This requires a USB stick or SD card of <strong>at least 4 GB</strong>.</p>\n"
-msgstr ""
+msgstr "<p>Vorraussetzung ist ein USB-Stick oder eine SD-Karte mit <strong>mindestens 4 GB</strong>.</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
msgid "You can use this persistent volume to store different kinds of files:"
msgstr ""
+"Sie können diesen beständigen Speicherbereich nutzen um verschiede Arten von "
+"Dateien zu speichern:"
#. type: Bullet: ' - '
msgid "your personal files and working documents"
-msgstr ""
+msgstr "Ihre persönlichen Dateien und Arbeitsdokumente"
#. type: Bullet: ' - '
msgid "the software packages that you download and install in Tails"
msgstr ""
+"Die Softwarepakete, die Sie in Tails heruntergeladen und installiert haben"
#. type: Bullet: ' - '
msgid "the configuration of the programs you use"
-msgstr ""
+msgstr "Die Einstellungen der Programme, die Sie nutzen"
#. type: Bullet: ' - '
msgid "your encryption keys"
-msgstr ""
+msgstr "Ihre Verschlüsselungsschlüssel"
#. type: Plain text
msgid ""
"The persistent volume is an encrypted partition protected by a passphrase."
msgstr ""
+"Der beständige Speicherbereich ist eine verschlüsselte Partition, die mit "
+"einer Passphrase geschützt ist."
#. type: Plain text
msgid ""
"Once the persistent volume is created, you can choose to activate it or not "
"each time you start Tails."
msgstr ""
+"Sobald der beständige Speicherbereich erstellt wurde, können Sie bei jedem "
+"Start von Tails auswählen, ob Sie ihn aktivieren wollen oder nicht."
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
@@ -95,39 +110,52 @@ msgid ""
"How to use the persistent volume\n"
"=================================\n"
msgstr ""
+"Wie benutzt man den beständigen Speicherbereich?\n"
+"=================================\n"
#. type: Bullet: ' - '
msgid "[[Warnings about persistence|first_steps/persistence/warnings]]"
-msgstr ""
+msgstr "[[Warnungen zu Beständigkeit|first_steps/persistence/warnings]]"
#. type: Bullet: ' - '
msgid ""
"[[Create & configure the persistent volume|first_steps/persistence/"
"configure]]"
msgstr ""
+"[[Erstellen und Konfigurieren des beständigen Speicherbereiches|first_steps/"
+"persistence/configure]]"
#. type: Bullet: ' - '
msgid "[[Enable & use the persistent volume|first_steps/persistence/use]]"
msgstr ""
+"[[Aktivierung und Benutzung des beständigen Speicherbereiches|first_steps/"
+"persistence/use]]"
#. type: Bullet: ' - '
msgid ""
"[[Change the passphrase of the persistent volume|first_steps/persistence/"
"change_passphrase]]"
msgstr ""
+"[[Ändern der Passphrase für den beständige Speicherbereich|first_steps/"
+"persistence/change_passphrase]]"
#. type: Bullet: ' - '
msgid ""
"[[Manually copy your persistent data to a new device|first_steps/persistence/"
"copy]]"
msgstr ""
+"[[Händisch Daten vom beständigen Speicherbereich auf ein anderes "
+"Speichermedium kopieren|first_steps/persistence/copy]]"
#. type: Bullet: ' - '
msgid ""
"[[Check the file system of the persistent volume|first_steps/persistence/"
"check_file_system]]"
msgstr ""
+"[[Das Dateisystem des beständigen Speicherbereiches überprüfen|first_steps/"
+"persistence/check_file_system]]"
#. type: Bullet: ' - '
msgid "[[Delete the persistent volume|first_steps/persistence/delete]]"
msgstr ""
+"[[Den beständigen Speicherbereich löschen|first_steps/persistence/delete]]"
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.de.po b/wiki/src/doc/first_steps/startup_options/administration_password.de.po
index 9e8ef99..c8e432a 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.de.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2014-03-18 02:28+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2015-01-28 17:16+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Translators <tails-l10n@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-"Language: de\n"
#. type: Plain text
#, no-wrap
@@ -38,8 +38,10 @@ msgid "To install new programs and packages"
msgstr "Das Installieren von neuen Programmen und Paketen"
#. type: Bullet: ' - '
-msgid "To access the internal hard disks of the computer"
-msgstr "Das Zugreifen auf die eingebauten Festplatten des Computers"
+msgid ""
+"To [[access the internal hard disks of the computer|doc/"
+"encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
+msgstr ""
#. type: Bullet: ' - '
msgid "To execute commands with <span class=\"command\">sudo</span>"
@@ -135,3 +137,6 @@ msgid "Execute <span class=\"command\">sudo -i</span> in a terminal."
msgstr ""
"Führen Sie den Befehl <span class=\"command\">sudo -i</span> in einem "
"Terminalfenster aus."
+
+#~ msgid "To access the internal hard disks of the computer"
+#~ msgstr "Das Zugreifen auf die eingebauten Festplatten des Computers"
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.fr.po b/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
index f64138e..5aa9473 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-03-18 02:28+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -32,8 +32,10 @@ msgid "To install new programs and packages"
msgstr "Pour installer de nouveaux programmes et paquets"
#. type: Bullet: ' - '
-msgid "To access the internal hard disks of the computer"
-msgstr "Pour avoir accès au disque dur interne de l'ordinateur"
+msgid ""
+"To [[access the internal hard disks of the computer|doc/"
+"encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
+msgstr ""
#. type: Bullet: ' - '
msgid "To execute commands with <span class=\"command\">sudo</span>"
@@ -130,3 +132,6 @@ msgstr ""
#. type: Bullet: ' - '
msgid "Execute <span class=\"command\">sudo -i</span> in a terminal."
msgstr "Taper <span class=\"command\">sudo -i</span> dans un terminal."
+
+#~ msgid "To access the internal hard disks of the computer"
+#~ msgstr "Pour avoir accès au disque dur interne de l'ordinateur"
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.mdwn b/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
index 42f0983..18f3b11 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
@@ -5,7 +5,8 @@ administration tasks.<br/>
For example:
- To install new programs and packages
- - To access the internal hard disks of the computer
+ - To
+ [[access the internal hard disks of the computer|doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]
- To execute commands with <span class="command">sudo</span>
**By default, the administration password is disabled for better security.**
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.pt.po b/wiki/src/doc/first_steps/startup_options/administration_password.pt.po
index b92a91d..cc2ca69 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.pt.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-23 00:14+0300\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2014-06-21 19:15-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,8 +36,10 @@ msgid "To install new programs and packages"
msgstr "Para instalar novos programas e pacotes"
#. type: Bullet: ' - '
-msgid "To access the internal hard disks of the computer"
-msgstr "Para acessar os discos rígidos internos do computador"
+msgid ""
+"To [[access the internal hard disks of the computer|doc/"
+"encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
+msgstr ""
#. type: Bullet: ' - '
msgid "To execute commands with <span class=\"command\">sudo</span>"
@@ -132,3 +134,6 @@ msgstr ""
msgid "Execute <span class=\"command\">sudo -i</span> in a terminal."
msgstr ""
"Execute comandos com <span class=\"command\">sudo -i</span> em um terminal."
+
+#~ msgid "To access the internal hard disks of the computer"
+#~ msgstr "Para acessar os discos rígidos internos do computador"
diff --git a/wiki/src/download.de.po b/wiki/src/download.de.po
index 2716e95..d7b8198 100644
--- a/wiki/src/download.de.po
+++ b/wiki/src/download.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-01-07 09:55+0100\n"
-"PO-Revision-Date: 2015-01-21 15:33+0100\n"
+"PO-Revision-Date: 2015-01-31 20:07-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails language team <tails-l10n@boum.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.5.4\n"
#. type: Content of: outside any tag (error?)
msgid ""
@@ -23,7 +23,7 @@ msgid ""
"without restriction.</strong>"
msgstr ""
"[[!meta title=\"Herunterladen, prüfen und installieren\"]] <strong>Tails ist "
-"[[freie Software|doc/about/license]], Sie können sie ohne Einschränkung "
+"[[Freie Software|doc/about/license]], Sie können sie ohne Einschränkung "
"herunterladen, benutzen und verteilen.</strong>"
#. type: Content of: <div>
@@ -144,9 +144,9 @@ msgid ""
"stable_i386_torrent_sig_url\" raw=\"yes\"]]>signature of the Torrent file</"
"a> itself before downloading the ISO image."
msgstr ""
-"Zusätzlich können Sie auch die <a href=[[!inline pages=\"inc/"
+"Zusätzlich können Sie die <a href=[[!inline pages=\"inc/"
"stable_i386_torrent_sig_url\" raw=\"yes\"]]>Signatur der Torrent Datei</a> "
-"vor dem Herunterladen der ISO Datei verifizieren."
+"selbst vor dem Herunterladen des ISO-Images verifizieren."
#. type: Content of: <div><div><div><h3>
msgid "Seed back!"
@@ -188,8 +188,8 @@ msgid ""
"victim of a man-in-the-middle attack while using HTTPS. On this website as "
"much as on any other of the Internet."
msgstr ""
-"Diese Techniken basieren auf normalen HTTPS und <span class=\"definition"
-"\">[[!wikipedia_de Zertifizierungsstelle desc=\"Zertifizierungsstellen\"]]</"
+"Diese Techniken basieren auf normalem HTTPS und <span class=\"definition\">"
+"[[!wikipedia_de Zertifizierungsstelle desc=\"Zertifizierungsstellen\"]]</"
"span> um Ihnen Vertrauen in den Inhalt dieser Website zu geben. Trotz der "
"Verwendung von HTTPS können Sie, [[wie auf unserer Warnungsseite erklärt|doc/"
"about/warning#index3h1]], Opfer eines \"Man-in-the-middle\"-Angriffs sein. "
@@ -205,8 +205,8 @@ msgid ""
"authenticity of the ISO image</a>."
msgstr ""
"Daher <strong>stellen diese Techniken keinen sehr sicheren Weg dar, die "
-"<span class=\"definition\">[[!wikipedia_de Authentizität desc=\"Echtheit"
-"\"]]</span> des ISO-Images zu prüfen und sicherzustellen, dass Sie eine "
+"<span class=\"definition\">[[!wikipedia_de Authentizität desc=\"Echtheit\"]]"
+"</span> des ISO-Images zu prüfen und sicherzustellen, dass Sie eine "
"unverfälschte Kopie von Tails heruntergeladen haben.</strong> In einem "
"eigenen Abschnitt erfahren Sie mehr zu den fortgeschrittenen Techniken, um "
"die <a href=\"#authenticity-check\">Echtheit des ISO-Images zu überprüfen</"
@@ -272,12 +272,12 @@ msgstr ""
#. type: Content of: <div><div>
msgid ""
"[[!toggleable id=\"verify_the_iso_image_using_gnome\" text=\"\"\" <span "
-"class=\"hide\">[[!toggle id=\"verify_the_iso_image_using_gnome\" text="
-"\"\"]]</span>"
+"class=\"hide\">[[!toggle id=\"verify_the_iso_image_using_gnome\" text=\"\"]]"
+"</span>"
msgstr ""
"[[!toggleable id=\"verify_the_iso_image_using_gnome\" text=\"\"\" <span "
-"class=\"hide\">[[!toggle id=\"verify_the_iso_image_using_gnome\" text="
-"\"\"]]</span>"
+"class=\"hide\">[[!toggle id=\"verify_the_iso_image_using_gnome\" text=\"\"]]"
+"</span>"
#. type: Content of: <div><div><h2>
msgid "Using Linux with Gnome: Ubuntu, Debian, Tails, Fedora, etc."
@@ -377,16 +377,18 @@ msgid ""
"To be notified of new versions and important project news, follow our [[news "
"feed|news]] or subscribe to our <a href=\"https://mailman.boum.org/listinfo/"
"amnesia-news\">news mailing list</a>:"
-msgstr "Um über neue Versionen und wichtige Neuigkeiten informiert zu werden, "
-"folgen Sie unserem [[Newsfeed|news]], oder abonnieren unsere "
-"<a href=\"https://mailman.boum.org/listinfo/amnesia-news\">news-Mailingliste</a>:"
+msgstr ""
+"Um über neue Versionen und wichtige Neuigkeiten informiert zu werden, folgen "
+"Sie unserem [[Newsfeed|news]], oder abonnieren unsere <a href=\"https://"
+"mailman.boum.org/listinfo/amnesia-news\">news-Mailingliste</a>:"
#. type: Content of: <div><div><form>
msgid ""
"<input class=\"text\" name=\"email\" value=\"\"/> <input class=\"button\" "
"type=\"submit\" value=\"Subscribe\"/>"
-msgstr "<input class=\"text\" name=\"email\" value=\"\"/> "
-"<input class=\"button\" type=\"submit\" value=\"Abbonieren\"/>"
+msgstr ""
+"<input class=\"text\" name=\"email\" value=\"\"/> <input class=\"button\" "
+"type=\"submit\" value=\"Abonnieren\"/>"
#. type: Content of: <div><div><h1>
msgid "Installation"
diff --git a/wiki/src/local.css b/wiki/src/local.css
index 0c65f2c..c986220 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -1073,6 +1073,14 @@ div.tip {
background-image: url(lib/admon-tip.png);
}
+/* Inlined 16x16 icons */
+
+img.symbolic {
+ display: inline-block;
+ position: relative;
+ top: 1px;
+}
+
/* Trail */
div.trail {
diff --git a/wiki/src/support/known_issues.de.po b/wiki/src/support/known_issues.de.po
index be6f248..22efb76 100644
--- a/wiki/src/support/known_issues.de.po
+++ b/wiki/src/support/known_issues.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-07 00:13+0100\n"
+"POT-Creation-Date: 2015-02-10 13:52+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"
@@ -524,6 +524,7 @@ msgid ""
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
+" - Lenovo ThinkPad X220\n"
" - Toshiba Satellite C855D\n"
" - Dell Inc. Studio 1458\n"
" - Fujitsu Lifebook AH531/GFO, only on regular shutdown, emergency\n"
@@ -635,25 +636,6 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "VirtualBox guest modules are broken for 64-bit guests\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"VirtualBox guest modules allow for additional features when using Tails as a "
-"VirtualBox guest: shared folders, resizable display, shared clipboard, etc."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"But due to [a bug in VirtualBox](https://www.virtualbox.org/ticket/11037), "
-"the resizable display and shared clipboard only work in Tails if the "
-"VirtualBox guest is configured to have a 32-bit processor. The shared "
-"folders work both on 32-bit and 64-bit guests."
-msgstr ""
-
-#. type: Title -
-#, no-wrap
msgid "Touchpad configurations\n"
msgstr ""
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index 082681d..87b87ce 100644
--- a/wiki/src/support/known_issues.fr.po
+++ b/wiki/src/support/known_issues.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-07 00:13+0100\n"
+"POT-Creation-Date: 2015-02-10 13:52+0100\n"
"PO-Revision-Date: 2015-01-18 12:37-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -606,7 +606,23 @@ msgid "This issue has been reported on the following hardware:"
msgstr "Ce problème a été rapporté sur les ordinateurs suivants :"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - Apple when booting from a USB stick:\n"
+#| " - MacBook Air 5,1\n"
+#| " - MacBook Pro 7,1, 13-inch mid 2010\n"
+#| " - MacBook Pro 9,2, 13-inch mid 2012\n"
+#| " - MacBook Pro 8,1, 13-inch late 2011\n"
+#| " - MacBook Pro 10,2\n"
+#| " - MacBook Pro Retina 11,1, late 2013\n"
+#| " - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
+#| " - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
+#| " USB stick\n"
+#| " - Toshiba Satellite C855D\n"
+#| " - Dell Inc. Studio 1458\n"
+#| " - Fujitsu Lifebook AH531/GFO, only on regular shutdown, emergency\n"
+#| " shutdown works\n"
+#| " - Samsung N150P\n"
msgid ""
" - Apple when booting from a USB stick:\n"
" - MacBook Air 5,1\n"
@@ -618,6 +634,7 @@ msgid ""
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
+" - Lenovo ThinkPad X220\n"
" - Toshiba Satellite C855D\n"
" - Dell Inc. Studio 1458\n"
" - Fujitsu Lifebook AH531/GFO, only on regular shutdown, emergency\n"
@@ -765,34 +782,6 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "VirtualBox guest modules are broken for 64-bit guests\n"
-msgstr "Les modules de suppléments pour invités (*guest modules*) de VirtualBox ne marchent pas pour les invités 64-bits\n"
-
-#. type: Plain text
-msgid ""
-"VirtualBox guest modules allow for additional features when using Tails as a "
-"VirtualBox guest: shared folders, resizable display, shared clipboard, etc."
-msgstr ""
-"Les modules de suppléments pour invités (*guest modules*) de VirtualBox "
-"permettent lorsqu'on utilise Tails dans VirtualBox d'avoir des "
-"fonctionnalités supplémentaires : dossiers partagés, redimensionnement de "
-"l'affichage, presse-papier partagé, etc."
-
-#. type: Plain text
-msgid ""
-"But due to [a bug in VirtualBox](https://www.virtualbox.org/ticket/11037), "
-"the resizable display and shared clipboard only work in Tails if the "
-"VirtualBox guest is configured to have a 32-bit processor. The shared "
-"folders work both on 32-bit and 64-bit guests."
-msgstr ""
-"Mais à cause d'un [bug dans VirtualBox](https://www.virtualbox.org/"
-"ticket/11037), le redimensionnement de l'affichage et le partage de presse-"
-"papiers fonctionnent uniquement dans Tails si l'invité VirtualBox est "
-"configuré pour un processeur 32-bit. Les dossiers partagés fonctionnent à la "
-"fois sur les invités 32-bit et 64-bit."
-
-#. type: Title -
-#, no-wrap
msgid "Touchpad configurations\n"
msgstr "Configuration du pavé tactile\n"
@@ -867,6 +856,31 @@ msgstr ""
"langues disponibles dans le navigateur Tor depuis la [page d'accueil du "
"navigateur Tor](https://www.torproject.org/projects/torbrowser.html)."
+#~ msgid "VirtualBox guest modules are broken for 64-bit guests\n"
+#~ msgstr "Les modules de suppléments pour invités (*guest modules*) de VirtualBox ne marchent pas pour les invités 64-bits\n"
+
+#~ msgid ""
+#~ "VirtualBox guest modules allow for additional features when using Tails "
+#~ "as a VirtualBox guest: shared folders, resizable display, shared "
+#~ "clipboard, etc."
+#~ msgstr ""
+#~ "Les modules de suppléments pour invités (*guest modules*) de VirtualBox "
+#~ "permettent lorsqu'on utilise Tails dans VirtualBox d'avoir des "
+#~ "fonctionnalités supplémentaires : dossiers partagés, redimensionnement de "
+#~ "l'affichage, presse-papier partagé, etc."
+
+#~ msgid ""
+#~ "But due to [a bug in VirtualBox](https://www.virtualbox.org/"
+#~ "ticket/11037), the resizable display and shared clipboard only work in "
+#~ "Tails if the VirtualBox guest is configured to have a 32-bit processor. "
+#~ "The shared folders work both on 32-bit and 64-bit guests."
+#~ msgstr ""
+#~ "Mais à cause d'un [bug dans VirtualBox](https://www.virtualbox.org/"
+#~ "ticket/11037), le redimensionnement de l'affichage et le partage de "
+#~ "presse-papiers fonctionnent uniquement dans Tails si l'invité VirtualBox "
+#~ "est configuré pour un processeur 32-bit. Les dossiers partagés "
+#~ "fonctionnent à la fois sur les invités 32-bit et 64-bit."
+
#~ msgid "Problematic virtual machines\n"
#~ msgstr "Machines virtuelles problématiques\n"
diff --git a/wiki/src/support/known_issues.mdwn b/wiki/src/support/known_issues.mdwn
index 2bf2e38..3794493 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -272,6 +272,7 @@ This issue has been reported on the following hardware:
- Hewlett-Packard HP Pavilion dv6 Notebook PC
- Lenovo ThinkPad X61, only on emergency shutdown when pulling out the
USB stick
+ - Lenovo ThinkPad X220
- Toshiba Satellite C855D
- Dell Inc. Studio 1458
- Fujitsu Lifebook AH531/GFO, only on regular shutdown, emergency
@@ -330,17 +331,6 @@ Tails fails to connect to certain Wi-Fi networks
This might be related to the introduction of wireless regulation support
in Tails 0.13.
-VirtualBox guest modules are broken for 64-bit guests
------------------------------------------------------
-
-VirtualBox guest modules allow for additional features when using Tails as a
-VirtualBox guest: shared folders, resizable display, shared clipboard, etc.
-
-But due to [a bug in VirtualBox](https://www.virtualbox.org/ticket/11037), the
-resizable display and shared clipboard
-only work in Tails if the VirtualBox guest is configured to have a 32-bit
-processor. The shared folders work both on 32-bit and 64-bit guests.
-
Touchpad configurations
-----------------------
diff --git a/wiki/src/support/known_issues.pt.po b/wiki/src/support/known_issues.pt.po
index f962e81..409a2a5 100644
--- a/wiki/src/support/known_issues.pt.po
+++ b/wiki/src/support/known_issues.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-07 00:13+0100\n"
+"POT-Creation-Date: 2015-02-10 13:52+0100\n"
"PO-Revision-Date: 2014-06-30 15:38-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -640,6 +640,7 @@ msgid ""
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
+" - Lenovo ThinkPad X220\n"
" - Toshiba Satellite C855D\n"
" - Dell Inc. Studio 1458\n"
" - Fujitsu Lifebook AH531/GFO, only on regular shutdown, emergency\n"
@@ -760,28 +761,6 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "VirtualBox guest modules are broken for 64-bit guests\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"VirtualBox guest modules allow for additional features when using Tails as a "
-"VirtualBox guest: shared folders, resizable display, shared clipboard, etc."
-msgstr ""
-
-#. type: Plain text
-#, fuzzy
-msgid ""
-"But due to [a bug in VirtualBox](https://www.virtualbox.org/ticket/11037), "
-"the resizable display and shared clipboard only work in Tails if the "
-"VirtualBox guest is configured to have a 32-bit processor. The shared "
-"folders work both on 32-bit and 64-bit guests."
-msgstr ""
-"Veja [[!tails_todo fix_virtualbox_guest_modules_build desc=\"a\n"
-"tarefa correspondente\"]] para detalhes.\n"
-
-#. type: Title -
-#, no-wrap
msgid "Touchpad configurations\n"
msgstr "Configurações do Touchpad\n"
@@ -858,6 +837,14 @@ msgstr ""
#~| msgid "<a id=\"chainloading\"></a>\n"
#~ msgid "<a id=\"isohybrid-options\"></a>\n"
#~ msgstr "<a id=\"chainloading\"></a>\n"
+#~ msgid ""
+#~ "But due to [a bug in VirtualBox](https://www.virtualbox.org/"
+#~ "ticket/11037), the resizable display and shared clipboard only work in "
+#~ "Tails if the VirtualBox guest is configured to have a 32-bit processor. "
+#~ "The shared folders work both on 32-bit and 64-bit guests."
+#~ msgstr ""
+#~ "Veja [[!tails_todo fix_virtualbox_guest_modules_build desc=\"a\n"
+#~ "tarefa correspondente\"]] para detalhes.\n"
#, fuzzy
#~| msgid "<a id=\"problematic-usb-sticks\"></a>\n"