Commit 69fe71a2 authored by sajolida's avatar sajolida
Browse files

Remove mac-dvd scenario (#15825)

parent ec636046
...@@ -108,7 +108,6 @@ scenario and elements with the ...@@ -108,7 +108,6 @@ scenario and elements with the
- `install-clone` for [[/install/clone|/install/clone]] - `install-clone` for [[/install/clone|/install/clone]]
- `windows-usb` for [[/install/win/usb|/install/win/usb]] - `windows-usb` for [[/install/win/usb|/install/win/usb]]
- `mac-usb` for [[/install/mac/usb|/install/mac/usb]] - `mac-usb` for [[/install/mac/usb|/install/mac/usb]]
- `mac-dvd` for [[/install/mac/dvd|/install/mac/dvd]]
- `mac-clone` for [[/install/mac/clone|/install/mac/clone]] - `mac-clone` for [[/install/mac/clone|/install/mac/clone]]
- `debian-usb` for [[/install/debian/usb|/install/debian/usb]] - `debian-usb` for [[/install/debian/usb|/install/debian/usb]]
- `expert-usb` for [[/install/expert/usb|/install/expert/usb]] - `expert-usb` for [[/install/expert/usb|/install/expert/usb]]
......
...@@ -26,32 +26,32 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]" ...@@ -26,32 +26,32 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\">1½ " "<span class=\"windows linux mac-usb debian expert upgrade-tails\">1½ "
"hours in total</span> <span class=\"install-clone\">½ hour</span> <span " "hours in total</span> <span class=\"install-clone\">½ hour</span> <span "
"class=\"upgrade-clone\">¼ hour</span>" "class=\"upgrade-clone\">¼ hour</span>"
msgstr "" msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 Stunden insgesamt</span> " "<span class=\"windows linux mac-usb\">2 Stunden insgesamt</span> "
"<span class=\"debian expert upgrade-tails\">1½ Stunden insgesamt</span> " "<span class=\"debian expert upgrade-tails\">1½ Stunden insgesamt</span> "
"<span class=\"install-clone\">½ Stunde</span> <span class=\"upgrade-clone" "<span class=\"install-clone\">½ Stunde</span> <span class=\"upgrade-clone"
"\">¼ Stunde</span>" "\">¼ Stunde</span>"
#. type: Content of: <div><div><div><div><div><h4><span> #. type: Content of: <div><div><div><div><div><h4><span>
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> " "<span class=\"windows linux mac-usb debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age" "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
"\"]] to download</small>" "\"]] to download</small>"
msgstr "" msgstr ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> " "<span class=\"windows linux mac-usb debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age" "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
"\"]] zum herunterladen</small>" "\"]] zum herunterladen</small>"
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
msgid "" msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd debian expert\"><small>½ " "</span> <span class=\"windows linux mac-usb debian expert\"><small>½ "
"hour to install</small></span> <span class=\"upgrade-tails\"><small>½ hour " "hour to install</small></span> <span class=\"upgrade-tails\"><small>½ hour "
"to upgrade</small></span>" "to upgrade</small></span>"
msgstr "" msgstr ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 Stunde zum " "</span> <span class=\"windows linux mac-usb\"><small>1 Stunde zum "
"Installieren</small></span> <span class=\"debian expert\"><small>½ Stunde " "Installieren</small></span> <span class=\"debian expert\"><small>½ Stunde "
"zum Installieren</small></span> <span class=\"upgrade-tails\"><small>½ " "zum Installieren</small></span> <span class=\"upgrade-tails\"><small>½ "
"Stunde zum Aktualisieren</small></span>" "Stunde zum Aktualisieren</small></span>"
...@@ -267,32 +267,32 @@ msgstr "Konfigurieren" ...@@ -267,32 +267,32 @@ msgstr "Konfigurieren"
#, fuzzy #, fuzzy
#~| msgid "" #~| msgid ""
#~| "<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class=" #~| "<span class=\"windows linux mac-usb\">2 hours</span> <span class="
#~| "\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</" #~| "\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</"
#~| "span> <span class=\"upgrade-clone\">¼ hour</span>" #~| "span> <span class=\"upgrade-clone\">¼ hour</span>"
#~ msgid "" #~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 hours in " #~ "<span class=\"windows linux mac-usb upgrade-tails\">2 hours in "
#~ "total</span> <span class=\"debian expert\">1½ hour in total</span> <span " #~ "total</span> <span class=\"debian expert\">1½ hour in total</span> <span "
#~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ " #~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
#~ "hour</span>" #~ "hour</span>"
#~ msgstr "" #~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd\">2 Stunden</span> <span " #~ "<span class=\"windows linux mac-usb\">2 Stunden</span> <span "
#~ "class=\"debian expert\">1½ Stunden</span> <span class=\"install-clone" #~ "class=\"debian expert\">1½ Stunden</span> <span class=\"install-clone"
#~ "\">½ Stunde</span> <span class=\"upgrade-clone\">¼ Stunde</span>" #~ "\">½ Stunde</span> <span class=\"upgrade-clone\">¼ Stunde</span>"
#, fuzzy #, fuzzy
#~| msgid "" #~| msgid ""
#~| "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to " #~| "</span> <span class=\"windows linux mac-usb\"><small>1 hour to "
#~| "install</small></span> <span class=\"debian expert\"><small>½ hour to " #~| "install</small></span> <span class=\"debian expert\"><small>½ hour to "
#~| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to " #~| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
#~| "upgrade</small></span>" #~| "upgrade</small></span>"
#~ msgid "" #~ msgid ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to " #~ "</span> <span class=\"windows linux mac-usb\"><small>1 hour to "
#~ "install</small></span> <span class=\"debian expert\"><small>½ hour to " #~ "install</small></span> <span class=\"debian expert\"><small>½ hour to "
#~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to " #~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to "
#~ "upgrade</small></span>" #~ "upgrade</small></span>"
#~ msgstr "" #~ msgstr ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 Stunde zum " #~ "</span> <span class=\"windows linux mac-usb\"><small>1 Stunde zum "
#~ "Installieren</small></span> <span class=\"debian expert\"><small>½ Stunde " #~ "Installieren</small></span> <span class=\"debian expert\"><small>½ Stunde "
#~ "zum Installieren</small></span> <span class=\"upgrade-tails\"><small>½ " #~ "zum Installieren</small></span> <span class=\"upgrade-tails\"><small>½ "
#~ "Stunde zum Aktualisieren</small></span>" #~ "Stunde zum Aktualisieren</small></span>"
...@@ -331,14 +331,14 @@ msgstr "Konfigurieren" ...@@ -331,14 +331,14 @@ msgstr "Konfigurieren"
#, fuzzy #, fuzzy
#~| msgid "" #~| msgid ""
#~| "<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails" #~| "<span class=\"windows linux mac-usb debian expert upgrade-tails"
#~| "\"> <small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" " #~| "\"> <small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" "
#~| "sort=\"age\"]] to download</small>" #~| "sort=\"age\"]] to download</small>"
#~ msgid "" #~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!" #~ "<span class=\"windows linux mac-usb upgrade-tails\"><small>[[!"
#~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>" #~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
#~ msgstr "" #~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails" #~ "<span class=\"windows linux mac-usb debian expert upgrade-tails"
#~ "\"> <small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=" #~ "\"> <small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
#~ "\"age\"]] zum herunterladen</small>" #~ "\"age\"]] zum herunterladen</small>"
......
...@@ -29,42 +29,42 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]" ...@@ -29,42 +29,42 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> " #| "<span class=\"windows linux mac-usb\">2 hours in total</span> "
#| "<span class=\"debian expert\">1½ hour in total</span> <span class=" #| "<span class=\"debian expert\">1½ hour in total</span> <span class="
#| "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</" #| "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
#| "span>" #| "span>"
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\">1½ " "<span class=\"windows linux mac-usb debian expert upgrade-tails\">1½ "
"hours in total</span> <span class=\"install-clone\">½ hour</span> <span " "hours in total</span> <span class=\"install-clone\">½ hour</span> <span "
"class=\"upgrade-clone\">¼ hour</span>" "class=\"upgrade-clone\">¼ hour</span>"
msgstr "" msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 horas en total</span> <span " "<span class=\"windows linux mac-usb\">2 horas en total</span> <span "
"class=\"debian expert\">1½ hora en total</span> <span class=\"install-clone" "class=\"debian expert\">1½ hora en total</span> <span class=\"install-clone"
"\">½ hora</span> <span class=\"upgrade-clone\">¼ hora</span>" "\">½ hora</span> <span class=\"upgrade-clone\">¼ hora</span>"
#. type: Content of: <div><div><div><div><div><h4><span> #. type: Content of: <div><div><div><div><div><h4><span>
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> " "<span class=\"windows linux mac-usb debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age" "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
"\"]] to download</small>" "\"]] to download</small>"
msgstr "" msgstr ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> " "<span class=\"windows linux mac-usb debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age" "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
"\"]] para descargar</small>" "\"]] para descargar</small>"
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to " #| "</span> <span class=\"windows linux mac-usb\"><small>1 hour to "
#| "install</small></span> <span class=\"debian expert\"><small>½ hour to " #| "install</small></span> <span class=\"debian expert\"><small>½ hour to "
#| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to " #| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
#| "upgrade</small></span>" #| "upgrade</small></span>"
msgid "" msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd debian expert\"><small>½ " "</span> <span class=\"windows linux mac-usb debian expert\"><small>½ "
"hour to install</small></span> <span class=\"upgrade-tails\"><small>½ hour " "hour to install</small></span> <span class=\"upgrade-tails\"><small>½ hour "
"to upgrade</small></span>" "to upgrade</small></span>"
msgstr "" msgstr ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hora para " "</span> <span class=\"windows linux mac-usb\"><small>1 hora para "
"instalar</small></span> <span class=\"debian expert\"><small>½ hora para " "instalar</small></span> <span class=\"debian expert\"><small>½ hora para "
"instalar</small></span> <span class=\"upgrade-tails\"><small>½ hora para " "instalar</small></span> <span class=\"upgrade-tails\"><small>½ hora para "
"actualizar</small></span>" "actualizar</small></span>"
...@@ -268,12 +268,12 @@ msgid "Configure" ...@@ -268,12 +268,12 @@ msgid "Configure"
msgstr "Configurar" msgstr "Configurar"
#~ msgid "" #~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 hours in " #~ "<span class=\"windows linux mac-usb upgrade-tails\">2 hours in "
#~ "total</span> <span class=\"debian expert\">1½ hour in total</span> <span " #~ "total</span> <span class=\"debian expert\">1½ hour in total</span> <span "
#~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ " #~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
#~ "hour</span>" #~ "hour</span>"
#~ msgstr "" #~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 horas en " #~ "<span class=\"windows linux mac-usb upgrade-tails\">2 horas en "
#~ "total</span> <span class=\"debian expert\">1½ hora en total</span> <span " #~ "total</span> <span class=\"debian expert\">1½ hora en total</span> <span "
#~ "class=\"install-clone\">½ hora</span> <span class=\"upgrade-clone\">¼ " #~ "class=\"install-clone\">½ hora</span> <span class=\"upgrade-clone\">¼ "
#~ "hora</span>" #~ "hora</span>"
...@@ -297,12 +297,12 @@ msgstr "Configurar" ...@@ -297,12 +297,12 @@ msgstr "Configurar"
#~ "sort=\"age\"]] \"\"\"]]" #~ "sort=\"age\"]] \"\"\"]]"
#~ msgid "" #~ msgid ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to " #~ "</span> <span class=\"windows linux mac-usb\"><small>1 hour to "
#~ "install</small></span> <span class=\"debian expert\"><small>½ hour to " #~ "install</small></span> <span class=\"debian expert\"><small>½ hour to "
#~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to " #~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to "
#~ "upgrade</small></span>" #~ "upgrade</small></span>"
#~ msgstr "" #~ msgstr ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hora para " #~ "</span> <span class=\"windows linux mac-usb\"><small>1 hora para "
#~ "instalar</small></span> <span class=\"debian expert\"><small>½ hora para " #~ "instalar</small></span> <span class=\"debian expert\"><small>½ hora para "
#~ "instalar</small></span> <span class=\"upgrade-tails\"><small>¼ hora para " #~ "instalar</small></span> <span class=\"upgrade-tails\"><small>¼ hora para "
#~ "actualizar</small></span>" #~ "actualizar</small></span>"
...@@ -323,10 +323,10 @@ msgstr "Configurar" ...@@ -323,10 +323,10 @@ msgstr "Configurar"
#~ "\"upgrade-tails\">instalar un Tails intermediario.</span>" #~ "\"upgrade-tails\">instalar un Tails intermediario.</span>"
#~ msgid "" #~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!" #~ "<span class=\"windows linux mac-usb upgrade-tails\"><small>[[!"
#~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>" #~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
#~ msgstr "" #~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!" #~ "<span class=\"windows linux mac-usb upgrade-tails\"><small>[[!"
#~ "toggle id=\"why_two\" text=\"¿Por qué un Tails intermedio?\"]]</small></" #~ "toggle id=\"why_two\" text=\"¿Por qué un Tails intermedio?\"]]</small></"
#~ "span>" #~ "span>"
......
...@@ -26,21 +26,21 @@ msgstr "" ...@@ -26,21 +26,21 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\">1½ " "<span class=\"windows linux mac-usb debian expert upgrade-tails\">1½ "
"hours in total</span> <span class=\"install-clone\">½ hour</span> <span " "hours in total</span> <span class=\"install-clone\">½ hour</span> <span "
"class=\"upgrade-clone\">¼ hour</span>" "class=\"upgrade-clone\">¼ hour</span>"
msgstr "" msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span> #. type: Content of: <div><div><div><div><div><h4><span>
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> " "<span class=\"windows linux mac-usb debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age" "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
"\"]] to download</small>" "\"]] to download</small>"
msgstr "" msgstr ""
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
msgid "" msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd debian expert\"><small>½ " "</span> <span class=\"windows linux mac-usb debian expert\"><small>½ "
"hour to install</small></span> <span class=\"upgrade-tails\"><small>½ hour " "hour to install</small></span> <span class=\"upgrade-tails\"><small>½ hour "
"to upgrade</small></span>" "to upgrade</small></span>"
msgstr "" msgstr ""
......
...@@ -27,42 +27,42 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]" ...@@ -27,42 +27,42 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> " #| "<span class=\"windows linux mac-usb\">2 hours in total</span> "
#| "<span class=\"debian expert\">1½ hour in total</span> <span class=" #| "<span class=\"debian expert\">1½ hour in total</span> <span class="
#| "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</" #| "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
#| "span>" #| "span>"
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\">1½ " "<span class=\"windows linux mac-usb debian expert upgrade-tails\">1½ "
"hours in total</span> <span class=\"install-clone\">½ hour</span> <span " "hours in total</span> <span class=\"install-clone\">½ hour</span> <span "
"class=\"upgrade-clone\">¼ hour</span>" "class=\"upgrade-clone\">¼ hour</span>"
msgstr "" msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 heures au total</span> <span " "<span class=\"windows linux mac-usb\">2 heures au total</span> <span "
"class=\"debian expert\">1 heure ½ au total</span> <span class=\"install-clone" "class=\"debian expert\">1 heure ½ au total</span> <span class=\"install-clone"
"\">½ heure</span> <span class=\"upgrade-clone\">¼ d'heure</span>" "\">½ heure</span> <span class=\"upgrade-clone\">¼ d'heure</span>"
#. type: Content of: <div><div><div><div><div><h4><span> #. type: Content of: <div><div><div><div><div><h4><span>
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> " "<span class=\"windows linux mac-usb debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age" "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
"\"]] to download</small>" "\"]] to download</small>"
msgstr "" msgstr ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> " "<span class=\"windows linux mac-usb debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age" "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
"\"]] à télécharger</small>" "\"]] à télécharger</small>"
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to " #| "</span> <span class=\"windows linux mac-usb\"><small>1 hour to "
#| "install</small></span> <span class=\"debian expert\"><small>½ hour to " #| "install</small></span> <span class=\"debian expert\"><small>½ hour to "
#| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to " #| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
#| "upgrade</small></span>" #| "upgrade</small></span>"
msgid "" msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd debian expert\"><small>½ " "</span> <span class=\"windows linux mac-usb debian expert\"><small>½ "
"hour to install</small></span> <span class=\"upgrade-tails\"><small>½ hour " "hour to install</small></span> <span class=\"upgrade-tails\"><small>½ hour "
"to upgrade</small></span>" "to upgrade</small></span>"
msgstr "" msgstr ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 heure pour " "</span> <span class=\"windows linux mac-usb\"><small>1 heure pour "
"l'installation</small></span> <span class=\"debian expert\"><small>½ heure " "l'installation</small></span> <span class=\"debian expert\"><small>½ heure "
"pour l'installation</small></span> <span class=\"upgrade-tails\"><small>½ " "pour l'installation</small></span> <span class=\"upgrade-tails\"><small>½ "
"heure pour la mise à jour</small></span>" "heure pour la mise à jour</small></span>"
...@@ -298,10 +298,10 @@ msgstr "Configuration" ...@@ -298,10 +298,10 @@ msgstr "Configuration"
#~ "<span class=\"upgrade-tails\">installer un Tails intermédiaire.</span>" #~ "<span class=\"upgrade-tails\">installer un Tails intermédiaire.</span>"
#~ msgid "" #~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!" #~ "<span class=\"windows linux mac-usb upgrade-tails\"><small>[[!"
#~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>" #~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
#~ msgstr "" #~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!" #~ "<span class=\"windows linux mac-usb upgrade-tails\"><small>[[!"
#~ "toggle id=\"why_two\" text=\"Pourquoi un Tails intermédiaire ?\"]]</" #~ "toggle id=\"why_two\" text=\"Pourquoi un Tails intermédiaire ?\"]]</"
#~ "small></span>" #~ "small></span>"
...@@ -328,23 +328,23 @@ msgstr "Configuration" ...@@ -328,23 +328,23 @@ msgstr "Configuration"
#~ "\">mettre à jour votre Tails.</span>" #~ "\">mettre à jour votre Tails.</span>"
#~ msgid "" #~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 hours in " #~ "<span class=\"windows linux mac-usb upgrade-tails\">2 hours in "
#~ "total</span> <span class=\"debian expert\">1½ hour in total</span> <span " #~ "total</span> <span class=\"debian expert\">1½ hour in total</span> <span "
#~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ " #~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
#~ "hour</span>" #~ "hour</span>"
#~ msgstr "" #~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 heures au " #~ "<span class=\"windows linux mac-usb upgrade-tails\">2 heures au "
#~ "total</span> <span class=\"debian expert\">1 heure ½ au total</span> " #~ "total</span> <span class=\"debian expert\">1 heure ½ au total</span> "
#~ "<span class=\"install-clone\">½ heure</span> <span class=\"upgrade-clone" #~ "<span class=\"install-clone\">½ heure</span> <span class=\"upgrade-clone"
#~ "\">¼ d'heure</span>" #~ "\">¼ d'heure</span>"
#~ msgid "" #~ msgid ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to " #~ "</span> <span class=\"windows linux mac-usb\"><small>1 hour to "
#~ "install</small></span> <span class=\"debian expert\"><small>½ hour to " #~ "install</small></span> <span class=\"debian expert\"><small>½ hour to "
#~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to " #~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to "
#~ "upgrade</small></span>" #~ "upgrade</small></span>"
#~ msgstr "" #~ msgstr ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 heure pour " #~ "</span> <span class=\"windows linux mac-usb\"><small>1 heure pour "
#~ "l'installation</small></span> <span class=\"debian expert\"><small>½ " #~ "l'installation</small></span> <span class=\"debian expert\"><small>½ "
#~ "heure pour l'installation</small></span> <span class=\"upgrade-tails" #~ "heure pour l'installation</small></span> <span class=\"upgrade-tails"
#~ "\"><small>¼ heure pour la mise à jour</small></span>" #~ "\"><small>¼ heure pour la mise à jour</small></span>"
......
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
<div class="caption"> <div class="caption">
<h4> <h4>
<span class="windows linux mac-usb mac-dvd expert upgrade-tails">1½ hours in total</span> <span class="windows linux mac-usb expert upgrade-tails">1½ hours in total</span>
<span class="install-clone">½ hour</span> <span class="install-clone">½ hour</span>
<span class="upgrade-clone">¼ hour</span> <span class="upgrade-clone">¼ hour</span>
<br /> <br />
<span class="windows linux mac-usb mac-dvd expert upgrade-tails"> <span class="windows linux mac-usb expert upgrade-tails">
<small>[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]] to download</small><br /> <small>[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]] to download</small><br />
</span> </span>
<span class="windows linux mac-usb mac-dvd expert"><small>½ hour to install</small></span> <span class="windows linux mac-usb expert"><small>½ hour to install</small></span>
<span class="upgrade-tails"><small>½ hour to upgrade</small></span> <span class="upgrade-tails"><small>½ hour to upgrade</small></span>
</h4> </h4>
</div> </div>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-2 windows linux mac-usb expert install-clone mac-dvd"> <div class="col-xs-12 col-sm-2 windows linux mac-usb expert install-clone">
<div class="thumbnail"> <div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no" alt=""]] [[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption"> <div class="caption">
...@@ -71,16 +71,6 @@ ...@@ -71,16 +71,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-2 mac-dvd">
<div class="thumbnail">
[[!img install/inc/icons/1-dvd.png link="no" alt=""]]
<div class="caption">
<h4>1 DVD<br />
<small>All data will be lost!</small>
</h4>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-2"> <div class="col-xs-12 col-sm-2">
<div class="thumbnail"> <div class="thumbnail">
[[!img install/inc/icons/screens.png link="no" alt=""]] [[!img install/inc/icons/screens.png link="no" alt=""]]
...@@ -101,7 +91,7 @@ ...@@ -101,7 +91,7 @@
<div id="steps"> <div id="steps">
<h3>Your steps</h3> <h3>Your steps</h3>
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd expert"> <div class="col-xs-12 col-sm-2 windows linux mac-usb expert">
<div class="thumbnail"> <div class="thumbnail">
[[!img install/inc/infography/download-and-verify.png link="no" alt="ISO image downloaded and verified"]] [[!img install/inc/infography/download-and-verify.png link="no" alt="ISO image downloaded and verified"]]
<p>Download</p> <p>Download</p>
...@@ -131,13 +121,7 @@ ...@@ -131,13 +121,7 @@
<p>Install intermediary</p> <p>Install intermediary</p>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-2 mac-dvd"> <div class="col-xs-12 col-sm-2 windows linux mac-usb expert">
<div class="thumbnail">
[[!img install/inc/infography/insert-dvd.png link="no" alt="DVD inserted"]]
<p>Install</p>
</div>
</div>
<div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd expert">
<div class="thumbnail"> <div class="thumbnail">
[[!img install/inc/infography/restart.png link="no" alt=""]] [[!img install/inc/infography/restart.png link="no" alt=""]]
<p>Restart</p> <p>Restart</p>
...@@ -158,19 +142,13 @@ ...@@ -158,19 +142,13 @@
</p> </p>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-2 mac-dvd"> <div class="col-xs-12 col-sm-2 install-clone">
<div class="thumbnail">
[[!img install/inc/infography/clone-dvd.png link="no" alt="Tails installed on USB stick on the right"]]
<p>Install</p>
</div>
</div>
<div class="col-xs-12 col-sm-2 mac-dvd install-clone">
<div class="thumbnail"> <div class="thumbnail">
[[!img install/inc/infography/restart.png link="no" alt=""]] [[!img install/inc/infography/restart.png link="no" alt=""]]
<p>Restart</p> <p>Restart</p>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd install-clone expert"> <div class="col-xs-12 col-sm-2 windows linux mac-usb install-clone expert">
<div class="thumbnail"> <div class="thumbnail">
[[!img install/inc/infography/create-persistence.png link="no" alt="Encryption configured on USB stick on the right"]] [[!img install/inc/infography/create-persistence.png link="no" alt="Encryption configured on USB stick on the right"]]
<p>Configure</p> <p>Configure</p>
......
...@@ -28,14 +28,14 @@ msgstr "" ...@@ -28,14 +28,14 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4> #. type: Content of: <div><div><div><div><div><h4>
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\">1½ " "<span class=\"windows linux mac-usb debian expert upgrade-tails\">1½ "
"hours in total</span> <span class=\"install-clone\">½ hour</span> <span " "hours in total</span> <span class=\"install-clone\">½ hour</span> <span "
"class=\"upgrade-clone\">¼ hour</span>" "class=\"upgrade-clone\">¼ hour</span>"
msgstr "" msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span> #. type: Content of: <div><div><div><div><div><h4><span>
msgid "" msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> " "<span class=\"windows linux mac-usb debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age" "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
"\"]] to download</small>" "\"]] to download</small>"
msgstr ""