summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2016-01-25 12:06:43 +0000
committersajolida <sajolida@pimienta.org>2016-01-25 12:06:43 +0000
commitb9b2d8b8ef0ee2b7e28625281ccbe04f8b3cbd43 (patch)
tree54d91090ddc7f26476a348017b9d6e4169dba1c1
parent3dffc6a371ba0155eca44681cf1bcb0b584d5d48 (diff)
parenta849cff1e6d3ace4cc0a4fc12b131accae77c3e7 (diff)
Merge remote-tracking branch 'origin/master' into web/9323-release-iaweb/9323-release-ia
Conflicts: wiki/src/install/debian.html wiki/src/install/debian/usb.mdwn wiki/src/install/debian/usb/overview.html wiki/src/install/expert/usb.mdwn wiki/src/install/expert/usb/overview.html wiki/src/install/inc/steps/install_final.inline.mdwn wiki/src/install/inc/steps/not_at_all.inline.mdwn wiki/src/install/inc/steps/restart_first_time.inline.mdwn wiki/src/install/linux.html wiki/src/install/win.html wiki/src/upgrade.html
-rw-r--r--wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn66
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn55
-rw-r--r--wiki/src/blueprint/persistent_Tor_state.mdwn2
-rw-r--r--wiki/src/blueprint/replace_Pidgin.mdwn25
-rw-r--r--wiki/src/blueprint/report_2015_12.mdwn4
-rw-r--r--wiki/src/contribute/how/documentation.mdwn22
-rwxr-xr-xwiki/src/contribute/how/documentation/compress-image.sh25
-rwxr-xr-xwiki/src/contribute/how/documentation/qrcode-decode.sh14
-rwxr-xr-xwiki/src/contribute/how/documentation/qrcode-encode.sh15
-rw-r--r--wiki/src/contribute/release_process.mdwn2
-rw-r--r--wiki/src/contribute/release_process/tails-installer.mdwn18
-rw-r--r--wiki/src/doc/about/license.de.po60
-rw-r--r--wiki/src/doc/about/license.fa.po60
-rw-r--r--wiki/src/doc/about/license.fr.po34
-rw-r--r--wiki/src/doc/about/license.mdwn32
-rw-r--r--wiki/src/doc/about/license.pt.po60
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.de.po30
-rw-r--r--wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po36
-rw-r--r--wiki/src/doc/encryption_and_privacy/truecrypt.de.po103
-rw-r--r--wiki/src/doc/first_steps/shutdown.de.po20
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.de.po69
-rw-r--r--wiki/src/doc/first_steps/startup_options/offline_mode.de.po5
-rw-r--r--wiki/src/inc/release_notes/1.8.2.de.po14
-rw-r--r--wiki/src/install/debian.de.po26
-rw-r--r--wiki/src/install/debian.fa.po26
-rw-r--r--wiki/src/install/debian.fr.po26
-rw-r--r--wiki/src/install/debian.html13
-rw-r--r--wiki/src/install/debian.pt.po26
-rw-r--r--wiki/src/install/debian/usb.de.po92
-rw-r--r--wiki/src/install/debian/usb.fa.po92
-rw-r--r--wiki/src/install/debian/usb.fr.po92
-rw-r--r--wiki/src/install/debian/usb.mdwn52
-rw-r--r--wiki/src/install/debian/usb.pt.po92
-rw-r--r--wiki/src/install/debian/usb/overview.de.po18
-rw-r--r--wiki/src/install/debian/usb/overview.fa.po18
-rw-r--r--wiki/src/install/debian/usb/overview.fr.po18
-rw-r--r--wiki/src/install/debian/usb/overview.html5
-rw-r--r--wiki/src/install/debian/usb/overview.pt.po18
-rw-r--r--wiki/src/install/download.de.po12
-rw-r--r--wiki/src/install/download.fa.po20
-rw-r--r--wiki/src/install/download.fr.po13
-rw-r--r--wiki/src/install/download.mdwn2
-rw-r--r--wiki/src/install/download.pt.po12
-rw-r--r--wiki/src/install/dvd.de.po35
-rw-r--r--wiki/src/install/dvd.fa.po35
-rw-r--r--wiki/src/install/dvd.fr.po35
-rw-r--r--wiki/src/install/dvd.mdwn2
-rw-r--r--wiki/src/install/dvd.pt.po35
-rw-r--r--wiki/src/install/expert/usb.de.po34
-rw-r--r--wiki/src/install/expert/usb.fa.po34
-rw-r--r--wiki/src/install/expert/usb.fr.po34
-rw-r--r--wiki/src/install/expert/usb.mdwn23
-rw-r--r--wiki/src/install/expert/usb.pt.po34
-rw-r--r--wiki/src/install/expert/usb/overview.de.po16
-rw-r--r--wiki/src/install/expert/usb/overview.fa.po16
-rw-r--r--wiki/src/install/expert/usb/overview.fr.po16
-rw-r--r--wiki/src/install/expert/usb/overview.html5
-rw-r--r--wiki/src/install/expert/usb/overview.pt.po16
-rw-r--r--wiki/src/install/inc/icons/check.pngbin0 -> 1167 bytes
-rw-r--r--wiki/src/install/inc/icons/failed.pngbin0 -> 906 bytes
-rw-r--r--wiki/src/install/inc/icons/pause.pngbin0 -> 1059 bytes
-rw-r--r--wiki/src/install/inc/icons/play.pngbin0 -> 1300 bytes
-rw-r--r--wiki/src/install/inc/overview.de.po14
-rw-r--r--wiki/src/install/inc/overview.fa.po14
-rw-r--r--wiki/src/install/inc/overview.fr.po14
-rw-r--r--wiki/src/install/inc/overview.html14
-rw-r--r--wiki/src/install/inc/overview.pt.po14
-rw-r--r--wiki/src/install/inc/router/clone.de.po4
-rw-r--r--wiki/src/install/inc/router/clone.fa.po4
-rw-r--r--wiki/src/install/inc/router/clone.fr.po4
-rw-r--r--wiki/src/install/inc/router/clone.html2
-rw-r--r--wiki/src/install/inc/router/clone.pt.po4
-rw-r--r--wiki/src/install/inc/screenshots/tails_installer_in_debian.pngbin23926 -> 23755 bytes
-rw-r--r--wiki/src/install/inc/screenshots/tails_installer_in_tails.pngbin40392 -> 67593 bytes
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fr.po4
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.pt.po4
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po103
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po103
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po103
-rw-r--r--wiki/src/install/inc/steps/download.inline.html91
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po103
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.de.po18
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fa.po18
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po18
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.mdwn12
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.pt.po18
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po9
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po4
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.pt.po4
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.de.po52
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.fa.po52
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.fr.po52
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.mdwn27
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.pt.po52
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.de.po75
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fa.po75
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fr.po75
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.mdwn46
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.pt.po75
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.de.po43
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fa.po43
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po43
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.mdwn29
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.pt.po43
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.de.po18
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fa.po18
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fr.po18
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.mdwn16
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.pt.po18
-rw-r--r--wiki/src/install/inc/steps/switch.inline.de.po52
-rw-r--r--wiki/src/install/inc/steps/switch.inline.fa.po52
-rw-r--r--wiki/src/install/inc/steps/switch.inline.fr.po52
-rw-r--r--wiki/src/install/inc/steps/switch.inline.mdwn42
-rw-r--r--wiki/src/install/inc/steps/switch.inline.pt.po52
-rw-r--r--wiki/src/install/inc/steps/you_are_done.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/you_are_done.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/you_are_done.inline.fr.po4
-rw-r--r--wiki/src/install/inc/steps/you_are_done.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/you_are_done.inline.pt.po4
-rw-r--r--wiki/src/install/inc/stylesheets/assistant.css55
-rw-r--r--wiki/src/install/inc/stylesheets/dave.css176
-rw-r--r--wiki/src/install/inc/stylesheets/download-only.css3
-rw-r--r--wiki/src/install/inc/stylesheets/dvd.css12
-rw-r--r--wiki/src/install/inc/stylesheets/mac-dvd.css2
-rw-r--r--wiki/src/install/inc/stylesheets/overview.css1
-rw-r--r--wiki/src/install/inc/stylesheets/router-install.css39
-rw-r--r--wiki/src/install/inc/stylesheets/steps.css29
-rw-r--r--wiki/src/install/inc/stylesheets/vm.css3
-rw-r--r--wiki/src/install/linux.de.po14
-rw-r--r--wiki/src/install/linux.fa.po8
-rw-r--r--wiki/src/install/linux.fr.po8
-rw-r--r--wiki/src/install/linux.html4
-rw-r--r--wiki/src/install/linux.pt.po8
-rw-r--r--wiki/src/install/linux/usb.de.po107
-rw-r--r--wiki/src/install/linux/usb.fa.po107
-rw-r--r--wiki/src/install/linux/usb.fr.po107
-rw-r--r--wiki/src/install/linux/usb.mdwn56
-rw-r--r--wiki/src/install/linux/usb.pt.po107
-rw-r--r--wiki/src/install/os.de.po4
-rw-r--r--wiki/src/install/os.fa.po4
-rw-r--r--wiki/src/install/os.fr.po4
-rw-r--r--wiki/src/install/os.html2
-rw-r--r--wiki/src/install/os.pt.po4
-rw-r--r--wiki/src/install/vm.de.po23
-rw-r--r--wiki/src/install/vm.fa.po23
-rw-r--r--wiki/src/install/vm.fr.po23
-rw-r--r--wiki/src/install/vm.mdwn1
-rw-r--r--wiki/src/install/vm.pt.po23
-rw-r--r--wiki/src/install/win.de.po8
-rw-r--r--wiki/src/install/win.fa.po8
-rw-r--r--wiki/src/install/win.fr.po8
-rw-r--r--wiki/src/install/win.html4
-rw-r--r--wiki/src/install/win.pt.po8
-rw-r--r--wiki/src/lib/spinner.pngbin0 -> 21016 bytes
-rw-r--r--wiki/src/local.css11
-rw-r--r--wiki/src/local.rtl.css4
-rw-r--r--wiki/src/news/test_2.0-rc1.de.po300
-rw-r--r--wiki/src/news/test_2.0-rc1.fa.po300
-rw-r--r--wiki/src/news/test_2.0-rc1.fr.po300
-rw-r--r--wiki/src/news/test_2.0-rc1.mdwn141
-rw-r--r--wiki/src/news/test_2.0-rc1.pt.po300
-rw-r--r--wiki/src/news/version_1.8.2.de.po63
-rw-r--r--wiki/src/press.de.po30
-rw-r--r--wiki/src/press.fa.po39
-rw-r--r--wiki/src/press.fr.po30
-rw-r--r--wiki/src/press.mdwn15
-rw-r--r--wiki/src/press.pt.po30
-rw-r--r--wiki/src/press/media_appearances_2016.de.po30
-rw-r--r--wiki/src/press/media_appearances_2016.fa.po30
-rw-r--r--wiki/src/press/media_appearances_2016.fr.po30
-rw-r--r--wiki/src/press/media_appearances_2016.mdwn5
-rw-r--r--wiki/src/press/media_appearances_2016.pt.po30
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.8.1.de.po45
-rw-r--r--wiki/src/support/known_issues.de.po24
-rw-r--r--wiki/src/support/known_issues.fa.po24
-rw-r--r--wiki/src/support/known_issues.fr.po24
-rw-r--r--wiki/src/support/known_issues.mdwn12
-rw-r--r--wiki/src/support/known_issues.pt.po24
-rw-r--r--wiki/src/torrents/files/tails-i386-2.0~rc1.iso.sig16
-rw-r--r--wiki/src/upgrade.de.po10
-rw-r--r--wiki/src/upgrade.fa.po10
-rw-r--r--wiki/src/upgrade.fr.po10
-rw-r--r--wiki/src/upgrade.html6
-rw-r--r--wiki/src/upgrade.pt.po10
-rw-r--r--wiki/src/upgrade/tails.de.po12
-rw-r--r--wiki/src/upgrade/tails.fa.po12
-rw-r--r--wiki/src/upgrade/tails.fr.po12
-rw-r--r--wiki/src/upgrade/tails.mdwn4
-rw-r--r--wiki/src/upgrade/tails.pt.po12
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml.pgp26
196 files changed, 5098 insertions, 1559 deletions
diff --git a/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn b/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
index ec4c8ea..3bcedaa 100644
--- a/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
+++ b/wiki/src/blueprint/hardware_for_automated_tests_take2.mdwn
@@ -1,11 +1,14 @@
-
Rationale
=========
In [[!tails_ticket 9264]], we're discussing and drafting our needs for more
isotesters. From some statistics of the number of automated builds per month,
we concluded we need to be able to run at least 1000 more test suites per
-month, which means begin able to host at least 8 more isotesters.
+month, which means being able to host at least 8 more isotesters.
+
+Note: our workload parallelizes poorly over multiple CPU cores, so
+perhaps getting _less_ additional ISO testers, but each with faster
+CPU clock, would be more efficient.
Estimates
=========
@@ -15,13 +18,13 @@ isotester means:
* 20G RAM
* 25G HDD (10G system+data, 15G tmp)
- * 3 CPU cores (+1 for the qemu process on the host)
+ * 3 CPU threads
So 8 isotesters would mean:
* 160G RAM
* 200G HDD
- * 32 CPU cores max
+ * 24 CPU threads max
From there, it seems unlikely we could host that on Lizard, and we are
back on the research about new hardware for isotesters.
@@ -30,12 +33,7 @@ Hardware
========
Given the amount of RAM and CPUs required, it seems close to [[Lizard's
-specs|blueprint/hardware_for_automated_tests]]. If we stick on the CPUs, we
-probably need the same kind, with 12 cores and in the end 48 CPU threads.
-
-If we settle on this, we would have a bit of room for the future to be able to
-run up to 11 isotesters (44 CPUs, 275-330G HDD, 220G RAM), running theorically
-1320 test suites per month on this sole box.
+specs|blueprint/hardware_for_automated_tests]].
We still need to decide if we would use faster (as in Ghz) CPUs than the one
Lizard has (Low voltages versions). In this case the price jumps quite a bit,
@@ -44,7 +42,51 @@ each of Lizard's ones).
The following price estimations are based on interpromicro.com ones.
-## Option A: Low voltage CPUs
+## Candidate options
+
+We currently prefer option C if it's doable, and option D otherwise.
+
+### Option C: 12 cores, upgradable by adding a CPU
+
+XXX:
+
+* can we plug one CPU only on a 2-sockets SMP mobo?
+ => ask taggart
+* this is for 8 VMs with 3 vcpus each; if we can instead go for 4 VMs
+ with 3 real cores each, then we need less RAM (~ $1000 less)
+ => depends on the outcome of [[!tails_ticket 10971]]
+
+ * 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
+ * 1 x Intel® E5-2690v3-2.6Ghz/12C, 30M, 135W LGA2011 CPU - $2124
+ * 16 x 16GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $2100
+ * 2 x Samsung 850 EVO, 500GB 2.5" SATA3 SSD(3D V-NAMD) - $400
+ * 1 x Heatsink - $50
+ * 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $350
+
+Total --- **$5424**
+
+### Option D: 2*6 cores, upgradable by replacing CPUs
+
+XXX:
+
+* this is for 8 VMs with 3 vcpus each; if we can instead go for 4 VMs
+ with 3 real cores each, then we need less RAM (~ $1000 less)
+ => depends on the outcome of [[!tails_ticket 10971]]
+
+ * 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
+ * 2 x Intel® E5-2643v3, 6C, 3.4GHz, 135 - $3260
+ * 16 x 16GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $2100
+ * 2 x Samsung 850 EVO, 500GB 2.5" SATA3 SSD(3D V-NAMD) - $400
+ * 1 x Heatsink - $50
+ * 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $350
+
+Total --- **$6675**
+
+## Deprecated options
+
+### Option A: Low voltage CPUs
+
+We actually need less CPU cores.
That's essentially a Lizard clone, minus SSD HDDs.
@@ -57,7 +99,7 @@ That's essentially a Lizard clone, minus SSD HDDs.
Total --- **$6200**
-## Option B: Faster CPUs
+### Option B: Faster CPUs
* 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
* 2 x Intel® E5-2670v3-2.3Ghz/12C, 30M, 9.6GT/s, 120W LGA2011 CPU - $3,300
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index 5acbacd..10aedfd 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -318,6 +318,61 @@ Genera il wiki in locale su TAILS
cd mytails
./build-website --set destdir="/home/amnesia/Persistent/outtails" "$@"
+___
+# Documenti Revisionati
+Dancus
+
+./doc/first_steps/persistence/warninzeyev REVISIONATO
+
+./doc/first_steps/shutdown REVISIONATO
+
+./doc/first_steps/start_tails REVISIONATO
+
+./doc/first_steps/startup_option/administration_password
+
+./doc/first_steps/startup_options/bridge_mode
+
+./doc/first_steps/startup_options/mac_spoofing
+
+./doc/first_steps/startup_options/network_configuration
+
+./doc/first_steps/startup_options/windows_camouflage
+
+-------------------------------------------------------------------
+Blackflag
+
+doc/about/tor.it.html REVISIONATO ("Tor ama le compagnie?")
+
+about/trust.it.po (il file è ok ma sul sito locale sembra ancora da tradurre...)
+
+about/warning.it.po (manca circa 1/3 della traduzione)
+
+doc/first_steps/shutdown.it.po REVISIONATO
+
+getting_started.it.po REVISIONATO
+index.it.po REVISIONATO
+sidebar.it.po REVISIONATO
+
+support.it.html REVISIONATO (file ok ma html sbagliato (da me) )
+
+________________________________
+
+Igni
+
+./doc/about.index --FINITO!
+
+./doc/about/features --FINITO!
+
+./doc/about/fingerprint --FINITO!
+
+./doc/first_steps/persistence.caution --FINITO!
+
+./doc/first_steps/persistence/configure --FINITO!
+
+./doc/first_steps/persistence/delete --FINITO!
+
+./doc/first_steps/persistence/warnings --FINITO!
+________________________________________
diff --git a/wiki/src/blueprint/persistent_Tor_state.mdwn b/wiki/src/blueprint/persistent_Tor_state.mdwn
index 6737bd0..b08337d 100644
--- a/wiki/src/blueprint/persistent_Tor_state.mdwn
+++ b/wiki/src/blueprint/persistent_Tor_state.mdwn
@@ -81,7 +81,7 @@ always generate a new connection => new uuid), I don't see how we can
get around treating all wired networks as the same one and hence
getting the same entry guards for all wired connections.
-Hmm. And actually, I guess it would be a problem for eduraom network
+Hmm. And actually, I guess it would be a problem for eduroam network
and similar "global" networks where one normally would configure one
NM connection without a BSSID but only an SSID. OTOH, with eduroam
specifically one uses a certificate that's unique per user, but I've
diff --git a/wiki/src/blueprint/replace_Pidgin.mdwn b/wiki/src/blueprint/replace_Pidgin.mdwn
index a17f69c..0aa416d 100644
--- a/wiki/src/blueprint/replace_Pidgin.mdwn
+++ b/wiki/src/blueprint/replace_Pidgin.mdwn
@@ -7,6 +7,12 @@ The document can also list candidate clients together with some indication where
TODO: Would a pair of two separate client (XMPP and IRC) also be okay, or are we only looking for a single client that can do both?
# Requirements
+
+**Note**: the key words "MUST", "MUST NOT", "REQUIRED", "SHALL",
+"SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
+"OPTIONAL" in this document are to be interpreted as described in
+[RFC 2119](http://www.ietf.org/rfc/rfc2119.txt).
+
## General requirements
### Documentation
@@ -39,13 +45,28 @@ Ideally, some usability study for the OTR user interface has been done.
TODO: Pidgin already has an apparmor profile; should we require that a replacement also comes with an apparmor profile?
+The client MUST NOT save logs of conversations.
+
## XMPP (Jabber)
+
+ *( Here is a [list](https://developer.pidgin.im/wiki/SupportedXEPs) of XMPP extensions supported by Pidgin )*
+
+### MUC
+The client must support XMPP conference rooms [(XEP-0045)](https://xmpp.org/extensions/xep-0045.html).
+
## IRC
### SASL
The client must support SASL authentication.
# Candidate alternatives
-## Tor Messenger
+## Tor Messenger ([[!tails_ticket 8577]])
+
+* Documentation, downloads and tickets in Tor's [Trac](https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger)
+* Tor Messenger supports XMPP, IRC and some other protocols.
+
+## CoyIM (based on xmpp-client) ([[!tails_ticket 8574]])
-## xmpp-client
+* [Homepage](https://coy.im/)
+* [Github](https://github.com/twstrike/coyim/)
+* CoyIM only supports XMPP.
diff --git a/wiki/src/blueprint/report_2015_12.mdwn b/wiki/src/blueprint/report_2015_12.mdwn
index 936d748..d65850f 100644
--- a/wiki/src/blueprint/report_2015_12.mdwn
+++ b/wiki/src/blueprint/report_2015_12.mdwn
@@ -66,9 +66,9 @@ FIXME
Metrics
=======
-* Tails has been started more than FIXME times this month. This makes FIXME boots a day on average.
+* Tails has been started more than 546366 times this month. This makes 17625 boots a day on average.
-* FIXME downloads of the OpenPGP signature of Tails ISO from our website.
+* 35853 downloads of the OpenPGP signature of Tails ISO from our website.
* FIXME bug reports were received through WhisperBack.
diff --git a/wiki/src/contribute/how/documentation.mdwn b/wiki/src/contribute/how/documentation.mdwn
index 6bf40ae..a40f900 100644
--- a/wiki/src/contribute/how/documentation.mdwn
+++ b/wiki/src/contribute/how/documentation.mdwn
@@ -48,6 +48,28 @@ We recommend you to [[build an offline version of the
documentation|contribute/build/website]] to test your contributions
before sharing them with us.
+# Tools
+
+ - Images on our website are compressed and cleaned using the
+ [[compress-image.sh]] script. To run this script you need the
+ `optipng`, `advancecomp`, and `mat` packages.
+
+ - To encode and decode QR codes, you can use the [[qrcode-encode.sh]]
+ and [[qrcode-decode.sh]] scripts. To run these scripts
+ you need to install the `qrencode` and `zbar-tools` packages.
+
+ For example:
+
+ qrcode-encode https://tails.boum.org/
+
+ Creates a QR code in tails_boum_org.png. And:
+
+ qrcode-decode tails_boum_org.png
+
+ Outputs:
+
+ QR-Code:https://tails.boum.org/
+
# Translating
We want Tails [[end-user documentation|doc]] to be translated in
diff --git a/wiki/src/contribute/how/documentation/compress-image.sh b/wiki/src/contribute/how/documentation/compress-image.sh
index 254ae57..44b6ea4 100755
--- a/wiki/src/contribute/how/documentation/compress-image.sh
+++ b/wiki/src/contribute/how/documentation/compress-image.sh
@@ -1,8 +1,25 @@
#!/bin/bash
-# To run this script in Debian, install the packages 'optipng' and 'advancecomp'.
+set -e
+set -u
-for image in $* ; do
- optipng -o6 $image
- advdef -z3 $image
+if [ ! -x /usr/bin/optipng ]; then
+ echo "Please install the \"optipng\" package." >&2
+ exit 1
+fi
+
+if [ ! -x /usr/bin/advdef ]; then
+ echo "Please install the \"advancecomp\" package." >&2
+ exit 1
+fi
+
+if [ ! -x /usr/bin/mat ]; then
+ echo "Please install the \"mat\" package." >&2
+ exit 1
+fi
+
+for image in "${@}" ; do
+ optipng -o6 "${image}"
+ advdef -z3 "${image}"
+ mat "${image}"
done
diff --git a/wiki/src/contribute/how/documentation/qrcode-decode.sh b/wiki/src/contribute/how/documentation/qrcode-decode.sh
new file mode 100755
index 0000000..c841c0c
--- /dev/null
+++ b/wiki/src/contribute/how/documentation/qrcode-decode.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+set -u
+
+if [ ! -x /usr/bin/zbarimg ]; then
+ echo "Please install the \"zbar-tools\" package." >&2
+ exit 1
+fi
+
+for code in "${@}" ; do
+ echo "${code}"
+ zbarimg "${code}"
+done
diff --git a/wiki/src/contribute/how/documentation/qrcode-encode.sh b/wiki/src/contribute/how/documentation/qrcode-encode.sh
new file mode 100755
index 0000000..03798f5
--- /dev/null
+++ b/wiki/src/contribute/how/documentation/qrcode-encode.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+set -u
+
+if [ ! -x /usr/bin/qrencode ]; then
+ echo "Please install the \"qrencode\" package." >&2
+ exit 1
+fi
+
+for code in "${@}" ; do
+ file="$(echo "${code}" | sed -r "s#http(s)?://##;s#/\$##;s#[/\.]#_#g")"
+ qrencode -o "${file}.png" -s 5 "${code}"
+ "$(dirname "${0}")/compress-image.sh" "${file}.png"
+done
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index a7bec25..126828f 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -790,7 +790,7 @@ Update the size of the ISO image in `inc/*`:
Generate the expected signature verification output:
- gpg --keyid-format long --verify "${ISO_PATH}.sig" "${ISO_PATH}" 2>&1 | \
+ gpg --keyid-format 0xlong --verify "${ISO_PATH}.sig" "${ISO_PATH}" 2>&1 | \
sed 's/ /\&nbsp;/g;s/</\&lt;/;s/>/\&gt;/;s/$/<br\/>/g' > \
"$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_gpg_signature_output.html"
diff --git a/wiki/src/contribute/release_process/tails-installer.mdwn b/wiki/src/contribute/release_process/tails-installer.mdwn
index 6961480..dea76ea 100644
--- a/wiki/src/contribute/release_process/tails-installer.mdwn
+++ b/wiki/src/contribute/release_process/tails-installer.mdwn
@@ -227,3 +227,21 @@ Example for a backport to Jessie:
* build, test and upload to jessie-backports
* have gbp create a `debian/4.3+dfsg-1_bpo8+1` tag
* push the Debian packaging branch (`debian/jessie-backports`) and the new tag
+
+### Quality assurance
+
+ Scenario: Installing Tails to a pristine USB drive
+ Given I have started Debian
+ And I have a Tails ISO image
+ When I install the tails-installer package
+ And I plug USB drive "install"
+ And I ask Tails Installer to install my Tails ISO image to USB drive "install"
+ Then my Tails ISO image is installed on USB drive "install"
+
+ Scenario: Upgrading an old Tails USB installation from an ISO image
+ Given I have started Debian
+ And I have a Tails ISO image
+ When I install the tails-installer package
+ And I plug USB drive "upgrade" that has an old Tails installed
+ And I ask Tails installer to upgrade USB drive "upgrade" with my Tails ISO image
+ Then my Tails ISO image is installed on USB drive "upgrade"
diff --git a/wiki/src/doc/about/license.de.po b/wiki/src/doc/about/license.de.po
index 3fa6255..4686611 100644
--- a/wiki/src/doc/about/license.de.po
+++ b/wiki/src/doc/about/license.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails Translation\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-01-21 20:21+0100\n"
"PO-Revision-Date: 2015-05-16 22:27+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translation <tails-l10n@boum.org>\n"
@@ -60,7 +60,31 @@ msgstr ""
"lizenz- oder markenrechtlich geschützt sind:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#| " by Ilsur Aptukov from the Noun Project.\n"
+#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#| "project is authorized to use it under certain conditions; licensed under\n"
+#| "Creative Commons Attribution 3.0 United States License.\n"
+#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#| " Creative Commons - Attribution, by Olivier Guin.\n"
+#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
+#| " Attribution, by Azis.\n"
+#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
+#| " Attribution, by factor[e] design initiative.\n"
+#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
+#| " Rohith M S.\n"
+#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
+#| " Attribution, by Edward Boatman.\n"
+#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
+#| " Commons — Attribution, by Joe Mortell.\n"
+#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
+#| " Attribution, by Cris Dobbins.\n"
+#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#| " Creative Commons — Attribution, by Cornelius Danger.\n"
msgid ""
" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" by Ilsur Aptukov from the Noun Project.\n"
@@ -71,20 +95,28 @@ msgid ""
" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, by Cris Dobbins.\n"
+" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+" Creative Commons — Attribution, by Azis.\n"
+" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+" Creative Commons — Attribution, by factor[e] design initiative.\n"
+" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+" Public Domain, by Rohith M S.\n"
+" - [[User|http://thenounproject.com/term/user/419/]]:\n"
+" Creative Commons — Attribution, by Edward Boatman.\n"
+" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+" Creative Commons — Attribution, by Joe Mortell.\n"
+" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+" Creative Commons — Attribution, by Cris Dobbins.\n"
" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, by Cornelius Danger.\n"
+" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+" Public Domain, by Julian Norton.\n"
+" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+" Creative Commons — Attribution, by Kervin Markle.\n"
+" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+" Creative Commons — Attribution, by Zech Nelson.\n"
+" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+" Creative Commons — Attribution, by Zech Nelson.\n"
msgstr ""
" - Das Tails-Logo basiert auf [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" von Ilsur Aptukov von The Noun Project.\n"
diff --git a/wiki/src/doc/about/license.fa.po b/wiki/src/doc/about/license.fa.po
index 753a05e..d48cb73 100644
--- a/wiki/src/doc/about/license.fa.po
+++ b/wiki/src/doc/about/license.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-21 20:21+0100\n"
"PO-Revision-Date: 2015-10-21 10:59+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/license/"
@@ -62,7 +62,31 @@ msgstr ""
"و شرایط توزیع گوناگونی هستند:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#| " by Ilsur Aptukov from the Noun Project.\n"
+#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#| "project is authorized to use it under certain conditions; licensed under\n"
+#| "Creative Commons Attribution 3.0 United States License.\n"
+#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#| " Creative Commons - Attribution, by Olivier Guin.\n"
+#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
+#| " Attribution, by Azis.\n"
+#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
+#| " Attribution, by factor[e] design initiative.\n"
+#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
+#| " Rohith M S.\n"
+#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
+#| " Attribution, by Edward Boatman.\n"
+#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
+#| " Commons — Attribution, by Joe Mortell.\n"
+#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
+#| " Attribution, by Cris Dobbins.\n"
+#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#| " Creative Commons — Attribution, by Cornelius Danger.\n"
msgid ""
" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" by Ilsur Aptukov from the Noun Project.\n"
@@ -73,20 +97,28 @@ msgid ""
" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, by Cris Dobbins.\n"
+" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+" Creative Commons — Attribution, by Azis.\n"
+" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+" Creative Commons — Attribution, by factor[e] design initiative.\n"
+" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+" Public Domain, by Rohith M S.\n"
+" - [[User|http://thenounproject.com/term/user/419/]]:\n"
+" Creative Commons — Attribution, by Edward Boatman.\n"
+" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+" Creative Commons — Attribution, by Joe Mortell.\n"
+" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+" Creative Commons — Attribution, by Cris Dobbins.\n"
" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, by Cornelius Danger.\n"
+" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+" Public Domain, by Julian Norton.\n"
+" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+" Creative Commons — Attribution, by Kervin Markle.\n"
+" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+" Creative Commons — Attribution, by Zech Nelson.\n"
+" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+" Creative Commons — Attribution, by Zech Nelson.\n"
msgstr ""
" - نشان‌وارهٔ تیلز بر اساس [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" و توسط ایلسور آبتوکف از پروژهٔ Noun طراحی شده‌است.\n"
diff --git a/wiki/src/doc/about/license.fr.po b/wiki/src/doc/about/license.fr.po
index 86506ee..7ca5705 100644
--- a/wiki/src/doc/about/license.fr.po
+++ b/wiki/src/doc/about/license.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-01-21 20:21+0100\n"
"PO-Revision-Date: 2012-04-29 16:02+0100\n"
"Last-Translator: MR\n"
"Language-Team: \n"
@@ -63,20 +63,28 @@ msgid ""
" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, by Cris Dobbins.\n"
+" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+" Creative Commons — Attribution, by Azis.\n"
+" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+" Creative Commons — Attribution, by factor[e] design initiative.\n"
+" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+" Public Domain, by Rohith M S.\n"
+" - [[User|http://thenounproject.com/term/user/419/]]:\n"
+" Creative Commons — Attribution, by Edward Boatman.\n"
+" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+" Creative Commons — Attribution, by Joe Mortell.\n"
+" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+" Creative Commons — Attribution, by Cris Dobbins.\n"
" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, by Cornelius Danger.\n"
+" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+" Public Domain, by Julian Norton.\n"
+" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+" Creative Commons — Attribution, by Kervin Markle.\n"
+" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+" Creative Commons — Attribution, by Zech Nelson.\n"
+" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+" Creative Commons — Attribution, by Zech Nelson.\n"
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/about/license.mdwn b/wiki/src/doc/about/license.mdwn
index 5016e13..9e8ceb2 100644
--- a/wiki/src/doc/about/license.mdwn
+++ b/wiki/src/doc/about/license.mdwn
@@ -23,20 +23,28 @@ Creative Commons Attribution 3.0 United States License.
- Icons from [[The Noun Project|http://thenounproject.com/]]:
- [[Announcement|http://thenounproject.com/term/announcement/1186/]]:
Creative Commons - Attribution, by Olivier Guin.
- - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —
- Attribution, by Azis.
- - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —
- Attribution, by factor[e] design initiative.
- - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by
- Rohith M S.
- - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —
- Attribution, by Edward Boatman.
- - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative
- Commons — Attribution, by Joe Mortell.
- - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —
- Attribution, by Cris Dobbins.
+ - [[Code|http://thenounproject.com/term/code/18033/]]:
+ Creative Commons — Attribution, by Azis.
+ - [[Pen|http://thenounproject.com/term/pen/18907/]]:
+ Creative Commons — Attribution, by factor[e] design initiative.
+ - [[Loan|http://thenounproject.com/term/loan/19538/]]:
+ Public Domain, by Rohith M S.
+ - [[User|http://thenounproject.com/term/user/419/]]:
+ Creative Commons — Attribution, by Edward Boatman.
+ - [[Translation|http://thenounproject.com/term/translation/5735/]]:
+ Creative Commons — Attribution, by Joe Mortell.
+ - [[Gears|http://thenounproject.com/term/gears/8949/]]:
+ Creative Commons — Attribution, by Cris Dobbins.
- [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:
Creative Commons — Attribution, by Cornelius Danger.
+ - [[Check Mark|https://thenounproject.com/term/check/4489/]]:
+ Public Domain, by Julian Norton.
+ - [[Delete|https://thenounproject.com/term/delete/49691/]]:
+ Creative Commons — Attribution, by Kervin Markle.
+ - [[Play|https://thenounproject.com/term/play/152052]]:
+ Creative Commons — Attribution, by Zech Nelson.
+ - [[Pause|https://thenounproject.com/term/pause/152046]]:
+ Creative Commons — Attribution, by Zech Nelson.
Distribution of the source code
===============================
diff --git a/wiki/src/doc/about/license.pt.po b/wiki/src/doc/about/license.pt.po
index 86b7b42..3fdc027 100644
--- a/wiki/src/doc/about/license.pt.po
+++ b/wiki/src/doc/about/license.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-01-21 20:21+0100\n"
"PO-Revision-Date: 2014-05-23 12:05-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,31 @@ msgstr ""
"marcas e termos de distribuição:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#| " by Ilsur Aptukov from the Noun Project.\n"
+#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#| "project is authorized to use it under certain conditions; licensed under\n"
+#| "Creative Commons Attribution 3.0 United States License.\n"
+#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#| " Creative Commons - Attribution, by Olivier Guin.\n"
+#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
+#| " Attribution, by Azis.\n"
+#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
+#| " Attribution, by factor[e] design initiative.\n"
+#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
+#| " Rohith M S.\n"
+#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
+#| " Attribution, by Edward Boatman.\n"
+#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
+#| " Commons — Attribution, by Joe Mortell.\n"
+#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
+#| " Attribution, by Cris Dobbins.\n"
+#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#| " Creative Commons — Attribution, by Cornelius Danger.\n"
msgid ""
" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" by Ilsur Aptukov from the Noun Project.\n"
@@ -63,20 +87,28 @@ msgid ""
" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, by Cris Dobbins.\n"
+" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+" Creative Commons — Attribution, by Azis.\n"
+" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+" Creative Commons — Attribution, by factor[e] design initiative.\n"
+" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+" Public Domain, by Rohith M S.\n"
+" - [[User|http://thenounproject.com/term/user/419/]]:\n"
+" Creative Commons — Attribution, by Edward Boatman.\n"
+" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+" Creative Commons — Attribution, by Joe Mortell.\n"
+" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+" Creative Commons — Attribution, by Cris Dobbins.\n"
" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, by Cornelius Danger.\n"
+" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+" Public Domain, by Julian Norton.\n"
+" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+" Creative Commons — Attribution, by Kervin Markle.\n"
+" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+" Creative Commons — Attribution, by Zech Nelson.\n"
+" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+" Creative Commons — Attribution, by Zech Nelson.\n"
msgstr ""
" - O logotipo do Tails logo é baseado em [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" por Ilsur Aptukov do Noun Project.\n"
diff --git a/wiki/src/doc/anonymous_internet/i2p.de.po b/wiki/src/doc/anonymous_internet/i2p.de.po
index 618a838..6122606 100644
--- a/wiki/src/doc/anonymous_internet/i2p.de.po
+++ b/wiki/src/doc/anonymous_internet/i2p.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails Translations\n"
"POT-Creation-Date: 2015-10-30 11:35+0100\n"
-"PO-Revision-Date: 2015-04-25 23:30+0100\n"
-"Last-Translator: spriver <spriver@autistici.org>\n"
+"PO-Revision-Date: 2015-11-09 12:35+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.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -22,17 +22,6 @@ msgid "[[!meta title=\"Using I2P\"]]\n"
msgstr "[[!meta title=\"I2P benutzen\"]]\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "[I2P](https://geti2p.net/) is an alternative anonymity network to Tor "
-#| "which supports most common Internet activities like web browsing, email, "
-#| "filesharing etc. Unlike Tor, whose main focus arguably is on accessing "
-#| "sites from the \"normal\" Internet, I2P is more oriented towards being a "
-#| "closed [[!wikipedia darknet]], separate from the \"normal\" Internet. Any "
-#| "one running I2P can run an anonymous server, a so called Eepsite, that is "
-#| "only accessible within I2P using the `.i2p` top level domain (similar to "
-#| "`.onion` for Tor hidden services). For instance, the I2P homepage can "
-#| "also be accessed through I2P via <http://i2p-projekt.i2p>."
msgid ""
"[I2P](https://geti2p.net/) is an alternative anonymity network to Tor which "
"supports most common Internet activities like web browsing, email, "
@@ -59,17 +48,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
msgid "<p>I2P doesn't go through Tor.</p>\n"
-msgstr ""
+msgstr "<p>I2P läuft nicht über Tor.</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Title =
#, no-wrap
@@ -115,13 +104,6 @@ msgstr ""
" <span class=\"guimenuitem\">I2P Browser</span></span>.\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "The router console shows I2P's current status, links to many useful I2P "
-#| "resources (forums, email, filesharing, etc.) and offers the possibility "
-#| "to shutdown I2P. Starting with Tails 1.2, `.i2p` addresses are only "
-#| "accessible from within I2P Browser. Internet resources cannot be reached "
-#| "from within I2P Browser."
msgid ""
"The router console shows I2P's current status, links to many useful I2P "
"resources (forums, email, filesharing, etc.) and offers the possibility to "
diff --git a/wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po b/wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po
index cae9d0b..e31aad1 100644
--- a/wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po
+++ b/wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2015-02-21 17:16+0100\n"
-"PO-Revision-Date: 2014-07-22 12:39+0100\n"
-"Last-Translator: Tails developers <tails@boum.org>\n"
+"PO-Revision-Date: 2015-11-06 15:44+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.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.6\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -43,33 +43,25 @@ msgid ""
"connecting directly to the destination server, a connection is made between "
"each relay of the circuit and this takes more time."
msgstr ""
-"Tor bietet Anonymität durch Aufbauen einer Route durch drei Relays. Statt "
+"Tor bietet Anonymität durch Aufbauen einer Route durch drei Relais. Statt "
"sich also direkt mit dem Zielserver zu verbinden, wird eine Verbindung "
-"zwischen jedem Relay der Route aufgebaut, was mehr Zeit benötigt."
+"zwischen jedem Relais der Route aufgebaut, was mehr Zeit benötigt."
#. type: Plain text
msgid ""
"Furthermore, Tor tries to build circuits with relays in different countries "
"which make connection travel more and appear slower."
msgstr ""
-"Zudem versucht Tor, Routen über Relays herzustellen, die sich in "
+"Zudem versucht Tor, Routen über Relais herzustellen, die sich in "
"verschiedenen Ländern befinden. Dadurch wird die Strecke länger und die "
"Verbindung langsamer."
#. type: Title =
#, no-wrap
msgid "Quality of the relays\n"
-msgstr "Qualität der Relays\n"
+msgstr "Qualität der Relais\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "The Tor relays are run by volunteers in a decentralized way. So all "
-#| "relays are not of the same quality. Some are big and fast, while some "
-#| "others are smaller and slower. As a whole, the network could be faster it "
-#| "had more capacity. To improve the capacity of the Tor network, you can "
-#| "either run a Tor relay yourself or [help existing relays](https://www."
-#| "torservers.net/partners.html)."
msgid ""
"The Tor relays are run by volunteers in a decentralized way. So all relays "
"are not of the same quality. Some are big and fast, while some others are "
@@ -78,12 +70,12 @@ msgid ""
"Tor relay yourself or [help existing relays](https://www.torservers.net/"
"partners.html)."
msgstr ""
-"Tor-Relay Server werden von Freiwilligen in einer dezentralisierten Struktur "
-"betrieben. Aufgrund dessen haben nicht alle Server die gleiche Kapazität "
-"(Bandbreite). Manche sind groß und schnell, während andere kleiner und "
-"langsamer sind. Insgesamt würde das Netzwerk schneller sein, wenn es mehr "
-"Kapazität hätte. Um die Kapazität des Netzwerks zu erhöhen, können Sie "
-"selbst einen Tor-Relay betreiben oder [bestehenden Relays helfen](https://"
+"Tor-Relais Server werden von Freiwilligen in einer dezentralisierten "
+"Struktur betrieben. Aufgrund dessen haben nicht alle Server die gleiche "
+"Kapazität (Bandbreite). Manche sind groß und schnell, während andere kleiner "
+"und langsamer sind. Insgesamt würde das Netzwerk schneller sein, wenn es "
+"mehr Kapazität hätte. Um die Kapazität des Netzwerks zu erhöhen, können Sie "
+"selbst einen Tor-Relais betreiben oder [bestehenden Relays helfen](https://"
"www.torservers.net/partners.html)."
#. type: Title =
@@ -106,7 +98,7 @@ msgstr ""
"Manche Nutzer missbrauchen das Tor-Netzwerk. Manche tun dies mit Absicht,\n"
"manche durch fehlendes Wissen. Beispielsweise wird Tor manchmal benutzt,\n"
"um [[!wikipedia_de Denial_of_Service desc=\"DDoS-Angriffe\"]] durchzuführen.\n"
-"Wenn dies getan wird, sind die Tor-Relays diejenigen, die unter solchen Angriffen leiden.\n"
+"Wenn dies getan wird, sind die Tor-Relais diejenigen, die unter solchen Angriffen leiden.\n"
"Manche Nutzer nutzen [[!wikipedia_de Peer-to-Peer desc=\"Peer-to-Peer Programme\"]]\n"
"über das Tor-Netzwerk, was ebenso schlecht für das Netzwerk ist. \n"
"Falls Sie Peer-to-Peer nutzen wollen, ist es besser, wenn Sie\n"
diff --git a/wiki/src/doc/encryption_and_privacy/truecrypt.de.po b/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
index 695b1c4..b68f71b 100644
--- a/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
+++ b/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
@@ -5,22 +5,21 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2014-12-04 17:21+0100\n"
-"PO-Revision-Date: 2014-04-06 12:10+0100\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2016-01-23 13:52+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@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"
+"X-Generator: Poedit 1.8.6\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta title=\"TrueCrypt\"]]\n"
+#, no-wrap
msgid "[[!meta title=\"Opening TrueCrypt volumes using cryptsetup\"]]\n"
-msgstr "[[!meta title=\"TrueCrypt\"]]\n"
+msgstr "[[!meta title=\"TrueCrypt Laufwerke mit cryptsetup öffnen\"]]\n"
#. type: Plain text
msgid ""
@@ -28,21 +27,25 @@ msgid ""
"announced that the project was no longer maintained and recommended users to "
"find alternate solutions. That website now reads:"
msgstr ""
+"Am 28. Mai 2014 wurde auf der [*TrueCrypt* Website](http://truecrypt."
+"sourceforge.net/) bekanntgegeben, dass das Projekt nicht länger betreut "
+"werden würde und Nutzern empfohlen wird, alternative Lösungen zu nutzen. Auf "
+"der Website steht jetzt:"
#. type: Plain text
#, no-wrap
msgid "> WARNING: Using TrueCrypt is not secure as it may contain unfixed security issues.\n"
-msgstr ""
+msgstr "> WARNUNG: Die Benutzung von TrueCrypt ist nicht sicher, da es unbehobene Sicherheitslücken enthalten könnte.\n"
#. type: Plain text
#, no-wrap
msgid "*TrueCrypt* was removed in Tails 1.2.1.\n"
-msgstr ""
+msgstr "*TrueCrypt* wurde in Tails 1.2.1. entfernt\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
-msgstr ""
+msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
@@ -51,22 +54,27 @@ msgid ""
"volumes|/doc/encryption_and_privacy/encrypted_volumes]] instead of <span class=\"application\">TrueCrypt</span>\n"
"volumes.</p>\n"
msgstr ""
+"<p>Wir empfehlen Ihnen, den [[verschlüsselten Speicherbereich für Tails|doc/first_steps/persistence]] oder [[verschlüsselte\n"
+"Laufwerke mit LUKS|/doc/encryption_and_privacy/encrypted_volumes]] anstatt <span class=\"application\">TrueCrypt</span>\n"
+"Laufwerke zu verwenden.</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
msgid ""
"Still, you can open standard and hidden *TrueCrypt* volumes in Tails using "
"the `cryptsetup` command line tool."
msgstr ""
+"Dennoch können Sie sowohl gewöhnliche und versteckte *TrueCrypt* Laufwerke "
+"in Tails unter Nutzung des `cryptsetup` Kommandozeilenwerkzeugs öffnen."
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
@@ -74,22 +82,19 @@ msgid ""
"<p>This technique might not work on volumes created with <em>TrueCrypt</em>\n"
"version 4.1 to 4.3 (November 2005 to March 2007).</p>\n"
msgstr ""
+"<p>Diese Vorgehensweise funktioniert möglicherweise nicht mit Laufwerken, die mit den <em>TrueCrypt</em>\n"
+"Versionen 4.1 bis 4.3 erstellt wurden (November 2005 bis März 2007).</p>\n"
#. type: Bullet: '1. '
msgid ""
"[[Set up an administration password|first_steps/startup_options/"
"administration_password]]."
msgstr ""
+"[[Setzen Sie ein Administrationspasswort|first_steps/startup_options/"
+"administration_password]]."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Once Tails has started, to start <span\n"
-#| "class=\"application\">TrueCrypt</span> choose\n"
-#| "<span class=\"menuchoice\">\n"
-#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-#| " <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-#| " <span class=\"guimenuitem\">TrueCrypt</span></span>.\n"
+#, no-wrap
msgid ""
"1. Choose\n"
" <span class=\"menuchoice\">\n"
@@ -99,13 +104,13 @@ msgid ""
" </span>\n"
" to open a terminal with administration rights.\n"
msgstr ""
-"Sobald Tails gestartet ist, können Sie <span\n"
-"class=\"application\">TrueCrypt</span> starten, indem Sie\n"
-"<span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Zubehör</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">TrueCrypt</span></span>\n"
-"auswählen.\n"
+"1. Wählen Sie\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Zubehör</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Root Terminal</span>\n"
+" </span>\n"
+" um ein Terminal mit Administrationsrechten zu öffnen.\n"
#. type: Bullet: '1. '
msgid ""
@@ -113,11 +118,15 @@ msgid ""
"command. Replace `[volume]` with the path to your volume (partition or file "
"container) and `[name]` with a name of your choice."
msgstr ""
+"**Wenn Sie ein übliches *TrueCrypt* Laufwerk öffnen möchten**, führen Sie "
+"den folgenden Befehl aus. Ersetzen Sie `[volume]` mit dem Pfad zu Ihren "
+"Laufwerk (Partition oder Dateicontainer) und `[name]` mit einem Namen Ihrer "
+"Wahl."
#. type: Plain text
#, no-wrap
msgid " cryptsetup open --type tcrypt [volume] [name]\n"
-msgstr ""
+msgstr " cryptsetup open --type tcrypt [volume] [name]\n"
#. type: Plain text
#, no-wrap
@@ -125,11 +134,13 @@ msgid ""
" Here is an example of the command to execute to open a standard volume in a file container, yours is probably\n"
" different:\n"
msgstr ""
+" Hier ist ein Beispiel des auszuführenden Befehls, um ein übliches Laufwerk in einem Dateicontainer zu öffnen, Ihrer ist möglicherweise\n"
+" anders:\n"
#. type: Plain text
#, no-wrap
msgid " cryptsetup open --type tcrypt /media/mydisk/mycontainer myvolume\n"
-msgstr ""
+msgstr " cryptsetup open --type tcrypt /media/mydisk/mycontainer myvolume\n"
#. type: Plain text
#, no-wrap
@@ -138,11 +149,14 @@ msgid ""
" the following command. Replace `[volume]` with the path to your volume\n"
" (partition or file container) and `[name]` with a name of your choice.\n"
msgstr ""
+" **Wenn Sie stattdessen ein verstecktes *TrueCrypt* Laufwerk öffnen möchten**, führen\n"
+" Sie den folgenden Befehl aus. Ersetzen Sie `[volume]` mit dem Pfad zu Ihrem Laufwerk\n"
+" (Partition oder Dateicontainer) und `[name]` mit einem Namen Ihrer Wahl.\n"
#. type: Plain text
#, no-wrap
msgid " cryptsetup --tcrypt-hidden open --type tcrypt [volume] [name]\n"
-msgstr ""
+msgstr " cryptsetup --tcrypt-hidden open --type tcrypt [volume] [name]\n"
#. type: Plain text
#, no-wrap
@@ -150,11 +164,13 @@ msgid ""
" Here is an example of the command to execute to open a hidden volume on a partition, yours is probably\n"
" different:\n"
msgstr ""
+" Hier ist ein Beispiel des auszuführenden Befehls, um ein verstecktes Laufwerk auf einer Partition zu öffnen, Ihrer ist\n"
+" möglicherweise anders:\n"
#. type: Plain text
#, no-wrap
msgid " cryptsetup --tcrypt-hidden open --type tcrypt /dev/sdc1 myhidden\n"
-msgstr ""
+msgstr " cryptsetup --tcrypt-hidden open --type tcrypt /dev/sdc1 myhidden\n"
#. type: Bullet: '1. '
msgid ""
@@ -162,37 +178,42 @@ msgid ""
"the following commands to mount the volume. Replace `[name]` with the name "
"chosen in step&nbsp;3."
msgstr ""
+"Führen Sie die folgenden Befehle aus, nachdem Sie Ihr Kennwort eingegeben "
+"haben und die Eingabeaufforderung wieder erscheint. Ersetzen Sie `[name]` "
+"mit dem im dritten Schritt gewählten Namen."
#. type: Plain text
#, no-wrap
msgid " mkdir /media/[name]\n"
-msgstr ""
+msgstr " mkdir /media/[name]\n"
#. type: Plain text
#, no-wrap
msgid " a. And, if your volume contains a **NTFS or FAT file system** (default):\n"
-msgstr ""
+msgstr " a. Und wenn Ihr Laufwerk ein **NTFS or FAT Dateisystem** enthält (Standard):\n"
#. type: Plain text
#, no-wrap
msgid " mount -o uid=1000 /dev/mapper/[name] /media/[name]\n"
-msgstr ""
+msgstr " mount -o uid=1000 /dev/mapper/[name] /media/[name]\n"
#. type: Plain text
#, no-wrap
msgid " a. Else, if your volume contains an **Ext2, Ext3, or Ext4 file system**:\n"
-msgstr ""
+msgstr " a. Oder wenn Ihr Laufwerk ein **Ext2, Ext3, or Ext4 Dateisystem** enthält:\n"
#. type: Plain text
#, no-wrap
msgid " mount /dev/mapper/[name] /media/[name]\n"
-msgstr ""
+msgstr " mount /dev/mapper/[name] /media/[name]\n"
#. type: Bullet: '1. '
msgid ""
"If you don't see any error message, the volume is now available from the "
"<span class=\"guimenu\">Places</span> menu."
msgstr ""
+"Wenn Sie keine Fehlermeldungen sehen, ist das Laufwerk nun in dem <span "
+"class=\"guimenu\">Orte</span>-Menü verfügbar."
#. type: Bullet: '1. '
msgid ""
@@ -200,6 +221,10 @@ msgid ""
"commands to safely remove it. Otherwise some of your files could be lost or "
"damaged. Replace `[name]`with the mapping name chosen in step&nbsp;3."
msgstr ""
+"Wenn Sie Ihr *TrueCrypt* Laufwerk schließen möchten, führen Sie folgenden "
+"Befehl aus, um es sicher zu entfernen. Anderenfalls könnten einige Ihrer "
+"Dateien verloren gehen oder beschädigt werden. Ersetzen Sie `[name]` mit dem "
+"zugeordneten Namen, den Sie im dritten Schritt ausgewählt haben."
#. type: Plain text
#, no-wrap
@@ -207,6 +232,8 @@ msgid ""
" umount /media/[name]\n"
" cryptsetup close [name]\n"
msgstr ""
+" umount /media/[name]\n"
+" cryptsetup close [name]\n"
#~ msgid "Security considerations\n"
#~ msgstr "Sicherheitsbedenken\n"
diff --git a/wiki/src/doc/first_steps/shutdown.de.po b/wiki/src/doc/first_steps/shutdown.de.po
index 2cb0418..04e8b1b 100644
--- a/wiki/src/doc/first_steps/shutdown.de.po
+++ b/wiki/src/doc/first_steps/shutdown.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2014-09-15 01:22+0300\n"
-"PO-Revision-Date: 2014-09-13 20:41+0100\n"
-"Last-Translator: Tails developers <tails@boum.org>\n"
+"PO-Revision-Date: 2015-11-06 15:20+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.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.6\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -55,17 +55,17 @@ msgstr ""
"gestartet wurde"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "<div class=\"bug\">\n"
+#, no-wrap
msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"bug\">\n"
+msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
msgid ""
"<p>This method might in rare occasions break the file system of your persistent\n"
"volume. <strong>Use this method only in case of emergency.</strong></p>\n"
-msgstr "<p>Diese Methode kann in einigen raren Fällen das Dateisystem Ihres beständigen\n"
+msgstr ""
+"<p>Diese Methode kann in einigen raren Fällen das Dateisystem Ihres beständigen\n"
"Datenträgers beschädigen. <strong>Benutzen Sie diese Methode nur im Notfall.</strong></p>\n"
#. type: Plain text
@@ -73,7 +73,8 @@ msgstr "<p>Diese Methode kann in einigen raren Fällen das Dateisystem Ihres bes
msgid ""
"<p>Using the [[<span class=\"guilabel\">read-only</span> option|persistence/use]]\n"
"of the persistent volume prevents this problem.</p>\n"
-msgstr "<p>Das Aktivieren der [[<span class=\"guilabel\">Nur-lesen</span> Option|persistence/use]]\n"
+msgstr ""
+"<p>Das Aktivieren der [[<span class=\"guilabel\">Nur-lesen</span> Option|persistence/use]]\n"
"des beständigen Datenträgers vermeidet dieses Problem.</p>\n"
#. type: Plain text
@@ -82,7 +83,8 @@ msgid ""
"<p>If you cannot enable persistence after using this method, you should be able\n"
"to recover most of your data by doing a [[file system check on the persistent\n"
"volume|persistence/check_file_system]].</p>\n"
-msgstr "<p>Sollten Sie den beständigen Datenträger nicht mehr aktivieren können, nachdem\n"
+msgstr ""
+"<p>Sollten Sie den beständigen Datenträger nicht mehr aktivieren können, nachdem\n"
"Sie diese Methode benutzt haben. können Sie Ihre Daten sehr wahrscheinlich wiederherstellen,\n"
"indem Sie das [[Dateisystem des beständigen Datenträgers überprüfen|persistence/check_the_file_system]].\n"
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.de.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.de.po
index bb23c50..2d7d3ce 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.de.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: TAILS\n"
"POT-Creation-Date: 2015-10-30 11:35+0100\n"
-"PO-Revision-Date: 2015-02-12 19:00+0100\n"
-"Last-Translator: Tails developers <tails@boum.org>\n"
+"PO-Revision-Date: 2015-11-06 15:21+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Translations <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"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -95,22 +95,16 @@ msgstr ""
"was Bridges sind."
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "In order to use bridges, you must know in advance the address of at least "
-#| "one bridge. The Tor Project distributes bridge addresses in several ways, "
-#| "for example from their [website](https://bridges.torproject.org/) and via "
-#| "email."
msgid ""
"In order to use Tor through bridges, you must know the address of at least "
"one bridge in advance. The Tor Project distributes bridge addresses in "
"several ways, for example from their [website](https://bridges.torproject."
"org/) and via email."
msgstr ""
-"Um Bridges zu benutzen, müssen Sie im Vorfeld eine Adresse von zumindest "
-"einer Bridge kennen. Das Tor Projekt verteilt diese auf verschiedenste Art "
-"und Weise, beispielsweise auf ihrer [Website](https://bridges.torproject."
-"org/) als auch über E-Mail."
+"Um Tor über Bridges zu benutzen, müssen Sie im Vorfeld eine Adresse von "
+"zumindest einer Bridge kennen. Das Tor Projekt verteilt diese auf "
+"verschiedenste Art und Weise, beispielsweise auf ihrer [Website](https://"
+"bridges.torproject.org/) als auch über E-Mail."
#. type: Plain text
#, no-wrap
@@ -165,32 +159,27 @@ msgstr "`obfs3`"
#. type: Bullet: ' - '
msgid "`obfs4`"
-msgstr ""
+msgstr "`obfs4`"
#. type: Bullet: ' - '
msgid "`ScrambleSuit`"
-msgstr ""
+msgstr "`ScrambleSuit`"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "To use bridges, choose to configure bridge settings from [[<span\n"
-#| "class=\"application\">Tails Greeter</span>|startup_options#tails_greeter]] as\n"
-#| "explained in the [[network configuration|network_configuration]] documentation.\n"
+#, no-wrap
msgid ""
"To use Tor through bridges, choose the bridge settings configuration option in [[<span\n"
"class=\"application\">Tails Greeter</span>|startup_options#tails_greeter]] as\n"
"explained in the [[network configuration|network_configuration]] documentation.\n"
msgstr ""
-"Um Bridges zu benutzen, konfigurieren Sie bitte die Bridge-Einstellungen vom [[<span\n"
+"Um Tor über Bridges zu benutzen, konfigurieren Sie bitte die Bridge-Einstellungen vom [[<span\n"
"class=\"application\">Tails Greeter</span>|startup_options#tails_greeter]], wie es in der \n"
"Dokumentation zur [[Netzwerkkonfiguration|network_configuration]] erklärt wird.\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "<div class=\"note\">\n"
+#, no-wrap
msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"note\">\n"
+msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
@@ -199,6 +188,9 @@ msgid ""
"relays of your Tor circuits in the [[Network Map of\n"
"<span class=\"application\">Vidalia</span>|/doc/anonymous_internet/vidalia#map]].</p>\n"
msgstr ""
+"<p>Nachdem Tor gestartet wurde, erscheinen die von Ihnen konfigurierten Bridges als die\n"
+"ersten Relais Ihrer Tor Kanäle auf der [[Netzwerkkarte von\n"
+"<span class=\"application\">Vidalia</span>|/doc/anonymous_internet/vidalia#map]].</p>\n"
#. type: Title =
#, no-wrap
@@ -206,14 +198,6 @@ msgid "If using Tor is dangerous in your country\n"
msgstr "Falls die Nutzung von Tor in Ihrem Land gefährlich ist\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "The Tor Project's [documentation on bridges](https://www.torproject.org/"
-#| "docs/bridges) mainly focuses on censorship circumvention, this means when "
-#| "the usage of Tor is blocked by censorship. If using Tor is dangerous or "
-#| "considered suspicious in your country, then there are some extra rules "
-#| "that you should follow in order to prevent you from being identified as a "
-#| "Tor user."
msgid ""
"The Tor Project's [documentation on bridges](https://www.torproject.org/docs/"
"bridges) mainly focuses on censorship circumvention: when using Tor is "
@@ -234,11 +218,7 @@ msgid "<div class=\"caution\">\n"
msgstr "<div class=\"caution\">\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Bridges are important tools that work in many cases but <strong>they are\n"
-#| "not an absolute protection</strong> against the technical progress that\n"
-#| "an adversary could do to identify Tor users.\n"
+#, no-wrap
msgid ""
"Bridges are important tools that work in many cases but <strong>they are\n"
"not absolute protection</strong> against all techniques that\n"
@@ -275,14 +255,7 @@ msgstr ""
"perfekt zu sein."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " So the best is if you can find a trusted friend or\n"
-#| " an organisation in a different country who runs a \"private\" *obfuscated\n"
-#| " bridge* for you. In this case \"private\" means that the bridge is\n"
-#| " configured with the option `PublishServerDescriptor 0`. Without this option The Tor\n"
-#| " Project can learn about the bridge and may distribute its address to others\n"
-#| " and so it could end up in the hands of your adversary.\n"
+#, no-wrap
msgid ""
" So the best is if you can find a trusted friend or\n"
" an organisation in a different country who runs a \"private\" *obfuscated\n"
@@ -291,9 +264,9 @@ msgid ""
" Project will learn about the bridge and may distribute its address to others\n"
" and so it could end up in the hands of your adversary.\n"
msgstr ""
-" Deswegen ist es am Besten, wenn Sie einen Freund oder eine Organistation in einem anderen Land finden, denen Sie vertrauen, die eine \"private\" *verschleierte\n"
-" Bridge* für Sie betreiben. In diesem Falle bedeutet \"privat\", dass die Bridge mit der Option `PublishServerDescriptor 0` konfiguriert ist. \n"
-" Ohne diese Option erhält das Tor Projekt Informationen über diese Bridge und kann die Adresse weitergeben, \n"
+" Deswegen ist es am Besten, wenn Sie einen Freund oder eine Organisation in einem anderen Land finden, denen Sie vertrauen, die eine \"private\", *verschleierte\n"
+" Bridge* für Sie betreiben. In diesem Falle bedeutet \"privat\", dass die Bridge mit der Option `PublishServerDescriptor 0` konfiguriert ist.\n"
+" Ohne diese Option erhält das Tor Projekt Informationen über diese Bridge und kann die Adresse weitergeben,\n"
" wodurch sie in die Hände eines Angreifers geraten könnte.\n"
#, fuzzy
diff --git a/wiki/src/doc/first_steps/startup_options/offline_mode.de.po b/wiki/src/doc/first_steps/startup_options/offline_mode.de.po
index 247c421..e92cb9a 100644
--- a/wiki/src/doc/first_steps/startup_options/offline_mode.de.po
+++ b/wiki/src/doc/first_steps/startup_options/offline_mode.de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-10-26 23:57+0100\n"
-"PO-Revision-Date: 2015-10-27 18:29+0100\n"
+"PO-Revision-Date: 2015-11-12 19:45+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: de\n"
@@ -55,4 +55,5 @@ msgid ""
"the <span class=\"guilabel\">Disable all networking</span> option."
msgstr ""
"Wählen Sie in dem Bereich <span class=\"guilabel\">Netzwerkeinstellungen</"
-"span> die Option <span class=\"guilabel\">Disable all networking</span> aus."
+"span> die Option <span class=\"guilabel\">Alle Netzwerkfunktionen "
+"deaktivieren</span> aus."
diff --git a/wiki/src/inc/release_notes/1.8.2.de.po b/wiki/src/inc/release_notes/1.8.2.de.po
index 7367ee9..58724ec 100644
--- a/wiki/src/inc/release_notes/1.8.2.de.po
+++ b/wiki/src/inc/release_notes/1.8.2.de.po
@@ -3,26 +3,28 @@
# 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: \n"
"POT-Creation-Date: 2016-01-09 22:27+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2016-01-15 22:22+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \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"
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
-msgstr ""
+msgstr "Aktualisierungen und Änderungen"
#. type: Plain text
msgid ""
"- Upgrade Tor Browser to [5.0.7](https://blog.torproject.org/blog/tor-"
"browser-507-released)"
msgstr ""
+"- Aktualisierung von Tor Browser auf [5.0.7](https://blog.torproject.org/"
+"blog/tor-browser-507-released)"
diff --git a/wiki/src/install/debian.de.po b/wiki/src/install/debian.de.po
index 346f4b6..43ff7e5 100644
--- a/wiki/src/install/debian.de.po
+++ b/wiki/src/install/debian.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,16 +18,16 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Ubuntu\"]] [[!meta stylesheet="
-"\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/router-debian\" rel=\"stylesheet\" title=\"\"]] [[!inline "
-"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
-"[[<span class=\"back\">Back</span>|install/os]]"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Debian or Ubuntu (Linux Mint, "
+"etc.)\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] "
+"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-debian\" rel=\"stylesheet"
+"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/os]]"
msgstr ""
#. type: Content of: <h1>
-msgid "<strong>Ubuntu</strong>"
+msgid "<strong>Debian or Ubuntu</strong> <small>(Linux Mint, etc.)</small>"
msgstr ""
#. type: Content of: <div><div>
@@ -56,12 +56,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "25 minutes to install"
+msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
@@ -69,7 +69,7 @@ msgid "[["
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Install from Ubuntu"
+msgid "Install from Debian or Ubuntu"
msgstr ""
#. type: Content of: <div><div>
@@ -77,7 +77,7 @@ msgid "|debian/usb/overview]] [["
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "<small>Install from Ubuntu using the</small>"
+msgid "<small>Install from Debian or Ubuntu using the</small>"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
diff --git a/wiki/src/install/debian.fa.po b/wiki/src/install/debian.fa.po
index 7172229..43ff7e5 100644
--- a/wiki/src/install/debian.fa.po
+++ b/wiki/src/install/debian.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,16 +18,16 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Ubuntu\"]] [[!meta stylesheet="
-"\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/router-debian\" rel=\"stylesheet\" title=\"\"]] [[!inline "
-"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
-"[[<span class=\"back\">Back</span>|install/os]]"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Debian or Ubuntu (Linux Mint, "
+"etc.)\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] "
+"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-debian\" rel=\"stylesheet"
+"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/os]]"
msgstr ""
#. type: Content of: <h1>
-msgid "<strong>Ubuntu</strong>"
+msgid "<strong>Debian or Ubuntu</strong> <small>(Linux Mint, etc.)</small>"
msgstr ""
#. type: Content of: <div><div>
@@ -56,12 +56,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "25 minutes to install"
+msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
@@ -69,7 +69,7 @@ msgid "[["
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Install from Ubuntu"
+msgid "Install from Debian or Ubuntu"
msgstr ""
#. type: Content of: <div><div>
@@ -77,7 +77,7 @@ msgid "|debian/usb/overview]] [["
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "<small>Install from Ubuntu using the</small>"
+msgid "<small>Install from Debian or Ubuntu using the</small>"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
diff --git a/wiki/src/install/debian.fr.po b/wiki/src/install/debian.fr.po
index 346f4b6..43ff7e5 100644
--- a/wiki/src/install/debian.fr.po
+++ b/wiki/src/install/debian.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,16 +18,16 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Ubuntu\"]] [[!meta stylesheet="
-"\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/router-debian\" rel=\"stylesheet\" title=\"\"]] [[!inline "
-"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
-"[[<span class=\"back\">Back</span>|install/os]]"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Debian or Ubuntu (Linux Mint, "
+"etc.)\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] "
+"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-debian\" rel=\"stylesheet"
+"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/os]]"
msgstr ""
#. type: Content of: <h1>
-msgid "<strong>Ubuntu</strong>"
+msgid "<strong>Debian or Ubuntu</strong> <small>(Linux Mint, etc.)</small>"
msgstr ""
#. type: Content of: <div><div>
@@ -56,12 +56,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "25 minutes to install"
+msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
@@ -69,7 +69,7 @@ msgid "[["
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Install from Ubuntu"
+msgid "Install from Debian or Ubuntu"
msgstr ""
#. type: Content of: <div><div>
@@ -77,7 +77,7 @@ msgid "|debian/usb/overview]] [["
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "<small>Install from Ubuntu using the</small>"
+msgid "<small>Install from Debian or Ubuntu using the</small>"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
diff --git a/wiki/src/install/debian.html b/wiki/src/install/debian.html
index 2a90fb7..e1b3752 100644
--- a/wiki/src/install/debian.html
+++ b/wiki/src/install/debian.html
@@ -1,5 +1,4 @@
-[[!meta title="Ubuntu"]]
-
+[[!meta title="Debian or Ubuntu (Linux Mint, etc.)"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/router-debian" rel="stylesheet" title=""]]
@@ -8,7 +7,7 @@
[[<span class="back">Back</span>|install/os]]
-<h1 class="text-center"><strong>Ubuntu</strong></h1>
+<h1 class="text-center"><strong>Debian or Ubuntu</strong> <small>(Linux Mint, etc.)</small></h1>
<div id="scenarios" class="row">
<div class="col-md-6">
@@ -32,14 +31,14 @@
<ul>
<li>1 USB stick <small>(at least 4 GB)</small></li>
- <li>30&ndash;60 minutes to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
- <li>25 minutes to install</li>
+ <li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
+ <li>½ hour to install</li>
</ul>
[[
<div class="panel panel-primary">
<div class="panel-heading">
- <h3 class="panel-title">Install from Ubuntu</h3>
+ <h3 class="panel-title">Install from Debian or Ubuntu</h3>
</div>
</div>
|debian/usb/overview]]
@@ -47,7 +46,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
- <h3 class="panel-title"><small>Install from Ubuntu using the</small><br />command line <small> and </small> GnuPG</h3>
+ <h3 class="panel-title"><small>Install from Debian or Ubuntu using the</small><br />command line <small> and </small> GnuPG</h3>
</div>
</div>
|expert/usb/overview]]
diff --git a/wiki/src/install/debian.pt.po b/wiki/src/install/debian.pt.po
index 346f4b6..43ff7e5 100644
--- a/wiki/src/install/debian.pt.po
+++ b/wiki/src/install/debian.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,16 +18,16 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Ubuntu\"]] [[!meta stylesheet="
-"\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/router-debian\" rel=\"stylesheet\" title=\"\"]] [[!inline "
-"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
-"[[<span class=\"back\">Back</span>|install/os]]"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Debian or Ubuntu (Linux Mint, "
+"etc.)\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] "
+"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-debian\" rel=\"stylesheet"
+"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/os]]"
msgstr ""
#. type: Content of: <h1>
-msgid "<strong>Ubuntu</strong>"
+msgid "<strong>Debian or Ubuntu</strong> <small>(Linux Mint, etc.)</small>"
msgstr ""
#. type: Content of: <div><div>
@@ -56,12 +56,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "25 minutes to install"
+msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
@@ -69,7 +69,7 @@ msgid "[["
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Install from Ubuntu"
+msgid "Install from Debian or Ubuntu"
msgstr ""
#. type: Content of: <div><div>
@@ -77,7 +77,7 @@ msgid "|debian/usb/overview]] [["
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "<small>Install from Ubuntu using the</small>"
+msgid "<small>Install from Debian or Ubuntu using the</small>"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
diff --git a/wiki/src/install/debian/usb.de.po b/wiki/src/install/debian/usb.de.po
index 5881df0..df779df 100644
--- a/wiki/src/install/debian/usb.de.po
+++ b/wiki/src/install/debian/usb.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +23,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing Tails on a USB stick from Ubuntu\"]]\n"
+msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu\"]]\n"
msgstr ""
#. type: Plain text
@@ -68,7 +68,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Ubuntu.</p>\n"
+msgid "<p class=\"start\">Start in Debian or Ubuntu.</p>\n"
msgstr ""
#. type: Plain text
@@ -78,34 +78,94 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"next\"></a>\n"
+msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
+msgid "If you are running Debian\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
+#. type: Bullet: '1. '
+msgid "Make sure that you are connected to the Internet."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Start <span class=\"application\">Synaptic Package Manager</span>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>To know your version of Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>.</p>\n"
+"1. Choose\n"
+" <span class=\"guimenupath\">\n"
+" <span class=\"guimenu\">Settings</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Repositories</span></span>.\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
+#. type: Bullet: '1. '
+msgid ""
+"To add the *jessie-backports* repository, click <span class=\"button\">New</"
+"span> in the <span class=\"guilabel\">Repositories</span> dialog and specify:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">URI</span>: *http://http.debian.net/debian/*"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">Section(s)</span>: *main*"
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that you are connected to the Internet."
+msgid "Click <span class=\"button\">Ok</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the confirmation dialog, click <span class=\"guilabel\">Reload</span> and "
+"wait for the download of the package information to finish."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the main windows of <span class=\"application\">Synaptic</span>, click "
+"<span class=\"button\">Search</span> and search for `tails-installer`."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the list of packages, double-click on `tails-installer` to mark `tails-"
+"installer` for installation."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "In the confirmation dialog, click <span class=\"button\">Mark</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the <span class=\"button\">Apply</span> button in the toolbar to "
+"apply the changes."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "In the confirmation dialog, click <span class=\"button\">Apply</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After all the changes are applied, close <span class=\"application"
+"\">Synaptic</span>."
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "If you are running Ubuntu\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/debian/usb.fa.po b/wiki/src/install/debian/usb.fa.po
index bfe8b00..df779df 100644
--- a/wiki/src/install/debian/usb.fa.po
+++ b/wiki/src/install/debian/usb.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +23,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing Tails on a USB stick from Ubuntu\"]]\n"
+msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu\"]]\n"
msgstr ""
#. type: Plain text
@@ -68,7 +68,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Ubuntu.</p>\n"
+msgid "<p class=\"start\">Start in Debian or Ubuntu.</p>\n"
msgstr ""
#. type: Plain text
@@ -78,34 +78,94 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"next\"></a>\n"
+msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
+msgid "If you are running Debian\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
+#. type: Bullet: '1. '
+msgid "Make sure that you are connected to the Internet."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Start <span class=\"application\">Synaptic Package Manager</span>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>To know your version of Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>.</p>\n"
+"1. Choose\n"
+" <span class=\"guimenupath\">\n"
+" <span class=\"guimenu\">Settings</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Repositories</span></span>.\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
+#. type: Bullet: '1. '
+msgid ""
+"To add the *jessie-backports* repository, click <span class=\"button\">New</"
+"span> in the <span class=\"guilabel\">Repositories</span> dialog and specify:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">URI</span>: *http://http.debian.net/debian/*"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">Section(s)</span>: *main*"
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that you are connected to the Internet."
+msgid "Click <span class=\"button\">Ok</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the confirmation dialog, click <span class=\"guilabel\">Reload</span> and "
+"wait for the download of the package information to finish."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the main windows of <span class=\"application\">Synaptic</span>, click "
+"<span class=\"button\">Search</span> and search for `tails-installer`."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the list of packages, double-click on `tails-installer` to mark `tails-"
+"installer` for installation."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "In the confirmation dialog, click <span class=\"button\">Mark</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the <span class=\"button\">Apply</span> button in the toolbar to "
+"apply the changes."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "In the confirmation dialog, click <span class=\"button\">Apply</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After all the changes are applied, close <span class=\"application"
+"\">Synaptic</span>."
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "If you are running Ubuntu\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/debian/usb.fr.po b/wiki/src/install/debian/usb.fr.po
index 5881df0..df779df 100644
--- a/wiki/src/install/debian/usb.fr.po
+++ b/wiki/src/install/debian/usb.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +23,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing Tails on a USB stick from Ubuntu\"]]\n"
+msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu\"]]\n"
msgstr ""
#. type: Plain text
@@ -68,7 +68,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Ubuntu.</p>\n"
+msgid "<p class=\"start\">Start in Debian or Ubuntu.</p>\n"
msgstr ""
#. type: Plain text
@@ -78,34 +78,94 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"next\"></a>\n"
+msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
+msgid "If you are running Debian\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
+#. type: Bullet: '1. '
+msgid "Make sure that you are connected to the Internet."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Start <span class=\"application\">Synaptic Package Manager</span>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>To know your version of Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>.</p>\n"
+"1. Choose\n"
+" <span class=\"guimenupath\">\n"
+" <span class=\"guimenu\">Settings</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Repositories</span></span>.\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
+#. type: Bullet: '1. '
+msgid ""
+"To add the *jessie-backports* repository, click <span class=\"button\">New</"
+"span> in the <span class=\"guilabel\">Repositories</span> dialog and specify:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">URI</span>: *http://http.debian.net/debian/*"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">Section(s)</span>: *main*"
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that you are connected to the Internet."
+msgid "Click <span class=\"button\">Ok</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the confirmation dialog, click <span class=\"guilabel\">Reload</span> and "
+"wait for the download of the package information to finish."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the main windows of <span class=\"application\">Synaptic</span>, click "
+"<span class=\"button\">Search</span> and search for `tails-installer`."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the list of packages, double-click on `tails-installer` to mark `tails-"
+"installer` for installation."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "In the confirmation dialog, click <span class=\"button\">Mark</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the <span class=\"button\">Apply</span> button in the toolbar to "
+"apply the changes."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "In the confirmation dialog, click <span class=\"button\">Apply</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After all the changes are applied, close <span class=\"application"
+"\">Synaptic</span>."
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "If you are running Ubuntu\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/debian/usb.mdwn b/wiki/src/install/debian/usb.mdwn
index 6e26ea8..3d88b65 100644
--- a/wiki/src/install/debian/usb.mdwn
+++ b/wiki/src/install/debian/usb.mdwn
@@ -1,5 +1,4 @@
-[[!meta title="Installing Tails on a USB stick from Ubuntu"]]
-
+[[!meta title="Installing Tails on a USB stick from Debian or Ubuntu"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
@@ -11,21 +10,54 @@
<div class="step-image">[[!img install/inc/infography/os-debian-ubuntu.png link="no"]]</div>
-<p class="start">Start in Ubuntu.</p>
+<p class="start">Start in Debian or Ubuntu.</p>
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
-<a id="next"></a>
-
[[!inline pages="install/inc/steps/install_tails_installer.inline" raw="yes"]]
-<div class="tip">
+If you are running Debian
+-------------------------
+
+1. Make sure that you are connected to the Internet.
+
+1. Start <span class="application">Synaptic Package Manager</span>.
+
+1. Choose
+ <span class="guimenupath">
+ <span class="guimenu">Settings</span>&nbsp;▸
+ <span class="guimenuitem">Repositories</span></span>.
+
+1. To add the *jessie-backports* repository, click
+ <span class="button">New</span> in the <span class="guilabel">Repositories</span>
+ dialog and specify:
+
+ - <span class="guilabel">URI</span>: *http://http.debian.net/debian/*
+ - <span class="guilabel">Distributions</span>: *jessie-backports*
+ - <span class="guilabel">Section(s)</span>: *main*
+
+1. Click <span class="button">Ok</span>.
+
+1. In the confirmation dialog, click <span class="guilabel">Reload</span> and
+ wait for the download of the package information to finish.
+
+1. In the main windows of <span class="application">Synaptic</span>, click
+ <span class="button">Search</span> and search for `tails-installer`.
+
+1. In the list of packages, double-click on `tails-installer` to mark
+ `tails-installer` for installation.
+
+1. In the confirmation dialog, click <span class="button">Mark</span>.
+
+1. Click on the <span class="button">Apply</span> button in the toolbar to
+ apply the changes.
+
+1. In the confirmation dialog, click <span class="button">Apply</span>.
-<p>To know your version of Ubuntu, open
-<span class="application">System Settings</span> and click on
-<span class="guilabel">Details</span>.</p>
+1. After all the changes are applied, close <span class="application">Synaptic</span>.
-</div>
+If you are running Ubuntu
+-------------------------
1. Make sure that you are connected to the Internet.
diff --git a/wiki/src/install/debian/usb.pt.po b/wiki/src/install/debian/usb.pt.po
index 5881df0..df779df 100644
--- a/wiki/src/install/debian/usb.pt.po
+++ b/wiki/src/install/debian/usb.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +23,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing Tails on a USB stick from Ubuntu\"]]\n"
+msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu\"]]\n"
msgstr ""
#. type: Plain text
@@ -68,7 +68,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Ubuntu.</p>\n"
+msgid "<p class=\"start\">Start in Debian or Ubuntu.</p>\n"
msgstr ""
#. type: Plain text
@@ -78,34 +78,94 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"next\"></a>\n"
+msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
+msgid "If you are running Debian\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
+#. type: Bullet: '1. '
+msgid "Make sure that you are connected to the Internet."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Start <span class=\"application\">Synaptic Package Manager</span>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>To know your version of Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>.</p>\n"
+"1. Choose\n"
+" <span class=\"guimenupath\">\n"
+" <span class=\"guimenu\">Settings</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Repositories</span></span>.\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
+#. type: Bullet: '1. '
+msgid ""
+"To add the *jessie-backports* repository, click <span class=\"button\">New</"
+"span> in the <span class=\"guilabel\">Repositories</span> dialog and specify:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">URI</span>: *http://http.debian.net/debian/*"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "<span class=\"guilabel\">Section(s)</span>: *main*"
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that you are connected to the Internet."
+msgid "Click <span class=\"button\">Ok</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the confirmation dialog, click <span class=\"guilabel\">Reload</span> and "
+"wait for the download of the package information to finish."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the main windows of <span class=\"application\">Synaptic</span>, click "
+"<span class=\"button\">Search</span> and search for `tails-installer`."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the list of packages, double-click on `tails-installer` to mark `tails-"
+"installer` for installation."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "In the confirmation dialog, click <span class=\"button\">Mark</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the <span class=\"button\">Apply</span> button in the toolbar to "
+"apply the changes."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "In the confirmation dialog, click <span class=\"button\">Apply</span>."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After all the changes are applied, close <span class=\"application"
+"\">Synaptic</span>."
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "If you are running Ubuntu\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/debian/usb/overview.de.po b/wiki/src/install/debian/usb/overview.de.po
index 4097a34..82c1a11 100644
--- a/wiki/src/install/debian/usb/overview.de.po
+++ b/wiki/src/install/debian/usb/overview.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,17 +18,17 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Ubuntu\"]] [[!meta "
-"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] "
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\"]] [[<span class=\"back\">Back</span>|install/win]]"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Debian or Ubuntu"
+"\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet"
+"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
msgstr ""
#. type: Content of: <h1>
-msgid "Install from <strong>Ubuntu</strong>"
+msgid "Install from <strong>Debian or Ubuntu</strong>"
msgstr ""
#. type: Content of: outside any tag (error?)
diff --git a/wiki/src/install/debian/usb/overview.fa.po b/wiki/src/install/debian/usb/overview.fa.po
index cee194c..82c1a11 100644
--- a/wiki/src/install/debian/usb/overview.fa.po
+++ b/wiki/src/install/debian/usb/overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,17 +18,17 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Ubuntu\"]] [[!meta "
-"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] "
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\"]] [[<span class=\"back\">Back</span>|install/win]]"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Debian or Ubuntu"
+"\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet"
+"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
msgstr ""
#. type: Content of: <h1>
-msgid "Install from <strong>Ubuntu</strong>"
+msgid "Install from <strong>Debian or Ubuntu</strong>"
msgstr ""
#. type: Content of: outside any tag (error?)
diff --git a/wiki/src/install/debian/usb/overview.fr.po b/wiki/src/install/debian/usb/overview.fr.po
index 4097a34..82c1a11 100644
--- a/wiki/src/install/debian/usb/overview.fr.po
+++ b/wiki/src/install/debian/usb/overview.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,17 +18,17 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Ubuntu\"]] [[!meta "
-"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] "
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\"]] [[<span class=\"back\">Back</span>|install/win]]"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Debian or Ubuntu"
+"\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet"
+"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
msgstr ""
#. type: Content of: <h1>
-msgid "Install from <strong>Ubuntu</strong>"
+msgid "Install from <strong>Debian or Ubuntu</strong>"
msgstr ""
#. type: Content of: outside any tag (error?)
diff --git a/wiki/src/install/debian/usb/overview.html b/wiki/src/install/debian/usb/overview.html
index 67b6e39..e7df550 100644
--- a/wiki/src/install/debian/usb/overview.html
+++ b/wiki/src/install/debian/usb/overview.html
@@ -1,5 +1,4 @@
-[[!meta title="Install from Ubuntu"]]
-
+[[!meta title="Install from Debian or Ubuntu"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
@@ -9,7 +8,7 @@
[[<span class="back">Back</span>|install/win]]
-<h1 class="text-center">Install from <strong>Ubuntu</strong></h1>
+<h1 class="text-center">Install from <strong>Debian or Ubuntu</strong></h1>
[[!inline pages="install/inc/overview" raw="yes"]]
diff --git a/wiki/src/install/debian/usb/overview.pt.po b/wiki/src/install/debian/usb/overview.pt.po
index 4097a34..82c1a11 100644
--- a/wiki/src/install/debian/usb/overview.pt.po
+++ b/wiki/src/install/debian/usb/overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,17 +18,17 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Ubuntu\"]] [[!meta "
-"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] "
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\"]] [[<span class=\"back\">Back</span>|install/win]]"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Debian or Ubuntu"
+"\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet"
+"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
msgstr ""
#. type: Content of: <h1>
-msgid "Install from <strong>Ubuntu</strong>"
+msgid "Install from <strong>Debian or Ubuntu</strong>"
msgstr ""
#. type: Content of: outside any tag (error?)
diff --git a/wiki/src/install/download.de.po b/wiki/src/install/download.de.po
index 1bd7721..e7a241c 100644
--- a/wiki/src/install/download.de.po
+++ b/wiki/src/install/download.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-27 22:58+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -43,6 +43,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
msgstr ""
diff --git a/wiki/src/install/download.fa.po b/wiki/src/install/download.fa.po
index 5518312..e7a241c 100644
--- a/wiki/src/install/download.fa.po
+++ b/wiki/src/install/download.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-30 21:10+0000\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,16 +33,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/download.fr.po b/wiki/src/install/download.fr.po
index d86cdef..113fade 100644
--- a/wiki/src/install/download.fr.po
+++ b/wiki/src/install/download.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-27 22:58+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\n"
"PO-Revision-Date: 2015-11-12 13:41+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,6 +43,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"download.inline\" raw=\"yes\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr "[[!inline pages=\"download.inline.fr\" raw=\"yes\"]]\n"
+
+#. type: Plain text
+#, no-wrap
msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
msgstr ""
diff --git a/wiki/src/install/download.mdwn b/wiki/src/install/download.mdwn
index bf0c71a..9c82251 100644
--- a/wiki/src/install/download.mdwn
+++ b/wiki/src/install/download.mdwn
@@ -3,6 +3,8 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/dave" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/dave"]]
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
diff --git a/wiki/src/install/download.pt.po b/wiki/src/install/download.pt.po
index 1bd7721..e7a241c 100644
--- a/wiki/src/install/download.pt.po
+++ b/wiki/src/install/download.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-27 22:58+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -43,6 +43,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
msgstr ""
diff --git a/wiki/src/install/dvd.de.po b/wiki/src/install/dvd.de.po
index 2e5dcff..c9285e9 100644
--- a/wiki/src/install/dvd.de.po
+++ b/wiki/src/install/dvd.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 16:52+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,23 +33,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -64,9 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
@@ -74,11 +66,6 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"next\"></a>\n"
-msgstr ""
-
#. type: Title =
#, no-wrap
msgid "Burn a Tails DVD\n"
@@ -92,18 +79,18 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from "
-"Windows](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Windows)"
+"[Burning from Windows](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Windows)"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from "
-"Ubuntu](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Ubuntu)"
+"[Burning from Ubuntu](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Ubuntu)"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS "
-"X](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Mac_OS_X)"
+"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr ""
diff --git a/wiki/src/install/dvd.fa.po b/wiki/src/install/dvd.fa.po
index 85e5354..c9285e9 100644
--- a/wiki/src/install/dvd.fa.po
+++ b/wiki/src/install/dvd.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-23 15:02+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,23 +33,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -64,9 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
@@ -74,11 +66,6 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"next\"></a>\n"
-msgstr ""
-
#. type: Title =
#, no-wrap
msgid "Burn a Tails DVD\n"
@@ -92,18 +79,18 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from "
-"Windows](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Windows)"
+"[Burning from Windows](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Windows)"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from "
-"Ubuntu](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Ubuntu)"
+"[Burning from Ubuntu](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Ubuntu)"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS "
-"X](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Mac_OS_X)"
+"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr ""
diff --git a/wiki/src/install/dvd.fr.po b/wiki/src/install/dvd.fr.po
index 2e5dcff..c9285e9 100644
--- a/wiki/src/install/dvd.fr.po
+++ b/wiki/src/install/dvd.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 16:52+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,23 +33,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -64,9 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
@@ -74,11 +66,6 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"next\"></a>\n"
-msgstr ""
-
#. type: Title =
#, no-wrap
msgid "Burn a Tails DVD\n"
@@ -92,18 +79,18 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from "
-"Windows](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Windows)"
+"[Burning from Windows](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Windows)"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from "
-"Ubuntu](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Ubuntu)"
+"[Burning from Ubuntu](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Ubuntu)"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS "
-"X](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Mac_OS_X)"
+"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr ""
diff --git a/wiki/src/install/dvd.mdwn b/wiki/src/install/dvd.mdwn
index 89ce9d4..2b9d097 100644
--- a/wiki/src/install/dvd.mdwn
+++ b/wiki/src/install/dvd.mdwn
@@ -11,8 +11,6 @@
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
-<a id="next"></a>
-
Burn a Tails DVD
================
diff --git a/wiki/src/install/dvd.pt.po b/wiki/src/install/dvd.pt.po
index 2e5dcff..c9285e9 100644
--- a/wiki/src/install/dvd.pt.po
+++ b/wiki/src/install/dvd.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 16:52+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,23 +33,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -64,9 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
@@ -74,11 +66,6 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"next\"></a>\n"
-msgstr ""
-
#. type: Title =
#, no-wrap
msgid "Burn a Tails DVD\n"
@@ -92,18 +79,18 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from "
-"Windows](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Windows)"
+"[Burning from Windows](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Windows)"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from "
-"Ubuntu](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Ubuntu)"
+"[Burning from Ubuntu](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Ubuntu)"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS "
-"X](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Mac_OS_X)"
+"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr ""
diff --git a/wiki/src/install/expert/usb.de.po b/wiki/src/install/expert/usb.de.po
index af26601..e81ddf0 100644
--- a/wiki/src/install/expert/usb.de.po
+++ b/wiki/src/install/expert/usb.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +23,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing Tails on a USB stick from Ubuntu using the command line\"]]\n"
+msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu using the command line\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -38,7 +43,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p>Start in Ubuntu.</p>\n"
+msgid "<p>Start in Debian or Ubuntu.</p>\n"
msgstr ""
#. type: Title =
@@ -111,7 +116,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " sudo apt-get install debian-keyring/jessie\n"
+msgid " sudo apt install debian-keyring/jessie\n"
msgstr ""
#. type: Bullet: '1. '
@@ -291,23 +296,34 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
+#. type: Bullet: '1. '
+msgid "If you are running:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" a. Debian, execute the following command to add the\n"
+" backports repository to your system:\n"
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
-"<p>To know your version of Ubuntu, execute\n"
-"<span class=\"command\">lsb_release -a</span>.</p>\n"
+" BACKPORTS='deb http://http.debian.net/debian/ jessie-backports main'\n"
+" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/jessie-backports.list && echo \"OK\"\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Execute the following command to add the\n"
-"PPA repository to your system:\n"
+" b. Ubuntu, execute the following command to add the\n"
+" PPA repository to your system:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " sudo add-apt-repository ppa:tails-team/tails-installer\n"
+msgid " sudo add-apt-repository ppa:tails-team/tails-installer\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/expert/usb.fa.po b/wiki/src/install/expert/usb.fa.po
index 598ad67..e81ddf0 100644
--- a/wiki/src/install/expert/usb.fa.po
+++ b/wiki/src/install/expert/usb.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +23,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing Tails on a USB stick from Ubuntu using the command line\"]]\n"
+msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu using the command line\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -38,7 +43,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p>Start in Ubuntu.</p>\n"
+msgid "<p>Start in Debian or Ubuntu.</p>\n"
msgstr ""
#. type: Title =
@@ -111,7 +116,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " sudo apt-get install debian-keyring/jessie\n"
+msgid " sudo apt install debian-keyring/jessie\n"
msgstr ""
#. type: Bullet: '1. '
@@ -291,23 +296,34 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
+#. type: Bullet: '1. '
+msgid "If you are running:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" a. Debian, execute the following command to add the\n"
+" backports repository to your system:\n"
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
-"<p>To know your version of Ubuntu, execute\n"
-"<span class=\"command\">lsb_release -a</span>.</p>\n"
+" BACKPORTS='deb http://http.debian.net/debian/ jessie-backports main'\n"
+" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/jessie-backports.list && echo \"OK\"\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Execute the following command to add the\n"
-"PPA repository to your system:\n"
+" b. Ubuntu, execute the following command to add the\n"
+" PPA repository to your system:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " sudo add-apt-repository ppa:tails-team/tails-installer\n"
+msgid " sudo add-apt-repository ppa:tails-team/tails-installer\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/expert/usb.fr.po b/wiki/src/install/expert/usb.fr.po
index af26601..e81ddf0 100644
--- a/wiki/src/install/expert/usb.fr.po
+++ b/wiki/src/install/expert/usb.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +23,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing Tails on a USB stick from Ubuntu using the command line\"]]\n"
+msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu using the command line\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -38,7 +43,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p>Start in Ubuntu.</p>\n"
+msgid "<p>Start in Debian or Ubuntu.</p>\n"
msgstr ""
#. type: Title =
@@ -111,7 +116,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " sudo apt-get install debian-keyring/jessie\n"
+msgid " sudo apt install debian-keyring/jessie\n"
msgstr ""
#. type: Bullet: '1. '
@@ -291,23 +296,34 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
+#. type: Bullet: '1. '
+msgid "If you are running:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" a. Debian, execute the following command to add the\n"
+" backports repository to your system:\n"
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
-"<p>To know your version of Ubuntu, execute\n"
-"<span class=\"command\">lsb_release -a</span>.</p>\n"
+" BACKPORTS='deb http://http.debian.net/debian/ jessie-backports main'\n"
+" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/jessie-backports.list && echo \"OK\"\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Execute the following command to add the\n"
-"PPA repository to your system:\n"
+" b. Ubuntu, execute the following command to add the\n"
+" PPA repository to your system:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " sudo add-apt-repository ppa:tails-team/tails-installer\n"
+msgid " sudo add-apt-repository ppa:tails-team/tails-installer\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/expert/usb.mdwn b/wiki/src/install/expert/usb.mdwn
index cc374be..0495cc1 100644
--- a/wiki/src/install/expert/usb.mdwn
+++ b/wiki/src/install/expert/usb.mdwn
@@ -1,9 +1,9 @@
-[[!meta title="Installing Tails on a USB stick from Ubuntu using the command line"]]
-
+[[!meta title="Installing Tails on a USB stick from Debian or Ubuntu using the command line"]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/expert" rel="stylesheet" title=""]]
-<p>Start in Ubuntu.</p>
+<p>Start in Debian or Ubuntu.</p>
Verify the Tails signing key
============================
@@ -38,7 +38,7 @@ OpenPGP Keys</a> by <em>Riseup</em>.</p>
1. Install the Debian keyring. It contains the OpenPGP keys of all Debian developers:
- sudo apt-get install debian-keyring/jessie
+ sudo apt install debian-keyring/jessie
1. Import the OpenPGP key of [[!wikipedia Stefano_Zacchiroli]], a former
Debian Project Leader, from the Debian keyring into your keyring:
@@ -122,17 +122,18 @@ using the Tails signing key.
[[!inline pages="install/inc/steps/install_tails_installer.inline" raw="yes"]]
-<div class="tip">
+1. If you are running:
-<p>To know your version of Ubuntu, execute
-<span class="command">lsb_release -a</span>.</p>
+ a. Debian, execute the following command to add the
+ backports repository to your system:
-</div>
+ BACKPORTS='deb http://http.debian.net/debian/ jessie-backports main'
+ echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/jessie-backports.list && echo "OK"
-1. Execute the following command to add the
-PPA repository to your system:
+ b. Ubuntu, execute the following command to add the
+ PPA repository to your system:
- sudo add-apt-repository ppa:tails-team/tails-installer
+ sudo add-apt-repository ppa:tails-team/tails-installer
1. Update your lists of packages:
diff --git a/wiki/src/install/expert/usb.pt.po b/wiki/src/install/expert/usb.pt.po
index af26601..e81ddf0 100644
--- a/wiki/src/install/expert/usb.pt.po
+++ b/wiki/src/install/expert/usb.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +23,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing Tails on a USB stick from Ubuntu using the command line\"]]\n"
+msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu using the command line\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -38,7 +43,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p>Start in Ubuntu.</p>\n"
+msgid "<p>Start in Debian or Ubuntu.</p>\n"
msgstr ""
#. type: Title =
@@ -111,7 +116,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " sudo apt-get install debian-keyring/jessie\n"
+msgid " sudo apt install debian-keyring/jessie\n"
msgstr ""
#. type: Bullet: '1. '
@@ -291,23 +296,34 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
+#. type: Bullet: '1. '
+msgid "If you are running:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" a. Debian, execute the following command to add the\n"
+" backports repository to your system:\n"
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
-"<p>To know your version of Ubuntu, execute\n"
-"<span class=\"command\">lsb_release -a</span>.</p>\n"
+" BACKPORTS='deb http://http.debian.net/debian/ jessie-backports main'\n"
+" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/jessie-backports.list && echo \"OK\"\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"1. Execute the following command to add the\n"
-"PPA repository to your system:\n"
+" b. Ubuntu, execute the following command to add the\n"
+" PPA repository to your system:\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " sudo add-apt-repository ppa:tails-team/tails-installer\n"
+msgid " sudo add-apt-repository ppa:tails-team/tails-installer\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/expert/usb/overview.de.po b/wiki/src/install/expert/usb/overview.de.po
index 0752457..6821567 100644
--- a/wiki/src/install/expert/usb/overview.de.po
+++ b/wiki/src/install/expert/usb/overview.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,18 +18,18 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Ubuntu using the "
-"command line and GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Debian or Ubuntu "
+"using the command line and GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel="
+"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
"installation-assistant.inline\" raw=\"yes\"]] [[<span class=\"back\">Back</"
"span>|install/win]]"
msgstr ""
#. type: Content of: <h1>
-msgid "<small>Install from Ubuntu using the</small>"
+msgid "<small>Install from Debian or Ubuntu using the</small>"
msgstr ""
#. type: Content of: <h1>
diff --git a/wiki/src/install/expert/usb/overview.fa.po b/wiki/src/install/expert/usb/overview.fa.po
index 2216307..6821567 100644
--- a/wiki/src/install/expert/usb/overview.fa.po
+++ b/wiki/src/install/expert/usb/overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,18 +18,18 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Ubuntu using the "
-"command line and GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Debian or Ubuntu "
+"using the command line and GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel="
+"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
"installation-assistant.inline\" raw=\"yes\"]] [[<span class=\"back\">Back</"
"span>|install/win]]"
msgstr ""
#. type: Content of: <h1>
-msgid "<small>Install from Ubuntu using the</small>"
+msgid "<small>Install from Debian or Ubuntu using the</small>"
msgstr ""
#. type: Content of: <h1>
diff --git a/wiki/src/install/expert/usb/overview.fr.po b/wiki/src/install/expert/usb/overview.fr.po
index 0752457..6821567 100644
--- a/wiki/src/install/expert/usb/overview.fr.po
+++ b/wiki/src/install/expert/usb/overview.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,18 +18,18 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Ubuntu using the "
-"command line and GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Debian or Ubuntu "
+"using the command line and GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel="
+"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
"installation-assistant.inline\" raw=\"yes\"]] [[<span class=\"back\">Back</"
"span>|install/win]]"
msgstr ""
#. type: Content of: <h1>
-msgid "<small>Install from Ubuntu using the</small>"
+msgid "<small>Install from Debian or Ubuntu using the</small>"
msgstr ""
#. type: Content of: <h1>
diff --git a/wiki/src/install/expert/usb/overview.html b/wiki/src/install/expert/usb/overview.html
index f96014d..993e0ac 100644
--- a/wiki/src/install/expert/usb/overview.html
+++ b/wiki/src/install/expert/usb/overview.html
@@ -1,5 +1,4 @@
-[[!meta title="Install from Ubuntu using the command line and GnuPG"]]
-
+[[!meta title="Install from Debian or Ubuntu using the command line and GnuPG"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
@@ -9,7 +8,7 @@
[[<span class="back">Back</span>|install/win]]
-<h1 class="text-center"><small>Install from Ubuntu using the</small><br />command line <small> and </small> GnuPG</h1>
+<h1 class="text-center"><small>Install from Debian or Ubuntu using the</small><br />command line <small> and </small> GnuPG</h1>
[[!inline pages="install/inc/overview" raw="yes"]]
diff --git a/wiki/src/install/expert/usb/overview.pt.po b/wiki/src/install/expert/usb/overview.pt.po
index 0752457..6821567 100644
--- a/wiki/src/install/expert/usb/overview.pt.po
+++ b/wiki/src/install/expert/usb/overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -18,18 +18,18 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Ubuntu using the "
-"command line and GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from Debian or Ubuntu "
+"using the command line and GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel="
+"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
"installation-assistant.inline\" raw=\"yes\"]] [[<span class=\"back\">Back</"
"span>|install/win]]"
msgstr ""
#. type: Content of: <h1>
-msgid "<small>Install from Ubuntu using the</small>"
+msgid "<small>Install from Debian or Ubuntu using the</small>"
msgstr ""
#. type: Content of: <h1>
diff --git a/wiki/src/install/inc/icons/check.png b/wiki/src/install/inc/icons/check.png
new file mode 100644
index 0000000..1adaece
--- /dev/null
+++ b/wiki/src/install/inc/icons/check.png
Binary files differ
diff --git a/wiki/src/install/inc/icons/failed.png b/wiki/src/install/inc/icons/failed.png
new file mode 100644
index 0000000..18e7561
--- /dev/null
+++ b/wiki/src/install/inc/icons/failed.png
Binary files differ
diff --git a/wiki/src/install/inc/icons/pause.png b/wiki/src/install/inc/icons/pause.png
new file mode 100644
index 0000000..a0df060
--- /dev/null
+++ b/wiki/src/install/inc/icons/pause.png
Binary files differ
diff --git a/wiki/src/install/inc/icons/play.png b/wiki/src/install/inc/icons/play.png
new file mode 100644
index 0000000..cc3f0cb
--- /dev/null
+++ b/wiki/src/install/inc/icons/play.png
Binary files differ
diff --git a/wiki/src/install/inc/overview.de.po b/wiki/src/install/inc/overview.de.po
index 54349ba..be755d1 100644
--- a/wiki/src/install/inc/overview.de.po
+++ b/wiki/src/install/inc/overview.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-26 01:44+0100\n"
+"POT-Creation-Date: 2016-01-20 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"
@@ -26,9 +26,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">1 or 2 hours</span> <span "
-"class=\"debian expert\">1 hour</span> <span class=\"install-clone\">15 "
-"minutes</span> <span class=\"upgrade-clone\">10 minutes</span>"
+"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
+"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
+"<span class=\"upgrade-clone\">¼ hour</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
@@ -40,9 +40,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>45 minutes to "
-"install</small></span> <span class=\"debian expert\"><small>25 minutes to "
-"install</small></span> <span class=\"upgrade-tails\"><small>20 minutes to "
+"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
+"install</small></span> <span class=\"debian expert\"><small>½ hour to "
+"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
diff --git a/wiki/src/install/inc/overview.fa.po b/wiki/src/install/inc/overview.fa.po
index 54349ba..be755d1 100644
--- a/wiki/src/install/inc/overview.fa.po
+++ b/wiki/src/install/inc/overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-26 01:44+0100\n"
+"POT-Creation-Date: 2016-01-20 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"
@@ -26,9 +26,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">1 or 2 hours</span> <span "
-"class=\"debian expert\">1 hour</span> <span class=\"install-clone\">15 "
-"minutes</span> <span class=\"upgrade-clone\">10 minutes</span>"
+"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
+"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
+"<span class=\"upgrade-clone\">¼ hour</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
@@ -40,9 +40,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>45 minutes to "
-"install</small></span> <span class=\"debian expert\"><small>25 minutes to "
-"install</small></span> <span class=\"upgrade-tails\"><small>20 minutes to "
+"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
+"install</small></span> <span class=\"debian expert\"><small>½ hour to "
+"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
diff --git a/wiki/src/install/inc/overview.fr.po b/wiki/src/install/inc/overview.fr.po
index 54349ba..be755d1 100644
--- a/wiki/src/install/inc/overview.fr.po
+++ b/wiki/src/install/inc/overview.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-26 01:44+0100\n"
+"POT-Creation-Date: 2016-01-20 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"
@@ -26,9 +26,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">1 or 2 hours</span> <span "
-"class=\"debian expert\">1 hour</span> <span class=\"install-clone\">15 "
-"minutes</span> <span class=\"upgrade-clone\">10 minutes</span>"
+"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
+"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
+"<span class=\"upgrade-clone\">¼ hour</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
@@ -40,9 +40,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>45 minutes to "
-"install</small></span> <span class=\"debian expert\"><small>25 minutes to "
-"install</small></span> <span class=\"upgrade-tails\"><small>20 minutes to "
+"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
+"install</small></span> <span class=\"debian expert\"><small>½ hour to "
+"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
diff --git a/wiki/src/install/inc/overview.html b/wiki/src/install/inc/overview.html
index 276489b..6594c3c 100644
--- a/wiki/src/install/inc/overview.html
+++ b/wiki/src/install/inc/overview.html
@@ -7,19 +7,19 @@
<div class="caption">
<h4>
- <span class="windows linux mac-usb mac-dvd">1 or 2 hours</span>
- <span class="debian expert">1 hour</span>
- <span class="install-clone">15 minutes</span>
- <span class="upgrade-clone">10 minutes</span>
+ <span class="windows linux mac-usb mac-dvd">2 hours</span>
+ <span class="debian expert">1½ hour</span>
+ <span class="install-clone">½ hour</span>
+ <span class="upgrade-clone">¼ hour</span>
<br />
<span class="windows linux mac-usb mac-dvd debian expert upgrade-tails">
<small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]] to download</small><br />
</span>
- <span class="windows linux mac-usb mac-dvd"><small>45 minutes to install</small></span>
- <span class="debian expert"><small>25 minutes to install</small></span>
- <span class="upgrade-tails"><small>20 minutes to upgrade</small></span>
+ <span class="windows linux mac-usb mac-dvd"><small>1 hour to install</small></span>
+ <span class="debian expert"><small>½ hour to install</small></span>
+ <span class="upgrade-tails"><small>½ hour to upgrade</small></span>
</h4>
</div>
</div>
diff --git a/wiki/src/install/inc/overview.pt.po b/wiki/src/install/inc/overview.pt.po
index 54349ba..be755d1 100644
--- a/wiki/src/install/inc/overview.pt.po
+++ b/wiki/src/install/inc/overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-26 01:44+0100\n"
+"POT-Creation-Date: 2016-01-20 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"
@@ -26,9 +26,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">1 or 2 hours</span> <span "
-"class=\"debian expert\">1 hour</span> <span class=\"install-clone\">15 "
-"minutes</span> <span class=\"upgrade-clone\">10 minutes</span>"
+"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
+"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
+"<span class=\"upgrade-clone\">¼ hour</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
@@ -40,9 +40,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>45 minutes to "
-"install</small></span> <span class=\"debian expert\"><small>25 minutes to "
-"install</small></span> <span class=\"upgrade-tails\"><small>20 minutes to "
+"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
+"install</small></span> <span class=\"debian expert\"><small>½ hour to "
+"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
diff --git a/wiki/src/install/inc/router/clone.de.po b/wiki/src/install/inc/router/clone.de.po
index 1c46eff..53572f8 100644
--- a/wiki/src/install/inc/router/clone.de.po
+++ b/wiki/src/install/inc/router/clone.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-16 18:07+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -39,5 +39,5 @@ msgid "1 USB stick <small>(at least 4 GB)</small>"
msgstr ""
#. type: Content of: <ul><li>
-msgid "15 minutes to install"
+msgid "½ hour to install"
msgstr ""
diff --git a/wiki/src/install/inc/router/clone.fa.po b/wiki/src/install/inc/router/clone.fa.po
index 4e6c405..53572f8 100644
--- a/wiki/src/install/inc/router/clone.fa.po
+++ b/wiki/src/install/inc/router/clone.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -39,5 +39,5 @@ msgid "1 USB stick <small>(at least 4 GB)</small>"
msgstr ""
#. type: Content of: <ul><li>
-msgid "15 minutes to install"
+msgid "½ hour to install"
msgstr ""
diff --git a/wiki/src/install/inc/router/clone.fr.po b/wiki/src/install/inc/router/clone.fr.po
index 1c46eff..53572f8 100644
--- a/wiki/src/install/inc/router/clone.fr.po
+++ b/wiki/src/install/inc/router/clone.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-16 18:07+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -39,5 +39,5 @@ msgid "1 USB stick <small>(at least 4 GB)</small>"
msgstr ""
#. type: Content of: <ul><li>
-msgid "15 minutes to install"
+msgid "½ hour to install"
msgstr ""
diff --git a/wiki/src/install/inc/router/clone.html b/wiki/src/install/inc/router/clone.html
index 36ae657..13807ab 100644
--- a/wiki/src/install/inc/router/clone.html
+++ b/wiki/src/install/inc/router/clone.html
@@ -8,5 +8,5 @@ Tails is up-to-date.</p>
<ul>
<li>1 other Tails <small>(USB stick or DVD)</small></li>
<li>1 USB stick <small>(at least 4 GB)</small></li>
- <li>15 minutes to install</li>
+ <li>½ hour to install</li>
</ul>
diff --git a/wiki/src/install/inc/router/clone.pt.po b/wiki/src/install/inc/router/clone.pt.po
index 1c46eff..53572f8 100644
--- a/wiki/src/install/inc/router/clone.pt.po
+++ b/wiki/src/install/inc/router/clone.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-16 18:07+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -39,5 +39,5 @@ msgid "1 USB stick <small>(at least 4 GB)</small>"
msgstr ""
#. type: Content of: <ul><li>
-msgid "15 minutes to install"
+msgid "½ hour to install"
msgstr ""
diff --git a/wiki/src/install/inc/screenshots/tails_installer_in_debian.png b/wiki/src/install/inc/screenshots/tails_installer_in_debian.png
index 5556586..f011554 100644
--- a/wiki/src/install/inc/screenshots/tails_installer_in_debian.png
+++ b/wiki/src/install/inc/screenshots/tails_installer_in_debian.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/tails_installer_in_tails.png b/wiki/src/install/inc/screenshots/tails_installer_in_tails.png
index 21b435b..c5ce7ae 100644
--- a/wiki/src/install/inc/screenshots/tails_installer_in_tails.png
+++ b/wiki/src/install/inc/screenshots/tails_installer_in_tails.png
Binary files differ
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.de.po b/wiki/src/install/inc/steps/create_persistence.inline.de.po
index 3cd5ab5..a20ce20 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.de.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -224,7 +224,7 @@ msgstr ""
msgid ""
"<div class=\"state-image debian expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
-"<div class=\"state-image dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
+"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.fa.po b/wiki/src/install/inc/steps/create_persistence.inline.fa.po
index 3cd5ab5..a20ce20 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fa.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -224,7 +224,7 @@ msgstr ""
msgid ""
"<div class=\"state-image debian expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
-"<div class=\"state-image dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
+"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.fr.po b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
index 3cd5ab5..a20ce20 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fr.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -224,7 +224,7 @@ msgstr ""
msgid ""
"<div class=\"state-image debian expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
-"<div class=\"state-image dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
+"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.mdwn b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
index d46358c..ad48d64 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.mdwn
+++ b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
@@ -74,7 +74,7 @@ Restart and activate the persistent storage
<div class="state-image debian expert">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="state-image windows linux mac-usb clone">[[!img install/inc/infography/final-tails-with-persistence.png link="no"]]</div>
-<div class="state-image dvd">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
+<div class="state-image mac-dvd">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="trophy" id="recommendations">
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.pt.po b/wiki/src/install/inc/steps/create_persistence.inline.pt.po
index 3cd5ab5..a20ce20 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.pt.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -224,7 +224,7 @@ msgstr ""
msgid ""
"<div class=\"state-image debian expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
-"<div class=\"state-image dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
+"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/download.inline.de.po b/wiki/src/install/inc/steps/download.inline.de.po
index d54afe3..f8dfeca 100644
--- a/wiki/src/install/inc/steps/download.inline.de.po
+++ b/wiki/src/install/inc/steps/download.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-21 21:19+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"
@@ -26,12 +26,21 @@ msgstr ""
msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <p>
msgid ""
-"In this step you will download Tails as an ISO image: a single file "
-"containing the whole operating system. For your security, it is very "
-"important to also verify your download. We propose you two techniques to do "
-"this verification automatically."
+"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
+"this step you</span> <span class=\"download-only\">You</span> will download "
+"Tails as an ISO image: a single file containing the whole operating system. "
+"For your security, it is very important to also verify your download. We "
+"propose you two techniques to do this verification automatically."
+msgstr ""
+
+#. type: Content of: <div>
+msgid "[[!img lib/spinner.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Please wait…"
msgstr ""
#. type: Content of: <div><div>
@@ -68,10 +77,19 @@ msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<code>https://tails.boum.org/download</code> <a href=\"?override=firefox\" "
-"class=\"btn btn-lg btn-primary browser-override\">I'm already in Firefox "
-"<span class=\"minver-firefox\">38.0.1</span>+ or Tor Browser <span class="
-"\"minver-tor\">5</span>+.</a>"
+"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/</"
+"code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/install/"
+"mac/usb/</code></span> <span class=\"mac-dvd\"><code>https://tails.boum.org/"
+"install/mac/dvd/</code></span> <span class=\"debian\"><code>https://tails."
+"boum.org/install/debian/usb/</code></span> <span class=\"linux"
+"\"><code>https://tails.boum.org/install/linux/usb/</code></span> <span class="
+"\"upgrade-tails\"><code>https://tails.boum.org/upgrade/tails/</code></span> "
+"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/</code></span> "
+"<span class=\"vm\"><code>https://tails.boum.org/install/vm/</code></span> "
+"<span class=\"download-only\"><code>https://tails.boum.org/install/download/"
+"</code></span> <a href=\"?override=firefox\" class=\"btn btn-lg btn-primary "
+"browser-override\">I'm already in Firefox <span class=\"minver-firefox"
+"\">38.0.1</span>+ or Tor Browser <span class=\"minver-tor\">5</span>+.</a>"
msgstr ""
#. type: Content of: <div><div><div><div><h2>
@@ -123,7 +141,9 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid "<span class=\"label label-success state done\">Done</span>"
+msgid ""
+"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
+"alt=\"Done\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -248,33 +268,40 @@ msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
"<small id=\"download-path\">Downloading to <span class=\"download-path\">"
-"$PATH</span></small>"
+"$PATH</span></small> <small id=\"downloaded-path\">Downloaded to <span class="
+"\"verify-file-path\">$PATH</span></small>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"btn btn-"
-"primary\">Pause</span> <span id=\"download-button-state-resume\" class=\"btn "
-"btn-primary\">Resume</span> <span id=\"download-button-state-cancel\" class="
-"\"btn btn-primary label-warning\">Cancel</span>"
+"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"\">[[!img "
+"install/inc/icons/pause.png link=\"no\" alt=\"Pause\"]]</span> <span id="
+"\"download-button-state-resume\" class=\"\">[[!img install/inc/icons/play."
+"png link=\"no\" alt=\"Resume\"]]</span> <span id=\"download-button-state-"
+"cancel\" class=\"btn btn-link\">Cancel</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id='download-text-pause'> Paused</span> <span id =\"download-text-done"
-"\" class=\"label label-success state\">Done</span> <span id =\"download-text-"
-"failed\" class=\"label label-warning state\">Failed</span>"
+"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
+"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
+"\"Done\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
+"install/inc/icons/failed.png link=\"no\" alt=\"Failed\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click \"resume\" to go on."
+msgid "The download has been paused (or failed)."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "Click on the play button to resume."
msgstr ""
#. type: Content of: <div><div><div><div><p>
msgid ""
"The download of the ISO image failed! Please check your network connection "
-"and try to resume..."
+"and click <span class=\"guilabel\">Retry</span>…"
msgstr ""
#. type: Content of: <div><div><div><div><div>
@@ -291,9 +318,10 @@ msgstr ""
msgid ""
"<span id=\"verify-text-state-calculating\" class=\"state calculating label "
"label-info\"><span class=\"verify-progress\">$PROGRESS</span></span> <span "
-"id=\"verify-text-state-done\" class=\"state success label label-success"
-"\">Done</span> <span id=\"verify-text-state-failed\" class=\"state failed "
-"label label-danger\">Failed</span>"
+"id=\"verify-text-state-done\" class=\"state success done\">[[!img install/"
+"inc/icons/check.png link=\"no\" alt=\"Done\"]]</span> <span id=\"verify-text-"
+"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
+"link=\"no\" alt=\"Failed\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
@@ -302,20 +330,17 @@ msgstr ""
#. type: Content of: <div><div><div><div><p>
msgid ""
-"You can now continue with the next step and <span class=\"install-clone\">"
-"[[Open these instructions on another device|install/clone#next]].</span> "
-"<span class=\"debian\">[[Install <span class=\"application\">Tails "
-"Installer</span>|install/debian/usb#next]].</span> <span class=\"windows\">"
+"You can now continue with the next step and <span class=\"windows\">"
"[[Install an intermediary Tails|install/win/usb#next]].</span> <span class="
-"\"linux\">[[Install an intermediary Tails|install/linux/usb#next]].</span> "
+"\"mac-usb\">[[Install an intermediary Tails|install/mac/usb#next]].</span> "
"<span class=\"mac-dvd\">[[Burn a Tails DVD|install/mac/dvd#next]].</span> "
-"<span class=\"mac-usb\">[[Install an intermediary Tails|install/mac/"
-"usb#next]].</span> <span class=\"mac-clone\">[[Open these instructions on "
-"another device|install/mac/clone#next]].</span> <span class=\"dvd\">[[Burn "
-"Tails on a DVD|install/dvd#next]].</span> <span class=\"upgrade-clone\">"
-"[[Open these instructions on another device|upgrade/clone#next]].</span> "
-"<span class=\"upgrade-tails\">[[Install an intermediary Tails|upgrade/"
-"tails#next]].</span>"
+"<span class=\"debian\">[[Install <span class=\"application\">Tails "
+"Installer</span>|install/debian/usb#next]].</span> <span class=\"linux\">"
+"[[Install an intermediary Tails|install/linux/usb#next]].</span> <span class="
+"\"upgrade-tails\">[[Install an intermediary Tails|upgrade/tails#next]].</"
+"span> <span class=\"dvd\">[[Burn Tails on a DVD|install/dvd#next]].</span> "
+"<span class=\"vm\">read our [[Introduction to virtual machines|install/"
+"vm#next]].</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
@@ -326,7 +351,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div>
-msgid "<a href=\"\" class=\"btn btn-lg btn-link\">Download again</a>"
+msgid "<a href=\"\" id=\"download-again\" class=\"\">Download again</a>"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -340,3 +365,7 @@ msgid ""
"The verification of the ISO image failed again! Please try to download again "
"from a different place or a different computer&hellip;"
msgstr ""
+
+#. type: Content of: outside any tag (error?)
+msgid "<a id=\"next\"></a>"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.fa.po b/wiki/src/install/inc/steps/download.inline.fa.po
index d54afe3..f8dfeca 100644
--- a/wiki/src/install/inc/steps/download.inline.fa.po
+++ b/wiki/src/install/inc/steps/download.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-21 21:19+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"
@@ -26,12 +26,21 @@ msgstr ""
msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <p>
msgid ""
-"In this step you will download Tails as an ISO image: a single file "
-"containing the whole operating system. For your security, it is very "
-"important to also verify your download. We propose you two techniques to do "
-"this verification automatically."
+"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
+"this step you</span> <span class=\"download-only\">You</span> will download "
+"Tails as an ISO image: a single file containing the whole operating system. "
+"For your security, it is very important to also verify your download. We "
+"propose you two techniques to do this verification automatically."
+msgstr ""
+
+#. type: Content of: <div>
+msgid "[[!img lib/spinner.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Please wait…"
msgstr ""
#. type: Content of: <div><div>
@@ -68,10 +77,19 @@ msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<code>https://tails.boum.org/download</code> <a href=\"?override=firefox\" "
-"class=\"btn btn-lg btn-primary browser-override\">I'm already in Firefox "
-"<span class=\"minver-firefox\">38.0.1</span>+ or Tor Browser <span class="
-"\"minver-tor\">5</span>+.</a>"
+"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/</"
+"code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/install/"
+"mac/usb/</code></span> <span class=\"mac-dvd\"><code>https://tails.boum.org/"
+"install/mac/dvd/</code></span> <span class=\"debian\"><code>https://tails."
+"boum.org/install/debian/usb/</code></span> <span class=\"linux"
+"\"><code>https://tails.boum.org/install/linux/usb/</code></span> <span class="
+"\"upgrade-tails\"><code>https://tails.boum.org/upgrade/tails/</code></span> "
+"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/</code></span> "
+"<span class=\"vm\"><code>https://tails.boum.org/install/vm/</code></span> "
+"<span class=\"download-only\"><code>https://tails.boum.org/install/download/"
+"</code></span> <a href=\"?override=firefox\" class=\"btn btn-lg btn-primary "
+"browser-override\">I'm already in Firefox <span class=\"minver-firefox"
+"\">38.0.1</span>+ or Tor Browser <span class=\"minver-tor\">5</span>+.</a>"
msgstr ""
#. type: Content of: <div><div><div><div><h2>
@@ -123,7 +141,9 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid "<span class=\"label label-success state done\">Done</span>"
+msgid ""
+"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
+"alt=\"Done\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -248,33 +268,40 @@ msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
"<small id=\"download-path\">Downloading to <span class=\"download-path\">"
-"$PATH</span></small>"
+"$PATH</span></small> <small id=\"downloaded-path\">Downloaded to <span class="
+"\"verify-file-path\">$PATH</span></small>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"btn btn-"
-"primary\">Pause</span> <span id=\"download-button-state-resume\" class=\"btn "
-"btn-primary\">Resume</span> <span id=\"download-button-state-cancel\" class="
-"\"btn btn-primary label-warning\">Cancel</span>"
+"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"\">[[!img "
+"install/inc/icons/pause.png link=\"no\" alt=\"Pause\"]]</span> <span id="
+"\"download-button-state-resume\" class=\"\">[[!img install/inc/icons/play."
+"png link=\"no\" alt=\"Resume\"]]</span> <span id=\"download-button-state-"
+"cancel\" class=\"btn btn-link\">Cancel</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id='download-text-pause'> Paused</span> <span id =\"download-text-done"
-"\" class=\"label label-success state\">Done</span> <span id =\"download-text-"
-"failed\" class=\"label label-warning state\">Failed</span>"
+"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
+"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
+"\"Done\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
+"install/inc/icons/failed.png link=\"no\" alt=\"Failed\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click \"resume\" to go on."
+msgid "The download has been paused (or failed)."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "Click on the play button to resume."
msgstr ""
#. type: Content of: <div><div><div><div><p>
msgid ""
"The download of the ISO image failed! Please check your network connection "
-"and try to resume..."
+"and click <span class=\"guilabel\">Retry</span>…"
msgstr ""
#. type: Content of: <div><div><div><div><div>
@@ -291,9 +318,10 @@ msgstr ""
msgid ""
"<span id=\"verify-text-state-calculating\" class=\"state calculating label "
"label-info\"><span class=\"verify-progress\">$PROGRESS</span></span> <span "
-"id=\"verify-text-state-done\" class=\"state success label label-success"
-"\">Done</span> <span id=\"verify-text-state-failed\" class=\"state failed "
-"label label-danger\">Failed</span>"
+"id=\"verify-text-state-done\" class=\"state success done\">[[!img install/"
+"inc/icons/check.png link=\"no\" alt=\"Done\"]]</span> <span id=\"verify-text-"
+"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
+"link=\"no\" alt=\"Failed\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
@@ -302,20 +330,17 @@ msgstr ""
#. type: Content of: <div><div><div><div><p>
msgid ""
-"You can now continue with the next step and <span class=\"install-clone\">"
-"[[Open these instructions on another device|install/clone#next]].</span> "
-"<span class=\"debian\">[[Install <span class=\"application\">Tails "
-"Installer</span>|install/debian/usb#next]].</span> <span class=\"windows\">"
+"You can now continue with the next step and <span class=\"windows\">"
"[[Install an intermediary Tails|install/win/usb#next]].</span> <span class="
-"\"linux\">[[Install an intermediary Tails|install/linux/usb#next]].</span> "
+"\"mac-usb\">[[Install an intermediary Tails|install/mac/usb#next]].</span> "
"<span class=\"mac-dvd\">[[Burn a Tails DVD|install/mac/dvd#next]].</span> "
-"<span class=\"mac-usb\">[[Install an intermediary Tails|install/mac/"
-"usb#next]].</span> <span class=\"mac-clone\">[[Open these instructions on "
-"another device|install/mac/clone#next]].</span> <span class=\"dvd\">[[Burn "
-"Tails on a DVD|install/dvd#next]].</span> <span class=\"upgrade-clone\">"
-"[[Open these instructions on another device|upgrade/clone#next]].</span> "
-"<span class=\"upgrade-tails\">[[Install an intermediary Tails|upgrade/"
-"tails#next]].</span>"
+"<span class=\"debian\">[[Install <span class=\"application\">Tails "
+"Installer</span>|install/debian/usb#next]].</span> <span class=\"linux\">"
+"[[Install an intermediary Tails|install/linux/usb#next]].</span> <span class="
+"\"upgrade-tails\">[[Install an intermediary Tails|upgrade/tails#next]].</"
+"span> <span class=\"dvd\">[[Burn Tails on a DVD|install/dvd#next]].</span> "
+"<span class=\"vm\">read our [[Introduction to virtual machines|install/"
+"vm#next]].</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
@@ -326,7 +351,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div>
-msgid "<a href=\"\" class=\"btn btn-lg btn-link\">Download again</a>"
+msgid "<a href=\"\" id=\"download-again\" class=\"\">Download again</a>"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -340,3 +365,7 @@ msgid ""
"The verification of the ISO image failed again! Please try to download again "
"from a different place or a different computer&hellip;"
msgstr ""
+
+#. type: Content of: outside any tag (error?)
+msgid "<a id=\"next\"></a>"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.fr.po b/wiki/src/install/inc/steps/download.inline.fr.po
index d54afe3..f8dfeca 100644
--- a/wiki/src/install/inc/steps/download.inline.fr.po
+++ b/wiki/src/install/inc/steps/download.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-21 21:19+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"
@@ -26,12 +26,21 @@ msgstr ""
msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <p>
msgid ""
-"In this step you will download Tails as an ISO image: a single file "
-"containing the whole operating system. For your security, it is very "
-"important to also verify your download. We propose you two techniques to do "
-"this verification automatically."
+"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
+"this step you</span> <span class=\"download-only\">You</span> will download "
+"Tails as an ISO image: a single file containing the whole operating system. "
+"For your security, it is very important to also verify your download. We "
+"propose you two techniques to do this verification automatically."
+msgstr ""
+
+#. type: Content of: <div>
+msgid "[[!img lib/spinner.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Please wait…"
msgstr ""
#. type: Content of: <div><div>
@@ -68,10 +77,19 @@ msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<code>https://tails.boum.org/download</code> <a href=\"?override=firefox\" "
-"class=\"btn btn-lg btn-primary browser-override\">I'm already in Firefox "
-"<span class=\"minver-firefox\">38.0.1</span>+ or Tor Browser <span class="
-"\"minver-tor\">5</span>+.</a>"
+"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/</"
+"code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/install/"
+"mac/usb/</code></span> <span class=\"mac-dvd\"><code>https://tails.boum.org/"
+"install/mac/dvd/</code></span> <span class=\"debian\"><code>https://tails."
+"boum.org/install/debian/usb/</code></span> <span class=\"linux"
+"\"><code>https://tails.boum.org/install/linux/usb/</code></span> <span class="
+"\"upgrade-tails\"><code>https://tails.boum.org/upgrade/tails/</code></span> "
+"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/</code></span> "
+"<span class=\"vm\"><code>https://tails.boum.org/install/vm/</code></span> "
+"<span class=\"download-only\"><code>https://tails.boum.org/install/download/"
+"</code></span> <a href=\"?override=firefox\" class=\"btn btn-lg btn-primary "
+"browser-override\">I'm already in Firefox <span class=\"minver-firefox"
+"\">38.0.1</span>+ or Tor Browser <span class=\"minver-tor\">5</span>+.</a>"
msgstr ""
#. type: Content of: <div><div><div><div><h2>
@@ -123,7 +141,9 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid "<span class=\"label label-success state done\">Done</span>"
+msgid ""
+"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
+"alt=\"Done\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -248,33 +268,40 @@ msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
"<small id=\"download-path\">Downloading to <span class=\"download-path\">"
-"$PATH</span></small>"
+"$PATH</span></small> <small id=\"downloaded-path\">Downloaded to <span class="
+"\"verify-file-path\">$PATH</span></small>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"btn btn-"
-"primary\">Pause</span> <span id=\"download-button-state-resume\" class=\"btn "
-"btn-primary\">Resume</span> <span id=\"download-button-state-cancel\" class="
-"\"btn btn-primary label-warning\">Cancel</span>"
+"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"\">[[!img "
+"install/inc/icons/pause.png link=\"no\" alt=\"Pause\"]]</span> <span id="
+"\"download-button-state-resume\" class=\"\">[[!img install/inc/icons/play."
+"png link=\"no\" alt=\"Resume\"]]</span> <span id=\"download-button-state-"
+"cancel\" class=\"btn btn-link\">Cancel</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id='download-text-pause'> Paused</span> <span id =\"download-text-done"
-"\" class=\"label label-success state\">Done</span> <span id =\"download-text-"
-"failed\" class=\"label label-warning state\">Failed</span>"
+"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
+"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
+"\"Done\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
+"install/inc/icons/failed.png link=\"no\" alt=\"Failed\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click \"resume\" to go on."
+msgid "The download has been paused (or failed)."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "Click on the play button to resume."
msgstr ""
#. type: Content of: <div><div><div><div><p>
msgid ""
"The download of the ISO image failed! Please check your network connection "
-"and try to resume..."
+"and click <span class=\"guilabel\">Retry</span>…"
msgstr ""
#. type: Content of: <div><div><div><div><div>
@@ -291,9 +318,10 @@ msgstr ""
msgid ""
"<span id=\"verify-text-state-calculating\" class=\"state calculating label "
"label-info\"><span class=\"verify-progress\">$PROGRESS</span></span> <span "
-"id=\"verify-text-state-done\" class=\"state success label label-success"
-"\">Done</span> <span id=\"verify-text-state-failed\" class=\"state failed "
-"label label-danger\">Failed</span>"
+"id=\"verify-text-state-done\" class=\"state success done\">[[!img install/"
+"inc/icons/check.png link=\"no\" alt=\"Done\"]]</span> <span id=\"verify-text-"
+"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
+"link=\"no\" alt=\"Failed\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
@@ -302,20 +330,17 @@ msgstr ""
#. type: Content of: <div><div><div><div><p>
msgid ""
-"You can now continue with the next step and <span class=\"install-clone\">"
-"[[Open these instructions on another device|install/clone#next]].</span> "
-"<span class=\"debian\">[[Install <span class=\"application\">Tails "
-"Installer</span>|install/debian/usb#next]].</span> <span class=\"windows\">"
+"You can now continue with the next step and <span class=\"windows\">"
"[[Install an intermediary Tails|install/win/usb#next]].</span> <span class="
-"\"linux\">[[Install an intermediary Tails|install/linux/usb#next]].</span> "
+"\"mac-usb\">[[Install an intermediary Tails|install/mac/usb#next]].</span> "
"<span class=\"mac-dvd\">[[Burn a Tails DVD|install/mac/dvd#next]].</span> "
-"<span class=\"mac-usb\">[[Install an intermediary Tails|install/mac/"
-"usb#next]].</span> <span class=\"mac-clone\">[[Open these instructions on "
-"another device|install/mac/clone#next]].</span> <span class=\"dvd\">[[Burn "
-"Tails on a DVD|install/dvd#next]].</span> <span class=\"upgrade-clone\">"
-"[[Open these instructions on another device|upgrade/clone#next]].</span> "
-"<span class=\"upgrade-tails\">[[Install an intermediary Tails|upgrade/"
-"tails#next]].</span>"
+"<span class=\"debian\">[[Install <span class=\"application\">Tails "
+"Installer</span>|install/debian/usb#next]].</span> <span class=\"linux\">"
+"[[Install an intermediary Tails|install/linux/usb#next]].</span> <span class="
+"\"upgrade-tails\">[[Install an intermediary Tails|upgrade/tails#next]].</"
+"span> <span class=\"dvd\">[[Burn Tails on a DVD|install/dvd#next]].</span> "
+"<span class=\"vm\">read our [[Introduction to virtual machines|install/"
+"vm#next]].</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
@@ -326,7 +351,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div>
-msgid "<a href=\"\" class=\"btn btn-lg btn-link\">Download again</a>"
+msgid "<a href=\"\" id=\"download-again\" class=\"\">Download again</a>"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -340,3 +365,7 @@ msgid ""
"The verification of the ISO image failed again! Please try to download again "
"from a different place or a different computer&hellip;"
msgstr ""
+
+#. type: Content of: outside any tag (error?)
+msgid "<a id=\"next\"></a>"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index 8801abc..3044683 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -3,9 +3,17 @@ Download and verify the Tails ISO image
<div class="step-image">[[!img install/inc/infography/download-and-verify.png link="no"]]</div>
-In this step you will download Tails as an ISO image: a single file containing the whole operating system.
+<p>
+<span class="windows mac-usb mac-dvd debian linux upgrade-tails dvd vm">In this step you</span>
+<span class="download-only">You</span>
+will download Tails as an ISO image: a single file containing the whole operating system.
For your security, it is very important to also verify your download. We propose you
-two techniques to do this verification automatically.
+two techniques to do this verification automatically.</p>
+
+<div id="dave-init">
+ [[!img lib/spinner.png link="no"]]<br />
+ <p>Please wait…</p>
+</div>
<div id="download-and-verify">
<div id="extension-version">0.2.7rc1</div>
@@ -20,7 +28,15 @@ two techniques to do this verification automatically.
Tor Browser <span class="minver-tor">5</span>+</p>
<p>A Firefox add-on to download and verify Tails automatically.</p>
<p>Copy and paste this link in Firefox or Tor Browser:</p>
- <code>https://tails.boum.org/download</code>
+ <span class="windows"><code>https://tails.boum.org/install/win/usb/</code></span>
+ <span class="mac-usb"><code>https://tails.boum.org/install/mac/usb/</code></span>
+ <span class="mac-dvd"><code>https://tails.boum.org/install/mac/dvd/</code></span>
+ <span class="debian"><code>https://tails.boum.org/install/debian/usb/</code></span>
+ <span class="linux"><code>https://tails.boum.org/install/linux/usb/</code></span>
+ <span class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails/</code></span>
+ <span class="dvd"><code>https://tails.boum.org/install/dvd/</code></span>
+ <span class="vm"><code>https://tails.boum.org/install/vm/</code></span>
+ <span class="download-only"><code>https://tails.boum.org/install/download/</code></span>
<a href="?override=firefox" class="btn btn-lg btn-primary browser-override">I'm already in Firefox <span class="minver-firefox">38.0.1</span>+ or Tor Browser <span class="minver-tor">5</span>+.</a>
</div>
<div class="col-md-6 bittorrent">
@@ -45,7 +61,15 @@ two techniques to do this verification automatically.
<p id="unsupported-firefox">You are running Firefox <span class="current-firefox">1.0</span>.
Please update to Firefox <span class="minver-firefox">38.0.1</span>, Tor Browser <span class="minver-tor">5</span>, or newer and visit this link:</p>
<p id="unsupported-other">Copy and paste this link in Firefox or Tor Browser:</p>
- <code>https://tails.boum.org/download</code>
+ <span class="windows"><code>https://tails.boum.org/install/win/usb/</code></span>
+ <span class="mac-usb"><code>https://tails.boum.org/install/mac/usb/</code></span>
+ <span class="mac-dvd"><code>https://tails.boum.org/install/mac/dvd/</code></span>
+ <span class="debian"><code>https://tails.boum.org/install/debian/usb/</code></span>
+ <span class="linux"><code>https://tails.boum.org/install/linux/usb/</code></span>
+ <span class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails/</code></span>
+ <span class="dvd"><code>https://tails.boum.org/install/dvd/</code></span>
+ <span class="vm"><code>https://tails.boum.org/install/vm/</code></span>
+ <span class="download-only"><code>https://tails.boum.org/install/download/</code></span>
<a href="?override=firefox" class="btn btn-lg btn-primary browser-override">I'm already in Firefox <span class="minver-firefox">38.0.1</span>+ or Tor Browser <span class="minver-tor">5</span>+.</a>
</div>
<div class="col-md-6 bittorrent">
@@ -70,7 +94,7 @@ two techniques to do this verification automatically.
<div id="use-text" class="btn btn-lg disabled clearfix">
<span id="use-text-label" class="pull-left">Use Firefox add-on</span>
<div id="use-text-state" class="pull-right">
- <span class="label label-success state done">Done</span>
+ <span class="state done">[[!img install/inc/icons/check.png link="no" alt="Done"]]</span>
</div>
</div>
</div>
@@ -85,7 +109,7 @@ two techniques to do this verification automatically.
<div id="update-text" class="btn btn-lg disabled clearfix">
<span id="update-button-label" class="pull-left">Update Firefox add-on</span>
<div id="update-text-state" class="pull-right">
- <span class="label label-success state done">Done</span>
+ <span class="state done">[[!img install/inc/icons/check.png link="no" alt="Done"]]</span>
</div>
</div>
</div>
@@ -108,7 +132,7 @@ two techniques to do this verification automatically.
<div id="install-text" class="btn btn-lg disabled clearfix">
<span id="install-text-label" class="pull-left">Install Firefox add-on</span>
<div id="install-text-state" class="pull-right">
- <span class="label label-success state done">Done</span>
+ <span class="state done">[[!img install/inc/icons/check.png link="no" alt="Done"]]</span>
</div>
</div>
</div>
@@ -132,7 +156,7 @@ two techniques to do this verification automatically.
<small id="download-button-size">(<span class="iso-size-MiB">$SIZE</span> MiB)</small>
</span>
</a>
- <div id="download-text" class="btn btn-lg clearfix">
+ <div id="download-text" class="btn-lg clearfix">
<div id="download-text-left" class="pull-left clearfix">
<div id="download-text-label" class="pull-left">Download Tails <span class="iso-version">[[!inline pages="inc/stable_i386_version" raw="yes"]]</span> ISO image
<small id="download-eta">
@@ -156,60 +180,61 @@ two techniques to do this verification automatically.
</div>
</div>
<small id="download-path">Downloading to <span class="download-path">$PATH</span></small>
+ <small id="downloaded-path">Downloaded to <span class="verify-file-path">$PATH</span></small>
+
</div>
<div id="download-button-state" class="pull-right">
<a id="download-button-state-retry" href="#" class="btn btn-primary iso-url">Retry</a>
- <span id="download-button-state-pause" class="btn btn-primary">Pause</span>
- <span id="download-button-state-resume" class="btn btn-primary">Resume</span>
- <span id="download-button-state-cancel" class="btn btn-primary label-warning">Cancel</span>
+ <span id="download-button-state-pause" class="">[[!img install/inc/icons/pause.png link="no" alt="Pause"]]</span>
+ <span id="download-button-state-resume" class="">[[!img install/inc/icons/play.png link="no" alt="Resume"]]</span>
+ <span id="download-button-state-cancel" class="btn btn-link">Cancel</span>
</div>
<div id="download-text-state" class="pull-right">
<span id='download-text-pause'>
- Paused</span>
- <span id ="download-text-done" class="label label-success state">Done</span>
- <span id ="download-text-failed" class="label label-warning state">Failed</span>
+ </span>
+ <span id ="download-text-done" class="state done">[[!img install/inc/icons/check.png link="no" alt="Done"]]</span>
+ <span id ="download-text-failed" class="state">[[!img install/inc/icons/failed.png link="no" alt="Failed"]]</span>
</div>
</div>
<div id="download-message">
- <div id="download-message-paused">
- <p>The download has been paused. Click "resume" to go on.</p>
- </div>
- <div id="download-message-failed">
- <p>The download of the ISO image failed! Please check your network connection and try to resume...</p>
- </div>
+ <div id="download-message-paused">
+ <p>The download has been paused (or failed).<br />
+ Click on the play button to resume.</p>
+ </div>
+ <div id="download-message-failed">
+ <p>The download of the ISO image failed! Please check your network connection and click <span class="guilabel">Retry</span>…</p>
+ </div>
</div>
</div>
<div id="verify">
- <div id="verify-text" class="btn btn-lg clearfix">
+ <div id="verify-text" class="btn-lg clearfix">
<div class="pull-left">
<div id="verify-text-label">Verify ISO image</div>
<small id="verify-text-calculating">Computing SHA-256 checksum&hellip;</small>
</div>
<div id="verify-text-state" class="pull-right">
<span id="verify-text-state-calculating" class="state calculating label label-info"><span class="verify-progress">$PROGRESS</span></span>
- <span id="verify-text-state-done" class="state success label label-success">Done</span>
- <span id="verify-text-state-failed" class="state failed label label-danger">Failed</span>
+ <span id="verify-text-state-done" class="state success done">[[!img install/inc/icons/check.png link="no" alt="Done"]]</span>
+ <span id="verify-text-state-failed" class="state failed">[[!img install/inc/icons/failed.png link="no" alt="Failed"]]</span>
</div>
</div>
<div id="verify-text-success" class="bg-success">
<div class="trophy">
<p>You downloaded and verified the ISO image successfully!</p>
- <p>You can now continue with the next step and
- <span class="install-clone">[[Open these instructions on another device|install/clone#next]].</span>
- <span class="debian">[[Install <span class="application">Tails Installer</span>|install/debian/usb#next]].</span>
+ <p class="windows mac-usb mac-dvd debian linux upgrade-tails dvd vm">You can now continue with the next step and
<span class="windows">[[Install an intermediary Tails|install/win/usb#next]].</span>
- <span class="linux">[[Install an intermediary Tails|install/linux/usb#next]].</span>
- <span class="mac-dvd">[[Burn a Tails DVD|install/mac/dvd#next]].</span>
<span class="mac-usb">[[Install an intermediary Tails|install/mac/usb#next]].</span>
- <span class="mac-clone">[[Open these instructions on another device|install/mac/clone#next]].</span>
- <span class="dvd">[[Burn Tails on a DVD|install/dvd#next]].</span>
- <span class="upgrade-clone">[[Open these instructions on another device|upgrade/clone#next]].</span>
+ <span class="mac-dvd">[[Burn a Tails DVD|install/mac/dvd#next]].</span>
+ <span class="debian">[[Install <span class="application">Tails Installer</span>|install/debian/usb#next]].</span>
+ <span class="linux">[[Install an intermediary Tails|install/linux/usb#next]].</span>
<span class="upgrade-tails">[[Install an intermediary Tails|upgrade/tails#next]].</span>
+ <span class="dvd">[[Burn Tails on a DVD|install/dvd#next]].</span>
+ <span class="vm">read our [[Introduction to virtual machines|install/vm#next]].</span>
</p>
<p class="openpgp">If you are knowledgeable about OpenPGP, you can do additional verification using the <a href='[[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]'>OpenPGP signature</a>.</p>
</div>
- <a href="" class="btn btn-lg btn-link">Download again</a>
+ <a href="" id="download-again" class="">Download again</a>
</div>
<div id="verify-text-failure" class="bg-warning">
@@ -220,3 +245,5 @@ two techniques to do this verification automatically.
</div>
</div>
</div>
+
+<a id="next"></a>
diff --git a/wiki/src/install/inc/steps/download.inline.pt.po b/wiki/src/install/inc/steps/download.inline.pt.po
index d54afe3..f8dfeca 100644
--- a/wiki/src/install/inc/steps/download.inline.pt.po
+++ b/wiki/src/install/inc/steps/download.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-21 21:19+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"
@@ -26,12 +26,21 @@ msgstr ""
msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <p>
msgid ""
-"In this step you will download Tails as an ISO image: a single file "
-"containing the whole operating system. For your security, it is very "
-"important to also verify your download. We propose you two techniques to do "
-"this verification automatically."
+"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
+"this step you</span> <span class=\"download-only\">You</span> will download "
+"Tails as an ISO image: a single file containing the whole operating system. "
+"For your security, it is very important to also verify your download. We "
+"propose you two techniques to do this verification automatically."
+msgstr ""
+
+#. type: Content of: <div>
+msgid "[[!img lib/spinner.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Please wait…"
msgstr ""
#. type: Content of: <div><div>
@@ -68,10 +77,19 @@ msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<code>https://tails.boum.org/download</code> <a href=\"?override=firefox\" "
-"class=\"btn btn-lg btn-primary browser-override\">I'm already in Firefox "
-"<span class=\"minver-firefox\">38.0.1</span>+ or Tor Browser <span class="
-"\"minver-tor\">5</span>+.</a>"
+"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/</"
+"code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/install/"
+"mac/usb/</code></span> <span class=\"mac-dvd\"><code>https://tails.boum.org/"
+"install/mac/dvd/</code></span> <span class=\"debian\"><code>https://tails."
+"boum.org/install/debian/usb/</code></span> <span class=\"linux"
+"\"><code>https://tails.boum.org/install/linux/usb/</code></span> <span class="
+"\"upgrade-tails\"><code>https://tails.boum.org/upgrade/tails/</code></span> "
+"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/</code></span> "
+"<span class=\"vm\"><code>https://tails.boum.org/install/vm/</code></span> "
+"<span class=\"download-only\"><code>https://tails.boum.org/install/download/"
+"</code></span> <a href=\"?override=firefox\" class=\"btn btn-lg btn-primary "
+"browser-override\">I'm already in Firefox <span class=\"minver-firefox"
+"\">38.0.1</span>+ or Tor Browser <span class=\"minver-tor\">5</span>+.</a>"
msgstr ""
#. type: Content of: <div><div><div><div><h2>
@@ -123,7 +141,9 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid "<span class=\"label label-success state done\">Done</span>"
+msgid ""
+"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
+"alt=\"Done\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -248,33 +268,40 @@ msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
"<small id=\"download-path\">Downloading to <span class=\"download-path\">"
-"$PATH</span></small>"
+"$PATH</span></small> <small id=\"downloaded-path\">Downloaded to <span class="
+"\"verify-file-path\">$PATH</span></small>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"btn btn-"
-"primary\">Pause</span> <span id=\"download-button-state-resume\" class=\"btn "
-"btn-primary\">Resume</span> <span id=\"download-button-state-cancel\" class="
-"\"btn btn-primary label-warning\">Cancel</span>"
+"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"\">[[!img "
+"install/inc/icons/pause.png link=\"no\" alt=\"Pause\"]]</span> <span id="
+"\"download-button-state-resume\" class=\"\">[[!img install/inc/icons/play."
+"png link=\"no\" alt=\"Resume\"]]</span> <span id=\"download-button-state-"
+"cancel\" class=\"btn btn-link\">Cancel</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id='download-text-pause'> Paused</span> <span id =\"download-text-done"
-"\" class=\"label label-success state\">Done</span> <span id =\"download-text-"
-"failed\" class=\"label label-warning state\">Failed</span>"
+"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
+"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
+"\"Done\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
+"install/inc/icons/failed.png link=\"no\" alt=\"Failed\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click \"resume\" to go on."
+msgid "The download has been paused (or failed)."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "Click on the play button to resume."
msgstr ""
#. type: Content of: <div><div><div><div><p>
msgid ""
"The download of the ISO image failed! Please check your network connection "
-"and try to resume..."
+"and click <span class=\"guilabel\">Retry</span>…"
msgstr ""
#. type: Content of: <div><div><div><div><div>
@@ -291,9 +318,10 @@ msgstr ""
msgid ""
"<span id=\"verify-text-state-calculating\" class=\"state calculating label "
"label-info\"><span class=\"verify-progress\">$PROGRESS</span></span> <span "
-"id=\"verify-text-state-done\" class=\"state success label label-success"
-"\">Done</span> <span id=\"verify-text-state-failed\" class=\"state failed "
-"label label-danger\">Failed</span>"
+"id=\"verify-text-state-done\" class=\"state success done\">[[!img install/"
+"inc/icons/check.png link=\"no\" alt=\"Done\"]]</span> <span id=\"verify-text-"
+"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
+"link=\"no\" alt=\"Failed\"]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
@@ -302,20 +330,17 @@ msgstr ""
#. type: Content of: <div><div><div><div><p>
msgid ""
-"You can now continue with the next step and <span class=\"install-clone\">"
-"[[Open these instructions on another device|install/clone#next]].</span> "
-"<span class=\"debian\">[[Install <span class=\"application\">Tails "
-"Installer</span>|install/debian/usb#next]].</span> <span class=\"windows\">"
+"You can now continue with the next step and <span class=\"windows\">"
"[[Install an intermediary Tails|install/win/usb#next]].</span> <span class="
-"\"linux\">[[Install an intermediary Tails|install/linux/usb#next]].</span> "
+"\"mac-usb\">[[Install an intermediary Tails|install/mac/usb#next]].</span> "
"<span class=\"mac-dvd\">[[Burn a Tails DVD|install/mac/dvd#next]].</span> "
-"<span class=\"mac-usb\">[[Install an intermediary Tails|install/mac/"
-"usb#next]].</span> <span class=\"mac-clone\">[[Open these instructions on "
-"another device|install/mac/clone#next]].</span> <span class=\"dvd\">[[Burn "
-"Tails on a DVD|install/dvd#next]].</span> <span class=\"upgrade-clone\">"
-"[[Open these instructions on another device|upgrade/clone#next]].</span> "
-"<span class=\"upgrade-tails\">[[Install an intermediary Tails|upgrade/"
-"tails#next]].</span>"
+"<span class=\"debian\">[[Install <span class=\"application\">Tails "
+"Installer</span>|install/debian/usb#next]].</span> <span class=\"linux\">"
+"[[Install an intermediary Tails|install/linux/usb#next]].</span> <span class="
+"\"upgrade-tails\">[[Install an intermediary Tails|upgrade/tails#next]].</"
+"span> <span class=\"dvd\">[[Burn Tails on a DVD|install/dvd#next]].</span> "
+"<span class=\"vm\">read our [[Introduction to virtual machines|install/"
+"vm#next]].</span>"
msgstr ""
#. type: Content of: <div><div><div><div><p>
@@ -326,7 +351,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div>
-msgid "<a href=\"\" class=\"btn btn-lg btn-link\">Download again</a>"
+msgid "<a href=\"\" id=\"download-again\" class=\"\">Download again</a>"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -340,3 +365,7 @@ msgid ""
"The verification of the ISO image failed again! Please try to download again "
"from a different place or a different computer&hellip;"
msgstr ""
+
+#. type: Content of: outside any tag (error?)
+msgid "<a id=\"next\"></a>"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/install_final.inline.de.po b/wiki/src/install/inc/steps/install_final.inline.de.po
index b778af7..57b33d6 100644
--- a/wiki/src/install/inc/steps/install_final.inline.de.po
+++ b/wiki/src/install/inc/steps/install_final.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 class=\"dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
@@ -97,7 +97,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"dvd\"]]\n"
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -109,8 +109,8 @@ msgstr ""
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"debian expert dvd\">the</span> USB stick in the "
-"computer."
+"Tails</span> <span class=\"debian expert mac-dvd\">the</span> USB stick in "
+"the computer."
msgstr ""
#. type: Plain text
@@ -181,7 +181,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"dvd\"]]\n"
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Bullet: '1. '
@@ -196,7 +196,7 @@ msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
-" <span class=\"debian expert dvd upgrade-clone\">your</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
@@ -209,8 +209,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Read the warning message in the pop-up window. Click <span class=\"button"
-"\">Yes</span> to confirm."
+"Read the warning message in the confirmation dialog. Click <span class="
+"\"button\">Yes</span> to confirm."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_final.inline.fa.po b/wiki/src/install/inc/steps/install_final.inline.fa.po
index b778af7..57b33d6 100644
--- a/wiki/src/install/inc/steps/install_final.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_final.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 class=\"dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
@@ -97,7 +97,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"dvd\"]]\n"
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -109,8 +109,8 @@ msgstr ""
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"debian expert dvd\">the</span> USB stick in the "
-"computer."
+"Tails</span> <span class=\"debian expert mac-dvd\">the</span> USB stick in "
+"the computer."
msgstr ""
#. type: Plain text
@@ -181,7 +181,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"dvd\"]]\n"
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Bullet: '1. '
@@ -196,7 +196,7 @@ msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
-" <span class=\"debian expert dvd upgrade-clone\">your</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
@@ -209,8 +209,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Read the warning message in the pop-up window. Click <span class=\"button"
-"\">Yes</span> to confirm."
+"Read the warning message in the confirmation dialog. Click <span class="
+"\"button\">Yes</span> to confirm."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_final.inline.fr.po b/wiki/src/install/inc/steps/install_final.inline.fr.po
index b778af7..57b33d6 100644
--- a/wiki/src/install/inc/steps/install_final.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_final.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 class=\"dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
@@ -97,7 +97,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"dvd\"]]\n"
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -109,8 +109,8 @@ msgstr ""
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"debian expert dvd\">the</span> USB stick in the "
-"computer."
+"Tails</span> <span class=\"debian expert mac-dvd\">the</span> USB stick in "
+"the computer."
msgstr ""
#. type: Plain text
@@ -181,7 +181,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"dvd\"]]\n"
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Bullet: '1. '
@@ -196,7 +196,7 @@ msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
-" <span class=\"debian expert dvd upgrade-clone\">your</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
@@ -209,8 +209,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Read the warning message in the pop-up window. Click <span class=\"button"
-"\">Yes</span> to confirm."
+"Read the warning message in the confirmation dialog. Click <span class="
+"\"button\">Yes</span> to confirm."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_final.inline.mdwn b/wiki/src/install/inc/steps/install_final.inline.mdwn
index 1c47947..a06ebb0 100644
--- a/wiki/src/install/inc/steps/install_final.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_final.inline.mdwn
@@ -1,6 +1,6 @@
<h1 class="debian expert install-clone mac-clone">Install Tails</h1>
<h1 class="windows linux mac-usb">Install the final Tails</h1>
-<h1 class="dvd">Install Tails on a USB stick</h1>
+<h1 class="mac-dvd">Install Tails on a USB stick</h1>
<h1 class="upgrade">Upgrade your Tails</h1>
<p class="debian windows linux mac expert">
@@ -37,7 +37,7 @@
<div class="step-image">
[[!img install/inc/infography/plug-usb.png link="no" class="debian"]]
[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb install-clone mac-clone"]]
-[[!img install/inc/infography/plug-tails-usb.png link="no" class="dvd"]]
+[[!img install/inc/infography/plug-tails-usb.png link="no" class="mac-dvd"]]
[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-clone upgrade-tails"]]
</div>
@@ -45,7 +45,7 @@
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="upgrade">your Tails</span>
- <span class="debian expert dvd">the</span>
+ <span class="debian expert mac-dvd">the</span>
USB stick in the computer.
1. <div class="windows linux mac upgrade install-clone"><p>
@@ -78,7 +78,7 @@
<div class="step-image">
[[!img install/inc/infography/install-tails.png link="no" class="debian"]]
[[!img install/inc/infography/clone-intermediary-tails.png link="no" class="windows linux mac-usb clone upgrade-tails"]]
- [[!img install/inc/infography/clone-dvd.png link="no" class="dvd"]]
+ [[!img install/inc/infography/clone-dvd.png link="no" class="mac-dvd"]]
</div>
1. <p class="debian expert">Click <span class="button">Browse</span>
@@ -87,7 +87,7 @@
Choose
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
- <span class="debian expert dvd upgrade-clone">your</span>
+ <span class="debian expert mac-dvd upgrade-clone">your</span>
USB stick in the <span class="guilabel">Target Device</span> drop-down list.
1. To start the
@@ -104,7 +104,7 @@
</div>
-1. Read the warning message in the pop-up window. Click
+1. Read the warning message in the confirmation dialog. Click
<span class="button">Yes</span> to confirm.
The
diff --git a/wiki/src/install/inc/steps/install_final.inline.pt.po b/wiki/src/install/inc/steps/install_final.inline.pt.po
index b778af7..57b33d6 100644
--- a/wiki/src/install/inc/steps/install_final.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_final.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 class=\"dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
@@ -97,7 +97,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"dvd\"]]\n"
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -109,8 +109,8 @@ msgstr ""
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"debian expert dvd\">the</span> USB stick in the "
-"computer."
+"Tails</span> <span class=\"debian expert mac-dvd\">the</span> USB stick in "
+"the computer."
msgstr ""
#. type: Plain text
@@ -181,7 +181,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"dvd\"]]\n"
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Bullet: '1. '
@@ -196,7 +196,7 @@ msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
-" <span class=\"debian expert dvd upgrade-clone\">your</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
@@ -209,8 +209,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Read the warning message in the pop-up window. Click <span class=\"button"
-"\">Yes</span> to confirm."
+"Read the warning message in the confirmation dialog. Click <span class="
+"\"button\">Yes</span> to confirm."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po b/wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po
index e7e9a55..87d8db0 100644
--- a/wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po
+++ b/wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 13:04+0000\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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"state-image\">[[!img install/inc/infography/intermediary-tails.png link=\"no\"]]</div>\n"
+msgid "<div class=\"state-image\" id=\"intermediary\">[[!img install/inc/infography/intermediary-tails.png link=\"no\"]]</div>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po b/wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po
index fb2a0c1..87d8db0 100644
--- a/wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 13:04+0000\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"
@@ -18,9 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"<div class=\"state-image\">[[!img "
-"install/inc/infography/intermediary-tails.png link=\"no\"]]</div>\n"
+msgid "<div class=\"state-image\" id=\"intermediary\">[[!img install/inc/infography/intermediary-tails.png link=\"no\"]]</div>\n"
msgstr ""
#. type: Plain text
@@ -34,8 +32,7 @@ msgid ""
"<p>Cool, you now have an intermediary Tails on your first USB stick. You\n"
"will soon have to restart your computer on this USB stick.\n"
"<span class=\"windows linux\">It can be a bit tricky, so good luck!</span>\n"
-"<span class=\"mac\">But it might not work on your Mac model, so good "
-"luck!</span>\n"
+"<span class=\"mac\">But it might not work on your Mac model, so good luck!</span>\n"
"</p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po b/wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po
index e7e9a55..87d8db0 100644
--- a/wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 13:04+0000\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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"state-image\">[[!img install/inc/infography/intermediary-tails.png link=\"no\"]]</div>\n"
+msgid "<div class=\"state-image\" id=\"intermediary\">[[!img install/inc/infography/intermediary-tails.png link=\"no\"]]</div>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn b/wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn
index b6091c5..de02539 100644
--- a/wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn
@@ -1,4 +1,4 @@
-<div class="state-image">[[!img install/inc/infography/intermediary-tails.png link="no"]]</div>
+<div class="state-image" id="intermediary">[[!img install/inc/infography/intermediary-tails.png link="no"]]</div>
<div class="trophy">
diff --git a/wiki/src/install/inc/steps/install_intermediary_outro.inline.pt.po b/wiki/src/install/inc/steps/install_intermediary_outro.inline.pt.po
index e7e9a55..87d8db0 100644
--- a/wiki/src/install/inc/steps/install_intermediary_outro.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_intermediary_outro.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 13:04+0000\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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"state-image\">[[!img install/inc/infography/intermediary-tails.png link=\"no\"]]</div>\n"
+msgid "<div class=\"state-image\" id=\"intermediary\">[[!img install/inc/infography/intermediary-tails.png link=\"no\"]]</div>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_tails_installer.inline.de.po b/wiki/src/install/inc/steps/install_tails_installer.inline.de.po
index 67c5f0b..0557d1e 100644
--- a/wiki/src/install/inc/steps/install_tails_installer.inline.de.po
+++ b/wiki/src/install/inc/steps/install_tails_installer.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -30,5 +30,55 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
+msgid "Debian 8 (Jessie) or later in the backports repository"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid "Ubuntu 14.04 (Trusty) or later in a PPA (*Personal Package Archive*)"
msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip debian\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To know your version of Debian or Ubuntu, open\n"
+"<span class=\"application\">System Settings</span> and click on\n"
+"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+"<span class=\"guilabel\">Base system</span> information.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip expert\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To know your version of Ubuntu, execute\n"
+"<span class=\"command\">lsb_release -a</span>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If it is impossible to install <span class=\"application\">Tails\n"
+"Installer</span> in your version of Ubuntu or Debian, you can [[install Tails using\n"
+"<span class=\"application\">GNOME Disks</span>|install/linux/usb/overview]]\n"
+"instead. But it is more complicated and requires two USB sticks instead of\n"
+"one.</span></p>\n"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/install_tails_installer.inline.fa.po b/wiki/src/install/inc/steps/install_tails_installer.inline.fa.po
index 73322c8..0557d1e 100644
--- a/wiki/src/install/inc/steps/install_tails_installer.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_tails_installer.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -30,5 +30,55 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
+msgid "Debian 8 (Jessie) or later in the backports repository"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid "Ubuntu 14.04 (Trusty) or later in a PPA (*Personal Package Archive*)"
msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip debian\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To know your version of Debian or Ubuntu, open\n"
+"<span class=\"application\">System Settings</span> and click on\n"
+"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+"<span class=\"guilabel\">Base system</span> information.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip expert\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To know your version of Ubuntu, execute\n"
+"<span class=\"command\">lsb_release -a</span>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If it is impossible to install <span class=\"application\">Tails\n"
+"Installer</span> in your version of Ubuntu or Debian, you can [[install Tails using\n"
+"<span class=\"application\">GNOME Disks</span>|install/linux/usb/overview]]\n"
+"instead. But it is more complicated and requires two USB sticks instead of\n"
+"one.</span></p>\n"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/install_tails_installer.inline.fr.po b/wiki/src/install/inc/steps/install_tails_installer.inline.fr.po
index 67c5f0b..0557d1e 100644
--- a/wiki/src/install/inc/steps/install_tails_installer.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_tails_installer.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -30,5 +30,55 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
+msgid "Debian 8 (Jessie) or later in the backports repository"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid "Ubuntu 14.04 (Trusty) or later in a PPA (*Personal Package Archive*)"
msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip debian\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To know your version of Debian or Ubuntu, open\n"
+"<span class=\"application\">System Settings</span> and click on\n"
+"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+"<span class=\"guilabel\">Base system</span> information.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip expert\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To know your version of Ubuntu, execute\n"
+"<span class=\"command\">lsb_release -a</span>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If it is impossible to install <span class=\"application\">Tails\n"
+"Installer</span> in your version of Ubuntu or Debian, you can [[install Tails using\n"
+"<span class=\"application\">GNOME Disks</span>|install/linux/usb/overview]]\n"
+"instead. But it is more complicated and requires two USB sticks instead of\n"
+"one.</span></p>\n"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/install_tails_installer.inline.mdwn b/wiki/src/install/inc/steps/install_tails_installer.inline.mdwn
index bba38be..517d71a 100644
--- a/wiki/src/install/inc/steps/install_tails_installer.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_tails_installer.inline.mdwn
@@ -5,4 +5,31 @@ In this step, you will install <span class="application">Tails
Installer</span>, a program designed specifically for installing Tails.
<span class="application">Tails Installer</span> is available in:
+ - Debian 8 (Jessie) or later in the backports repository
- Ubuntu 14.04 (Trusty) or later in a PPA (*Personal Package Archive*)
+
+<div class="tip debian">
+
+<p>To know your version of Debian or Ubuntu, open
+<span class="application">System Settings</span> and click on
+<span class="guilabel">Details</span>. For Debian, refer to the
+<span class="guilabel">Base system</span> information.</p>
+
+</div>
+
+<div class="tip expert">
+
+<p>To know your version of Ubuntu, execute
+<span class="command">lsb_release -a</span>.</p>
+
+</div>
+
+<div class="tip">
+
+<p>If it is impossible to install <span class="application">Tails
+Installer</span> in your version of Ubuntu or Debian, you can [[install Tails using
+<span class="application">GNOME Disks</span>|install/linux/usb/overview]]
+instead. But it is more complicated and requires two USB sticks instead of
+one.</span></p>
+
+</div>
diff --git a/wiki/src/install/inc/steps/install_tails_installer.inline.pt.po b/wiki/src/install/inc/steps/install_tails_installer.inline.pt.po
index 67c5f0b..0557d1e 100644
--- a/wiki/src/install/inc/steps/install_tails_installer.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_tails_installer.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -30,5 +30,55 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
+msgid "Debian 8 (Jessie) or later in the backports repository"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid "Ubuntu 14.04 (Trusty) or later in a PPA (*Personal Package Archive*)"
msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip debian\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To know your version of Debian or Ubuntu, open\n"
+"<span class=\"application\">System Settings</span> and click on\n"
+"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+"<span class=\"guilabel\">Base system</span> information.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip expert\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>To know your version of Ubuntu, execute\n"
+"<span class=\"command\">lsb_release -a</span>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>If it is impossible to install <span class=\"application\">Tails\n"
+"Installer</span> in your version of Ubuntu or Debian, you can [[install Tails using\n"
+"<span class=\"application\">GNOME Disks</span>|install/linux/usb/overview]]\n"
+"instead. But it is more complicated and requires two USB sticks instead of\n"
+"one.</span></p>\n"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/not_at_all.inline.de.po b/wiki/src/install/inc/steps/not_at_all.inline.de.po
index 949d21e..6df655d 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.de.po
+++ b/wiki/src/install/inc/steps/not_at_all.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -57,6 +57,14 @@ msgstr ""
msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
+#. type: Bullet: ' 1. '
+msgid "Shut down the computer."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
@@ -71,7 +79,6 @@ msgid ""
" <tr><th>Manufacturer</th><th>Key</th></tr>\n"
" <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
" <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
-" <tr><td>Compaq</td><td>Esc, F9</td></tr>\n"
" <tr><td>Dell</td><td>F12</td></tr>\n"
" <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
" <tr><td>HP</td><td>Esc, F9</td></tr>\n"
@@ -84,44 +91,55 @@ msgid ""
msgstr ""
#. type: Bullet: ' 1. '
-msgid "Make sure that the first USB stick is plugged in the computer."
+msgid "Switch on the computer."
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Shut down the computer."
+#. type: Plain text
+#, no-wrap
+msgid " Immediately press several times the first potential boot menu key identified in step 3.\n"
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Switch on the computer."
+#. type: Plain text
+#, no-wrap
+msgid ""
+" a. If a boot menu with a list of devices appears, select your USB stick\n"
+" and press <span class=\"keycap\">Enter</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " Immediately press several times the first potential boot menu key identified in step 1.\n"
+msgid " a. If the computer starts on another operating system, then:\n"
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' 1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
-"If a boot menu with a list of possible devices to start from appears, select "
-"the first USB stick in the list and press <span class=\"keycap\">Enter</"
-"span>."
+" a. If a boot menu with a list of devices appears, select your USB stick\n"
+" and press <span class=\"keycap\">Enter</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - If the computer starts on\n"
-" <span class=\"debian\">Ubuntu,</span>\n"
-" <span class=\"windows\">Windows,</span>\n"
-" <span class=\"linux\">Linux,</span>\n"
-"\trepeat steps 2 and 3 for all the potential boot menu keys\n"
-" identified in step 1.\n"
+" a. If the computer starts on another operating system or returns an\n"
+" error message, then shut down the computer again and repeat step\n"
+" 4 for all the potential boot menu keys identified in step 3.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If none of the potential boot menu keys identified in step 1 work or if\n"
+" If none of the potential boot menu keys identified in step 3 work or if\n"
" the USB stick does not appear in the list, then try the second\n"
" troubleshooting technique described below.\n"
msgstr ""
@@ -140,8 +158,17 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
-" <p>Search for the user guide of the computer on the website of its\n"
-" manufacturer to learn how to edit the BIOS settings.</p>\n"
+" <p>Search for the user manual of the computer on the website of its\n"
+" manufacturer to learn how to edit the BIOS settings: [Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers),\n"
+" [Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/),\n"
+" [Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/),\n"
+" [Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/),\n"
+" [HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/),\n"
+" [Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/),\n"
+" [Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads),\n"
+" [Sony](http://esupport.sony.com/US](http://esupport.sony.com/US), or\n"
+" [Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers).\n"
+" </p>\n"
" </div>\n"
msgstr ""
@@ -158,10 +185,8 @@ msgstr ""
msgid ""
" <div class=\"caution\">\n"
" <p>Take note of the changes that you apply to the BIOS settings, to be\n"
-" able to revert them if they prevent the computer to start on\n"
-" <span class=\"debian\">Ubuntu.</span>\n"
-" <span class=\"windows\">Windows.</span>\n"
-" <span class=\"linux\">Linux.</span></p>\n"
+" able to revert them if they prevent the computer to start on its usual\n"
+" operating system.</p>\n"
" </div>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/not_at_all.inline.fa.po b/wiki/src/install/inc/steps/not_at_all.inline.fa.po
index 5ea71ef..6df655d 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.fa.po
+++ b/wiki/src/install/inc/steps/not_at_all.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -57,6 +57,14 @@ msgstr ""
msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
+#. type: Bullet: ' 1. '
+msgid "Shut down the computer."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
@@ -71,7 +79,6 @@ msgid ""
" <tr><th>Manufacturer</th><th>Key</th></tr>\n"
" <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
" <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
-" <tr><td>Compaq</td><td>Esc, F9</td></tr>\n"
" <tr><td>Dell</td><td>F12</td></tr>\n"
" <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
" <tr><td>HP</td><td>Esc, F9</td></tr>\n"
@@ -84,44 +91,55 @@ msgid ""
msgstr ""
#. type: Bullet: ' 1. '
-msgid "Make sure that the first USB stick is plugged in the computer."
+msgid "Switch on the computer."
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Shut down the computer."
+#. type: Plain text
+#, no-wrap
+msgid " Immediately press several times the first potential boot menu key identified in step 3.\n"
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Switch on the computer."
+#. type: Plain text
+#, no-wrap
+msgid ""
+" a. If a boot menu with a list of devices appears, select your USB stick\n"
+" and press <span class=\"keycap\">Enter</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " Immediately press several times the first potential boot menu key identified in step 1.\n"
+msgid " a. If the computer starts on another operating system, then:\n"
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' 1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
-"If a boot menu with a list of possible devices to start from appears, select "
-"the first USB stick in the list and press <span class=\"keycap\">Enter</"
-"span>."
+" a. If a boot menu with a list of devices appears, select your USB stick\n"
+" and press <span class=\"keycap\">Enter</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - If the computer starts on\n"
-" <span class=\"debian\">Ubuntu,</span>\n"
-" <span class=\"windows\">Windows,</span>\n"
-" <span class=\"linux\">Linux,</span>\n"
-"\trepeat steps 2 and 3 for all the potential boot menu keys\n"
-" identified in step 1.\n"
+" a. If the computer starts on another operating system or returns an\n"
+" error message, then shut down the computer again and repeat step\n"
+" 4 for all the potential boot menu keys identified in step 3.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If none of the potential boot menu keys identified in step 1 work or if\n"
+" If none of the potential boot menu keys identified in step 3 work or if\n"
" the USB stick does not appear in the list, then try the second\n"
" troubleshooting technique described below.\n"
msgstr ""
@@ -140,8 +158,17 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
-" <p>Search for the user guide of the computer on the website of its\n"
-" manufacturer to learn how to edit the BIOS settings.</p>\n"
+" <p>Search for the user manual of the computer on the website of its\n"
+" manufacturer to learn how to edit the BIOS settings: [Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers),\n"
+" [Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/),\n"
+" [Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/),\n"
+" [Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/),\n"
+" [HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/),\n"
+" [Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/),\n"
+" [Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads),\n"
+" [Sony](http://esupport.sony.com/US](http://esupport.sony.com/US), or\n"
+" [Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers).\n"
+" </p>\n"
" </div>\n"
msgstr ""
@@ -158,10 +185,8 @@ msgstr ""
msgid ""
" <div class=\"caution\">\n"
" <p>Take note of the changes that you apply to the BIOS settings, to be\n"
-" able to revert them if they prevent the computer to start on\n"
-" <span class=\"debian\">Ubuntu.</span>\n"
-" <span class=\"windows\">Windows.</span>\n"
-" <span class=\"linux\">Linux.</span></p>\n"
+" able to revert them if they prevent the computer to start on its usual\n"
+" operating system.</p>\n"
" </div>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/not_at_all.inline.fr.po b/wiki/src/install/inc/steps/not_at_all.inline.fr.po
index 949d21e..6df655d 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.fr.po
+++ b/wiki/src/install/inc/steps/not_at_all.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -57,6 +57,14 @@ msgstr ""
msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
+#. type: Bullet: ' 1. '
+msgid "Shut down the computer."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
@@ -71,7 +79,6 @@ msgid ""
" <tr><th>Manufacturer</th><th>Key</th></tr>\n"
" <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
" <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
-" <tr><td>Compaq</td><td>Esc, F9</td></tr>\n"
" <tr><td>Dell</td><td>F12</td></tr>\n"
" <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
" <tr><td>HP</td><td>Esc, F9</td></tr>\n"
@@ -84,44 +91,55 @@ msgid ""
msgstr ""
#. type: Bullet: ' 1. '
-msgid "Make sure that the first USB stick is plugged in the computer."
+msgid "Switch on the computer."
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Shut down the computer."
+#. type: Plain text
+#, no-wrap
+msgid " Immediately press several times the first potential boot menu key identified in step 3.\n"
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Switch on the computer."
+#. type: Plain text
+#, no-wrap
+msgid ""
+" a. If a boot menu with a list of devices appears, select your USB stick\n"
+" and press <span class=\"keycap\">Enter</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " Immediately press several times the first potential boot menu key identified in step 1.\n"
+msgid " a. If the computer starts on another operating system, then:\n"
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' 1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
-"If a boot menu with a list of possible devices to start from appears, select "
-"the first USB stick in the list and press <span class=\"keycap\">Enter</"
-"span>."
+" a. If a boot menu with a list of devices appears, select your USB stick\n"
+" and press <span class=\"keycap\">Enter</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - If the computer starts on\n"
-" <span class=\"debian\">Ubuntu,</span>\n"
-" <span class=\"windows\">Windows,</span>\n"
-" <span class=\"linux\">Linux,</span>\n"
-"\trepeat steps 2 and 3 for all the potential boot menu keys\n"
-" identified in step 1.\n"
+" a. If the computer starts on another operating system or returns an\n"
+" error message, then shut down the computer again and repeat step\n"
+" 4 for all the potential boot menu keys identified in step 3.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If none of the potential boot menu keys identified in step 1 work or if\n"
+" If none of the potential boot menu keys identified in step 3 work or if\n"
" the USB stick does not appear in the list, then try the second\n"
" troubleshooting technique described below.\n"
msgstr ""
@@ -140,8 +158,17 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
-" <p>Search for the user guide of the computer on the website of its\n"
-" manufacturer to learn how to edit the BIOS settings.</p>\n"
+" <p>Search for the user manual of the computer on the website of its\n"
+" manufacturer to learn how to edit the BIOS settings: [Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers),\n"
+" [Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/),\n"
+" [Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/),\n"
+" [Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/),\n"
+" [HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/),\n"
+" [Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/),\n"
+" [Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads),\n"
+" [Sony](http://esupport.sony.com/US](http://esupport.sony.com/US), or\n"
+" [Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers).\n"
+" </p>\n"
" </div>\n"
msgstr ""
@@ -158,10 +185,8 @@ msgstr ""
msgid ""
" <div class=\"caution\">\n"
" <p>Take note of the changes that you apply to the BIOS settings, to be\n"
-" able to revert them if they prevent the computer to start on\n"
-" <span class=\"debian\">Ubuntu.</span>\n"
-" <span class=\"windows\">Windows.</span>\n"
-" <span class=\"linux\">Linux.</span></p>\n"
+" able to revert them if they prevent the computer to start on its usual\n"
+" operating system.</p>\n"
" </div>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/not_at_all.inline.mdwn b/wiki/src/install/inc/steps/not_at_all.inline.mdwn
index 1544b83..bba30f0 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.mdwn
+++ b/wiki/src/install/inc/steps/not_at_all.inline.mdwn
@@ -17,6 +17,10 @@
[[!img install/inc/screenshots/bios_boot_menu.png class="screenshot" link="no"]]
+ 1. Shut down the computer.
+
+ 1. Make sure that the first USB stick is plugged in the computer.
+
1. Identify the potential boot menu keys for the computer depending on
the computer manufacturer in the following list:
@@ -24,7 +28,6 @@
<tr><th>Manufacturer</th><th>Key</th></tr>
<tr><td>Acer</td><td>Esc, F12, F9</td></tr>
<tr><td>Asus</td><td>Esc, F8</td></tr>
- <tr><td>Compaq</td><td>Esc, F9</td></tr>
<tr><td>Dell</td><td>F12</td></tr>
<tr><td>Fujitsu</td><td>F12, Esc</td></tr>
<tr><td>HP</td><td>Esc, F9</td></tr>
@@ -35,23 +38,29 @@
<tr><td>others&hellip;</td><td>F12, Esc</td></tr>
</table>
- 1. Make sure that the first USB stick is plugged in the computer.
+ 1. Switch on the computer.
- 1. Shut down the computer.
+ Immediately press several times the first potential boot menu key identified in step 3.
- 1. Switch on the computer.
+ a. If a boot menu with a list of devices appears, select your USB stick
+ and press <span class="keycap">Enter</span>.
+
+ a. If the computer starts on another operating system, then:
+
+ 1. Shut down the computer.
+
+ 1. Press-and-hold the potential boot menu key identified in step 3.
- Immediately press several times the first potential boot menu key identified in step 1.
+ 1. Switch on the computer again while holding the potential boot menu key pressed.
- - If a boot menu with a list of possible devices to start from
- appears, select the first USB stick in the list and press
- <span class="keycap">Enter</span>.
+ a. If a boot menu with a list of devices appears, select your USB stick
+ and press <span class="keycap">Enter</span>.
- - If the computer starts on Windows or Linux,
- repeat steps 2 and 3 for all the potential boot menu keys
- identified in step 1.
+ a. If the computer starts on Windows or Linux or returns an error message,
+ repeat steps 2 and 3 for all the potential boot menu keys
+ identified in step 1.
- If none of the potential boot menu keys identified in step 1 work or if
+ If none of the potential boot menu keys identified in step 3 work or if
the USB stick does not appear in the list, then try the second
troubleshooting technique described below.
@@ -65,8 +74,17 @@
You might need to edit the BIOS settings of the computer.
<div class="tip">
- <p>Search for the user guide of the computer on the website of its
- manufacturer to learn how to edit the BIOS settings.</p>
+ <p>Search for the user manual of the computer on the website of its
+ manufacturer to learn how to edit the BIOS settings: [Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers),
+ [Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/),
+ [Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/),
+ [Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/),
+ [HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/),
+ [Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/),
+ [Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads),
+ [Sony](http://esupport.sony.com/US](http://esupport.sony.com/US), or
+ [Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers).
+ </p>
</div>
In the BIOS settings, try to apply the following changes one by one and
diff --git a/wiki/src/install/inc/steps/not_at_all.inline.pt.po b/wiki/src/install/inc/steps/not_at_all.inline.pt.po
index 949d21e..6df655d 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.pt.po
+++ b/wiki/src/install/inc/steps/not_at_all.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -57,6 +57,14 @@ msgstr ""
msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
+#. type: Bullet: ' 1. '
+msgid "Shut down the computer."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
@@ -71,7 +79,6 @@ msgid ""
" <tr><th>Manufacturer</th><th>Key</th></tr>\n"
" <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
" <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
-" <tr><td>Compaq</td><td>Esc, F9</td></tr>\n"
" <tr><td>Dell</td><td>F12</td></tr>\n"
" <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
" <tr><td>HP</td><td>Esc, F9</td></tr>\n"
@@ -84,44 +91,55 @@ msgid ""
msgstr ""
#. type: Bullet: ' 1. '
-msgid "Make sure that the first USB stick is plugged in the computer."
+msgid "Switch on the computer."
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Shut down the computer."
+#. type: Plain text
+#, no-wrap
+msgid " Immediately press several times the first potential boot menu key identified in step 3.\n"
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Switch on the computer."
+#. type: Plain text
+#, no-wrap
+msgid ""
+" a. If a boot menu with a list of devices appears, select your USB stick\n"
+" and press <span class=\"keycap\">Enter</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " Immediately press several times the first potential boot menu key identified in step 1.\n"
+msgid " a. If the computer starts on another operating system, then:\n"
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' 1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
-"If a boot menu with a list of possible devices to start from appears, select "
-"the first USB stick in the list and press <span class=\"keycap\">Enter</"
-"span>."
+" a. If a boot menu with a list of devices appears, select your USB stick\n"
+" and press <span class=\"keycap\">Enter</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - If the computer starts on\n"
-" <span class=\"debian\">Ubuntu,</span>\n"
-" <span class=\"windows\">Windows,</span>\n"
-" <span class=\"linux\">Linux,</span>\n"
-"\trepeat steps 2 and 3 for all the potential boot menu keys\n"
-" identified in step 1.\n"
+" a. If the computer starts on another operating system or returns an\n"
+" error message, then shut down the computer again and repeat step\n"
+" 4 for all the potential boot menu keys identified in step 3.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If none of the potential boot menu keys identified in step 1 work or if\n"
+" If none of the potential boot menu keys identified in step 3 work or if\n"
" the USB stick does not appear in the list, then try the second\n"
" troubleshooting technique described below.\n"
msgstr ""
@@ -140,8 +158,17 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
-" <p>Search for the user guide of the computer on the website of its\n"
-" manufacturer to learn how to edit the BIOS settings.</p>\n"
+" <p>Search for the user manual of the computer on the website of its\n"
+" manufacturer to learn how to edit the BIOS settings: [Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers),\n"
+" [Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/),\n"
+" [Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/),\n"
+" [Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/),\n"
+" [HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/),\n"
+" [Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/),\n"
+" [Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads),\n"
+" [Sony](http://esupport.sony.com/US](http://esupport.sony.com/US), or\n"
+" [Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers).\n"
+" </p>\n"
" </div>\n"
msgstr ""
@@ -158,10 +185,8 @@ msgstr ""
msgid ""
" <div class=\"caution\">\n"
" <p>Take note of the changes that you apply to the BIOS settings, to be\n"
-" able to revert them if they prevent the computer to start on\n"
-" <span class=\"debian\">Ubuntu.</span>\n"
-" <span class=\"windows\">Windows.</span>\n"
-" <span class=\"linux\">Linux.</span></p>\n"
+" able to revert them if they prevent the computer to start on its usual\n"
+" operating system.</p>\n"
" </div>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.de.po b/wiki/src/install/inc/steps/restart_first_time.inline.de.po
index 49b1925..ef50467 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.de.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 class=\"dvd\">Restart on the Tails DVD</h1>\n"
+"<h1 class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
msgstr ""
#. type: Plain text
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"dvd\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -85,10 +85,10 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
+" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -150,22 +150,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img doc/first_steps/start_tails/tails_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"note install-clone debian expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Ubuntu,</span>\n"
+" <span class=\"debian expert\">Debian or Ubuntu,</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
-" refer to the\n"
-" troubleshooting section about [[!toggle id=\"not_at_all\" text=\"Tails\n"
-" not starting at all\"]].</p>\n"
+" refer to [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+" about Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -186,6 +180,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid " [[!img doc/first_steps/start_tails/tails_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
" <div class=\"bug mac-usb mac-clone\">\n"
" <p>If your computer fails to start on the intermediary Tails, you can\n"
@@ -227,17 +226,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"note\">\n"
" <p>If the computer stops responding or displays error messages before\n"
" getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-" the troubleshooting section about\n"
-" [[!toggle id=\"not_entirely\" text=\"Tails not starting entirely\"]].</p>\n"
+" [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+" Tails not starting entirely\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -258,6 +252,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"1. In <span class=\"application\">Tails Greeter</span>, select your preferred language in the drop-down\n"
"list on the bottom left of the screen. Click <span class=\"button\">Login</span>.\n"
@@ -295,6 +294,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p class=\"clone dvd\">This was a first but important step!\n"
+"<p class=\"clone mac-dvd\">This was a first but important step!\n"
"Now grab the <span class=\"clone\">new</span> USB stick on which you want to install Tails.</p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fa.po b/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
index 49b1925..ef50467 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 class=\"dvd\">Restart on the Tails DVD</h1>\n"
+"<h1 class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
msgstr ""
#. type: Plain text
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"dvd\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -85,10 +85,10 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
+" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -150,22 +150,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img doc/first_steps/start_tails/tails_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"note install-clone debian expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Ubuntu,</span>\n"
+" <span class=\"debian expert\">Debian or Ubuntu,</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
-" refer to the\n"
-" troubleshooting section about [[!toggle id=\"not_at_all\" text=\"Tails\n"
-" not starting at all\"]].</p>\n"
+" refer to [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+" about Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -186,6 +180,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid " [[!img doc/first_steps/start_tails/tails_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
" <div class=\"bug mac-usb mac-clone\">\n"
" <p>If your computer fails to start on the intermediary Tails, you can\n"
@@ -227,17 +226,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"note\">\n"
" <p>If the computer stops responding or displays error messages before\n"
" getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-" the troubleshooting section about\n"
-" [[!toggle id=\"not_entirely\" text=\"Tails not starting entirely\"]].</p>\n"
+" [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+" Tails not starting entirely\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -258,6 +252,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"1. In <span class=\"application\">Tails Greeter</span>, select your preferred language in the drop-down\n"
"list on the bottom left of the screen. Click <span class=\"button\">Login</span>.\n"
@@ -295,6 +294,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p class=\"clone dvd\">This was a first but important step!\n"
+"<p class=\"clone mac-dvd\">This was a first but important step!\n"
"Now grab the <span class=\"clone\">new</span> USB stick on which you want to install Tails.</p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
index 49b1925..ef50467 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 class=\"dvd\">Restart on the Tails DVD</h1>\n"
+"<h1 class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
msgstr ""
#. type: Plain text
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"dvd\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -85,10 +85,10 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
+" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -150,22 +150,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img doc/first_steps/start_tails/tails_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"note install-clone debian expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Ubuntu,</span>\n"
+" <span class=\"debian expert\">Debian or Ubuntu,</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
-" refer to the\n"
-" troubleshooting section about [[!toggle id=\"not_at_all\" text=\"Tails\n"
-" not starting at all\"]].</p>\n"
+" refer to [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+" about Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -186,6 +180,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid " [[!img doc/first_steps/start_tails/tails_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
" <div class=\"bug mac-usb mac-clone\">\n"
" <p>If your computer fails to start on the intermediary Tails, you can\n"
@@ -227,17 +226,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"note\">\n"
" <p>If the computer stops responding or displays error messages before\n"
" getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-" the troubleshooting section about\n"
-" [[!toggle id=\"not_entirely\" text=\"Tails not starting entirely\"]].</p>\n"
+" [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+" Tails not starting entirely\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -258,6 +252,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"1. In <span class=\"application\">Tails Greeter</span>, select your preferred language in the drop-down\n"
"list on the bottom left of the screen. Click <span class=\"button\">Login</span>.\n"
@@ -295,6 +294,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p class=\"clone dvd\">This was a first but important step!\n"
+"<p class=\"clone mac-dvd\">This was a first but important step!\n"
"Now grab the <span class=\"clone\">new</span> USB stick on which you want to install Tails.</p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.mdwn b/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
index 5aaaca1..0281e66 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
@@ -1,13 +1,13 @@
<h1 class="windows linux mac-usb upgrade-tails">Restart on the intermediary Tails</h1>
<h1 class="clone">Restart on the other Tails</h1>
-<h1 class="dvd">Restart on the Tails DVD</h1>
+<h1 class="mac-dvd">Restart on the Tails DVD</h1>
<div class="step-image">
[[!img install/inc/infography/plug-source-usb.png link="no" class="install-clone mac-clone"]]
[[!img install/inc/infography/plug-other-usb.png link="no" class="upgrade-clone"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="debian"]]
[[!img install/inc/infography/restart-on-intermediary-tails.png link="no" class="clone windows linux mac-usb"]]
-[[!img install/inc/infography/restart-on-dvd.png link="no" class="dvd"]]
+[[!img install/inc/infography/restart-on-dvd.png link="no" class="mac-dvd"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails"]]
</div>
@@ -24,10 +24,10 @@ from a Tails DVD in a similar way.</p>
</div>
1. <p>
- <span class="dvd">Make sure that the DVD is inserted in the computer.</span>
+ <span class="mac-dvd">Make sure that the DVD is inserted in the computer.</span>
<span class="usb">Shut down the computer while leaving the <span class="windows linux mac">first</span> USB stick plugged in.</span>
</p>
- <p class="dvd clone upgrade-tails">Shut down the computer.</p>
+ <p class="mac-dvd clone upgrade-tails">Shut down the computer.</p>
<p class="clone">Plug in the other Tails USB stick that you want to
<span class="install-clone debian windows linux mac">install</span>
<span class="upgrade">upgrade</span>
@@ -55,18 +55,15 @@ from a Tails DVD in a similar way.</p>
1. If the computer starts on Tails, the <span class="guilabel">Boot Tails</span> menu
appears. Choose <span class="guilabel">Live</span> and press <span class="keycap">Enter</span>.
- [[!img install/inc/screenshots/tails_boot_menu.png class="screenshot" link="no" alt="Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'."]]
-
<div class="note install-clone debian expert windows linux">
<p>Most computers do not start on Tails by default. If it does you
are lucky. Otherwise, if the computer starts on
- <span class="debian expert">Ubuntu,</span>
+ <span class="debian expert">Debian or Ubuntu,</span>
<span class="windows">Windows,</span>
<span class="linux">Linux,</span>
<span class="install-clone">Windows or Linux,</span>
- refer to the
- troubleshooting section about [[!toggle id="not_at_all" text="Tails
- not starting at all"]].</p>
+ refer to [[!toggle id="not_at_all" text="the troubleshooting section
+ about Tails not starting at all"]].</p>
</div>
[[!toggleable id="not_at_all" text="""
@@ -79,6 +76,8 @@ from a Tails DVD in a similar way.</p>
"""]]
+ [[!img install/inc/screenshots/tails_boot_menu.png class="screenshot" link="no" alt="Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'."]]
+
<div class="bug mac-usb mac-clone">
<p>If your computer fails to start on the intermediary Tails, you can
try these other two methods:</p>
@@ -100,13 +99,11 @@ from a Tails DVD in a similar way.</p>
1. After 30&ndash;60 seconds, another screen called <span class="application">Tails Greeter</span> appears.
- [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class="screenshot" link="no"]]
-
<div class="note">
<p>If the computer stops responding or displays error messages before
getting to <span class="application">Tails Greeter</span>, refer to
- the troubleshooting section about
- [[!toggle id="not_entirely" text="Tails not starting entirely"]].</p>
+ [[!toggle id="not_entirely" text="the troubleshooting section about
+ Tails not starting entirely"]].</p>
</div>
[[!toggleable id="not_entirely" text="""
@@ -119,6 +116,8 @@ from a Tails DVD in a similar way.</p>
"""]]
+ [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class="screenshot" link="no"]]
+
1. In <span class="application">Tails Greeter</span>, select your preferred language in the drop-down
list on the bottom left of the screen. Click <span class="button">Login</span>.
@@ -135,7 +134,7 @@ Now grab your second USB stick as it is time to install the final Tails on it.</
you to store some of your documents and configuration
and benefit from automatic security upgrades.</p>
-<p class="clone dvd">This was a first but important step!
+<p class="clone mac-dvd">This was a first but important step!
Now grab the <span class="clone">new</span> USB stick on which you want to install Tails.</p>
</div>
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.pt.po b/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
index 49b1925..ef50467 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 class=\"dvd\">Restart on the Tails DVD</h1>\n"
+"<h1 class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
msgstr ""
#. type: Plain text
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"dvd\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -85,10 +85,10 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
+" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -150,22 +150,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img doc/first_steps/start_tails/tails_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"note install-clone debian expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Ubuntu,</span>\n"
+" <span class=\"debian expert\">Debian or Ubuntu,</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
-" refer to the\n"
-" troubleshooting section about [[!toggle id=\"not_at_all\" text=\"Tails\n"
-" not starting at all\"]].</p>\n"
+" refer to [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+" about Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -186,6 +180,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid " [[!img doc/first_steps/start_tails/tails_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
" <div class=\"bug mac-usb mac-clone\">\n"
" <p>If your computer fails to start on the intermediary Tails, you can\n"
@@ -227,17 +226,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"note\">\n"
" <p>If the computer stops responding or displays error messages before\n"
" getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-" the troubleshooting section about\n"
-" [[!toggle id=\"not_entirely\" text=\"Tails not starting entirely\"]].</p>\n"
+" [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+" Tails not starting entirely\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -258,6 +252,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid " [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class=\"screenshot\" link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"1. In <span class=\"application\">Tails Greeter</span>, select your preferred language in the drop-down\n"
"list on the bottom left of the screen. Click <span class=\"button\">Login</span>.\n"
@@ -295,6 +294,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p class=\"clone dvd\">This was a first but important step!\n"
+"<p class=\"clone mac-dvd\">This was a first but important step!\n"
"Now grab the <span class=\"clone\">new</span> USB stick on which you want to install Tails.</p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.de.po b/wiki/src/install/inc/steps/restart_second_time.inline.de.po
index a31bb6f..9ed2c59 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.de.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"usb\">Restart on the final Tails</h1>\n"
"<h1 class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 class=\"dvd\">Restart on the Tails USB stick</h1>\n"
+"<h1 class=\"mac-dvd\">Restart on the Tails USB stick</h1>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -40,7 +40,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/restart-on-tails-usb.png link=\"no\" class=\"dvd\"]]\n"
+msgid " [[!img install/inc/infography/restart-on-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -60,7 +60,7 @@ msgid ""
" <span class=\"clone\">new</span>\n"
" USB stick plugged in.\n"
" </p>\n"
-" <p class=\"dvd\">Eject the DVD and leave the USB stick plugged in.</p>\n"
+" <p class=\"mac-dvd\">Eject the DVD and leave the USB stick plugged in.</p>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -77,9 +77,9 @@ msgstr ""
msgid ""
" <div class=\"note windows linux\">\n"
" <p>Some computers start successfully on the intermediary Tails but fail\n"
-" to start on the final Tails. If this is your case, refer to the\n"
-" troubleshooting section about [[!toggle id=\"not_at_all\" text=\"Tails\n"
-" not starting at all\"]].</p>\n"
+" to start on the final Tails. If this is your case, refer to\n"
+" [[!toggle id=\"not_at_all\" text=\"the troubleshooting section about\n"
+" Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -104,10 +104,10 @@ msgid ""
" <div class=\"bug mac-usb mac-dvd\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
-" <span class=\"dvd\">Tails USB stick,</span>\n"
+" <span class=\"mac-dvd\">Tails USB stick,</span>\n"
" you can continue using the\n"
" <span class=\"usb\">intermediary Tails</span>\n"
-" <span class=\"dvd\">Tails DVD</span>.\n"
+" <span class=\"mac-dvd\">Tails DVD</span>.\n"
" <span class=\"usb\">On this intermediary Tails you cannot benefit from\n"
" automatic upgrades or create an encrypted persistent storage.</span></p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.fa.po b/wiki/src/install/inc/steps/restart_second_time.inline.fa.po
index a31bb6f..9ed2c59 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.fa.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"usb\">Restart on the final Tails</h1>\n"
"<h1 class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 class=\"dvd\">Restart on the Tails USB stick</h1>\n"
+"<h1 class=\"mac-dvd\">Restart on the Tails USB stick</h1>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -40,7 +40,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/restart-on-tails-usb.png link=\"no\" class=\"dvd\"]]\n"
+msgid " [[!img install/inc/infography/restart-on-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -60,7 +60,7 @@ msgid ""
" <span class=\"clone\">new</span>\n"
" USB stick plugged in.\n"
" </p>\n"
-" <p class=\"dvd\">Eject the DVD and leave the USB stick plugged in.</p>\n"
+" <p class=\"mac-dvd\">Eject the DVD and leave the USB stick plugged in.</p>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -77,9 +77,9 @@ msgstr ""
msgid ""
" <div class=\"note windows linux\">\n"
" <p>Some computers start successfully on the intermediary Tails but fail\n"
-" to start on the final Tails. If this is your case, refer to the\n"
-" troubleshooting section about [[!toggle id=\"not_at_all\" text=\"Tails\n"
-" not starting at all\"]].</p>\n"
+" to start on the final Tails. If this is your case, refer to\n"
+" [[!toggle id=\"not_at_all\" text=\"the troubleshooting section about\n"
+" Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -104,10 +104,10 @@ msgid ""
" <div class=\"bug mac-usb mac-dvd\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
-" <span class=\"dvd\">Tails USB stick,</span>\n"
+" <span class=\"mac-dvd\">Tails USB stick,</span>\n"
" you can continue using the\n"
" <span class=\"usb\">intermediary Tails</span>\n"
-" <span class=\"dvd\">Tails DVD</span>.\n"
+" <span class=\"mac-dvd\">Tails DVD</span>.\n"
" <span class=\"usb\">On this intermediary Tails you cannot benefit from\n"
" automatic upgrades or create an encrypted persistent storage.</span></p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.fr.po b/wiki/src/install/inc/steps/restart_second_time.inline.fr.po
index a31bb6f..9ed2c59 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.fr.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"usb\">Restart on the final Tails</h1>\n"
"<h1 class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 class=\"dvd\">Restart on the Tails USB stick</h1>\n"
+"<h1 class=\"mac-dvd\">Restart on the Tails USB stick</h1>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -40,7 +40,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/restart-on-tails-usb.png link=\"no\" class=\"dvd\"]]\n"
+msgid " [[!img install/inc/infography/restart-on-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -60,7 +60,7 @@ msgid ""
" <span class=\"clone\">new</span>\n"
" USB stick plugged in.\n"
" </p>\n"
-" <p class=\"dvd\">Eject the DVD and leave the USB stick plugged in.</p>\n"
+" <p class=\"mac-dvd\">Eject the DVD and leave the USB stick plugged in.</p>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -77,9 +77,9 @@ msgstr ""
msgid ""
" <div class=\"note windows linux\">\n"
" <p>Some computers start successfully on the intermediary Tails but fail\n"
-" to start on the final Tails. If this is your case, refer to the\n"
-" troubleshooting section about [[!toggle id=\"not_at_all\" text=\"Tails\n"
-" not starting at all\"]].</p>\n"
+" to start on the final Tails. If this is your case, refer to\n"
+" [[!toggle id=\"not_at_all\" text=\"the troubleshooting section about\n"
+" Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -104,10 +104,10 @@ msgid ""
" <div class=\"bug mac-usb mac-dvd\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
-" <span class=\"dvd\">Tails USB stick,</span>\n"
+" <span class=\"mac-dvd\">Tails USB stick,</span>\n"
" you can continue using the\n"
" <span class=\"usb\">intermediary Tails</span>\n"
-" <span class=\"dvd\">Tails DVD</span>.\n"
+" <span class=\"mac-dvd\">Tails DVD</span>.\n"
" <span class=\"usb\">On this intermediary Tails you cannot benefit from\n"
" automatic upgrades or create an encrypted persistent storage.</span></p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.mdwn b/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
index 722ea19..d5bdf27 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
@@ -1,12 +1,12 @@
<h1 class="usb">Restart on the final Tails</h1>
<h1 class="clone">Restart on the other Tails</h1>
-<h1 class="dvd">Restart on the Tails USB stick</h1>
+<h1 class="mac-dvd">Restart on the Tails USB stick</h1>
1. Shut down the computer.
<div class="step-image">
[[!img install/inc/infography/restart-on-final-tails.png link="no" class="usb clone"]]
- [[!img install/inc/infography/restart-on-tails-usb.png link="no" class="dvd"]]
+ [[!img install/inc/infography/restart-on-tails-usb.png link="no" class="mac-dvd"]]
</div>
1. <p class="usb clone">
@@ -18,7 +18,7 @@
<span class="clone">new</span>
USB stick plugged in.
</p>
- <p class="dvd">Eject the DVD and leave the USB stick plugged in.</p>
+ <p class="mac-dvd">Eject the DVD and leave the USB stick plugged in.</p>
1. Switch on the computer.
@@ -26,9 +26,9 @@
<div class="note windows linux">
<p>Some computers start successfully on the intermediary Tails but fail
- to start on the final Tails. If this is your case, refer to the
- troubleshooting section about [[!toggle id="not_at_all" text="Tails
- not starting at all"]].</p>
+ to start on the final Tails. If this is your case, refer to
+ [[!toggle id="not_at_all" text="the troubleshooting section about
+ Tails not starting at all"]].</p>
</div>
[[!toggleable id="not_at_all" text="""
@@ -44,10 +44,10 @@
<div class="bug mac-usb mac-dvd">
<p>If your computer fails to start on the
<span class="usb">final Tails,</span>
- <span class="dvd">Tails USB stick,</span>
+ <span class="mac-dvd">Tails USB stick,</span>
you can continue using the
<span class="usb">intermediary Tails</span>
- <span class="dvd">Tails DVD</span>.
+ <span class="mac-dvd">Tails DVD</span>.
<span class="usb">On this intermediary Tails you cannot benefit from
automatic upgrades or create an encrypted persistent storage.</span></p>
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.pt.po b/wiki/src/install/inc/steps/restart_second_time.inline.pt.po
index a31bb6f..9ed2c59 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.pt.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:02+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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,7 +21,7 @@ msgstr ""
msgid ""
"<h1 class=\"usb\">Restart on the final Tails</h1>\n"
"<h1 class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 class=\"dvd\">Restart on the Tails USB stick</h1>\n"
+"<h1 class=\"mac-dvd\">Restart on the Tails USB stick</h1>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -40,7 +40,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/restart-on-tails-usb.png link=\"no\" class=\"dvd\"]]\n"
+msgid " [[!img install/inc/infography/restart-on-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
msgstr ""
#. type: Plain text
@@ -60,7 +60,7 @@ msgid ""
" <span class=\"clone\">new</span>\n"
" USB stick plugged in.\n"
" </p>\n"
-" <p class=\"dvd\">Eject the DVD and leave the USB stick plugged in.</p>\n"
+" <p class=\"mac-dvd\">Eject the DVD and leave the USB stick plugged in.</p>\n"
msgstr ""
#. type: Bullet: '1. '
@@ -77,9 +77,9 @@ msgstr ""
msgid ""
" <div class=\"note windows linux\">\n"
" <p>Some computers start successfully on the intermediary Tails but fail\n"
-" to start on the final Tails. If this is your case, refer to the\n"
-" troubleshooting section about [[!toggle id=\"not_at_all\" text=\"Tails\n"
-" not starting at all\"]].</p>\n"
+" to start on the final Tails. If this is your case, refer to\n"
+" [[!toggle id=\"not_at_all\" text=\"the troubleshooting section about\n"
+" Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
@@ -104,10 +104,10 @@ msgid ""
" <div class=\"bug mac-usb mac-dvd\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
-" <span class=\"dvd\">Tails USB stick,</span>\n"
+" <span class=\"mac-dvd\">Tails USB stick,</span>\n"
" you can continue using the\n"
" <span class=\"usb\">intermediary Tails</span>\n"
-" <span class=\"dvd\">Tails DVD</span>.\n"
+" <span class=\"mac-dvd\">Tails DVD</span>.\n"
" <span class=\"usb\">On this intermediary Tails you cannot benefit from\n"
" automatic upgrades or create an encrypted persistent storage.</span></p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/switch.inline.de.po b/wiki/src/install/inc/steps/switch.inline.de.po
index 7c24b9f..9dc1868 100644
--- a/wiki/src/install/inc/steps/switch.inline.de.po
+++ b/wiki/src/install/inc/steps/switch.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 20:11+0100\n"
+"POT-Creation-Date: 2016-01-14 14:46+0000\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"
@@ -32,59 +32,59 @@ msgid ""
"rest of the instructions afterwards, we recommend you either:"
msgstr ""
-#. type: Bullet: ' - '
-msgid ""
-"Open this page on your smartphone, tablet, or another computer (recommended)."
-msgstr ""
-
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\"mac-dvd\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\"mac-dvd qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class=\"linux\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class=\"linux qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class=\"upgrade-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class=\"upgrade-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class=\"upgrade-tails\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class=\"upgrade-tails qrcode\" link=\"no\"]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Open this page on your smartphone, tablet, or another computer (recommended)."
msgstr ""
#. type: Bullet: ' - '
@@ -98,14 +98,14 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <a class=\"install-clone\" href=\"https://tails.boum.org/install/clone/\">https://tails.boum.org/install/clone/</a>\n"
-" <a class=\"windows\" href=\"https://tails.boum.org/install/win/usb/\">https://tails.boum.org/install/win/usb/</a>\n"
-" <a class=\"mac-usb\" href=\"https://tails.boum.org/install/mac/usb/\">https://tails.boum.org/install/mac/usb/</a>\n"
-" <a class=\"mac-clone\" href=\"https://tails.boum.org/install/mac/clone/\">https://tails.boum.org/install/mac/clone/</a>\n"
-" <a class=\"mac-dvd\" href=\"https://tails.boum.org/install/mac/dvd/\">https://tails.boum.org/install/mac/dvd/</a>\n"
-" <a class=\"debian\" href=\"https://tails.boum.org/install/debian/usb/\">https://tails.boum.org/install/debian/usb/</a>\n"
-" <a class=\"expert\" href=\"https://tails.boum.org/install/expert/usb/\">https://tails.boum.org/install/expert/usb/</a>\n"
-" <a class=\"linux\" href=\"https://tails.boum.org/install/linux/usb/\">https://tails.boum.org/install/linux/usb/</a>\n"
-" <a class=\"upgrade-clone\" href=\"https://tails.boum.org/upgrade/clone/\">https://tails.boum.org/upgrade/clone/</a>\n"
-" <a class=\"upgrade-tails\" href=\"https://tails.boum.org/upgrade/tails/\">https://tails.boum.org/upgrade/tails/</a>\n"
+" <span class=\"install-clone\">`https://tails.boum.org/install/clone/`</span>\n"
+" <span class=\"windows\">`https://tails.boum.org/install/win/usb/`</span>\n"
+" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/`</span>\n"
+" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/`</span>\n"
+" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/`</span>\n"
+" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/`</span>\n"
+" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/`</span>\n"
+" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/`</span>\n"
+" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/`</span>\n"
+" <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/`</span>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/switch.inline.fa.po b/wiki/src/install/inc/steps/switch.inline.fa.po
index 4ae9a41..9dc1868 100644
--- a/wiki/src/install/inc/steps/switch.inline.fa.po
+++ b/wiki/src/install/inc/steps/switch.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-14 14:46+0000\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"
@@ -32,59 +32,59 @@ msgid ""
"rest of the instructions afterwards, we recommend you either:"
msgstr ""
-#. type: Bullet: ' - '
-msgid ""
-"Open this page on your smartphone, tablet, or another computer (recommended)."
-msgstr ""
-
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\"mac-dvd\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\"mac-dvd qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class=\"linux\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class=\"linux qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class=\"upgrade-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class=\"upgrade-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class=\"upgrade-tails\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class=\"upgrade-tails qrcode\" link=\"no\"]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Open this page on your smartphone, tablet, or another computer (recommended)."
msgstr ""
#. type: Bullet: ' - '
@@ -98,14 +98,14 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <a class=\"install-clone\" href=\"https://tails.boum.org/install/clone/\">https://tails.boum.org/install/clone/</a>\n"
-" <a class=\"windows\" href=\"https://tails.boum.org/install/win/usb/\">https://tails.boum.org/install/win/usb/</a>\n"
-" <a class=\"mac-usb\" href=\"https://tails.boum.org/install/mac/usb/\">https://tails.boum.org/install/mac/usb/</a>\n"
-" <a class=\"mac-clone\" href=\"https://tails.boum.org/install/mac/clone/\">https://tails.boum.org/install/mac/clone/</a>\n"
-" <a class=\"mac-dvd\" href=\"https://tails.boum.org/install/mac/dvd/\">https://tails.boum.org/install/mac/dvd/</a>\n"
-" <a class=\"debian\" href=\"https://tails.boum.org/install/debian/usb/\">https://tails.boum.org/install/debian/usb/</a>\n"
-" <a class=\"expert\" href=\"https://tails.boum.org/install/expert/usb/\">https://tails.boum.org/install/expert/usb/</a>\n"
-" <a class=\"linux\" href=\"https://tails.boum.org/install/linux/usb/\">https://tails.boum.org/install/linux/usb/</a>\n"
-" <a class=\"upgrade-clone\" href=\"https://tails.boum.org/upgrade/clone/\">https://tails.boum.org/upgrade/clone/</a>\n"
-" <a class=\"upgrade-tails\" href=\"https://tails.boum.org/upgrade/tails/\">https://tails.boum.org/upgrade/tails/</a>\n"
+" <span class=\"install-clone\">`https://tails.boum.org/install/clone/`</span>\n"
+" <span class=\"windows\">`https://tails.boum.org/install/win/usb/`</span>\n"
+" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/`</span>\n"
+" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/`</span>\n"
+" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/`</span>\n"
+" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/`</span>\n"
+" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/`</span>\n"
+" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/`</span>\n"
+" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/`</span>\n"
+" <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/`</span>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/switch.inline.fr.po b/wiki/src/install/inc/steps/switch.inline.fr.po
index 7c24b9f..9dc1868 100644
--- a/wiki/src/install/inc/steps/switch.inline.fr.po
+++ b/wiki/src/install/inc/steps/switch.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 20:11+0100\n"
+"POT-Creation-Date: 2016-01-14 14:46+0000\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"
@@ -32,59 +32,59 @@ msgid ""
"rest of the instructions afterwards, we recommend you either:"
msgstr ""
-#. type: Bullet: ' - '
-msgid ""
-"Open this page on your smartphone, tablet, or another computer (recommended)."
-msgstr ""
-
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\"mac-dvd\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\"mac-dvd qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class=\"linux\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class=\"linux qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class=\"upgrade-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class=\"upgrade-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class=\"upgrade-tails\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class=\"upgrade-tails qrcode\" link=\"no\"]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Open this page on your smartphone, tablet, or another computer (recommended)."
msgstr ""
#. type: Bullet: ' - '
@@ -98,14 +98,14 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <a class=\"install-clone\" href=\"https://tails.boum.org/install/clone/\">https://tails.boum.org/install/clone/</a>\n"
-" <a class=\"windows\" href=\"https://tails.boum.org/install/win/usb/\">https://tails.boum.org/install/win/usb/</a>\n"
-" <a class=\"mac-usb\" href=\"https://tails.boum.org/install/mac/usb/\">https://tails.boum.org/install/mac/usb/</a>\n"
-" <a class=\"mac-clone\" href=\"https://tails.boum.org/install/mac/clone/\">https://tails.boum.org/install/mac/clone/</a>\n"
-" <a class=\"mac-dvd\" href=\"https://tails.boum.org/install/mac/dvd/\">https://tails.boum.org/install/mac/dvd/</a>\n"
-" <a class=\"debian\" href=\"https://tails.boum.org/install/debian/usb/\">https://tails.boum.org/install/debian/usb/</a>\n"
-" <a class=\"expert\" href=\"https://tails.boum.org/install/expert/usb/\">https://tails.boum.org/install/expert/usb/</a>\n"
-" <a class=\"linux\" href=\"https://tails.boum.org/install/linux/usb/\">https://tails.boum.org/install/linux/usb/</a>\n"
-" <a class=\"upgrade-clone\" href=\"https://tails.boum.org/upgrade/clone/\">https://tails.boum.org/upgrade/clone/</a>\n"
-" <a class=\"upgrade-tails\" href=\"https://tails.boum.org/upgrade/tails/\">https://tails.boum.org/upgrade/tails/</a>\n"
+" <span class=\"install-clone\">`https://tails.boum.org/install/clone/`</span>\n"
+" <span class=\"windows\">`https://tails.boum.org/install/win/usb/`</span>\n"
+" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/`</span>\n"
+" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/`</span>\n"
+" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/`</span>\n"
+" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/`</span>\n"
+" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/`</span>\n"
+" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/`</span>\n"
+" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/`</span>\n"
+" <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/`</span>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/switch.inline.mdwn b/wiki/src/install/inc/steps/switch.inline.mdwn
index d07f732..f7a4765 100644
--- a/wiki/src/install/inc/steps/switch.inline.mdwn
+++ b/wiki/src/install/inc/steps/switch.inline.mdwn
@@ -6,30 +6,30 @@ Open these instructions on another device
In the next step, you will shut down the computer. To be able to follow
the rest of the instructions afterwards, we recommend you either:
- - Open this page on your smartphone, tablet, or another computer (recommended).
+ [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class="install-clone qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="windows qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class="mac-usb qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class="mac-clone qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class="mac-dvd qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="debian qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="expert qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class="upgrade-clone qrcode" link="no"]]
+ [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class="upgrade-tails qrcode" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class="install-clone" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="windows" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class="mac-usb" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class="mac-clone" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class="mac-dvd" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="debian" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="expert" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class="upgrade-clone" link="no"]]
- [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class="upgrade-tails" link="no"]]
+ - Open this page on your smartphone, tablet, or another computer (recommended).
- Print the rest of the instructions on paper.
- Take note of the URL of this page to be able to come back later:
- <a class="install-clone" href="https://tails.boum.org/install/clone/">https://tails.boum.org/install/clone/</a>
- <a class="windows" href="https://tails.boum.org/install/win/usb/">https://tails.boum.org/install/win/usb/</a>
- <a class="mac-usb" href="https://tails.boum.org/install/mac/usb/">https://tails.boum.org/install/mac/usb/</a>
- <a class="mac-clone" href="https://tails.boum.org/install/mac/clone/">https://tails.boum.org/install/mac/clone/</a>
- <a class="mac-dvd" href="https://tails.boum.org/install/mac/dvd/">https://tails.boum.org/install/mac/dvd/</a>
- <a class="debian" href="https://tails.boum.org/install/debian/usb/">https://tails.boum.org/install/debian/usb/</a>
- <a class="expert" href="https://tails.boum.org/install/expert/usb/">https://tails.boum.org/install/expert/usb/</a>
- <a class="linux" href="https://tails.boum.org/install/linux/usb/">https://tails.boum.org/install/linux/usb/</a>
- <a class="upgrade-clone" href="https://tails.boum.org/upgrade/clone/">https://tails.boum.org/upgrade/clone/</a>
- <a class="upgrade-tails" href="https://tails.boum.org/upgrade/tails/">https://tails.boum.org/upgrade/tails/</a>
+ <span class="install-clone">`https://tails.boum.org/install/clone/`</span>
+ <span class="windows">`https://tails.boum.org/install/win/usb/`</span>
+ <span class="mac-usb">`https://tails.boum.org/install/mac/usb/`</span>
+ <span class="mac-clone">`https://tails.boum.org/install/mac/clone/`</span>
+ <span class="mac-dvd">`https://tails.boum.org/install/mac/dvd/`</span>
+ <span class="debian">`https://tails.boum.org/install/debian/usb/`</span>
+ <span class="expert">`https://tails.boum.org/install/expert/usb/`</span>
+ <span class="linux">`https://tails.boum.org/install/linux/usb/`</span>
+ <span class="upgrade-clone">`https://tails.boum.org/upgrade/clone/`</span>
+ <span class="upgrade-tails">`https://tails.boum.org/upgrade/tails/`</span>
diff --git a/wiki/src/install/inc/steps/switch.inline.pt.po b/wiki/src/install/inc/steps/switch.inline.pt.po
index 7c24b9f..9dc1868 100644
--- a/wiki/src/install/inc/steps/switch.inline.pt.po
+++ b/wiki/src/install/inc/steps/switch.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 20:11+0100\n"
+"POT-Creation-Date: 2016-01-14 14:46+0000\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"
@@ -32,59 +32,59 @@ msgid ""
"rest of the instructions afterwards, we recommend you either:"
msgstr ""
-#. type: Bullet: ' - '
-msgid ""
-"Open this page on your smartphone, tablet, or another computer (recommended)."
-msgstr ""
-
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\"mac-dvd\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\"mac-dvd qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class=\"linux\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class=\"linux qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class=\"upgrade-clone\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class=\"upgrade-clone qrcode\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class=\"upgrade-tails\" link=\"no\"]]\n"
+msgid " [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class=\"upgrade-tails qrcode\" link=\"no\"]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"Open this page on your smartphone, tablet, or another computer (recommended)."
msgstr ""
#. type: Bullet: ' - '
@@ -98,14 +98,14 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <a class=\"install-clone\" href=\"https://tails.boum.org/install/clone/\">https://tails.boum.org/install/clone/</a>\n"
-" <a class=\"windows\" href=\"https://tails.boum.org/install/win/usb/\">https://tails.boum.org/install/win/usb/</a>\n"
-" <a class=\"mac-usb\" href=\"https://tails.boum.org/install/mac/usb/\">https://tails.boum.org/install/mac/usb/</a>\n"
-" <a class=\"mac-clone\" href=\"https://tails.boum.org/install/mac/clone/\">https://tails.boum.org/install/mac/clone/</a>\n"
-" <a class=\"mac-dvd\" href=\"https://tails.boum.org/install/mac/dvd/\">https://tails.boum.org/install/mac/dvd/</a>\n"
-" <a class=\"debian\" href=\"https://tails.boum.org/install/debian/usb/\">https://tails.boum.org/install/debian/usb/</a>\n"
-" <a class=\"expert\" href=\"https://tails.boum.org/install/expert/usb/\">https://tails.boum.org/install/expert/usb/</a>\n"
-" <a class=\"linux\" href=\"https://tails.boum.org/install/linux/usb/\">https://tails.boum.org/install/linux/usb/</a>\n"
-" <a class=\"upgrade-clone\" href=\"https://tails.boum.org/upgrade/clone/\">https://tails.boum.org/upgrade/clone/</a>\n"
-" <a class=\"upgrade-tails\" href=\"https://tails.boum.org/upgrade/tails/\">https://tails.boum.org/upgrade/tails/</a>\n"
+" <span class=\"install-clone\">`https://tails.boum.org/install/clone/`</span>\n"
+" <span class=\"windows\">`https://tails.boum.org/install/win/usb/`</span>\n"
+" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/`</span>\n"
+" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/`</span>\n"
+" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/`</span>\n"
+" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/`</span>\n"
+" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/`</span>\n"
+" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/`</span>\n"
+" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/`</span>\n"
+" <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/`</span>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/you_are_done.inline.de.po b/wiki/src/install/inc/steps/you_are_done.inline.de.po
index 74db1e8..cb93270 100644
--- a/wiki/src/install/inc/steps/you_are_done.inline.de.po
+++ b/wiki/src/install/inc/steps/you_are_done.inline.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 20:11+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"state-image debian expert dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
+"<div class=\"state-image debian expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/you_are_done.inline.fa.po b/wiki/src/install/inc/steps/you_are_done.inline.fa.po
index 5d4305e..cb93270 100644
--- a/wiki/src/install/inc/steps/you_are_done.inline.fa.po
+++ b/wiki/src/install/inc/steps/you_are_done.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"state-image debian expert dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
+"<div class=\"state-image debian expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/you_are_done.inline.fr.po b/wiki/src/install/inc/steps/you_are_done.inline.fr.po
index 74db1e8..cb93270 100644
--- a/wiki/src/install/inc/steps/you_are_done.inline.fr.po
+++ b/wiki/src/install/inc/steps/you_are_done.inline.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 20:11+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"state-image debian expert dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
+"<div class=\"state-image debian expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/you_are_done.inline.mdwn b/wiki/src/install/inc/steps/you_are_done.inline.mdwn
index ab47526..1f458a7 100644
--- a/wiki/src/install/inc/steps/you_are_done.inline.mdwn
+++ b/wiki/src/install/inc/steps/you_are_done.inline.mdwn
@@ -1,4 +1,4 @@
-<div class="state-image debian expert dvd">[[!img install/inc/infography/tails-usb.png link="no"]]</div>
+<div class="state-image debian expert mac-dvd">[[!img install/inc/infography/tails-usb.png link="no"]]</div>
<div class="state-image windows linux mac-usb">[[!img install/inc/infography/final-tails.png link="no"]]</div>
<div class="state-image install-clone mac-clone">[[!img install/inc/infography/new-tails.png link="no"]]</div>
diff --git a/wiki/src/install/inc/steps/you_are_done.inline.pt.po b/wiki/src/install/inc/steps/you_are_done.inline.pt.po
index 74db1e8..cb93270 100644
--- a/wiki/src/install/inc/steps/you_are_done.inline.pt.po
+++ b/wiki/src/install/inc/steps/you_are_done.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 20:11+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"state-image debian expert dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
+"<div class=\"state-image debian expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
msgstr ""
diff --git a/wiki/src/install/inc/stylesheets/assistant.css b/wiki/src/install/inc/stylesheets/assistant.css
index 030a4ac..e79d57e 100644
--- a/wiki/src/install/inc/stylesheets/assistant.css
+++ b/wiki/src/install/inc/stylesheets/assistant.css
@@ -101,14 +101,13 @@ h1:before {
}
h3, h4, p, ul {
- margin: 20px;
+ margin-bottom: 1.5em;
}
p, ul, ol, h1, h2, h3, h4, h5, h6 {
max-width: none;
}
-
p, h3, h4 {
color: #505050;
}
@@ -121,7 +120,6 @@ ul {
padding-left: 20px;
}
-
/* markdown add a p at the top of the page */
#content > p {
margin-top: 0;
@@ -157,9 +155,6 @@ ul {
border-bottom-width: 4px;
border-color: #56347C;
margin-top: 30px;
- width: 90%;
- margin-right: 5%;
- margin-left: 5%;
}
.panel-primary > .panel-heading {
@@ -195,9 +190,10 @@ ul {
margin: 0 -0.3em;
}
+
/* Hide all scenario-dependent bits by default. */
-.clone, .usb, .dvd,
+.clone, .usb, .dvd, .vm, .download-only,
.install-clone,
.windows, .windows-usb,
.mac, .mac-usb, .mac-dvd, .mac-clone,
@@ -208,6 +204,7 @@ ul {
display: none;
}
+
/* TOGGLE */
#download-and-verify div.toggleable, #needs div.toggleable, #scenarios div.toggleable {
@@ -227,7 +224,6 @@ ul {
#download-and-verify div.toggleable {
margin-top: -1.2em;
- width: 48em;
position: relative;
}
@@ -243,12 +239,17 @@ ul {
width: 35em;
}
-#download-and-verify a.toggle, #needs a.toggle, #scenarios a.toggle {
+a.toggle {
border-bottom: 1px dashed black !important;
cursor: help;
text-decoration: none !important;
}
+.hide a.toggle {
+ border-bottom: none !important;
+ cursor: pointer;
+}
+
#download-and-verify div.toggleable a.toggle, #needs div.toggleable a.toggle, #scenarios div.toggleable a.toggle {
border: none !important;
cursor: pointer;
@@ -256,3 +257,39 @@ ul {
right: 7px;
top: 5px;
}
+
+
+/*========== Non-Mobile First Method ==========*/
+
+/* Large Devices, Wide Screens */
+@media only screen and (max-width : 1200px) {
+
+}
+
+/* Medium Devices, Desktops */
+@media only screen and (max-width : 992px) {
+
+}
+
+/* Small Devices, Tablets */
+@media only screen and (max-width : 768px) {
+
+ .page {
+ padding: 0px 1em 1em;
+ }
+
+ #tails-installation-assistant {
+ display: none;
+ }
+
+}
+
+/* Extra Small Devices, Phones */
+@media only screen and (max-width : 480px) {
+
+}
+
+/* Custom, iPhone Retina */
+@media only screen and (max-width : 320px) {
+
+}
diff --git a/wiki/src/install/inc/stylesheets/dave.css b/wiki/src/install/inc/stylesheets/dave.css
index 06144b1..1fdeed3 100644
--- a/wiki/src/install/inc/stylesheets/dave.css
+++ b/wiki/src/install/inc/stylesheets/dave.css
@@ -1,3 +1,17 @@
+/* MEMO for DAVE states */
+
+/* :not([data-extension]) the extension is disabled or uninstalled */
+/* data-extension^="ok" the extension is installed and enabled */
+/* data-phase="ready" we can choose between use or torrent */
+/* data-phase="started" the user choosed to use the extension, he can choose to download */
+/* data-phase="downloading" the downloading is start and not ended (can ba going, paused or failed) */
+/* data-phase="verifying" DAVE is verifying the ISO */
+/* data-phase="verified" the ISO has been verified */
+
+/* data-state="going" the download is in progress */
+/* data-state="pause" the download is paused (by the user or lost connection or something else) - it's possible to resume*/
+/* data-state="failed" the download is failed (by a lost connection or something else) - it's possible to retry */
+
/*
Hide every div in the #download-and-verify box except #undetected-browser,
to set the baseline as a Javascript-disabled fallback.
@@ -19,10 +33,16 @@ html[data-phase^="downl"] #download-message
display: block !important;
}
-#dave-init { display: none };
-html[data-phase="init"] #dave-init { display: block };
+#dave-init { display: none }
+html[data-phase="init"][data-extension="ok"] #dave-init { display: block; }
-html[data-phase="init"] #download-and-verify { display: none };
+#dave-init {
+ width: 100%;
+ text-align: center;
+ margin-top: 5em;
+}
+
+html[data-phase="init"][data-extension="ok"] #download-and-verify { display: none; }
#download-text-state > *,
#download-button-state > *,
@@ -30,8 +50,8 @@ html[data-phase="init"] #download-and-verify { display: none };
display: none;
}
-
html[data-phase^="verif"] #download-and-verify #download,
+html[data-phase^="verif"] #download-and-verify #verify,
html[data-phase^="downl"] #download-and-verify #download,
#download[data-state="pause"] #download-text-pause,
#download[data-state="pause"] #download-message-paused,
@@ -101,7 +121,7 @@ Extension's toggles
}
#download.dave-show {
opacity: 1;
- transition: opacity: 1s;
+ transition: 1s;
}
#download-progress {
@@ -111,7 +131,9 @@ Extension's toggles
[data-phase^="verif"] #download-and-verify #i_have_iso.dave-show { display: none !important}
[data-phase^="download"] #download-button,
+[data-phase^="started"] #bittorrent-minor,
[data-phase^="download"] #bittorrent-minor,
+[data-phase^="verify"] #bittorrent-minor,
[data-phase^="verif"] #download-button,
[data-phase^="verif"] #download-eta,
[data-phase^="verif"] #download-progress
@@ -196,12 +218,6 @@ will give
border: none;
}
-/* Remove message once extension has started. */
-html[data-extension^="ok"] #use p,
-html[data-extension^="ok"] #update p,
-html[data-extension^="ok"] #install p {
- opacity: 0;
-}
/* Add transparency to past states. */
.btn.disabled, .btn[disabled], fieldset[disabled] .btn {
@@ -249,10 +265,7 @@ html[data-phase^="verifying"] #download {
cursor: default;
}
-html[data-phase^="verified"] #verify-text {
- box-shadow: none;
- opacity: 0.25 !important;
-}
+
/* Hide "Calculating" once verified. */
html[data-phase^="verified"] #verify-text-calculating {
@@ -288,15 +301,24 @@ html[data-phase^="verified"] #verify-text-calculating {
display: block;
}
+
/* Show and Hide bittorent link. */
-html:not([data-extension^="ok"]) #bittorrent-minor {
- display:block !important;;
+
+#bittorrent-minor {
+ display: none !important;
+ margin-top: 1em;
+ margin-left: 1.2em;
}
-html[data-extension^="ok"] #bittorrent-minor {
- display:none;
+html:not([data-phase]) #bittorrent-minor {
+ display: block !important;
+}
+
+html[data-phase="ready"] #bittorrent-minor {
+ display: block !important;
}
+
/* Remove default bootstrap success background. */
#verify-text-success {
background: none;
@@ -307,3 +329,119 @@ html[data-extension^="ok"] #bittorrent-minor {
white-space: normal;
margin-top: 30px;
}
+
+.extension code {
+ font-size: 80%;
+}
+
+
+/* Steps numbers */
+
+#use > .btn::before,
+#update > .btn::before,
+#install > .btn::before,
+#download > .btn-lg::before,
+#verify > .btn-lg::before {
+ color: #56347C;
+ margin-left: -50px;
+ position: absolute;
+}
+
+#use > .btn::before,
+#update > .btn::before,
+#install > .btn::before {
+ content: "1. ";
+}
+
+#download > .btn-lg::before {
+ content: "2. ";
+}
+
+#verify > .btn-lg::before {
+ content: "3. ";
+}
+
+/* Images */
+
+#download-path {
+ display: inline-block;
+ overflow: auto;
+ width: 400px;
+}
+
+.done img {
+ width: 46px;
+ height: 37px;
+}
+
+#download-button-state-pause img,
+#download-button-state-resume img,
+#download-text-failed img {
+ width: 70%;
+ height: 70%;
+ transition: all 0.2s;
+}
+
+#download-button-state-pause:hover img,
+#download-button-state-resume:hover img {
+ -moz-transform: scale(1.2);
+}
+
+#download-button-state-pause:active img,
+#download-button-state-resume:active img {
+ -moz-transform: rotate(10deg);
+}
+
+#download-button-state-cancel {
+ text-decoration: underline;
+}
+
+#download-and-verify small {
+ font-size: 65% ;
+ text-align: left;
+}
+
+/* Hide failed once is verified */
+html[data-phase^="verified"] #download-text-failed {
+ display: none !important;
+}
+
+/* #verify section behavior */
+html:not([data-phase="ready"]) #verify {
+ display: block !important;
+}
+
+html:not([data-phase]) #verify {
+ display: none !important;
+}
+
+#verify:active {
+ border: none;
+ box-shadow: none;
+}
+
+html:not([data-phase="verified"]) #verify-text-success,
+html:not([data-phase="verified"]) #verify-text-failure,
+html:not([data-phase="verified"]) #verify-text-failure-again,
+html:not([data-phase="verified"]) #verify-text-calculating,
+html:not([data-phase="verified"]) #verify-text-state {
+ display: none;
+}
+
+#download-again {
+ float: right;
+}
+
+html:not([data-phase="verified"]) #downloaded-path {
+ display: none !important;
+}
+
+#download-message-failed, #download-message-paused {
+ padding: 5px;
+ margin: 5px;
+ background: lightgrey;
+}
+
+#download[data-state="failed"] #download-message-failed {
+ display: none !important;
+}
diff --git a/wiki/src/install/inc/stylesheets/download-only.css b/wiki/src/install/inc/stylesheets/download-only.css
new file mode 100644
index 0000000..0d8200b
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/download-only.css
@@ -0,0 +1,3 @@
+span.download-only {
+ display: inline;
+}
diff --git a/wiki/src/install/inc/stylesheets/dvd.css b/wiki/src/install/inc/stylesheets/dvd.css
index 6cecb79..6fc01bb 100644
--- a/wiki/src/install/inc/stylesheets/dvd.css
+++ b/wiki/src/install/inc/stylesheets/dvd.css
@@ -1,11 +1,5 @@
-span.dvd, a.dvd {
- display: inline;
-}
+/* This stylesheet applies to /install/dvd only and not to /install/mac/dvd. */
-div.dvd, img.dvd, p.dvd, h1.dvd {
- display: block;
-}
-
-li.dvd {
- display: list-item;
+span.dvd {
+ display: inline;
}
diff --git a/wiki/src/install/inc/stylesheets/mac-dvd.css b/wiki/src/install/inc/stylesheets/mac-dvd.css
index 0ccb2ec..7bb2044 100644
--- a/wiki/src/install/inc/stylesheets/mac-dvd.css
+++ b/wiki/src/install/inc/stylesheets/mac-dvd.css
@@ -1,5 +1,5 @@
@import url("mac.css");
-@import url("dvd.css");
+/* We're not importing "dvd.css" as it applies to /install/dvd only. */
span.mac-dvd, a.mac-dvd {
display: inline;
diff --git a/wiki/src/install/inc/stylesheets/overview.css b/wiki/src/install/inc/stylesheets/overview.css
index e63114e..d3a3eeb 100644
--- a/wiki/src/install/inc/stylesheets/overview.css
+++ b/wiki/src/install/inc/stylesheets/overview.css
@@ -58,6 +58,7 @@ h4 small{
#needs, #steps {
margin-bottom: 50px;
+ padding: 0 20px;
border: 1px solid #56347C;
box-shadow: 10px 10px #56347C;
border-radius: 4px;
diff --git a/wiki/src/install/inc/stylesheets/router-install.css b/wiki/src/install/inc/stylesheets/router-install.css
index 43fc2a7..2b7c27b 100644
--- a/wiki/src/install/inc/stylesheets/router-install.css
+++ b/wiki/src/install/inc/stylesheets/router-install.css
@@ -4,3 +4,42 @@
margin-left: 25%;
margin-right: 25%;
}
+
+/*========== Non-Mobile First Method ==========*/
+
+/* Large Devices, Wide Screens */
+@media only screen and (max-width : 1200px) {
+
+}
+
+/* Medium Devices, Desktops */
+@media only screen and (max-width : 992px) {
+
+}
+
+/* Small Devices, Tablets */
+@media only screen and (max-width : 768px) {
+
+ #content {
+ padding-left: 0px;
+ width: 100%;
+ margin: 0px;
+ padding: 10px;
+ }
+
+ h1 {
+ font-size: 25px;
+ margin-left: 30px;
+ }
+
+}
+
+/* Extra Small Devices, Phones */
+@media only screen and (max-width : 480px) {
+
+}
+
+/* Custom, iPhone Retina */
+@media only screen and (max-width : 320px) {
+
+}
diff --git a/wiki/src/install/inc/stylesheets/steps.css b/wiki/src/install/inc/stylesheets/steps.css
index d23fdf2..a79f291 100644
--- a/wiki/src/install/inc/stylesheets/steps.css
+++ b/wiki/src/install/inc/stylesheets/steps.css
@@ -88,6 +88,7 @@ div.trophy {
margin-top: 30px;
padding-top: 20px;
padding-bottom: 50px;
+ padding-right: 20px;
position: relative;
background-color: white;
}
@@ -98,16 +99,6 @@ div.trophy p {
font-weight: 200;
}
-/* Some more room to the special tips and tricks */
-
-div.note, div.bug, div.caution, div.tip {
- background-color: white;
- border-radius: 4px;
- margin-left: 50px;
- padding: 20px;
- padding-left: 70px;
-}
-
/* more room for the state */
.state-image {
margin-top: 50px;
@@ -163,7 +154,7 @@ div.toggleable .hide {
@media only screen and (max-width : 768px) {
#content {
- padding-left: 0px;
+ padding-left: 10px;
}
.step-image {
@@ -185,6 +176,15 @@ div.toggleable .hide {
width: 100%;
}
+ div.trophy {
+ background-position: center 0.5em;
+ padding: 60px 1em 1em;
+ }
+
+ #recommendations h3 {
+ font-size: 20px;
+ }
+
}
/* Extra Small Devices, Phones */
@@ -196,3 +196,10 @@ div.toggleable .hide {
@media only screen and (max-width : 320px) {
}
+
+/* QR code on the side */
+
+img.qrcode {
+ float: right;
+ margin-top: -1em;
+}
diff --git a/wiki/src/install/inc/stylesheets/vm.css b/wiki/src/install/inc/stylesheets/vm.css
new file mode 100644
index 0000000..760294c
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/vm.css
@@ -0,0 +1,3 @@
+span.vm {
+ display: inline;
+}
diff --git a/wiki/src/install/linux.de.po b/wiki/src/install/linux.de.po
index b4280a5..a9a03d9 100644
--- a/wiki/src/install/linux.de.po
+++ b/wiki/src/install/linux.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+0100\n"
"PO-Revision-Date: 2015-12-22 17:24+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -73,15 +73,21 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
+#| "stable_i386_iso_size\" raw=\"yes\"]]</small>"
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
"30&ndash;60 Minuten zum Herunterladen von Tails <small>[[!inline pages=\"inc/"
"stable_i386_iso_size\" raw=\"yes\"]]</small>"
#. type: Content of: <div><div><ul><li>
-msgid "45 minutes to install"
+#, fuzzy
+#| msgid "45 minutes to install"
+msgid "1 hour to install"
msgstr "45 Minuten zum Installieren"
#. type: Content of: <div><div>
diff --git a/wiki/src/install/linux.fa.po b/wiki/src/install/linux.fa.po
index c05562f..fc57750 100644
--- a/wiki/src/install/linux.fa.po
+++ b/wiki/src/install/linux.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -60,12 +60,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "45 minutes to install"
+msgid "1 hour to install"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/linux.fr.po b/wiki/src/install/linux.fr.po
index c05562f..fc57750 100644
--- a/wiki/src/install/linux.fr.po
+++ b/wiki/src/install/linux.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -60,12 +60,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "45 minutes to install"
+msgid "1 hour to install"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/linux.html b/wiki/src/install/linux.html
index ec6a7ef..5c7dd7e 100644
--- a/wiki/src/install/linux.html
+++ b/wiki/src/install/linux.html
@@ -38,8 +38,8 @@
[[!inline pages="install/inc/router/why_two.inline" raw="yes"]]
"""]]
</li>
- <li>30&ndash;60 minutes to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
- <li>45 minutes to install</li>
+ <li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
+ <li>1 hour to install</li>
</ul>
[[
diff --git a/wiki/src/install/linux.pt.po b/wiki/src/install/linux.pt.po
index c05562f..fc57750 100644
--- a/wiki/src/install/linux.pt.po
+++ b/wiki/src/install/linux.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -60,12 +60,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "45 minutes to install"
+msgid "1 hour to install"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/linux/usb.de.po b/wiki/src/install/linux/usb.de.po
index 6f1f484..4a50b10 100644
--- a/wiki/src/install/linux/usb.de.po
+++ b/wiki/src/install/linux/usb.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 13:04+0000\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"
@@ -153,6 +153,111 @@ msgstr ""
msgid " [[!img install/inc/screenshots/gnome_disks_system.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+" and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+" using the command line\"]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Install an intermediary Tails using the command line\n"
+" ----------------------------------------------------\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Take note of the *device name* of the first USB stick as displayed in the "
+"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
+"etc."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If you are not sure about the device name, you should stop proceeding or\n"
+" you risk overwriting any hard disk on the computer.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Open a terminal."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Execute the following command, replacing `[tails.iso]` with the path to the "
+"ISO image that you want to install and `[device]` with the device name found "
+"in step 1."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " Here is an example of command to execute, yours is probably different:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+" class=\"guilabel\">No such file or directory</span> error message, you can\n"
+" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+" insert the correct path to the ISO image in the terminal. Then complete the\n"
+" command and execute it.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"If no error message is returned, Tails is being install on the USB stick. "
+"The installation takes a few minutes."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" You can now continue with the next step and [[Open these instructions on\n"
+" another device|usb#intermediary]].\n"
+msgstr ""
+
#. type: Bullet: '1. '
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
diff --git a/wiki/src/install/linux/usb.fa.po b/wiki/src/install/linux/usb.fa.po
index 6f1f484..4a50b10 100644
--- a/wiki/src/install/linux/usb.fa.po
+++ b/wiki/src/install/linux/usb.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 13:04+0000\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"
@@ -153,6 +153,111 @@ msgstr ""
msgid " [[!img install/inc/screenshots/gnome_disks_system.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+" and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+" using the command line\"]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Install an intermediary Tails using the command line\n"
+" ----------------------------------------------------\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Take note of the *device name* of the first USB stick as displayed in the "
+"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
+"etc."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If you are not sure about the device name, you should stop proceeding or\n"
+" you risk overwriting any hard disk on the computer.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Open a terminal."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Execute the following command, replacing `[tails.iso]` with the path to the "
+"ISO image that you want to install and `[device]` with the device name found "
+"in step 1."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " Here is an example of command to execute, yours is probably different:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+" class=\"guilabel\">No such file or directory</span> error message, you can\n"
+" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+" insert the correct path to the ISO image in the terminal. Then complete the\n"
+" command and execute it.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"If no error message is returned, Tails is being install on the USB stick. "
+"The installation takes a few minutes."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" You can now continue with the next step and [[Open these instructions on\n"
+" another device|usb#intermediary]].\n"
+msgstr ""
+
#. type: Bullet: '1. '
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
diff --git a/wiki/src/install/linux/usb.fr.po b/wiki/src/install/linux/usb.fr.po
index 6f1f484..4a50b10 100644
--- a/wiki/src/install/linux/usb.fr.po
+++ b/wiki/src/install/linux/usb.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 13:04+0000\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"
@@ -153,6 +153,111 @@ msgstr ""
msgid " [[!img install/inc/screenshots/gnome_disks_system.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+" and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+" using the command line\"]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Install an intermediary Tails using the command line\n"
+" ----------------------------------------------------\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Take note of the *device name* of the first USB stick as displayed in the "
+"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
+"etc."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If you are not sure about the device name, you should stop proceeding or\n"
+" you risk overwriting any hard disk on the computer.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Open a terminal."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Execute the following command, replacing `[tails.iso]` with the path to the "
+"ISO image that you want to install and `[device]` with the device name found "
+"in step 1."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " Here is an example of command to execute, yours is probably different:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+" class=\"guilabel\">No such file or directory</span> error message, you can\n"
+" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+" insert the correct path to the ISO image in the terminal. Then complete the\n"
+" command and execute it.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"If no error message is returned, Tails is being install on the USB stick. "
+"The installation takes a few minutes."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" You can now continue with the next step and [[Open these instructions on\n"
+" another device|usb#intermediary]].\n"
+msgstr ""
+
#. type: Bullet: '1. '
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
diff --git a/wiki/src/install/linux/usb.mdwn b/wiki/src/install/linux/usb.mdwn
index c63c447..4280a0b 100644
--- a/wiki/src/install/linux/usb.mdwn
+++ b/wiki/src/install/linux/usb.mdwn
@@ -49,6 +49,62 @@
[[!img install/inc/screenshots/gnome_disks_system.png class="screenshot" link="no"]]
+ <div class="bug">
+
+ <p>If your version of <span class="application">GNOME Disks</span> is old
+ and has no [[!img lib/emblem-system.png alt="System" class="symbolic" link="no"]]
+ button, you have to [[!toggle id="dd" text="install an intermediary Tails
+ using the command line"]].</p>
+
+ </div>
+
+ [[!toggleable id="dd" text="""
+
+ Install an intermediary Tails using the command line
+ ----------------------------------------------------
+
+ 1. Take note of the *device name* of the first USB stick as displayed in the
+ right pane. The device name should be something like `/dev/sdb`,
+ `/dev/sdc`, etc.
+
+ <div class="caution">
+
+ <p>If you are not sure about the device name, you should stop proceeding or
+ you risk overwriting any hard disk on the computer.</p>
+
+ </div>
+
+ 1. Open a terminal.
+
+ 1. Execute the following command, replacing `[tails.iso]` with the path to the
+ ISO image that you want to install and `[device]` with the device name
+ found in step 1.
+
+ dd if=[tails.iso] of=[device] bs=16M && sync
+
+ Here is an example of command to execute, yours is probably different:
+
+ dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync
+
+ <div class="tip">
+
+ <p>If you are not sure about the path to the ISO image or if you get a <span
+ class="guilabel">No such file or directory</span> error message, you can
+ first type <code>dd</code>, followed by a space, and then drag and drop the
+ icon of the ISO image from a file browser onto the terminal. Doing so should
+ insert the correct path to the ISO image in the terminal. Then complete the
+ command and execute it.</p>
+
+ </div>
+
+ 1. If no error message is returned, Tails is being install on the USB stick.
+ The installation takes a few minutes.
+
+ You can now continue with the next step and [[Open these instructions on
+ another device|usb#intermediary]].
+
+ """]]
+
1. In the <span class="guilabel">Restore Disk Image</span> dialog, click on the file selector button and
choose the ISO image that you downloaded earlier.
diff --git a/wiki/src/install/linux/usb.pt.po b/wiki/src/install/linux/usb.pt.po
index 6f1f484..4a50b10 100644
--- a/wiki/src/install/linux/usb.pt.po
+++ b/wiki/src/install/linux/usb.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 13:04+0000\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"
@@ -153,6 +153,111 @@ msgstr ""
msgid " [[!img install/inc/screenshots/gnome_disks_system.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+" and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+" using the command line\"]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Install an intermediary Tails using the command line\n"
+" ----------------------------------------------------\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Take note of the *device name* of the first USB stick as displayed in the "
+"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
+"etc."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If you are not sure about the device name, you should stop proceeding or\n"
+" you risk overwriting any hard disk on the computer.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Open a terminal."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"Execute the following command, replacing `[tails.iso]` with the path to the "
+"ISO image that you want to install and `[device]` with the device name found "
+"in step 1."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " Here is an example of command to execute, yours is probably different:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+" class=\"guilabel\">No such file or directory</span> error message, you can\n"
+" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+" insert the correct path to the ISO image in the terminal. Then complete the\n"
+" command and execute it.</p>\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"If no error message is returned, Tails is being install on the USB stick. "
+"The installation takes a few minutes."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" You can now continue with the next step and [[Open these instructions on\n"
+" another device|usb#intermediary]].\n"
+msgstr ""
+
#. type: Bullet: '1. '
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
diff --git a/wiki/src/install/os.de.po b/wiki/src/install/os.de.po
index 5b0be49..9b9ad00 100644
--- a/wiki/src/install/os.de.po
+++ b/wiki/src/install/os.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -49,7 +49,7 @@ msgid "|install/mac]]"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Ubuntu"
+msgid "Debian or Ubuntu <small>(Linux Mint, etc.)</small>"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/os.fa.po b/wiki/src/install/os.fa.po
index 03a5376..9b9ad00 100644
--- a/wiki/src/install/os.fa.po
+++ b/wiki/src/install/os.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -49,7 +49,7 @@ msgid "|install/mac]]"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Ubuntu"
+msgid "Debian or Ubuntu <small>(Linux Mint, etc.)</small>"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/os.fr.po b/wiki/src/install/os.fr.po
index 5b0be49..9b9ad00 100644
--- a/wiki/src/install/os.fr.po
+++ b/wiki/src/install/os.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -49,7 +49,7 @@ msgid "|install/mac]]"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Ubuntu"
+msgid "Debian or Ubuntu <small>(Linux Mint, etc.)</small>"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/os.html b/wiki/src/install/os.html
index d3855e6..173fcb1 100644
--- a/wiki/src/install/os.html
+++ b/wiki/src/install/os.html
@@ -33,7 +33,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
- <h3 class="panel-title">Ubuntu</h3>
+ <h3 class="panel-title">Debian or Ubuntu <small>(Linux Mint, etc.)</small></h3>
</div>
</div>
|install/debian]]
diff --git a/wiki/src/install/os.pt.po b/wiki/src/install/os.pt.po
index 5b0be49..9b9ad00 100644
--- a/wiki/src/install/os.pt.po
+++ b/wiki/src/install/os.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-22 22:46+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -49,7 +49,7 @@ msgid "|install/mac]]"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Ubuntu"
+msgid "Debian or Ubuntu <small>(Linux Mint, etc.)</small>"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/vm.de.po b/wiki/src/install/vm.de.po
index 042af83..50f620e 100644
--- a/wiki/src/install/vm.de.po
+++ b/wiki/src/install/vm.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 16:52+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,23 +33,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/vm\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -59,9 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/vm.fa.po b/wiki/src/install/vm.fa.po
index 53e2dfc..50f620e 100644
--- a/wiki/src/install/vm.fa.po
+++ b/wiki/src/install/vm.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-23 15:02+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,23 +33,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/vm\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -59,9 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/vm.fr.po b/wiki/src/install/vm.fr.po
index 042af83..50f620e 100644
--- a/wiki/src/install/vm.fr.po
+++ b/wiki/src/install/vm.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 16:52+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,23 +33,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/vm\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -59,9 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/vm.mdwn b/wiki/src/install/vm.mdwn
index c803d13..076f6bb 100644
--- a/wiki/src/install/vm.mdwn
+++ b/wiki/src/install/vm.mdwn
@@ -4,6 +4,7 @@
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/vm" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/dave"]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
diff --git a/wiki/src/install/vm.pt.po b/wiki/src/install/vm.pt.po
index 042af83..50f620e 100644
--- a/wiki/src/install/vm.pt.po
+++ b/wiki/src/install/vm.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 16:52+0100\n"
+"POT-Creation-Date: 2016-01-14 14:29+0000\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"
@@ -33,23 +33,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" "
-"title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/vm\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -59,9 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/win.de.po b/wiki/src/install/win.de.po
index f136537..6988777 100644
--- a/wiki/src/install/win.de.po
+++ b/wiki/src/install/win.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -60,12 +60,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "45 minutes to install"
+msgid "1 hour to install"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/win.fa.po b/wiki/src/install/win.fa.po
index f136537..6988777 100644
--- a/wiki/src/install/win.fa.po
+++ b/wiki/src/install/win.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -60,12 +60,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "45 minutes to install"
+msgid "1 hour to install"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/win.fr.po b/wiki/src/install/win.fr.po
index f136537..6988777 100644
--- a/wiki/src/install/win.fr.po
+++ b/wiki/src/install/win.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -60,12 +60,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "45 minutes to install"
+msgid "1 hour to install"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/win.html b/wiki/src/install/win.html
index 4b8fa99..eb0eb00 100644
--- a/wiki/src/install/win.html
+++ b/wiki/src/install/win.html
@@ -38,8 +38,8 @@
[[!inline pages="install/inc/router/why_two.inline" raw="yes"]]
"""]]
</li>
- <li>30&ndash;60 minutes to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
- <li>45 minutes to install</li>
+ <li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
+ <li>1 hour to install</li>
</ul>
[[
diff --git a/wiki/src/install/win.pt.po b/wiki/src/install/win.pt.po
index f136537..6988777 100644
--- a/wiki/src/install/win.pt.po
+++ b/wiki/src/install/win.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -60,12 +60,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "45 minutes to install"
+msgid "1 hour to install"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/lib/spinner.png b/wiki/src/lib/spinner.png
new file mode 100644
index 0000000..ac7f5f9
--- /dev/null
+++ b/wiki/src/lib/spinner.png
Binary files differ
diff --git a/wiki/src/local.css b/wiki/src/local.css
index 7b846d5..e4b62e6 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -1054,7 +1054,8 @@ span.replaceable { font-style: italic; }
div.bug, div.caution, div.next, div.note, div.tip, div.trophy {
background-color: #FFFFF0;
border: 1px solid #E0E0DF;
- padding: 0.5em 6px;
+ border-radius: 4px;
+ padding: 1.35em 6px 0em;
background-position: 6px 0.5em;
background-repeat: no-repeat;
min-height: 48px;
@@ -1062,14 +1063,6 @@ div.bug, div.caution, div.next, div.note, div.tip, div.trophy {
margin: 0 0 1.5em 0;
max-width: 38em;
}
-div.bug > p:only-child, div.caution > p:only-child, div.next > p:only-child, div.note > p:only-child, div.tip > p:only-child, div.trophy > p:only-child {
- display: table-cell;
- height: 2.5em;
- vertical-align: bottom;
-}
-div.bug p:last-child, div.caution p:last-child, div.next p:last-child, div.note p:last-child, div.tip p:last-child, div.trophy > p:last-child {
- margin-bottom: 0;
-}
div.bug {
background-image: url(lib/admon-bug.png);
}
diff --git a/wiki/src/local.rtl.css b/wiki/src/local.rtl.css
index aaf312b..3c0384f 100644
--- a/wiki/src/local.rtl.css
+++ b/wiki/src/local.rtl.css
@@ -32,8 +32,8 @@ html[dir="rtl"] .sidebar .download a {
}
html[dir="rtl"] #tor_check {
- float: left;
- margin: 0 0 2em 0;
+ float: right;
+ margin: 0 0 0 2em;
}
html[dir="rtl"] .pageheader #otherlanguages {
diff --git a/wiki/src/news/test_2.0-rc1.de.po b/wiki/src/news/test_2.0-rc1.de.po
new file mode 100644
index 0000000..322422e
--- /dev/null
+++ b/wiki/src/news/test_2.0-rc1.de.po
@@ -0,0 +1,300 @@
+# 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: 2016-01-13 12:37+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=\"Call for testing: 2.0~rc1\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta date=\"2016-01-12 17:00:00\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!tag announce]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can help Tails! The first release candidate for the upcoming version 2.0 "
+"is out. We are very excited and cannot wait to hear what you think about "
+"it :)"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=1]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's new in 2.0?"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Tails 2.0 will be the first version of Tails based on Debian 8 (Jessie). As "
+"such, it upgrades essentially all included software."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The most noticeable change is probably the move to GNOME Shell, configured "
+"in *Classic mode*. This desktop environment provides a modern and actively "
+"developed replacement for the aging GNOME \"Flashback\". GNOME Shell also "
+"paves the way for better supporting touchscreens in the future."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Under the hood, an amazing amount of code was ported to more modern "
+"technologies. This, in turn, allowed us to do lots of small changes all "
+"around the place, that will make the Tails experience both safer, and more "
+"pleasant. For example, all custom system services are harder to exploit "
+"thanks to the use of Linux namespaces, set up by systemd. And the way Tails "
+"tells the user that \"Tor is ready\" is now more accurate."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"But really, there are simply too many changes to describe them all here, so "
+"try Tails 2.0~rc1 yourself!"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Technical details of all the changes are listed in the [Changelog](https://"
+"git-tails.immerda.ch/tails/plain/debian/changelog?h=devel)."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"There is one piece of bad news, that makes us a bit sad, though: we had to "
+"remove the Windows camouflage feature, since our call for help to port it to "
+"GNOME Shell (issued in January, 2015) was unsuccessful."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's new since Tails 2.0~beta1?"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix the passphrase strength indicator of GNOME Disks."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Remove Claws Mail: Icedove is now the default email client."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Upgrade Tor Browser to 5.5a6."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Install xserver-xorg-video-intel from Jessie Backports (currently: "
+"2.99.917-2~bpo8+1). This adds support for recent chips such as Intel "
+"Broadwell's HD Graphics."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Stop offering the option to open downloaded files with external"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"applications in Tor Browser (Closes: #9285). Our AppArmor confinement was"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "blocking most such actions anyway, resulting in poor UX."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Fix the performance issue of Tails Upgrader that made automatic upgrades"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "very slow to apply."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix Electrum by installing the version from Debian testing."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Restore default file associations."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Repair Dotfiles persistence feature."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix ability to reconfigure an existing persistent storage."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Associate armored OpenPGP public keys named `*.key` with Seahorse."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Update the list of enabled GNOME Shell extensions, which might fix"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"the \"GNOME Shell sometimes leaves Classic mode\" bug seen in 2.0~beta1:"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "How to test Tails 2.0~rc1?"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"**Keep in mind that this is a test image.** We have ensured that it is not "
+"broken in any obvious way, but it might still contain undiscovered issues."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Download the ISO image and its signature:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <a class=\"download-file\" href=\"http://dl.amnesia.boum.org/tails/alpha/tails-i386-2.0~rc1/tails-i386-2.0~rc1.iso\" >Tails 2.0~rc1 ISO image</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <a class=\"download-signature\"\n"
+" href=\"https://tails.boum.org/torrents/files/tails-i386-2.0~rc1.iso.sig\">Tails 2.0~rc1 signature</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Or try the automatic upgrade from\n"
+" 2.0~beta1 even though it is very slow.\n"
+" Note that there is no automatic upgrade from 1.8.2 to this release.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "[[Verify the ISO image|download#verify]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Have a look at the list of <a href=\"#known_issues\">known issues of this "
+"release</a> and the list of [[longstanding known issues|support/"
+"known_issues]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Test wildly!"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you find anything that is not working as it should, please report to\n"
+"us on <tails-testers@boum.org>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Bonus points if you first check if it is a\n"
+"<a href=\"#known_issues\">known issue of this release</a> or a\n"
+"[[longstanding known issue|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"known_issues\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Known issues in 2.0~rc1\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "The documentation was not updated yet."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Tor Browser does not support MPEG-4 video streaming in Tails 2.0 and newer "
+"([[!tails_ticket 10835]]). Instead, in some cases you can download them and "
+"play them with the video player included in Tails. On the other hand, web "
+"sites that propose WebM video streaming work fine."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Sometimes, some of the icons located on the top right corner of the screen "
+"are not displayed entirely, or at all. For example, the Vidalia icon, or the "
+"icon that allows to change to another keyboard layout, may be hidden. Other "
+"information, such as the clock, may not be visible. Restarting Tails often "
+"solves this problem. ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Network interfaces sometimes remain turned off ([[!tails_ticket 9012]]). If "
+"this happens to you, please [[report the error|doc/first_steps/"
+"bug_reporting]] so we can get enough debugging information to fix it."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Graphics display operations are slow on computers with graphics adapters of "
+"the NVidia [[!wikipedia GeForce 900 series]], such as the GeForce GTX 960."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"It is not possible to add and configure printers ([[!tails_ticket 10893]])."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "[[Longstanding known issues|support/known_issues]]"
+msgstr ""
diff --git a/wiki/src/news/test_2.0-rc1.fa.po b/wiki/src/news/test_2.0-rc1.fa.po
new file mode 100644
index 0000000..322422e
--- /dev/null
+++ b/wiki/src/news/test_2.0-rc1.fa.po
@@ -0,0 +1,300 @@
+# 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: 2016-01-13 12:37+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=\"Call for testing: 2.0~rc1\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta date=\"2016-01-12 17:00:00\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!tag announce]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can help Tails! The first release candidate for the upcoming version 2.0 "
+"is out. We are very excited and cannot wait to hear what you think about "
+"it :)"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=1]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's new in 2.0?"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Tails 2.0 will be the first version of Tails based on Debian 8 (Jessie). As "
+"such, it upgrades essentially all included software."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The most noticeable change is probably the move to GNOME Shell, configured "
+"in *Classic mode*. This desktop environment provides a modern and actively "
+"developed replacement for the aging GNOME \"Flashback\". GNOME Shell also "
+"paves the way for better supporting touchscreens in the future."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Under the hood, an amazing amount of code was ported to more modern "
+"technologies. This, in turn, allowed us to do lots of small changes all "
+"around the place, that will make the Tails experience both safer, and more "
+"pleasant. For example, all custom system services are harder to exploit "
+"thanks to the use of Linux namespaces, set up by systemd. And the way Tails "
+"tells the user that \"Tor is ready\" is now more accurate."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"But really, there are simply too many changes to describe them all here, so "
+"try Tails 2.0~rc1 yourself!"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Technical details of all the changes are listed in the [Changelog](https://"
+"git-tails.immerda.ch/tails/plain/debian/changelog?h=devel)."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"There is one piece of bad news, that makes us a bit sad, though: we had to "
+"remove the Windows camouflage feature, since our call for help to port it to "
+"GNOME Shell (issued in January, 2015) was unsuccessful."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's new since Tails 2.0~beta1?"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix the passphrase strength indicator of GNOME Disks."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Remove Claws Mail: Icedove is now the default email client."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Upgrade Tor Browser to 5.5a6."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Install xserver-xorg-video-intel from Jessie Backports (currently: "
+"2.99.917-2~bpo8+1). This adds support for recent chips such as Intel "
+"Broadwell's HD Graphics."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Stop offering the option to open downloaded files with external"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"applications in Tor Browser (Closes: #9285). Our AppArmor confinement was"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "blocking most such actions anyway, resulting in poor UX."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Fix the performance issue of Tails Upgrader that made automatic upgrades"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "very slow to apply."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix Electrum by installing the version from Debian testing."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Restore default file associations."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Repair Dotfiles persistence feature."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix ability to reconfigure an existing persistent storage."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Associate armored OpenPGP public keys named `*.key` with Seahorse."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Update the list of enabled GNOME Shell extensions, which might fix"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"the \"GNOME Shell sometimes leaves Classic mode\" bug seen in 2.0~beta1:"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "How to test Tails 2.0~rc1?"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"**Keep in mind that this is a test image.** We have ensured that it is not "
+"broken in any obvious way, but it might still contain undiscovered issues."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Download the ISO image and its signature:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <a class=\"download-file\" href=\"http://dl.amnesia.boum.org/tails/alpha/tails-i386-2.0~rc1/tails-i386-2.0~rc1.iso\" >Tails 2.0~rc1 ISO image</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <a class=\"download-signature\"\n"
+" href=\"https://tails.boum.org/torrents/files/tails-i386-2.0~rc1.iso.sig\">Tails 2.0~rc1 signature</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Or try the automatic upgrade from\n"
+" 2.0~beta1 even though it is very slow.\n"
+" Note that there is no automatic upgrade from 1.8.2 to this release.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "[[Verify the ISO image|download#verify]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Have a look at the list of <a href=\"#known_issues\">known issues of this "
+"release</a> and the list of [[longstanding known issues|support/"
+"known_issues]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Test wildly!"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you find anything that is not working as it should, please report to\n"
+"us on <tails-testers@boum.org>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Bonus points if you first check if it is a\n"
+"<a href=\"#known_issues\">known issue of this release</a> or a\n"
+"[[longstanding known issue|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"known_issues\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Known issues in 2.0~rc1\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "The documentation was not updated yet."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Tor Browser does not support MPEG-4 video streaming in Tails 2.0 and newer "
+"([[!tails_ticket 10835]]). Instead, in some cases you can download them and "
+"play them with the video player included in Tails. On the other hand, web "
+"sites that propose WebM video streaming work fine."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Sometimes, some of the icons located on the top right corner of the screen "
+"are not displayed entirely, or at all. For example, the Vidalia icon, or the "
+"icon that allows to change to another keyboard layout, may be hidden. Other "
+"information, such as the clock, may not be visible. Restarting Tails often "
+"solves this problem. ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Network interfaces sometimes remain turned off ([[!tails_ticket 9012]]). If "
+"this happens to you, please [[report the error|doc/first_steps/"
+"bug_reporting]] so we can get enough debugging information to fix it."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Graphics display operations are slow on computers with graphics adapters of "
+"the NVidia [[!wikipedia GeForce 900 series]], such as the GeForce GTX 960."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"It is not possible to add and configure printers ([[!tails_ticket 10893]])."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "[[Longstanding known issues|support/known_issues]]"
+msgstr ""
diff --git a/wiki/src/news/test_2.0-rc1.fr.po b/wiki/src/news/test_2.0-rc1.fr.po
new file mode 100644
index 0000000..322422e
--- /dev/null
+++ b/wiki/src/news/test_2.0-rc1.fr.po
@@ -0,0 +1,300 @@
+# 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: 2016-01-13 12:37+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=\"Call for testing: 2.0~rc1\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta date=\"2016-01-12 17:00:00\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!tag announce]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can help Tails! The first release candidate for the upcoming version 2.0 "
+"is out. We are very excited and cannot wait to hear what you think about "
+"it :)"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=1]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's new in 2.0?"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Tails 2.0 will be the first version of Tails based on Debian 8 (Jessie). As "
+"such, it upgrades essentially all included software."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The most noticeable change is probably the move to GNOME Shell, configured "
+"in *Classic mode*. This desktop environment provides a modern and actively "
+"developed replacement for the aging GNOME \"Flashback\". GNOME Shell also "
+"paves the way for better supporting touchscreens in the future."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Under the hood, an amazing amount of code was ported to more modern "
+"technologies. This, in turn, allowed us to do lots of small changes all "
+"around the place, that will make the Tails experience both safer, and more "
+"pleasant. For example, all custom system services are harder to exploit "
+"thanks to the use of Linux namespaces, set up by systemd. And the way Tails "
+"tells the user that \"Tor is ready\" is now more accurate."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"But really, there are simply too many changes to describe them all here, so "
+"try Tails 2.0~rc1 yourself!"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Technical details of all the changes are listed in the [Changelog](https://"
+"git-tails.immerda.ch/tails/plain/debian/changelog?h=devel)."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"There is one piece of bad news, that makes us a bit sad, though: we had to "
+"remove the Windows camouflage feature, since our call for help to port it to "
+"GNOME Shell (issued in January, 2015) was unsuccessful."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's new since Tails 2.0~beta1?"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix the passphrase strength indicator of GNOME Disks."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Remove Claws Mail: Icedove is now the default email client."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Upgrade Tor Browser to 5.5a6."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Install xserver-xorg-video-intel from Jessie Backports (currently: "
+"2.99.917-2~bpo8+1). This adds support for recent chips such as Intel "
+"Broadwell's HD Graphics."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Stop offering the option to open downloaded files with external"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"applications in Tor Browser (Closes: #9285). Our AppArmor confinement was"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "blocking most such actions anyway, resulting in poor UX."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Fix the performance issue of Tails Upgrader that made automatic upgrades"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "very slow to apply."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix Electrum by installing the version from Debian testing."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Restore default file associations."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Repair Dotfiles persistence feature."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix ability to reconfigure an existing persistent storage."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Associate armored OpenPGP public keys named `*.key` with Seahorse."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Update the list of enabled GNOME Shell extensions, which might fix"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"the \"GNOME Shell sometimes leaves Classic mode\" bug seen in 2.0~beta1:"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "How to test Tails 2.0~rc1?"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"**Keep in mind that this is a test image.** We have ensured that it is not "
+"broken in any obvious way, but it might still contain undiscovered issues."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Download the ISO image and its signature:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <a class=\"download-file\" href=\"http://dl.amnesia.boum.org/tails/alpha/tails-i386-2.0~rc1/tails-i386-2.0~rc1.iso\" >Tails 2.0~rc1 ISO image</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <a class=\"download-signature\"\n"
+" href=\"https://tails.boum.org/torrents/files/tails-i386-2.0~rc1.iso.sig\">Tails 2.0~rc1 signature</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Or try the automatic upgrade from\n"
+" 2.0~beta1 even though it is very slow.\n"
+" Note that there is no automatic upgrade from 1.8.2 to this release.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "[[Verify the ISO image|download#verify]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Have a look at the list of <a href=\"#known_issues\">known issues of this "
+"release</a> and the list of [[longstanding known issues|support/"
+"known_issues]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Test wildly!"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you find anything that is not working as it should, please report to\n"
+"us on <tails-testers@boum.org>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Bonus points if you first check if it is a\n"
+"<a href=\"#known_issues\">known issue of this release</a> or a\n"
+"[[longstanding known issue|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"known_issues\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Known issues in 2.0~rc1\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "The documentation was not updated yet."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Tor Browser does not support MPEG-4 video streaming in Tails 2.0 and newer "
+"([[!tails_ticket 10835]]). Instead, in some cases you can download them and "
+"play them with the video player included in Tails. On the other hand, web "
+"sites that propose WebM video streaming work fine."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Sometimes, some of the icons located on the top right corner of the screen "
+"are not displayed entirely, or at all. For example, the Vidalia icon, or the "
+"icon that allows to change to another keyboard layout, may be hidden. Other "
+"information, such as the clock, may not be visible. Restarting Tails often "
+"solves this problem. ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Network interfaces sometimes remain turned off ([[!tails_ticket 9012]]). If "
+"this happens to you, please [[report the error|doc/first_steps/"
+"bug_reporting]] so we can get enough debugging information to fix it."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Graphics display operations are slow on computers with graphics adapters of "
+"the NVidia [[!wikipedia GeForce 900 series]], such as the GeForce GTX 960."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"It is not possible to add and configure printers ([[!tails_ticket 10893]])."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "[[Longstanding known issues|support/known_issues]]"
+msgstr ""
diff --git a/wiki/src/news/test_2.0-rc1.mdwn b/wiki/src/news/test_2.0-rc1.mdwn
new file mode 100644
index 0000000..0a295fb
--- /dev/null
+++ b/wiki/src/news/test_2.0-rc1.mdwn
@@ -0,0 +1,141 @@
+[[!meta title="Call for testing: 2.0~rc1"]]
+
+[[!meta date="2016-01-12 17:00:00"]]
+
+[[!tag announce]]
+
+You can help Tails! The first release candidate for the upcoming
+version 2.0 is out. We are very excited and cannot wait to hear what
+you think about it :)
+
+[[!toc levels=1]]
+
+# What's new in 2.0?
+
+Tails 2.0 will be the first version of Tails based on Debian 8
+(Jessie). As such, it upgrades essentially all included software.
+
+The most noticeable change is probably the move to GNOME Shell,
+configured in *Classic mode*. This desktop environment provides a modern
+and actively developed replacement for the aging GNOME "Flashback".
+GNOME Shell also paves the way for better supporting touchscreens in
+the future.
+
+Under the hood, an amazing amount of code was ported to more modern
+technologies. This, in turn, allowed us to do lots of small changes
+all around the place, that will make the Tails experience both
+safer, and more pleasant. For example, all custom system services
+are harder to exploit thanks to the use of Linux namespaces, set up by
+systemd. And the way Tails tells the user that "Tor is ready" is now
+more accurate.
+
+But really, there are simply too many changes to describe them all
+here, so try Tails 2.0~rc1 yourself!
+
+Technical details of all the changes are listed in the
+[Changelog](https://git-tails.immerda.ch/tails/plain/debian/changelog?h=devel).
+
+There is one piece of bad news, that makes us a bit sad, though: we
+had to remove the Windows camouflage feature, since our call for help
+to port it to GNOME Shell (issued in January, 2015) was unsuccessful.
+
+# What's new since Tails 2.0~beta1?
+
+## New features
+
+* Fix the passphrase strength indicator of GNOME Disks.
+
+## Upgrades and changes
+
+* Remove Claws Mail: Icedove is now the default email client.
+* Upgrade Tor Browser to 5.5a6.
+* Install xserver-xorg-video-intel from Jessie Backports (currently:
+ 2.99.917-2~bpo8+1). This adds support for recent chips such as
+ Intel Broadwell's HD Graphics.
+
+## Fixed problems
+
+* Stop offering the option to open downloaded files with external
+* applications in Tor Browser (Closes: #9285). Our AppArmor confinement was
+* blocking most such actions anyway, resulting in poor UX.
+
+* Fix the performance issue of Tails Upgrader that made automatic upgrades
+* very slow to apply.
+
+* Fix Electrum by installing the version from Debian testing.
+
+* Restore default file associations.
+
+* Repair Dotfiles persistence feature.
+
+* Fix ability to reconfigure an existing persistent storage.
+
+* Associate armored OpenPGP public keys named `*.key` with Seahorse.
+
+* Update the list of enabled GNOME Shell extensions, which might fix
+* the "GNOME Shell sometimes leaves Classic mode" bug seen in 2.0~beta1:
+
+# How to test Tails 2.0~rc1?
+
+1. **Keep in mind that this is a test image.** We have ensured
+ that it is not broken in any obvious way, but it might still contain
+ undiscovered issues.
+
+2. Download the ISO image and its signature:
+
+ <a class="download-file" href="http://dl.amnesia.boum.org/tails/alpha/tails-i386-2.0~rc1/tails-i386-2.0~rc1.iso" >Tails 2.0~rc1 ISO image</a>
+
+ <a class="download-signature"
+ href="https://tails.boum.org/torrents/files/tails-i386-2.0~rc1.iso.sig">Tails 2.0~rc1 signature</a>
+
+ Or try the automatic upgrade from
+ 2.0~beta1 even though it is very slow.
+ Note that there is no automatic upgrade from 1.8.2 to this release.
+
+1. [[Verify the ISO image|download#verify]].
+
+1. Have a look at the list of <a href="#known_issues">known issues of
+ this release</a> and the list of
+ [[longstanding known issues|support/known_issues]].
+
+1. Test wildly!
+
+If you find anything that is not working as it should, please report to
+us on <tails-testers@boum.org>.
+
+Bonus points if you first check if it is a
+<a href="#known_issues">known issue of this release</a> or a
+[[longstanding known issue|support/known_issues]].
+
+<a id="known_issues"></a>
+
+Known issues in 2.0~rc1
+=======================
+
+* The documentation was not updated yet.
+
+* Tor Browser does not support MPEG-4 video streaming in Tails 2.0 and
+ newer ([[!tails_ticket 10835]]). Instead, in some cases you can
+ download them and play them with the video player included in Tails.
+ On the other hand, web sites that propose WebM video streaming
+ work fine.
+
+* Sometimes, some of the icons located on the top right corner of the
+ screen are not displayed entirely, or at all. For example, the Vidalia
+ icon, or the icon that allows to change to another keyboard layout,
+ may be hidden. Other information, such as the clock, may not
+ be visible. Restarting Tails often solves this problem.
+ ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])
+
+* Network interfaces sometimes remain turned off ([[!tails_ticket 9012]]).
+ If this happens to you, please [[report the error|doc/first_steps/bug_reporting]]
+ so we can get enough debugging information to fix it.
+
+* Graphics display operations are slow on computers with graphics
+ adapters of the NVidia [[!wikipedia GeForce 900 series]], such as the
+ GeForce GTX 960.
+
+* It is not possible to add and configure printers
+ ([[!tails_ticket 10893]]).
+
+* [[Longstanding known issues|support/known_issues]]
diff --git a/wiki/src/news/test_2.0-rc1.pt.po b/wiki/src/news/test_2.0-rc1.pt.po
new file mode 100644
index 0000000..322422e
--- /dev/null
+++ b/wiki/src/news/test_2.0-rc1.pt.po
@@ -0,0 +1,300 @@
+# 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: 2016-01-13 12:37+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=\"Call for testing: 2.0~rc1\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta date=\"2016-01-12 17:00:00\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!tag announce]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can help Tails! The first release candidate for the upcoming version 2.0 "
+"is out. We are very excited and cannot wait to hear what you think about "
+"it :)"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=1]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's new in 2.0?"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Tails 2.0 will be the first version of Tails based on Debian 8 (Jessie). As "
+"such, it upgrades essentially all included software."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The most noticeable change is probably the move to GNOME Shell, configured "
+"in *Classic mode*. This desktop environment provides a modern and actively "
+"developed replacement for the aging GNOME \"Flashback\". GNOME Shell also "
+"paves the way for better supporting touchscreens in the future."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Under the hood, an amazing amount of code was ported to more modern "
+"technologies. This, in turn, allowed us to do lots of small changes all "
+"around the place, that will make the Tails experience both safer, and more "
+"pleasant. For example, all custom system services are harder to exploit "
+"thanks to the use of Linux namespaces, set up by systemd. And the way Tails "
+"tells the user that \"Tor is ready\" is now more accurate."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"But really, there are simply too many changes to describe them all here, so "
+"try Tails 2.0~rc1 yourself!"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Technical details of all the changes are listed in the [Changelog](https://"
+"git-tails.immerda.ch/tails/plain/debian/changelog?h=devel)."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"There is one piece of bad news, that makes us a bit sad, though: we had to "
+"remove the Windows camouflage feature, since our call for help to port it to "
+"GNOME Shell (issued in January, 2015) was unsuccessful."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's new since Tails 2.0~beta1?"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix the passphrase strength indicator of GNOME Disks."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Remove Claws Mail: Icedove is now the default email client."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Upgrade Tor Browser to 5.5a6."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Install xserver-xorg-video-intel from Jessie Backports (currently: "
+"2.99.917-2~bpo8+1). This adds support for recent chips such as Intel "
+"Broadwell's HD Graphics."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Stop offering the option to open downloaded files with external"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"applications in Tor Browser (Closes: #9285). Our AppArmor confinement was"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "blocking most such actions anyway, resulting in poor UX."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Fix the performance issue of Tails Upgrader that made automatic upgrades"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "very slow to apply."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix Electrum by installing the version from Debian testing."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Restore default file associations."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Repair Dotfiles persistence feature."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Fix ability to reconfigure an existing persistent storage."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Associate armored OpenPGP public keys named `*.key` with Seahorse."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Update the list of enabled GNOME Shell extensions, which might fix"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"the \"GNOME Shell sometimes leaves Classic mode\" bug seen in 2.0~beta1:"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "How to test Tails 2.0~rc1?"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"**Keep in mind that this is a test image.** We have ensured that it is not "
+"broken in any obvious way, but it might still contain undiscovered issues."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Download the ISO image and its signature:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <a class=\"download-file\" href=\"http://dl.amnesia.boum.org/tails/alpha/tails-i386-2.0~rc1/tails-i386-2.0~rc1.iso\" >Tails 2.0~rc1 ISO image</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <a class=\"download-signature\"\n"
+" href=\"https://tails.boum.org/torrents/files/tails-i386-2.0~rc1.iso.sig\">Tails 2.0~rc1 signature</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Or try the automatic upgrade from\n"
+" 2.0~beta1 even though it is very slow.\n"
+" Note that there is no automatic upgrade from 1.8.2 to this release.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "[[Verify the ISO image|download#verify]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Have a look at the list of <a href=\"#known_issues\">known issues of this "
+"release</a> and the list of [[longstanding known issues|support/"
+"known_issues]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Test wildly!"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you find anything that is not working as it should, please report to\n"
+"us on <tails-testers@boum.org>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Bonus points if you first check if it is a\n"
+"<a href=\"#known_issues\">known issue of this release</a> or a\n"
+"[[longstanding known issue|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"known_issues\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Known issues in 2.0~rc1\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "The documentation was not updated yet."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Tor Browser does not support MPEG-4 video streaming in Tails 2.0 and newer "
+"([[!tails_ticket 10835]]). Instead, in some cases you can download them and "
+"play them with the video player included in Tails. On the other hand, web "
+"sites that propose WebM video streaming work fine."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Sometimes, some of the icons located on the top right corner of the screen "
+"are not displayed entirely, or at all. For example, the Vidalia icon, or the "
+"icon that allows to change to another keyboard layout, may be hidden. Other "
+"information, such as the clock, may not be visible. Restarting Tails often "
+"solves this problem. ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Network interfaces sometimes remain turned off ([[!tails_ticket 9012]]). If "
+"this happens to you, please [[report the error|doc/first_steps/"
+"bug_reporting]] so we can get enough debugging information to fix it."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Graphics display operations are slow on computers with graphics adapters of "
+"the NVidia [[!wikipedia GeForce 900 series]], such as the GeForce GTX 960."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"It is not possible to add and configure printers ([[!tails_ticket 10893]])."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "[[Longstanding known issues|support/known_issues]]"
+msgstr ""
diff --git a/wiki/src/news/version_1.8.2.de.po b/wiki/src/news/version_1.8.2.de.po
index cdd94c6..28a3a80 100644
--- a/wiki/src/news/version_1.8.2.de.po
+++ b/wiki/src/news/version_1.8.2.de.po
@@ -3,60 +3,63 @@
# 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: \n"
"POT-Creation-Date: 2016-01-09 22:18+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2016-01-15 22:20+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \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"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Sun Jan 10 01:02:03 CET 2016\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Sun Jan 10 01:02:03 CET 2016\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Tails 1.8.2 is out\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Tails 1.8.2 wurde veröffentlicht\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
-"This release fixes [[numerous security "
-"issues|security/Numerous_security_holes_in_1.8.1]]. All users must upgrade "
-"as soon as possible."
+"This release fixes [[numerous security issues|security/"
+"Numerous_security_holes_in_1.8.1]]. All users must upgrade as soon as "
+"possible."
msgstr ""
+"Diese Version behebt [[zahlreiche Sicherheitslücken|security/"
+"Numerous_security_holes_in_1.8.1]]. Alle Benutzer sollten so schnell wie "
+"möglich aktualisieren."
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
msgid "Changes"
-msgstr ""
+msgstr "Änderungen"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"inc/release_notes/1.8.2\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"inc/release_notes/1.8.2.de\" raw=\"yes\"]]\n"
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "Bekannte Probleme"
#. type: Bullet: '* '
msgid ""
@@ -64,42 +67,60 @@ msgid ""
"to take around an hour *after* the download is finished. See [[!tails_ticket "
"10757]] for details."
msgstr ""
+"Automatische Aktualisierungen sind viel langsamer als bisher. Erwarten Sie, "
+"dass eine Aktualisierung etwa eine Stunde in Anspruch nimmt, nachdem der "
+"Download abgeschlossen wurde. Für weitere Details lesen Sie [[!tails_ticket "
+"10757]]."
#. type: Plain text
msgid "See the current list of [[known issues|support/known_issues]]."
msgstr ""
+"Lesen Sie sich die aktuelle Liste der [[bekannten Probleme|support/known_issues]] "
+"durch."
#. type: Title #
#, no-wrap
msgid "Download or upgrade"
-msgstr ""
+msgstr "Herunterladen oder Aktualisieren"
#. type: Plain text
msgid "Go to the [[download]] or [[upgrade|doc/first_steps/upgrade/]] page."
msgstr ""
+"Gehen Sie zur [[Download-|download]] oder zur [[Aktualisieren-|doc/"
+"first_steps/upgrade/]]-Seite."
#. type: Plain text
msgid ""
"If your Tails does not boot after an automatic upgrade, please [[upgrade "
"your Tails manually|doc/first_steps/upgrade#manual]]."
msgstr ""
+"Falls Ihr Tails nach einer automatischen Aktualisierung nicht mehr startet, "
+"[[aktualisieren Sie Ihr Tails bitte manuell|doc/first_steps/upgrade#manual]]."
#. type: Title #
#, no-wrap
msgid "What's coming up?"
-msgstr ""
+msgstr "Was kommt als Nächstes?"
#. type: Plain text
-msgid "The next Tails release is [[scheduled|contribute/calendar]] for January 26."
+msgid ""
+"The next Tails release is [[scheduled|contribute/calendar]] for January 26."
msgstr ""
+"Die nächste Version von Tails ist für den 26. Januar [[geplant|contribute/"
+"calendar]]."
#. type: Plain text
msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
msgstr ""
+"Werfen Sie einen Blick auf die [[!tails_roadmap]], um zu sehen, was wir als "
+"nächstes vorhaben."
#. type: Plain text
msgid ""
-"We need your help and there are many ways to [[contribute to "
-"Tails|contribute]] ([[donating|contribute/how/donate]] is only one of "
-"them). Come [[talk to us|contribute/talk]]!"
+"We need your help and there are many ways to [[contribute to Tails|"
+"contribute]] ([[donating|contribute/how/donate]] is only one of them). Come "
+"[[talk to us|contribute/talk]]!"
msgstr ""
+"Wir brauchen Ihre Hilfe und es gibt viele Wege, auf denen Sie [[Tails "
+"unterstützen|contribute]] können. ([[Spenden|contribute/how/donate]] ist nur "
+"einer davon). [[Sprechen Sie uns an|contribute/talk]]!"
diff --git a/wiki/src/press.de.po b/wiki/src/press.de.po
index 3b20c91..7dd8714 100644
--- a/wiki/src/press.de.po
+++ b/wiki/src/press.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-05 23:11+0100\n"
+"POT-Creation-Date: 2016-01-15 12:26+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"
@@ -114,12 +114,12 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "2015\n"
+msgid "2016\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"press/media_appearances_2016\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
@@ -130,6 +130,10 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
+msgid "[[!toggle id=\"media_appearances_2015\" text=\"2015\"]]"
+msgstr ""
+
+#. type: Bullet: '* '
msgid "[[!toggle id=\"media_appearances_2014\" text=\"2014\"]]"
msgstr ""
@@ -147,6 +151,26 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "[[!toggleable id=\"media_appearances_2015\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2015\" text=\"\"]]</span>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "2015\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
msgstr ""
diff --git a/wiki/src/press.fa.po b/wiki/src/press.fa.po
index 8597516..449daaa 100644
--- a/wiki/src/press.fa.po
+++ b/wiki/src/press.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-01-05 23:11+0100\n"
+"POT-Creation-Date: 2016-01-15 12:26+0100\n"
"PO-Revision-Date: 2015-10-19 07:27+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/press/fa/"
@@ -135,12 +135,13 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "2015\n"
-msgstr "۲۰۱۵\n"
+msgid "2016\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"press/media_appearances_2016\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
#. type: Plain text
@@ -153,6 +154,12 @@ msgstr ""
"----------------------\n"
#. type: Bullet: '* '
+#, fuzzy
+#| msgid "[[!toggle id=\"media_appearances_2014\" text=\"2014\"]]"
+msgid "[[!toggle id=\"media_appearances_2015\" text=\"2015\"]]"
+msgstr "[[!toggle id=\"media_appearances_2014\" text=\"۲۰۱۴\"]]"
+
+#. type: Bullet: '* '
msgid "[[!toggle id=\"media_appearances_2014\" text=\"2014\"]]"
msgstr "[[!toggle id=\"media_appearances_2014\" text=\"۲۰۱۴\"]]"
@@ -169,6 +176,28 @@ msgid "[[!toggle id=\"media_appearances_2011\" text=\"2011\"]]"
msgstr "[[!toggle id=\"media_appearances_2011\" text=\"۲۰۱۱\"]]"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
+msgid "[[!toggleable id=\"media_appearances_2015\" text=\"\"\"\n"
+msgstr "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2014\" text=\"\"]]</span>\n"
+msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2015\" text=\"\"]]</span>\n"
+msgstr "<span class=\"hide\">[[!toggle id=\"media_appearances_2014\" text=\"\"]]</span>\n"
+
+#. type: Title -
+#, no-wrap
+msgid "2015\n"
+msgstr "۲۰۱۵\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+
+#. type: Plain text
#, no-wrap
msgid "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
msgstr "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
diff --git a/wiki/src/press.fr.po b/wiki/src/press.fr.po
index 4c04307..d78cb7f 100644
--- a/wiki/src/press.fr.po
+++ b/wiki/src/press.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-05 23:11+0100\n"
+"POT-Creation-Date: 2016-01-15 12:26+0100\n"
"PO-Revision-Date: 2015-01-19 16:52-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -130,12 +130,12 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "2015\n"
+msgid "2016\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"press/media_appearances_2016\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
@@ -146,6 +146,10 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
+msgid "[[!toggle id=\"media_appearances_2015\" text=\"2015\"]]"
+msgstr ""
+
+#. type: Bullet: '* '
msgid "[[!toggle id=\"media_appearances_2014\" text=\"2014\"]]"
msgstr ""
@@ -163,6 +167,26 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "[[!toggleable id=\"media_appearances_2015\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2015\" text=\"\"]]</span>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "2015\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
msgstr ""
diff --git a/wiki/src/press.mdwn b/wiki/src/press.mdwn
index 327ab3c..b1a8908 100644
--- a/wiki/src/press.mdwn
+++ b/wiki/src/press.mdwn
@@ -42,19 +42,30 @@ mentioned regularly in the press and in research papers. This list is
not comprehensive, but illustrates some of the significant articles
that have been published about Tails.
-2015
+2016
----
-[[!inline pages="press/media_appearances_2015" raw="yes"]]
+[[!inline pages="press/media_appearances_2016" raw="yes"]]
Older media appearances
----------------------
+* [[!toggle id="media_appearances_2015" text="2015"]]
* [[!toggle id="media_appearances_2014" text="2014"]]
* [[!toggle id="media_appearances_2013" text="2013"]]
* [[!toggle id="media_appearances_2012" text="2012"]]
* [[!toggle id="media_appearances_2011" text="2011"]]
+[[!toggleable id="media_appearances_2015" text="""
+<span class="hide">[[!toggle id="media_appearances_2015" text=""]]</span>
+
+2015
+----
+
+[[!inline pages="press/media_appearances_2015" raw="yes"]]
+
+"""]]
+
[[!toggleable id="media_appearances_2014" text="""
<span class="hide">[[!toggle id="media_appearances_2014" text=""]]</span>
diff --git a/wiki/src/press.pt.po b/wiki/src/press.pt.po
index 3b20c91..7dd8714 100644
--- a/wiki/src/press.pt.po
+++ b/wiki/src/press.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-05 23:11+0100\n"
+"POT-Creation-Date: 2016-01-15 12:26+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"
@@ -114,12 +114,12 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "2015\n"
+msgid "2016\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"press/media_appearances_2016\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
@@ -130,6 +130,10 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
+msgid "[[!toggle id=\"media_appearances_2015\" text=\"2015\"]]"
+msgstr ""
+
+#. type: Bullet: '* '
msgid "[[!toggle id=\"media_appearances_2014\" text=\"2014\"]]"
msgstr ""
@@ -147,6 +151,26 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "[[!toggleable id=\"media_appearances_2015\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2015\" text=\"\"]]</span>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "2015\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
msgstr ""
diff --git a/wiki/src/press/media_appearances_2016.de.po b/wiki/src/press/media_appearances_2016.de.po
new file mode 100644
index 0000000..034b3e9
--- /dev/null
+++ b/wiki/src/press/media_appearances_2016.de.po
@@ -0,0 +1,30 @@
+# 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: 2016-01-15 12:26+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=\"Media appearances in 2016\"]]\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"2016-01-12: Tails is listed as best distro for privacy in [The Best Linux "
+"Distros of "
+"2016](http://www.linux.com/news/software/applications/878620-the-best-linux-distros-of-2016/) "
+"by Swapnil Bhartiya in Linux.com."
+msgstr ""
diff --git a/wiki/src/press/media_appearances_2016.fa.po b/wiki/src/press/media_appearances_2016.fa.po
new file mode 100644
index 0000000..034b3e9
--- /dev/null
+++ b/wiki/src/press/media_appearances_2016.fa.po
@@ -0,0 +1,30 @@
+# 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: 2016-01-15 12:26+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=\"Media appearances in 2016\"]]\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"2016-01-12: Tails is listed as best distro for privacy in [The Best Linux "
+"Distros of "
+"2016](http://www.linux.com/news/software/applications/878620-the-best-linux-distros-of-2016/) "
+"by Swapnil Bhartiya in Linux.com."
+msgstr ""
diff --git a/wiki/src/press/media_appearances_2016.fr.po b/wiki/src/press/media_appearances_2016.fr.po
new file mode 100644
index 0000000..034b3e9
--- /dev/null
+++ b/wiki/src/press/media_appearances_2016.fr.po
@@ -0,0 +1,30 @@
+# 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: 2016-01-15 12:26+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=\"Media appearances in 2016\"]]\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"2016-01-12: Tails is listed as best distro for privacy in [The Best Linux "
+"Distros of "
+"2016](http://www.linux.com/news/software/applications/878620-the-best-linux-distros-of-2016/) "
+"by Swapnil Bhartiya in Linux.com."
+msgstr ""
diff --git a/wiki/src/press/media_appearances_2016.mdwn b/wiki/src/press/media_appearances_2016.mdwn
new file mode 100644
index 0000000..3c3b6b8
--- /dev/null
+++ b/wiki/src/press/media_appearances_2016.mdwn
@@ -0,0 +1,5 @@
+[[!meta title="Media appearances in 2016"]]
+
+* 2016-01-12: Tails is listed as best distro for privacy in [The Best
+ Linux Distros of 2016](http://www.linux.com/news/software/applications/878620-the-best-linux-distros-of-2016/)
+ by Swapnil Bhartiya in Linux.com.
diff --git a/wiki/src/press/media_appearances_2016.pt.po b/wiki/src/press/media_appearances_2016.pt.po
new file mode 100644
index 0000000..034b3e9
--- /dev/null
+++ b/wiki/src/press/media_appearances_2016.pt.po
@@ -0,0 +1,30 @@
+# 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: 2016-01-15 12:26+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=\"Media appearances in 2016\"]]\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"2016-01-12: Tails is listed as best distro for privacy in [The Best Linux "
+"Distros of "
+"2016](http://www.linux.com/news/software/applications/878620-the-best-linux-distros-of-2016/) "
+"by Swapnil Bhartiya in Linux.com."
+msgstr ""
diff --git a/wiki/src/security/Numerous_security_holes_in_1.8.1.de.po b/wiki/src/security/Numerous_security_holes_in_1.8.1.de.po
index 059eb31..e2512d5 100644
--- a/wiki/src/security/Numerous_security_holes_in_1.8.1.de.po
+++ b/wiki/src/security/Numerous_security_holes_in_1.8.1.de.po
@@ -3,77 +3,82 @@
# 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: \n"
"POT-Creation-Date: 2016-01-09 22:18+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2016-01-15 22:21+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \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"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Thu Jan 7 12:34:56 CET 2016\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Thu Jan 7 12:34:56 CET 2016\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Numerous security holes in Tails 1.8.1\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\" Zahlreiche Sicherheitslücken in Tails 1.8.1\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag security/fixed]]\n"
-msgstr ""
+msgstr "[[!tag security/fixed]]\n"
#. type: Plain text
-msgid "Several security holes that affect Tails 1.8.1 are now fixed in Tails 1.8.2."
+msgid ""
+"Several security holes that affect Tails 1.8.1 are now fixed in Tails 1.8.2."
msgstr ""
+"Einige Sicherheitslücken, die Tails 1.8.1 betreffen, wurden in Tails 1.8.2 "
+"behoben."
#. type: Plain text
msgid ""
-"We **strongly** encourage you to [[upgrade to "
-"Tails 1.8.2|news/version_1.8.2]] as soon as possible."
+"We **strongly** encourage you to [[upgrade to Tails 1.8.2|news/"
+"version_1.8.2]] as soon as possible."
msgstr ""
+"Wir empfehlen **dringend**, so schnell wie möglich auf [[Tails 1.8.2 zu "
+"aktualisieren|news/version_1.8.2]]."
#. type: Title =
#, no-wrap
msgid "Details\n"
-msgstr ""
+msgstr "Details\n"
#. type: Bullet: '* '
msgid "Tor Browser: [[!mfsa2015 150]], [[!tor_bug 17931]]"
-msgstr ""
+msgstr "Tor Browser: [[!mfsa2015 150]], [[!tor_bug 17931]]"
#. type: Bullet: '* '
msgid "foomatic-filters: [[!debsa2015 3429]]"
-msgstr ""
+msgstr "foomatic-filters: [[!debsa2015 3429]]"
#. type: Bullet: '* '
msgid "libxml2: [[!debsa2015 3430]]"
-msgstr ""
+msgstr "libxml2: [[!debsa2015 3430]]"
#. type: Bullet: '* '
msgid "icedove: [[!debsa2016 3432]]"
-msgstr ""
+msgstr "icedove: [[!debsa2016 3432]]"
#. type: Bullet: '* '
msgid "samba: [[!debsa2016 3433]]"
-msgstr ""
+msgstr "samba: [[!debsa2016 3433]]"
#. type: Bullet: '* '
msgid "linux: [[!debsa2016 3434]]"
-msgstr ""
+msgstr "linux: [[!debsa2016 3434]]"
#. type: Bullet: '* '
msgid "git: [[!debsa2016 3435]]"
-msgstr ""
+msgstr "git: [[!debsa2016 3435]]"
#. type: Bullet: '* '
msgid "openssl: [[!debsa2016 3436]]"
-msgstr ""
+msgstr "openssl: [[!debsa2016 3436]]"
diff --git a/wiki/src/support/known_issues.de.po b/wiki/src/support/known_issues.de.po
index 4f8b53e..15eedc4 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: 2016-01-09 13:19+0100\n"
+"POT-Creation-Date: 2016-01-15 20:24+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"
@@ -1014,3 +1014,25 @@ msgstr ""
#. type: Plain text
msgid "Note that your Persistent Volume will be safely preserved."
msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Print preview is blank in Tor Browser"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Due to a [bug in Firefox](https://bugzilla.mozilla.org/show_bug.cgi?"
+"id=1205598), its print preview is incompatible with the AppArmor confinement "
+"of Tor Browser in Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"From the print preview, you can click\n"
+"<span class=\"guilabel\">Print&hellip;</span> and choose\n"
+"<span class=\"guilabel\">Print to File</span> in the list of printers to\n"
+"save it as a PDF file. Then you can open this PDF file from the file\n"
+"browser.\n"
+msgstr ""
diff --git a/wiki/src/support/known_issues.fa.po b/wiki/src/support/known_issues.fa.po
index 859dc8f..f7aa4d4 100644
--- a/wiki/src/support/known_issues.fa.po
+++ b/wiki/src/support/known_issues.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-01-09 13:19+0100\n"
+"POT-Creation-Date: 2016-01-15 20:24+0100\n"
"PO-Revision-Date: 2015-10-25 10:05+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -1266,6 +1266,28 @@ msgstr ""
msgid "Note that your Persistent Volume will be safely preserved."
msgstr "در نظر داشته باشید که درایو مانای شما امن خواهد بود."
+#. type: Title ##
+#, no-wrap
+msgid "Print preview is blank in Tor Browser"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Due to a [bug in Firefox](https://bugzilla.mozilla.org/show_bug.cgi?"
+"id=1205598), its print preview is incompatible with the AppArmor confinement "
+"of Tor Browser in Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"From the print preview, you can click\n"
+"<span class=\"guilabel\">Print&hellip;</span> and choose\n"
+"<span class=\"guilabel\">Print to File</span> in the list of printers to\n"
+"save it as a PDF file. Then you can open this PDF file from the file\n"
+"browser.\n"
+msgstr ""
+
#~ msgid ""
#~ "If you keep updating automatically, there is a point in which your Tails "
#~ "partition gets full. Currently the test about remaining space is failing, "
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index f79c553..40fe1f2 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: 2016-01-09 13:19+0100\n"
+"POT-Creation-Date: 2016-01-15 20:24+0100\n"
"PO-Revision-Date: 2015-10-10 10:53-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1240,6 +1240,28 @@ msgstr ""
msgid "Note that your Persistent Volume will be safely preserved."
msgstr ""
+#. type: Title ##
+#, no-wrap
+msgid "Print preview is blank in Tor Browser"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Due to a [bug in Firefox](https://bugzilla.mozilla.org/show_bug.cgi?"
+"id=1205598), its print preview is incompatible with the AppArmor confinement "
+"of Tor Browser in Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"From the print preview, you can click\n"
+"<span class=\"guilabel\">Print&hellip;</span> and choose\n"
+"<span class=\"guilabel\">Print to File</span> in the list of printers to\n"
+"save it as a PDF file. Then you can open this PDF file from the file\n"
+"browser.\n"
+msgstr ""
+
#, fuzzy
#~ msgid ""
#~ "<!-- If this section is empty adjust the [[fingerprint documentation|doc/"
diff --git a/wiki/src/support/known_issues.mdwn b/wiki/src/support/known_issues.mdwn
index 3301499..cbed277 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -535,3 +535,15 @@ To fix this problem, you can [[update your Tails
manually|doc/first_steps/upgrade/#manual]].
Note that your Persistent Volume will be safely preserved.
+
+## Print preview is blank in Tor Browser
+
+Due to a [bug in Firefox](https://bugzilla.mozilla.org/show_bug.cgi?id=1205598),
+its print preview is incompatible with the AppArmor confinement of Tor
+Browser in Tails.
+
+From the print preview, you can click
+<span class="guilabel">Print&hellip;</span> and choose
+<span class="guilabel">Print to File</span> in the list of printers to
+save it as a PDF file. Then you can open this PDF file from the file
+browser.
diff --git a/wiki/src/support/known_issues.pt.po b/wiki/src/support/known_issues.pt.po
index 125bdaf..bfb0e0a 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: 2016-01-09 13:19+0100\n"
+"POT-Creation-Date: 2016-01-15 20:24+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"
@@ -1173,6 +1173,28 @@ msgstr ""
msgid "Note that your Persistent Volume will be safely preserved."
msgstr ""
+#. type: Title ##
+#, no-wrap
+msgid "Print preview is blank in Tor Browser"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Due to a [bug in Firefox](https://bugzilla.mozilla.org/show_bug.cgi?"
+"id=1205598), its print preview is incompatible with the AppArmor confinement "
+"of Tor Browser in Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"From the print preview, you can click\n"
+"<span class=\"guilabel\">Print&hellip;</span> and choose\n"
+"<span class=\"guilabel\">Print to File</span> in the list of printers to\n"
+"save it as a PDF file. Then you can open this PDF file from the file\n"
+"browser.\n"
+msgstr ""
+
#~ msgid ""
#~ "<!-- If this section is empty adjust the [[fingerprint documentation|doc/"
#~ "about/fingerprint]]. -->\n"
diff --git a/wiki/src/torrents/files/tails-i386-2.0~rc1.iso.sig b/wiki/src/torrents/files/tails-i386-2.0~rc1.iso.sig
new file mode 100644
index 0000000..505e5ae
--- /dev/null
+++ b/wiki/src/torrents/files/tails-i386-2.0~rc1.iso.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJWlDUiAAoJEJj+xrx1Kj22fZoP/0NXTiY74i+g3IyFFdui8mj5
+EkIleDE6s1yN1koqv9+EX6agRXnsChiyrA7CUROibCWfNu39kFCtHpq4+35C2ARl
+OTCzCTrldro9mRmnrNO4t09bQeBPYdiqErMU+phB9Z/JdiH0rWDQFvDQz2ZTZ9qQ
+D2pgXiAUWUcg3Loa2B9FCeBWqbNvP/Q3MAEajei08hVSu2RzfPIoju1QJ8hMWbRT
+s6eupEsNGhPl7J/hJMnswystntxTlVJmOxmGTjdY9N6R5TAvnZG5daHXZ/R69YtI
+mrteIAjXrOhgrxhxElcLndeP6Xt2z8HwytMg7WauSTn2vLYWKSJHXmulsC5ZPth6
+m0yrW2jr38WjOKQJH+/wJ49kFfA9bku86qMClgsqXRG2FTHlEFx6UoZG1qNONofw
+tfoCCNdZh1TxTeQQ5f/GXp6HfE1Uth7FHP+ojkhYp5EvlQuOP7LGtwfl5c5SJhdH
+OfufEJUNcFPXxfbChdUJmWg6GyZEBQYqLTy6uCZFT+SrY4OwwSBcva+dBY/Fy903
+Wj8vOd4OiJW3cjwyXrncrrsLK6/hV8Vqp720RP8SSRlexkKodcyxg13QjeXLeDBh
+4OY+x06yb3IolHV74FHOi8cb9NjhezER2Ydb0I+3Pmx+myy9Q8Ygo71qKbEUTlkv
+izwthMtSrPgrpGdDg/2e
+=ARED
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade.de.po b/wiki/src/upgrade.de.po
index 84236a1..5ca4008 100644
--- a/wiki/src/upgrade.de.po
+++ b/wiki/src/upgrade.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -52,7 +52,7 @@ msgid "Another USB stick with Tails up-to-date"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "10 minutes to upgrade"
+msgid "¼ hour to upgrade"
msgstr ""
#. type: Content of: <div><div>
@@ -85,12 +85,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "20 minutes to upgrade"
+msgid "½ hour to upgrade"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
diff --git a/wiki/src/upgrade.fa.po b/wiki/src/upgrade.fa.po
index 84236a1..5ca4008 100644
--- a/wiki/src/upgrade.fa.po
+++ b/wiki/src/upgrade.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -52,7 +52,7 @@ msgid "Another USB stick with Tails up-to-date"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "10 minutes to upgrade"
+msgid "¼ hour to upgrade"
msgstr ""
#. type: Content of: <div><div>
@@ -85,12 +85,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "20 minutes to upgrade"
+msgid "½ hour to upgrade"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
diff --git a/wiki/src/upgrade.fr.po b/wiki/src/upgrade.fr.po
index 84236a1..5ca4008 100644
--- a/wiki/src/upgrade.fr.po
+++ b/wiki/src/upgrade.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -52,7 +52,7 @@ msgid "Another USB stick with Tails up-to-date"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "10 minutes to upgrade"
+msgid "¼ hour to upgrade"
msgstr ""
#. type: Content of: <div><div>
@@ -85,12 +85,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "20 minutes to upgrade"
+msgid "½ hour to upgrade"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
diff --git a/wiki/src/upgrade.html b/wiki/src/upgrade.html
index 73ea4fe..524750d 100644
--- a/wiki/src/upgrade.html
+++ b/wiki/src/upgrade.html
@@ -20,7 +20,7 @@
<ul>
<li>Your USB stick</li>
<li>Another USB stick with Tails up-to-date</li>
- <li>10 minutes to upgrade</li>
+ <li>¼ hour to upgrade</li>
</ul>
[[
@@ -46,8 +46,8 @@
[[!inline pages="install/inc/router/why_extra.inline" raw="yes"]]
"""]]
</li>
- <li>30&ndash;60 minutes to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
- <li>20 minutes to upgrade</li>
+ <li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
+ <li>½ hour to upgrade</li>
</ul>
[[
diff --git a/wiki/src/upgrade.pt.po b/wiki/src/upgrade.pt.po
index 84236a1..5ca4008 100644
--- a/wiki/src/upgrade.pt.po
+++ b/wiki/src/upgrade.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-15 14:46+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"
@@ -52,7 +52,7 @@ msgid "Another USB stick with Tails up-to-date"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "10 minutes to upgrade"
+msgid "¼ hour to upgrade"
msgstr ""
#. type: Content of: <div><div>
@@ -85,12 +85,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
-"stable_i386_iso_size\" raw=\"yes\"]]</small>"
+"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
+"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "20 minutes to upgrade"
+msgid "½ hour to upgrade"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
diff --git a/wiki/src/upgrade/tails.de.po b/wiki/src/upgrade/tails.de.po
index 3b81ae2..19903e4 100644
--- a/wiki/src/upgrade/tails.de.po
+++ b/wiki/src/upgrade/tails.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-05 23:14+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -164,8 +164,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Read the warning message in the pop-up window. Click on the <span class="
-"\"button\">Yes</span> button to confirm."
+"Read the warning message in the confirmation dialog. Click on <span class="
+"\"button\">Yes</span> to confirm."
msgstr ""
#. type: Plain text
@@ -236,6 +236,12 @@ msgid ""
"span> button."
msgstr ""
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the pop-up window. Click on the <span class="
+"\"button\">Yes</span> button to confirm."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid " The upgrade takes a few minutes.\n"
diff --git a/wiki/src/upgrade/tails.fa.po b/wiki/src/upgrade/tails.fa.po
index 3b81ae2..19903e4 100644
--- a/wiki/src/upgrade/tails.fa.po
+++ b/wiki/src/upgrade/tails.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-05 23:14+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -164,8 +164,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Read the warning message in the pop-up window. Click on the <span class="
-"\"button\">Yes</span> button to confirm."
+"Read the warning message in the confirmation dialog. Click on <span class="
+"\"button\">Yes</span> to confirm."
msgstr ""
#. type: Plain text
@@ -236,6 +236,12 @@ msgid ""
"span> button."
msgstr ""
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the pop-up window. Click on the <span class="
+"\"button\">Yes</span> button to confirm."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid " The upgrade takes a few minutes.\n"
diff --git a/wiki/src/upgrade/tails.fr.po b/wiki/src/upgrade/tails.fr.po
index 3b81ae2..19903e4 100644
--- a/wiki/src/upgrade/tails.fr.po
+++ b/wiki/src/upgrade/tails.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-05 23:14+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -164,8 +164,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Read the warning message in the pop-up window. Click on the <span class="
-"\"button\">Yes</span> button to confirm."
+"Read the warning message in the confirmation dialog. Click on <span class="
+"\"button\">Yes</span> to confirm."
msgstr ""
#. type: Plain text
@@ -236,6 +236,12 @@ msgid ""
"span> button."
msgstr ""
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the pop-up window. Click on the <span class="
+"\"button\">Yes</span> button to confirm."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid " The upgrade takes a few minutes.\n"
diff --git a/wiki/src/upgrade/tails.mdwn b/wiki/src/upgrade/tails.mdwn
index 17e3323..d4b4382 100644
--- a/wiki/src/upgrade/tails.mdwn
+++ b/wiki/src/upgrade/tails.mdwn
@@ -57,8 +57,8 @@ copied.</p>
1. To start the installation, click on the <span class="button">Install Tails</span> button.
-1. Read the warning message in the pop-up window. Click on the <span
- class="button">Yes</span> button to confirm.
+1. Read the warning message in the confirmation dialog. Click
+ on <span class="button">Yes</span> to confirm.
The installation takes a few minutes.
diff --git a/wiki/src/upgrade/tails.pt.po b/wiki/src/upgrade/tails.pt.po
index 3b81ae2..19903e4 100644
--- a/wiki/src/upgrade/tails.pt.po
+++ b/wiki/src/upgrade/tails.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-05 23:14+0100\n"
+"POT-Creation-Date: 2016-01-24 16:47+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"
@@ -164,8 +164,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Read the warning message in the pop-up window. Click on the <span class="
-"\"button\">Yes</span> button to confirm."
+"Read the warning message in the confirmation dialog. Click on <span class="
+"\"button\">Yes</span> to confirm."
msgstr ""
#. type: Plain text
@@ -236,6 +236,12 @@ msgid ""
"span> button."
msgstr ""
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the pop-up window. Click on the <span class="
+"\"button\">Yes</span> button to confirm."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid " The upgrade takes a few minutes.\n"
diff --git a/wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml
index 58a8db7..9308713 100644
--- a/wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml
@@ -3,3 +3,18 @@ build-target: i386
channel: stable
product-name: Tails
product-version: 2.0~beta1
+upgrades:
+- details-url: https://tails.boum.org/news/test_2.0-rc1/
+ type: major
+ upgrade-paths:
+ - target-files:
+ - sha256: 4df44c896a61fc9751463cf3a94d482f1ec0c6d1ae86b270758a2ded544e33d9
+ size: 1135089664
+ url: http://dl.amnesia.boum.org/tails/alpha/tails-i386-2.0~rc1/tails-i386-2.0~rc1.iso
+ type: full
+ - target-files:
+ - sha256: 2f8ff8de18966c362a453e48a273acb7bd94b6f3a0544f9d06a0915be2d01dd6
+ size: 328980480
+ url: http://dl.amnesia.boum.org/tails/alpha/iuk/Tails_i386_2.0~beta1_to_2.0~rc1.iuk
+ type: incremental
+ version: 2.0~rc1
diff --git a/wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml.pgp
index e30e41e..ad5eb80 100644
--- a/wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/2.0~beta1/i386/stable/upgrades.yml.pgp
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
-iQIcBAABCgAGBQJWTvCrAAoJEDyD3LUvaZxWIrwP/RvVrwOkdNzYrFHsDW02lBcX
-hnLvADrFEWa0cifJZalhwYB6FzW66R2m3LdIBOIUWFpCd6pTAF8mrX99YiHVbhK4
-zxT7gpwIHuDYn4jfz4cuGbfyoLrks0WGrkexOlio5Y3OHRGu/ben4QRQuPEuMbnt
-Cx2Fgfw3o2NxR1q9Phy3p8RHQaDNgALzH7TyiAJiX2RSJ6anyJz2Jhuri9f9RHI5
-4ux05vou6EMgHEFurVE6uIhtmRjJ8jfiTmBG4EZn3vIH9WlG88hQWeUvmoCmpsEi
-3DVK7YU5dZUZvLzyhOhwofjQJ//Ecw3IA728VoOSaNiUXnMIsGwEfd7a+DnhXHGl
-6MmWy7YH8Taigz8MIdnpQ8FvapeK7sBZOH0D6It9oM13ELiF6CtNQaTD/4yTVaY6
-n9ibZZfNT5zb3R1x0N05SI0aNnrAxs+BA3nFxt+Ra/4TUBxAOQSnxNiAdNNp44ZC
-QE9rR2aUBgmyPMeL43WQo/v/hJGp5dDocFeYWozwlhRmESjL4aeZRD0z92KNxqOp
-/TO01dOtWGGnBS+Ef62Agvt9bO5eNh4J7zXv2xN0jzOK3G9gUtdg1VkZBINa7TzL
-7pQmc+qsZM02dde+1Lv2y1SGyWRM7044VK2zfM9KDONWNclROdG2k4ZSz1NNZy69
-DhdZjovVZONEm/JIXa8i
-=U/uY
+iQIcBAABCgAGBQJWlQFhAAoJEJj+xrx1Kj22DaMP/3okGnrHwbX3cC0tdn4CkbVU
+C96mT/76ndebumxCb5JT5o1JQJNy0JkBLggOtNn4H5XrJyPUoNItq4gm60DGc9Jr
+n74IEYhENobQSP94qOSW+xyqYdd4s9aULaSwUR2YeaSTE+DcSTV7WuyyNuiw1XWr
+p0Mz3In4VcH3svwkHu0q2yXIQlGonAX3Anp8aBnsKNH4USBBRnLRmM6fJLZTVG+5
+x8vSUf7E55jJJhD1N7woPs1RcTioMSTIqXkyRqmaJYskcM5llzCBXAhvgj2qAlnE
+v8xqahpq+xZ4RH9OGEseCU7eBa1XT7akYX9gb2TfFk/XwSpl+YBKJy5/yqn6MddR
+/esG66sKiccozFFMFYdkMB2pNo8iRbOXzPzDqW1USkc1BYDJ3eXnP+D7C1Kah0mJ
+aij4sG6AFHh5ibj7JK40zFKJ4KkUM27h5tC/RHyFcf3ZBbRkSAgX1yF9Ks3FHUBx
+oYzfjNKdFOx3hA4/qkC6H9org2LRNdT7Mi6pt/WRd37kcBGmeYSfOwAL5apid3Y6
+6xSbpa3duKdbyDTgdMAEJN1UedaVFwN7bKh/jdgEZZBfNIK7cnWh0Uu6mEkckbHR
+cpwOk/BBLUdxh9XYZKr3OMv41gvp+yoeNHK4krIsICw84oEuVHLPTqv5sBEhzTBj
+xGHtHk3K6LXuNVsNuW02
+=Xiaj
-----END PGP SIGNATURE-----