summaryrefslogtreecommitdiffstats
path: root/wiki/src/install/inc
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/install/inc')
-rw-r--r--wiki/src/install/inc/icons/check.pngbin1109 -> 460 bytes
-rw-r--r--wiki/src/install/inc/icons/dialog-warning-small.pngbin0 -> 1041 bytes
-rw-r--r--wiki/src/install/inc/icons/failed.pngbin382 -> 587 bytes
-rw-r--r--wiki/src/install/inc/icons/pause.pngbin1001 -> 0 bytes
-rw-r--r--wiki/src/install/inc/icons/play.pngbin1242 -> 0 bytes
-rw-r--r--wiki/src/install/inc/js/dave.js59
-rw-r--r--wiki/src/install/inc/js/dave_2.js192
-rw-r--r--wiki/src/install/inc/js/download.js296
-rw-r--r--wiki/src/install/inc/screenshots/allow_js.pngbin0 -> 12401 bytes
-rw-r--r--wiki/src/install/inc/screenshots/notification_in_tails.pngbin8791 -> 5516 bytes
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.de.po36
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po30
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po31
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.html6
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.it.po35
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po35
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.de.po6
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fa.po2
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fr.po10
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.it.po2
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.pt.po6
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.fr.po16
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.it.po4
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.pt.po4
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po1311
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po1128
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po1490
-rw-r--r--wiki/src/install/inc/steps/download.inline.html737
-rw-r--r--wiki/src/install/inc/steps/download.inline.it.po1425
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po1339
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.de.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.fa.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.fr.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.html116
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.it.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.pt.po251
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po74
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.de.po9
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po22
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.it.po4
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po9
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po12
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po34
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.it.po12
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po12
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.de.po6
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fr.po12
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.it.po13
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.pt.po4
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po14
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fr.po6
-rw-r--r--wiki/src/install/inc/stylesheets/assistant.css90
-rw-r--r--wiki/src/install/inc/stylesheets/dave.css487
-rw-r--r--wiki/src/install/inc/stylesheets/dave_2.css76
-rw-r--r--wiki/src/install/inc/stylesheets/debian.css4
-rw-r--r--wiki/src/install/inc/stylesheets/download-only.css6
-rw-r--r--wiki/src/install/inc/stylesheets/download.css200
-rw-r--r--wiki/src/install/inc/stylesheets/dvd.css6
-rw-r--r--wiki/src/install/inc/stylesheets/expert.css4
-rw-r--r--wiki/src/install/inc/stylesheets/install-clone.css4
-rw-r--r--wiki/src/install/inc/stylesheets/linux.css4
-rw-r--r--wiki/src/install/inc/stylesheets/mac-clone.css4
-rw-r--r--wiki/src/install/inc/stylesheets/mac-dvd.css4
-rw-r--r--wiki/src/install/inc/stylesheets/mac-usb.css4
-rw-r--r--wiki/src/install/inc/stylesheets/overview.css1
-rw-r--r--wiki/src/install/inc/stylesheets/router-mac.css2
-rw-r--r--wiki/src/install/inc/stylesheets/steps.css125
-rw-r--r--wiki/src/install/inc/stylesheets/upgrade-clone.css4
-rw-r--r--wiki/src/install/inc/stylesheets/upgrade-tails.css4
-rw-r--r--wiki/src/install/inc/stylesheets/vm.css6
-rw-r--r--wiki/src/install/inc/stylesheets/windows.css4
81 files changed, 6358 insertions, 4525 deletions
diff --git a/wiki/src/install/inc/icons/check.png b/wiki/src/install/inc/icons/check.png
index 7583289..0ec124a 100644
--- a/wiki/src/install/inc/icons/check.png
+++ b/wiki/src/install/inc/icons/check.png
Binary files differ
diff --git a/wiki/src/install/inc/icons/dialog-warning-small.png b/wiki/src/install/inc/icons/dialog-warning-small.png
new file mode 100644
index 0000000..8f53491
--- /dev/null
+++ b/wiki/src/install/inc/icons/dialog-warning-small.png
Binary files differ
diff --git a/wiki/src/install/inc/icons/failed.png b/wiki/src/install/inc/icons/failed.png
index c1999e4..290cff1 100644
--- a/wiki/src/install/inc/icons/failed.png
+++ 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
deleted file mode 100644
index 97bb802..0000000
--- a/wiki/src/install/inc/icons/pause.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/icons/play.png b/wiki/src/install/inc/icons/play.png
deleted file mode 100644
index 5850881..0000000
--- a/wiki/src/install/inc/icons/play.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/js/dave.js b/wiki/src/install/inc/js/dave.js
deleted file mode 100644
index f1fbc4e..0000000
--- a/wiki/src/install/inc/js/dave.js
+++ /dev/null
@@ -1,59 +0,0 @@
-(function() {
- var chromeSupported = false;
- var minVer = {
- "firefox": 38,
- "chrome": 44,
- "tor": 5
- };
-
- function setBrowser(browser) {
- document.documentElement.dataset.browser = browser ? "sb-" + browser : "unsupported";
- }
- function forId(id, cb) {
- var el = document.getElementById(id);
- if (el) cb(el);
- }
- var forClass = document.getElementsByClassName ? function(cn, cb) {
- var ee = document.getElementsByClassName(cn);
- for (var j = ee.length; j-- > 0;) cb(ee[j]);
- } : function () {};
-
- var browser,
- v = navigator.userAgent.match(/\b(Chrome|Firefox)\/(\d+)/)
- ;
- v = v && parseInt(v[2]) || 0;
- var override = location.search.match(/\boverride=(\w+)/);
- if (override) {
- browser = override[1];
- } else if (window.InstallTrigger) {
- if (v >= minVer.firefox || minVer.firefox === 38 && new RegExp("").source) // see Fx 38 RegExp @ https://developer.mozilla.org/it/Firefox/Releases/38
- browser = "firefox";
- else {
- addEventListener("DOMContentLoaded", function() {
- forId("unsupported-other", function(el) { el.style.display = "none"; });
- if (!v) v = "< 38";
- forClass("current-firefox", function(el) { el.innerHTML = v || "< 38"; });
- }, true);
- }
- } else {
- addEventListener("DOMContentLoaded", function() { forId("unsupported-firefox", function(el) { el.style.display = "none"; }); }, true);
- if (chromeSupported &&
- /\bChrom/.test(navigator.userAgent) && /\bGoogle Inc\./.test(navigator.vendor) &&
- v >= minVer.chrome) {
- browser = "chrome";
- }
- }
- setBrowser(browser);
- var style = document.createElement("style");
- style.innerHTML = "#download-and-verify { display: none !important } #dave-init { display: block }";
- document.documentElement.firstChild.appendChild(style);
-
- addEventListener("load", function(ev) {
- style.innerHTML = "#dave-init { display: none }";
- forId("self-url", function (el) { el.textContent = location.href; });
- for (var browser in minVer) {
- forClass("minver-" + browser, function(el) { el.innerHTML = minVer[browser]; });
- }
- }, true);
-
-})();
diff --git a/wiki/src/install/inc/js/dave_2.js b/wiki/src/install/inc/js/dave_2.js
deleted file mode 100644
index efc8373..0000000
--- a/wiki/src/install/inc/js/dave_2.js
+++ /dev/null
@@ -1,192 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-
- function showFloatingToggleableLinks() {
- var links = document.getElementsByClassName('floating-toggleable-link');
- for (let i = 0; i < links.length; i++) {
- links[i].style.display = 'block';
- }
- }
- showFloatingToggleableLinks();
-
- function opaque(elm) {
- elm.style.opacity = '1.0';
- var siblings = elm.querySelectorAll('a');
- for (let i = 0; i < siblings.length; i++) {
- siblings[i].style.pointerEvents = 'auto';
- }
- }
-
- function transparent(elm) {
- elm.style.opacity = '0.3';
- var siblings = elm.querySelectorAll('a');
- for (let i = 0; i < siblings.length; i++) {
- siblings[i].style.pointerEvents = 'none';
- }
- }
-
- function toggleOpacity(elm, mode) {
- for(var i = 0; i < elm.length; i++) {
- if(mode == 'opaque') {
- opaque(elm[i]);
- } else {
- transparent(elm[i]);
- }
- }
- }
-
- function hide(elm) {
- elm.style.display = 'none';
- }
-
- function show(elm) {
- elm.style.display = 'initial';
- if(elm.classList.contains('block')) {
- elm.style.display = 'block';
- }
- if(elm.classList.contains('inline-block')) {
- elm.style.display = 'inline-block';
- }
- }
-
- function toggleDisplay(elm, mode) {
- for(var i = 0; i < elm.length; i++) {
- if(mode == 'hide') {
- hide(elm[i]);
- } else {
- show(elm[i]);
- }
- }
- }
-
- function detectBrowser() {
- // XXX: This should be set by the browser detection script
- var vendor = 'firefox';
- if(vendor == 'firefox') {
- showVersionForSupportedBrowser();
- toggleDisplay(document.getElementsByClassName('chrome'), 'hide');
- toggleDisplay(document.getElementsByClassName('firefox'), 'show');
- }
- if(vendor == 'chrome') {
- showVersionForSupportedBrowser();
- toggleDisplay(document.getElementsByClassName('firefox'), 'hide');
- toggleDisplay(document.getElementsByClassName('chrome'), 'show');
- }
- }
-
- function showVersionForSupportedBrowser() {
- toggleDisplay(document.getElementsByClassName('no-js'), 'hide');
- toggleDisplay(document.getElementsByClassName('supported-browser'), 'show');
- toggleDirectBitTorrent('direct');
- }
-
- function toggleContinueLink(method, state) {
- if(method == 'direct') {
- hide(document.getElementById('skip-download-direct'));
- hide(document.getElementById('skip-verification-direct'));
- hide(document.getElementById('next-direct'));
- show(document.getElementById(state));
- }
- if(method == 'bittorrent') {
- hide(document.getElementById('skip-download-bittorrent'));
- hide(document.getElementById('next-bittorrent'));
- show(document.getElementById(state));
- }
- }
-
- function showUpdateExtension() {
- hide(document.getElementById('install-extension'));
- hide(document.getElementById('extension-installed'));
- show(document.getElementById('update-extension'));
- show(document.getElementById('extension-updated'));
- }
-
- function resetVerificationResult(result) {
- hide(document.getElementById('verifying-download'));
- hide(document.getElementById('verification-successful'));
- hide(document.getElementById('verification-failed'));
- hide(document.getElementById('verification-failed-again'));
- toggleContinueLink('direct', 'skip-verification-direct');
- }
-
- function showVerifyingDownload() {
- hide(document.getElementById('verify-download'));
- show(document.getElementById('verifying-download'));
- }
-
- function showVerificationResult(result) {
- hide(document.getElementById('verify-download'));
- resetVerificationResult();
- if(result == 'successful') {
- show(document.getElementById('verification-successful'));
- opaque(document.getElementById('step-continue-direct'));
- toggleContinueLink('direct', 'next-direct');
- }
- if(result == 'failed') {
- show(document.getElementById('verification-failed'));
- }
- if(result == 'failed-again') {
- show(document.getElementById('verification-failed-again'));
- }
- }
-
- function toggleDirectBitTorrent(method) {
- transparent(document.getElementById('step-verify-direct'));
- transparent(document.getElementById('step-continue-direct'));
- transparent(document.getElementById('continue-link-direct'));
- transparent(document.getElementById('step-verify-bittorrent'));
- transparent(document.getElementById('step-continue-bittorrent'));
- transparent(document.getElementById('continue-link-bittorrent'));
- if(method == 'direct') {
- opaque(document.getElementById('step-verify-direct'));
- opaque(document.getElementById('continue-link-direct'));
- show(document.getElementById('verify-download'));
- }
- if(method == 'bittorrent') {
- opaque(document.getElementById('step-verify-bittorrent'));
- opaque(document.getElementById('step-continue-bittorrent'));
- opaque(document.getElementById('continue-link-bittorrent'));
- toggleContinueLink('bittorrent', 'next-bittorrent');
- }
- }
-
- detectBrowser();
- toggleDirectBitTorrent('none');
- toggleContinueLink('direct', 'skip-download-direct');
- toggleContinueLink('bittorrent', 'skip-download-bittorrent');
- opaque(document.getElementById('continue-link-direct'));
- opaque(document.getElementById('continue-link-bittorrent'));
-
- // Display "Verify with your browser" when ISO image is clicked
- document.getElementById('download-iso').onclick = function() {
- toggleDirectBitTorrent('direct');
- resetVerificationResult();
- }
-
- // Display "Verify with BitTorrent" when Torrent file is clicked
- document.getElementById('download-torrent').onclick = function() {
- toggleDirectBitTorrent('bittorrent');
- }
-
- // Display "Update extension" instead of "Install extension"
- // XXX: This should be done by the extension instead
- showUpdateExtension();
-
- // Display "Verify download" when "Install extension" or "Update extension" is clicked
- // XXX: This should be done by the extension instead
- var buttons = document.getElementsByClassName('install-extension-btn');
- for (let i = 0; i < buttons.length; i++) {
- buttons[i].addEventListener('click', function() {
- hide(document.getElementById('install-extension'));
- hide(document.getElementById('update-extension'));
- show(document.getElementById('verification'));
- });
- }
-
- // Display "Verification successful" when "Verify download" is clicked
- // XXX: This should be done by the extension instead
- document.getElementById('verify-download').onclick = function() {
- showVerifyingDownload();
- setTimeout(function(){showVerificationResult('successful')}, 1500);
- }
-
-});
diff --git a/wiki/src/install/inc/js/download.js b/wiki/src/install/inc/js/download.js
new file mode 100644
index 0000000..7c5e707
--- /dev/null
+++ b/wiki/src/install/inc/js/download.js
@@ -0,0 +1,296 @@
+document.addEventListener("DOMContentLoaded", function() {
+
+ window.addEventListener("message", receiveMessage);
+
+ function receiveMessage(event) {
+ if (event.source !== window || event.origin !== "https://tails.boum.org" || !event.data) {
+ return;
+ }
+ if (event.data.action === "verifying") {
+ showVerifyingDownload(event.data.fileName);
+ }
+ else if (event.data.action === "verification-failed") {
+ showVerificationResult("failed");
+ }
+ else if (event.data.action === "verification-failed-again") {
+ showVerificationResult("failed-again");
+ }
+ else if (event.data.action === "verification-success") {
+ showVerificationResult("successful");
+ }
+ else if (event.data.action === "progress") {
+ showVerificationProgress(event.data.percentage);
+ }
+ else if (event.data.action === "extension-installed") {
+ if (document.documentElement.dataset.extension === "up-to-date") {
+ showVerifyDownload();
+ }
+ else if (document.documentElement.dataset.extension === "outdated") {
+ showUpdateExtension();
+ }
+ }
+ }
+
+ // Display floating-toggleable-links to prevent people without JS to
+ // either always see the toggles or have broken toggle links.
+ function showFloatingToggleableLinks() {
+ var links = document.getElementsByClassName("floating-toggleable-link");
+ for (let i = 0; i < links.length; i++) {
+ show(links[i]);
+ }
+ }
+ showFloatingToggleableLinks();
+
+ function opaque(elm) {
+ elm.classList.remove('transparent');
+ var siblings = elm.querySelectorAll("a");
+ for (let i = 0; i < siblings.length; i++) {
+ siblings[i].style.pointerEvents = "auto";
+ }
+ }
+
+ function transparent(elm) {
+ elm.classList.add('transparent');
+ var siblings = elm.querySelectorAll("a");
+ for (let i = 0; i < siblings.length; i++) {
+ siblings[i].style.pointerEvents = "none";
+ }
+ }
+
+ function toggleOpacity(elm, mode) {
+ for (let i = 0; i < elm.length; i++) {
+ if (mode == "opaque") {
+ opaque(elm[i]);
+ } else {
+ transparent(elm[i]);
+ }
+ }
+ }
+
+ function hide(elm) {
+ elm.style.display = "none";
+ }
+
+ function show(elm) {
+ elm.style.display = "initial";
+ if (elm.classList.contains("block")) {
+ elm.style.display = "block";
+ }
+ if (elm.classList.contains("inline-block")) {
+ elm.style.display = "inline-block";
+ }
+ }
+
+ function toggleDisplay(elm, mode) {
+ for (let i = 0; i < elm.length; i++) {
+ if (mode == "hide") {
+ hide(elm[i]);
+ } else {
+ show(elm[i]);
+ }
+ }
+ }
+
+ function detectBrowser() {
+ /* To list the APIs that our extension is using, execute: git grep "chrome."
+ Browser compatibility:
+
+ - https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Browser_support_for_JavaScript_APIs
+ - https://developer.chrome.com/extensions/api_index
+ */
+ minVersion = {
+ "firefox": 45, // First release with chrome.runtime.getManifest
+ "chrome": 22, // First release with chrome.runtime.getManifest
+ "torbrowser": 6 // First release based on Firefox 45
+ };
+ document.getElementById("min-version-firefox").textContent = minVersion.firefox.toString();
+ document.getElementById("min-version-chrome").textContent = minVersion.chrome.toString();
+ document.getElementById("min-version-tor-browser").textContent = minVersion.torbrowser.toString();
+
+ version = navigator.userAgent.match(/\b(Chrome|Firefox)\/(\d+)/);
+ version = version && parseInt(version[2]) || 0;
+ overrideVersion = location.search.match(/\bversion=(\w+)/);
+ if (overrideVersion) {
+ version = overrideVersion[1];
+ }
+
+ overrideBrowser = location.search.match(/\bbrowser=(\w+)/);
+ if (overrideBrowser) {
+ browser = overrideBrowser[1];
+ } else if (window.InstallTrigger) {
+ browser = "Firefox";
+ } else if ((/\bChrom/).test(navigator.userAgent) && (/\bGoogle Inc\./).test(navigator.vendor)) {
+ browser = "Chrome";
+ }
+
+ if (browser === "Firefox" || browser === "Chrome") {
+ document.getElementById("detected-browser").textContent = browser + " " + version.toString();
+ } else {
+ // Don't bother displaying version number for unsupported browsers as it's probably more error prone.
+ document.getElementById("detected-browser").textContent = browser;
+ }
+
+ toggleDisplay(document.getElementsByClassName("no-js"), "hide");
+ if (browser === "Firefox") {
+ if (version >= minVersion.firefox) {
+ // Supported Firefox
+ toggleDisplay(document.getElementsByClassName("supported-browser"), "show");
+ toggleDisplay(document.getElementsByClassName("chrome"), "hide");
+ toggleDisplay(document.getElementsByClassName("firefox"), "show");
+ } else {
+ // Outdated Firefox
+ toggleDisplay(document.getElementsByClassName("outdated-browser"), "show");
+ }
+ } else if (browser === "Chrome") {
+ if (version >= minVersion.chrome) {
+ // Supported Chrome
+ toggleDisplay(document.getElementsByClassName("supported-browser"), "show");
+ toggleDisplay(document.getElementsByClassName("firefox"), "hide");
+ toggleDisplay(document.getElementsByClassName("chrome"), "show");
+ } else {
+ // Outdated Chrome
+ toggleDisplay(document.getElementsByClassName("outdated-browser"), "show");
+ }
+ } else {
+ toggleDisplay(document.getElementsByClassName("unsupported-browser"), "show");
+ }
+ }
+
+ function toggleContinueLink(method, state) {
+ if (method == "direct") {
+ hide(document.getElementById("skip-download-direct"));
+ hide(document.getElementById("skip-verification-direct"));
+ hide(document.getElementById("next-direct"));
+ show(document.getElementById(state));
+ }
+ if(method == "bittorrent") {
+ hide(document.getElementById("skip-download-bittorrent"));
+ hide(document.getElementById("next-bittorrent"));
+ show(document.getElementById(state));
+ }
+ }
+
+ function resetVerificationResult(result) {
+ hide(document.getElementById("verifying-download"));
+ hide(document.getElementById("verification-successful"));
+ hide(document.getElementById("verification-failed"));
+ hide(document.getElementById("verification-failed-again"));
+ toggleContinueLink("direct", "skip-verification-direct");
+ }
+
+ function showUpdateExtension() {
+ hide(document.getElementById("verification"));
+ hide(document.getElementById("install-extension"));
+ show(document.getElementById("update-extension"));
+ }
+
+ function showVerifyDownload() {
+ hide(document.getElementById("install-extension"));
+ hide(document.getElementById("update-extension"));
+ show(document.getElementById("verification"));
+ }
+
+ function showVerifyingDownload(filename) {
+ hide(document.getElementById("verify-download-wrapper"));
+ if (filename) {
+ document.getElementById("filename").textContent = filename;
+ }
+ show(document.getElementById("verifying-download"));
+ }
+
+ function showVerificationProgress(percentage) {
+ showVerifyingDownload();
+ document.getElementById("progress-bar").style.width = percentage + "%";
+ document.getElementById("progress-bar").setAttribute("aria-valuenow", percentage.toString());
+ }
+
+ function showVerificationResult(result) {
+ toggleDirectBitTorrent("direct");
+ showVerifyDownload();
+ hide(document.getElementById("verify-download-wrapper"));
+ resetVerificationResult();
+ if (result === "successful") {
+ show(document.getElementById("verification-successful"));
+ opaque(document.getElementById("step-continue-direct"));
+ toggleContinueLink("direct", "next-direct");
+ }
+ else if (result === "failed") {
+ show(document.getElementById("verification-failed"));
+ replaceUrlPrefixWithRandomMirror(document.querySelectorAll(".use-mirror-pool")); // Try again with different mirrors
+ }
+ else if (result === "failed-again") {
+ show(document.getElementById("verification-failed-again"));
+ replaceUrlPrefixWithRandomMirror(document.querySelectorAll(".use-mirror-pool")); // Change mirrors in case people try again anyway
+ }
+ }
+
+ function toggleDirectBitTorrent(method) {
+ transparent(document.getElementById("step-verify-direct"));
+ transparent(document.getElementById("step-continue-direct"));
+ transparent(document.getElementById("continue-link-direct"));
+ transparent(document.getElementById("step-verify-bittorrent"));
+ transparent(document.getElementById("step-continue-bittorrent"));
+ transparent(document.getElementById("continue-link-bittorrent"));
+ if (method == "direct") {
+ opaque(document.getElementById("step-verify-direct"));
+ opaque(document.getElementById("continue-link-direct"));
+ show(document.getElementById("verify-download-wrapper"));
+ }
+ if (method == "bittorrent") {
+ opaque(document.getElementById("step-verify-bittorrent"));
+ opaque(document.getElementById("step-continue-bittorrent"));
+ opaque(document.getElementById("continue-link-bittorrent"));
+ toggleContinueLink("bittorrent", "next-bittorrent");
+ }
+ }
+
+ // Reset the page to its initial state:
+ // - Detect the browser version and display the relevant variant
+ detectBrowser();
+ // - Show the download steps of both direct and BitTorrent downloads
+ toggleDirectBitTorrent("none");
+ // - Display 'Skip download' as continue link
+ toggleContinueLink("direct", "skip-download-direct");
+ toggleContinueLink("bittorrent", "skip-download-bittorrent");
+ opaque(document.getElementById("continue-link-direct"));
+ opaque(document.getElementById("continue-link-bittorrent"));
+
+ // Display "Verify with your browser" when ISO image is clicked
+ document.getElementById("download-iso").onclick = function() {
+ toggleDirectBitTorrent("direct");
+ resetVerificationResult();
+ }
+
+ // Display "Verify with your browser" when "I already" is clicked
+ document.getElementById("already-downloaded").onclick = function() {
+ toggleDirectBitTorrent("direct");
+ resetVerificationResult();
+ }
+
+ // Reset verification when downloading again after failure
+ document.getElementById("download-iso-again").onclick = function() {
+ toggleDirectBitTorrent("direct");
+ resetVerificationResult();
+ }
+
+ // Display "Verify with BitTorrent" when Torrent file is clicked
+ document.getElementById("download-torrent").onclick = function() {
+ toggleDirectBitTorrent("bittorrent");
+ }
+
+ // Install Chrome extension when clicking "chrome" links
+ // See https://developer.chrome.com/webstore/inline_installation
+ var chromeInstallationLinks = document.getElementsByClassName("chrome");
+ for (let i = 0; i < chromeInstallationLinks.length; i++) {
+ chromeInstallationLinks[i].onclick = function() {
+ chrome.webstore.install();
+ }
+ }
+
+ // To debug the display of the different states:
+ // showVerificationResult("successful");
+ // showVerificationResult("failed");
+ // showVerificationResult("failed-again");
+ // showVerificationProgress('50');
+
+});
diff --git a/wiki/src/install/inc/screenshots/allow_js.png b/wiki/src/install/inc/screenshots/allow_js.png
new file mode 100644
index 0000000..55a1d6b
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/allow_js.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/notification_in_tails.png b/wiki/src/install/inc/screenshots/notification_in_tails.png
index 9c699a2..5c0b291 100644
--- a/wiki/src/install/inc/screenshots/notification_in_tails.png
+++ b/wiki/src/install/inc/screenshots/notification_in_tails.png
Binary files differ
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.de.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.de.po
deleted file mode 100644
index b49bfab..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.de.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-04-29 15:20+0000\n"
-"PO-Revision-Date: 2016-06-12 17:23-0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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.10\n"
-
-#. type: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr ""
-"Ihr BitTorrent-Client verifiziert automatisch Ihren Download anhand der in "
-"der Torrent-Datei enthaltenen kryptographischen Prüfsumme."
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the OpenPGP signature included in the Torrent file. [[Learn how to do "
-"this.|install/download/openpgp]]"
-msgstr ""
-"Wenn Sie sich mit OpenPGP auskennen, können Sie mithilfe der in der Torrent-"
-"Datei enthaltenen OpenPGP-Signatur eine zusätzliche Verifizierung "
-"durchführen. [[Lernen Sie, wie so etwas gemacht wird.|install/download/"
-"openpgp]]"
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po
deleted file mode 100644
index cbfe8bc..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-04-29 15:20+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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the OpenPGP signature included in the Torrent file. [[Learn how to do "
-"this.|install/download/openpgp]]"
-msgstr ""
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po
deleted file mode 100644
index c25ea81..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-02-24 23:12+0100\n"
-"PO-Revision-Date: 2017-03-31 07:19+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fr\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: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr "Votre client BitTorrent vérifie automatiquement ce que vous téléchargez en se basant sur une somme de contrôle cryptographique dans le fichier Torrent."
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification using the OpenPGP signature included in the Torrent file. [[Learn how to do this.|"
-"install/download/openpgp]]"
-msgstr ""
-"Si vous avez l'habitude d'OpenPGP, vous pouvez également vérifier la signature OpenPGP inclue dans le fichier Torrent. [[Apprendre comment faire.|install/"
-"download/openpgp]]"
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.html b/wiki/src/install/inc/steps/bittorrent_verification.inline.html
deleted file mode 100644
index f7df64e..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>Your BitTorrent client verifies your download automatically based on a
-cryptographic checksum in the Torrent file.</p>
-
-<p class="openpgp">If you are knowledgeable about OpenPGP, you can do
-additional verification using the OpenPGP signature included in the
-Torrent file. [[Learn how to do this.|install/download/openpgp]]</p>
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.it.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.it.po
deleted file mode 100644
index 9267819..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.it.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: trasitails\n"
-"POT-Creation-Date: 2016-05-17 09:40+0200\n"
-"PO-Revision-Date: 2016-06-30 19:59-0000\n"
-"Last-Translator: anoni\n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: it\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: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr ""
-"Il tuo software BitTorrent (client) automaticamente analizza il file che hai "
-"scaricato, sulla base di un checksum cifrato situato nel file Torrent."
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the OpenPGP signature included in the Torrent file. [[Learn how to do "
-"this.|install/download/openpgp]]"
-msgstr ""
-"Se conosci OpenPGP, puoi avere una verifica addizionale usando la firma "
-"della chiave OpenPGP inclusa nel file Torrent. [[Vedi come si fa.|install/"
-"download/openpgp]]"
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po
deleted file mode 100644
index 115a07b..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2016-02-24 23:12+0100\n"
-"PO-Revision-Date: 2016-04-30 12:05-0300\n"
-"Last-Translator: Tails Developers <amnesia@boum.org>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: pt\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: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr ""
-"Seu cliente de BitTorrent automaticamente verifica o download baseado em uma "
-"soma de verificação criptográfica incluída no arquivo Torrent."
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the OpenPGP signature included in the Torrent file. [[Learn how to do "
-"this.|install/download/openpgp]]"
-msgstr ""
-"Se você tem conhecimento sobre OpenPGP, você pode fazer uma verificação "
-"adicional usando a assinatura OpenPGP incluída no arquivo Torrent. [[Aprenda "
-"como fazer isto|doc/get/verify]]."
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 b1c14ed..4f36bfe 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.de.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.de.po
@@ -369,9 +369,9 @@ msgstr " <div class=\"col-md-6\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid " [[!img lib/admon-caution.png link=\"no\"]]\n"
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
-msgstr " [[!img lib/admon-caution.png link=\"no\"]]\n"
+#| msgid " [[!img lib/dialog-warning.png link=\"no\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgstr " [[!img lib/dialog-warning.png link=\"no\"]]\n"
#. type: Plain text
#, no-wrap
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 527d8f0..e6aeceb 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fa.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fa.po
@@ -283,7 +283,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\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 8b67034..42daed7 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fr.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2017-05-19 17:19+0200\n"
-"PO-Revision-Date: 2017-06-05 13:52-0000\n"
+"PO-Revision-Date: 2017-09-26 19:29+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -352,8 +352,8 @@ msgstr " <div class=\"col-md-6\">\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
-msgstr " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgstr " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
#. type: Plain text
#, no-wrap
@@ -381,7 +381,7 @@ msgid ""
" error</span> launcher on the Tails desktop or visit our [[support\n"
" pages|support]].</p>\n"
msgstr ""
-" <p>Si vous rencontrez des problèmes, lancez l'outil <span class=\"guilabel\">Rapporter\n"
+" <p>Si vous rencontrez des problèmes, lancez l'outil <span class=\"guilabel\">Signaler\n"
" une erreur</span> qui se trouve sur le bureau de Tails ou visitez nos [[pages\n"
" de support|support]].</p>\n"
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.it.po b/wiki/src/install/inc/steps/create_persistence.inline.it.po
index f0651c8..64f3a14 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.it.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.it.po
@@ -353,7 +353,7 @@ msgstr " <div class=\"col-md-6\">\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\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 ef07ce6..298132f 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.mdwn
+++ b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
@@ -139,7 +139,7 @@ Restart and activate the persistent storage
<div class="col-md-6">
- [[!img lib/admon-caution.png link="no" alt="" class="float-left"]]
+ [[!img lib/dialog-warning.png link="no" alt="" class="float-left"]]
<p>Tails does not protect you from everything! Have a look at our
[[warnings|doc/about/warning]].</p>
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 b179ad2..b3e0a91 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.pt.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.pt.po
@@ -370,9 +370,9 @@ msgstr " <div class=\"col-md-6\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid " [[!img lib/admon-caution.png link=\"no\"]]\n"
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
-msgstr " [[!img lib/admon-caution.png link=\"no\"]]\n"
+#| msgid " [[!img lib/dialog-warning.png link=\"no\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgstr " [[!img lib/dialog-warning.png link=\"no\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.de.po b/wiki/src/install/inc/steps/debian_requirements.inline.de.po
index 607db5b..b7a90bb 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.de.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2016-07-12 18:42+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
#. type: Plain text
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.fa.po b/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
index de52bad..0a19b24 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+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"
@@ -35,7 +35,7 @@ msgstr ""
#. type: Plain text
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.fr.po b/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
index 3b997ee..5a5cef1 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
-"PO-Revision-Date: 2016-11-26 14:18-0000\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"PO-Revision-Date: 2017-09-26 19:30+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
msgid "These instructions require:"
@@ -33,9 +33,15 @@ msgid "Linux Mint 18 (Sarah) or later"
msgstr "Linux Mint 18 (Sarah) ou plus récent"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If your version of Debian, Ubuntu, or Linux Mint is not supported, you "
+#| "can follow the instructions for [[other Linux distributions|install/linux/"
+#| "usb/overview]] instead. But they are more complicated and require two USB "
+#| "sticks instead of one."
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
@@ -59,7 +65,7 @@ msgid ""
msgstr ""
"<p>Pour connaître votre version de Debian ou Ubuntu, ouvrez\n"
"<span class=\"application\">Paramètres</span> et cliquez sur\n"
-"<span class=\"guilabel\">Détails</span>. Pour Debian, se rapporter à\n"
+"<span class=\"guilabel\">Détails</span>. Pour Debian, se reporter à\n"
"l'information <span class=\"guilabel\">Distribution</span>.</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.it.po b/wiki/src/install/inc/steps/debian_requirements.inline.it.po
index 301d3a4..fda4612 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.it.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
#. type: Plain text
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.mdwn b/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
index 1b1b919..c2f86da 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
@@ -5,7 +5,7 @@ These instructions require:
- Linux Mint 18 (Sarah) or later
If your version of Debian, Ubuntu, or Linux Mint is not supported, you can follow the
-instructions for [[other Linux distributions|install/linux/usb/overview]]
+instructions for [[other Linux distributions|install/linux/usb-overview]]
instead. But they are more complicated and require two USB sticks instead of
one.
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.pt.po b/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
index d91b841..7f496c9 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2016-07-12 18:42+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -43,7 +43,7 @@ msgstr ""
#| "of one."
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.de.po b/wiki/src/install/inc/steps/download.inline.de.po
index fbff786..243db96 100644
--- a/wiki/src/install/inc/steps/download.inline.de.po
+++ b/wiki/src/install/inc/steps/download.inline.de.po
@@ -3,11 +3,10 @@
# 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: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-12-03 16:30+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"
@@ -16,388 +15,1276 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. type: Content of: <div>
+msgid "0.95"
+msgstr ""
+
#. type: Content of: <h1>
-msgid "Download and verify the Tails ISO image"
+msgid ""
+"Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
-#. type: Content of: <div>
+#. type: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
+"</a>"
+msgstr ""
+"Laden Sie das <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]] ISO-Image herunter</a> (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)."
+
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
+"<a>I already downloaded Tails <span class=\"remove-extra-space\">&nbsp;[[!"
+"inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span>."
+"</a>"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<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."
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div>
-msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><p>
-msgid "Please wait…"
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
msgstr ""
-#. type: Content of: <div><div>
-msgid "0.2.8"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"We failed to detect your browser vendor, maybe because JavaScript is "
-"disabled."
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You can download and verify the ISO image via:"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "With an unverified download, you might:"
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Browser add-on"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Lose time if your download is incomplete or broken due to an error during "
+"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
-"for <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+</a> or <a href=\"https://www.torproject.org/download/"
-"download-easy.html.en\">Tor Browser <span class=\"minver-tor\">5</span>+</a>"
+"Get hacked while using Tails if our download mirrors have been compromised "
+"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "A Firefox add-on to download and verify Tails automatically."
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are not in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if your download is modified on the fly by an "
+"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "Copy and paste this link in Firefox or Tor Browser:"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<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=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are already in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"You seem to have JavaScript disabled. To use our browser extension, please "
+"allow all this page:"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[!img screenshots/allow_js.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Install Firefox add-on</a>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "BitTorrent"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "<u>Tails Verification</u> extension installed!"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Download "
-"Torrent file</a>"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"label>"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Verifying <span id=\"filename\">$FILENAME</span>&hellip;"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You seem to be using an unsupported browser."
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"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:"
+"[[!toggleable id=\"why-failed\" text=\"\"\" [[!toggle id=\"why-failed\" text="
+"\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Most likely, the verification failed because of an error or interruption "
+"during the download."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser and already have our "
-"Firefox add-on installed."
+"Less likely, the verification might have failed because of a malicious "
+"download from our download mirrors or due to a network attack in your "
+"country or local network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "Downloading again is usually enough to fix this problem."
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
msgstr ""
-#. type: Content of: <div><div><div><a><div>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed-again\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"<span class=\"label label-default state already\">Already installed</span>"
+"[[!toggleable id=\"why-failed-again\" text=\"\"\" [[!toggle id=\"why-failed-"
+"again\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div>
-msgid "</a>"
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "The verification might have failed again because of:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A software problem in our verification extension"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A malicious download from our download mirrors"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A network attack in your country or local network"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Trying from a different place or a different computer might solve any of "
+"these issues."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
+"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
+"span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id=\"use-text-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
+"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
+"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
+"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
+"download|upgrade/tails]]</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser but have an outdated "
-"version of our Firefox add-on."
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Update "
-"Firefox add-on</span>"
+"Firefox <span id=\"min-version-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a href=\"https://www.mozilla.org/firefox/new/\">Download</a>)"
msgstr ""
-#. type: Content of: <div><div><div><a><div>
-msgid "<span class=\"label label-default state restartless\">No restart</span>"
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<span id=\"update-button-label\" class=\"pull-left\">Update Firefox add-on</"
-"span>"
+"Tor Browser <span id=\"min-version-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a href=\"https://www.torproject.org/download/download-easy.html"
+"\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "We detected that you are running Firefox or Tor Browser."
+msgid "Please update your browser to the latest version."
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"You can download the ISO image via our Firefox add-on. The add-on verifies "
-"your download [[!toggle id=\"extension-verification\" text=\"automatically"
-"\"]]."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!toggle id=\"what-is-bittorrent\" text=\"What is BitTorrent?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div>
msgid ""
-"The verification is based on a cryptographic checksum downloaded from our "
-"website."
+"[[!toggleable id=\"what-is-bittorrent\" text=\"\"\" [[!toggle id=\"what-is-"
+"bittorrent\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
msgid ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Install Firefox add-on</span>"
+"BitTorrent is a peer-to-peer technology for file sharing that makes your "
+"download faster and easier to resume."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<span id=\"install-text-label\" class=\"pull-left\">Install Firefox add-on</"
-"span>"
+"You need to install BitTorrent software on your computer, like <a href="
+"\"https://transmissionbt.com/\">Transmission</a> (for Windows, macOS, and "
+"Linux)."
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "BitTorrent doesn't work over Tor or in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"or [[!toggle id=\"bittorrent-verification\" text=\"Download and verify via "
-"BitTorrent\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
#. type: Content of: <div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
+"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
+"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] Torrent file</a>"
+msgstr ""
+"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
+"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
+"Image gespeichert haben."
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id="
-"\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/"
-"bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download Torrent file</a>"
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "\"\"\"]]"
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Open and download the Torrent file with your BitTorrent client. It contains "
+"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
+"\"]] ISO image that you will use in the next step."
msgstr ""
-#. type: Content of: <div><div><div><p>
-msgid "or [[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">seconds</span> <span class=\"singular\">second</span> "
-"</span> </small>"
+"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
+"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
+"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
+"Image gespeichert haben."
-#. type: Content of: <div><div><div><div><div><div>
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complete</span> <span class=\"progress-label\">$PROGRESS</span>"
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
msgid ""
-"<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>"
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "This section provides simplified instructions:"
+msgstr "Dieser Abschnitt bietet vereinfachte Anweisungen:"
+
+#. type: Content of: <div><ul><li>
msgid ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"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>"
+"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
+"span></a>"
msgstr ""
+"<a href=\"#windows\">Unter Windows mit <span class=\"application\">Gpg4win</"
+"span></a>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
msgid ""
-"<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>"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
+"a>"
msgstr ""
+"<a href=\"#mac\">Unter macOS mit <span class=\"application\">GPGTools</"
+"span></a>"
-#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click on the play button to resume."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#tails\">In Tails</a>"
+msgstr "<a href=\"#tails\">In Tails</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#command-line\">Using the command line</a>"
+msgstr "<a href=\"#command-line\">Mittels der Kommandozeile</a>"
+
+#. type: Content of: <div>
+msgid "<a id=\"windows\"></a>"
+msgstr "<a id=\"windows\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In Windows with <span class=\"application\">Gpg4win</span>"
+msgstr "Unter Windows mit <span class=\"application\">Gpg4win</span>"
+
+#. type: Content of: <div><p>
+msgid ""
+"See the [[<span class=\"application\">Gpg4win</span> documentation on "
+"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
msgstr ""
+"Lesen Sie die entsprechende [[<span class=\"application\">Gpg4win</span>-"
+"Dokumentation zum Prüfen von Signaturen|http://www.gpg4win.org/doc/de/"
+"gpg4win-compendium_24.html#id5]]."
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"The download of the ISO image failed! Please check your network connection "
-"and click <span class=\"guilabel\">Retry</span>…"
+"Verify the date of the signature to make sure that you downloaded the latest "
+"version."
msgstr ""
+"Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie die "
+"aktuellste Version heruntergeladen haben."
-#. type: Content of: <div><div><div><div><div>
-msgid "Verify ISO image"
+#. type: Content of: <div><p>
+msgid "If the following warning appears:"
+msgstr "Wenn die folgende Warnung erscheint:"
+
+#. type: Content of: <div><pre>
+#, no-wrap
+msgid ""
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
msgstr ""
+"Es sind nicht genügend Informationen zur Überprüfung der Signatur vorhanden.\n"
+"Signiert am ... von tails@boum.org (Schlüssel-ID: 0x58ACD84F\n"
+"Die Gültigkeit der Signatur kann nicht überprüft werden.\n"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"<small id=\"verify-text-calculating\">Computing SHA-256 checksum&hellip;</"
-"small>"
+"Then the ISO image is still correct according to the signing key that you "
+"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
+"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
+"Dann ist das ISO-Image dennoch im Bezug auf den von Ihnen heruntergeladenen "
+"Signaturschlüssel korrekt. Um diese Warnung zu entfernen, müssen Sie den "
+"Signaturschlüssel durch das <a href=\"#wot\">OpenPGP Web of Trust "
+"authentifizieren</a>."
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
+msgid "<a id=\"mac\"></a>"
+msgstr "<a id=\"mac\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr "Unter macOS mit <span class=\"application\">GPGTools</span>"
+
+#. type: Content of: <div><ol><li>
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 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>"
+"Open <span class=\"application\">Finder</span> and navigate to the folder "
+"where you saved the ISO image and the signature."
msgstr ""
+"Öffnen Sie den <span class=\"application\">Finder</span> und navigieren Sie "
+"zu dem Ordner, in dem Sie das ISO-Image und die Signatur gespeichert haben."
-#. type: Content of: <div><div><div><div><p>
-msgid "You downloaded and verified the ISO image successfully!"
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
+"Verify Signature of File</span></span>."
msgstr ""
+"Rechtsklicken Sie auf das ISO-Image und wählen Sie <span class="
+"\"guimenuchoice\"> <span class=\"guisubmenu\">Dienste</span> ▸ <span class="
+"\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>."
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div>
+msgid "<a id=\"tails\"></a>"
+msgstr "<a id=\"tails\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In Tails"
+msgstr "In Tails"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"You can now continue with the next step and <span class=\"windows"
-"\">[[Install an intermediary Tails|install/win/usb#next]].</span> <span "
-"class=\"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=\"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>"
+"Open the file browser and navigate to the folder where you saved the ISO "
+"image and the signature."
msgstr ""
+"Öffnen Sie den Dateibrowser und navigieren Sie zu dem Ordner, in dem Sie das "
+"ISO-Image und die Signatur gespeichert haben."
-#. type: Content of: <div><div><div><div><div><p>
+#. type: Content of: <div><ol><li>
msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the [[!toggle id=\"openpgp\" text=\"OpenPGP signature\"]]."
+"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
+"With Verify Signature</span>."
msgstr ""
+"Rechtsklicken Sie auf die Signatur und wählen Sie <span class=\"guimenuitem"
+"\">Mit Signatur-Datei überprüfen öffnen</span>."
-#. type: Content of: <div><div><div><div><div>
-msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
+#. type: Content of: <div><ol><li>
+msgid "The verification of the ISO image starts automatically:"
+msgstr "Die Verifizierung des ISO-Image startet automatisch:"
+
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"After the verification finishes, click on the notification counter in the "
+"bottom-right corner and on the notification with a transparent background on "
+"the right of the notification area:"
msgstr ""
+"Klicken Sie, nachdem die Verifizierung beendet wurde, auf den "
+"Benachrichtigungs-Zähler im unteren, rechten Bereich und auf die "
+"Benachrichtigung mit einem durchsichtigen Hintergrund auf der rechten Seite "
+"des Benachrichtigungsbereichs:"
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div>
+msgid "<a id=\"command-line\"></a>"
+msgstr "<a id=\"command-line\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Using the command line"
+msgstr "Mithilfe der Kommandozeile"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download the OpenPGP signature</a>"
+"Open a terminal and navigate to the folder where you saved the ISO image and "
+"the signature."
msgstr ""
+"Öffnen Sie ein Terminal und navigieren Sie zu dem Ordner, in dem Sie das ISO-"
+"Image und die Signatur gespeichert haben."
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Download the Tails signing key|tails-signing.key]]"
+#. type: Content of: <div><ol><li><p>
+msgid "Execute:"
+msgstr "Führen Sie aus:"
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Learn how to do this|install/download/openpgp]]"
+#. type: Content of: <div><ol><li><p>
+msgid "The output of this command should be the following:"
+msgstr " Die Ausgabe des Befehls sollte folgende sein:"
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "If the output also includes:"
+msgstr "Wenn die Ausgabe auch folgendes enthält:"
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: WARNING: This key is not certified with a trusted signature!"
+msgstr "gpg: WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!"
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+"gpg: Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
+"Besitzer gehört."
+
+#. type: Content of: <div>
+#, fuzzy
+#| msgid "<a id=\"wot\"></a>"
+msgid "\"\"\"]] <a id=\"wot\"></a>"
+msgstr "<a id=\"wot\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Authenticate the signing key through the OpenPGP Web of Trust"
+msgstr ""
+"Authentifizieren Sie den Signaturschlüssel durch das OpenPGP Web of Trust"
+
+#. type: Content of: <div><p>
msgid ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Download again</a>"
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div>
msgid ""
-"The verification of the ISO image failed! Please try to download "
-"again&hellip;"
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The verification techniques presented until now ([[Firefox extension, "
+#| "BitTorrent|install/download]], or OpenPGP verification) all rely on some "
+#| "information being securely downloaded using HTTPS from our website:"
+msgid ""
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
+msgstr ""
+"Die bisher vorgestellten Methoden zur Verifizierung ([[Firefoxerweiterung, "
+"BitTorrent|install/download]] oder OpenPGP-Verfizierung) basieren alle auf "
+"einigen, sicher mit HTTPS von unserer Webseite heruntergeladenen "
+"Informationen:"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>checksum</em> for the Firefox extension"
+msgstr "Die <em>Prüfsumme</em> für die Firefoxerweiterung"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Torrent file</em> for BitTorrent"
+msgstr "Die <em>Torrentdatei</em> für BitTorrent"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Tails signing key</em> for the OpenPGP verification"
+msgstr "Der <em>Signaturschlüssel von Tails</em> für die OpenPGP-Verfizierung"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "But, while doing so, you could download malicious information if our "
+#| "website is compromised or if you are victim of a [[man-in-the-middle "
+#| "attack|doc/about/warning#man-in-the-middle]]."
+msgid ""
+"But, while doing so, you could download malicious information if our website "
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
+"about/warning#man-in-the-middle]]."
+msgstr ""
+"Jedoch könnten Sie, wenn unsere Website kompromittiert wurde oder Sie ein "
+"Opfer eines [[Man-in-the-Middle-Angriffs|doc/about/warning#man-in-the-"
+"middle]] sind, gefälschte Informationen herunterladen."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP verification is the only technique that allows you to verify the "
+"ISO image even better by also authenticating the Tails signing key through "
+"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
+"way to completely protect you from malicious downloads."
+msgstr ""
+"Die Verifikation mit OpenPGP ist die einzige Vorgehensweise, die Ihnen durch "
+"das zusätzliche Authentifizeren mit dem OpenPGP Web of Trust eine noch "
+"bessere Authentifizierung bietet. Durch das Vertrauen in das OpenPGP Web of "
+"Trust können Sie sich vollständig gegen schadhafte Downloads schützen."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are verifying an ISO image from inside Tails already, for example to "
+"do a manual upgrade, then the Tails signing key is already included in "
+"Tails. You can trust this signing key as much as you are trusting your Tails "
+"installation already because you are not downloading it."
+msgstr ""
+"Wenn Sie das ISO-Image bereits von einem Tails aus verifizieren, zum "
+"Beispiel wenn Sie eine manuelle Aktualisierung durchführen, ist der "
+"Signaturschlüssel von Tails bereits in dem Tails enthalten. Da Sie ihn nicht "
+"herunterladen, können Sie diesem Signaturschlüssel in dem gleichen Maße, wie "
+"dem bereits installierten Tails vertrauen."
+
+#. type: Content of: <div><p>
+msgid ""
+"One of the inherent problems of standard HTTPS is that the trust we usually "
+"put in a website is defined by certificate authorities: a hierarchical and "
+"closed set of companies and governmental institutions approved by your web "
+"browser vendor. This model of trust has long been criticized and proved "
+"several times to be vulnerable to attacks [[as explained on our warning page|"
+"doc/about/warning#man-in-the-middle]]."
+msgstr ""
+"Eine der grundlegenden Probleme von üblichem HTTPS ist, dass das Vertrauen, "
+"welches wir in eine Webseite setzen, von Zertifizierungsstellen abhängt: "
+"Eine hierarchische und geschlossene Gruppe von Firmen und staatlichen "
+"Institutionen, die durch Webbrowser verifiziert werden. Dieses "
+"Vertrauensmodell wird schon lange kritisiert und ist erwiesenermaßen durch "
+"Angriffe verwundbar, [[wie wir es auf unserer Warnungsseite beschreiben|"
+"about/warning#man-in-the-middle]]."
+
+#. type: Content of: <div><p>
+msgid ""
+"We believe that, instead, users should be given the final say when trusting "
+"a website, and that designation of trust should be done on the basis of "
+"human interactions."
+msgstr ""
+"Stattdessen glauben wir, dass den Nutzenden bezüglich dem Vertrauen zu einer "
+"Webseite die letztendliche Entscheidung überlassen werden sollte und dass "
+"das Herstellen von Vertrauen auf der Basis von menschlicher Interaktion "
+"geschehen sollte."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
+"on OpenPGP keys that can help solving this problem. Let's see this with an "
+"example:"
+msgstr ""
+"Das OpenPGP [[!wikipedia_de Web_of_Trust desc=\"Web of Trust\"]] ist ein auf "
+"OpenPGP-Schlüsseln basierendes, dezentrales Vertrauensmodell. Werfen wir mit "
+"einem Beispiel einen Blick darauf:"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<em>You are friend with Alice and really trust her way of managing "
+#| "OpenPGP keys. So you are trusting Alice's key.</em>"
+msgid ""
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
+"keys. So you are trusting Alice's key.</em>"
+msgstr ""
+"<em>Sie sind mit Alice befreundet und vertrauen ihr wirklich, wie sie ihre "
+"OpenPGP-Schlüssel verwaltet. Sie vertrauen dem Schlüssel von Alice.</em>"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
+"certified Bob's key. So Alice is trusting Bob's key.</em>"
+msgstr ""
+"<em>Hinzu kommt, dass Alice Bob, einen Tails-Entwickler, bei einer Konferenz "
+"trifft und Bobs Schlüssel signiert. Alice vertraut Bobs Schlüssel.</em>"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
+"fully trusts the Tails signing key.</em>"
+msgstr ""
+"<em>Bob ist ein Tails Entwickler, welcher direkt den Signaturschlüssel von "
+"Tails besitzt. Bob vertraut dem Signaturschlüssel von Tails vollständig.</em>"
+
+#. type: Content of: <div><p>
+msgid ""
+"In this scenario, Alice found a path to trust the Tails signing key without "
+"the need to rely on certificate authorities."
+msgstr ""
+"Dieses Szenario erzeugt einen Vertrauenspfad von Ihnen zum Signaturschlüssel "
+"von Tails, welcher es Ihnen erlauben kann, ihm ohne die Abhängigkeit von "
+"Zertifizierungsstellen zu vertrauen."
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<p>If you are on Debian or Ubuntu, you can install the\n"
+#| "<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
+#| "all Debian developers. Some Debian developers have certified the Tails\n"
+#| "signing key and you can use these certifications to build a trust path.\n"
+#| "This technique is explained in detail in our instructions on\n"
+#| "[[installing Tails from Debian or Ubuntu using the command\n"
+#| "line|install/expert/usb]].</p>\n"
msgid ""
-"The verification of the ISO image failed again! Please try to download again "
-"from a different place or a different computer&hellip;"
+"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
+"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
+"Debian developers. Some Debian developers have certified the Tails signing "
+"key and you can use these certifications to build a trust path. This "
+"technique is explained in detail in our instructions on [[installing Tails "
+"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
+"usb]]."
+msgstr ""
+"Wenn Sie Debian oder Ubuntu benutzen, können Sie das Paket <code>debian-"
+"keyring</code>, welches die OpenPGP-Schlüssel aller Entwickelnden von Debian "
+"enthält, installieren. Einige Entwickelnde von Debian haben, um einen "
+"Vertrauenspfad aufzubauen, den Signaturschlüssel von Tails zertifiziert. "
+"Diese Vorgehensweise wird in unseren Anweisungen zur [[Installation von "
+"Tails auf einem USB-Stick unter Verwendung der Kommandozeile von Debian oder "
+"Ubuntu aus|install/expert/usb]] näher beschrieben."
+
+#. type: Content of: <div><p>
+msgid ""
+"Relying on the Web of Trust requires both caution and intelligent "
+"supervision by the users. The technical details are outside of the scope of "
+"this document."
msgstr ""
+"Dieses Vertrauensmodell ist auch nicht perfekt und benötigt sowohl Vorsicht "
+"als auch intelligente Kontrolle durch Nutzende. Die technischen Details "
+"übersteigen den Umfang dieses Dokuments."
-#. type: Content of: outside any tag (error?)
-msgid "<a id=\"next\"></a>"
+#. type: Content of: <div><p>
+msgid ""
+"Since the Web of Trust is actually based on human relationships and real-"
+"life interactions, the best is to get in touch with people knowledgeable "
+"about OpenPGP and build trust relationships in order to find your own trust "
+"path to the Tails signing key."
msgstr ""
+"Da das Web of Trust tatsächlich auf zwischenmenschlichen Beziehungen und "
+"Interaktion im realen Leben basiert, wäre es das Beste, Kontakte zu Menschen "
+"aufzubauen, die sich mit OpenPGP auskennen und zu beginnen, es selbst zu "
+"benutzen und Vertrauensverhältnisse aufzubauen, damit Sie Ihren eigenen "
+"Vertrauenspfad zum Signaturschlüssel von Tails finden."
+
+#. type: Content of: <div><p>
+msgid ""
+"For example, you can start by contacting a local [[!wikipedia "
+"Linux_User_Group]], [[an organization offering Tails training|support/"
+"learn]], or other Tails enthusiasts near you and exchange about their "
+"OpenPGP practices."
+msgstr ""
+"Sie könnten damit beginnen, indem Sie mit einer lokalen [[!wikipedia_de "
+"Linux_User_Group desc=\"%s\"]] oder anderen Enthusiasten von Tails in Ihrer "
+"Umgebung in Kontakt treten und sich über deren Methoden bezüglich OpenPGP "
+"austauschen."
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "After you built a trust path, you can certify the Tails signing key by "
+#| "signing it with your own key to get rid of some warnings during the "
+#| "verification process."
+msgid ""
+"After you build a trust path, you can certify the Tails signing key by "
+"signing it with your own key to get rid of some warnings during the "
+"verification process."
+msgstr ""
+"Nachdem Sie einen Vertrauenspfad aufgebaut haben, können Sie den "
+"Signaturschlüssel von Tails mit Ihrem eigenen Schlüssel zertifizieren, um "
+"einige der Warnungen während des Verifizierungsprozesses loszuwerden."
+
+#~ msgid "Download and verify using OpenPGP"
+#~ msgstr "Herunterladen und mit OpenPGP verifizieren"
+
+#~ msgid ""
+#~ "These instructions are for people who are already familiar with basic "
+#~ "usage of OpenPGP and have <em>GPG</em> installed but might need guidance "
+#~ "on performing the verification."
+#~ msgstr ""
+#~ "Diese Anweisungen sind für Personen, die bereits mit der grundsätzlichen "
+#~ "Benutzung von OpenPGP vertraut sind und <em>GPG</em> installiert haben, "
+#~ "aber möglicherweise Hilfe zur Durchführung der Verifizierung benötigen."
+
+#~ msgid ""
+#~ "If you are doing the verification for the first time, download the "
+#~ "[[Tails signing key|tails-signing.key]] and import it in your keyring. "
+#~ "If you are working from Tails, the signing key is already included."
+#~ msgstr ""
+#~ "Wenn Sie die Verifizierung zum ersten Mal durchführen, laden Sie den "
+#~ "[[Signaturschlüssel von Tails|tails-signing.key]] herunter und "
+#~ "importieren Sie ihn in Ihren Schlüsselbund. Wenn Sie von einem Tails aus "
+#~ "arbeiten, ist der Signaturschlüssel bereits enthalten.[[!meta title="
+#~ "\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" rel="
+#~ "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+#~ "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/"
+#~ "inc/stylesheets/download\" 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/download\"]] "
+#~ "[[!meta link=\"https://chrome.google.com/webstore/detail/"
+#~ "gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]] [[!"
+#~ "inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age"
+#~ "\"]]"
+
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Alle ISO-Images sind mit dem gleichen Signaturschlüssel signiert, somit "
+#~ "müssen Sie ihn nur einmal importieren. Dennoch werden Sie jedes mal, wenn "
+#~ "Sie ein neues ISO-Image herunterladen, es erneut verifizieren müssen."
+
+#~ msgid ""
+#~ "This download of the Tails signing key is protected using HTTPS. But you "
+#~ "could still download a malicious signing key if our website is "
+#~ "compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+#~ "about/warning#man-in-the-middle]]."
+#~ msgstr ""
+#~ "Dieser Download des Signaturschlüssels von Tails wird durch HTTPS "
+#~ "geschützt. Dennoch könnten Sie, falls unsere Webseite kompromittiert ist "
+#~ "oder Sie Opfer eines [[Man-in-the-Middle-Angriffs|doc/about/warning#man-"
+#~ "in-the-middle]] sind, einen bösartigen Signaturschlüssel herunterladen."
+
+#~ msgid ""
+#~ "For additional verification, you can <a href=\"#wot\">authenticate the "
+#~ "signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Für zusätzliche Verifizierung <a href=\"#wot\">authentifizieren Sie den "
+#~ "Signaturschlüssel durch das OpenPGP Web of Trust</a>."
+
+#~ msgid "Verify the ISO image"
+#~ msgstr "Das ISO-Image verifizieren"
+
+#~ msgid ""
+#~ "As explained above in step 3, this simple OpenPGP verification provides a "
+#~ "level of verification equivalent to HTTPS, like the [[Firefox extension "
+#~ "or BitTorrent|install/download]], unless you also <a href=\"#wot"
+#~ "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Wie weiter oben in Schritt 3 beschrieben, bietet diese einfache, mit "
+#~ "HTTPS vergleichbare Verifizierung mit OpenPGP ein Verifizierungsniveau, "
+#~ "welches mit der [[Firefoxerweiterung oder BitTorrent|install/download]] "
+#~ "vergleichbar ist, es sei denn Sie <a href=\"#wot\">authentifizieren den "
+#~ "Signaturschlüssel zusätzlich durch das OpenPGP Web of Trust</a>."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "Weitere Literatur zu OpenPGP"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia_de GnuPG desc=\"Wikipedia: %s\"]], eine freie OpenPGP "
+#~ "Software"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian: Schlüsselsignierung|http://www.debian.org/events/keysigning.de."
+#~ "html]], ein Tutorial zum Signieren der Schlüssel von anderen Personen"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Erklärungen zum PGP Web of Trust|http://www.rubin.ch/pgp/"
+#~ "weboftrust.de.html]]"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: Zertifikatsprüfung|http://www.gpg4win.org/doc/de/gpg4win-"
+#~ "compendium_16.html]], Anweisungen zum Verwalten von Vertrauen in "
+#~ "Schlüssel mit Gpg4win"
+
+#, fuzzy
+#~| msgid ""
+#~| "Verify the date of the signature to make sure that you downloaded the "
+#~| "latest version."
+#~ msgid ""
+#~ "Verify the date of the signature to make sure that you downloaded the "
+#~ "latest version. If the output also includes:"
+#~ msgstr ""
+#~ "Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie die "
+#~ "aktuellste Version heruntergeladen haben."
+
+#, fuzzy
+#~| msgid ""
+#~| " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
+#~ msgid ""
+#~ "The verification of the ISO image starts automatically: [[!img install/"
+#~ "inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
+
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
+
+#~ msgid "</div>\n"
+#~ msgstr "</div>\n"
+
+#~ msgid ""
+#~ " Verify the date of the signature to make sure that you downloaded the "
+#~ "latest version.\n"
+#~ msgstr ""
+#~ " Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie "
+#~ "die aktuellste Version heruntergeladen haben.\n"
+
+#~ msgid ""
+#~ " Then the ISO image is still correct according to the signing key that "
+#~ "you\n"
+#~ " downloaded. To remove this warning you need to <a href=\"#wot"
+#~ "\">authenticate\n"
+#~ " the signing key through the OpenPGP Web of Trust</a>.\n"
+#~ msgstr ""
+#~ " Ist das ISO-Image dennoch im Bezug auf den von Ihnen heruntergeladenen "
+#~ "Signaturschlüssel\n"
+#~ " korrekt. Um diese Warnung zu entfernen, müssen Sie den "
+#~ "Signaturschlüssel durch das \n"
+#~ " <a href=\"#wot\">OpenPGP Web of Trust authentifizieren</a>.\n"
+
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
+
+#~ msgid "<div class=\"tip\">\n"
+#~ msgstr "<div class=\"tip\">\n"
+
+#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>Tails ist im März 2015 [[zu einem neuen\n"
+#~ "Signaturschlüssel|news/signing_key_transition]] gewechselt.\n"
+#~ "Falls Sie den vorherigen Signaturschlüssel besessen haben, stellen Sie "
+#~ "sicher,\n"
+#~ "dass Sie den [[neuen Signaturschlüssel importieren und\n"
+#~ "verifizieren|news/signing_key_transition#index1h1]].</p>\n"
+
+#~ msgid ""
+#~ "We also acknowledge that not everybody might be able to create good trust "
+#~ "path to Tails signing key since it based on a network of direct human "
+#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
+#~ msgstr ""
+#~ "Wir gestehen auch ein, dass nicht alle Menschen in der Lage sein könnten, "
+#~ "einen zuverlässigen Vertrauenspfad zum Signaturschlüssel von Tails "
+#~ "aufzubauen, da es auf einem Netzwerk von direkten menschlichen "
+#~ "Beziehungen und dem Fachwissen über recht komplexe Werkzeuge wie OpenPGP "
+#~ "basiert."
+
+#~ msgid ""
+#~ "Note that since all Tails releases are signed with the same key, you will "
+#~ "not have to verify the key every time and the trust you might "
+#~ "progressively build in it will be built once and for all. Still, you will "
+#~ "have to check the ISO image every time you download a new one!"
+#~ msgstr ""
+#~ "Bitte beachten Sie, dass alle Versionen von Tails mit dem gleichen "
+#~ "Schlüssel signiert sind, weshalb Sie den Schlüssel nicht jedes Mal aufs "
+#~ "Neue verifizieren müssen und Sie das Vertrauen, welches Sie "
+#~ "möglicherweise zunehmend in ihn aufbauen, ein für alle Mal tun. Dennoch "
+#~ "werden Sie das ISO-Image jedes Mal, wenn Sie ein neues herunterladen, "
+#~ "überprüfen müssen."
+
+#~ msgid ""
+#~ "If you want to be extra cautious and really authenticate Tails signing "
+#~ "key in a stronger way than what standard HTTPS offers you, you will need "
+#~ "to use the OpenPGP Web of Trust."
+#~ msgstr ""
+#~ "Wenn Sie besonders vorsichtig sein und den Tails Signaturschlüssel "
+#~ "wirklich auf eine sicherere Weise verifizieren wollen, als es Ihnen "
+#~ "übliches HTTPS bietet, möchten, wird es nötig sein, dass Sie das OpenPGP "
+#~ "Web of Trust nutzen."
+
+#~ msgid ""
+#~ "We will present you three techniques from the easiest to the safest. "
+#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
+#~ "them according to your possibilities and technical skills."
+#~ msgstr ""
+#~ "Wir werden Ihnen drei Vorgehensweisen, von der einfachsten bis zur "
+#~ "sichersten, vorstellen. Nochmals, keine von diesen ist eine magische "
+#~ "Komplettlösung. Zögern Sie nicht, sie entsprechend Ihrer Möglichkeiten "
+#~ "und technischer Kenntnisse kennenzulernen."
diff --git a/wiki/src/install/inc/steps/download.inline.fa.po b/wiki/src/install/inc/steps/download.inline.fa.po
index fbff786..80a7188 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: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-12-03 16:30+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"
@@ -16,388 +16,1094 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. type: Content of: <div>
+msgid "0.95"
+msgstr ""
+
#. type: Content of: <h1>
-msgid "Download and verify the Tails ISO image"
+msgid ""
+"Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
-#. type: Content of: <div>
+#. type: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><div>
msgid ""
-"<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."
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
+"</a>"
msgstr ""
-#. type: Content of: <div>
-msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"<a>I already downloaded Tails <span class=\"remove-extra-space\">&nbsp;[[!"
+"inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span>."
+"</a>"
msgstr ""
-#. type: Content of: <div><p>
-msgid "Please wait…"
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div><div>
-msgid "0.2.8"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"We failed to detect your browser vendor, maybe because JavaScript is "
-"disabled."
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You can download and verify the ISO image via:"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "With an unverified download, you might:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Lose time if your download is incomplete or broken due to an error during "
+"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Browser add-on"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if our download mirrors have been compromised "
+"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
-"for <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+</a> or <a href=\"https://www.torproject.org/download/"
-"download-easy.html.en\">Tor Browser <span class=\"minver-tor\">5</span>+</a>"
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "A Firefox add-on to download and verify Tails automatically."
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if your download is modified on the fly by an "
+"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are not in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "Copy and paste this link in Firefox or Tor Browser:"
+#. type: Content of: <div>
+msgid "\"\"\"]]"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<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=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are already in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"You seem to have JavaScript disabled. To use our browser extension, please "
+"allow all this page:"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[!img screenshots/allow_js.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Install Firefox add-on</a>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "BitTorrent"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "<u>Tails Verification</u> extension installed!"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Download "
-"Torrent file</a>"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"label>"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Verifying <span id=\"filename\">$FILENAME</span>&hellip;"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You seem to be using an unsupported browser."
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"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:"
+"[[!toggleable id=\"why-failed\" text=\"\"\" [[!toggle id=\"why-failed\" text="
+"\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser and already have our "
-"Firefox add-on installed."
+"Most likely, the verification failed because of an error or interruption "
+"during the download."
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"Less likely, the verification might have failed because of a malicious "
+"download from our download mirrors or due to a network attack in your "
+"country or local network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "Downloading again is usually enough to fix this problem."
msgstr ""
-#. type: Content of: <div><div><div><a><div>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"<span class=\"label label-default state already\">Already installed</span>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
msgstr ""
-#. type: Content of: <div><div><div>
-msgid "</a>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed-again\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-failed-again\" text=\"\"\" [[!toggle id=\"why-failed-"
+"again\" text=\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "The verification might have failed again because of:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A software problem in our verification extension"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A malicious download from our download mirrors"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A network attack in your country or local network"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Trying from a different place or a different computer might solve any of "
+"these issues."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
+"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
+"span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id=\"use-text-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
+"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
+"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
+"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
+"download|upgrade/tails]]</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser but have an outdated "
-"version of our Firefox add-on."
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Update "
-"Firefox add-on</span>"
+"Firefox <span id=\"min-version-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a href=\"https://www.mozilla.org/firefox/new/\">Download</a>)"
msgstr ""
-#. type: Content of: <div><div><div><a><div>
-msgid "<span class=\"label label-default state restartless\">No restart</span>"
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<span id=\"update-button-label\" class=\"pull-left\">Update Firefox add-on</"
-"span>"
+"Tor Browser <span id=\"min-version-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a href=\"https://www.torproject.org/download/download-easy.html"
+"\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "We detected that you are running Firefox or Tor Browser."
+msgid "Please update your browser to the latest version."
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"You can download the ISO image via our Firefox add-on. The add-on verifies "
-"your download [[!toggle id=\"extension-verification\" text=\"automatically"
-"\"]]."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!toggle id=\"what-is-bittorrent\" text=\"What is BitTorrent?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div>
msgid ""
-"The verification is based on a cryptographic checksum downloaded from our "
-"website."
+"[[!toggleable id=\"what-is-bittorrent\" text=\"\"\" [[!toggle id=\"what-is-"
+"bittorrent\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
msgid ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Install Firefox add-on</span>"
+"BitTorrent is a peer-to-peer technology for file sharing that makes your "
+"download faster and easier to resume."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<span id=\"install-text-label\" class=\"pull-left\">Install Firefox add-on</"
-"span>"
+"You need to install BitTorrent software on your computer, like <a href="
+"\"https://transmissionbt.com/\">Transmission</a> (for Windows, macOS, and "
+"Linux)."
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "BitTorrent doesn't work over Tor or in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"or [[!toggle id=\"bittorrent-verification\" text=\"Download and verify via "
-"BitTorrent\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
#. type: Content of: <div><div><div>
msgid ""
-"[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id="
-"\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/"
-"bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
+"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
+"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] Torrent file</a>"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><h3>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download Torrent file</a>"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "\"\"\"]]"
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "or [[Download and verify using OpenPGP|install/download/openpgp]]"
+msgid ""
+"Open and download the Torrent file with your BitTorrent client. It contains "
+"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
+"\"]] ISO image that you will use in the next step."
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">seconds</span> <span class=\"singular\">second</span> "
-"</span> </small>"
+"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div>
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complete</span> <span class=\"progress-label\">$PROGRESS</span>"
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
msgid ""
-"<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>"
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "This section provides simplified instructions:"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
msgid ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"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>"
+"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
+"span></a>"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
msgid ""
-"<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>"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
+"a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click on the play button to resume."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#tails\">In Tails</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#command-line\">Using the command line</a>"
+msgstr ""
+
+#. type: Content of: <div>
+msgid "<a id=\"windows\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "In Windows with <span class=\"application\">Gpg4win</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"The download of the ISO image failed! Please check your network connection "
-"and click <span class=\"guilabel\">Retry</span>…"
+"See the [[<span class=\"application\">Gpg4win</span> documentation on "
+"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "Verify ISO image"
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"Verify the date of the signature to make sure that you downloaded the latest "
+"version."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "If the following warning appears:"
+msgstr ""
+
+#. type: Content of: <div><pre>
+#, no-wrap
msgid ""
-"<small id=\"verify-text-calculating\">Computing SHA-256 checksum&hellip;</"
-"small>"
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li><p>
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 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>"
+"Then the ISO image is still correct according to the signing key that you "
+"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
+"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "You downloaded and verified the ISO image successfully!"
+#. type: Content of: <div>
+msgid "<a id=\"mac\"></a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><h3>
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"You can now continue with the next step and <span class=\"windows"
-"\">[[Install an intermediary Tails|install/win/usb#next]].</span> <span "
-"class=\"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=\"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>"
+"Open <span class=\"application\">Finder</span> and navigate to the folder "
+"where you saved the ISO image and the signature."
msgstr ""
-#. type: Content of: <div><div><div><div><div><p>
+#. type: Content of: <div><ol><li>
msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the [[!toggle id=\"openpgp\" text=\"OpenPGP signature\"]]."
+"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
+"Verify Signature of File</span></span>."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
+#. type: Content of: <div>
+msgid "<a id=\"tails\"></a>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><h3>
+msgid "In Tails"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download the OpenPGP signature</a>"
+"Open the file browser and navigate to the folder where you saved the ISO "
+"image and the signature."
msgstr ""
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Download the Tails signing key|tails-signing.key]]"
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
+"With Verify Signature</span>."
msgstr ""
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Learn how to do this|install/download/openpgp]]"
+#. type: Content of: <div><ol><li>
+msgid "The verification of the ISO image starts automatically:"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Download again</a>"
+"After the verification finishes, click on the notification counter in the "
+"bottom-right corner and on the notification with a transparent background on "
+"the right of the notification area:"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div>
+msgid "<a id=\"command-line\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "Using the command line"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"The verification of the ISO image failed! Please try to download "
-"again&hellip;"
+"Open a terminal and navigate to the folder where you saved the ISO image and "
+"the signature."
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "Execute:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "The output of this command should be the following:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "If the output also includes:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: WARNING: This key is not certified with a trusted signature!"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+
+#. type: Content of: <div>
+msgid "\"\"\"]] <a id=\"wot\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "Authenticate the signing key through the OpenPGP Web of Trust"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"The verification of the ISO image failed again! Please try to download again "
-"from a different place or a different computer&hellip;"
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
msgstr ""
-#. type: Content of: outside any tag (error?)
-msgid "<a id=\"next\"></a>"
+#. type: Content of: <div><ul><li>
+msgid "The <em>checksum</em> for the Firefox extension"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Torrent file</em> for BitTorrent"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Tails signing key</em> for the OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"But, while doing so, you could download malicious information if our website "
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
+"about/warning#man-in-the-middle]]."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP verification is the only technique that allows you to verify the "
+"ISO image even better by also authenticating the Tails signing key through "
+"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
+"way to completely protect you from malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are verifying an ISO image from inside Tails already, for example to "
+"do a manual upgrade, then the Tails signing key is already included in "
+"Tails. You can trust this signing key as much as you are trusting your Tails "
+"installation already because you are not downloading it."
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "One of the inherent problems of standard HTTPS is that the trust we "
+#| "usually put on a website is defined by certificate authorities: a "
+#| "hierarchical and closed set of companies and governmental institutions "
+#| "approved by web browser vendors. This model of trust has long been "
+#| "criticized and proved several times to be vulnerable to attacks [[as "
+#| "explained on our warning page|about/warning#man-in-the-middle]]."
+msgid ""
+"One of the inherent problems of standard HTTPS is that the trust we usually "
+"put in a website is defined by certificate authorities: a hierarchical and "
+"closed set of companies and governmental institutions approved by your web "
+"browser vendor. This model of trust has long been criticized and proved "
+"several times to be vulnerable to attacks [[as explained on our warning page|"
+"doc/about/warning#man-in-the-middle]]."
+msgstr ""
+"یکی از مشکلات اصلی اچ‌تی‌تی‌پی‌اس استاندارد این است که اعتمادی که معمولاً‌ به یک "
+"تارنما می‌کنیم از طریق مراجع صور گواهی دیجیتال تعریف می‌شود: یعنی گروهی بسته و "
+"سلسله‌مراتبی از شرکت‌ها و نهادهای دولتی مورد تأیید توسعه‌دهندگان مروگرهای وب. "
+"این مدل از اعتماد مدت‌ها است که مورد انتقاد قرار گرفته و [[همان‌طور که در صفحهٔ "
+"هشدار ما آمده|about/warning#man-in-the-middle]] بارها مشخص شده که در برابر "
+"حملات آسیب‌پذیر است"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We believe instead that users should be given the final say when trusting "
+#| "a website, and that designation of trust should be done on the basis of "
+#| "human interaction."
+msgid ""
+"We believe that, instead, users should be given the final say when trusting "
+"a website, and that designation of trust should be done on the basis of "
+"human interactions."
msgstr ""
+"ما در عوض معتقدیم کاربران باید نظر نهایی در مورد اعتماد به یک تارنما را "
+"بدهند و اعتماد باید بر مبنای تعاملات انسانی باشد."
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The OpenPGP [[!wikipedia Web_of_Trust desc=\"Web of Trust\"]] is a "
+#| "decentralized trust model based on OpenPGP keys. Let's see that with an "
+#| "example."
+msgid ""
+"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
+"on OpenPGP keys that can help solving this problem. Let's see this with an "
+"example:"
+msgstr ""
+"[[!wikipedia Web_of_Trust desc=\"شبکهٔ اعتماد\"]] اُپن‌پی‌جی‌پی یک مدل اعتماد "
+"مرکززدایی‌شده بر مبنای کلیدهای اُپن‌پی‌جی‌پی است. بیایید مثالی در این مورد ببینیم."
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "*You're a friend of Alice and really trust her way of managing OpenPGP "
+#| "keys.\n"
+#| "You're trusting Alice's key.*\n"
+msgid ""
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
+"keys. So you are trusting Alice's key.</em>"
+msgstr ""
+"*شما دوست آلیس هستید و واقعاً‌ به نحوهٔ مدیریت کلیدهای اُپن‌پی‌جی‌پی از سوی اعتماد "
+"دارید.\n"
+"شما به کلید آلیس اعتماد دارید.*\n"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "*Furthermore, Alice met Bob, a Tails developer, in a conference, and "
+#| "signed\n"
+#| "Bob's key. Alice is trusting Bob's key.*\n"
+msgid ""
+"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
+"certified Bob's key. So Alice is trusting Bob's key.</em>"
+msgstr ""
+"*همین‌طور آلیس در یک کنفرانس، باب، یک برنامه‌نویس تیلز، را ملاقات\n"
+"و کلید باب را امضا کرده است. آلیس به کلید باب اعتماد دارد.*\n"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "*Bob is a Tails developer who directly owns the Tails signing key. Bob "
+#| "fully\n"
+#| "trusts Tails signing key.*\n"
+msgid ""
+"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
+"fully trusts the Tails signing key.</em>"
+msgstr ""
+"*باب یک برنامه‌نویس تیلز است که مستقیماً صاحب یک کلید امضای تیلز است.\n"
+"باب به کلید امضای تیلز اعتماد کامل دارد.*\n"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This scenario creates a trust path from you to Tails signing key that "
+#| "could allow you to trust it without having to depend on certificate "
+#| "authorities."
+msgid ""
+"In this scenario, Alice found a path to trust the Tails signing key without "
+"the need to rely on certificate authorities."
+msgstr ""
+"این روابط مسیری از اعتماد بین شما و کلید امضای تیلز ایجاد می‌کند که به شما "
+"اجازه می‌دهد بدون نیاز به اتکا به مراجع صدور گواهی دیجیتال به این کلید اعتماد "
+"کنید."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
+"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
+"Debian developers. Some Debian developers have certified the Tails signing "
+"key and you can use these certifications to build a trust path. This "
+"technique is explained in detail in our instructions on [[installing Tails "
+"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
+"usb]]."
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This trust model is not perfect either and requires both caution and "
+#| "intelligent supervision by users. The technical details of creating, "
+#| "managing and trusting OpenPGP keys is outside of the scope of this "
+#| "document."
+msgid ""
+"Relying on the Web of Trust requires both caution and intelligent "
+"supervision by the users. The technical details are outside of the scope of "
+"this document."
+msgstr ""
+"این مدل اعتماد نیز بی‌نقص نبوده و مستلزم احتیاط و نظارت هوشمندانه از سوی "
+"کاربران است. جزییات فنی ایجاد و مدیریت کلیدهای اُپن‌پی‌جی‌پی و اعتماد به آن‌ها "
+"خارج از حوصلهٔ این سند است."
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Since the Web of Trust is actually based on human relationships and real-"
+#| "life interactions the best would be to start establishing contacts with "
+#| "people knowledgeable about OpenPGP, start using it yourself and build "
+#| "trust relationships in order to find your own trust path to Tails signing "
+#| "key."
+msgid ""
+"Since the Web of Trust is actually based on human relationships and real-"
+"life interactions, the best is to get in touch with people knowledgeable "
+"about OpenPGP and build trust relationships in order to find your own trust "
+"path to the Tails signing key."
+msgstr ""
+"از آن‌جا که شبکهٔ اعتماد بر مبنای روابط انسانی و تعاملات زندگی واقعی است، "
+"بهترین کار برقراری ارتباط با افراد آشنا با اُپن‌پی‌جی‌پی، استفاده از آن توسط "
+"خودتان و ایجاد روابط اعتماد برای یافتن مسیر اعتماد خود به کلید امضای تیلز "
+"است."
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "You could start by contacting a local [[!wikipedia Linux_User_Group desc="
+#| "\"%s\"]] or other Tails enthusiasts near you and exchange about their "
+#| "OpenPGP practices."
+msgid ""
+"For example, you can start by contacting a local [[!wikipedia "
+"Linux_User_Group]], [[an organization offering Tails training|support/"
+"learn]], or other Tails enthusiasts near you and exchange about their "
+"OpenPGP practices."
+msgstr ""
+"می‌توانید این کار را با تماس گرفتن با علاقه‌مندان محلی تیلز یا [[!wikipedia "
+"Linux_User_Group desc=\"%s\"]] و مبادلهٔ کارهای اُپن‌پی‌جی‌پی آن‌ها آغاز کنید."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"After you build a trust path, you can certify the Tails signing key by "
+"signing it with your own key to get rid of some warnings during the "
+"verification process."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| "Note that since all Tails releases are signed with the same key, you "
+#~| "will not have to verify the key every time and the trust you might "
+#~| "progressively build in it will be built once and for all. Still, you "
+#~| "will have to check the ISO image every time you download a new one!"
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "توجه داشته باشید از آن‌جا که تمام نسخه‌های تیلز با کلید مشابه امضاء شده‌اند "
+#~ "لازم نیست هر بار نیازی به تأیید کلید نیست و اعتمادی که ممکن است به مرور "
+#~ "به آن پیدا کنید، یک بار برای همیشه در دسترس است. با این‌حال باید هر بار که "
+#~ "فایل ایزوی جدید دانلود می‌کنید، آن را بررسی کنید."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "منابع مطالعاتی بیشتر در مورد اُپن‌پی‌جی‌پی"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]]، یک نرم‌افزار آزاد اُپن‌پی‌جی‌پی"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr ""
+#~ "[[آپاچی: چگونگی استفاده از اُپن‌پی‌جی‌پی|http://www.apache.org/dev/openpgp."
+#~ "html]]"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[دبیان: امضای کلید|http://www.debian.org/events/keysigning]]، آموزش "
+#~ "کلیدهای امضای افراد دیگر"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: توضیح شبکهٔ اعتماد اُپن‌پی‌جی‌پی|http://www.rubin.ch/pgp/"
+#~ "weboftrust.en.html]]"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: بازرسی گواهی|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]]، راهنمایی برای مدیریت کلیدها با Gpg4win"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>Tails [[transitioned to a new signing\n"
+#~| "key|news/signing_key_transition]] between Tails 1.3 (February 24) and\n"
+#~| "Tails 1.3.1 (March 31). If you had the previous signing key, make sure\n"
+#~| "to [[import and verify the new signing\n"
+#~| "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>تیلز [[به یک کلید امضای جدید منتقل\n"
+#~ "می‌شود|news/signing_key_transition]]. این انتقال بین تیلز ۱٫۳ (۲۴ فوریه)\n"
+#~ "و تیلز ۱٫۳٫۱ (۳۱ مارس) انجام می‌شود. اگر کلید امضای قبلی را داشتید مطمئن "
+#~ "شوید که\n"
+#~ "[[کلید امضای جدید را وارد و تأیید\n"
+#~ "می‌کنید|news/signing_key_transition#index1h1]].</p>\n"
+
+#~ msgid "<!-- l10n placeholder for language-specific link -->"
+#~ msgstr "<!-- l10n placeholder for language-specific link -->"
+
+#~ msgid ""
+#~ "We also acknowledge that not everybody might be able to create good trust "
+#~ "path to Tails signing key since it based on a network of direct human "
+#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
+#~ msgstr ""
+#~ "ما همچنین تصدیق می‌کنیم که هر کسی ممکن است بتواند یک مسیر اعتماد خوب به "
+#~ "کلید امضای تیلز ایجاد کند، چرا که این مسیر بر مبنای ارتباطات مستقیم "
+#~ "انسانی و دانش ابزارهای بسیار پیچیده‌ای مانند اُپن‌پی‌جی‌پی است."
+
+#~ msgid ""
+#~ "Note that since all Tails releases are signed with the same key, you will "
+#~ "not have to verify the key every time and the trust you might "
+#~ "progressively build in it will be built once and for all. Still, you will "
+#~ "have to check the ISO image every time you download a new one!"
+#~ msgstr ""
+#~ "توجه داشته باشید از آن‌جا که تمام نسخه‌های تیلز با کلید مشابه امضاء شده‌اند "
+#~ "لازم نیست هر بار نیازی به تأیید کلید نیست و اعتمادی که ممکن است به مرور "
+#~ "به آن پیدا کنید، یک بار برای همیشه در دسترس است. با این‌حال باید هر بار که "
+#~ "فایل ایزوی جدید دانلود می‌کنید، آن را بررسی کنید."
+
+#~ msgid ""
+#~ "If you want to be extra cautious and really authenticate Tails signing "
+#~ "key in a stronger way than what standard HTTPS offers you, you will need "
+#~ "to use the OpenPGP Web of Trust."
+#~ msgstr ""
+#~ "اگر می‌خواهید خیلی محتاط باشید و از روشی قوی‌تر از چیزی که اچ‌تی‌تی‌پی‌اس "
+#~ "استاندارد در اختیارتان می‌گذارد کاملاً‌ از صحت کلید امضای تیلز مطمئن شوید، "
+#~ "باید از شبکهٔ اعتماد اُپن‌پی‌جی‌پی استفاده کنید."
+
+#~ msgid ""
+#~ "We will present you three techniques from the easiest to the safest. "
+#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
+#~ "them according to your possibilities and technical skills."
+#~ msgstr ""
+#~ "سه شگرد به ترتیب ساده‌ترین تا امن‌ترین را به شما معرفی می‌کنیم. باز هم باید "
+#~ "در نظر داشت که هیچ کدام از این راه‌حل‌ها بی‌نقص و جادویی نیستند. می‌توانید "
+#~ "بسته به امکانات و توانایی‌های فنی خود این شگردها را بررسی کنید."
diff --git a/wiki/src/install/inc/steps/download.inline.fr.po b/wiki/src/install/inc/steps/download.inline.fr.po
index c41d63d..1b38d4e 100644
--- a/wiki/src/install/inc/steps/download.inline.fr.po
+++ b/wiki/src/install/inc/steps/download.inline.fr.po
@@ -5,543 +5,1265 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2017-06-17 12:08+0000\n"
-"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:30+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"
-"X-Generator: Poedit 1.8.11\n"
+
+#. type: Content of: <div>
+msgid "0.95"
+msgstr ""
#. type: Content of: <h1>
-msgid "Download and verify the Tails ISO image"
-msgstr "Télécharger et vérifier l'image ISO de Tails"
+msgid ""
+"Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort="
+"\"age\"]]"
+msgstr ""
-#. type: Content of: <div>
+#. type: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw="
+#| "\"yes\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages="
+#| "\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> "
+#| "(<span class=\"remove-extra-space\">[[!inline pages=\"inc/"
+#| "stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)."
msgid ""
-"<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."
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
+"</a>"
msgstr ""
-"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">À "
-"cette étape vous</span> <span class=\"download-only\">Vous</span> devez "
-"télécharger l'image ISO de Tails : un simple fichier contenant la totalité "
-"du système d'exploitation. Pour votre sécurité, il est très important de "
-"vérifier également ce que vous avez téléchargé. Nous vous proposons deux "
-"techniques pour faire cette vérification automatiquement."
+"Téléchargez l'<a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\">image ISO de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]]</a> (<span class=\"remove-extra-space\">"
+"[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)."
-#. type: Content of: <div>
-msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"<a>I already downloaded Tails <span class=\"remove-extra-space\">&nbsp;[[!"
+"inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span>."
+"</a>"
+msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <div><p>
-msgid "Please wait…"
-msgstr "Veuillez patienter…"
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+msgstr ""
-#. type: Content of: <div><div>
-msgid "0.2.8"
-msgstr "0.2.8"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
+msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"We failed to detect your browser vendor, maybe because JavaScript is "
-"disabled."
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-"Nous n'avons pas réussi à détecter le type de votre navigateur, peut-être "
-"parce que JavaScript est désactivé."
-#. type: Content of: <div><div><p>
-msgid "You can download and verify the ISO image via:"
-msgstr "Vous pouvez télécharger et vérifier l'image ISO avec :"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "With an unverified download, you might:"
+msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Browser add-on"
-msgstr "Module complémentaire pour navigateur"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Lose time if your download is incomplete or broken due to an error during "
+"the download. This is quite frequent."
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
-"for <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+</a> or <a href=\"https://www.torproject.org/download/"
-"download-easy.html.en\">Tor Browser <span class=\"minver-tor\">5</span>+</a>"
+"Get hacked while using Tails if our download mirrors have been compromised "
+"and are serving malicious downloads."
msgstr ""
-"pour <a href=\"https://www.mozilla.org/fr/firefox/new/\">Firefox <span class="
-"\"minver-firefox\">38.0.1</span>+</a> ou <a href=\"https://www.torproject."
-"org/download/download-easy.html.en\">Navigateur Tor <span class=\"minver-tor"
-"\">5</span>+</a>"
-#. type: Content of: <div><div><div><div><p>
-msgid "A Firefox add-on to download and verify Tails automatically."
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
msgstr ""
-"Un module complémentaire Firefox pour télécharger et vérifier Tails "
-"automatiquement."
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are not in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if your download is modified on the fly by an "
+"attacker on the network."
msgstr ""
-"<strong>Si vous n'êtes pas dans Firefox ou dans le Navigateur Tor :</strong>"
-#. type: Content of: <div><div><div><div><p>
-msgid "Copy and paste this link in Firefox or Tor Browser:"
-msgstr "Copiez et collez ce lien dans Firefox ou dans le Navigateur Tor :"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<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>"
-msgstr ""
-"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/index."
-"fr.html</code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/"
-"install/mac/usb/index.fr.html</code></span> <span class=\"mac-dvd"
-"\"><code>https://tails.boum.org/install/mac/dvd/index.fr.html</code></span> "
-"<span class=\"debian\"><code>https://tails.boum.org/install/debian/usb/index."
-"fr.html</code></span> <span class=\"linux\"><code>https://tails.boum.org/"
-"install/linux/usb/index.fr.html</code></span> <span class=\"upgrade-tails"
-"\"><code>https://tails.boum.org/upgrade/tails/index.fr.html</code></span> "
-"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/index.fr.html</"
-"code></span> <span class=\"vm\"><code>https://tails.boum.org/install/vm/"
-"index.fr.html</code></span> <span class=\"download-only\"><code>https://"
-"tails.boum.org/install/download/index.fr.html</code></span>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are already in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"You seem to have JavaScript disabled. To use our browser extension, please "
+"allow all this page:"
msgstr ""
-"<strong>Si vous êtes déjà dans Firefox ou dans le Navigateur Tor :</strong>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[!img screenshots/allow_js.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Install Firefox add-on</a>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Installer le module complémentaire Firefox</a>"
-#. type: Content of: <div><div><div><div><h2>
-msgid "BitTorrent"
-msgstr "BitTorrent"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "<u>Tails Verification</u> extension installed!"
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Download "
-"Torrent file</a>"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"label>"
msgstr ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Télécharger "
-"le fichier Torrent</a>"
-#. type: Content of: <div><div><p>
-msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Verifying <span id=\"filename\">$FILENAME</span>&hellip;"
msgstr ""
-"[[Télécharger et vérifier en utilisant OpenPGP|install/download/openpgp]]"
-#. type: Content of: <div><div><p>
-msgid "You seem to be using an unsupported browser."
-msgstr "Il semble que vous utilisez un navigateur non supporté."
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"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:"
+"[[!toggleable id=\"why-failed\" text=\"\"\" [[!toggle id=\"why-failed\" text="
+"\"X\"]]"
msgstr ""
-"Vous utilisez Firefox <span class=\"current-firefox\">1.0</span>. Merci de "
-"mettre à jour vers Firefox <span class=\"minver-firefox\">38.0.1</span>, le "
-"Navigateur Tor <span class=\"minver-tor\">5</span> ou plus récent et visitez "
-"ce lien :"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser and already have our "
-"Firefox add-on installed."
+"Most likely, the verification failed because of an error or interruption "
+"during the download."
msgstr ""
-"Nous détectons que vous utilisez Firefox ou le Navigateur Tor et que vous "
-"avez déjà notre module complémentaire Firefox installé."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"Less likely, the verification might have failed because of a malicious "
+"download from our download mirrors or due to a network attack in your "
+"country or local network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "Downloading again is usually enough to fix this problem."
msgstr ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Utiliser le module "
-"complémentaire Firefox</span>"
-#. type: Content of: <div><div><div><a><div>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"<span class=\"label label-default state already\">Already installed</span>"
-msgstr "<span class=\"label label-default state already\">Déjà installé</span>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
+msgstr ""
-#. type: Content of: <div><div><div>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed-again\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-failed-again\" text=\"\"\" [[!toggle id=\"why-failed-"
+"again\" text=\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "The verification might have failed again because of:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A software problem in our verification extension"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A malicious download from our download mirrors"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A network attack in your country or local network"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Trying from a different place or a different computer might solve any of "
+"these issues."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
+"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
+"span>"
+msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id=\"use-text-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
+"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
+"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
+"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
+"download|upgrade/tails]]</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
-"<span id=\"use-text-label\" class=\"pull-left\">Utiliser le module "
-"complémentaire Firefox</span>"
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Fait\"]]</span>"
#. type: Content of: <div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser but have an outdated "
-"version of our Firefox add-on."
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
msgstr ""
-"Nous détectons que vous utilisez Firefox ou le Navigateur Tor mais avec une "
-"version obsolète du module complémentaire Firefox."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Update "
-"Firefox add-on</span>"
+"Firefox <span id=\"min-version-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a href=\"https://www.mozilla.org/firefox/new/\">Download</a>)"
msgstr ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Mettre à "
-"jour le module complémentaire Firefox</span>"
-#. type: Content of: <div><div><div><a><div>
-msgid "<span class=\"label label-default state restartless\">No restart</span>"
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
-"<span class=\"label label-default state restartless\">Pas de redémarrage</"
-"span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<span id=\"update-button-label\" class=\"pull-left\">Update Firefox add-on</"
-"span>"
+"Tor Browser <span id=\"min-version-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a href=\"https://www.torproject.org/download/download-easy.html"
+"\">Download</a>)"
msgstr ""
-"<span id=\"update-button-label\" class=\"pull-left\">Mettre à jour le module "
-"complémentaire Firefox</span>"
#. type: Content of: <div><div><div><p>
-msgid "We detected that you are running Firefox or Tor Browser."
-msgstr "Nous détectons que vous utilisez Firefox ou le Navigateur Tor."
+msgid "Please update your browser to the latest version."
+msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"You can download the ISO image via our Firefox add-on. The add-on verifies "
-"your download [[!toggle id=\"extension-verification\" text=\"automatically"
-"\"]]."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
-"Vous pouvez télécharger l'image ISO avec notre module complémentaire "
-"Firefox. Le module complémentaire vérifie ce que vous avez téléchargé [[!"
-"toggle id=\"extension-verification\" text=\"automatiquement\"]]."
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
msgstr ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!toggle id=\"what-is-bittorrent\" text=\"What is BitTorrent?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div>
msgid ""
-"The verification is based on a cryptographic checksum downloaded from our "
-"website."
+"[[!toggleable id=\"what-is-bittorrent\" text=\"\"\" [[!toggle id=\"what-is-"
+"bittorrent\" text=\"X\"]]"
msgstr ""
-"La vérification se base sur une somme de contrôle cryptographique "
-"téléchargée depuis notre site web."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
msgid ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Install Firefox add-on</span>"
+"BitTorrent is a peer-to-peer technology for file sharing that makes your "
+"download faster and easier to resume."
msgstr ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Installer le module complémentaire Firefox</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<span id=\"install-text-label\" class=\"pull-left\">Install Firefox add-on</"
-"span>"
+"You need to install BitTorrent software on your computer, like <a href="
+"\"https://transmissionbt.com/\">Transmission</a> (for Windows, macOS, and "
+"Linux)."
msgstr ""
-"<span id=\"install-text-label\" class=\"pull-left\">Installer le module "
-"complémentaire Firefox</span>"
#. type: Content of: <div><div><div><p>
+msgid "BitTorrent doesn't work over Tor or in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"or [[!toggle id=\"bittorrent-verification\" text=\"Download and verify via "
-"BitTorrent\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-"ou [[!toggle id=\"bittorrent-verification\" text=\"Télécharger et vérifier "
-"avec BitTorrent\"]]"
#. type: Content of: <div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
msgid ""
-"[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id="
-"\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/"
-"bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id=\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/bittorrent_verification.inline.fr\" raw=\"yes\" sort=\"age\"]]"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
+"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
+"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] Torrent file</a>"
+msgstr ""
+"Téléchargez la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'>signature OpenPGP de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a> et sauvegardez-la dans "
+"le dossier où vous avez enregistré l'image ISO."
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><h3>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download Torrent file</a>"
-msgstr "<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort=\"age\"]]'>Télécharger le fichier Torrent</a>"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr "\"\"\"]]"
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
+msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "or [[Download and verify using OpenPGP|install/download/openpgp]]"
+msgid ""
+"Open and download the Torrent file with your BitTorrent client. It contains "
+"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
+"\"]] ISO image that you will use in the next step."
msgstr ""
-"ou [[Télécharger et vérifier en utilisant OpenPGP|install/download/openpgp]]"
-#. type: Content of: <div><div>
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Télécharger l'image ISO de Tails <span class=\"iso-version\">[[!inline "
-"pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> <small "
-"id=\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
-#. type: Content of: <div><div><div><div><div>
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">seconds</span> <span class=\"singular\">second</span> "
-"</span> </small>"
-msgstr ""
-"Télécharger l'image ISO de Tails <span class=\"iso-version\">[[!inline pages="
-"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> Ko/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">secondes</span> <span class=\"singular\">seconde</"
-"span> </span> </small>"
+"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
+msgstr ""
+"Téléchargez la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'>signature OpenPGP de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a> et sauvegardez-la dans "
+"le dossier où vous avez enregistré l'image ISO."
-#. type: Content of: <div><div><div><div><div><div>
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complete</span> <span class=\"progress-label\">$PROGRESS</span>"
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complété</span> <span class=\"progress-label\">$PROGRESS</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
msgid ""
-"<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>"
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-"<small id=\"download-path\">Téléchargement dans <span class=\"download-path"
-"\">$PATH</span></small> <small id=\"downloaded-path\">Téléchargé dans <span "
-"class=\"verify-file-path\">$PATH</span></small>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "This section provides simplified instructions:"
+msgstr "Cette section contient des instructions simplifiées :"
+
+#. type: Content of: <div><ul><li>
msgid ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"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>"
+"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
+"span></a>"
msgstr ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Réessayer</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=\"Reprendre\"]]</span> <span id=\"download-button-state-"
-"cancel\" class=\"btn btn-link\">Annuler</span>"
+"<a href=\"#windows\">Pour Windows avec <span class=\"application\">Gpg4win</"
+"span></a>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
msgid ""
-"<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>"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
+"a>"
msgstr ""
-"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
-"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
-"\"Fait\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
-"install/inc/icons/failed.png link=\"no\" alt=\"Échec\"]]</span>"
+"<a href=\"#mac\">Pour macOS avec <span class=\"application\">GPGTools</"
+"span></a>"
-#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click on the play button to resume."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#tails\">In Tails</a>"
+msgstr "<a href=\"#tails\">Pour Tails</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#command-line\">Using the command line</a>"
+msgstr "<a href=\"#command-line\">En utilisant la ligne de commande</a>"
+
+#. type: Content of: <div>
+msgid "<a id=\"windows\"></a>"
+msgstr "<a id=\"windows\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In Windows with <span class=\"application\">Gpg4win</span>"
+msgstr "Pour Windows avec <span class=\"application\">Gpg4win</span>"
+
+#. type: Content of: <div><p>
+msgid ""
+"See the [[<span class=\"application\">Gpg4win</span> documentation on "
+"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
msgstr ""
-"Le téléchargement a été mis en pause. Cliquez sur le bouton lecture pour "
-"reprendre."
+"Voir la documentation de [[<span class=\"application\">Gpg4win</span> sur la "
+"vérification des signatures|http://www.gpg4win.org/doc/en/gpg4win-"
+"compendium_24.html#id4]] (en anglais)."
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"The download of the ISO image failed! Please check your network connection "
-"and click <span class=\"guilabel\">Retry</span>…"
+"Verify the date of the signature to make sure that you downloaded the latest "
+"version."
msgstr ""
-"Le téléchargement de l'image ISO a échoué ! Veuillez vérifier votre "
-"connexion réseau et cliquer sur <span class=\"guilabel\">Réessayer</span>…"
+"Vérifiez la date de la signature pour vous assurer que vous avez téléchargé "
+"la dernière version."
-#. type: Content of: <div><div><div><div><div>
-msgid "Verify ISO image"
-msgstr "Vérification de l'image ISO"
+#. type: Content of: <div><p>
+msgid "If the following warning appears:"
+msgstr "Si l'avertissement suivant apparaît :"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><pre>
+#, no-wrap
msgid ""
-"<small id=\"verify-text-calculating\">Computing SHA-256 checksum&hellip;</"
-"small>"
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
msgstr ""
-"<small id=\"verify-text-calculating\">Calcul de la somme de contrôle "
-"SHA-256&hellip;</small>"
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li><p>
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 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>"
+"Then the ISO image is still correct according to the signing key that you "
+"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
+"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
-"<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 done\">[[!img install/"
-"inc/icons/check.png link=\"no\" alt=\"Fait\"]]</span> <span id=\"verify-text-"
-"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
-"link=\"no\" alt=\"Échec\"]]</span>"
+"Alors l'image ISO est tout de même correctement signée par la clé que vous "
+"avez téléchargé. Pour supprimer cet avertissement vous devez <a href=\"#wot"
+"\">authentifier la clé de signature via la Toile de Confiance OpenPGP</a>."
-#. type: Content of: <div><div><div><div><p>
-msgid "You downloaded and verified the ISO image successfully!"
-msgstr "Vous avez téléchargé et vérifié l'image ISO avec succès !"
+#. type: Content of: <div>
+msgid "<a id=\"mac\"></a>"
+msgstr "<a id=\"mac\"></a>"
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><h3>
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr "Pour macOS en utilisant <span class=\"application\">GPGTools</span>"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"You can now continue with the next step and <span class=\"windows"
-"\">[[Install an intermediary Tails|install/win/usb#next]].</span> <span "
-"class=\"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=\"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 ""
-"Vous pouvez maintenant continuer à la prochaine étape et <span class="
-"\"windows\">[[Installer un Tails intermédiaire|install/win/usb#next]].</"
-"span> <span class=\"mac-usb\">[[Installer un Tails intermédiaire|install/mac/"
-"usb#next]].</span> <span class=\"mac-dvd\">[[Graver un DVD Tails|install/mac/"
-"dvd#next]].</span> <span class=\"debian\">[[Installer l'<span class="
-"\"application\">Installeur de Tails</span>|install/debian/usb#next]].</span> "
-"<span class=\"linux\">[[Installer un Tails intermédiaire|install/linux/"
-"usb#next]].</span> <span class=\"upgrade-tails\">[[Installer un Tails "
-"intermédiaire|upgrade/tails#next]].</span> <span class=\"dvd\">[[Graver "
-"Tails sur un DVD|install/dvd#next]].</span> <span class=\"vm\">lire notre "
-"[[Introduction aux machines virtuelles|install/vm#next]].</span>"
+"Open <span class=\"application\">Finder</span> and navigate to the folder "
+"where you saved the ISO image and the signature."
+msgstr ""
+"Ouvrez <span class=\"application\">Finder</span> et naviguez jusqu'au "
+"dossier où vous avez enregistré l'image ISO et la signature."
-#. type: Content of: <div><div><div><div><div><p>
-msgid "If you are knowledgeable about OpenPGP, you can do additional verification using the [[!toggle id=\"openpgp\" text=\"OpenPGP signature\"]]."
-msgstr "Si vous avez l'habitude d'OpenPGP, vous pouvez également vérifier en utilisant la [[!toggle id=\"openpgp\" text=\"signature OpenPGP\"]]."
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
+"Verify Signature of File</span></span>."
+msgstr ""
+"Faites un clic droit sur l'image ISO puis sur <span class=\"guimenuchoice\"> "
+"<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+"\">OpenPGP: Verify Signature of File</span></span>."
-#. type: Content of: <div><div><div><div><div>
-msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
-msgstr "[[!toggleable id=\"openpgp\" text=\"\"\""
+#. type: Content of: <div>
+msgid "<a id=\"tails\"></a>"
+msgstr "<a id=\"tails\"></a>"
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><h3>
+msgid "In Tails"
+msgstr "Pour Tails"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download the OpenPGP signature</a>"
-msgstr "<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]'>Télécharger la signature OpenPGP</a>"
+"Open the file browser and navigate to the folder where you saved the ISO "
+"image and the signature."
+msgstr ""
+"Ouvrez le navigateur de fichier et naviguez jusqu'au dossier où vous avez "
+"enregistré l'image ISO et la signature."
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Download the Tails signing key|tails-signing.key]]"
-msgstr "[[Télécharger la clé de signature de Tails|tails-signing.key]]"
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
+"With Verify Signature</span>."
+msgstr ""
+"Faites un clic droit sur la signature puis sur <span class=\"guimenuitem"
+"\">Ouvrir avec Vérifier la signature</span>."
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Learn how to do this|install/download/openpgp]]"
-msgstr "[[Apprendre à le faire|install/download/openpgp]]"
+#. type: Content of: <div><ol><li>
+msgid "The verification of the ISO image starts automatically:"
+msgstr "La vérification de l'image ISO démarre automatiquement :"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Download again</a>"
+"After the verification finishes, click on the notification counter in the "
+"bottom-right corner and on the notification with a transparent background on "
+"the right of the notification area:"
msgstr ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Télécharger à nouveau</a>"
+"Une fois la vérification terminée, cliquez sur le compteur de notification "
+"dans l'angle en bas à droite puis sur la notification avec un fond "
+"transparent à droite de la zone de notification :"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div>
+msgid "<a id=\"command-line\"></a>"
+msgstr "<a id=\"command-line\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Using the command line"
+msgstr "En ligne de commande"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"The verification of the ISO image failed! Please try to download "
-"again&hellip;"
+"Open a terminal and navigate to the folder where you saved the ISO image and "
+"the signature."
msgstr ""
-"La vérification de l'image ISO a échoué ! Veuillez réessayer le "
-"téléchargement&hellip;"
+"Ouvrez un terminal et naviguez jusqu'au dossier où vous avez enregistré "
+"l'image ISO et la signature."
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "Execute:"
+msgstr "Exécutez la commande :"
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+msgid "The output of this command should be the following:"
+msgstr "La sortie de cette commande devrait être :"
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"The verification of the ISO image failed again! Please try to download again "
-"from a different place or a different computer&hellip;"
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
-"La vérification de l'image ISO a échoué à nouveau ! Veuillez réessayer à "
-"nouveau depuis un autre endroit ou sur un autre ordinateur&hellip;"
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
-#. type: Content of: outside any tag (error?)
-msgid "<a id=\"next\"></a>"
-msgstr "<a id=\"next\"></a>"
+#. type: Content of: <div><ol><li><p>
+msgid "If the output also includes:"
+msgstr "Si la sortie inclut aussi :"
-#~ msgid "0.2.7rc55"
-#~ msgstr "0.2.7rc55"
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: WARNING: This key is not certified with a trusted signature!"
+msgstr "gpg: WARNING: This key is not certified with a trusted signature!"
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+"gpg: There is no indication that the signature belongs to the owner."
+
+#. type: Content of: <div>
+#, fuzzy
+#| msgid "<a id=\"wot\"></a>"
+msgid "\"\"\"]] <a id=\"wot\"></a>"
+msgstr "<a id=\"wot\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Authenticate the signing key through the OpenPGP Web of Trust"
+msgstr "Authentifier la clé de signature via la Toile de Confiance OpenPGP"
+
+#. type: Content of: <div><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The verification techniques presented until now ([[Firefox extension, "
+#| "BitTorrent|install/download]], or OpenPGP verification) all rely on some "
+#| "information being securely downloaded using HTTPS from our website:"
+msgid ""
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
+msgstr ""
+"Les techniques de vérifications présentées jusqu'à maintenant ([[le module "
+"complémentaire pour Firefox, BitTorrent|install/download]] et la "
+"vérification OpenPGP) dépendent toutes d'informations téléchargées de "
+"manière sécurisée via HTTPS depuis notre site web :"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>checksum</em> for the Firefox extension"
+msgstr "La <em>somme de contrôle</em> pour l'extension Firefox"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Torrent file</em> for BitTorrent"
+msgstr "Le <em>fichier Torrent</em> pour BitTorrent"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Tails signing key</em> for the OpenPGP verification"
+msgstr "La <em>clé de signature de Tails</em> pour la vérification OpenPGP"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "But, while doing so, you could download malicious information if our "
+#| "website is compromised or if you are victim of a [[man-in-the-middle "
+#| "attack|doc/about/warning#man-in-the-middle]]."
+msgid ""
+"But, while doing so, you could download malicious information if our website "
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
+"about/warning#man-in-the-middle]]."
+msgstr ""
+"Mais, si notre site web était compromis ou que vous étiez victime d'une "
+"[[attaque de l'homme du milieu|doc/about/warning#man-in-the-middle]] vous "
+"pourriez télécharger des informations malveillantes."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP verification is the only technique that allows you to verify the "
+"ISO image even better by also authenticating the Tails signing key through "
+"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
+"way to completely protect you from malicious downloads."
+msgstr ""
+"La vérification OpenPGP est la seule méthode qui vous permet une "
+"vérification encore plus poussée de l'image ISO en authentifiant aussi la "
+"clé de signature de Tails via la Toile de Confiance OpenPGP. Se fier à la "
+"Toile de Confiance OpenPGP est la seule manière de vous protéger "
+"complètement des téléchargements malveillants."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are verifying an ISO image from inside Tails already, for example to "
+"do a manual upgrade, then the Tails signing key is already included in "
+"Tails. You can trust this signing key as much as you are trusting your Tails "
+"installation already because you are not downloading it."
+msgstr ""
+"Si vous vérifiez l'image ISO depuis Tails, par exemple pour faire une mise à "
+"jour manuelle, la clé de signature de Tails est déjà fournie. Vous pouvez "
+"avoir confiance en cette clé autant qu'en votre installation de Tails."
+
+#. type: Content of: <div><p>
+msgid ""
+"One of the inherent problems of standard HTTPS is that the trust we usually "
+"put in a website is defined by certificate authorities: a hierarchical and "
+"closed set of companies and governmental institutions approved by your web "
+"browser vendor. This model of trust has long been criticized and proved "
+"several times to be vulnerable to attacks [[as explained on our warning page|"
+"doc/about/warning#man-in-the-middle]]."
+msgstr ""
+"Un problème inhérent au standard HTTPS est le fait que la confiance "
+"généralement accordée à un site web est définie par des autorités de "
+"certification : un ensemble fermé et hiérarchique d'entreprises et "
+"d'institutions gouvernementales approuvées par le fabricant de votre "
+"navigateur. La critique de ce modèle de confiance a été faite depuis "
+"longtemps et il a été montré de nombreuses fois qu'il était sujet à "
+"certaines attaques [[comme expliqué dans notre page d'avertissements|doc/"
+"about/warning#man-in-the-middle]]."
+
+#. type: Content of: <div><p>
+msgid ""
+"We believe that, instead, users should be given the final say when trusting "
+"a website, and that designation of trust should be done on the basis of "
+"human interactions."
+msgstr ""
+"Nous pensons plutôt que le dernier mot, lorsqu'il s'agit de faire confiance "
+"à un site web, doit revenir aux individus et que la construction de la "
+"confiance devrait être basée sur des relations humaines."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
+"on OpenPGP keys that can help solving this problem. Let's see this with an "
+"example:"
+msgstr ""
+"La [[!wikipedia_fr Toile_de_confiance desc=\"Toile de Confiance\"]] OpenPGP "
+"est un modèle de confiance décentralisé basé sur les clés OpenPGP. Voyons ça "
+"avec un exemple :"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<em>You are friend with Alice and really trust her way of managing "
+#| "OpenPGP keys. So you are trusting Alice's key.</em>"
+msgid ""
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
+"keys. So you are trusting Alice's key.</em>"
+msgstr ""
+"<em>Vous êtes un ami d'Alice et lui faites vraiment confiance quant à sa "
+"manière de gérer les clés OpenPGP. Vous avez confiance dans la clé d'Alice.</"
+"em>"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
+"certified Bob's key. So Alice is trusting Bob's key.</em>"
+msgstr ""
+"<em>De plus, Alice a rencontré Bob, un développeur de Tails, lors d'une "
+"conférence et a signé sa clé. Alice a confiance dans la clé de Bob.</em>"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
+"fully trusts the Tails signing key.</em>"
+msgstr ""
+"<em>Bob est un développeur de Tails qui possède la clé de signature de "
+"Tails. Bob a pleinement confiance dans la clé de signature de Tails.</em>"
+
+#. type: Content of: <div><p>
+msgid ""
+"In this scenario, Alice found a path to trust the Tails signing key without "
+"the need to rely on certificate authorities."
+msgstr ""
+"Dans ce scénario, Alice a trouvé un chemin de confiance jusqu'à la clé de "
+"signature de Tails sans avoir besoin d'autorités de certification."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
+"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
+"Debian developers. Some Debian developers have certified the Tails signing "
+"key and you can use these certifications to build a trust path. This "
+"technique is explained in detail in our instructions on [[installing Tails "
+"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
+"usb]]."
+msgstr ""
+"Si vous utilisez Debian, Ubuntu ou Linux Mint, vous pouvez installer le "
+"paquet <code>debian-keyring</code> qui contient les clés OpenPGP de tous les "
+"développeurs Debian. Certains développeurs Debian ont certifié la clé de "
+"signature de Tails, vous pouvez donc utiliser ces certifications pour "
+"construire un chemin de confiance. Cette méthode est expliquée en détail "
+"dans nos instructions sur [[installer Tails depuis Debian, Ubuntu ou Linux "
+"Mint en ligne de commande|install/expert/usb]]."
+
+#. type: Content of: <div><p>
+msgid ""
+"Relying on the Web of Trust requires both caution and intelligent "
+"supervision by the users. The technical details are outside of the scope of "
+"this document."
+msgstr ""
+"Se fier à la Toile de Confiance demande à la fois prudence et intelligence "
+"de la part des personnes l'utilisant. Les détails techniques sont au-delà de "
+"la portée de ce document."
+
+#. type: Content of: <div><p>
+msgid ""
+"Since the Web of Trust is actually based on human relationships and real-"
+"life interactions, the best is to get in touch with people knowledgeable "
+"about OpenPGP and build trust relationships in order to find your own trust "
+"path to the Tails signing key."
+msgstr ""
+"La toile de confiance étant basée sur des relations humaines et des "
+"interactions dans la vraie vie, le mieux serait d'entrer en contact avec des "
+"personnes s'y connaissant en OpenPGP et de construire des liens de confiance "
+"afin de vous frayer votre propre chemin de confiance jusqu'à la clé de "
+"signature de Tails."
+
+#. type: Content of: <div><p>
+msgid ""
+"For example, you can start by contacting a local [[!wikipedia "
+"Linux_User_Group]], [[an organization offering Tails training|support/"
+"learn]], or other Tails enthusiasts near you and exchange about their "
+"OpenPGP practices."
+msgstr ""
+"Vous pourriez commencer par prendre contact avec un [[!wikipedia_fr "
+"Groupe_d'utilisateurs_Linux]], [[une organisation proposant des formations à "
+"propos de Tails|support/learn]] ou d'autres amis de Tails proches de chez "
+"vous et échanger à propos de leurs pratiques d'OpenPGP."
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "After you built a trust path, you can certify the Tails signing key by "
+#| "signing it with your own key to get rid of some warnings during the "
+#| "verification process."
+msgid ""
+"After you build a trust path, you can certify the Tails signing key by "
+"signing it with your own key to get rid of some warnings during the "
+"verification process."
+msgstr ""
+"Après avoir construit un chemin de confiance, vous pouvez certifier la clé "
+"de signature Tails en la signant avec votre propre clé pour vous débarrasser "
+"des avertissements durant le processus de vérification."
+
+#~ msgid "Download and verify using OpenPGP"
+#~ msgstr "Télécharger et vérifier avec OpenPGP"
+
+#~ msgid ""
+#~ "These instructions are for people who are already familiar with basic "
+#~ "usage of OpenPGP and have <em>GPG</em> installed but might need guidance "
+#~ "on performing the verification."
+#~ msgstr ""
+#~ "Ces instructions sont destinées aux personnes étant déjà familières avec "
+#~ "OpenPGP et ayant déjà <em>GPG</em> installé mais pouvant avoir besoin "
+#~ "d'aide pour effectuer la vérification."
+
+#~ msgid ""
+#~ "If you are not familiar with OpenPGP, download using either [[our Firefox "
+#~ "extension or BitTorrent|install/download]] instead."
+#~ msgstr ""
+#~ "Si vous n'avez pas l'habitude d'OpenPGP, téléchargez plutôt en utilisant "
+#~ "soit [[notre module complémentaire Firefox soit BitTorrent|install/"
+#~ "download]]."
+
+#~ msgid ""
+#~ "If you are doing the verification for the first time, download the "
+#~ "[[Tails signing key|tails-signing.key]] and import it in your keyring. "
+#~ "If you are working from Tails, the signing key is already included."
+#~ msgstr ""
+#~ "Si vous faites cette vérification pour la première fois, téléchargez la "
+#~ "[[clé de signature de Tails|tails-signing.key]] et importez-la dans votre "
+#~ "trousseau de clés. Si vous travaillez depuis Tails, la clé de signature "
+#~ "est déjà inclue."
+
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Toutes les images ISO sont signées avec la même clé, vous n'aurez donc à "
+#~ "l'importer qu'une seule fois. Vous devrez quand même vérifier l'image ISO "
+#~ "chaque fois que vous en téléchargerez une nouvelle."
+
+#~ msgid ""
+#~ "This download of the Tails signing key is protected using HTTPS. But you "
+#~ "could still download a malicious signing key if our website is "
+#~ "compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+#~ "about/warning#man-in-the-middle]]."
+#~ msgstr ""
+#~ "Le téléchargement de la clé de signature est protégé par l'utilisation de "
+#~ "HTTPS. Mais vous pourriez tout de même télécharger une clé malveillante "
+#~ "si notre site web était compromis ou si vous étiez victime d'une attaque "
+#~ "de [[l'homme du milieu|doc/about/warning#man-in-the-middle]]."
+
+#~ msgid ""
+#~ "For additional verification, you can <a href=\"#wot\">authenticate the "
+#~ "signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Pour une vérification supplémentaire, vous pouvez <a href=\"#wot"
+#~ "\">authentifier la clé de signature via la Toile de Confiance OpenPGP</a>."
+
+#~ msgid "Verify the ISO image"
+#~ msgstr "Vérifier l'image ISO"
+
+#~ msgid ""
+#~ "As explained above in step 3, this simple OpenPGP verification provides a "
+#~ "level of verification equivalent to HTTPS, like the [[Firefox extension "
+#~ "or BitTorrent|install/download]], unless you also <a href=\"#wot"
+#~ "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Comme expliqué à la troisième étape, cette simple vérification avec "
+#~ "OpenPGP fournit un niveau de vérification équivalent à HTTPS, comme [[le "
+#~ "module complémentaire pour Firefox ou BitTorrent|install/download]], sauf "
+#~ "si vous <a href=\"#wot\">authentifiez la clé de signature via la Toile de "
+#~ "Confiance OpenPGP</a>."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "En lire plus à propos de OpenPGP"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia_fr GNU_Privacy_Guard desc=\"Wikipédia : GnuPG\"]], un "
+#~ "logiciel OpenPGP libre"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr ""
+#~ "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]] (en "
+#~ "anglais)"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian : Signature de clés|http://www.debian.org/events/keysigning.fr."
+#~ "html]], un tutoriel sur le fait de signer les clés d'autres personnes"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]] (en anglais)"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions en anglais pour la gestion de la "
+#~ "confiance des clés avec Gpg4win"
+
+#, fuzzy
+#~| msgid ""
+#~| "Verify the date of the signature to make sure that you downloaded the "
+#~| "latest version."
+#~ msgid ""
+#~ "Verify the date of the signature to make sure that you downloaded the "
+#~ "latest version. If the output also includes:"
+#~ msgstr ""
+#~ "Vérifiez la date de la signature pour vous assurer que vous avez "
+#~ "téléchargé la dernière version."
+
+#, fuzzy
+#~| msgid ""
+#~| " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
+#~ msgid ""
+#~ "The verification of the ISO image starts automatically: [[!img install/"
+#~ "inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
+
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
+
+#~ msgid "</div>\n"
+#~ msgstr "</div>\n"
+
+#~ msgid ""
+#~ " Verify the date of the signature to make sure that you downloaded the "
+#~ "latest version.\n"
+#~ msgstr ""
+#~ " Vérifiez la date de la signature pour vous assurer que vous avez "
+#~ "téléchargé la dernière version.\n"
+
+#~ msgid ""
+#~ " Then the ISO image is still correct according to the signing key that "
+#~ "you\n"
+#~ " downloaded. To remove this warning you need to <a href=\"#wot"
+#~ "\">authenticate\n"
+#~ " the signing key through the OpenPGP Web of Trust</a>.\n"
+#~ msgstr ""
+#~ " Alors l'image ISO est tout de même correctement signée par la clé que "
+#~ "vous\n"
+#~ " avez téléchargé. Pour supprimer cet avertissement vous devez <a href="
+#~ "\"#wot\">authentifier\n"
+#~ " la clé de signature via la Toile de Confiance OpenPGP</a>.\n"
+
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
+
+#~ msgid "<div class=\"tip\">\n"
+#~ msgstr "<div class=\"tip\">\n"
+
+#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>Tails [[a changé de clé de signature\n"
+#~ "|news/signing_key_transition]] en mars 2015.\n"
+#~ "Si vous aviez l'ancienne clé, n'oubliez-pas\n"
+#~ "d'[[importer et vérifier la nouvelle clé\n"
+#~ "de signature|news/signing_key_transition#index1h1]].</p>\n"
+
+#~ msgid ""
+#~ "We also acknowledge that not everybody might be able to create good trust "
+#~ "path to Tails signing key since it based on a network of direct human "
+#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
+#~ msgstr ""
+#~ "Nous reconnaissons quand même qu'il n'est pas donné à tout le monde de "
+#~ "pouvoir établir un bon chemin de confiance jusqu'à la clé de signature de "
+#~ "Tails, cela étant basé sur un réseau de relations humaines ainsi que sur "
+#~ "le savoir-faire relativement complexe d'outils comme OpenPGP."
+
+#~ msgid ""
+#~ "Note that since all Tails releases are signed with the same key, you will "
+#~ "not have to verify the key every time and the trust you might "
+#~ "progressively build in it will be built once and for all. Still, you will "
+#~ "have to check the ISO image every time you download a new one!"
+#~ msgstr ""
+#~ "Notez que toutes les versions de Tails étant signées par la même clé, "
+#~ "vous n'aurez pas à vérifier la clé à chaque fois et que la confiance que "
+#~ "vous pourriez progressivement lui accorder le sera une fois pour toute. "
+#~ "En revanche, il vous faudra vérifier l'image ISO à chaque fois que vous "
+#~ "en téléchargez une nouvelle !"
+
+#~ msgid ""
+#~ "If you want to be extra cautious and really authenticate Tails signing "
+#~ "key in a stronger way than what standard HTTPS offers you, you will need "
+#~ "to use the OpenPGP Web of Trust."
+#~ msgstr ""
+#~ "Si vous voulez être très prudent et réellement authentifier la clé de "
+#~ "signature de Tails d'une manière plus forte que ce que le HTTPS standard "
+#~ "vous permet, vous allez devoir utiliser la toile de confiance OpenPGP."
#~ msgid ""
-#~ "<a id=\"i_have_iso\" href=\"\" title=\"Select an ISO image to verify\">I "
-#~ "already have an ISO image.</a>"
+#~ "We will present you three techniques from the easiest to the safest. "
+#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
+#~ "them according to your possibilities and technical skills."
#~ msgstr ""
-#~ "<a id=\"i_have_iso\" href=\"\" title=\"Sélectionner une image ISO pour "
-#~ "vérification\">J'ai déjà l'image ISO.</a>"
+#~ "Nous allons vous montrer trois techniques, de la plus simple à la plus "
+#~ "sûre. Encore une fois, aucune de celles-ci n'est une solution magique ou "
+#~ "parfaite. N'hésitez pas à les tester selon vos possibilités et "
+#~ "compétences techniques."
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index 1bedc79..70c92e5 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -1,272 +1,535 @@
-<h1 id="download-verify">Download and verify the Tails ISO image</h1>
+<div id="activate-tails-verification"></div> <!-- Needed to activate the verification extension -->
+<div id="extension-version">0.95</div> <!-- Minimum version of the extension -->
-<div class="step-image">[[!img install/inc/infography/download-and-verify.png link="no" alt=""]]</div>
+<h1 class="debian windows linux mac-usb mac-dvd dvd vm upgrade-tails">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
-<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.</p>
+<div class="row">
-<div id="dave-init">
- [[!img lib/spinner.png link="no" alt=""]]<br />
- <p>Please wait…</p>
-</div>
+ <div id="direct-download" class="col-md-6"> <!-- Direct download -->
+ <h2>Direct download</h2>
-<div id="download-and-verify" class="chrome-unsupported">
- <div id="extension-version">0.2.8</div>
-
- <div id="undetected-browser">
- <p>We failed to detect your browser vendor, maybe because JavaScript is disabled.</p>
- <p>You can download and verify the ISO image via:</p>
- <div class="row download-options">
- <div class="col-md-6 extension">
- <h2>Browser add-on</h2>
- <p>for <a href="https://getfirefox.com">Firefox <span class="minver-firefox">38.0.1</span>+</a> or
- <a href="https://www.torproject.org/download/download-easy.html.en">Tor Browser <span class="minver-tor">5</span>+</a></p>
- <p>A Firefox add-on to download and verify Tails automatically.</p>
- <p><strong>If you are not in Firefox or Tor Browser:</strong></p>
- <p>Copy and paste this link in Firefox or Tor Browser:</p>
- <p>
- <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>
- </p>
- <p><strong>If you are already in Firefox or Tor Browser:</strong></p>
- <a href="https://addons.mozilla.org/firefox/downloads/latest/673020/addon-673020-latest.xpi" class="btn btn-lg btn-primary browser-override">Install Firefox add-on</a>
+ <div class="supported-browser no-js">
+ <div id="step-download-iso">
+ <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails</h3>
+ <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
+ <p id="already-downloaded" class="indent"><a>I already downloaded Tails <span class="remove-extra-space">&nbsp;[[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</span>.</a></p>
</div>
- <div class="col-md-6 bittorrent">
- <h2>BitTorrent</h2>
- [[!inline pages="install/inc/steps/bittorrent_verification.inline" raw="yes" sort="age"]]
+ <div id="step-verify-direct">
+ <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>2</span>Verify your download using your browser</h3>
+ <div class="caution indent">
+ <p><b>For your security,<br/>always verify your download!</b></p>
+ <p class="floating-toggleable-link why-verify-link">[[!toggle id="why-verify-supported" text="Why?"]]</p>
+ <div id="why-verify-supported" class="floating-toggleable">
+ [[!toggleable id="why-verify-supported" text="""
+ [[!toggle id="why-verify-supported" text="X"]]
+ <p>With an unverified download, you might:</p>
+ <ul>
+ <li>Lose time if your download is incomplete or broken due to an error during the download.
+ This is quite frequent.</li>
+ <li>Get hacked while using Tails if our download mirrors have been compromised and are serving malicious downloads.<br/>
+ <a href="http://blog.linuxmint.com/?p=2994">This already happened to other operating systems.</a></li>
+ <li>Get hacked while using Tails if your download is modified on the fly by an attacker on the network.<br/>
+ <a href="https://en.wikipedia.org/wiki/DigiNotar">This is possible for strong adversaries.</a></li>
+ </ul>
+ """]]
+ </div>
+ <p>Our browser extension makes it quick and easy.</p>
+ </div>
+ <div id="install-extension" class="indent">
+ <a href="https://addons.mozilla.org/firefox/downloads/latest/tails-verification/addon-tails-verification-latest.xpi" class="install-extension-btn supported-browser firefox btn btn-primary inline-block">Install <u>Tails Verification</u> extension</a>
+ <a class="install-extension-btn supported-browser chrome btn btn-primary inline-block">Install <u>Tails Verification</u> extension</a>
+ <div class="no-js">
+ <p>You seem to have JavaScript disabled. To use our browser
+ extension, please allow all this page:</p>
+ [[!img screenshots/allow_js.png link="no"]]
+ </div>
+ </div>
+ <div id="update-extension" class="indent block">
+ <p>Your extension is an older version.</p>
+ <a href="https://addons.mozilla.org/firefox/downloads/latest/tails-verification/addon-tails-verification-latest.xpi" class="install-extension-btn firefox btn btn-primary inline-block">Update extension</a>
+ <a class="install-extension-btn chrome btn btn-primary inline-block">Update extension</a>
+ </div>
+ <div id="verification" class="indent block">
+ <p id="extension-installed" class="block"><u>Tails Verification</u> extension installed!</p>
+ <label id="verify-download-wrapper" class="btn btn-primary inline-block">
+ Verify download&hellip;
+ <input id="verify-download" type="file"/>
+ </label>
+ <div id="verifying-download" class="indent block">
+ <p>Verifying <span id="filename">$FILENAME</span>&hellip;</p>
+ <div class="progress">
+ <div id="progress-bar" class="progress-bar" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+ </div>
+ </div>
+ <p id="verification-successful" class="block">Verification successful!</p>
+ <div id="verification-failed" class="block">
+ <p><b>Verification failed!</b></p>
+ <p class="floating-toggleable-link why-failed-link">[[!toggle id="why-failed" text="Why?"]]</p>
+ <div id="why-failed" class="floating-toggleable">
+ [[!toggleable id="why-failed" text="""
+ [[!toggle id="why-failed" text="X"]]
+ <p>Most likely, the verification failed because of an error
+ or interruption during the download.</p>
- <a href='[[!inline pages="inc/stable_amd64_torrent_url" raw="yes" sort="age"]]' class="btn btn-lg btn-primary">Download Torrent file</a>
- </div>
- </div>
- <p class="direct-download">[[Download and verify using OpenPGP|install/download/openpgp]]</p>
- </div>
-
- <div id="unsupported-browser">
- <p>You seem to be using an unsupported browser.</p>
- <p>You can download and verify the ISO image via:</p>
- <div class="row download-options">
- <div class="col-md-6 extension">
- <h2>Browser add-on</h2>
- <p>for <a href="https://getfirefox.com">Firefox <span class="minver-firefox">38.0.1</span>+</a> or
- <a href="https://www.torproject.org/download/download-easy.html.en">Tor Browser <span class="minver-tor">5</span>+</a></p>
- <p>A Firefox add-on to download and verify Tails automatically.</p>
- <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>
- <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>
- </div>
- <div class="col-md-6 bittorrent">
- <h2>BitTorrent</h2>
+ <p>Less likely, the verification might have failed because
+ of a malicious download from our download mirrors or due to
+ a network attack in your country or local network.</p>
- [[!inline pages="install/inc/steps/bittorrent_verification.inline" raw="yes" sort="age"]]
+ <p>Downloading again is usually enough to fix this
+ problem.</p>
+ """]]
+ </div>
+ <p><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool">Please try to download again&hellip;</a></p>
+ </div>
+ <div id="verification-failed-again" class="block">
+ <p><b>Verification failed again!</b></p>
+ <p class="floating-toggleable-link why-failed-again-link">[[!toggle id="why-failed-again" text="Why?"]]</p>
+ <div id="why-failed-again" class="floating-toggleable">
+ [[!toggleable id="why-failed-again" text="""
+ [[!toggle id="why-failed-again" text="X"]]
+ <p>The verification might have failed again because of:</p>
+ <ul>
+ <li>A software problem in our verification extension</li>
+ <li>A malicious download from our download mirrors</li>
+ <li>A network attack in your country or local network</li>
+ </ul>
+ <p>Trying from a different place or a different computer might solve any of these issues.</p>
+ """]]
+ </div>
+ <p>Please try to download again from a different place or a different computer&hellip;</p>
+ </div>
+ </div>
+ </div>
- <a href='[[!inline pages="inc/stable_amd64_torrent_url" raw="yes" sort="age"]]' class="btn btn-lg btn-primary">Download Torrent file</a>
+ <div id="step-continue-direct">
+ <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>3</span>Continue
+ <span class="debian windows linux mac-usb mac-dvd">installing</span>
+ <span class="upgrade-tails">upgrading</span>
+ <span class="download-only">installing or upgrading</span></h3>
</div>
- </div>
- <p class="direct-download">[[Download and verify using OpenPGP|install/download/openpgp]]</p>
- </div>
-
- <div id="supported-browser">
- <div id="use">
- <p>We detected that you are running Firefox or Tor Browser and already have our Firefox add-on installed.</p>
- <a id="use-button" href="" class="btn btn-lg btn-primary clearfix">
- <span id="use-button-label" class="pull-left">Use Firefox add-on</span>
- <div id="use-button-state" class="pull-right">
- <span class="label label-default state already">Already installed</span>
+ <div id="continue-link-direct" class="indent">
+ <div id="skip-download-direct">
+ <span class="debian">[[Skip download|debian/usb]]</span>
+ <span class="windows">[[Skip download|win/usb]]</span>
+ <span class="linux">[[Skip download|linux/usb]]</span>
+ <span class="mac-usb">[[Skip download|mac/usb]]</span>
+ <span class="mac-dvd">[[Skip download|mac/dvd]]</span>
+ <span class="dvd">[[Skip download|dvd]]</span>
+ <span class="vm">[[Skip download|doc/advanced_topics/virtualization]]</span>
+ <span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
</div>
- </a>
- <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="state done">[[!img install/inc/icons/check.png link="no" alt="Done"]]</span>
+ <div id="skip-verification-direct" class="block">
+ <div class="debian">[[Skip verification!|debian/usb]]</div>
+ <div class="windows">[[Skip verification!|win/usb]]</div>
+ <div class="linux">[[Skip verification!|linux/usb]]</div>
+ <div class="mac-usb">[[Skip verification!|mac/usb]]</div>
+ <div class="mac-dvd">[[Skip verification!|mac/dvd]]</div>
+ <div class="dvd">[[Skip verification!|dvd]]</div>
+ <div class="vm">[[Skip verification!|doc/advanced_topics/virtualization]]</div>
+ <div class="upgrade-tails">[[Skip verification!|upgrade/tails]]</div>
</div>
- </div>
- </div>
- <div id="update">
- <p>We detected that you are running Firefox or Tor Browser but have an outdated version of our Firefox add-on.</p>
- <a id="update-button" href="https://addons.mozilla.org/firefox/downloads/latest/673020/addon-673020-latest.xpi" class="btn btn-lg btn-primary clearfix">
- <span id="update-button-label" class="pull-left">Update Firefox add-on</span>
- <div id="update-state" class="pull-right">
- <span class="label label-default state restartless">No restart</span>
- </div>
- </a>
- <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="state done">[[!img install/inc/icons/check.png link="no" alt="Done"]]</span>
+ <div id="next-direct">
+ <div class="debian">[[<div class="btn btn-primary inline-block">Next: Install <em>Tails Installer</em> (<span class="next-counter"></span>)</div>|debian/usb]]</div>
+ <div class="windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
+ <div class="linux">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|linux/usb]]</div>
+ <div class="mac-usb">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|mac/usb]]</div>
+ <div class="mac-dvd">[[<div class="btn btn-primary inline-block">Next: Burn a Tails DVD (<span class="next-counter"></span>)</div>|mac/dvd]]</div>
+ <div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
+ <div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
+ <div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
+ <ul class="download-only">
+ <li>[[Install from Windows|install/win/usb]]</li>
+ <li>[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]</li>
+ <li>[[Install from other Linux distributions|install/linux/usb]]</li>
+ <li>[[Install from macOS by burning a DVD first|install/mac/dvd]]</li>
+ <li>[[Install from macOS and the command line|install/mac/usb]]</li>
+ <li>[[Burn on a DVD|dvd]]</li>
+ <li>[[Run in a virtual machine|doc/advanced_topics/virtualization]]</li>
+ <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+ </ul>
</div>
</div>
+ </div> <!-- Supported browser & No JS -->
+
+ <div class="outdated-browser unsupported-browser">
+ <p>You are using <u><b><span id="detected-browser">$DETECTED-BROWSER</span></b></u>.</p>
+ <p>Direct download is only available for:</p>
+ <ul>
+ <li>Firefox <span id="min-version-firefox">$MINVER-FIREFOX</span> and later (<a href="https://www.mozilla.org/firefox/new/">Download</a>)</li>
+ <li>Chrome<span id="min-version-chrome">$MINVER-CHROME</span> and later (<a href="https://www.google.com/chrome/">Download</a>)</li>
+ <li>Tor Browser <span id="min-version-tor-browser">$MINVER-TOR-BROWSER</span> and later (<a href="https://www.torproject.org/download/download-easy.html">Download</a>)</li>
+ </ul>
</div>
- <div id="install">
- <p>We detected that you are running Firefox or Tor Browser.</p>
- <p>You can download the ISO image via our Firefox add-on. The add-on
- verifies your download [[!toggle id="extension-verification" text="automatically"]].</p>
-
- [[!toggleable id="extension-verification" text="""
- [[!toggle id="extension-verification" text="X"]]
- <p>The verification is based on a cryptographic checksum downloaded from our website.</p>
- """]]
-
- <a id="install-button" href="https://addons.mozilla.org/firefox/downloads/latest/673020/addon-673020-latest.xpi" class="btn btn-lg btn-primary clearfix">
- <span id="install-button-label" class="pull-left">Install Firefox add-on</span>
- <div id="install-button-state" class="pull-right">
- <span class="label label-default state restartless">No restart</span>
- </div>
- </a>
- <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="state done">[[!img install/inc/icons/check.png link="no" alt="Done"]]</span>
+ <div class="outdated-browser">
+ <p>Please update your browser to the latest version.</p>
+ </div>
+ <div class="unsupported-browser">
+ <div class="caution">
+ <p><b>For your security,<br/>always verify your download!</b></p>
+ <p class="floating-toggleable-link why-verify-link">[[!toggle id="why-verify-unsupported" text="Why?"]]</p>
+ <div id="why-verify-unsupported" class="floating-toggleable">
+ [[!toggleable id="why-verify-unsupported" text="""
+ [[!toggle id="why-verify-unsupported" text="X"]]
+ <p>With an unverified download, you might:</p>
+ <ul>
+ <li>Lose time if your download is incomplete or broken due to an error during the download.
+ This is quite frequent.</li>
+ <li>Get hacked while using Tails if our download mirrors have been compromised and are serving malicious downloads.<br/>
+ <a href="http://blog.linuxmint.com/?p=2994">This already happened to other operating systems.</a></li>
+ <li>Get hacked while using Tails if your download is modified on the fly by an attacker on the network.<br/>
+ <a href="https://en.wikipedia.org/wiki/DigiNotar">This is possible for strong adversaries.</a></li>
+ </ul>
+ """]]
</div>
+ <p>Our browser extension for Firefox, Chrome, and Tor Browser makes this quick and easy.</p>
</div>
- </div>
+ <p>Copy and paste this link in Firefox, Chrome, or Tor Browser:</p>
+ <p class="debian"><code>https://tails.boum.org/install/debian/usb-download/</code></p>
+ <p class="windows"><code>https://tails.boum.org/install/win/usb-download/</code></p>
+ <p class="linux"><code>https://tails.boum.org/install/linux/usb-download/</code></p>
+ <p class="mac-usb"><code>https://tails.boum.org/install/mac/usb-download/</code></p>
+ <p class="mac-dvd"><code>https://tails.boum.org/install/mac/dvd-download/</code></p>
+ <p class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails-download/</code></p>
+ <p class="dvd"><code>https://tails.boum.org/install/dvd-download/</code></p>
+ <p class="vm"><code>https://tails.boum.org/install/vm-download/</code></p>
+ <p class="download-only"><code>https://tails.boum.org/install/download/</code></p>
+ </div> <!-- Outdated browser -->
+ </div> <!-- Direct download -->
- <div id="download-minor">
- <p>or [[!toggle id="bittorrent-verification" text="Download and verify via BitTorrent"]]</p>
+ <div id="bittorrent-download" class="col-md-6">
+ <h2>BitTorrent download</h2>
+ <p class="floating-toggleable-link what-is-bittorrent-link">[[!toggle id="what-is-bittorrent" text="What is BitTorrent?"]]</p>
- [[!toggleable id="bittorrent-verification" text="""
- [[!toggle id="bittorrent-verification" text="X"]]
+ <div id="what-is-bittorrent" class="floating-toggleable">
+ [[!toggleable id="what-is-bittorrent" text="""
+ [[!toggle id="what-is-bittorrent" text="X"]]
+ <p>BitTorrent is a peer-to-peer technology for file sharing that makes your
+ download faster and easier to resume.</p>
- [[!inline pages="install/inc/steps/bittorrent_verification.inline" raw="yes" sort="age"]]
+ <p>You need to install BitTorrent software on your computer, like
+ <a href="https://transmissionbt.com/">Transmission</a> (for Windows, macOS, and Linux).</p>
- <p><a href='[[!inline pages="inc/stable_amd64_torrent_url" raw="yes" sort="age"]]'>Download Torrent file</a></p>
+ <p>BitTorrent doesn't work over Tor or in Tails.</p>
"""]]
</div>
- <div id="download-minor">
- <p>or [[Download and verify using OpenPGP|install/download/openpgp]]</p>
+ <div id="step-download-torrent">
+ <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
+ <a href="[[!inline pages="inc/stable_amd64_torrent_url" raw="yes" sort="age"]]" id="download-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file</a>
</div>
- </div>
-
- <div id="download">
- <a id="download-button" href='[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]' class="btn btn-lg btn-primary clearfix iso-url use-mirror-pool">
- <span id="download-button-label" class="pull-left">Download Tails <span class="iso-version">[[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</span> ISO image
- <small id="download-button-size">(<span class="iso-size-MiB">$SIZE</span> MiB)</small>
- </span>
- </a>
- <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_amd64_version" raw="yes" sort="age"]]</span> ISO image
- <small id="download-eta">
- <span class="speed-KBs">$SPEED</span> KB/s &mdash; <span class="downloaded-MiB">$DOWNLOADED</span>/<span class="iso-size-MiB">$SIZE</span> MiB,
- <span data-value="???">
- <span class="eta-mins">???</span>
- <span class="plural">minutes</span>
- <span class="singular">minute</span>
- </span>
- <span data-value="???">
- <span class="eta-secs">???</span>
- <span class="plural">seconds</span>
- <span class="singular">second</span>
- </span>
- </small>
- </div>
- <div id="download-progress" class="progress">
- <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="$PROGRESS" aria-valuemin="0" aria-valuemax="100" style="width: $PROGRESS">
- <span class="sr-only"><span class="progress-label">$PROGRESS</span> complete</span>
- <span class="progress-label">$PROGRESS</span>
- </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="">[[!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'>
- </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 id="step-verify-bittorrent">
+ <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>2</span>Verify your download using BitTorrent</h3>
+ <p class="indent">Your BitTorrent client will automatically verify your download when it is complete.</p>
</div>
- <div id="download-message">
- <div id="download-message-paused">
- <p>The download has been paused. Click on the play button to resume.</p>
- </div>
- <div id="download-message-failed" class="caution">
- <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-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 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 id="step-continue-bittorrent">
+ <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>3</span>Continue
+ <span class="debian windows linux mac-usb mac-dvd">installing</span>
+ <span class="upgrade-tails">upgrading</span>
+ <span class="download-only">installing or upgrading</span></h3>
+ <p class="debian windows linux mac-usb mac-dvd upgrade-tails indent">Open and download
+ the Torrent file with your BitTorrent client. It contains the
+ Tails [[!inline pages="inc/stable_amd64_version" raw="yes"
+ sort="age"]] ISO image that you will use in the next step.</p>
</div>
- <div id="verify-text-success" class="bg-success">
- <div class="trophy">
- <p>You downloaded and verified the ISO image successfully!</p>
- <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="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="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>
-
- <div id="openpgp">
- <p>If you are knowledgeable about OpenPGP, you can do additional verification using the
- [[!toggle id="openpgp" text="OpenPGP signature"]].</p>
-
- [[!toggleable id="openpgp" text="""
- <ul>
- <li><a href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>Download the OpenPGP signature</a></li>
- <li>[[Download the Tails signing key|tails-signing.key]]</li>
- <li>[[Learn how to do this|install/download/openpgp]]</li>
+ <div id="continue-link-bittorrent" class="indent">
+ <div id="skip-download-bittorrent">
+ <span class="debian">[[Skip download|debian/usb]]</span>
+ <span class="windows">[[Skip download|win/usb]]</span>
+ <span class="linux">[[Skip download|linux/usb]]</span>
+ <span class="mac-usb">[[Skip download|mac/usb]]</span>
+ <span class="mac-dvd">[[Skip download|mac/dvd]]</span>
+ <span class="dvd">[[Skip download|dvd]]</span>
+ <span class="vm">[[Skip download|doc/advanced_topics/virtualization]]</span>
+ <span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
+ </div>
+ <div id="next-bittorrent">
+ <div class="debian">[[<div class="btn btn-primary inline-block">Next: Install <em>Tails Installer</em> (<span class="next-counter"></span>)</div>|debian/usb]]</div>
+ <div class="windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
+ <div class="linux">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|linux/usb]]</div>
+ <div class="mac-usb">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|mac/usb]]</div>
+ <div class="mac-dvd">[[<div class="btn btn-primary inline-block">Next: Burn a Tails DVD (<span class="next-counter"></span>)</div>|mac/dvd]]</div>
+ <div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
+ <div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
+ <div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
+ <ul class="download-only">
+ <li>[[Install from Windows|install/win/usb]]</li>
+ <li>[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]</li>
+ <li>[[Install from other Linux distributions|install/linux/usb]]</li>
+ <li>[[Install from macOS by burning a DVD first|install/mac/dvd]]</li>
+ <li>[[Install from macOS and the command line|install/mac/usb]]</li>
+ <li>[[Burn on a DVD|dvd]]</li>
+ <li>[[Run in a virtual machine|doc/advanced_topics/virtualization]]</li>
+ <li>[[Upgrade inside Tails|upgrade/tails]]</li>
</ul>
- """]]
- </div>
-
</div>
- <p><a href="" id="download-button-state-cancel" class="download-again">Download again</a></p>
</div>
+ </div> <!-- BitTorrent download -->
+
+</div>
+
+<div id="openpgp">
+
+<h2>Verify using OpenPGP (optional)</h2>
+
+<p>If you know OpenPGP, you can also verify your download using an
+OpenPGP signature instead, or in addition to, our browser extension or
+BitTorrent.</p>
+
+<ol>
+ <li>
+ <p>Download the [[Tails signing key|tails-signing.key]].</p>
+ </li>
+
+ <li>
+ <p>Download the <a href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>
+ Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] OpenPGP signature</a>
+ and save it to the same folder where
+ you saved the ISO image.</p>
+ </li>
+</ol>
+
+<h3>Basic OpenPGP verification</h3>
+
+<p>Verifying using OpenPGP but without authenticating our signing key
+through the OpenPGP Web of Trust is equivalent in terms of security to
+verifying using our browser extension or BitTorrent because it relies on
+downloading a genuine signing key from our website.</p>
+
+[[!toggle id="basic-openpgp" text="See instructions for basic OpenPGP verification."]]
+
+[[!toggleable id="basic-openpgp" text="""
+<span class="hide">[[!toggle id="basic-openpgp" text=""]]</span>
+
+<p>This section provides simplified instructions:</p>
+
+<ul>
+ <li><a href="#windows">In Windows with <span class="application">Gpg4win</span></a></li>
+ <li><a href="#mac">In macOS with <span class="application">GPGTools</span></a></li>
+ <li><a href="#tails">In Tails</a></li>
+ <li><a href="#command-line">Using the command line</a></li>
+</ul>
+
+<a id="windows"></a>
+
+<h3>In Windows with <span class="application">Gpg4win</span></h3>
+
+<p>See the [[<span class="application">Gpg4win</span> documentation on
+verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].</p>
+
+<p>Verify the date of the signature to make sure that you downloaded the latest version.</p>
+
+<p>If the following warning appears:</p>
+
+<pre>
+Not enough information to check the signature validity.
+Signed on ... by tails@boum.org (Key ID: 0x58ACD84F
+The validity of the signature cannot be verified.
+</pre>
+
+<p>Then the ISO image is still correct according to the signing key that you
+downloaded. To remove this warning you need to <a href="#wot">authenticate the
+signing key through the OpenPGP Web of Trust</a>.</p>
+
+<a id="mac"></a>
+
+<h3>In macOS using <span class="application">GPGTools</span></h3>
+
+<ol>
+ <li>
+ Open <span class="application">Finder</span> and navigate to the
+ folder where you saved the ISO image and the signature.
+ </li>
+
+ <li>
+ Right-click on the ISO image and choose
+ <span class="guimenuchoice">
+ <span class="guisubmenu">Services</span> ▸
+ <span class="guimenuitem">OpenPGP: Verify Signature of File</span></span>.
+ </li>
+</ol>
+
+<a id="tails"></a>
+
+<h3>In Tails</h3>
+
+<ol>
+ <li>
+ Open the file browser and navigate to the folder where you saved the
+ ISO image and the signature.
+ </li>
+
+ <li>
+ Right-click on the signature and choose <span class="guimenuitem">Open With
+ Verify Signature</span>.
+ </li>
+
+ <li>
+ The verification of the ISO image starts automatically:
+
+ <p>[[!img install/inc/screenshots/verifying_in_tails.png link="no"]]</p>
+ </li>
+
+ <li>
+ After the verification finishes, click on the notification counter in
+ the bottom-right corner and on the notification with a transparent
+ background on the right of the notification area:
+
+ <p>[[!img install/inc/screenshots/notification_in_tails.png link="no"]]</p>
+
+ <p>Verify the date of the signature to make sure that you downloaded the latest version.</p>
+ </li>
+</ol>
+
+<a id="command-line"></a>
+
+<h3>Using the command line</h3>
+
+<ol>
+
+ <li>
+ Open a terminal and navigate to the folder where you saved the ISO
+ image and the signature.
+ </li>
+
+ <li>
+ <p>Execute:</p>
+
+ <p class="pre">[[!inline pages="inc/stable_amd64_gpg_verify" raw="yes" sort="age"]]</p>
+
+ <p>The output of this command should be the following:</p>
+
+ <p class="pre">[[!inline pages="inc/stable_amd64_gpg_signature_output" raw="yes" sort="age"]]</p>
+
+ <p>Verify the date of the signature to make sure that you downloaded the latest version.</p>
+
+ <p>If the output also includes:</p>
+
+ <p class="pre">
+ gpg: WARNING: This key is not certified with a trusted signature!<br/>
+ gpg: There is no indication that the signature belongs to the owner.<br/>
+ </p>
+
+ <p>Then the ISO image is still correct according to the signing key that you
+ downloaded. To remove this warning you need to <a href="#wot">authenticate
+ the signing key through the OpenPGP Web of Trust</a>.</p>
+ </li>
+
+</ol>
+
+"""]]
+
+<a id="wot"></a>
+
+<h3>Authenticate the signing key through the OpenPGP Web of Trust</h3>
+
+<p>Authenticating our signing key through the OpenPGP Web of Trust is
+the only verification technique that can protect you in case our website
+is compromised. It is also the most complicated technique and might not
+be possible for everyone to perform because it relies on trust
+relationships between individuals.</p>
+
+[[!toggle id="web-of-trust" text="Read more about authenticating the Tails signing key through the OpenPGP Web of Trust."]]
+
+[[!toggleable id="web-of-trust" text="""
+<span class="hide">[[!toggle id="web-of-trust" text=""]]</span>
+
+<p>The verification techniques presented until now (browser extension,
+BitTorrent, or OpenPGP verification) all rely on some
+information being securely downloaded using HTTPS from our website:</p>
+
+<ul>
+ <li>The <em>checksum</em> for the Firefox extension</li>
+ <li>The <em>Torrent file</em> for BitTorrent</li>
+ <li>The <em>Tails signing key</em> for the OpenPGP verification</li>
+</ul>
+
+<p>But, while doing so, you could download malicious information if our
+website is compromised or if you are a victim of a [[man-in-the-middle
+attack|doc/about/warning#man-in-the-middle]].</p>
+
+<p>The OpenPGP verification is the only technique that allows you to verify the ISO image even better
+by also authenticating the Tails signing key through the OpenPGP Web of
+Trust. Relying on the OpenPGP Web of Trust is the only way to completely
+protect you from malicious downloads.</p>
+
+<div class="note">
+
+<p>If you are verifying an ISO image from inside Tails already, for
+example to do a manual upgrade, then the Tails signing key is already
+included in Tails. You can trust this signing key as much as you are trusting your
+Tails installation already because you are not downloading it.</p>
+
+</div>
+
+<p>One of the inherent problems of standard HTTPS is that the trust we usually put
+in a website is defined by certificate authorities: a hierarchical and closed
+set of companies and governmental institutions approved by your web browser vendor.
+This model of trust has long been criticized and proved several times to be
+vulnerable to attacks [[as explained on our warning page|doc/about/warning#man-in-the-middle]].</p>
+
+<p>We believe that, instead, users should be given the final say when trusting a
+website, and that designation of trust should be done on the basis of human
+interactions.</p>
+
+<p>The OpenPGP [[!wikipedia Web_of_Trust]] is a
+decentralized trust model based on OpenPGP keys that can help solving
+this problem. Let's see this with an example:</p>
+
+<ol>
+ <li>
+ <em>You are friends with Alice and really trust her way of managing
+ OpenPGP keys. So you are trusting Alice's key.</em>
+ </li>
+
+ <li>
+ <em>Furthermore, Alice met Bob, a Tails developer, in a conference and certified
+ Bob's key. So Alice is trusting Bob's key.</em>
+ </li>
+
+ <li>
+ <em>Bob is a Tails developer who directly owns the Tails signing key. So
+ Bob fully trusts the Tails signing key.</em>
+ </li>
+</ol>
+
+<p>In this scenario, Alice found a path to trust the Tails signing key
+without the need to rely on certificate authorities.</p>
+
+<div class="tip">
+
+<p>If you are on Debian, Ubuntu, or Linux Mint, you can install the
+<code>debian-keyring</code> package which contains the OpenPGP keys of
+all Debian developers. Some Debian developers have certified the Tails
+signing key and you can use these certifications to build a trust path.
+This technique is explained in detail in our instructions on
+[[installing Tails from Debian, Ubuntu, or Linux Mint using the command
+line|install/expert/usb]].</p>
+
+</div>
+
+<p>Relying on the Web of Trust requires both caution and intelligent supervision
+by the users. The technical details are outside of the scope of this document.</p>
+
+<p>Since the Web of Trust is actually based on human relationships and
+real-life interactions, the best is to get in touch with people
+knowledgeable about OpenPGP and build trust relationships in order to
+find your own trust path to the Tails signing key.</p>
+
+<p>For example, you can start by contacting a local [[!wikipedia Linux_User_Group]],
+[[an organization offering Tails training|support/learn]], or other Tails
+enthusiasts near you and exchange about their OpenPGP practices.</p>
+
+<div class="tip">
+
+<p>After you build a trust path, you can certify the Tails signing key by
+signing it with your own key to get rid of some warnings during the
+verification process.</p>
- <div id="verify-text-failure" class="caution">
- <p>The verification of the ISO image failed! Please try to download again&hellip;</p>
- <p><a href="" id="download-button-state-cancel" class="download-again">Download again</a></p>
- </div>
- <div id="verify-text-failure-again" class="caution">
- <p>The verification of the ISO image failed again! Please try to download again from a different place or a different computer&hellip;</p>
- <p><a href="" id="download-button-state-cancel" class="download-again">Download again</a></p>
- </div>
- </div>
</div>
-<a id="next"></a>
+"""]]
+
+</div>
diff --git a/wiki/src/install/inc/steps/download.inline.it.po b/wiki/src/install/inc/steps/download.inline.it.po
index 3a76116..0ce3a0c 100644
--- a/wiki/src/install/inc/steps/download.inline.it.po
+++ b/wiki/src/install/inc/steps/download.inline.it.po
@@ -3,542 +3,1219 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2017-02-09 19:32+0100\n"
-"Last-Translator: ignifugo <ignifugo@insicuri.net>\n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: it\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:30+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"
-"X-Generator: Poedit 1.8.7.1\n"
+
+#. type: Content of: <div>
+msgid "0.95"
+msgstr ""
#. type: Content of: <h1>
-msgid "Download and verify the Tails ISO image"
-msgstr "Scarica e verifica l'immagine ISO di Tails"
+msgid ""
+"Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort="
+"\"age\"]]"
+msgstr ""
-#. type: Content of: <div>
+#. type: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw="
+#| "\"yes\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages="
+#| "\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> "
+#| "(<span class=\"remove-extra-space\">[[!inline pages=\"inc/"
+#| "stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)."
msgid ""
-"<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."
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
+"</a>"
msgstr ""
-"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
-"questo passaggio</span> <span class=\"download-only\">Tu</span> scaricherai "
-"una immagine ISO di Tails: un singolo file contenente l'intero sistema "
-"operativo. Per la tua sicurezza, è molto importante che tu faccia anche una "
-"verifica sul file che hai scaricato. Ti proponiamo due modi per fare questa "
-"verifica automaticamente."
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]] immagine ISO </a> (<span class=\"remove-"
+"extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
+"\"age\"]]</span>)."
-#. type: Content of: <div>
-msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"<a>I already downloaded Tails <span class=\"remove-extra-space\">&nbsp;[[!"
+"inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span>."
+"</a>"
+msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <div><p>
-msgid "Please wait…"
-msgstr "Aspetta un attimo…"
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+msgstr ""
-#. type: Content of: <div><div>
-msgid "0.2.8"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"We failed to detect your browser vendor, maybe because JavaScript is "
-"disabled."
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-"Non riusciamo a sapere dal tuo browser da chi è prodotto, forse perchè hai "
-"JavaScript disabilitato."
-#. type: Content of: <div><div><p>
-msgid "You can download and verify the ISO image via:"
-msgstr "Puoi scaricare e verificare l'immagine ISO in vari modi:"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "With an unverified download, you might:"
+msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Browser add-on"
-msgstr "Un'estensione del browser (browser add-on)"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Lose time if your download is incomplete or broken due to an error during "
+"the download. This is quite frequent."
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
-"for <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+</a> or <a href=\"https://www.torproject.org/download/"
-"download-easy.html.en\">Tor Browser <span class=\"minver-tor\">5</span>+</a>"
+"Get hacked while using Tails if our download mirrors have been compromised "
+"and are serving malicious downloads."
msgstr ""
-"per Firefox successivi alla versione<span class=\"minver-firefox\">38.0.1</"
-"span> oppure Tor Browser superiori alla versione <span class=\"minver-tor"
-"\">5</span>"
-#. type: Content of: <div><div><div><div><p>
-msgid "A Firefox add-on to download and verify Tails automatically."
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
msgstr ""
-"Un'estensione di Firefox (Firefox add-on) per scaricare e verificare Tails "
-"automaticamente."
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are not in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if your download is modified on the fly by an "
+"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "Copy and paste this link in Firefox or Tor Browser:"
-msgstr "Fai copia ed incolla di questo link nel tuo browser Firefox o Tor:"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<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=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are already in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"You seem to have JavaScript disabled. To use our browser extension, please "
+"allow all this page:"
msgstr ""
-#. type: Content of: <div><div><div><div>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"https://addons.mozilla.org/firefox/downloads/latest-beta/673020/"
-#| "addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-#| "\">Install Firefox add-on</a>"
-msgid ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Install Firefox add-on</a>"
-msgstr ""
-"<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\">Già uso Firefox <span class=\"minver-firefox\">38.0.1</"
-"span>+ o Tor Browser <span class=\"minver-tor\">5</span>+.</a>"
-
-#. type: Content of: <div><div><div><div><h2>
-msgid "BitTorrent"
-msgstr "BitTorrent"
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[!img screenshots/allow_js.png link=\"no\"]]"
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Download "
-"Torrent file</a>"
-msgstr "[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Scarica il file via Torrent</a>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
+msgstr ""
-#. type: Content of: <div><div><p>
-msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
-msgstr "[[Scarica e verifica il file usando OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "<u>Tails Verification</u> extension installed!"
+msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You seem to be using an unsupported browser."
-msgstr "Sembrerebbe che tu stia usando un browser non supportato."
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"label>"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Verifying <span id=\"filename\">$FILENAME</span>&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"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:"
+"[[!toggleable id=\"why-failed\" text=\"\"\" [[!toggle id=\"why-failed\" text="
+"\"X\"]]"
msgstr ""
-"Stai utilizzando Firefox <span class=\"current-firefox\">1.0</span>. "
-"Aggiorna Firefox almeno alla versione <span class=\"minver-firefox\">38.0.1</"
-"span>, Tor Browser almeno alla<span class=\"minver-tor\">5</span>, o "
-"successive e visita questo link:"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser and already have our "
-"Firefox add-on installed."
+"Most likely, the verification failed because of an error or interruption "
+"during the download."
msgstr ""
-"Pare che stai utilizzando una versione di Firefox o di Tor Browser che ha "
-"già installato l'add-on di Firefox richiesto."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"Less likely, the verification might have failed because of a malicious "
+"download from our download mirrors or due to a network attack in your "
+"country or local network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "Downloading again is usually enough to fix this problem."
msgstr ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Usare un'estensione di "
-"Firefox (Firefox add-on)</span>"
-#. type: Content of: <div><div><div><a><div>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"<span class=\"label label-default state already\">Already installed</span>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
msgstr ""
-"<span class=\"label label-default state already\">Già installata</span>"
-#. type: Content of: <div><div><div>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed-again\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-failed-again\" text=\"\"\" [[!toggle id=\"why-failed-"
+"again\" text=\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "The verification might have failed again because of:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A software problem in our verification extension"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A malicious download from our download mirrors"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A network attack in your country or local network"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Trying from a different place or a different computer might solve any of "
+"these issues."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
+"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
+"span>"
+msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id=\"use-text-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
+"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
+"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
+"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
+"download|upgrade/tails]]</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
msgstr ""
-"<span id=\"use-text-label\" class=\"pull-left\">Usa Firefox add-on</span>"
#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
#. type: Content of: <div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser but have an outdated "
-"version of our Firefox add-on."
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
msgstr ""
-"Sembra che tu stia utilizzando Firefox o Tor Browser con una versione fuori "
-"aggiornamento del nostro componente aggiuntivo di Firefox."
-#. type: Content of: <div><div><div><a>
-#, fuzzy
-#| msgid ""
-#| "<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/"
-#| "downloads/latest-beta/673020/addon-673020-latest.xpi\" class=\"btn btn-lg "
-#| "btn-primary clearfix\"> <span id=\"update-button-label\" class=\"pull-left"
-#| "\">Update Firefox add-on</span>"
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Update "
-"Firefox add-on</span>"
+"Firefox <span id=\"min-version-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a href=\"https://www.mozilla.org/firefox/new/\">Download</a>)"
msgstr ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest-beta/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Aggiorna "
-"Firefox add-on</span>"
-#. type: Content of: <div><div><div><a><div>
-msgid "<span class=\"label label-default state restartless\">No restart</span>"
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
-"<span class=\"label label-default state restartless\">Non riavviare</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<span id=\"update-button-label\" class=\"pull-left\">Update Firefox add-on</"
-"span>"
+"Tor Browser <span id=\"min-version-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a href=\"https://www.torproject.org/download/download-easy.html"
+"\">Download</a>)"
msgstr ""
-"<span id=\"update-button-label\" class=\"pull-left\">Aggiorna Firefox add-"
-"on</span>"
#. type: Content of: <div><div><div><p>
-msgid "We detected that you are running Firefox or Tor Browser."
-msgstr "Pare che tu stia usando Firefox o Tor Browser."
+msgid "Please update your browser to the latest version."
+msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"You can download the ISO image via our Firefox add-on. The add-on verifies "
-"your download [[!toggle id=\"extension-verification\" text=\"automatically"
-"\"]]."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!toggle id=\"what-is-bittorrent\" text=\"What is BitTorrent?\"]]"
msgstr ""
-"Puoi scaricare l'immagine ISO tramite la nostra estensione per Firefox. "
-"L'estensione verifica il file che hai scaricato[[!toggle id=\"extension-"
-"verification\" text=\"automatically\"]]."
#. type: Content of: <div><div><div>
msgid ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
+"[[!toggleable id=\"what-is-bittorrent\" text=\"\"\" [[!toggle id=\"what-is-"
+"bittorrent\" text=\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"BitTorrent is a peer-to-peer technology for file sharing that makes your "
+"download faster and easier to resume."
msgstr ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
#. type: Content of: <div><div><div><p>
msgid ""
-"The verification is based on a cryptographic checksum downloaded from our "
-"website."
+"You need to install BitTorrent software on your computer, like <a href="
+"\"https://transmissionbt.com/\">Transmission</a> (for Windows, macOS, and "
+"Linux)."
msgstr ""
-"La verifica è basata sul confronto del checksum cifrato scaricato dal nostro "
-"sito."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
+msgid "BitTorrent doesn't work over Tor or in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
+msgstr ""
+
+#. type: Content of: <div><div><div>
#, fuzzy
#| msgid ""
-#| "\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/"
-#| "firefox/downloads/latest-beta/673020/addon-673020-latest.xpi\" class="
-#| "\"btn btn-lg btn-primary clearfix\"> <span id=\"install-button-label\" "
-#| "class=\"pull-left\">Install Firefox add-on</span>"
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
msgid ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Install Firefox add-on</span>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
+"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
+"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] Torrent file</a>"
msgstr ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest-beta/673020/addon-673020-latest.xpi\" class=\"btn btn-lg "
-"btn-primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Installa Firefox add-on</span>"
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] firma OpenPGP</a> dell'ultima immagine ISO Tails e salvala "
+"nella stessa cartella in cui hai savato l'immagine ISO."
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><h3>
msgid ""
-"<span id=\"install-text-label\" class=\"pull-left\">Install Firefox add-on</"
-"span>"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
-"<span id=\"install-text-label\" class=\"pull-left\">Installa Firefox add-on</"
-"span>"
#. type: Content of: <div><div><div><p>
msgid ""
-"or [[!toggle id=\"bittorrent-verification\" text=\"Download and verify via "
-"BitTorrent\"]]"
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
msgstr ""
-"o [[!toggle id=\"bittorrent-verification\" text=\"Scarica e verifica via "
-"BitTorrent\"]]"
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><p>
msgid ""
-"[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id="
-"\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/"
-"bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id=\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
+"Open and download the Torrent file with your BitTorrent client. It contains "
+"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
+"\"]] ISO image that you will use in the next step."
+msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download Torrent file</a>"
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr "\"\"\"]]"
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
+msgstr ""
-#. type: Content of: <div><div><div><p>
-msgid "or [[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
+msgid ""
+"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
+msgstr ""
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] firma OpenPGP</a> dell'ultima immagine ISO Tails e salvala "
+"nella stessa cartella in cui hai savato l'immagine ISO."
+
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
-msgstr "<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id=\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</small> </span> </a>"
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
+msgstr ""
-#. type: Content of: <div><div><div><div><div>
+#. type: Content of: <div>
msgid ""
-"Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">seconds</span> <span class=\"singular\">second</span> "
-"</span> </small>"
-msgstr "Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id=\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</span> <span class=\"plural\">minuti</span> <span class=\"singular\">minuto</span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> <span class=\"plural\">secondi</span> <span class=\"singular\">secondo</span> </span> </small>"
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
+msgstr ""
-#. type: Content of: <div><div><div><div><div><div>
+#. type: Content of: <div><p>
+msgid "This section provides simplified instructions:"
+msgstr "Questa sezione fornisce istruzioni semplificate:"
+
+#. type: Content of: <div><ul><li>
msgid ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complete</span> <span class=\"progress-label\">$PROGRESS</span>"
+"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
+"span></a>"
msgstr ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"completato</span> <span class=\"progress-label\">$PROGRESS</span>"
+"<a href=\"#windows\">In Windows con <span class=\"application\">Gpg4win</"
+"span></a>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
msgid ""
-"<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>"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
+"a>"
msgstr ""
-"<small id=\"download-path\">In scaricamento da<span class=\"download-path\">"
-"$PATH</span></small> <small id=\"downloaded-path\">Scaricato da<span class="
-"\"verify-file-path\">$PATH</span></small>"
+"<a href=\"#mac\">In macOS con <span class=\"application\">GPGTools</span></a>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#tails\">In Tails</a>"
+msgstr "<a href=\"#tails\">In Tails</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#command-line\">Using the command line</a>"
+msgstr "<a href=\"#command-line\">Usando la riga di comando</a>"
+
+#. type: Content of: <div>
+msgid "<a id=\"windows\"></a>"
+msgstr "<a id=\"windows\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In Windows with <span class=\"application\">Gpg4win</span>"
+msgstr "In Windows con <span class=\"application\">Gpg4win</span>"
+
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"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>"
+"See the [[<span class=\"application\">Gpg4win</span> documentation on "
+"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
msgstr ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"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>"
+"Guarda la documentazione [[<span class=\"application\">Gpg4win</span> su "
+"come verificare le firme|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"<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>"
+"Verify the date of the signature to make sure that you downloaded the latest "
+"version."
msgstr ""
-"<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>"
+"Verifica la data della firma per essere certa che hai scaricato l'ultima "
+"versione."
-#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click on the play button to resume."
+#. type: Content of: <div><p>
+msgid "If the following warning appears:"
+msgstr "Se compare il seguente avviso:"
+
+#. type: Content of: <div><pre>
+#, no-wrap
+msgid ""
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
msgstr ""
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"The download of the ISO image failed! Please check your network connection "
-"and click <span class=\"guilabel\">Retry</span>…"
+"Then the ISO image is still correct according to the signing key that you "
+"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
+"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
-"Lo scaricamento dell'immagine ISO è fallito! Per piacere, verifica la tua "
-"connessione ad internet e clicca su <span class=\"guilabel\">Riprova</span>…"
+"Significa che l'immagine ISO è ancora corretta secondo la chiave di firma "
+"che hai scaricato. Per rimuovere questo avviso devi <a href=\"#wot"
+"\">autenticare la chiave di firma attraverso la Web of Trust OpenPGP</a>."
-#. type: Content of: <div><div><div><div><div>
-msgid "Verify ISO image"
-msgstr "Verifica l'immagine ISO"
+#. type: Content of: <div>
+msgid "<a id=\"mac\"></a>"
+msgstr "<a id=\"mac\"></a>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><h3>
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr "In macOS usando <span class=\"application\">GPGTools</span>"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<small id=\"verify-text-calculating\">Computing SHA-256 checksum&hellip;</"
-"small>"
+"Open <span class=\"application\">Finder</span> and navigate to the folder "
+"where you saved the ISO image and the signature."
msgstr ""
-"<small id=\"verify-text-calculating\">Calcolare il SHA-256 checksum&hellip;</"
-"small>"
+"Apri il <span class=\"application\">Finder</span> e naviga nella cartella "
+"dove hai salvato l'immagine ISO e la firma."
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li>
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 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>"
+"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
+"Verify Signature of File</span></span>."
msgstr ""
-"<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 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>"
+"1. Clicca con il tasto destro sull'immagine ISO e scegli <span class="
+"\"guimenuchoice\"> <span class=\"guisubmenu\">Services</span> ▸ "
+"<span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>."
-#. type: Content of: <div><div><div><div><p>
-msgid "You downloaded and verified the ISO image successfully!"
-msgstr "Hai scaricato e verificato l'immagine ISO con risultato positivo!"
+#. type: Content of: <div>
+msgid "<a id=\"tails\"></a>"
+msgstr "<a id=\"tails\"></a>"
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><h3>
+msgid "In Tails"
+msgstr "Su Tails"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"You can now continue with the next step and <span class=\"windows"
-"\">[[Install an intermediary Tails|install/win/usb#next]].</span> <span "
-"class=\"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=\"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 ""
-"Ora puoi proseguire al prossimo punto <span class=\"windows\">[[Installa una "
-"Tails intermediaria|install/win/usb#next]].</span> <span class=\"mac-usb"
-"\">[[Installa una Tails intermediaria|install/mac/usb#next]].</span> <span "
-"class=\"mac-dvd\">[[Crea un DVD di Tails|install/mac/dvd#next]].</span> "
-"<span class=\"debian\">[[Install <span class=\"application\">Tails "
-"Installer</span>|install/debian/usb#next]].</span> <span class=\"linux"
-"\">[[Installa una Tails intermediaria|install/linux/usb#next]].</span> <span "
-"class=\"upgrade-tails\">[[Installa una Tails intermediaria|upgrade/"
-"tails#next]].</span> <span class=\"dvd\">[[Crea un DVD di Tails|install/"
-"dvd#next]].</span> <span class=\"vm\">read our [[Introduzione alle macchine "
-"virtuali|install/vm#next]].</span>"
+"Open the file browser and navigate to the folder where you saved the ISO "
+"image and the signature."
+msgstr ""
+"Apri il navigatore di file e arriva nella cartella dove hai salvato "
+"l'immagine ISO e la firma."
-#. type: Content of: <div><div><div><div><div><p>
+#. type: Content of: <div><ol><li>
msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the [[!toggle id=\"openpgp\" text=\"OpenPGP signature\"]]."
+"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
+"With Verify Signature</span>."
msgstr ""
-"Se hai esperienza con OpenPGP, puoi fare una seconda verifica usando la <a "
-"href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\"]]'>firma "
-"OpenPGP</a>. [[Vedi come si fa.|install/download/openpgp]]"
+"Clicca con il tasto destro sulla firma e scegli <span class=\"guimenuitem"
+"\">Open With Verify Signature</span>."
-#. type: Content of: <div><div><div><div><div>
-msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
+#. type: Content of: <div><ol><li>
+msgid "The verification of the ISO image starts automatically:"
+msgstr "La verifica dell'immagine ISO inizierà automaticamente:"
+
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"After the verification finishes, click on the notification counter in the "
+"bottom-right corner and on the notification with a transparent background on "
+"the right of the notification area:"
msgstr ""
+"Quando la verifica è completata, clicca sul contatore di notifiche "
+"nell'angolo in basso a destra e sulla notifica con uno sfondo trasparente "
+"sulla destra dell'area di notifica:"
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div>
+msgid "<a id=\"command-line\"></a>"
+msgstr "<a id=\"riga di comando\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Using the command line"
+msgstr "Usare la riga di comando"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"Open a terminal and navigate to the folder where you saved the ISO image and "
+"the signature."
+msgstr ""
+"Apri un terminale e naviga nella cartella dove hai salvato l'immagine ISO e "
+"la firma."
+
+#. type: Content of: <div><ol><li><p>
+msgid "Execute:"
+msgstr "Esegui:"
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+msgid "The output of this command should be the following:"
+msgstr "L'output di questo comando dovrebbe essere il seguente:"
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
+msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+msgid "If the output also includes:"
+msgstr "Se l'output include anche:"
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: WARNING: This key is not certified with a trusted signature!"
+msgstr "gpg: WARNING: This key is not certified with a trusted signature!"
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+"gpg: There is no indication that the signature belongs to the owner."
+
+#. type: Content of: <div>
+#, fuzzy
+#| msgid "<a id=\"wot\"></a>"
+msgid "\"\"\"]] <a id=\"wot\"></a>"
+msgstr "<a id=\"wot\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Authenticate the signing key through the OpenPGP Web of Trust"
+msgstr "Autenticare la chiave di firma attraverso la Web of Trust OpenPGP"
+
+#. type: Content of: <div><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
#, fuzzy
#| msgid ""
-#| "<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes"
-#| "\"]]'>Download Torrent file</a>"
+#| "The verification techniques presented until now ([[Firefox extension, "
+#| "BitTorrent|install/download]], or OpenPGP verification) all rely on some "
+#| "information being securely downloaded using HTTPS from our website:"
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download the OpenPGP signature</a>"
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
msgstr ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes"
-"\"]]'>Download Torrent file</a>"
+"Le tecniche di verifica presentate fino a ora ([[Firefox extension, "
+"BitTorrent|install/download]], o verifica OpenPGP) si basano tutte sul'aver "
+"scaricato alcune informazioni dal nostro sito in maniera sicura utilizzando "
+"HTTPS:"
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Download the Tails signing key|tails-signing.key]]"
+#. type: Content of: <div><ul><li>
+msgid "The <em>checksum</em> for the Firefox extension"
+msgstr "La <em>checksum</em> per l'estensione Firefox"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Torrent file</em> for BitTorrent"
+msgstr "Il <em>file Torrent</em> per BitTorrent"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Tails signing key</em> for the OpenPGP verification"
+msgstr "La <em>chiave di firma Tails</em> per la verifica OpenPGP"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "But, while doing so, you could download malicious information if our "
+#| "website is compromised or if you are victim of a [[man-in-the-middle "
+#| "attack|doc/about/warning#man-in-the-middle]]."
+msgid ""
+"But, while doing so, you could download malicious information if our website "
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
+"about/warning#man-in-the-middle]]."
msgstr ""
+"Ma, facendo una di queste cose, potresti scaricare informazioni malevole se "
+"il nostro sito è stato compromesso o se sei vittima di un attacco [[man-in-"
+"the-middle attack|doc/about/warning#man-in-the-middle]]."
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Learn how to do this|install/download/openpgp]]"
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP verification is the only technique that allows you to verify the "
+"ISO image even better by also authenticating the Tails signing key through "
+"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
+"way to completely protect you from malicious downloads."
msgstr ""
+"La verifica OpenPGP è l'unica tecnica che ti consente di verificare "
+"l'immagine ISO ancora meglio attraverso l'autenticazione della chiave di "
+"firma Tails tramite la Web of Trust OpenPGP. Affidarsi alla Web of Trust "
+"OpenPGP è l'unico modo per proteggerti completamente da download malevoli."
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
msgid ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Download again</a>"
+"If you are verifying an ISO image from inside Tails already, for example to "
+"do a manual upgrade, then the Tails signing key is already included in "
+"Tails. You can trust this signing key as much as you are trusting your Tails "
+"installation already because you are not downloading it."
msgstr ""
+"Se stai verificando un'immagine ISO essendo già in Tails, per esempio per "
+"fare un aggiornamento manuale, allora la chiave di firma Tails è già inclusa "
+"in Tails. Puoi avere fiducia in questa chiave di firma tanto quanto hai già "
+"fiducia nella tua installazione Tails, perché non lo stai scaricando."
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><p>
msgid ""
-"The verification of the ISO image failed! Please try to download "
-"again&hellip;"
+"One of the inherent problems of standard HTTPS is that the trust we usually "
+"put in a website is defined by certificate authorities: a hierarchical and "
+"closed set of companies and governmental institutions approved by your web "
+"browser vendor. This model of trust has long been criticized and proved "
+"several times to be vulnerable to attacks [[as explained on our warning page|"
+"doc/about/warning#man-in-the-middle]]."
msgstr ""
-"La verifica dell'immagine ISO è fallita! Per piacere prova a scaricarla "
-"nuovamente&hellip;"
+"Uno dei problemi inerenti allo standard HTTPS è che la fiducia che "
+"generalmente riponiamo in un sito è definita da certificati di autorità: un "
+"insieme gerarchico e chiuso di aziende e instituzioni governative approvate "
+"dal rivenditore del tuo browser. Questo modello di fiducia è criticato da "
+"tempo e si è dimostrato svariate volte vulnerabile agli attacchi, [[come "
+"spiegato nella nostra pagina di avviso|doc/about/warning#man-in-the-middle]]."
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><p>
msgid ""
-"The verification of the ISO image failed again! Please try to download again "
-"from a different place or a different computer&hellip;"
+"We believe that, instead, users should be given the final say when trusting "
+"a website, and that designation of trust should be done on the basis of "
+"human interactions."
msgstr ""
-"La verifica dell'immagine ISO è fallita! Per piacere prova a scaricarla "
-"nuovamente in un luogo diverso con una differente connessione o con un "
-"computer diverso da quello che stai usando ora&hellip;"
+"Noi pensiamo che, invece, gli utilizzatori dovrebbero avere la parola finale "
+"sulla fiducia verso un sito internet, e che la fiducia vada riposta sulla "
+"base di interazioni umane."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
+"on OpenPGP keys that can help solving this problem. Let's see this with an "
+"example:"
+msgstr ""
+"La [[!wikipedia Web_of_Trust]] OpenPGP è un modello di fiducia "
+"decentralizzato basato su chiavi OpenPGP che possono aiutare a risolvere "
+"questo problema. Vediamolo con un esempio:"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<em>You are friend with Alice and really trust her way of managing "
+#| "OpenPGP keys. So you are trusting Alice's key.</em>"
+msgid ""
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
+"keys. So you are trusting Alice's key.</em>"
+msgstr ""
+"<em>Sei amica di Alice e hai fiducia nel modo in cui gestisce le chiavi "
+"OpenPGP. Quindi di fidi della chiave di Alice.</em>"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
+"certified Bob's key. So Alice is trusting Bob's key.</em>"
+msgstr ""
+"<em>Inoltre, Alice incontra Bob, uno sviluppatore di Tails, in una "
+"conferenza e certifica la sua chiave. Quindi Alice ha fiducia nella chiave "
+"di Bob.</em>"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
+"fully trusts the Tails signing key.</em>"
+msgstr ""
+"<em>Bob è uno sviluppatore di Tails che possiede direttamente le chiavi di "
+"firma di Tails. Quindi Bob si fida pienamente delle chiavi di firma di Tails."
+"</em>"
+
+#. type: Content of: <div><p>
+msgid ""
+"In this scenario, Alice found a path to trust the Tails signing key without "
+"the need to rely on certificate authorities."
+msgstr ""
+"In questo scenario, Alice ha trovato un sentiero di fiducia nella chiave di "
+"firma Tails senza il bisogno di affidarsi ad autorità certificate."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
+"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
+"Debian developers. Some Debian developers have certified the Tails signing "
+"key and you can use these certifications to build a trust path. This "
+"technique is explained in detail in our instructions on [[installing Tails "
+"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
+"usb]]."
+msgstr ""
+"Se sei su Debian o Ubuntu, puoi installare il pacchetto <code>debian-"
+"keyring</code> che contiene le chiavi OpenPGP di tutti gli sviluppatori "
+"Debian. Alcuni sviluppatori Debian hanno certificato la chiave di firma di "
+"Tails e puoi usare queste certificazioni per costruire un sentiero di "
+"fiducia This technique is explained in detail in our instructions on Questa "
+"tecnica è spiegata in dettaglio nelle nostre istruzioni su [[installare "
+"Tails from Debian or Ubuntu usando la riga di comando|install/expert/usb]]."
+
+#. type: Content of: <div><p>
+msgid ""
+"Relying on the Web of Trust requires both caution and intelligent "
+"supervision by the users. The technical details are outside of the scope of "
+"this document."
+msgstr ""
+"Affidarsi alla Web of Trust richiede sia cautela che supervisione "
+"intelligente da parte degli utilizzatori. I dettagli tecnici sono al di "
+"fuori degli scopi di questo documento."
+
+#. type: Content of: <div><p>
+msgid ""
+"Since the Web of Trust is actually based on human relationships and real-"
+"life interactions, the best is to get in touch with people knowledgeable "
+"about OpenPGP and build trust relationships in order to find your own trust "
+"path to the Tails signing key."
+msgstr ""
+"Dato che la Web of Trust è basata su relazioni umane e interazioni nella "
+"vita offline, la cosa migliore è entrare in contatto con persone che hanno "
+"conoscenza di OpenPGP e costruire con loro relazioni per trovare la tua rete "
+"di fiducia nella chiave di firma Tails."
+
+#. type: Content of: <div><p>
+msgid ""
+"For example, you can start by contacting a local [[!wikipedia "
+"Linux_User_Group]], [[an organization offering Tails training|support/"
+"learn]], or other Tails enthusiasts near you and exchange about their "
+"OpenPGP practices."
+msgstr ""
+"Per esempio, puoi iniziare contattando un [[!wikipedia Linux_User_Group]], "
+"[[un'organizzazione che offra training su Tails|support/learn]], o altri "
+"entusiasti di Tails vicino a te e scambiare informazioni sulle loro pratiche "
+"OpenPGP."
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "After you built a trust path, you can certify the Tails signing key by "
+#| "signing it with your own key to get rid of some warnings during the "
+#| "verification process."
+msgid ""
+"After you build a trust path, you can certify the Tails signing key by "
+"signing it with your own key to get rid of some warnings during the "
+"verification process."
+msgstr ""
+"Una volta che hai stabilito un sentiero di fiducia, puoi certificare la "
+"chiave di firma di Tails firmandola con la tua stessa chiave per liberarti "
+"di alcuni degli avvertimenti duranta il processo di verifica."
+
+#~ msgid "Download and verify using OpenPGP"
+#~ msgstr "Scarica e verifica usando OpenPGP"
+
+#~ msgid ""
+#~ "These instructions are for people who are already familiar with basic "
+#~ "usage of OpenPGP and have <em>GPG</em> installed but might need guidance "
+#~ "on performing the verification."
+#~ msgstr ""
+#~ "Queste istruzioni sono per persone che sono già familiari con un uso base "
+#~ "di OpenPGP e hanno <em>GPG</em> installato, ma potrebbero avere necessità "
+#~ "di una guida per effettuare la verifica."
+
+#~ msgid ""
+#~ "If you are doing the verification for the first time, download the "
+#~ "[[Tails signing key|tails-signing.key]] and import it in your keyring. "
+#~ "If you are working from Tails, the signing key is already included."
+#~ msgstr ""
+#~ "Se stai facendo la verifica per la prima volta, scarica la [[chiave di "
+#~ "firma Tails|tails-signing.key]] e importala nel tuo portachiavi. Se stai "
+#~ "lavorando da Tails, la chiave di firma è già inclusa."
+
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Tutte le immagini ISO sono firmate con la stessa chiave, quindi devi "
+#~ "importarla solo una volta. In ogni caso, devi verificare l'immagine ISO "
+#~ "ogni volta in cui ne scarichi una nuova."
+
+#~ msgid ""
+#~ "This download of the Tails signing key is protected using HTTPS. But you "
+#~ "could still download a malicious signing key if our website is "
+#~ "compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+#~ "about/warning#man-in-the-middle]]."
+#~ msgstr ""
+#~ "Questo download della chiave di firma Tails è protetto usato HTTPS. Ma "
+#~ "potresti comunque scaricare una chiave di firma maligna se il tuo sito "
+#~ "compromesso o se sei vittima di un [[attacco man-in-the-middle|doc/about/"
+#~ "warning#man-in-the-middle]]."
+
+#~ msgid ""
+#~ "For additional verification, you can <a href=\"#wot\">authenticate the "
+#~ "signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Per verifiche aggiuntive, puoi <a href=\"#wot\">autenticare la chiave di "
+#~ "firma attraverso la Web of Trust di OpenPGP</a>."
+
+#~ msgid "Verify the ISO image"
+#~ msgstr "Verificare l'immagine ISO"
+
+#~ msgid ""
+#~ "As explained above in step 3, this simple OpenPGP verification provides a "
+#~ "level of verification equivalent to HTTPS, like the [[Firefox extension "
+#~ "or BitTorrent|install/download]], unless you also <a href=\"#wot"
+#~ "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Come spiegato precedentemente al passaggio 3, questa semplice verica "
+#~ "OpenPGP fornisce un livello di verifica equivalente all'HTTPS, come "
+#~ "un'[[estensione Firefox o BitTorrent|install/download]], a meno che tu "
+#~ "non <a href=\"#wot\">autentichi la chiave di firma utilizzando la Web of "
+#~ "Trust OpenPGP</a>."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "Altre letture su OpenPGP"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], un software OpenPGP free"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], un "
+#~ "tutorial sulle chiavi di firma delle altre persone"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], istruzioni su come gestire la fiducia nelle chiavi "
+#~ "con Gpg4win"
+
+#, fuzzy
+#~| msgid ""
+#~| "Verify the date of the signature to make sure that you downloaded the "
+#~| "latest version."
+#~ msgid ""
+#~ "Verify the date of the signature to make sure that you downloaded the "
+#~ "latest version. If the output also includes:"
+#~ msgstr ""
+#~ "Verifica la data della firma per essere certa che hai scaricato l'ultima "
+#~ "versione."
+
+#, fuzzy
+#~| msgid ""
+#~| " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
+#~ msgid ""
+#~ "The verification of the ISO image starts automatically: [[!img install/"
+#~ "inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
+
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
+
+#~ msgid "</div>\n"
+#~ msgstr "</div>\n"
+
+#~ msgid ""
+#~ " Verify the date of the signature to make sure that you downloaded the "
+#~ "latest version.\n"
+#~ msgstr ""
+#~ " Verifica la data della firma per assicurarti di aver scaricato "
+#~ "l'ultima versione.\n"
+
+#~ msgid ""
+#~ " Then the ISO image is still correct according to the signing key that "
+#~ "you\n"
+#~ " downloaded. To remove this warning you need to <a href=\"#wot"
+#~ "\">authenticate\n"
+#~ " the signing key through the OpenPGP Web of Trust</a>.\n"
+#~ msgstr ""
+#~ " L'immagine ISO è ancora corretta secondo la chiave di firma che hai\n"
+#~ " scaricato. Per rimuovere questo avviso devi <a href=\"#wot"
+#~ "\">autenticare\n"
+#~ " la chiave di firma attraverso la Web of Trust OpenPGP</a>.\n"
-#. type: Content of: outside any tag (error?)
-msgid "<a id=\"next\"></a>"
-msgstr "<a id=\"next\"></a>"
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
-#~ msgid "0.2.7rc55"
-#~ msgstr "0.2.7rc55"
+#~ msgid "<div class=\"tip\">\n"
+#~ msgstr "<div class=\"tip\">\n"
#~ msgid ""
-#~ "for Firefox <span class=\"minver-firefox\">38.0.1</span>+ or Tor Browser "
-#~ "<span class=\"minver-tor\">5</span>+"
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
#~ msgstr ""
-#~ "per Firefox successivi alla versione<span class=\"minver-firefox"
-#~ "\">38.0.1</span> oppure Tor Browser superiori alla versione <span class="
-#~ "\"minver-tor\">5</span>"
+#~ "<p>Tails [[è passato a una nuova chiave\n"
+#~ "di firma|news/signing_key_transition]] nel marzo 2015.\n"
+#~ "Se avevi la chiave di firma precedente, assicurati\n"
+#~ "di [[importare e verificare la nuova chiave\n"
+#~ "di firma|news/signing_key_transition#index1h1]].</p>\n"
diff --git a/wiki/src/install/inc/steps/download.inline.pt.po b/wiki/src/install/inc/steps/download.inline.pt.po
index 98c1c5e..2b30336 100644
--- a/wiki/src/install/inc/steps/download.inline.pt.po
+++ b/wiki/src/install/inc/steps/download.inline.pt.po
@@ -3,577 +3,1098 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2017-02-09 19:34+0100\n"
-"Last-Translator: Tails Developers <amnesia@boum.org>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:30+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: pt\n"
+"Language: \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: Content of: <div>
+msgid "0.95"
+msgstr ""
#. type: Content of: <h1>
-msgid "Download and verify the Tails ISO image"
+msgid ""
+"Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
-"Baixe e verifique a imagem ISO do Tails "
-"======================================="
-#. type: Content of: <div>
+#. type: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
+"<a>I already downloaded Tails <span class=\"remove-extra-space\">&nbsp;[[!"
+"inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span>."
+"</a>"
msgstr ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<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."
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "With an unverified download, you might:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Lose time if your download is incomplete or broken due to an error during "
+"the download. This is quite frequent."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if our download mirrors have been compromised "
+"and are serving malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if your download is modified on the fly by an "
+"attacker on the network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
msgstr ""
-"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm"
-"\">Neste passo</span> <span class=\"download-only\">Você</span> vai baixar o "
-"Tails como uma imagem ISO: um único arquivo contendo todo o sistema. Para "
-"sua segurança, é muito importante também verificar a integridade do arquivo. "
-"Nós propomos duas técnicas para fazer esta verificação automaticamente."
#. type: Content of: <div>
-msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
+msgid "\"\"\"]]"
+msgstr ""
-#. type: Content of: <div><p>
-msgid "Please wait…"
-msgstr "Por favor aguarde…"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
-#. type: Content of: <div><div>
-msgid "0.2.8"
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"We failed to detect your browser vendor, maybe because JavaScript is "
-"disabled."
+"You seem to have JavaScript disabled. To use our browser extension, please "
+"allow all this page:"
msgstr ""
-"Nós não conseguimos detectar o seu navegador, provavelmente porque o "
-"JavaScript está desabilitado."
-#. type: Content of: <div><div><p>
-msgid "You can download and verify the ISO image via:"
-msgstr "Você pode baixar e verificar a imagem ISO através de:"
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[!img screenshots/allow_js.png link=\"no\"]]"
+msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Browser add-on"
-msgstr "Extensão do navegador"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"for <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+</a> or <a href=\"https://www.torproject.org/download/"
-"download-easy.html.en\">Tor Browser <span class=\"minver-tor\">5</span>+</a>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
-"para o <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-"
-"firefox\">38.0.1</span>+</a> ou o <a href=\"https://www.torproject.org/"
-"download/download-easy.html.en\">Navegador Tor <span class=\"minver-tor\">5</"
-"span>+</a>"
-#. type: Content of: <div><div><div><div><p>
-msgid "A Firefox add-on to download and verify Tails automatically."
+#. type: Content of: <div><div><div><div><div><p>
+msgid "<u>Tails Verification</u> extension installed!"
msgstr ""
-"Uma extensão do Firefox para baixar e verificar o Tails automaticamente."
-#. type: Content of: <div><div><div><div><p>
-#, fuzzy
-#| msgid "We detected that you are running Firefox or Tor Browser."
-msgid "<strong>If you are not in Firefox or Tor Browser:</strong>"
-msgstr "Nós detectamos que você está rodando Firefox ou Navegador Tor."
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"label>"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "Copy and paste this link in Firefox or Tor Browser:"
-msgstr "Copie e cole este link no Firefox ou Navegador Tor:"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Verifying <span id=\"filename\">$FILENAME</span>&hellip;"
+msgstr ""
-#. type: Content of: <div><div><div><div>
-#, fuzzy
-#| msgid ""
-#| "<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>"
-msgid ""
-"<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>"
-msgstr ""
-"<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\">Eu já estou no Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+ ou Navegador Tor <span class=\"minver-tor\">5</span>+.</a>"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
-#, fuzzy
-#| msgid "We detected that you are running Firefox or Tor Browser."
-msgid "<strong>If you are already in Firefox or Tor Browser:</strong>"
-msgstr "Nós detectamos que você está rodando Firefox ou Navegador Tor."
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
-#. type: Content of: <div><div><div><div>
-#, fuzzy
-#| msgid ""
-#| "\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/"
-#| "firefox/downloads/latest-beta/673020/addon-673020-latest.xpi\" class="
-#| "\"btn btn-lg btn-primary clearfix\"> <span id=\"install-button-label\" "
-#| "class=\"pull-left\">Install Firefox add-on</span>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Install Firefox add-on</a>"
+"[[!toggleable id=\"why-failed\" text=\"\"\" [[!toggle id=\"why-failed\" text="
+"\"X\"]]"
msgstr ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest-beta/673020/addon-673020-latest.xpi\" class=\"btn btn-lg "
-"btn-primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Instalar extensão do Firefox</span>"
-#. type: Content of: <div><div><div><div><h2>
-msgid "BitTorrent"
-msgstr "BitTorrent"
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Most likely, the verification failed because of an error or interruption "
+"during the download."
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Download "
-"Torrent file</a>"
-msgstr "[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Baixe o arquivo Torrent</a>"
+"Less likely, the verification might have failed because of a malicious "
+"download from our download mirrors or due to a network attack in your "
+"country or local network."
+msgstr ""
-#. type: Content of: <div><div><p>
-msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "Downloading again is usually enough to fix this problem."
msgstr ""
-"<a href=\"http://dl.amnesia.boum.org/tails/stable/\">Baixe diretamente "
-"(inseguro!)</a>"
-#. type: Content of: <div><div><p>
-msgid "You seem to be using an unsupported browser."
-msgstr "Parece que você está usando um navegador não suportado."
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed-again\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"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:"
+"[[!toggleable id=\"why-failed-again\" text=\"\"\" [[!toggle id=\"why-failed-"
+"again\" text=\"X\"]]"
msgstr ""
-"Você está rodando o Firefox <span class=\"current-firefox\">1.0</span>. Por "
-"favor atualize para o Firefox <span class=\"minver-firefox\">38.0.1</span>, "
-"Navegador Tor <span class=\"minver-tor\">5</span> ou mais novo e abra este "
-"link:"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "The verification might have failed again because of:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A software problem in our verification extension"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A malicious download from our download mirrors"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A network attack in your country or local network"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser and already have our "
-"Firefox add-on installed."
+"Trying from a different place or a different computer might solve any of "
+"these issues."
msgstr ""
-"Nós detectamos que você está em um Firefox ou Navegador Tor e já tem a nossa "
-"extensão do Firefox instalada."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"Please try to download again from a different place or a different "
+"computer&hellip;"
msgstr ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Usar extensão do Firefox</"
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
+"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
"span>"
+msgstr ""
-#. type: Content of: <div><div><div><a><div>
+#. type: Content of: <div><div><div><div>
msgid ""
-"<span class=\"label label-default state already\">Already installed</span>"
-msgstr "<span class=\"label label-default state already\">Já instalado</span>"
+"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
+"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
+"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
+"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
+"download|upgrade/tails]]</span>"
+msgstr ""
-#. type: Content of: <div><div><div>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span id=\"use-text-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
-"<span id=\"use-text-label\" class=\"pull-left\">Usar extensão do Firefox</"
-"span>"
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Pronto\"]]</span>"
#. type: Content of: <div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser but have an outdated "
-"version of our Firefox add-on."
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
msgstr ""
-"Nós detectamos que você está rodando Firefox ou Navegador Tor mas tem uma "
-"versão desatualizada da nossa extensão do Firefox."
-#. type: Content of: <div><div><div><a>
-#, fuzzy
-#| msgid ""
-#| "<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/"
-#| "downloads/latest-beta/673020/addon-673020-latest.xpi\" class=\"btn btn-lg "
-#| "btn-primary clearfix\"> <span id=\"update-button-label\" class=\"pull-left"
-#| "\">Update Firefox add-on</span>"
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Update "
-"Firefox add-on</span>"
+"Firefox <span id=\"min-version-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a href=\"https://www.mozilla.org/firefox/new/\">Download</a>)"
msgstr ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest-beta/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Atualizar "
-"extensão do Firefox</span>"
-#. type: Content of: <div><div><div><a><div>
-msgid "<span class=\"label label-default state restartless\">No restart</span>"
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
-"<span class=\"label label-default state restartless\">Não é necessário "
-"reiniciar</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<span id=\"update-button-label\" class=\"pull-left\">Update Firefox add-on</"
-"span>"
+"Tor Browser <span id=\"min-version-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a href=\"https://www.torproject.org/download/download-easy.html"
+"\">Download</a>)"
msgstr ""
-"<span id=\"update-button-label\" class=\"pull-left\">Atualizar extensão do "
-"Firefox</span>"
#. type: Content of: <div><div><div><p>
-msgid "We detected that you are running Firefox or Tor Browser."
-msgstr "Nós detectamos que você está rodando Firefox ou Navegador Tor."
+msgid "Please update your browser to the latest version."
+msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"You can download the ISO image via our Firefox add-on. The add-on verifies "
-"your download [[!toggle id=\"extension-verification\" text=\"automatically"
-"\"]]."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
-"Você pode baixar a imagem ISO através da nossa extensão do Firefox. A "
-"extensão verifica o arquivo [[!toggle id=\"extension-verification\" text="
-"\"automaticamente\"]]."
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
msgstr ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!toggle id=\"what-is-bittorrent\" text=\"What is BitTorrent?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div>
msgid ""
-"The verification is based on a cryptographic checksum downloaded from our "
-"website."
+"[[!toggleable id=\"what-is-bittorrent\" text=\"\"\" [[!toggle id=\"what-is-"
+"bittorrent\" text=\"X\"]]"
msgstr ""
-"A verificação é baseada em uma soma de verificação criptográfica obtidas do "
-"nosso site."
-#. type: Content of: <div><div><div><a>
-#, fuzzy
-#| msgid ""
-#| "\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/"
-#| "firefox/downloads/latest-beta/673020/addon-673020-latest.xpi\" class="
-#| "\"btn btn-lg btn-primary clearfix\"> <span id=\"install-button-label\" "
-#| "class=\"pull-left\">Install Firefox add-on</span>"
+#. type: Content of: <div><div><div><p>
msgid ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Install Firefox add-on</span>"
+"BitTorrent is a peer-to-peer technology for file sharing that makes your "
+"download faster and easier to resume."
msgstr ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest-beta/673020/addon-673020-latest.xpi\" class=\"btn btn-lg "
-"btn-primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Instalar extensão do Firefox</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<span id=\"install-text-label\" class=\"pull-left\">Install Firefox add-on</"
-"span>"
+"You need to install BitTorrent software on your computer, like <a href="
+"\"https://transmissionbt.com/\">Transmission</a> (for Windows, macOS, and "
+"Linux)."
msgstr ""
-"<span id=\"install-text-label\" class=\"pull-left\">Instalar a extensão do "
-"Firefox</span>"
#. type: Content of: <div><div><div><p>
+msgid "BitTorrent doesn't work over Tor or in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"or [[!toggle id=\"bittorrent-verification\" text=\"Download and verify via "
-"BitTorrent\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-"ou [[!toggle id=\"bittorrent-verification\" text=\"Baixe e verifique via "
-"BitTorrent\"]]"
#. type: Content of: <div><div><div>
msgid ""
-"[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id="
-"\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/"
-"bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id=\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
+"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
+"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] Torrent file</a>"
+msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><h3>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download Torrent file</a>"
-msgstr "<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort=\"age\"]]'>Baixar arquivo Torrent</a>"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr "\"\"\"]]"
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
+msgstr ""
#. type: Content of: <div><div><div><p>
-#, fuzzy
-#| msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
-msgid "or [[Download and verify using OpenPGP|install/download/openpgp]]"
+msgid ""
+"Open and download the Torrent file with your BitTorrent client. It contains "
+"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
+"\"]] ISO image that you will use in the next step."
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-"<a href=\"http://dl.amnesia.boum.org/tails/stable/\">Baixe diretamente "
-"(inseguro!)</a>"
-#. type: Content of: <div><div>
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
-msgstr "<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left\">Baixe a imagem ISO do Tails <span class=\"iso-version\">[[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> <small id=\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</small> </span> </a>"
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
+msgstr ""
-#. type: Content of: <div><div><div><div><div>
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">seconds</span> <span class=\"singular\">second</span> "
-"</span> </small>"
-msgstr "Baixe a imagem ISO do Tails <span class=\"iso-version\">[[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> <small id=\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</span> <span class=\"plural\">minutos</span> <span class=\"singular\">minuto</span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> <span class=\"plural\">segundos</span> <span class=\"singular\">segundo</span> </span> </small>"
+"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
+msgstr ""
-#. type: Content of: <div><div><div><div><div><div>
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complete</span> <span class=\"progress-label\">$PROGRESS</span>"
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"completo</span> <span class=\"progress-label\">$PROGRESS</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
msgid ""
-"<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>"
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-"<small id=\"download-path\">Salvando em <span class=\"download-path\">$PATH</"
-"span></small> <small id=\"downloaded-path\">Salvo em <span class=\"verify-"
-"file-path\">$PATH</span></small>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "This section provides simplified instructions:"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
msgid ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"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>"
+"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
+"span></a>"
msgstr ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Tentar novamente</a> <span id=\"download-button-state-pause\" class="
-"\"\">[[!img install/inc/icons/pause.png link=\"no\" alt=\"Pausar\"]]</span> "
-"<span id=\"download-button-state-resume\" class=\"\">[[!img install/inc/"
-"icons/play.png link=\"no\" alt=\"Resumir\"]]</span> <span id=\"download-"
-"button-state-cancel\" class=\"btn btn-link\">Cancelar</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
msgid ""
-"<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>"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
+"a>"
msgstr ""
-"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
-"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
-"\"Pronto\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!"
-"img install/inc/icons/failed.png link=\"no\" alt=\"Falhou\"]]</span>"
-#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click on the play button to resume."
-msgstr "O *download* foi pausado. Clique no botão *Resumir* para resumir."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#tails\">In Tails</a>"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#command-line\">Using the command line</a>"
+msgstr ""
+
+#. type: Content of: <div>
+msgid "<a id=\"windows\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "In Windows with <span class=\"application\">Gpg4win</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"The download of the ISO image failed! Please check your network connection "
-"and click <span class=\"guilabel\">Retry</span>…"
+"See the [[<span class=\"application\">Gpg4win</span> documentation on "
+"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
msgstr ""
-"O *download* da imagem ISO falhou! Por favor verifique a conexão e clique em "
-"<span class=\"guilabel\">Tentar novamente</span>…"
-#. type: Content of: <div><div><div><div><div>
-msgid "Verify ISO image"
-msgstr "Verificar imagem ISO"
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"Verify the date of the signature to make sure that you downloaded the latest "
+"version."
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "If the following warning appears:"
+msgstr ""
+
+#. type: Content of: <div><pre>
+#, no-wrap
msgid ""
-"<small id=\"verify-text-calculating\">Computing SHA-256 checksum&hellip;</"
-"small>"
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
msgstr ""
-"<small id=\"verify-text-calculating\">Computando soma SHA-256&hellip;</small>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li><p>
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 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>"
+"Then the ISO image is still correct according to the signing key that you "
+"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
+"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
-"<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 done\">[[!img install/"
-"inc/icons/check.png link=\"no\" alt=\"Pronto\"]]</span> <span id=\"verify-"
-"text-state-failed\" class=\"state failed\">[[!img install/inc/icons/failed."
-"png link=\"no\" alt=\"Falhou\"]]</span>"
-#. type: Content of: <div><div><div><div><p>
-msgid "You downloaded and verified the ISO image successfully!"
-msgstr "Você baixou e verificou a imagem ISO com sucesso!"
+#. type: Content of: <div>
+msgid "<a id=\"mac\"></a>"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><h3>
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"You can now continue with the next step and <span class=\"windows"
-"\">[[Install an intermediary Tails|install/win/usb#next]].</span> <span "
-"class=\"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=\"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 ""
-"Agora você pode continuar com o próximo passo e <span class=\"windows"
-"\">[[Instalar um Tails intermediário|install/win/usb#next]].</span> <span "
-"class=\"mac-usb\">[[Instalar um Tails intermediário|install/mac/usb#next]].</"
-"span> <span class=\"mac-dvd\">[[Gravar um DVD do Tails|install/mac/"
-"dvd#next]].</span> <span class=\"debian\">[[Instalar o <span class="
-"\"application\">Tails Installer</span>|install/debian/usb#next]].</span> "
-"<span class=\"linux\">[[Instalar um Tails intermediário|install/linux/"
-"usb#next]].</span> <span class=\"upgrade-tails\">[[Instalar um Tails "
-"intermediário|upgrade/tails#next]].</span> <span class=\"dvd\">[[Gravar um "
-"DVD do Tails|install/dvd#next]].</span> <span class=\"vm\">leia a nossa "
-"[[Introdução a máquinas virtuais|install/vm#next]].</span>"
+"Open <span class=\"application\">Finder</span> and navigate to the folder "
+"where you saved the ISO image and the signature."
+msgstr ""
-#. type: Content of: <div><div><div><div><div><p>
+#. type: Content of: <div><ol><li>
msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the [[!toggle id=\"openpgp\" text=\"OpenPGP signature\"]]."
+"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
+"Verify Signature of File</span></span>."
msgstr ""
-"Se você tem conhecimento sobre OpenPGP, você pode fazer verificação "
-"adicional usando a [[!toggle id=\"openpgp\" text=\"assinatura OpenPGP\"]]."
-#. type: Content of: <div><div><div><div><div>
-msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
+#. type: Content of: <div>
+msgid "<a id=\"tails\"></a>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><h3>
+msgid "In Tails"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"Open the file browser and navigate to the folder where you saved the ISO "
+"image and the signature."
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
+"With Verify Signature</span>."
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid "The verification of the ISO image starts automatically:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"After the verification finishes, click on the notification counter in the "
+"bottom-right corner and on the notification with a transparent background on "
+"the right of the notification area:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div>
+msgid "<a id=\"command-line\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "Using the command line"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"Open a terminal and navigate to the folder where you saved the ISO image and "
+"the signature."
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "Execute:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "The output of this command should be the following:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "If the output also includes:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: WARNING: This key is not certified with a trusted signature!"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+
+#. type: Content of: <div>
+msgid "\"\"\"]] <a id=\"wot\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "Authenticate the signing key through the OpenPGP Web of Trust"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>checksum</em> for the Firefox extension"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Torrent file</em> for BitTorrent"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Tails signing key</em> for the OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"But, while doing so, you could download malicious information if our website "
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
+"about/warning#man-in-the-middle]]."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP verification is the only technique that allows you to verify the "
+"ISO image even better by also authenticating the Tails signing key through "
+"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
+"way to completely protect you from malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are verifying an ISO image from inside Tails already, for example to "
+"do a manual upgrade, then the Tails signing key is already included in "
+"Tails. You can trust this signing key as much as you are trusting your Tails "
+"installation already because you are not downloading it."
+msgstr ""
+
+#. type: Content of: <div><p>
#, fuzzy
#| msgid ""
-#| "<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes"
-#| "\"]]'>Download Torrent file</a>"
+#| "One of the inherent problems of standard HTTPS is that the trust we "
+#| "usually put on a website is defined by certificate authorities: a "
+#| "hierarchical and closed set of companies and governmental institutions "
+#| "approved by web browser vendors. This model of trust has long been "
+#| "criticized and proved several times to be vulnerable to attacks [[as "
+#| "explained on our warning page|about/warning#man-in-the-middle]]."
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download the OpenPGP signature</a>"
+"One of the inherent problems of standard HTTPS is that the trust we usually "
+"put in a website is defined by certificate authorities: a hierarchical and "
+"closed set of companies and governmental institutions approved by your web "
+"browser vendor. This model of trust has long been criticized and proved "
+"several times to be vulnerable to attacks [[as explained on our warning page|"
+"doc/about/warning#man-in-the-middle]]."
msgstr ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes"
-"\"]]'>Baixar arquivo Torrent</a>"
+"Um dos problemas inerentes ao HTTPS padrão é que a confiança que geralmente "
+"se coloca em um sítio web é definida por autoridades certificadoras: um "
+"conjunto fechado e hierárquico de companhias e instituições governamentais "
+"aprovadas pelos desenvolvedores de navegadores. Este modelo de confiança tem "
+"sido criticado há muito tempo e provou muitas vezes ser vulnerável a ataques "
+"[[como explicado em nossa página de advertência|about/warning#man-in-the-"
+"middle]]."
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Download the Tails signing key|tails-signing.key]]"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We believe instead that users should be given the final say when trusting "
+#| "a website, and that designation of trust should be done on the basis of "
+#| "human interaction."
+msgid ""
+"We believe that, instead, users should be given the final say when trusting "
+"a website, and that designation of trust should be done on the basis of "
+"human interactions."
msgstr ""
+"Ao invés disso, acreditamos que os usuários devem dar a última palavra "
+"quanto à confiança em um sítio web, e que a indicação de confiança deve ser "
+"feita com base em interação humana."
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><p>
#, fuzzy
-#| msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
-msgid "[[Learn how to do this|install/download/openpgp]]"
+#| msgid ""
+#| "The OpenPGP [[!wikipedia Web_of_Trust desc=\"Web of Trust\"]] is a "
+#| "decentralized trust model based on OpenPGP keys. Let's see that with an "
+#| "example."
+msgid ""
+"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
+"on OpenPGP keys that can help solving this problem. Let's see this with an "
+"example:"
msgstr ""
-"<a href=\"http://dl.amnesia.boum.org/tails/stable/\">Baixe diretamente "
-"(inseguro!)</a>"
+"A [[!wikipedia Web_of_Trust desc=\"Rede de Confiança\"]] é um modelo de "
+"confiança descentralizado baseado em chaves OpenPGP. Vejamos um exemplo."
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li>
#, fuzzy
-#| msgid "<a href=\"\" id=\"download-again\" class=\"\">Download again</a>"
+#| msgid ""
+#| "*You're a friend of Alice and really trust her way of managing OpenPGP "
+#| "keys.\n"
+#| "You're trusting Alice's key.*\n"
msgid ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Download again</a>"
-msgstr "<a href=\"\" id=\"download-again\" class=\"\">Baixar novamente</a>"
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
+"keys. So you are trusting Alice's key.</em>"
+msgstr ""
+"*Você é amigo de Alice e realmente confia em sua forma de gerenciar chaves "
+"OpenPGP. Você está confiando na chave de Alice.*\n"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "*Furthermore, Alice met Bob, a Tails developer, in a conference, and "
+#| "signed\n"
+#| "Bob's key. Alice is trusting Bob's key.*\n"
msgid ""
-"The verification of the ISO image failed! Please try to download "
-"again&hellip;"
+"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
+"certified Bob's key. So Alice is trusting Bob's key.</em>"
msgstr ""
-"A verificação da imagem ISO falhou! Por favor tente baixar novamente&hellip;"
+"*Além disso, Alice conheceu Bob, um desenvolvedor do Tails, em uma "
+"conferência, e assinou a chave de Bob. Alice está confiando na chave de "
+"Bob*.\n"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "*Bob is a Tails developer who directly owns the Tails signing key. Bob "
+#| "fully\n"
+#| "trusts Tails signing key.*\n"
msgid ""
-"The verification of the ISO image failed again! Please try to download again "
-"from a different place or a different computer&hellip;"
+"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
+"fully trusts the Tails signing key.</em>"
msgstr ""
-"A verificação da imagem ISO falhou novamente! Por favor baixe novamente de "
-"um local diferente ou de um computador diferente&hellip;"
+"*Bob é um desenvolvedor do Tails que possui diretamente a chave de "
+"assinatura do Tails. Bob confia completamente na chave de assinatura do "
+"Tails.\n"
-#. type: Content of: outside any tag (error?)
-msgid "<a id=\"next\"></a>"
-msgstr "<a id=\"next\"></a>"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This scenario creates a trust path from you to Tails signing key that "
+#| "could allow you to trust it without having to depend on certificate "
+#| "authorities."
+msgid ""
+"In this scenario, Alice found a path to trust the Tails signing key without "
+"the need to rely on certificate authorities."
+msgstr ""
+"Este cenário cria um caminho de confiança de você até a chave de assinatura "
+"do Tails que pode te permitir confiar nela sem depender de autoridades "
+"certificadoras."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
+"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
+"Debian developers. Some Debian developers have certified the Tails signing "
+"key and you can use these certifications to build a trust path. This "
+"technique is explained in detail in our instructions on [[installing Tails "
+"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
+"usb]]."
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This trust model is not perfect either and requires both caution and "
+#| "intelligent supervision by users. The technical details of creating, "
+#| "managing and trusting OpenPGP keys is outside of the scope of this "
+#| "document."
+msgid ""
+"Relying on the Web of Trust requires both caution and intelligent "
+"supervision by the users. The technical details are outside of the scope of "
+"this document."
+msgstr ""
+"Este modelo de confiança também não é perfeito e requer ambos cautela e "
+"supervisão inteligente por parte dos usuários. Os detalhes técnicos sobre a "
+"criação, gerenciamento e confiança em chaves GPG estão fora do escopo deste "
+"documento."
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Since the Web of Trust is actually based on human relationships and real-"
+#| "life interactions the best would be to start establishing contacts with "
+#| "people knowledgeable about OpenPGP, start using it yourself and build "
+#| "trust relationships in order to find your own trust path to Tails signing "
+#| "key."
+msgid ""
+"Since the Web of Trust is actually based on human relationships and real-"
+"life interactions, the best is to get in touch with people knowledgeable "
+"about OpenPGP and build trust relationships in order to find your own trust "
+"path to the Tails signing key."
+msgstr ""
+"Uma vez que a Rede de Confiança é de fato baseada em relações humanas e "
+"interações na vida real, o melhor é começar a estabelecer contatos com "
+"pessoas que tenham conhecimento sobre OpenPGP, começar a usá-lo você mesmo/a "
+"e construir relações de confiança para encontrar seu próprio caminho de "
+"confiança na chave de assinatura do Tails."
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "You could start by contacting a local [[!wikipedia Linux_User_Group desc="
+#| "\"%s\"]] or other Tails enthusiasts near you and exchange about their "
+#| "OpenPGP practices."
+msgid ""
+"For example, you can start by contacting a local [[!wikipedia "
+"Linux_User_Group]], [[an organization offering Tails training|support/"
+"learn]], or other Tails enthusiasts near you and exchange about their "
+"OpenPGP practices."
+msgstr ""
+"Você pode começar contatando um [[!wikipedia Linux_User_Group desc=\"Grupo "
+"de Usuários de Linux\" ou outros/as entusiastas do Tails próximos/as a você "
+"e trocando ideia sobre suas práticas com OpenPGP."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"After you build a trust path, you can certify the Tails signing key by "
+"signing it with your own key to get rid of some warnings during the "
+"verification process."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| "Note that since all Tails releases are signed with the same key, you "
+#~| "will not have to verify the key every time and the trust you might "
+#~| "progressively build in it will be built once and for all. Still, you "
+#~| "will have to check the ISO image every time you download a new one!"
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Note que, como todos os lançamentos do Tails são assinadas com a mesma "
+#~ "chave, você não precisa verificar a chave toda vez. Além disso, a "
+#~ "confiança que você pode adquirir progressivamente nesta chave em algum "
+#~ "momento vai ser adquirida de uma vez por todas. Mesmo assim você tem que "
+#~ "verificar a imagem ISO toda vez que baixar uma nova!"
-#~ msgid "0.2.7rc55"
-#~ msgstr "0.2.7rc55"
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "Mais leituras sobre o OpenPGP"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], um software livre que "
+#~ "implementa OpenPGP"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr ""
+#~ "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]] (em "
+#~ "inglês)"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], um "
+#~ "tutorial sobre como assinar chaves de outras pessoas (em inglês)"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Explicação da rede de confiança do PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]] (em inglês)"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: inspeção de certificado|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instruções para gerenciar confiança em chaves "
+#~ "usando Gpg4win"
+
+#~ msgid "<!-- l10n placeholder for language-specific link -->"
+#~ msgstr "<!-- l10n placeholder for language-specific link -->"
+
+#~ msgid ""
+#~ "We also acknowledge that not everybody might be able to create good trust "
+#~ "path to Tails signing key since it based on a network of direct human "
+#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
+#~ msgstr ""
+#~ "Nós também reconhecemos que nem todos podem conseguir criar um bom "
+#~ "caminho de confiança até a chave de assinatura uma vez que isto está "
+#~ "baseado em uma rede de relações humanas diretas e conhecimento de "
+#~ "ferramentas tão complexas quanto OpenPGP."
+
+#~ msgid ""
+#~ "Note that since all Tails releases are signed with the same key, you will "
+#~ "not have to verify the key every time and the trust you might "
+#~ "progressively build in it will be built once and for all. Still, you will "
+#~ "have to check the ISO image every time you download a new one!"
+#~ msgstr ""
+#~ "Note que, como todos os lançamentos do Tails são assinadas com a mesma "
+#~ "chave, você não precisa verificar a chave toda vez. Além disso, a "
+#~ "confiança que você pode adquirir progressivamente nesta chave em algum "
+#~ "momento vai ser adquirida de uma vez por todas. Mesmo assim você tem que "
+#~ "verificar a imagem ISO toda vez que baixar uma nova!"
+
+#~ msgid ""
+#~ "If you want to be extra cautious and really authenticate Tails signing "
+#~ "key in a stronger way than what standard HTTPS offers you, you will need "
+#~ "to use the OpenPGP Web of Trust."
+#~ msgstr ""
+#~ "Se você quiser ser extra cuidadoso e realmente autenticar a chave de uma "
+#~ "forma mais forte que o HTTPS padrão te oferece, você vai precisar usar a "
+#~ "Rede de Confiança OpenPGP."
#~ msgid ""
-#~ "<a id=\"i_have_iso\" href=\"\" title=\"Select an ISO image to verify\">I "
-#~ "already have an ISO image.</a>"
+#~ "We will present you three techniques from the easiest to the safest. "
+#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
+#~ "them according to your possibilities and technical skills."
#~ msgstr ""
-#~ "<a id=\"i_have_iso\" href=\"\" title=\"Selecione uma imagem ISO para "
-#~ "verificar\">Eu já tenho uma imagem ISO.</a>"
+#~ "Nós vamos apresentar agora três técnicas: desde a mais fácil até a mais "
+#~ "segura. Reforçamos que nenhuma delas é uma solução mágica e perfeita. "
+#~ "Sinta-se à vontade para explorá-las de acordo com suas possibilidades e "
+#~ "habilidades técnicas."
diff --git a/wiki/src/install/inc/steps/download_2.inline.de.po b/wiki/src/install/inc/steps/download_2.inline.de.po
deleted file mode 100644
index 5311839..0000000
--- a/wiki/src/install/inc/steps/download_2.inline.de.po
+++ /dev/null
@@ -1,251 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-27 11:54+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <div><div><h2>
-msgid "Direct download"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails"
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
-"ISO image (1.2 GB)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using your browser"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might lose time if your download is incomplete or broken due to an error "
-"during the download."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid "This is quite frequent."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if our download mirrors have been "
-"compromised and are serving malicious downloads."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
-"operating systems.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if your download is modified on the "
-"fly by an attacker on the network."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
-"strong adversaries.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
-"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
-"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
-"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
-"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
-"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
-"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Your extension is an older version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
-"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
-"\">Update extension (no restart)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Installed!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Updated!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verifying $FILENAME&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verification successful!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "Please <a>try to download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">3.</span>Continue installing"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid ""
-"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
-"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
-"\">Next</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
-"b></u>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Direct download is only available for:"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
-"(<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
-"later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
-"and later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Please update your browser to the latest version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
-msgstr ""
-
-#. type: Content of: <div><div><h2>
-msgid "BitTorrent download"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "<a>What is BitTorrent?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid ""
-"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
-"3.1 Torrent file</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"Your BitTorrent client will automatically verify your download when it is "
-"complete."
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
-"\" class=\"btn btn-primary\">Next</a>"
-msgstr ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.fa.po b/wiki/src/install/inc/steps/download_2.inline.fa.po
deleted file mode 100644
index 5311839..0000000
--- a/wiki/src/install/inc/steps/download_2.inline.fa.po
+++ /dev/null
@@ -1,251 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-27 11:54+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <div><div><h2>
-msgid "Direct download"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails"
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
-"ISO image (1.2 GB)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using your browser"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might lose time if your download is incomplete or broken due to an error "
-"during the download."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid "This is quite frequent."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if our download mirrors have been "
-"compromised and are serving malicious downloads."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
-"operating systems.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if your download is modified on the "
-"fly by an attacker on the network."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
-"strong adversaries.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
-"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
-"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
-"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
-"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
-"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
-"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Your extension is an older version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
-"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
-"\">Update extension (no restart)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Installed!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Updated!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verifying $FILENAME&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verification successful!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "Please <a>try to download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">3.</span>Continue installing"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid ""
-"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
-"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
-"\">Next</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
-"b></u>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Direct download is only available for:"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
-"(<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
-"later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
-"and later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Please update your browser to the latest version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
-msgstr ""
-
-#. type: Content of: <div><div><h2>
-msgid "BitTorrent download"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "<a>What is BitTorrent?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid ""
-"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
-"3.1 Torrent file</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"Your BitTorrent client will automatically verify your download when it is "
-"complete."
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
-"\" class=\"btn btn-primary\">Next</a>"
-msgstr ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.fr.po b/wiki/src/install/inc/steps/download_2.inline.fr.po
deleted file mode 100644
index 5311839..0000000
--- a/wiki/src/install/inc/steps/download_2.inline.fr.po
+++ /dev/null
@@ -1,251 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-27 11:54+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <div><div><h2>
-msgid "Direct download"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails"
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
-"ISO image (1.2 GB)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using your browser"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might lose time if your download is incomplete or broken due to an error "
-"during the download."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid "This is quite frequent."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if our download mirrors have been "
-"compromised and are serving malicious downloads."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
-"operating systems.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if your download is modified on the "
-"fly by an attacker on the network."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
-"strong adversaries.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
-"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
-"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
-"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
-"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
-"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
-"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Your extension is an older version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
-"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
-"\">Update extension (no restart)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Installed!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Updated!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verifying $FILENAME&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verification successful!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "Please <a>try to download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">3.</span>Continue installing"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid ""
-"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
-"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
-"\">Next</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
-"b></u>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Direct download is only available for:"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
-"(<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
-"later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
-"and later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Please update your browser to the latest version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
-msgstr ""
-
-#. type: Content of: <div><div><h2>
-msgid "BitTorrent download"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "<a>What is BitTorrent?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid ""
-"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
-"3.1 Torrent file</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"Your BitTorrent client will automatically verify your download when it is "
-"complete."
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
-"\" class=\"btn btn-primary\">Next</a>"
-msgstr ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.html b/wiki/src/install/inc/steps/download_2.inline.html
deleted file mode 100644
index 7c16722..0000000
--- a/wiki/src/install/inc/steps/download_2.inline.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<div class="row">
-
- <div class="col-md-6"> <!-- Direct download -->
- <h2>Direct download</h2>
-
- <div class="supported-browser no-js">
- <h3><span class="step-number">1.</span>Download Tails</h3>
- <a id="download-iso" class="btn btn-primary indent">Download Tails 3.1 ISO image (1.2 GB)</a>
-
- <div id="step-verify-direct">
- <h3><span class="step-number">2.</span>Verify your download using your browser</h3>
- <div class="caution indent">
- <p><b>For your security, always verify your download!</b><br/>
- Our browser extension makes it quick and easy.</p>
- <p class="floating-toggleable-link">[[!toggle id="why-verify" text="Why?"]]</p>
-
- <div id="why-verify" class="floating-toggleable">
- [[!toggleable id="why-verify" text="""
- [[!toggle id="why-verify" text="X"]]
- <ul>
- <li>You might lose time if your download is incomplete or broken due to an error during the download.<br/>
- This is quite frequent.</li>
- <li>You might get hacked while using Tails if our download mirrors have been compromised and are serving malicious downloads.<br/>
- <a href="http://blog.linuxmint.com/?p=2994">This already happened to other operating systems.</a></li>
- <li>You might get hacked while using Tails if your download is modified on the fly by an attacker on the network.<br/>
- <a href="https://en.wikipedia.org/wiki/DigiNotar">This is possible for strong adversaries.</a></li>
- </ul>
- """]]
- </div>
-
- </div>
- <div id="install-extension" class="indent">
- <a class="install-extension-btn supported-browser firefox btn btn-primary">Install <u>Tails verification</u> extension (no restart)</a>
- <a class="install-extension-btn supported-browser chrome btn btn-primary">Install <u>Tails verification</u> extension (no restart)</a>
- <a class="install-extension-btn no-js btn btn-primary">Install extension for <u>Firefox and Tor Browser</u> (no restart)</a>
- <a class="install-extension-btn no-js btn btn-primary">Install extension for <u>Chrome and Chromium</u> (no restart)</a>
- </div>
- <div id="update-extension" class="indent block">
- <p>Your extension is an older version.</p>
- <a class="install-extension-btn firefox btn btn-primary">Update extension (no restart)</a>
- <a class="install-extension-btn chrome btn btn-primary">Update extension (no restart)</a>
- </div>
- <div id="verification" class="indent block">
- <p id="extension-installed" class="block">Installed!</p>
- <p id="extension-updated" class="block">Updated!</p>
- <a id="verify-download" class="btn btn-primary">Verify download&hellip;</a>
- <p id="verifying-download" class="block">Verifying $FILENAME&hellip;</p>
- <p id="verification-successful" class="block">Verification successful!</p>
- <div id="verification-failed">
- <p><b>Verification failed!</b></p>
- <p>Please <a>try to download again&hellip;</a></p>
- <a>Why?</a>
- </div>
- <div id="verification-failed-again">
- <p><b>Verification failed again!</b></p>
- <p>Please try to download again from a different place or a different computer&hellip;</p>
- <a>Why?</a>
- </div>
- </div>
- </div>
-
- <div id="step-continue-direct">
- <h3><span class="step-number">3.</span>Continue installing</h3>
- </div>
- <div id="continue-link-direct" class="indent">
- <a id="skip-download-direct">Skip download</a>
- <a id="skip-verification-direct">Skip verification</a>
- <a id="next-direct" class="btn btn-primary">Next</a>
- </div>
- </div> <!-- Supported browser & No JS -->
-
- <div class="outdated-browser unsupported-browser">
- <p>You are using <u><b><span id="detected-browser">$DETECTED-BROWSER</span></b></u>.</p>
- <p>Direct download is only available for:</p>
- <ul>
- <li>Firefox <span class="minver-firefox">$MINVER-FIREFOX</span> and later (<a>Download</a>)</li>
- <li>Chrome and Chromium <span class="minver-chrome">$MINVER-CHROME</span> and later (<a>Download</a>)</li>
- <li>Tor Browser <span class="minver-tor-browser">$MINVER-TOR-BROWSER</span> and later (<a>Download</a>)</li>
- </ul>
- </div>
- <div class="outdated-browser">
- <p>Please update your browser to the latest version.</p>
- </div>
- <div class="unsupported-browser">
- <div class="caution">
- <p><b>For your security, always verify your download!</b><br/>
- Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes this quick and easy.</p>
- <p><a>Why?</a></p>
- </div>
- <p>Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:</p>
- <p>https://tails.boum.org/install/download/</p>
- </div> <!-- Outdated browser -->
- </div> <!-- Direct download -->
-
- <div class="col-md-6">
- <h2>BitTorrent download</h2>
- <a>What is BitTorrent?</a>
-
- <h3><span class="step-number">1.</span>Download Tails (Torrent file)</h3>
- <a id="download-torrent" class="btn btn-primary indent">Download Tails 3.1 Torrent file</a>
-
- <div id="step-verify-bittorrent">
- <h3><span class="step-number">2.</span>Verify your download using BitTorrent</h3>
- <p class="indent">Your BitTorrent client will automatically verify your download when it is complete.</p>
- </div>
-
- <div id="step-continue-bittorrent">
- <h3><span class="step-number">3.</span>Continue installing</h3>
- </div>
- <div id="continue-link-bittorrent" class="indent">
- <a id="skip-download-bittorrent">Skip download</a>
- <a id="next-bittorrent" class="btn btn-primary">Next</a>
- </div>
- </div> <!-- BitTorrent download -->
-
-</div>
diff --git a/wiki/src/install/inc/steps/download_2.inline.it.po b/wiki/src/install/inc/steps/download_2.inline.it.po
deleted file mode 100644
index 5311839..0000000
--- a/wiki/src/install/inc/steps/download_2.inline.it.po
+++ /dev/null
@@ -1,251 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-27 11:54+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <div><div><h2>
-msgid "Direct download"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails"
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
-"ISO image (1.2 GB)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using your browser"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might lose time if your download is incomplete or broken due to an error "
-"during the download."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid "This is quite frequent."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if our download mirrors have been "
-"compromised and are serving malicious downloads."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
-"operating systems.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if your download is modified on the "
-"fly by an attacker on the network."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
-"strong adversaries.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
-"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
-"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
-"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
-"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
-"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
-"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Your extension is an older version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
-"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
-"\">Update extension (no restart)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Installed!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Updated!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verifying $FILENAME&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verification successful!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "Please <a>try to download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">3.</span>Continue installing"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid ""
-"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
-"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
-"\">Next</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
-"b></u>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Direct download is only available for:"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
-"(<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
-"later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
-"and later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Please update your browser to the latest version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
-msgstr ""
-
-#. type: Content of: <div><div><h2>
-msgid "BitTorrent download"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "<a>What is BitTorrent?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid ""
-"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
-"3.1 Torrent file</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"Your BitTorrent client will automatically verify your download when it is "
-"complete."
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
-"\" class=\"btn btn-primary\">Next</a>"
-msgstr ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.pt.po b/wiki/src/install/inc/steps/download_2.inline.pt.po
deleted file mode 100644
index 5311839..0000000
--- a/wiki/src/install/inc/steps/download_2.inline.pt.po
+++ /dev/null
@@ -1,251 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-27 11:54+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <div><div><h2>
-msgid "Direct download"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails"
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
-"ISO image (1.2 GB)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using your browser"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might lose time if your download is incomplete or broken due to an error "
-"during the download."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid "This is quite frequent."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if our download mirrors have been "
-"compromised and are serving malicious downloads."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
-"operating systems.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"You might get hacked while using Tails if your download is modified on the "
-"fly by an attacker on the network."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><ul><li>
-msgid ""
-"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
-"strong adversaries.</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
-"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
-"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
-"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
-"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
-"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
-"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Your extension is an older version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
-"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
-"\">Update extension (no restart)</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Installed!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Updated!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
-"a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verifying $FILENAME&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Verification successful!"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "Please <a>try to download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid "<span class=\"step-number\">3.</span>Continue installing"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid ""
-"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
-"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
-"\">Next</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
-"b></u>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Direct download is only available for:"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
-"(<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
-"later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><ul><li>
-msgid ""
-"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
-"and later (<a>Download</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Please update your browser to the latest version."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
-msgstr ""
-
-#. type: Content of: <div><div><h2>
-msgid "BitTorrent download"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "<a>What is BitTorrent?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid ""
-"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
-"3.1 Torrent file</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><h3>
-msgid ""
-"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"Your BitTorrent client will automatically verify your download when it is "
-"complete."
-msgstr ""
-
-#. type: Content of: <div><div><div>
-msgid ""
-"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
-"\" class=\"btn btn-primary\">Next</a>"
-msgstr ""
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 ec28a93..c23d2f0 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: Tails\n"
"POT-Creation-Date: 2017-09-25 20:19+0200\n"
-"PO-Revision-Date: 2017-08-26 14:08+0000\n"
+"PO-Revision-Date: 2017-10-29 12:51+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -111,10 +111,9 @@ msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" a
msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"Clé USB branchée sur la droite\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\n"
+#, no-wrap
msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Second USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
+msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
#. type: Plain text
#, no-wrap
@@ -122,10 +121,9 @@ msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-
msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"Clé USB branchée sur la droite\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+#, no-wrap
msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
#. type: Bullet: '1. '
msgid ""
@@ -178,18 +176,14 @@ msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debia
msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Installeur de Tails\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <div class=\"expert\">\n"
-#| " <pre><code>tails-installer-launcher</code></pre>\n"
-#| " </div>\n"
+#, no-wrap
msgid ""
" <div class=\"expert\">\n"
" <pre><code>tails-installer</code></pre>\n"
" </div>\n"
msgstr ""
" <div class=\"expert\">\n"
-" <pre><code>tails-installer-launcher</code></pre>\n"
+" <pre><code>tails-installer</code></pre>\n"
" </div>\n"
#. type: Plain text
@@ -198,22 +192,19 @@ msgid " </div>\n"
msgstr " </div>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+#, no-wrap
msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Installeur de Tails : 'Installation par clonage', 'Mise à jour par clonage', 'Mise à jour à partir d'une ISO'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac install-clone\" alt=\"Installeur de Tails : 'Cloner le Tails actuellement utilisé'\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+#, no-wrap
msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Use a downloaded Tails ISO image'\"]]\n"
-msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Installeur de Tails : 'Installation', 'Mise à jour'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Installeur de Tails : 'Utiliser une image ISO Tails téléchargée'\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+#, no-wrap
msgid " [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"screenshot upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Installeur de Tails : 'Installation', 'Mise à jour'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"screenshot upgrade\" alt=\"Installeur de Tails : 'Cloner le Tails actuellement utilisé'\"]]\n"
#. type: Plain text
#, no-wrap
@@ -244,13 +235,7 @@ msgstr ""
"span> et choisir l'image ISO que vous avez téléchargé plus tôt.</p>"
#. type: Plain text
-#, fuzzy, no-wrap
-#| 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 mac-dvd upgrade-clone\">your</span>\n"
-#| " USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+#, no-wrap
msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
@@ -262,14 +247,9 @@ msgstr ""
" <span class=\"windows linux mac-usb\">la seconde</span>\n"
" <span class=\"install-clone mac-clone\">la nouvelle</span>\n"
" <span class=\"debian expert mac-dvd upgrade-clone\">votre</span>\n"
-" clé USB dans la liste déroulante <span class=\"guilabel\">Périphérique cible</span>.\n"
+" clé USB dans la liste déroulante <span class=\"guilabel\">Clé USB cible</span>.\n"
#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "To start the <span class=\"debian expert windows linux mac install-clone"
-#| "\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on "
-#| "the <span class=\"button\">Install Tails</span> button."
msgid ""
"To start the <span class=\"debian expert windows linux mac install-clone"
"\">installation, click on the <span class=\"button\">Install</span> button.</"
@@ -277,16 +257,12 @@ msgid ""
"\">Upgrade</span> button.</span>"
msgstr ""
"Pour démarrer <span class=\"debian expert windows linux mac install-clone"
-"\">l'installation,</span> <span class=\"upgrade\">la mise à jour,</span> "
-"cliquer sur le bouton <span class=\"button\">Installer Tails</span>."
+"\">l'installation, cliquez sur le bouton <span class=\"button"
+"\">Installation</span>.</span> <span class=\"upgrade\">la mise à jour, "
+"cliquez sur le bouton <span class=\"button\">Mise à jour</span>.</span>"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If it is impossible to upgrade the USB stick because it was not\n"
-#| " installed using <span class=\"application\">Tails Installer</span>, restart\n"
-#| " <span class=\"application\">Tails Installer</span> and choose\n"
-#| " <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+#, no-wrap
msgid ""
" <div class=\"note upgrade\">\n"
" <p>If your Tails USB stick was not installed using\n"
@@ -294,10 +270,11 @@ msgid ""
" <span class=\"guilabel\">Install</span> button instead.</p>\n"
" </div>\n"
msgstr ""
-" <p>Si il est impossible de mettre à jour la clé USB car elle n'a pas été\n"
-" installée avec l'<span class=\"application\">Installeur de Tails</span>, redémarrer\n"
-" l'<span class=\"application\">Installeur de Tails</span> et choisir\n"
-" <span class=\"guilabel\">Installation par clonage</span>.</p>\n"
+" <div class=\"note upgrade\">\n"
+" <p>Si votre clé USB Tails n'a pas été installée avec\n"
+" l'<span class=\"application\">Installeur de Tails</span>, cliquez à la place\n"
+" sur le bouton <span class=\"guilabel\">Installation</span>.</p>\n"
+" </div>\n"
#. type: Bullet: '1. '
msgid ""
@@ -370,6 +347,3 @@ msgstr "<p>Merci de prendre soin de vous !</p>\n"
#~ "\">Installation par clonage</span> <span class=\"button debian expert"
#~ "\">Installation</span> <span class=\"button upgrade\">Mise à jour par "
#~ "clonage</span>."
-
-#~ msgid " <div class=\"note upgrade\">\n"
-#~ msgstr " <div class=\"note upgrade\">\n"
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.de.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.de.po
index 654f23d..809ea40 100644
--- a/wiki/src/install/inc/steps/install_final_in_debian.inline.de.po
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-23 12:05+0000\n"
"PO-Revision-Date: 2016-03-05 03:13-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -178,10 +178,9 @@ msgid " <p>Start <span class=\"application\">Tails Installer</span>:</p>\n"
msgstr " <p>Starten Sie den <span class=\"application\">Tails Installer</span>:</p>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
-msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
+#, no-wrap
+msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po
index c81e8f2..d51e1b0 100644
--- a/wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-27 17:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -139,7 +139,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
+msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po
index a39e9ed..01d7155 100644
--- a/wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
-"PO-Revision-Date: 2017-08-26 14:08+0000\n"
+"POT-Creation-Date: 2017-11-23 12:05+0000\n"
+"PO-Revision-Date: 2017-10-29 13:43+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -111,10 +111,9 @@ msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" a
msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"Clé USB branchée sur la droite\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\n"
+#, no-wrap
msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Second USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
+msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
#. type: Plain text
#, no-wrap
@@ -122,10 +121,9 @@ msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-
msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"Clé USB branchée sur la droite\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+#, no-wrap
msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
#. type: Bullet: '1. '
msgid ""
@@ -174,8 +172,8 @@ msgstr " <p>Démarrer l'<span class=\"application\">Installeur de Tails</span>
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
-msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Installeur de Tails\"]]\n"
+msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -200,8 +198,8 @@ msgid ""
"class=\"button upgrade\">Upgrade by cloning</span> button."
msgstr ""
"Cliquer sur le bouton <span class=\"button windows linux mac install-clone"
-"\">Installation par clonage</span> <span class=\"button debian expert"
-"\">Installation</span> <span class=\"button upgrade\">Mise à jour par "
+"\">Installation par clonage</span><span class=\"button debian expert"
+"\">Installation</span><span class=\"button upgrade\">Mise à jour par "
"clonage</span>."
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.it.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.it.po
index a78e4fb..bd4fa80 100644
--- a/wiki/src/install/inc/steps/install_final_in_debian.inline.it.po
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails 1\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-27 17:16+0100\n"
"PO-Revision-Date: 2016-09-02 14:25+0200\n"
"Last-Translator: ignifugo <ignifugo@insicuri.net>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -171,7 +171,7 @@ msgstr " <p>Avvia <span class=\"application\">Tails Installer</span>:</p>\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
+msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn b/wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn
index 188d95f..989f2e7 100644
--- a/wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn
@@ -63,7 +63,7 @@
<p>Start <span class="application">Tails Installer</span>:</p>
- [[!img install/inc/icons/tails-installer.png link="no" class="debian" alt="Tails Installer"]]
+ [[!img install/inc/icons/tails-installer.png link="no" class="debian" alt=""]]
<div class="expert">
<pre><code>tails-installer-launcher</code></pre>
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po
index befb973..1c59331 100644
--- a/wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-23 12:05+0000\n"
"PO-Revision-Date: 2016-04-30 12:36-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -175,10 +175,9 @@ msgid " <p>Start <span class=\"application\">Tails Installer</span>:</p>\n"
msgstr " <p>Inicie o <span class=\"application\">Tails Installer</span>:</p>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
-msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
+#, no-wrap
+msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po b/wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po
index ebf4b2e..f7b3e9d 100644
--- a/wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po
+++ b/wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-04-28 14:22+0000\n"
+"POT-Creation-Date: 2017-12-03 12:53+0000\n"
"PO-Revision-Date: 2016-06-18 15:46-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -22,9 +22,15 @@ msgid "<h1 id=\"install-intermediary\">Install an intermediary Tails</h1>\n"
msgstr "<h1 id=\"install-intermediary\">Ein zwischenzeitliches Tails installieren</h1>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+#| "stick using\n"
+#| "<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
+#| "<span class=\"mac\">the command line.</span>\n"
+#| "<span class=\"linux\">a program called <span class=\"application\">GNOME Disks</span>.</span>\n"
msgid ""
-"In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+"In this step, you will install an intermediary Tails by copying the Tails ISO image on the first USB\n"
"stick using\n"
"<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
"<span class=\"mac\">the command line.</span>\n"
diff --git a/wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po b/wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po
index df4a919..84e4595 100644
--- a/wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-04-28 14:22+0000\n"
+"POT-Creation-Date: 2017-12-03 12:53+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"
@@ -24,7 +24,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+"In this step, you will install an intermediary Tails by copying the Tails ISO image on the first USB\n"
"stick using\n"
"<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
"<span class=\"mac\">the command line.</span>\n"
diff --git a/wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po b/wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po
index 4967dff..fa8a055 100644
--- a/wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-04-28 14:22+0000\n"
-"PO-Revision-Date: 2017-02-17 18:50-0000\n"
+"POT-Creation-Date: 2017-12-03 12:53+0000\n"
+"PO-Revision-Date: 2017-10-29 13:32+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -21,15 +21,21 @@ msgid "<h1 id=\"install-intermediary\">Install an intermediary Tails</h1>\n"
msgstr "<h1 id=\"install-intermediary\">Installer un Tails intermédiaire</h1>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+#| "stick using\n"
+#| "<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
+#| "<span class=\"mac\">the command line.</span>\n"
+#| "<span class=\"linux\">a program called <span class=\"application\">GNOME Disks</span>.</span>\n"
msgid ""
-"In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+"In this step, you will install an intermediary Tails by copying the Tails ISO image on the first USB\n"
"stick using\n"
"<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
"<span class=\"mac\">the command line.</span>\n"
"<span class=\"linux\">a program called <span class=\"application\">GNOME Disks</span>.</span>\n"
msgstr ""
-"Dans cette étape, vous allez installer un Tails intermédiaire en copiant l'image ISO de Tails\n"
+"À cette étape, vous allez installer un Tails intermédiaire en copiant l'image ISO de Tails\n"
"sur une première clé USB en utilisant\n"
"<span class=\"windows\">un programme appelé <span class=\"application\">Universal USB Installer</span>.</span>\n"
"<span class=\"mac\">la ligne de commande.</span>\n"
@@ -38,8 +44,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
-"<div class=\"note\">\n"
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
@@ -49,26 +54,21 @@ msgid ""
"automatic security upgrades or the possibility to store some of your\n"
"documents and configuration in an encrypted storage.</p>\n"
msgstr ""
-"<p>"
-"Ce Tails intermédiaire manquera de fonctionnalités importantes comme\n"
+"<p>Ce Tails intermédiaire manquera de fonctionnalités importantes comme\n"
"les mises à jour de sécurité automatiques ou la possibilité de stocker\n"
-"des documents et des réglages dans un espace de stockage chiffré."
-"</p>\n"
+"des documents et des réglages dans un espace de stockage chiffré.</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
-"</div>\n"
+msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
-msgstr ""
-"<div class=\"caution\">\n"
+msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
msgid "<p>All the data on this USB stick will be lost.</p>\n"
-msgstr ""
-"<p>Toutes les données sur cette clé USB seront perdues.</p>\n"
+msgstr "<p>Toutes les données sur cette clé USB seront perdues.</p>\n"
diff --git a/wiki/src/install/inc/steps/install_intermediary_intro.inline.it.po b/wiki/src/install/inc/steps/install_intermediary_intro.inline.it.po
index 916b284..795faee 100644
--- a/wiki/src/install/inc/steps/install_intermediary_intro.inline.it.po
+++ b/wiki/src/install/inc/steps/install_intermediary_intro.inline.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tranitails 1\n"
-"POT-Creation-Date: 2016-05-17 09:40+0200\n"
+"POT-Creation-Date: 2017-12-03 12:53+0000\n"
"PO-Revision-Date: 2016-09-02 14:26+0200\n"
"Last-Translator: ignifugo <ignifugo@insicuri.net>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -22,9 +22,15 @@ msgid "<h1 id=\"install-intermediary\">Install an intermediary Tails</h1>\n"
msgstr "<h1 id=\"install-intermediary\">Installla una Tails intermediaria</h1>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+#| "stick using\n"
+#| "<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
+#| "<span class=\"mac\">the command line.</span>\n"
+#| "<span class=\"linux\">a program called <span class=\"application\">GNOME Disks</span>.</span>\n"
msgid ""
-"In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+"In this step, you will install an intermediary Tails by copying the Tails ISO image on the first USB\n"
"stick using\n"
"<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
"<span class=\"mac\">the command line.</span>\n"
diff --git a/wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn b/wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn
index 8a54032..ef6b78e 100644
--- a/wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn
@@ -1,6 +1,6 @@
<h1 id="install-intermediary">Install an intermediary Tails</h1>
-In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB
+In this step, you will install an intermediary Tails by copying the Tails ISO image on the first USB
stick using
<span class="windows">a program called <span class="application">Universal USB Installer</span>.</span>
<span class="mac">the command line.</span>
diff --git a/wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po b/wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po
index 8262751..53a1f99 100644
--- a/wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2017-12-03 12:53+0000\n"
"PO-Revision-Date: 2016-04-30 12:26-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -22,9 +22,15 @@ msgid "<h1 id=\"install-intermediary\">Install an intermediary Tails</h1>\n"
msgstr "<h1 id=\"install-intermediary\">Instale um Tails intermediário</h1>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+#| "stick using\n"
+#| "<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
+#| "<span class=\"mac\">the command line.</span>\n"
+#| "<span class=\"linux\">a program called <span class=\"application\">GNOME Disks</span>.</span>\n"
msgid ""
-"In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB\n"
+"In this step, you will install an intermediary Tails by copying the Tails ISO image on the first USB\n"
"stick using\n"
"<span class=\"windows\">a program called <span class=\"application\">Universal USB Installer</span>.</span>\n"
"<span class=\"mac\">the command line.</span>\n"
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 2f22765..407b602 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
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-01-12 22:25+0100\n"
+"POT-Creation-Date: 2017-11-23 12:33+0000\n"
"PO-Revision-Date: 2017-04-14 18:58+0200\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: \n"
@@ -65,8 +65,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Boot menu with list of devices\"]]\n"
-msgstr " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Boot -Menü mit einer Liste von Geräten\"]]\n"
+msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
#. type: Bullet: ' 1. '
msgid "Shut down the computer."
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 e2f3210..53c3dfc 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: 2017-01-12 22:25+0100\n"
+"POT-Creation-Date: 2017-11-27 17:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Boot menu with list of devices\"]]\n"
+msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
msgstr ""
#. type: Bullet: ' 1. '
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 b3d02de..3f7bc1d 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
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-01-12 22:25+0100\n"
-"PO-Revision-Date: 2017-01-27 01:01-0000\n"
+"POT-Creation-Date: 2017-11-23 12:33+0000\n"
+"PO-Revision-Date: 2017-09-26 19:25+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -66,8 +66,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Boot menu with list of devices\"]]\n"
-msgstr " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Boot menu avec la liste des périphériques\"]]\n"
+msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
#. type: Bullet: ' 1. '
msgid "Shut down the computer."
@@ -332,7 +332,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " ### Report the problem to our support team\n"
-msgstr " ### Rapporter le problème à notre équipe d'assistance\n"
+msgstr " ### Signaler le problème à notre équipe d'assistance\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/not_at_all.inline.it.po b/wiki/src/install/inc/steps/not_at_all.inline.it.po
index 77b0aab..59c5407 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.it.po
+++ b/wiki/src/install/inc/steps/not_at_all.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-01-12 22:25+0100\n"
+"POT-Creation-Date: 2017-11-23 12:33+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -68,8 +68,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Boot menu with list of devices\"]]\n"
-msgstr ""
+msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
#. type: Bullet: ' 1. '
msgid "Shut down the computer."
@@ -436,10 +436,3 @@ msgstr ""
#. type: Bullet: ' 1. '
msgid "Does the same USB stick or DVD start successfully on other computers?"
msgstr "La stessa chiave USB o DVD si avvia con successo su altri computer?"
-
-#~ msgid ""
-#~ " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" "
-#~ "link=\"no\"]]\n"
-#~ msgstr ""
-#~ " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" "
-#~ "link=\"no\"]]\n"
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 7ea1572..1ed35ab 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.mdwn
+++ b/wiki/src/install/inc/steps/not_at_all.inline.mdwn
@@ -15,7 +15,7 @@
to display the boot menu and start on the USB stick. The following
screenshot is an example of such boot menu:
- [[!img install/inc/screenshots/bios_boot_menu.png class="screenshot" link="no" alt="Boot menu with list of devices"]]
+ [[!img install/inc/screenshots/bios_boot_menu.png class="screenshot" link="no" alt=""]]
1. Shut down the computer.
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 b85569b..6dae3a5 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: 2017-01-12 22:25+0100\n"
+"POT-Creation-Date: 2017-11-23 12:33+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"
@@ -54,7 +54,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"Boot menu with list of devices\"]]\n"
+msgid " [[!img install/inc/screenshots/bios_boot_menu.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
msgstr ""
#. type: Bullet: ' 1. '
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 6cfb485..1d8af21 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,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2017-09-25 20:19+0200\n"
-"PO-Revision-Date: 2017-06-05 13:30-0000\n"
+"PO-Revision-Date: 2017-10-29 12:54+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -143,10 +143,9 @@ msgid "<div class=\"step-image\">\n"
msgstr "<div class=\"step-image\">\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"USB stick plugged on the left\"]]\n"
+#, no-wrap
msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
-msgstr "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"Clé USB branchée sur la gauche\"]]\n"
+msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"Clé USB branchée sur la gauche\"]]\n"
#. type: Plain text
#, no-wrap
@@ -539,7 +538,7 @@ msgid ""
" Then try installing Tails on another USB stick.\n"
msgstr ""
" Si enlever <span class=\"code\">live-media=removable</span> vous permet de démarrer Tails, merci\n"
-" de rapporter le problème à notre [[équipe d'assistance|support/talk]].\n"
+" de signaler le problème à notre [[équipe d'assistance|support/talk]].\n"
" Cela contribue à améliorer la [[liste\n"
" des clés USB problématiques|support/known_issues#problematic-usb-sticks]].\n"
" Ensuite, essayez d'installer Tails sur une autre clé USB.\n"
@@ -619,6 +618,3 @@ msgid ""
msgstr ""
"<p class=\"clone mac-dvd\">C'était une première étape importante !\n"
"Maintenant attrapez la <span class=\"clone\">nouvelle</span> clé USB sur laquelle vous voulez installer Tails.</p>\n"
-
-#~ msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
-#~ msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Clé USB branchée sur la gauche\"]]\n"
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 b702249..4d7df4c 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,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2017-05-19 17:19+0200\n"
-"PO-Revision-Date: 2017-06-05 13:35-0000\n"
+"PO-Revision-Date: 2017-09-26 19:21+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -97,7 +97,7 @@ msgid ""
msgstr ""
" <div class=\"note windows linux\">\n"
" <p>Certains ordinateurs démarrent correctement le Tails intermédiaire mais échouent\n"
-" à démarrer le Tails définitif. Si c'est votre cas, rapportez vous à la\n"
+" à démarrer le Tails définitif. Si c'est votre cas, reportez vous à la\n"
" [[!toggle id=\"not_at_all\" text=\"partie résolution des problèmes\n"
" concernant Tails ne démarre pas du tout\"]].</p>\n"
" </div>\n"
diff --git a/wiki/src/install/inc/stylesheets/assistant.css b/wiki/src/install/inc/stylesheets/assistant.css
index ca8496b..c9375a3 100644
--- a/wiki/src/install/inc/stylesheets/assistant.css
+++ b/wiki/src/install/inc/stylesheets/assistant.css
@@ -1,13 +1,16 @@
-/* LAYOUT */
-
-.banner {
- height: 70px;
+/* revert bootstrap's too bold assumptions */
+* {
+ -webkit-box-sizing: unset;
+ box-sizing: unset;
}
-.banner, .page {
- box-sizing: content-box;
+.page * {
+ -webkit-box-sizing: border-box;
+ box-sizing: box;
}
+/* LAYOUT */
+
#tails-installation-assistant {
position: absolute;
top: -20px;
@@ -19,10 +22,6 @@
text-transform: capitalize;
}
-.parentlinks {
- display: none;
-}
-
.sidebar {
display: none;
}
@@ -40,14 +39,10 @@
}
.pageheader #otherlanguages {
- top: -35px;
+ top: 0;
right: 5px;
}
-span.title {
- display: none;
-}
-
/* CONTENT */
@@ -57,14 +52,6 @@ body {
margin-bottom: 100px;
}
-span.title {
- margin-top: 0px;
-}
-
-#content {
- padding-top: 20px;
-}
-
#pagebody #content .panel a {
color: black !important;
border-bottom: 0px !important;
@@ -76,7 +63,7 @@ span.title {
.also div {
padding-top: 10px;
- border-top: 2px solid #0A0;
+ border-top: 2px solid #53b351;
}
.also ul {
@@ -87,30 +74,10 @@ h1, h2, h3, h4, h5, h6 {
font-family: "Source Sans Pro Regular", "DejaVu Sans", "Verdana", "sans-serif";
}
-h1 {
- font-weight: 100;
- margin-bottom: 30px;
- margin-top: 0px;
-}
-
-h1 strong {
- font-weight: 800;
- -webkit-box-shadow: 0px -10px #0A0 inset;
- box-shadow: 0px -10px #0A0 inset;
-}
-
-h1:before {
- display: none;
-}
-
h3, h4, p, ul {
margin-bottom: 1.5em;
}
-p, ul, ol, h1, h2, h3, h4, h5, h6 {
- max-width: none;
-}
-
p, h3, h4 {
color: #505050;
}
@@ -137,26 +104,6 @@ td, th {
}
-/* BACK BUTTON */
-
-#back a {
- border: solid 1px #56347C;
- border-radius: 4px;
- display: inline-block;
- padding: 5px;
- position: relative;
- top: -5px;
- color: #0A0;
-}
-
-#back a:hover {
- color: #56347C;
- border: solid 1px #0A0;
- background: #0A0;
- color: white;
-}
-
-
/* PANELS */
.panel {
@@ -195,7 +142,7 @@ td, th {
.panel-footer {
background: none;
- border-color: #0A0;
+ border-color: #53b351;
color: #646464;
}
@@ -217,9 +164,9 @@ td, th {
#install div.toggleable, #bittorrent-minor div.toggleable, #needs div.toggleable, #scenarios div.toggleable {
background: white !important;
- border: 1px solid #0A0;
- -webkit-box-shadow: 5px 5px #0A0;
- box-shadow: 5px 5px #0A0;
+ border: 1px solid #53b351;
+ -webkit-box-shadow: 5px 5px #53b351;
+ box-shadow: 5px 5px #53b351;
padding: 15px 30px;
margin-left: auto;
margin-right: auto;
@@ -246,13 +193,6 @@ td, th {
width: 35em;
}
-#openpgp div.toggleable {
- background: none;
- border: none;
- padding: 0;
- margin: 0;
-}
-
a.toggle {
border-bottom: 1px dashed black !important;
cursor: help;
diff --git a/wiki/src/install/inc/stylesheets/dave.css b/wiki/src/install/inc/stylesheets/dave.css
deleted file mode 100644
index f021eff..0000000
--- a/wiki/src/install/inc/stylesheets/dave.css
+++ /dev/null
@@ -1,487 +0,0 @@
-/* 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.
-*/
-#download-and-verify > :not(#undetected-browser),
-#use-button,
-html:not([data-phase^="download"]) #download > :not(#download-button),
-#download-button-state,
-#download-text-state,
-#download-message
-{ display: none }
-
-html:not([data-phase="ready"]) #download-and-verify #use-button { display: none !important;}
-
-html[data-phase^="downl"] #download-text-state,
-html[data-phase^="downl"] #download-button-state,
-html[data-phase^="downl"] #download-message
-{
- display: block !important;
-}
-
-#dave-init { display: none }
-html[data-phase="init"][data-extension="ok"] #dave-init { display: block; }
-
-#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 > *,
-#download-message > * {
- 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,
-#download[data-state="pause"] #download-button-state-resume,
-#download[data-state="pause"] #download-button-state-cancel,
-#download[data-state="done"] #download-text-done,
-#download[data-state="failed"] #download-message-failed,
-#download[data-state="failed"] #download-text-failed,
-#download[data-state="failed"] #download-button-state-retry,
-#download[data-state="going"] #download-button-state-cancel,
-#download[data-state="going"] #download-button-state-pause,
-#download:not([data-state]) #download-button-state-cancel,
-#download:not([data-state]) #download-button-state-pause
-{
- display: block;
- opacity: 1
-}
-
-/*
-The browser-sniffing script in dave.js sets the data-browser attribute
-on the ancestor <html> element to either:
-
-1. "unsupported", if neither Chrome, Tor Browser or Firefox has been detected
-2. "sb-chrome" or "sb-firefox" otherwise
-
-The extension, if enabled, sets the data-extension attribute
-on the ancestor <html> element to either:not(
-- "ok" if the version is equal on higher than the content of #extension-version
-- "old" otherwise
-
-We use these two attributes to as a CSS filter to hide or show the relevant
-UI elements inside the #download-and-verify container.
-*/
-[data-browser] #download-and-verify #undetected-browser,
-[data-extension] #download-and-verify #undetected-browser
-{ display: none !important }
-
-[data-browser="unsupported"] #unsupported-browser,
-[data-browser^="sb-"] #supported-browser,
-[data-extension] #supported-browser
-{ display: block !important }
-
-html:not([data-extension]) #supported-browser > :not(#install),
-[data-extension="old"] #supported-browser > :not(#update),
-[data-extension="ok"] #supported-browser > div:not(#use)
-{ display: none }
-
-.chrome-unsupported .chrome-browser { display: none }
-
-/*
-Show only the buttons initially
-*/
-#supported-browser [id$="-text"]
-{ display: none; }
-
-/*
-Extension's toggles
-*/
-[data-extension="ok"] #download-and-verify .dave-show
-{ display: block !important }
-
-[data-extension="ok"] #download-and-verify .dave-hide
-{ display: none !important }
-
-#download {
- opacity: 0;
-}
-#download.dave-show {
- opacity: 1;
- transition: 1s;
-}
-
-#download-progress {
- width: 100%;
- margin: 0;
-}
-
-[data-phase^="download"] #download-button,
-[data-phase^="started"] #download-minor,
-[data-phase^="download"] #download-minor,
-[data-phase^="verify"] #download-minor,
-[data-phase^="verif"] #download-button,
-[data-phase^="verif"] #download-eta,
-[data-phase^="verif"] #download-progress
-{ display: none }
-
-html[data-phase^="download"] #download-and-verify #download,
-[data-phase^="download"] #download-text,
-[data-phase^="verif"] #download-text
-{ display: block !important}
-
-html[data-phase^="downloading"] #download-eta {
- opacity: 1;
-}
-
-#download-eta {
- opacity: 0;
- margin-top: 1em;
-}
-
-/*
-trick to hide both the value and the measure unit when number is bogus,
-especially for ETA with alternate min(s) / sec(s) and speed, and to use different singular and plural forms,
- e.g.
- <span data-value="1">
- <span class="eta-mins">1</span>
- <span class="plural">minutes</span>
- <span class="singular">minute</span>
- </span>
- <span data-value="90">
- <span class="eta-secs">90</span>
- <span class="plural">seconds</span>
- <span class="singular">second</span>
- </span>
-
- Will just display
- 1 minute
-
- and
-
-<span data-value="???">
- <span class="eta-mins">???</span>
- <span class="plural">minutes</span>
- <span class="singular">minute</span>
-</span>
-<span data-value="20">
- <span class="eta-secs">20</span>
- <span class="plural">seconds</span>
- <span class="singular">second</span>
-</span>
-
-will give
-20 seconds
-*/
-#download [data-value="???"],
-#download :not([data-value="1"]) > .singular,
-#download [data-value="1"] .plural,
-#download [data-value] + [data-value]
-{ display: none }
-
-#download [data-value="???"] + :not([data-value="???"])
-{ display: initial !important; }
-
-.dave-show {
- display: initial !important;
-}
-.dave-hide {
- display: none !important;
-}
-
-#download-and-verify h1 {
- margin-bottom: 50px;
-}
-
-#download-and-verify h2 {
- color: black;
- padding: 10px;
- border-bottom: 10px solid black;
-}
-
-#pagebody #download-and-verify a.btn {
- color: white !important;
- background: #56347c;
- border: none;
-}
-
-
-#download-button-state-retry {
- padding: 10px !important;
-}
-
-p.direct-download {
- margin-top: 3em;
- text-align: right;
-}
-
-/* Add transparency to past states. */
-.btn.disabled, .btn[disabled], fieldset[disabled] .btn {
- cursor: not-allowed;
- box-shadow: none;
- opacity: 0.25;
-}
-
-/* Hide download path once downloaded. */
-html[data-phase^="verified"] small#download-path,
-html[data-phase^="verifying"] small#download-path {
- opacity: 0;
-}
-
-/* Show "Done" once downloaded and changed state. */
-html[data-phase^="verified"] #download-text-state,
-html[data-phase^="verifying"] #download-text-state {
- opacity: 1;
- display: block;
-}
-
-html[data-phase^="verified"] #download-text-done,
-html[data-phase^="verifying"] #download-text-done {
- opacity: 1;
- display: block;
-}
-
-/* Hide "Download" once downloaded. */
-html[data-phase^="verified"] #download,
-html[data-phase^="verifying"] #download {
- cursor: not-allowed;
- box-shadow: none;
- opacity: 0.25 !important;
-}
-
-/* Enlarge div to look less like a button. */
-#verify-text {
- display: block;
- cursor: default;
-}
-
-
-
-/* Hide "Calculating" once verified. */
-html[data-phase^="verified"] #verify-text-calculating {
- display: none;
-}
-
-/* Less importance to GnuPG alternative. */
-#openpgp {
- background: none;
- font-size: 0.8em;
-}
-
-/* Left margin to prevent install-button::before to be in the gutter. */
-#download-and-verify {
- max-width: 600px;
- margin-left: auto;
- margin-right: auto;
- padding-top: 50px;
- padding-bottom: 50px;
- padding-left: 20px;
-}
-
-/* Do not display background image on links. */
-#download-and-verify a[href^="http"] {
- background-image: none;
-}
-
-/* Wider buttons */
-#download-button, #install-button, #update-button {
- display: block;
-}
-
-/* Show and hide BitTorrent and OpenPGP links. */
-
-#download-minor {
- display: none !important;
- margin-top: 1em;
-}
-
-#download-minor p:first-child {
- margin-left: 1.2em;
- margin-bottom: 0em;
-}
-
-#install {
- margin-bottom: 1em;
-}
-
-html:not([data-phase]) #download-minor {
- display: block !important;
-}
-
-html[data-phase="ready"] #download-minor {
- display: block !important;
-}
-
-
-/* Remove default bootstrap success background. */
-#verify-text-success {
- background: none;
-}
-
-/* Avoid big button and give some space when unsupported browser. */
-.download-options a {
- 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. ";
-}
-
-
-/* spacing */
-#update-text, #install-text, #use-text, #download {
- min-height: 70px;
-}
-
-/* Images */
-
-#download-path {
- display: inline-block;
- overflow: auto;
- width: 400px;
-}
-
-.done img {
- width: 46px;
- height: 37px;
- position: relative;
- top: -12px;
-}
-
-#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);
- cursor: pointer;
-}
-
-#download-button-state-pause:active img,
-#download-button-state-resume:active img {
- -moz-transform: rotate(10deg);
-}
-
-#download-button-state-cancel {
- text-decoration: none;
- margin-right: -20px;
- color: darkgrey;
-}
-
-#download-button-state-cancel:hover {
- text-decoration: underline;
-}
-
-#download-button-state {
- text-align: right;
-}
-#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;
-}
-
-a.download-again {
- color: darkgrey;
- border: none;
-}
-
-a.download-again:hover {
- text-decoration: underline;
-}
-
-html:not([data-phase="verified"]) #downloaded-path {
- display: none !important;
-}
-
-#download-message {
- padding-left: 16px;
-}
-
-#download-message-paused {
- font-style: italic;
-}
-
-#download[data-state="failed"] #download-message-failed {
- display: block !important;
-}
-
-#download[data-state="failed"] #download-text-failed {
- display: none !important;
-}
diff --git a/wiki/src/install/inc/stylesheets/dave_2.css b/wiki/src/install/inc/stylesheets/dave_2.css
deleted file mode 100644
index d557479..0000000
--- a/wiki/src/install/inc/stylesheets/dave_2.css
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Display No JS version by default */
-.supported-browser,
-.outdated-browser,
-.unsupported-browser {
- display: none;
-}
-
-.no-js {
- display: initial;
-}
-
-#skip-verification-direct,
-#verification,
-#update-extension,
-#extension-updated,
-#skip-download-direct,
-#skip-download-bittorrent {
- display: none;
-}
-
-#content {
- padding-left: 0 !important;
-}
-
-.btn {
- color: white !important;
- background: #0a0;
- border: none;
-}
-
-span.step-number {
- display: inline-block;
- width: 30px;
-}
-
-.indent {
- margin-left: 30px !important;
-}
-
-/* FLOATING TOGGLEABLE FOR 'WHY?' CONTEXTUAL HELP */
-
-/* Hide toggleable by default so they don't appear when there is no JavaScript. */
-.floating-toggleable-link {
- display: none;
-}
-
-.floating-toggleable div.toggleable {
- display: none;
- background: white !important;
- border: 1px solid #0A0 !important;
- -webkit-box-shadow: 5px 5px #0A0;
- box-shadow: 5px 5px #0A0;
- padding: 15px 30px !important;
- margin-left: auto;
- margin-right: auto;
- margin-top: -5px;
- position: absolute !important;
- text-align: left;
- font-size: 13px;
- z-index: 1;
-}
-
-/* X for closing the toggle */
-.floating-toggleable a.toggle {
- border: none !important;
- cursor: pointer;
- position: absolute;
- right: 7px;
- top: 5px;
-}
-
-/* Custom positioning for specific toggles */
-
-#why-verify div.toggleable {
- width: 40em;
-}
diff --git a/wiki/src/install/inc/stylesheets/debian.css b/wiki/src/install/inc/stylesheets/debian.css
index 0a506b6..1ab49aa 100644
--- a/wiki/src/install/inc/stylesheets/debian.css
+++ b/wiki/src/install/inc/stylesheets/debian.css
@@ -12,6 +12,6 @@ li.debian {
display: list-item;
}
-h1:before {
- content: counter(step)'/6.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/6';
}
diff --git a/wiki/src/install/inc/stylesheets/download-only.css b/wiki/src/install/inc/stylesheets/download-only.css
index 6c6b0c0..c58a3ab 100644
--- a/wiki/src/install/inc/stylesheets/download-only.css
+++ b/wiki/src/install/inc/stylesheets/download-only.css
@@ -1,7 +1,11 @@
-span.download-only {
+span.download-only, ul.download-only {
display: inline;
}
+p.download-only {
+ display: block;
+}
+
#pagebody h1 {
display: none;
}
diff --git a/wiki/src/install/inc/stylesheets/download.css b/wiki/src/install/inc/stylesheets/download.css
new file mode 100644
index 0000000..375ae30
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/download.css
@@ -0,0 +1,200 @@
+h1 {
+ margin-left: 0em !important;
+}
+
+/* Display No JS version by default */
+
+.supported-browser,
+.outdated-browser,
+.unsupported-browser {
+ display: none;
+}
+
+.no-js {
+ display: initial;
+}
+
+#skip-verification-direct,
+#verification,
+#update-extension,
+#verifying-download,
+#verification-successful,
+#verification-failed,
+#verification-failed-again,
+#skip-download-direct,
+#skip-download-bittorrent,
+#extension-version {
+ display: none;
+}
+
+#verify-download-wrapper input {
+ display: none;
+}
+
+.transparent {
+ opacity: 0.3;
+}
+
+/* Display logic in case the extension is installed or outdated */
+
+html[data-extension="up-to-date"] #install-extension,
+html[data-extension="outdated"] #install-extension {
+ display: none;
+}
+
+html[data-extension="outdated"] #update-extension,
+html[data-extension="up-to-date"] #verification {
+ display: block;
+}
+
+/* Layout */
+
+#content {
+ padding-left: 0 !important;
+}
+
+#direct-download {
+ border-right: 1px solid #ccc;
+}
+
+.btn {
+ color: white !important;
+ background: #53b351 !important;
+ border: none;
+ padding: 6px 12px !important;
+}
+
+span.step-number {
+ display: inline-block;
+ width: 35px;
+}
+
+.indent {
+ margin-left: 35px !important;
+}
+
+#step-download-iso, #step-download-torrent {
+ min-height: 7em;
+}
+
+#step-verify-direct, #step-verify-bittorrent, #step-continue-direct {
+ margin-top: 4em;
+}
+
+#step-continue-bittorrent {
+ margin-top: 5em;
+}
+
+/* FLOATING TOGGLEABLE FOR 'WHY?' CONTEXTUAL HELP */
+
+/* Hide toggleable by default so they don't appear when there is no JavaScript. */
+.floating-toggleable-link {
+ display: none;
+ margin: 0;
+}
+
+.floating-toggleable div.toggleable {
+ display: none;
+ background: white !important;
+ border: 1px solid #53b351 !important;
+ -webkit-box-shadow: 5px 5px #53b351;
+ box-shadow: 5px 5px #53b351;
+ padding: 15px 30px !important;
+ margin: -1em auto !important;
+ position: absolute !important;
+ text-align: left;
+ font-size: 13px;
+ z-index: 1;
+ width: 35em;
+}
+
+/* X for closing the toggle */
+.floating-toggleable a.toggle {
+ border: none !important;
+ cursor: pointer;
+ position: absolute;
+ right: 7px;
+ top: 5px;
+}
+
+.caution, #bittorrent-download, #verification-failed, #verification-failed-again {
+ position: relative;
+}
+
+.why-verify-link {
+ position: absolute;
+ top: 1.2em;
+ right: 1em;
+}
+
+.why-failed-link, .why-failed-again-link {
+ position: absolute;
+ top: 0;
+ right: 1em;
+}
+
+.what-is-bittorrent-link {
+ position: absolute;
+ top: 2.4em;
+ right: 1em;
+}
+
+#already-downloaded {
+ margin-top: 0.5em;
+ cursor: pointer;
+}
+
+/* Skip verification */
+
+#skip-verification-direct div {
+ background: url(../icons/dialog-warning-small.png) no-repeat;
+ height: 2em;
+ padding-left: 30px;
+}
+
+#skip-verification-direct a {
+ color: #e8112d;
+ border-color: #e8112f;
+ border-size: 2px;
+}
+
+/* Progress bar */
+
+.progress {
+ max-width: 100%;
+}
+
+.progress-bar {
+ background: #53b351;
+}
+
+/* Verification results */
+
+#extension-installed, #verification-successful {
+ background: url(../icons/check.png) no-repeat;
+ padding-left: 35px;
+}
+
+#verification-failed, #verification-failed-again {
+ background: url(../icons/failed.png) no-repeat;
+ padding-left: 35px;
+}
+
+#continue-link-direct li, #continue-link-bittorrent li {
+ margin-left: 1em;
+}
+
+/* OpenPGP */
+
+#openpgp {
+ margin-top: 5em;
+}
+
+#openpgp h3 {
+ margin-top: 3em;
+}
+
+#openpgp pre, #openpgp p.pre {
+ min-width: 58em;
+ width: 58em;
+}
diff --git a/wiki/src/install/inc/stylesheets/dvd.css b/wiki/src/install/inc/stylesheets/dvd.css
index 6fc01bb..4ba9231 100644
--- a/wiki/src/install/inc/stylesheets/dvd.css
+++ b/wiki/src/install/inc/stylesheets/dvd.css
@@ -1,5 +1,9 @@
/* This stylesheet applies to /install/dvd only and not to /install/mac/dvd. */
-span.dvd {
+span.dvd, a.dvd {
display: inline;
}
+
+div.dvd, img.dvd, p.dvd, h1.dvd {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/expert.css b/wiki/src/install/inc/stylesheets/expert.css
index 8d39107..1e6117b 100644
--- a/wiki/src/install/inc/stylesheets/expert.css
+++ b/wiki/src/install/inc/stylesheets/expert.css
@@ -30,8 +30,8 @@ div.note p.pre {
width: 32em;
}
-h1:before {
- content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/7';
}
h1 {
diff --git a/wiki/src/install/inc/stylesheets/install-clone.css b/wiki/src/install/inc/stylesheets/install-clone.css
index da0d441..d887d57 100644
--- a/wiki/src/install/inc/stylesheets/install-clone.css
+++ b/wiki/src/install/inc/stylesheets/install-clone.css
@@ -12,6 +12,6 @@ li.install-clone {
display: list-item;
}
-h1:before {
- content: counter(step)'/6.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/6';
}
diff --git a/wiki/src/install/inc/stylesheets/linux.css b/wiki/src/install/inc/stylesheets/linux.css
index 6abf920..a0ac49e 100644
--- a/wiki/src/install/inc/stylesheets/linux.css
+++ b/wiki/src/install/inc/stylesheets/linux.css
@@ -12,6 +12,6 @@ li.linux {
display: list-item;
}
-h1:before {
- content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/7';
}
diff --git a/wiki/src/install/inc/stylesheets/mac-clone.css b/wiki/src/install/inc/stylesheets/mac-clone.css
index d3f10c2..9ad2a3e 100644
--- a/wiki/src/install/inc/stylesheets/mac-clone.css
+++ b/wiki/src/install/inc/stylesheets/mac-clone.css
@@ -13,6 +13,6 @@ li.mac-clone {
display: list-item;
}
-h1:before {
- content: counter(step)'/6.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/6';
}
diff --git a/wiki/src/install/inc/stylesheets/mac-dvd.css b/wiki/src/install/inc/stylesheets/mac-dvd.css
index 7bb2044..06aeee2 100644
--- a/wiki/src/install/inc/stylesheets/mac-dvd.css
+++ b/wiki/src/install/inc/stylesheets/mac-dvd.css
@@ -13,6 +13,6 @@ li.mac-dvd {
display: list-item;
}
-h1:before {
- content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/7';
}
diff --git a/wiki/src/install/inc/stylesheets/mac-usb.css b/wiki/src/install/inc/stylesheets/mac-usb.css
index 8a65a56..3b56e3b 100644
--- a/wiki/src/install/inc/stylesheets/mac-usb.css
+++ b/wiki/src/install/inc/stylesheets/mac-usb.css
@@ -13,6 +13,6 @@ li.mac-usb {
display: list-item;
}
-h1:before {
- content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/7';
}
diff --git a/wiki/src/install/inc/stylesheets/overview.css b/wiki/src/install/inc/stylesheets/overview.css
index ef5f35e..cc72dee 100644
--- a/wiki/src/install/inc/stylesheets/overview.css
+++ b/wiki/src/install/inc/stylesheets/overview.css
@@ -38,6 +38,7 @@
#steps ol {
list-style-type: none;
margin-left: 0;
+ max-width: none;
}
#steps h4 {
diff --git a/wiki/src/install/inc/stylesheets/router-mac.css b/wiki/src/install/inc/stylesheets/router-mac.css
index dc8c935..abb76d2 100644
--- a/wiki/src/install/inc/stylesheets/router-mac.css
+++ b/wiki/src/install/inc/stylesheets/router-mac.css
@@ -23,7 +23,7 @@ ol.mac_install {
ol.mac_install li:before {
content: counter(counter, upper-alpha);
counter-increment: counter;
- box-shadow: 0px -15px #0A0 inset;
+ box-shadow: 0px -15px #53b351 inset;
font-size: 50px;
left: -50px;
top: 40px;
diff --git a/wiki/src/install/inc/stylesheets/steps.css b/wiki/src/install/inc/stylesheets/steps.css
index 944a967..f7edd61 100644
--- a/wiki/src/install/inc/stylesheets/steps.css
+++ b/wiki/src/install/inc/stylesheets/steps.css
@@ -1,62 +1,66 @@
-span.title {
- display: block;
- font-weight: 100;
- padding-top: 100px;
- color: black;
- font-size: 36px;
- text-align: center;
- border-left: none;
+#content {
+ padding-left: 225px;
}
-.sidebar {
- display: none;
-}
+/* Headings */
-#content {
- padding-left: 250px;
+h1 {
+ color: #56347C;
+ font-weight: 400;
+ margin-left: -225px;
+ margin-top: 50px;
+ margin-bottom: 25px;
}
-p.start {
- min-height: 200px;
+body {
+ counter-reset: step;
}
-pre, p.pre {
- width: 48em;
- max-width: 48em;
+h1, div.hidden-step-1, span.next-counter {
+ counter-increment: step;
}
-.step-image {
- position: absolute;
- left: 2.5em;
- width: 200px;
+h1:before {
+ position: relative;
+ font-size: 0.75em;
+ display: inline-block;
+ width: 60px;
}
-.step-image img {
- position: relative;
+h2 {
+ font-size: 1.5em;
+ line-height: 2em;
}
-.state-image {
- text-align: center;
- margin-bottom: 1em;
+h3 {
+ font-size: 15px;
}
-body {
- counter-reset: step;
+/* Paragraphs */
+
+p {
+ color: black;
}
+p.start {
+ min-height: 200px;
+}
-h1:before {
- position: relative;
- left: -2.5em;
- font-size: 0.75em;
- counter-increment: step;
- margin-right: -2em;
- display: inline;
+pre, p.pre {
+ width: 48em;
+ max-width: 48em;
}
-/* Thiner border */
+/* Step image */
+
+.step-image {
+ position: absolute;
+ left: 2em;
+ width: 200px;
+}
.step-image img {
+ position: relative;
outline: 3px solid white;
outline-offset: -4px;
position: relative;
@@ -76,16 +80,14 @@ img.screenshot:hover {
width: 100%;
}
-/* Give some room to the title and the sections */
+/* QR code */
-h1 {
- color: #56347C;
- font-weight: 400;
- margin-left: -150px;
- margin-top: 50px;
+img.qrcode {
+ float: right;
+ margin-top: -1em;
}
-/* Trophy is a trophy */
+/* Trophy */
div.trophy {
border: 5px solid #56347C;
@@ -104,27 +106,17 @@ div.trophy p {
font-weight: 200;
}
-.trophy img {
+div.trophy img {
margin: 10px;
}
-/* more room for the state */
.state-image {
margin-top: 0px;
+ text-align: center;
+ margin-bottom: 1em;
}
-p {
- color: black;
-}
-
-h2 {
- font-size: 1.5em;
- line-height: 2em;
-}
-
-h3 {
- font-size: 15px;
-}
+/* Recommendations */
#recommendations {
padding: 20px;
@@ -151,6 +143,8 @@ h3 {
float: left;
}
+/* Toggleable */
+
div.toggleable .hide {
display: block !important;
}
@@ -212,14 +206,6 @@ div.toggleable .hide {
}
-/* QR code on the side */
-
-img.qrcode {
- float: right;
- margin-top: -1em;
-}
-
-
@media print {
/* from http://www.alsacreations.com/astuce/lire/1160-une-feuille-de-styles-de-base-pour-le-media-print.html */
@@ -243,7 +229,7 @@ img.qrcode {
color: #000 !important;
}
-/* Tails specifics */
+ /* Tails specifics */
#content {
padding-left: 0px;
@@ -271,13 +257,10 @@ img.qrcode {
page-break-before: auto; /* 'always,' 'avoid,' 'left,' 'inherit,' or 'right' */
page-break-after: auto; /* 'always,' 'avoid,' 'left,' 'inherit,' or 'right' */
page-break-inside: avoid; /* or 'auto' */
-}
-
- .toggleable {
- display: block !important;
}
.toggleable {
+ display: block !important;
position: relative !important;
width: 90% !important;
margin: 50px !important;
diff --git a/wiki/src/install/inc/stylesheets/upgrade-clone.css b/wiki/src/install/inc/stylesheets/upgrade-clone.css
index eb29ac6..e7c3835 100644
--- a/wiki/src/install/inc/stylesheets/upgrade-clone.css
+++ b/wiki/src/install/inc/stylesheets/upgrade-clone.css
@@ -13,6 +13,6 @@ li.upgrade-clone {
display: list-item;
}
-h1:before {
- content: counter(step)'/4.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/4';
}
diff --git a/wiki/src/install/inc/stylesheets/upgrade-tails.css b/wiki/src/install/inc/stylesheets/upgrade-tails.css
index 1163e8e..0ec5f18 100644
--- a/wiki/src/install/inc/stylesheets/upgrade-tails.css
+++ b/wiki/src/install/inc/stylesheets/upgrade-tails.css
@@ -12,6 +12,6 @@ li.upgrade-tails {
display: list-item;
}
-h1:before {
- content: counter(step)'/6.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/6';
}
diff --git a/wiki/src/install/inc/stylesheets/vm.css b/wiki/src/install/inc/stylesheets/vm.css
index 760294c..b95600c 100644
--- a/wiki/src/install/inc/stylesheets/vm.css
+++ b/wiki/src/install/inc/stylesheets/vm.css
@@ -1,3 +1,7 @@
-span.vm {
+span.vm, a.vm {
display: inline;
}
+
+div.vm, img.vm, p.vm, h1.vm {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/windows.css b/wiki/src/install/inc/stylesheets/windows.css
index e2f8ed0..f84fed1 100644
--- a/wiki/src/install/inc/stylesheets/windows.css
+++ b/wiki/src/install/inc/stylesheets/windows.css
@@ -12,6 +12,6 @@ li.windows {
display: list-item;
}
-h1:before {
- content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+ content: counter(step)'/7';
}