summaryrefslogtreecommitdiffstats
path: root/wiki/src/install/inc/steps
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-11-07 07:43:29 +0000
committersajolida <sajolida@pimienta.org>2018-11-07 09:04:00 +0000
commit69fe71a2deaf549d0bd1dc743107bb0e93f9b398 (patch)
treeab51e13e6a7865cc4890726bac78ee1255e6927c /wiki/src/install/inc/steps
parentec6360460ada50c0b3af4ccb1e94a285676e6357 (diff)
Remove mac-dvd scenario (#15825)
Diffstat (limited to 'wiki/src/install/inc/steps')
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.de.po10
-rwxr-xr-xwiki/src/install/inc/steps/create_persistence.inline.es.po6
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fr.po6
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.it.po6
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.mdwn1
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.pt.po10
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po8
-rw-r--r--wiki/src/install/inc/steps/download.inline.es.po14
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po8
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po22
-rw-r--r--wiki/src/install/inc/steps/download.inline.html42
-rw-r--r--wiki/src/install/inc/steps/download.inline.it.po8
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po8
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.de.po12
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.es.po20
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fa.po5
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po20
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.it.po12
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.mdwn7
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.pt.po10
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.de.po19
-rwxr-xr-xwiki/src/install/inc/steps/restart_first_time.inline.es.po20
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fa.po10
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po20
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.it.po19
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.mdwn31
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.pt.po10
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.es.po4
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fa.po2
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fr.po4
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.it.po4
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.pt.po2
35 files changed, 107 insertions, 283 deletions
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 6df6e30..388d132 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.de.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.de.po
@@ -24,15 +24,15 @@ msgstr "<div class=\"trophy\">\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
-#| "<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
+#| "<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
#| "<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
#| "<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
msgid ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\" alt=\"Final Tails USB stick and intermediary USB stick that can be discarded\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\" alt=\"New Tails USB stick\"]]</div>\n"
msgstr ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
+"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
@@ -53,7 +53,6 @@ msgid ""
"<span class=\"windows\">[[final recommendations|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[final recommendations|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[final recommendations|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[final recommendations|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[final recommendations|linux/usb#recommendations]].</span>\n"
"</p>\n"
msgstr ""
@@ -65,7 +64,6 @@ msgstr ""
"<span class=\"windows\">[[abschließenden Empfehlungen|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[abschließenden Empfehlungen|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[abschließenden Empfehlungen|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[abschließenden Empfehlungen|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[abschließenden Empfehlungen|linux/usb#recommendations]].</span>\n"
"</p>\n"
@@ -365,11 +363,9 @@ msgstr "<div class=\"trophy\" id=\"recommendations\">\n"
msgid ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\" alt=\"Final Tails USB stick with persistent storage\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
msgstr ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.es.po b/wiki/src/install/inc/steps/create_persistence.inline.es.po
index fc8e7a7..2589f9a 100755
--- a/wiki/src/install/inc/steps/create_persistence.inline.es.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.es.po
@@ -25,11 +25,9 @@ msgstr "<div class=\"trophy\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\" alt=\"Final Tails USB stick and intermediary USB stick that can be discarded\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\" alt=\"New Tails USB stick\"]]</div>\n"
msgstr ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Memoria USB de Tails\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\" alt=\"Memoria USB de Tails Final y memoria USB intermedia que puede ser descartada\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\" alt=\"Nueva memoria USB de Tails\"]]</div>\n"
@@ -49,7 +47,6 @@ msgid ""
"<span class=\"windows\">[[final recommendations|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[final recommendations|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[final recommendations|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[final recommendations|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[final recommendations|linux/usb#recommendations]].</span>\n"
"</p>\n"
msgstr ""
@@ -61,7 +58,6 @@ msgstr ""
"<span class=\"windows\">[[recomendaciones finales|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[recomendaciones finales|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[recomendaciones finales|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[recomendaciones finales|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[recomendaciones finales|linux/usb#recommendations]].</span>\n"
"</p>\n"
@@ -332,11 +328,9 @@ msgstr "<div class=\"trophy\" id=\"recommendations\">\n"
msgid ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\" alt=\"Final Tails USB stick with persistent storage\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
msgstr ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Memoria USB de Tails con almacenamiento persistente\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\" alt=\"Memoria USB de Tails Final con almacenamiento persistente\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Memoria USB de Tails con almacenamiento persistente\"]]</div>\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 78484bb..35b5c9c 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fa.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fa.po
@@ -24,7 +24,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\" alt=\"Final Tails USB stick and intermediary USB stick that can be discarded\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\" alt=\"New Tails USB stick\"]]</div>\n"
msgstr ""
@@ -45,7 +45,6 @@ msgid ""
"<span class=\"windows\">[[final recommendations|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[final recommendations|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[final recommendations|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[final recommendations|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[final recommendations|linux/usb#recommendations]].</span>\n"
"</p>\n"
msgstr ""
@@ -265,7 +264,6 @@ msgstr ""
msgid ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\" alt=\"Final Tails USB stick with persistent storage\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.fr.po b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
index 40bbb88..794be0d 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fr.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
@@ -24,11 +24,9 @@ msgstr "<div class=\"trophy\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\" alt=\"Final Tails USB stick and intermediary USB stick that can be discarded\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\" alt=\"New Tails USB stick\"]]</div>\n"
msgstr ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Clé USB Tails\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\" alt=\"Clé USB Tails définitive et clé USB intermédiaire qui peut être écartée\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\" alt=\"Nouvelle clé USB Tails\"]]</div>\n"
@@ -48,7 +46,6 @@ msgid ""
"<span class=\"windows\">[[final recommendations|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[final recommendations|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[final recommendations|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[final recommendations|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[final recommendations|linux/usb#recommendations]].</span>\n"
"</p>\n"
msgstr ""
@@ -60,7 +57,6 @@ msgstr ""
"<span class=\"windows\">[[dernières recommandations|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[dernières recommandations|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[dernières recommandations|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[dernières recommandations|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[dernières recommandations|linux/usb#recommendations]].</span>\n"
"</p>\n"
@@ -328,11 +324,9 @@ msgstr "<div class=\"trophy\" id=\"recommendations\">\n"
msgid ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\" alt=\"Final Tails USB stick with persistent storage\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
msgstr ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.fr.png link=\"no\" alt=\"Clé USB Tails avec stockage persistant\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.fr.png link=\"no\" alt=\"Clé USB Tails définitive avec stockage persistant\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.fr.png link=\"no\" alt=\"Clé USB Tails avec stockage persistant\"]]</div>\n"
#. type: Plain text
#, no-wrap
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 dcd1e98..4a32899 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.it.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.it.po
@@ -24,11 +24,9 @@ msgstr "<div class=\"trophy\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\" alt=\"Final Tails USB stick and intermediary USB stick that can be discarded\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\" alt=\"New Tails USB stick\"]]</div>\n"
msgstr ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
@@ -49,7 +47,6 @@ msgid ""
"<span class=\"windows\">[[final recommendations|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[final recommendations|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[final recommendations|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[final recommendations|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[final recommendations|linux/usb#recommendations]].</span>\n"
"</p>\n"
msgstr ""
@@ -61,7 +58,6 @@ msgstr ""
"<span class=\"windows\">[[raccomandazioni finali|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[raccomandazioni finali|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[raccomandazioni finali|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[raccomandazioni finali|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[raccomandazioni finali|linux/usb#recommendations]].</span>\n"
"</p>\n"
@@ -349,11 +345,9 @@ msgstr "<div class=\"trophy\" id=\"recommendations\">\n"
msgid ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\" alt=\"Final Tails USB stick with persistent storage\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
msgstr ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.mdwn b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
index 21fa701..64a6566 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.mdwn
+++ b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
@@ -10,7 +10,6 @@ our instructions until the end. Otherwise, have a look at our
<span class="windows">[[final recommendations|win/usb#recommendations]].</span>
<span class="mac-usb">[[final recommendations|mac/usb#recommendations]].</span>
<span class="mac-clone">[[final recommendations|mac/clone#recommendations]].</span>
-<span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span>
<span class="linux">[[final recommendations|linux/usb#recommendations]].</span>
</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 a99ce39..215e7e1 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.pt.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.pt.po
@@ -24,15 +24,15 @@ msgstr "<div class=\"trophy\">\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
-#| "<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
+#| "<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
#| "<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
#| "<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
msgid ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\" alt=\"Final Tails USB stick and intermediary USB stick that can be discarded\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\" alt=\"New Tails USB stick\"]]</div>\n"
msgstr ""
-"<div class=\"state-image expert mac-dvd\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
+"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb\">[[!img install/inc/infography/final-tails.png link=\"no\"]]</div>\n"
"<div class=\"state-image install-clone mac-clone\">[[!img install/inc/infography/new-tails.png link=\"no\"]]</div>\n"
@@ -54,7 +54,6 @@ msgid ""
"<span class=\"windows\">[[final recommendations|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[final recommendations|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[final recommendations|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[final recommendations|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[final recommendations|linux/usb#recommendations]].</span>\n"
"</p>\n"
msgstr ""
@@ -66,7 +65,6 @@ msgstr ""
"<span class=\"windows\">[[recomendações finais|win/usb#recommendations]].</span>\n"
"<span class=\"mac-usb\">[[recomendações finais|mac/usb#recommendations]].</span>\n"
"<span class=\"mac-clone\">[[recomendações finais|mac/clone#recommendations]].</span>\n"
-"<span class=\"mac-dvd\">[[recomendações finais|mac/dvd#recommendations]].</span>\n"
"<span class=\"linux\">[[recomendações finais|linux/usb#recommendations]].</span>\n"
"</p>\n"
@@ -366,11 +364,9 @@ msgstr "<div class=\"trophy\" id=\"recommendations\">\n"
msgid ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\" alt=\"Final Tails USB stick with persistent storage\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\" alt=\"Tails USB stick with persistent storage\"]]</div>\n"
msgstr ""
"<div class=\"state-image expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
-"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/download.inline.de.po b/wiki/src/install/inc/steps/download.inline.de.po
index 3b0976d..f57f66d 100644
--- a/wiki/src/install/inc/steps/download.inline.de.po
+++ b/wiki/src/install/inc/steps/download.inline.de.po
@@ -354,7 +354,7 @@ msgstr ""
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"
+"linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
@@ -676,7 +676,7 @@ msgstr ""
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"windows linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
@@ -686,7 +686,7 @@ 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"
"\"]] <span class=\"debian windows linux mac-usb upgrade-tails\">USB</span> "
-"<span class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the "
+"<span class=\"dvd vm\">ISO</span> image that you will use in the "
"next step."
msgstr ""
@@ -716,7 +716,7 @@ msgid ""
"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
-"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"\"dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
"save it to the same folder where you saved the image."
diff --git a/wiki/src/install/inc/steps/download.inline.es.po b/wiki/src/install/inc/steps/download.inline.es.po
index 30068cc..71605a7 100644
--- a/wiki/src/install/inc/steps/download.inline.es.po
+++ b/wiki/src/install/inc/steps/download.inline.es.po
@@ -345,13 +345,13 @@ msgstr ""
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"
+"linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
"span>"
msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continúa <span class=\"debian windows "
-"linux mac-usb mac-dvd\">instalando</span> <span class=\"upgrade-tails"
+"linux mac-usb\">instalando</span> <span class=\"upgrade-tails"
"\">actualizando</span> <span class=\"download-only\">instalando o "
"actualizando</span>"
@@ -360,7 +360,7 @@ msgid ""
"<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 "
+"usb]]</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>"
@@ -368,8 +368,8 @@ msgstr ""
"<span class=\"debian\">[[Saltear la descarga|debian/usb]]</span> <span class="
"\"windows\">[[Saltear la descarga|win/usb]]</span> <span class=\"linux"
"\">[[Saltear la descarga|linux/usb]]</span> <span class=\"mac-usb"
-"\">[[Saltear la descarga|mac/usb]]</span> <span class=\"mac-dvd\">[[Saltear "
-"la descarga|mac/dvd]]</span> <span class=\"dvd\">[[Saltear la descarga|"
+"\">[[Saltear la descarga|mac/usb]]</span> "
+"<span class=\"dvd\">[[Saltear la descarga|"
"dvd]]</span> <span class=\"vm\">[[Saltear la descarga|doc/advanced_topics/"
"virtualization]]</span> <span class=\"upgrade-tails\">[[Saltear la descarga|"
"upgrade/tails]]</span>"
@@ -1188,14 +1188,14 @@ msgstr ""
#~ msgstr "Baja y verifica la imagen ISO de Tails"
#~ msgid ""
-#~ "<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm"
+#~ "<span class=\"windows mac-usb debian linux upgrade-tails dvd vm"
#~ "\">In this step you</span> <span class=\"download-only\">You</span> will "
#~ "download Tails as an ISO image: a single file containing the whole "
#~ "operating system. For your security, it is very important to also verify "
#~ "your download. We propose you two techniques to do this verification "
#~ "automatically."
#~ msgstr ""
-#~ "<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm"
+#~ "<span class=\"windows mac-usb debian linux upgrade-tails dvd vm"
#~ "\">En este paso</span> <span class=\"download-only\">Ahora</span> te "
#~ "bajarás Tails como una sola imagen ISO: un solo archivo que contiene todo "
#~ "el sistema operativo. Por tu seguridad, es importante también verificar "
diff --git a/wiki/src/install/inc/steps/download.inline.fa.po b/wiki/src/install/inc/steps/download.inline.fa.po
index 7dd0cc6..55aa966 100644
--- a/wiki/src/install/inc/steps/download.inline.fa.po
+++ b/wiki/src/install/inc/steps/download.inline.fa.po
@@ -295,7 +295,7 @@ msgstr ""
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"
+"linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
@@ -595,7 +595,7 @@ msgstr ""
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"windows linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
@@ -605,7 +605,7 @@ 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"
"\"]] <span class=\"debian windows linux mac-usb upgrade-tails\">USB</span> "
-"<span class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the "
+"<span class=\"dvd vm\">ISO</span> image that you will use in the "
"next step."
msgstr ""
@@ -629,7 +629,7 @@ msgid ""
"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
-"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"\"dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
"save it to the same folder where you saved the image."
diff --git a/wiki/src/install/inc/steps/download.inline.fr.po b/wiki/src/install/inc/steps/download.inline.fr.po
index 0e7a3d0..8ae4731 100644
--- a/wiki/src/install/inc/steps/download.inline.fr.po
+++ b/wiki/src/install/inc/steps/download.inline.fr.po
@@ -400,19 +400,19 @@ msgstr ""
#| 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-"
+#| "windows linux mac-usb\">installing</span> <span class=\"upgrade-"
#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
#| "upgrading</span>"
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"
+"linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continuer <span class=\"debian windows "
-"linux mac-usb mac-dvd\">l'installation</span> <span class=\"upgrade-tails"
+"linux mac-usb\">l'installation</span> <span class=\"upgrade-tails"
"\">la mise à jour</span> <span class=\"download-only\">l'installation ou la "
"mise à jour</span>"
@@ -421,7 +421,7 @@ msgid ""
"<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 "
+"usb]]</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>"
@@ -429,8 +429,8 @@ msgstr ""
"<span class=\"debian\">[[Passer le téléchargement|debian/usb]]</span> <span "
"class=\"windows\">[[Passer le téléchargement|win/usb]]</span> <span class="
"\"linux\">[[Passer le téléchargement|linux/usb]]</span> <span class=\"mac-usb"
-"\">[[Passer le téléchargement|mac/usb]]</span> <span class=\"mac-dvd"
-"\">[[Passer le téléchargement|mac/dvd]]</span> <span class=\"dvd\">[[Passer "
+"\">[[Passer le téléchargement|mac/usb]]</span> "
+"<span class=\"dvd\">[[Passer "
"le téléchargement|dvd]]</span> <span class=\"vm\">[[Passer le téléchargement|"
"doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-tails"
"\">[[Passer le téléchargement|upgrade/tails]]</span>"
@@ -782,19 +782,19 @@ msgstr ""
#| 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-"
+#| "windows linux mac-usb\">installing</span> <span class=\"upgrade-"
#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
#| "upgrading</span>"
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"windows linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continuer <span class=\"debian windows "
-"linux mac-usb mac-dvd\">l'installation</span> <span class=\"upgrade-tails"
+"linux mac-usb\">l'installation</span> <span class=\"upgrade-tails"
"\">la mise à jour</span> <span class=\"download-only\">l'installation ou la "
"mise à jour</span>"
@@ -808,7 +808,7 @@ 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"
"\"]] <span class=\"debian windows linux mac-usb upgrade-tails\">USB</span> "
-"<span class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the "
+"<span class=\"dvd vm\">ISO</span> image that you will use in the "
"next step."
msgstr ""
"Ouvrez et télécharger le fichier Torrent avec votre client BitTorrent. Il "
@@ -844,7 +844,7 @@ msgid ""
"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
-"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"\"dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
"save it to the same folder where you saved the image."
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index f94a285..3eae1ef 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -1,7 +1,7 @@
<div id="activate-tails-verification"></div> <!-- Needed to activate the verification extension -->
<div id="extension-version">1.0</div> <!-- Minimum version of the extension -->
-<h1 class="windows linux mac-usb mac-dvd dvd vm upgrade-tails">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
+<h1 class="windows linux mac-usb dvd vm upgrade-tails">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
<div class="row">
@@ -10,12 +10,12 @@
<div class="supported-browser no-js">
<div id="step-download-direct">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails</h3>
+ <h3><span class="step-number"><span class="windows linux mac-usb upgrade-tails">1.</span>1</span>Download Tails</h3>
<div class="windows linux mac-usb upgrade-tails download-only-img">
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
</div>
- <div class="mac-dvd dvd vm download-only-iso">
+ <div class="dvd vm download-only-iso">
<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>
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool-on-retry 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>
</div>
@@ -23,7 +23,7 @@
</div>
<div id="step-verify-direct">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>2</span>Verify your download using your browser</h3>
+ <h3><span class="step-number"><span class="windows linux mac-usb 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>
@@ -94,7 +94,7 @@
"""]]
</div>
<p class="windows linux mac-usb upgrade-tails download-only-img"><a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
- <p class="mac-dvd dvd vm download-only-iso"><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
+ <p class="dvd vm download-only-iso"><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
</div>
<div id="verification-failed-again" class="block">
<p><b>Verification failed again!</b></p>
@@ -117,8 +117,8 @@
</div>
<div id="step-continue-direct">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>3</span>Continue
- <span class="windows linux mac-usb mac-dvd">installing</span>
+ <h3><span class="step-number"><span class="windows linux mac-usb upgrade-tails">1.</span>3</span>Continue
+ <span class="windows linux mac-usb">installing</span>
<span class="upgrade-tails">upgrading</span>
<span class="download-only-img download-only-iso">installing or upgrading</span></h3>
</div>
@@ -127,7 +127,6 @@
<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>
@@ -136,7 +135,6 @@
<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>
@@ -145,7 +143,6 @@
<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>
@@ -201,7 +198,6 @@
<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>
@@ -228,30 +224,30 @@
</div>
<div id="step-download-torrent">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
+ <h3><span class="step-number"><span class="windows linux mac-usb upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
<div class="windows linux mac-usb upgrade-tails download-only-img">
<a href="[[!inline pages="inc/stable_amd64_img_torrent_url" raw="yes" sort="age"]]" id="download-img-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for USB image</a>
</div>
- <div class="mac-dvd dvd vm download-only-iso">
+ <div class="dvd vm download-only-iso">
<a href="[[!inline pages="inc/stable_amd64_iso_torrent_url" raw="yes" sort="age"]]" id="download-iso-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for ISO image</a>
</div>
</div>
<div id="step-verify-bittorrent">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>2</span>Verify your download using BitTorrent</h3>
+ <h3><span class="step-number"><span class="windows linux mac-usb 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="step-continue-bittorrent">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd dvd vm upgrade-tails">1.</span>3</span>Continue
- <span class="windows linux mac-usb mac-dvd">installing</span>
+ <h3><span class="step-number"><span class="windows linux mac-usb dvd vm upgrade-tails">1.</span>3</span>Continue
+ <span class="windows linux mac-usb">installing</span>
<span class="upgrade-tails">upgrading</span>
<span class="download-only-img download-only-iso">installing or upgrading</span></h3>
- <p class="windows linux mac-usb mac-dvd dvd vm upgrade-tails indent">Open and download
+ <p class="windows linux mac-usb dvd vm 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"]]
<span class="windows linux mac-usb upgrade-tails">USB</span>
- <span class="mac-dvd dvd vm">ISO</span>
+ <span class="dvd vm">ISO</span>
image that you will use in the next step.</p>
</div>
<div id="continue-link-bittorrent" class="indent">
@@ -259,7 +255,6 @@
<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>
@@ -268,7 +263,6 @@
<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>
@@ -305,7 +299,7 @@ BitTorrent.</p>
<li>
<p>Download the
<a class="windows linux mac-usb upgrade-tails" href='[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]'>OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
- <a class="mac-dvd dvd vm" href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
+ <a class="dvd vm" href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
</li>
@@ -393,7 +387,7 @@ signing key through the OpenPGP Web of Trust</a>.</p>
signature is good:
<p class="windows linux mac-usb upgrade-tails">[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="no"]]</p>
- <p class="mac-dvd dvd vm">[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="no"]]</p>
+ <p class="dvd vm">[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="no"]]</p>
<p>Verify that the date of the signature is at most five days earlier
than the latest version: [[!inline pages="inc/stable_amd64_date" raw="yes" sort="age"]].</p>
@@ -415,12 +409,12 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<p>Execute:</p>
<p class="windows linux mac-usb upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
- <p class="mac-dvd dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_verify" raw="yes" sort="age"]]</p>
+ <p class="dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_verify" raw="yes" sort="age"]]</p>
<p>The output of this command should be the following:</p>
<p class="windows linux mac-usb upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
- <p class="mac-dvd dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>
+ <p class="dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>
<p>Verify that the date of the signature is at most five days
earlier than the latest version: [[!inline pages="inc/stable_amd64_date" raw="yes" sort="age"]].</p>
diff --git a/wiki/src/install/inc/steps/download.inline.it.po b/wiki/src/install/inc/steps/download.inline.it.po
index cf1533f..1a6e7bb 100644
--- a/wiki/src/install/inc/steps/download.inline.it.po
+++ b/wiki/src/install/inc/steps/download.inline.it.po
@@ -353,7 +353,7 @@ msgstr ""
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"
+"linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
@@ -675,7 +675,7 @@ msgstr ""
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"windows linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
@@ -685,7 +685,7 @@ 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"
"\"]] <span class=\"debian windows linux mac-usb upgrade-tails\">USB</span> "
-"<span class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the "
+"<span class=\"dvd vm\">ISO</span> image that you will use in the "
"next step."
msgstr ""
@@ -716,7 +716,7 @@ msgid ""
"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
-"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"\"dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
"save it to the same folder where you saved the image."
diff --git a/wiki/src/install/inc/steps/download.inline.pt.po b/wiki/src/install/inc/steps/download.inline.pt.po
index 9ab2a97..31c3832 100644
--- a/wiki/src/install/inc/steps/download.inline.pt.po
+++ b/wiki/src/install/inc/steps/download.inline.pt.po
@@ -296,7 +296,7 @@ msgstr ""
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"
+"linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
@@ -596,7 +596,7 @@ msgstr ""
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"windows linux mac-usb\">installing</span> <span class=\"upgrade-tails"
"\">upgrading</span> <span class=\"download-only-img download-only-iso"
"\">installing or upgrading</span>"
msgstr ""
@@ -606,7 +606,7 @@ 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"
"\"]] <span class=\"debian windows linux mac-usb upgrade-tails\">USB</span> "
-"<span class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the "
+"<span class=\"dvd vm\">ISO</span> image that you will use in the "
"next step."
msgstr ""
@@ -630,7 +630,7 @@ msgid ""
"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
-"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"\"dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
"save it to the same folder where you saved the image."
diff --git a/wiki/src/install/inc/steps/install_final.inline.de.po b/wiki/src/install/inc/steps/install_final.inline.de.po
index 6afad9e..69fa81d 100644
--- a/wiki/src/install/inc/steps/install_final.inline.de.po
+++ b/wiki/src/install/inc/steps/install_final.inline.de.po
@@ -27,12 +27,10 @@ msgstr ""
msgid ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Tails installieren</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac\">Installieren Sie das endgültige Tails</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Installieren Sie Tails auf einen USB-Stick</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Aktualisieren Sie Ihr Tails</h1>\n"
#. type: Plain text
@@ -137,12 +135,12 @@ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
+"Tails</span> <span class=\"expert\">the</span> USB stick in "
"the computer."
msgstr ""
"Schließen Sie <span class=\"windows linux mac-usb\">den zweiten</span> <span "
"class=\"install-clone mac-clone\">den neuen</span> <span class=\"upgrade"
-"\">Ihren Tails</span> <span class=\"expert mac-dvd\">den</span> USB-"
+"\">Ihren Tails</span> <span class=\"expert\">den</span> USB-"
"Stick an Ihren Computer an."
#. type: Plain text
@@ -258,19 +256,19 @@ msgstr ""
#| " Choose\n"
#| " <span class=\"windows linux mac-usb\">the second</span>\n"
#| " <span class=\"install-clone mac-clone\">the new</span>\n"
-#| " <span class=\"expert mac-dvd upgrade-clone\">your</span>\n"
+#| " <span class=\"expert upgrade-clone\">your</span>\n"
#| " USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
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=\"expert mac-dvd upgrade-clone upgrade-tails\">your</span>\n"
+" <span class=\"expert upgrade-clone upgrade-tails\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Wählen Sie\n"
" <span class=\"windows linux mac-usb\">den zweiten</span>\n"
" <span class=\"install-clone mac-clone\">den neuen</span>\n"
-" <span class=\"expert mac-dvd upgrade-clone\">Ihren</span>\n"
+" <span class=\"expert upgrade-clone\">Ihren</span>\n"
" USB-Stick in der Dropdown-Liste <span class=\"guilabel\">Target Device</span> aus.\n"
#. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_final.inline.es.po b/wiki/src/install/inc/steps/install_final.inline.es.po
index 5854284..74deb25 100644
--- a/wiki/src/install/inc/steps/install_final.inline.es.po
+++ b/wiki/src/install/inc/steps/install_final.inline.es.po
@@ -23,12 +23,10 @@ msgstr ""
msgid ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Instalar Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Instalar el Tails final</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Instalar Tails en una memoria USB</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Actualiza tu Tails</h1>\n"
#. type: Plain text
@@ -118,11 +116,6 @@ msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"wi
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"Memoria USB conectada a la derecha\"]]\n"
-
-#. type: Plain text
-#, 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-tails\" alt=\"Segunda memoria USB conectada a la derecha\"]]\n"
@@ -130,12 +123,12 @@ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
+"Tails</span> <span class=\"expert\">the</span> USB stick in "
"the computer."
msgstr ""
"Conecta <span class=\"windows linux mac-usb\">la segunda</span> <span class="
"\"install-clone mac-clone\">la nueva</span> <span class=\"upgrade\">tu "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> memoria USB en "
+"Tails</span> <span class=\"expert\">the</span> memoria USB en "
"la computadora."
#. type: Plain text
@@ -224,11 +217,6 @@ msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"d
msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
msgstr " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails instalado en una memoria USB a la derecha\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installed on USB stick on the right\"]]\n"
-msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails instalado en una memoria USB a la derecha\"]]\n"
-
#. type: Bullet: '1. '
#, fuzzy
#| msgid ""
@@ -248,13 +236,13 @@ 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=\"expert mac-dvd upgrade-clone upgrade-tails\">your</span>\n"
+" <span class=\"expert upgrade-clone upgrade-tails\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Elige\n"
" <span class=\"windows linux mac-usb\">la segunda</span>\n"
" <span class=\"install-clone mac-clone\">la nueva</span>\n"
-" <span class=\"expert mac-dvd upgrade-clone upgrade-tails\">tu</span>\n"
+" <span class=\"expert upgrade-clone upgrade-tails\">tu</span>\n"
" memoria USB en la lista desplegable <span class=\"guilabel\">Memoria USB de Destino</span>.\n"
#. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_final.inline.fa.po b/wiki/src/install/inc/steps/install_final.inline.fa.po
index 707a499..fa694ee 100644
--- a/wiki/src/install/inc/steps/install_final.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_final.inline.fa.po
@@ -21,7 +21,6 @@ msgstr ""
msgid ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
@@ -109,7 +108,7 @@ msgstr ""
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
+"Tails</span> <span class=\"expert\">the</span> USB stick in "
"the computer."
msgstr ""
@@ -203,7 +202,7 @@ msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
-" <span class=\"expert mac-dvd upgrade-clone upgrade-tails\">your</span>\n"
+" <span class=\"expert upgrade-clone upgrade-tails\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
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 152ccb9..79db154 100644
--- a/wiki/src/install/inc/steps/install_final.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_final.inline.fr.po
@@ -21,12 +21,10 @@ msgstr ""
msgid ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Installer Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Installer le Tails définitif</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Installer Tails sur une clé USB</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Mettre à jour votre Tails</h1>\n"
#. type: Plain text
@@ -117,11 +115,6 @@ msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"wi
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"USB stick plugged on the right\"]]\n"
-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
-#, 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-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
@@ -129,12 +122,12 @@ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
+"Tails</span> <span class=\"expert\">the</span> USB stick in "
"the computer."
msgstr ""
"Connecter <span class=\"windows linux mac-usb\">la seconde</span> <span "
"class=\"install-clone mac-clone\">la nouvelle</span> <span class=\"upgrade"
-"\">votre</span> <span class=\"expert mac-dvd\">la</span> clé USB "
+"\">votre</span> <span class=\"expert\">la</span> clé USB "
"<span class=\"upgrade\">Tails </span>sur l'ordinateur."
#. type: Plain text
@@ -221,11 +214,6 @@ msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"d
msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
msgstr " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installé sur la clé USB sur la droite\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installed on USB stick on the right\"]]\n"
-msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installé sur la clé USB sur la droite\"]]\n"
-
#. type: Bullet: '1. '
msgid ""
"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/"
@@ -242,13 +230,13 @@ 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=\"expert mac-dvd upgrade-clone upgrade-tails\">your</span>\n"
+" <span class=\"expert upgrade-clone upgrade-tails\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Choisir\n"
" <span class=\"windows linux mac-usb\">la seconde</span>\n"
" <span class=\"install-clone mac-clone\">la nouvelle</span>\n"
-" <span class=\"expert mac-dvd upgrade-clone upgrade-tails\">votre</span>\n"
+" <span class=\"expert upgrade-clone upgrade-tails\">votre</span>\n"
" clé USB dans la liste déroulante <span class=\"guilabel\">Clé USB cible</span>.\n"
#. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_final.inline.it.po b/wiki/src/install/inc/steps/install_final.inline.it.po
index 64ee11b..481f017 100644
--- a/wiki/src/install/inc/steps/install_final.inline.it.po
+++ b/wiki/src/install/inc/steps/install_final.inline.it.po
@@ -21,12 +21,10 @@ msgstr ""
msgid ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Installa Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Installa una Tails finale</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Installa Tails su una chiavetta USB</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Aggiorna la tua Tails</h1>\n"
#. type: Plain text
@@ -128,12 +126,12 @@ msgstr ""
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
+"Tails</span> <span class=\"expert\">the</span> USB stick in "
"the computer."
msgstr ""
"Inserisci <span class=\"windows linux mac-usb\">la seconda</span> <span "
"class=\"install-clone mac-clone\">la nuova</span> <span class=\"upgrade"
-"\">chiavetta USB con la tua Tails</span> <span class=\"expert mac-dvd"
+"\">chiavetta USB con la tua Tails</span> <span class=\"expert"
"\">nel</span> computer."
#. type: Plain text
@@ -241,19 +239,19 @@ msgstr ""
#| " Choose\n"
#| " <span class=\"windows linux mac-usb\">the second</span>\n"
#| " <span class=\"install-clone mac-clone\">the new</span>\n"
-#| " <span class=\"expert mac-dvd upgrade-clone\">your</span>\n"
+#| " <span class=\"expert upgrade-clone\">your</span>\n"
#| " USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
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=\"expert mac-dvd upgrade-clone upgrade-tails\">your</span>\n"
+" <span class=\"expert upgrade-clone upgrade-tails\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Scegli\n"
" <span class=\"windows linux mac-usb\">la seconda</span>\n"
" <span class=\"install-clone mac-clone\">la nuova</span>\n"
-" <span class=\"expert mac-dvd upgrade-clone\">la tua</span>\n"
+" <span class=\"expert upgrade-clone\">la tua</span>\n"
" chiave USB come <span class=\"guilabel\">Target Device</span> drop-down list.\n"
#. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_final.inline.mdwn b/wiki/src/install/inc/steps/install_final.inline.mdwn
index 9ea0049..cf21fdf 100644
--- a/wiki/src/install/inc/steps/install_final.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_final.inline.mdwn
@@ -1,6 +1,5 @@
<h1 id="install-tails" class="expert install-clone mac-clone">Install Tails</h1>
<h1 id="install-final" class="windows linux mac-usb">Install the final Tails</h1>
-<h1 id="install-usb" class="mac-dvd">Install Tails on a USB stick</h1>
<h1 id="upgrade" class="upgrade">Upgrade your Tails</h1>
<p class="windows linux mac expert">
@@ -36,7 +35,6 @@
<div class="step-image">
[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb clone" alt="Second USB stick plugged on the right"]]
-[[!img install/inc/infography/plug-tails-usb.png link="no" class="mac-dvd" alt="USB stick plugged on the right"]]
[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-tails" alt="Second USB stick plugged on the right"]]
</div>
@@ -45,7 +43,7 @@
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="upgrade">your Tails</span>
- <span class="expert mac-dvd">the</span>
+ <span class="expert">the</span>
USB stick in the computer.
1. <div class="windows linux mac upgrade install-clone"><p>
@@ -74,7 +72,6 @@
<div class="step-image">
[[!img install/inc/infography/clone-intermediary-tails.png link="no" class="windows linux mac-usb clone upgrade-tails" alt="Tails installed on USB stick on the right"]]
- [[!img install/inc/infography/clone-dvd.png link="no" class="mac-dvd" alt="Tails installed on USB stick on the right"]]
</div>
1. <p class="expert">Click <span class="button">(None) [[!img lib/document-open.png alt="Menu" class=symbolic link="no"]]</span>
@@ -83,7 +80,7 @@
Choose
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
- <span class="expert mac-dvd upgrade-clone upgrade-tails">your</span>
+ <span class="expert upgrade-clone upgrade-tails">your</span>
USB stick in the <span class="guilabel">Target USB stick</span> drop-down list.
1. To start the
diff --git a/wiki/src/install/inc/steps/install_final.inline.pt.po b/wiki/src/install/inc/steps/install_final.inline.pt.po
index 66a0042..27a0019 100644
--- a/wiki/src/install/inc/steps/install_final.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_final.inline.pt.po
@@ -22,12 +22,10 @@ msgstr ""
msgid ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
"<h1 id=\"install-tails\" class=\"expert install-clone mac-clone\">Instale o Tails</h1>\n"
"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Instale o Tails final</h1>\n"
-"<h1 id=\"install-usb\" class=\"mac-dvd\">Instalar o Tails em uma memória USB</h1>\n"
"<h1 id=\"upgrade\" class=\"upgrade\">Atualize o Tails</h1>\n"
# Mantive "Tails Installer"
@@ -134,11 +132,11 @@ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
+"Tails</span> <span class=\"expert\">the</span> USB stick in "
"the computer."
msgstr ""
"Insira <span class=\"windows linux mac-usb\">a segunda</span> <span class="
-"\"install-clone mac-clone\">a nova</span> <span class=\"expert mac-dvd"
+"\"install-clone mac-clone\">a nova</span> <span class=\"expert"
"\">a</span> unidade USB <span class=\"upgrade\">Tails</span> no computador."
# Mantive "Tails Installer"
@@ -251,13 +249,13 @@ 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=\"expert mac-dvd upgrade-clone upgrade-tails\">your</span>\n"
+" <span class=\"expert upgrade-clone upgrade-tails\">your</span>\n"
" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Selecione\n"
" <span class=\"windows linux mac-usb\">a segunda</span>\n"
" <span class=\"install-clone mac-clone\">a nova</span>\n"
-" <span class=\"expert mac-dvd upgrade-clone\">a</span>\n"
+" <span class=\"expert upgrade-clone\">a</span>\n"
" unidade USB na lista <span class=\"guilabel\">Target Device</span>.\n"
#. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.de.po b/wiki/src/install/inc/steps/restart_first_time.inline.de.po
index 19b5b1a..7acb650 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.de.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.de.po
@@ -107,7 +107,6 @@ msgid ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
@@ -118,7 +117,6 @@ msgstr ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/index.de.html#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/index.de.html#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/index.de.html#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/index.de.html#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/index.de.html#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/index.de.html#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/index.de.html#back`</span>\n"
@@ -130,12 +128,10 @@ msgstr ""
msgid ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgstr ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Starten Sie mit dem vorübergehenden Tails neu</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Starten Sie mit dem anderen Tails neu</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Starten Sie mit der Tails-DVD neu</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Starten Sie mit dem anderen Tails neu</h1>\n"
#. type: Plain text
@@ -205,10 +201,9 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -216,10 +211,9 @@ msgid ""
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
msgstr ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Stellen Sie sicher, dass die DVD in den Computer eingelegt ist.</span>\n"
" <span class=\"usb\">Lassen Sie den <span class=\"windows linux mac\">ersten</span> USB-Stick angeschlossen und starten Sie den Computer neu.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Fahren Sie den Computer herunter.</p>\n"
+" <p class=\"clone upgrade-tails\">Fahren Sie den Computer herunter.</p>\n"
" <p class=\"clone\">Schließen Sie den anderen USB-Stick an, von dem aus Sie Tails\n"
" <span class=\"install-clone debian windows linux mac\">installieren</span>\n"
" <span class=\"upgrade\">aktualisieren</span>\n"
@@ -233,11 +227,9 @@ msgstr "Schalten Sie den Computer ein."
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
-" <p class=\"mac-dvd\">Drücken und halten Sie sofort die\n"
" <span class=\"keycap\">Wahl</span>-Taste (<span class=\"keycap\">Alt</span>-Taste), bis eine Liste der möglichen Datenträger\n"
" erscheint, von denen gestartet werden kann.</p>\n"
@@ -250,11 +242,9 @@ msgstr " [[!img install/inc/screenshots/mac_option_key.png class=\"mac-dvd\" l
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Choose the DVD and press\n"
" <span class=\"keycap\">Enter</span>. The DVD\n"
" might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
-" <p class=\"mac-dvd\">Wählen Sie die DVD aus und drücken Sie\n"
" <span class=\"keycap\">Enter</span>. Die DVD\n"
" wird möglicherweise, wie im folgenden Bildschirmfoto, als <span class=\"guilabel\">Windows</span> bezeichnet:</p>\n"
@@ -408,12 +398,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-dvd\">\n"
" <p>If your computer fails to start on the Tails DVD, then it might currently\n"
" be impossible to start Tails on your Mac model.</p>\n"
" </div>\n"
msgstr ""
-" <div class=\"bug mac-dvd\">\n"
" <p>Wenn Ihr Computer beim Starten von der Tails-DVD fehlschlägt, ist es möglicherweise derzeit\n"
" unmöglich, Tails auf Ihrem Mac Modell zu starten.</p>\n"
" </div>\n"
@@ -682,10 +670,7 @@ msgstr ""
#| "<p class=\"clone mac-dvd\">This was a first but important step!\n"
#| "Now grab the <span class=\"clone\">new</span> USB stick on which you want to install Tails.</p>\n"
msgid ""
-"<p class=\"clone mac-dvd\">This was a first but important step!\n"
-"<span class=\"mac-dvd\">Now grab the USB stick on which you want to install Tails.</span></p>\n"
msgstr ""
-"<p class=\"clone mac-dvd\">Dies war ein erster, aber wichtiger Schritt!\n"
"Holen Sie nun Ihren <span class=\"clone\">neuen</span> USB-Stick, auf dem Sie Tails installieren wollen.</p>\n"
#, fuzzy
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.es.po b/wiki/src/install/inc/steps/restart_first_time.inline.es.po
index a802a3c..4320858 100755
--- a/wiki/src/install/inc/steps/restart_first_time.inline.es.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.es.po
@@ -109,7 +109,6 @@ msgid ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
@@ -120,7 +119,6 @@ msgstr ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
@@ -132,12 +130,10 @@ msgstr ""
msgid ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgstr ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Reinicia en el Tails intermediario</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Reinicia en otro Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Reinicia en el DVD Tails</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Reinicia en Tails</h1>\n"
#. type: Plain text
@@ -203,10 +199,9 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -214,10 +209,9 @@ msgid ""
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
msgstr ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Asegúrate que el DVD está insertado en la computadora.</span>\n"
" <span class=\"usb\">Apaga la computadora mientras dejas la <span class=\"windows linux mac\">primera</span> memoria USB conectada.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Apaga la computadora</p>\n"
+" <p class=\"clone upgrade-tails\">Apaga la computadora</p>\n"
" <p class=\"clone\">Conecta la otra memoria USB desde la cual quieres\n"
" <span class=\"install-clone debian windows linux mac\">instalar</span>\n"
" <span class=\"upgrade\">actualizar</span>\n"
@@ -231,11 +225,9 @@ msgstr "Enciende la computadora."
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
-" <p class=\"mac-dvd\">Oprime imediatamente la tecla\n"
" <span class=\"keycap\">Opción</span> (<span class=\"keycap\">Alt</span> key) hasta que aparezca la lista de discos de arranque.</p>\n"
#. type: Plain text
@@ -246,11 +238,9 @@ msgstr " [[!img install/inc/screenshots/mac_option_key.png class=\"mac-dvd\" l
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Choose the DVD and press\n"
" <span class=\"keycap\">Enter</span>. The DVD\n"
" might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
-" <p class=\"mac-dvd\">Elige el DVD y presiona\n"
" <span class=\"keycap\">Enter</span>. El DVD\n"
" puede estar etiquetado como <span class=\"guilabel\">Windows</span> como en la siguiente captura de pantalla:</p>\n"
@@ -394,12 +384,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-dvd\">\n"
" <p>If your computer fails to start on the Tails DVD, then it might currently\n"
" be impossible to start Tails on your Mac model.</p>\n"
" </div>\n"
msgstr ""
-" <div class=\"bug mac-dvd\">\n"
" <p>Si tu computador no arranca desde el DVD Tails, tal vez sea imposible por ahora arrancar Tails desde tu modelo de Mac.</p>\n"
" </div>\n"
@@ -640,11 +628,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p class=\"clone mac-dvd\">This was a first but important step!\n"
-"<span class=\"mac-dvd\">Now grab the USB stick on which you want to install Tails.</span></p>\n"
msgstr ""
-"<p class=\"clone mac-dvd\">¡ Este ha sido un paso importante !\n"
-"<span class=\"mac-dvd\">Ahora toma la nueva memoria USB sobre la cual quieres instalar Tails.</span></p>\n"
#~ msgid ""
#~ "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fa.po b/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
index 93c132b..70fc3d5 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
@@ -102,7 +102,6 @@ msgid ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
@@ -115,7 +114,6 @@ msgstr ""
msgid ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgstr ""
@@ -175,10 +173,9 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -193,7 +190,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
@@ -206,7 +202,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Choose the DVD and press\n"
" <span class=\"keycap\">Enter</span>. The DVD\n"
" might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
@@ -318,7 +313,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-dvd\">\n"
" <p>If your computer fails to start on the Tails DVD, then it might currently\n"
" be impossible to start Tails on your Mac model.</p>\n"
" </div>\n"
@@ -508,6 +502,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p class=\"clone mac-dvd\">This was a first but important step!\n"
-"<span class=\"mac-dvd\">Now grab the USB stick on which you want to install Tails.</span></p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
index 006bcbe..6156721 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
@@ -106,7 +106,6 @@ msgid ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
@@ -117,7 +116,6 @@ msgstr ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/index.fr.html#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/index.fr.html#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/index.fr.html#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/index.fr.html#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/index.fr.html#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/index.fr.html#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/index.fr.html#back`</span>\n"
@@ -129,12 +127,10 @@ msgstr ""
msgid ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgstr ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Redémarrer sur le Tails intermédiaire</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Redémarrer sur l'autre Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Redémarrer sur le DVD Tails</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Redémarrer sous Tails</h1>\n"
#. type: Plain text
@@ -200,10 +196,9 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -211,10 +206,9 @@ msgid ""
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
msgstr ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Soyez sûre que le DVD est inséré dans l'ordinateur.</span>\n"
" <span class=\"usb\">Éteindre l'ordinateur en laissant la <span class=\"windows linux mac\">première</span> clé USB connectée.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Éteindre l'ordinateur.</p>\n"
+" <p class=\"clone upgrade-tails\">Éteindre l'ordinateur.</p>\n"
" <p class=\"clone\">Connecter l'autre clé USB Tails avec laquelle vous voulez\n"
" <span class=\"install-clone debian windows linux mac\">installer</span>\n"
" <span class=\"upgrade\">mettre à niveau</span>.</p>\n"
@@ -227,11 +221,9 @@ msgstr "Allumer l'ordinateur."
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
-" <p class=\"mac-dvd\">Presser et garder appuyé immédiatement la touche\n"
" <span class=\"keycap\">Option</span> (touche <span class=\"keycap\">Alt</span>) jusqu'à ce qu'une liste de disques\n"
" de démarrage apparaisse.</p>\n"
@@ -243,11 +235,9 @@ msgstr " [[!img install/inc/screenshots/mac_option_key.png class=\"mac-dvd\" l
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Choose the DVD and press\n"
" <span class=\"keycap\">Enter</span>. The DVD\n"
" might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
-" <p class=\"mac-dvd\">Choisir le DVD et appuyer sur\n"
" <span class=\"keycap\">Entrée</span>. Le DVD\n"
" devrait être nommé <span class=\"guilabel\">Windows</span> comme sur la capture d'écran suivante :</p>\n"
@@ -389,12 +379,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-dvd\">\n"
" <p>If your computer fails to start on the Tails DVD, then it might currently\n"
" be impossible to start Tails on your Mac model.</p>\n"
" </div>\n"
msgstr ""
-" <div class=\"bug mac-dvd\">\n"
" <p>Si votre ordinateur n'arrive pas à démarrer sur le DVD Tails, alors il est peut-être actuellement\n"
" impossible de démarrer Tails sur votre modèle de Mac.</p>\n"
" </div>\n"
@@ -640,8 +628,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p class=\"clone mac-dvd\">This was a first but important step!\n"
-"<span class=\"mac-dvd\">Now grab the USB stick on which you want to install Tails.</span></p>\n"
msgstr ""
-"<p class=\"clone mac-dvd\">C'était une première étape importante !\n"
-"<span class=\"mac-dvd\">Maintenant attrapez la clé USB sur laquelle vous voulez installer Tails.</span></p>\n"
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.it.po b/wiki/src/install/inc/steps/restart_first_time.inline.it.po
index 4a74cbb..d7f2f52 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.it.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.it.po
@@ -118,7 +118,6 @@ msgid ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
@@ -129,7 +128,6 @@ msgstr ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
@@ -141,12 +139,10 @@ msgstr ""
msgid ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgstr ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Riavvia sulla Tails intermediaria</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Riavvia su un'altra Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Riavvia sul DVD Tails</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Riavvia su Tails</h1>\n"
#. type: Plain text
@@ -213,10 +209,9 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -224,10 +219,9 @@ msgid ""
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
msgstr ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Assicurati che il DVD sia inserito nel computer.</span>\n"
" <span class=\"usb\">Spegni il computer lasciando la <span class=\"windows linux mac\">prima</span> chiave USB collegata.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Spegni il computer.</p>\n"
+" <p class=\"clone upgrade-tails\">Spegni il computer.</p>\n"
" <p class=\"clone\">Collega l'altra chiave USB Tails da cui vuoi\n"
" <span class=\"install-clone debian windows linux mac\">installare</span>\n"
" <span class=\"upgrade\">aggiornare</span>\n"
@@ -241,11 +235,9 @@ msgstr "Riaccendi il computer."
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
-" <p class=\"mac-dvd\">Immediatamente premi e tieni premuto il tasto\n"
" <span class=\"keycap\">Opzione</span> (<span class=\"keycap\">Alt</span> key) finché non appare una lista di\n"
" possibili dischi d'avvio.</p>\n"
"\n"
@@ -258,11 +250,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Choose the DVD and press\n"
" <span class=\"keycap\">Enter</span>. The DVD\n"
" might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
-" <p class=\"mac-dvd\">Scegli il DVD e premi\n"
" <span class=\"keycap\">Invio</span>. Il DVD\n"
" potrebbe essere etichettato <span class=\"guilabel\">Windows</span> come nello screenshot seguente:</p>\n"
@@ -395,12 +385,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-dvd\">\n"
" <p>If your computer fails to start on the Tails DVD, then it might currently\n"
" be impossible to start Tails on your Mac model.</p>\n"
" </div>\n"
msgstr ""
-" <div class=\"bug mac-dvd\">\n"
" <p>Se il tuo computer non si avvia dal DVD Tails, potrebbe essere\n"
" impossibile avviare Tails sul tuo modello di Mac.</p>\n"
" </div>\n"
@@ -663,10 +651,7 @@ msgstr ""
#| "<p class=\"clone mac-dvd\">This was a first but important step!\n"
#| "Now grab the <span class=\"clone\">new</span> USB stick on which you want to install Tails.</p>\n"
msgid ""
-"<p class=\"clone mac-dvd\">This was a first but important step!\n"
-"<span class=\"mac-dvd\">Now grab the USB stick on which you want to install Tails.</span></p>\n"
msgstr ""
-"<p class=\"clone mac-dvd\">Questo era il primo e più importante passaggio!\n"
"Ora prendi la <span class=\"clone\">nuova</span> chiave USB sulla quale vuoi installare Tails</p>\n"
#~ msgid ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.mdwn b/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
index d14c226..cbfc9b6 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
@@ -22,7 +22,6 @@ the rest of the instructions afterwards, we recommend you either:
[[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="windows qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class="mac-usb qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class="mac-clone qrcode" link="no" alt=""]]
- [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class="mac-dvd qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="expert qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class="upgrade-clone qrcode" link="no" alt=""]]
@@ -38,7 +37,6 @@ the rest of the instructions afterwards, we recommend you either:
<span class="windows">`https://tails.boum.org/install/win/usb/#back`</span>
<span class="mac-usb">`https://tails.boum.org/install/mac/usb/#back`</span>
<span class="mac-clone">`https://tails.boum.org/install/mac/clone/#back`</span>
- <span class="mac-dvd">`https://tails.boum.org/install/mac/dvd/#back`</span>
<span class="expert">`https://tails.boum.org/install/expert/usb/#back`</span>
<span class="linux">`https://tails.boum.org/install/linux/usb/#back`</span>
<span class="upgrade-clone">`https://tails.boum.org/upgrade/clone/#back`</span>
@@ -46,14 +44,12 @@ the rest of the instructions afterwards, we recommend you either:
<h1 id="start-intermediary" class="upgrade-tails">Restart on the intermediary Tails</h1>
<h1 id="start-other" class="clone">Restart on the other Tails</h1>
-<h1 id="start-dvd" class="mac-dvd">Restart on the Tails DVD</h1>
<h1 id="start-tails" class="windows linux mac-usb expert">Restart on Tails</h1>
<div class="step-image">
[[!img install/inc/infography/plug-source-usb.png link="no" class="clone" alt="USB stick plugged on the left"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="windows linux mac-usb" alt="Computer restarted on USB stick on the right"]]
[[!img install/inc/infography/restart-on-intermediary-tails.png link="no" class="clone" alt="Computer restarted on USB stick on the left"]]
-[[!img install/inc/infography/restart-on-dvd.png link="no" class="mac-dvd" alt="Computer restarted on DVD"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails" alt="USB stick unplugged on the right and computer restarted on USB stick on the left"]]
</div>
@@ -70,10 +66,9 @@ from a Tails DVD in a similar way.</p>
</div>
1. <p>
- <span class="mac-dvd">Make sure that the DVD is inserted in the computer.</span>
<span class="usb">Shut down the computer while leaving the USB stick plugged in.</span>
</p>
- <p class="mac-dvd clone upgrade-tails">Shut down the computer.</p>
+ <p class="clone upgrade-tails">Shut down the computer.</p>
<p class="clone">Plug in the other Tails USB stick that you want to
<span class="install-clone windows linux mac">install</span>
<span class="upgrade">upgrade</span>
@@ -82,18 +77,6 @@ from a Tails DVD in a similar way.</p>
1. Switch on the computer.
- <p class="mac-dvd">Immediately press-and-hold the
- <span class="keycap">Option</span> key (<span class="keycap">Alt</span> key) until a list of possible startup
- disks appears.</p>
-
- [[!img install/inc/screenshots/mac_option_key.png class="mac-dvd" link="no" alt="'Option' or 'alt' key in the bottom left of Mac keyboard"]]
-
- <p class="mac-dvd">Choose the DVD and press
- <span class="keycap">Enter</span>. The DVD
- might be labeled <span class="guilabel">Windows</span> like in the following screenshot:</p>
-
- [[!img install/inc/screenshots/mac_startup_dvd.png class="mac-dvd" link="no" alt="Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)"]]
-
<div class="mac-usb mac-clone">
[[!inline pages="install/inc/steps/mac_startup_disks.inline" raw="yes" sort="age"]]
</div>
@@ -129,11 +112,6 @@ from a Tails DVD in a similar way.</p>
currently be impossible to start Tails on your Mac model.</p>
</div>
- <div class="bug mac-dvd">
- <p>If your computer fails to start on the Tails DVD, then it might currently
- be impossible to start Tails on your Mac model.</p>
- </div>
-
1. After 30&ndash;60 seconds, another screen called <span class="application">Tails Greeter</span> appears.
<div class="note">
@@ -218,10 +196,3 @@ Click <span class="button">Start Tails</span>.
1. After 15&ndash;30 seconds, the Tails desktop appears.
[[!img install/inc/screenshots/desktop.png link="no" alt="Tails desktop"]]
-
-<div class="trophy mac-dvd">
-
-<p class="clone mac-dvd">This was a first but important step!
-<span class="mac-dvd">Now grab the USB stick on which you want to install Tails.</span></p>
-
-</div>
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.pt.po b/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
index 30bc5a3..6b03f96 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
@@ -103,7 +103,6 @@ msgid ""
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
@@ -116,7 +115,6 @@ msgstr ""
msgid ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgstr ""
@@ -176,10 +174,9 @@ msgstr ""
#, no-wrap
msgid ""
"1. <p>\n"
-" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
-" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+" <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
" <span class=\"install-clone debian windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
@@ -194,7 +191,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
@@ -207,7 +203,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <p class=\"mac-dvd\">Choose the DVD and press\n"
" <span class=\"keycap\">Enter</span>. The DVD\n"
" might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
@@ -319,7 +314,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-dvd\">\n"
" <p>If your computer fails to start on the Tails DVD, then it might currently\n"
" be impossible to start Tails on your Mac model.</p>\n"
" </div>\n"
@@ -509,6 +503,4 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p class=\"clone mac-dvd\">This was a first but important step!\n"
-"<span class=\"mac-dvd\">Now grab the USB stick on which you want to install Tails.</span></p>\n"
msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.de.po b/wiki/src/install/inc/steps/restart_second_time.inline.de.po
index aa2fd5a..5305096 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.de.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.de.po
@@ -133,7 +133,7 @@ msgstr " [[!inline pages=\"install/inc/steps/not_at_all.inline.de\" raw=\"yes\
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
" <span class=\"mac-dvd\">Tails USB stick,</span>\n"
@@ -143,7 +143,7 @@ msgid ""
" <span class=\"usb\">On this intermediary Tails you cannot benefit from\n"
" automatic upgrades or create an encrypted persistent storage.</span></p>\n"
msgstr ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>Falls Ihr Computer dabei fehlschlägt,\n"
" <span class=\"usb\">das endgültige Tails</span>\n"
" <span class=\"mac-dvd\">den USB-Stick mit Tails</span>\n"
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.es.po b/wiki/src/install/inc/steps/restart_second_time.inline.es.po
index 1e1345a..039e2f8 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.es.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.es.po
@@ -133,7 +133,7 @@ msgstr " [[!inline pages=\"install/inc/steps/not_at_all.inline.es\" raw=\"yes\
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
" <span class=\"mac-dvd\">Tails USB stick,</span>\n"
@@ -143,7 +143,7 @@ msgid ""
" <span class=\"usb\">On this intermediary Tails you cannot benefit from\n"
" automatic upgrades or create an encrypted persistent storage.</span></p>\n"
msgstr ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>Si tu computadora falla al iniciar en la\n"
" <span class=\"usb\">Tails final,</span>\n"
" <span class=\"mac-dvd\">memoria USB deTails,</span>\n"
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.fa.po b/wiki/src/install/inc/steps/restart_second_time.inline.fa.po
index 5e1304c..2fea2fe 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.fa.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.fa.po
@@ -108,7 +108,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
" <span class=\"mac-dvd\">Tails USB stick,</span>\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 c98cc45..2b503a1 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
@@ -129,7 +129,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
" <span class=\"mac-dvd\">Tails USB stick,</span>\n"
@@ -139,7 +139,7 @@ msgid ""
" <span class=\"usb\">On this intermediary Tails you cannot benefit from\n"
" automatic upgrades or create an encrypted persistent storage.</span></p>\n"
msgstr ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>Si votre ordinateur échoue à démarrer sur\n"
" <span class=\"usb\">le Tails définitif,</span>\n"
" <span class=\"mac-dvd\">la clé USB Tails,</span>\n"
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.it.po b/wiki/src/install/inc/steps/restart_second_time.inline.it.po
index e5d76f8..35d9c12 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.it.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.it.po
@@ -129,7 +129,7 @@ msgstr " [[!inline pages=\"install/inc/steps/not_at_all.inline.it\" raw=\"yes\
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
" <span class=\"mac-dvd\">Tails USB stick,</span>\n"
@@ -139,7 +139,7 @@ msgid ""
" <span class=\"usb\">On this intermediary Tails you cannot benefit from\n"
" automatic upgrades or create an encrypted persistent storage.</span></p>\n"
msgstr ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>Se il tuo computer non riesce ad avviari sulla\n"
" <span class=\"usb\">Tails finale,</span>\n"
" <span class=\"mac-dvd\">chiave USB Tails,</span>\n"
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.mdwn b/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
index c7e0895..c93eeef 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
@@ -41,7 +41,7 @@
"""]]
- <div class="bug mac-usb mac-dvd">
+ <div class="bug mac-usb">
<p>If your computer fails to start on the
<span class="usb">final Tails,</span>
<span class="mac-dvd">Tails USB stick,</span>
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.pt.po b/wiki/src/install/inc/steps/restart_second_time.inline.pt.po
index 4cb2cc1..73cfdfb 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.pt.po
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.pt.po
@@ -109,7 +109,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"bug mac-usb mac-dvd\">\n"
+" <div class=\"bug mac-usb\">\n"
" <p>If your computer fails to start on the\n"
" <span class=\"usb\">final Tails,</span>\n"
" <span class=\"mac-dvd\">Tails USB stick,</span>\n"