summaryrefslogtreecommitdiffstats
path: root/wiki/src/install
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2017-12-18 23:58:05 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2017-12-18 23:58:05 +0100
commit05c5f95bc04e1f84e31f57b11a9503375075577a (patch)
tree8c35d06ac943665e4787ed70b651c309702c7633 /wiki/src/install
parent15eb5d7ad7627916f1de3683071a79bb4b45f640 (diff)
parent1db04699bd95dccbee96e0cc51b0fc233fce75a8 (diff)
Merge remote-tracking branch 'origin/stable' into bugfix/10494-retry-curl-in-htpdatebugfix/10494-retry-curl-in-htpdate
Diffstat (limited to 'wiki/src/install')
-rw-r--r--wiki/src/install/debian.de.po55
-rw-r--r--wiki/src/install/debian.fa.po21
-rw-r--r--wiki/src/install/debian.fr.po49
-rw-r--r--wiki/src/install/debian.html14
-rw-r--r--wiki/src/install/debian.it.po55
-rw-r--r--wiki/src/install/debian.pt.po21
-rw-r--r--wiki/src/install/debian/clone-overview.de.po (renamed from wiki/src/install/win/clone/overview.de.po)49
-rw-r--r--wiki/src/install/debian/clone-overview.fa.po (renamed from wiki/src/install/win/clone/overview.fa.po)17
-rw-r--r--wiki/src/install/debian/clone-overview.fr.po63
-rw-r--r--wiki/src/install/debian/clone-overview.html (renamed from wiki/src/install/win/clone/overview.html)4
-rw-r--r--wiki/src/install/debian/clone-overview.it.po (renamed from wiki/src/install/debian/clone/overview.it.po)38
-rw-r--r--wiki/src/install/debian/clone-overview.pt.po (renamed from wiki/src/install/win/clone/overview.pt.po)17
-rw-r--r--wiki/src/install/debian/clone/overview.de.po51
-rw-r--r--wiki/src/install/debian/clone/overview.fa.po48
-rw-r--r--wiki/src/install/debian/clone/overview.fr.po48
-rw-r--r--wiki/src/install/debian/clone/overview.pt.po48
-rw-r--r--wiki/src/install/debian/usb-download.de.po62
-rw-r--r--wiki/src/install/debian/usb-download.fa.po62
-rw-r--r--wiki/src/install/debian/usb-download.fr.po62
-rw-r--r--wiki/src/install/debian/usb-download.it.po62
-rw-r--r--wiki/src/install/debian/usb-download.mdwn11
-rw-r--r--wiki/src/install/debian/usb-download.pt.po62
-rw-r--r--wiki/src/install/debian/usb-overview.de.po (renamed from wiki/src/install/debian/usb/overview.de.po)55
-rw-r--r--wiki/src/install/debian/usb-overview.fa.po (renamed from wiki/src/install/linux/usb/overview.fa.po)23
-rw-r--r--wiki/src/install/debian/usb-overview.fr.po70
-rw-r--r--wiki/src/install/debian/usb-overview.html (renamed from wiki/src/install/debian/usb/overview.html)8
-rw-r--r--wiki/src/install/debian/usb-overview.it.po70
-rw-r--r--wiki/src/install/debian/usb-overview.pt.po (renamed from wiki/src/install/linux/usb/overview.pt.po)23
-rw-r--r--wiki/src/install/debian/usb.de.po29
-rw-r--r--wiki/src/install/debian/usb.fa.po16
-rw-r--r--wiki/src/install/debian/usb.fr.po43
-rw-r--r--wiki/src/install/debian/usb.it.po29
-rw-r--r--wiki/src/install/debian/usb.mdwn6
-rw-r--r--wiki/src/install/debian/usb.pt.po16
-rw-r--r--wiki/src/install/debian/usb/overview.fa.po50
-rw-r--r--wiki/src/install/debian/usb/overview.fr.po53
-rw-r--r--wiki/src/install/debian/usb/overview.it.po60
-rw-r--r--wiki/src/install/debian/usb/overview.pt.po50
-rw-r--r--wiki/src/install/download.de.po18
-rw-r--r--wiki/src/install/download.fa.po11
-rw-r--r--wiki/src/install/download.fr.po18
-rw-r--r--wiki/src/install/download.it.po18
-rw-r--r--wiki/src/install/download.mdwn5
-rw-r--r--wiki/src/install/download.pt.po11
-rw-r--r--wiki/src/install/download/openpgp.de.po705
-rw-r--r--wiki/src/install/download/openpgp.fa.po650
-rw-r--r--wiki/src/install/download/openpgp.fr.po687
-rw-r--r--wiki/src/install/download/openpgp.it.po643
-rw-r--r--wiki/src/install/download/openpgp.mdwn236
-rw-r--r--wiki/src/install/download/openpgp.pt.po637
-rw-r--r--wiki/src/install/download_2.de.po29
-rw-r--r--wiki/src/install/download_2.fa.po29
-rw-r--r--wiki/src/install/download_2.fr.po29
-rw-r--r--wiki/src/install/download_2.html10
-rw-r--r--wiki/src/install/download_2.it.po29
-rw-r--r--wiki/src/install/download_2.pt.po29
-rw-r--r--wiki/src/install/dvd-download.de.po62
-rw-r--r--wiki/src/install/dvd-download.fa.po62
-rw-r--r--wiki/src/install/dvd-download.fr.po62
-rw-r--r--wiki/src/install/dvd-download.it.po62
-rw-r--r--wiki/src/install/dvd-download.mdwn11
-rw-r--r--wiki/src/install/dvd-download.pt.po62
-rw-r--r--wiki/src/install/dvd.de.po82
-rw-r--r--wiki/src/install/dvd.fa.po51
-rw-r--r--wiki/src/install/dvd.fr.po87
-rw-r--r--wiki/src/install/dvd.it.po82
-rw-r--r--wiki/src/install/dvd.mdwn17
-rw-r--r--wiki/src/install/dvd.pt.po51
-rw-r--r--wiki/src/install/expert/usb-overview.de.po (renamed from wiki/src/install/expert/usb/overview.de.po)35
-rw-r--r--wiki/src/install/expert/usb-overview.fa.po37
-rw-r--r--wiki/src/install/expert/usb-overview.fr.po70
-rw-r--r--wiki/src/install/expert/usb-overview.html (renamed from wiki/src/install/expert/usb/overview.html)6
-rw-r--r--wiki/src/install/expert/usb-overview.it.po (renamed from wiki/src/install/expert/usb/overview.it.po)43
-rw-r--r--wiki/src/install/expert/usb-overview.pt.po37
-rw-r--r--wiki/src/install/expert/usb.de.po10
-rw-r--r--wiki/src/install/expert/usb.fa.po4
-rw-r--r--wiki/src/install/expert/usb.fr.po19
-rw-r--r--wiki/src/install/expert/usb.it.po10
-rw-r--r--wiki/src/install/expert/usb.mdwn2
-rw-r--r--wiki/src/install/expert/usb.pt.po4
-rw-r--r--wiki/src/install/expert/usb/overview.fa.po50
-rw-r--r--wiki/src/install/expert/usb/overview.fr.po53
-rw-r--r--wiki/src/install/expert/usb/overview.pt.po50
-rw-r--r--wiki/src/install/inc/icons/check.pngbin1109 -> 460 bytes
-rw-r--r--wiki/src/install/inc/icons/dialog-warning-small.pngbin0 -> 1041 bytes
-rw-r--r--wiki/src/install/inc/icons/failed.pngbin382 -> 587 bytes
-rw-r--r--wiki/src/install/inc/icons/pause.pngbin1001 -> 0 bytes
-rw-r--r--wiki/src/install/inc/icons/play.pngbin1242 -> 0 bytes
-rw-r--r--wiki/src/install/inc/js/dave.js59
-rw-r--r--wiki/src/install/inc/js/dave_2.js192
-rw-r--r--wiki/src/install/inc/js/download.js296
-rw-r--r--wiki/src/install/inc/screenshots/allow_js.pngbin0 -> 12401 bytes
-rw-r--r--wiki/src/install/inc/screenshots/notification_in_tails.pngbin8791 -> 5516 bytes
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.de.po36
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po30
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po31
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.html6
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.it.po35
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po35
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.de.po6
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fa.po2
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fr.po10
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.it.po2
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.pt.po6
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.fr.po16
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.it.po4
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.pt.po4
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po1311
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po1128
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po1490
-rw-r--r--wiki/src/install/inc/steps/download.inline.html737
-rw-r--r--wiki/src/install/inc/steps/download.inline.it.po1425
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po1339
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.de.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.fa.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.fr.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.html116
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.it.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.pt.po251
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po74
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.de.po9
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po22
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.it.po4
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po9
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po12
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po34
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.it.po12
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po12
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.de.po6
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fr.po12
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.it.po13
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.pt.po4
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po14
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fr.po6
-rw-r--r--wiki/src/install/inc/stylesheets/assistant.css90
-rw-r--r--wiki/src/install/inc/stylesheets/dave.css487
-rw-r--r--wiki/src/install/inc/stylesheets/dave_2.css76
-rw-r--r--wiki/src/install/inc/stylesheets/debian.css4
-rw-r--r--wiki/src/install/inc/stylesheets/download-only.css6
-rw-r--r--wiki/src/install/inc/stylesheets/download.css200
-rw-r--r--wiki/src/install/inc/stylesheets/dvd.css6
-rw-r--r--wiki/src/install/inc/stylesheets/expert.css4
-rw-r--r--wiki/src/install/inc/stylesheets/install-clone.css4
-rw-r--r--wiki/src/install/inc/stylesheets/linux.css4
-rw-r--r--wiki/src/install/inc/stylesheets/mac-clone.css4
-rw-r--r--wiki/src/install/inc/stylesheets/mac-dvd.css4
-rw-r--r--wiki/src/install/inc/stylesheets/mac-usb.css4
-rw-r--r--wiki/src/install/inc/stylesheets/overview.css1
-rw-r--r--wiki/src/install/inc/stylesheets/router-mac.css2
-rw-r--r--wiki/src/install/inc/stylesheets/steps.css125
-rw-r--r--wiki/src/install/inc/stylesheets/upgrade-clone.css4
-rw-r--r--wiki/src/install/inc/stylesheets/upgrade-tails.css4
-rw-r--r--wiki/src/install/inc/stylesheets/vm.css6
-rw-r--r--wiki/src/install/inc/stylesheets/windows.css4
-rw-r--r--wiki/src/install/linux.de.po56
-rw-r--r--wiki/src/install/linux.fa.po18
-rw-r--r--wiki/src/install/linux.fr.po51
-rw-r--r--wiki/src/install/linux.html12
-rw-r--r--wiki/src/install/linux.it.po43
-rw-r--r--wiki/src/install/linux.pt.po18
-rw-r--r--wiki/src/install/linux/clone-overview.de.po (renamed from wiki/src/install/linux/clone/overview.de.po)33
-rw-r--r--wiki/src/install/linux/clone-overview.fa.po (renamed from wiki/src/install/linux/clone/overview.fa.po)17
-rw-r--r--wiki/src/install/linux/clone-overview.fr.po63
-rw-r--r--wiki/src/install/linux/clone-overview.html (renamed from wiki/src/install/linux/clone/overview.html)4
-rw-r--r--wiki/src/install/linux/clone-overview.it.po (renamed from wiki/src/install/linux/clone/overview.it.po)32
-rw-r--r--wiki/src/install/linux/clone-overview.pt.po (renamed from wiki/src/install/linux/clone/overview.pt.po)17
-rw-r--r--wiki/src/install/linux/clone/overview.fr.po48
-rw-r--r--wiki/src/install/linux/usb-download.de.po62
-rw-r--r--wiki/src/install/linux/usb-download.fa.po62
-rw-r--r--wiki/src/install/linux/usb-download.fr.po62
-rw-r--r--wiki/src/install/linux/usb-download.it.po62
-rw-r--r--wiki/src/install/linux/usb-download.mdwn11
-rw-r--r--wiki/src/install/linux/usb-download.pt.po62
-rw-r--r--wiki/src/install/linux/usb-overview.de.po (renamed from wiki/src/install/linux/usb/overview.de.po)45
-rw-r--r--wiki/src/install/linux/usb-overview.fa.po36
-rw-r--r--wiki/src/install/linux/usb-overview.fr.po71
-rw-r--r--wiki/src/install/linux/usb-overview.html (renamed from wiki/src/install/linux/usb/overview.html)8
-rw-r--r--wiki/src/install/linux/usb-overview.it.po (renamed from wiki/src/install/linux/usb/overview.it.po)47
-rw-r--r--wiki/src/install/linux/usb-overview.pt.po36
-rw-r--r--wiki/src/install/linux/usb.de.po32
-rw-r--r--wiki/src/install/linux/usb.fa.po16
-rw-r--r--wiki/src/install/linux/usb.fr.po32
-rw-r--r--wiki/src/install/linux/usb.it.po32
-rw-r--r--wiki/src/install/linux/usb.mdwn6
-rw-r--r--wiki/src/install/linux/usb.pt.po16
-rw-r--r--wiki/src/install/linux/usb/overview.fr.po55
-rw-r--r--wiki/src/install/mac.de.po32
-rw-r--r--wiki/src/install/mac.fa.po18
-rw-r--r--wiki/src/install/mac.fr.po39
-rw-r--r--wiki/src/install/mac.html12
-rw-r--r--wiki/src/install/mac.it.po29
-rw-r--r--wiki/src/install/mac.pt.po18
-rw-r--r--wiki/src/install/mac/clone-overview.de.po (renamed from wiki/src/install/mac/clone/overview.de.po)33
-rw-r--r--wiki/src/install/mac/clone-overview.fa.po (renamed from wiki/src/install/mac/clone/overview.fa.po)17
-rw-r--r--wiki/src/install/mac/clone-overview.fr.po64
-rw-r--r--wiki/src/install/mac/clone-overview.html (renamed from wiki/src/install/mac/clone/overview.html)4
-rw-r--r--wiki/src/install/mac/clone-overview.it.po (renamed from wiki/src/install/mac/clone/overview.it.po)32
-rw-r--r--wiki/src/install/mac/clone-overview.pt.po (renamed from wiki/src/install/mac/clone/overview.pt.po)17
-rw-r--r--wiki/src/install/mac/clone/overview.fr.po49
-rw-r--r--wiki/src/install/mac/dvd-download.de.po62
-rw-r--r--wiki/src/install/mac/dvd-download.fa.po62
-rw-r--r--wiki/src/install/mac/dvd-download.fr.po62
-rw-r--r--wiki/src/install/mac/dvd-download.it.po62
-rw-r--r--wiki/src/install/mac/dvd-download.mdwn11
-rw-r--r--wiki/src/install/mac/dvd-download.pt.po62
-rw-r--r--wiki/src/install/mac/dvd-overview.de.po (renamed from wiki/src/install/mac/dvd/overview.de.po)38
-rw-r--r--wiki/src/install/mac/dvd-overview.fa.po (renamed from wiki/src/install/mac/dvd/overview.fa.po)23
-rw-r--r--wiki/src/install/mac/dvd-overview.fr.po72
-rw-r--r--wiki/src/install/mac/dvd-overview.html (renamed from wiki/src/install/mac/dvd/overview.html)8
-rw-r--r--wiki/src/install/mac/dvd-overview.it.po (renamed from wiki/src/install/mac/dvd/overview.it.po)41
-rw-r--r--wiki/src/install/mac/dvd-overview.pt.po (renamed from wiki/src/install/mac/dvd/overview.pt.po)23
-rw-r--r--wiki/src/install/mac/dvd.de.po32
-rw-r--r--wiki/src/install/mac/dvd.fa.po16
-rw-r--r--wiki/src/install/mac/dvd.fr.po32
-rw-r--r--wiki/src/install/mac/dvd.it.po32
-rw-r--r--wiki/src/install/mac/dvd.mdwn6
-rw-r--r--wiki/src/install/mac/dvd.pt.po16
-rw-r--r--wiki/src/install/mac/dvd/overview.fr.po54
-rw-r--r--wiki/src/install/mac/usb-download.de.po62
-rw-r--r--wiki/src/install/mac/usb-download.fa.po62
-rw-r--r--wiki/src/install/mac/usb-download.fr.po62
-rw-r--r--wiki/src/install/mac/usb-download.it.po62
-rw-r--r--wiki/src/install/mac/usb-download.mdwn11
-rw-r--r--wiki/src/install/mac/usb-download.pt.po62
-rw-r--r--wiki/src/install/mac/usb-overview.de.po (renamed from wiki/src/install/mac/usb/overview.de.po)50
-rw-r--r--wiki/src/install/mac/usb-overview.fa.po (renamed from wiki/src/install/mac/usb/overview.fa.po)23
-rw-r--r--wiki/src/install/mac/usb-overview.fr.po69
-rw-r--r--wiki/src/install/mac/usb-overview.html (renamed from wiki/src/install/mac/usb/overview.html)8
-rw-r--r--wiki/src/install/mac/usb-overview.it.po (renamed from wiki/src/install/mac/usb/overview.it.po)44
-rw-r--r--wiki/src/install/mac/usb-overview.pt.po (renamed from wiki/src/install/mac/usb/overview.pt.po)23
-rw-r--r--wiki/src/install/mac/usb.de.po29
-rw-r--r--wiki/src/install/mac/usb.fa.po16
-rw-r--r--wiki/src/install/mac/usb.fr.po29
-rw-r--r--wiki/src/install/mac/usb.it.po29
-rw-r--r--wiki/src/install/mac/usb.mdwn6
-rw-r--r--wiki/src/install/mac/usb.pt.po16
-rw-r--r--wiki/src/install/mac/usb/overview.fr.po51
-rw-r--r--wiki/src/install/os.de.po23
-rw-r--r--wiki/src/install/os.fa.po10
-rw-r--r--wiki/src/install/os.fr.po26
-rw-r--r--wiki/src/install/os.html4
-rw-r--r--wiki/src/install/os.it.po25
-rw-r--r--wiki/src/install/os.pt.po10
-rw-r--r--wiki/src/install/v1/Tails/amd64/stable/latest.yml8
-rw-r--r--wiki/src/install/v1/Tails/i386/stable/latest.yml8
-rw-r--r--wiki/src/install/vm-download.de.po (renamed from wiki/src/install/vm.fa.po)23
-rw-r--r--wiki/src/install/vm-download.fa.po (renamed from wiki/src/install/vm.pt.po)23
-rw-r--r--wiki/src/install/vm-download.fr.po62
-rw-r--r--wiki/src/install/vm-download.it.po62
-rw-r--r--wiki/src/install/vm-download.mdwn (renamed from wiki/src/install/vm.mdwn)14
-rw-r--r--wiki/src/install/vm-download.pt.po62
-rw-r--r--wiki/src/install/vm.de.po77
-rw-r--r--wiki/src/install/vm.fr.po77
-rw-r--r--wiki/src/install/vm.it.po77
-rw-r--r--wiki/src/install/win.de.po43
-rw-r--r--wiki/src/install/win.fa.po18
-rw-r--r--wiki/src/install/win.fr.po50
-rw-r--r--wiki/src/install/win.html12
-rw-r--r--wiki/src/install/win.it.po39
-rw-r--r--wiki/src/install/win.pt.po18
-rw-r--r--wiki/src/install/win/clone-overview.de.po64
-rw-r--r--wiki/src/install/win/clone-overview.fa.po37
-rw-r--r--wiki/src/install/win/clone-overview.fr.po64
-rw-r--r--wiki/src/install/win/clone-overview.html (renamed from wiki/src/install/debian/clone/overview.html)4
-rw-r--r--wiki/src/install/win/clone-overview.it.po66
-rw-r--r--wiki/src/install/win/clone-overview.pt.po37
-rw-r--r--wiki/src/install/win/clone/overview.fr.po49
-rw-r--r--wiki/src/install/win/clone/overview.it.po57
-rw-r--r--wiki/src/install/win/usb-download.de.po62
-rw-r--r--wiki/src/install/win/usb-download.fa.po62
-rw-r--r--wiki/src/install/win/usb-download.fr.po62
-rw-r--r--wiki/src/install/win/usb-download.it.po62
-rw-r--r--wiki/src/install/win/usb-download.mdwn11
-rw-r--r--wiki/src/install/win/usb-download.pt.po62
-rw-r--r--wiki/src/install/win/usb-overview.de.po (renamed from wiki/src/install/win/usb/overview.de.po)48
-rw-r--r--wiki/src/install/win/usb-overview.fa.po36
-rw-r--r--wiki/src/install/win/usb-overview.fr.po65
-rw-r--r--wiki/src/install/win/usb-overview.html (renamed from wiki/src/install/win/usb/overview.html)8
-rw-r--r--wiki/src/install/win/usb-overview.it.po (renamed from wiki/src/install/win/usb/overview.it.po)47
-rw-r--r--wiki/src/install/win/usb-overview.pt.po36
-rw-r--r--wiki/src/install/win/usb.de.po29
-rw-r--r--wiki/src/install/win/usb.fa.po16
-rw-r--r--wiki/src/install/win/usb.fr.po44
-rw-r--r--wiki/src/install/win/usb.it.po29
-rw-r--r--wiki/src/install/win/usb.mdwn6
-rw-r--r--wiki/src/install/win/usb.pt.po16
-rw-r--r--wiki/src/install/win/usb/overview.fa.po48
-rw-r--r--wiki/src/install/win/usb/overview.fr.po49
-rw-r--r--wiki/src/install/win/usb/overview.pt.po48
299 files changed, 10992 insertions, 11278 deletions
diff --git a/wiki/src/install/debian.de.po b/wiki/src/install/debian.de.po
index b9c8ca0..eb9e192 100644
--- a/wiki/src/install/debian.de.po
+++ b/wiki/src/install/debian.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2017-02-16 18:24+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -23,18 +23,13 @@ msgid ""
"min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
"assistant\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/"
"tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Debian oder Ubuntu\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-debian\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]] [[<span class=\"back\">Zurück</span>|install/os]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/os]]"
-msgstr "[[Zurück|install/os]]"
-
-#. type: Content of: <h1>
-#, fuzzy
-#| msgid "<strong>Debian or Ubuntu</strong>"
-msgid ""
-"<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
-msgstr "<strong>Debian oder Ubuntu</strong>"
+msgstr ""
+"[[!meta title=\"Debian oder Ubuntu\"]] [[!meta stylesheet=\"bootstrap\" rel="
+"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-"
+"debian\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+"installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]] [[<span class="
+"\"back\">Zurück</span>|install/os]]"
#. type: Content of: <div><div>
msgid ""
@@ -47,7 +42,9 @@ msgid "Install from another Tails"
msgstr "Von einem anderen Tails aus installieren"
#. type: Content of: <div><div>
-msgid "|install/debian/clone/overview]]"
+#, fuzzy
+#| msgid "|install/debian/clone/overview]]"
+msgid "|install/debian/clone-overview]]"
msgstr "|install/debian/clone/overview]]"
#. type: Content of: <div><div><h3>
@@ -66,7 +63,10 @@ msgstr "1 USB-Stick <small>(mindestens 8 GB)</small>"
msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr "1 Stunde zum Herunterladen von Tails (<small class=\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
+msgstr ""
+"1 Stunde zum Herunterladen von Tails (<small class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
+"small>)"
#. type: Content of: <div><div><ul><li>
msgid "½ hour to install"
@@ -83,7 +83,9 @@ msgid "Install from Debian, Ubuntu, or Mint"
msgstr "Installation von Debian oder Ubuntu aus"
#. type: Content of: <div><div>
-msgid "|debian/usb/overview]] [["
+#, fuzzy
+#| msgid "|debian/usb/overview]] [["
+msgid "|debian/usb-overview]] [["
msgstr "|debian/usb/overview]] [["
#. type: Content of: <div><div><div><div><h3><small>
@@ -99,7 +101,9 @@ msgid "the</small> command line <small>and</small> GnuPG"
msgstr "Kommandozeile <small> sowie </small> GnuPG"
#. type: Content of: <div><div>
-msgid "|expert/usb/overview]]"
+#, fuzzy
+#| msgid "|expert/usb/overview]]"
+msgid "|expert/usb-overview]]"
msgstr "|expert/usb/overview]]"
#. type: Content of: <div><div>
@@ -107,12 +111,25 @@ msgid "You can also:"
msgstr "Sie können auch:"
#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd]]"
+#, fuzzy
+#| msgid "[[Burn Tails on a DVD|dvd]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
msgstr "[[Tails auf eine DVD brennen|dvd]]"
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+#, fuzzy
+#| msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm]]"
+#~ msgid "[[Back|install/os]]"
+#~ msgstr "[[Zurück|install/os]]"
+
+#, fuzzy
+#~| msgid "<strong>Debian or Ubuntu</strong>"
+#~ msgid ""
+#~ "<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
+#~ msgstr "<strong>Debian oder Ubuntu</strong>"
+
#~ msgid "</small>"
#~ msgstr "</small>"
diff --git a/wiki/src/install/debian.fa.po b/wiki/src/install/debian.fa.po
index 8bf7478..093cde9 100644
--- a/wiki/src/install/debian.fa.po
+++ b/wiki/src/install/debian.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,15 +24,6 @@ msgid ""
"tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
-#. type: Content of: <div>
-msgid "[[Back|install/os]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
-msgstr ""
-
#. type: Content of: <div><div>
msgid ""
"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
@@ -43,7 +34,7 @@ msgid "Install from another Tails"
msgstr ""
#. type: Content of: <div><div>
-msgid "|install/debian/clone/overview]]"
+msgid "|install/debian/clone-overview]]"
msgstr ""
#. type: Content of: <div><div><h3>
@@ -77,7 +68,7 @@ msgid "Install from Debian, Ubuntu, or Mint"
msgstr ""
#. type: Content of: <div><div>
-msgid "|debian/usb/overview]] [["
+msgid "|debian/usb-overview]] [["
msgstr ""
#. type: Content of: <div><div><div><div><h3><small>
@@ -89,7 +80,7 @@ msgid "the</small> command line <small>and</small> GnuPG"
msgstr ""
#. type: Content of: <div><div>
-msgid "|expert/usb/overview]]"
+msgid "|expert/usb-overview]]"
msgstr ""
#. type: Content of: <div><div>
@@ -97,9 +88,9 @@ msgid "You can also:"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr ""
diff --git a/wiki/src/install/debian.fr.po b/wiki/src/install/debian.fr.po
index 17b149a..887c41e 100644
--- a/wiki/src/install/debian.fr.po
+++ b/wiki/src/install/debian.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2017-02-16 17:00+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -22,17 +22,11 @@ msgid ""
"min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
"assistant\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/"
"tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Debian, Ubuntu ou Mint\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/os]]"
-msgstr "[[Retour|install/os]]"
-
-#. type: Content of: <h1>
-msgid ""
-"<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
msgstr ""
-"<strong>Debian</strong>, <strong>Ubuntu</strong> ou <strong>Mint</strong>"
+"[[!meta title=\"Debian, Ubuntu ou Mint\"]] [[!meta stylesheet=\"bootstrap.min"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/"
+"tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div>
msgid ""
@@ -45,7 +39,9 @@ msgid "Install from another Tails"
msgstr "Installer depuis un autre Tails"
#. type: Content of: <div><div>
-msgid "|install/debian/clone/overview]]"
+#, fuzzy
+#| msgid "|install/debian/clone/overview]]"
+msgid "|install/debian/clone-overview]]"
msgstr "|install/debian/clone/overview]]"
#. type: Content of: <div><div><h3>
@@ -64,7 +60,10 @@ msgstr "1 clé USB <small>(d'au moins 8 Go)</small>"
msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr "1 heure pour télécharger Tails (<small class=\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
+msgstr ""
+"1 heure pour télécharger Tails (<small class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
+"small>)"
#. type: Content of: <div><div><ul><li>
msgid "½ hour to install"
@@ -79,7 +78,9 @@ msgid "Install from Debian, Ubuntu, or Mint"
msgstr "Installer depuis Debian, Ubuntu ou Mint"
#. type: Content of: <div><div>
-msgid "|debian/usb/overview]] [["
+#, fuzzy
+#| msgid "|debian/usb/overview]] [["
+msgid "|debian/usb-overview]] [["
msgstr "|debian/usb/overview]] [["
#. type: Content of: <div><div><div><div><h3><small>
@@ -91,7 +92,9 @@ msgid "the</small> command line <small>and</small> GnuPG"
msgstr "la</small> ligne de commande <small>et</small> GnuPG"
#. type: Content of: <div><div>
-msgid "|expert/usb/overview]]"
+#, fuzzy
+#| msgid "|expert/usb/overview]]"
+msgid "|expert/usb-overview]]"
msgstr "|expert/usb/overview]]"
#. type: Content of: <div><div>
@@ -99,12 +102,24 @@ msgid "You can also:"
msgstr "Vous pouvez également :"
#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd]]"
+#, fuzzy
+#| msgid "[[Burn Tails on a DVD|dvd]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
msgstr "[[Graver Tails sur un DVD|dvd]]"
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+#, fuzzy
+#| msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Utiliser Tails dans une machine virtuelle|vm]]"
+#~ msgid "[[Back|install/os]]"
+#~ msgstr "[[Retour|install/os]]"
+
+#~ msgid ""
+#~ "<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
+#~ msgstr ""
+#~ "<strong>Debian</strong>, <strong>Ubuntu</strong> ou <strong>Mint</strong>"
+
#~ msgid "</small>"
#~ msgstr "</small>"
diff --git a/wiki/src/install/debian.html b/wiki/src/install/debian.html
index c81d69d..370958e 100644
--- a/wiki/src/install/debian.html
+++ b/wiki/src/install/debian.html
@@ -5,10 +5,6 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
-<div id="back">[[Back|install/os]]</div>
-
-<h1 class="text-center"><strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong></h1>
-
<div id="scenarios" class="row">
<div class="col-md-6">
@@ -20,7 +16,7 @@
<h3 class="panel-title">Install from another Tails</h3>
</div>
</div>
- |install/debian/clone/overview]]
+ |install/debian/clone-overview]]
</div>
<div class="col-md-6">
@@ -41,7 +37,7 @@
<h3 class="panel-title">Install from Debian, Ubuntu, or Mint</h3>
</div>
</div>
- |debian/usb/overview]]
+ |debian/usb-overview]]
[[
<div class="panel panel-primary">
@@ -49,7 +45,7 @@
<h3 class="panel-title two-lines"><small>Install from Debian, Ubuntu, or Mint using<br />the</small> command line <small>and</small> GnuPG</h3>
</div>
</div>
- |expert/usb/overview]]
+ |expert/usb-overview]]
</div>
</div>
@@ -59,8 +55,8 @@
You can also:
<ul>
- <li>[[Burn Tails on a DVD|dvd]]</li>
- <li>[[Run Tails in a virtual machine|vm]]</li>
+ <li>[[Burn Tails on a DVD|dvd-download]]</li>
+ <li>[[Run Tails in a virtual machine|vm-download]]</li>
</ul>
</div>
diff --git a/wiki/src/install/debian.it.po b/wiki/src/install/debian.it.po
index 68bc0db..8916952 100644
--- a/wiki/src/install/debian.it.po
+++ b/wiki/src/install/debian.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2017-02-16 18:24+0100\n"
"Last-Translator: transitails <transitails>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -24,29 +24,28 @@ msgid ""
"min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
"assistant\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/"
"tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Debian o Ubuntu\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-debian\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class=\"back\">Back</span>|install/os]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/os]]"
msgstr ""
-
-#. type: Content of: <h1>
-#, fuzzy
-#| msgid "<strong>Debian or Ubuntu</strong>"
-msgid ""
-"<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
-msgstr "<strong>Debian o Ubuntu</strong>"
+"[[!meta title=\"Debian o Ubuntu\"]] [[!meta stylesheet=\"bootstrap\" rel="
+"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-"
+"debian\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
+"\"back\">Back</span>|install/os]]"
#. type: Content of: <div><div>
-msgid "[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/router/clone.it\" raw=\"yes\" sort=\"age\"]] [["
+msgid ""
+"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
+msgstr ""
+"[[!inline pages=\"install/inc/router/clone.it\" raw=\"yes\" sort=\"age\"]] [["
#. type: Content of: <div><div><div><div><h3>
msgid "Install from another Tails"
msgstr "Installa da un altra Tails"
#. type: Content of: <div><div>
-msgid "|install/debian/clone/overview]]"
+#, fuzzy
+#| msgid "|install/debian/clone/overview]]"
+msgid "|install/debian/clone-overview]]"
msgstr "|install/debian/clone/overview]]"
#. type: Content of: <div><div><h3>
@@ -65,7 +64,9 @@ msgstr "1 chiavetta USB <small>(almeno 8 GB)</small>"
msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr "1 ora per scaricareTails (<small class=\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
+msgstr ""
+"1 ora per scaricareTails (<small class=\"remove-extra-space\">[[!inline "
+"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
#. type: Content of: <div><div><ul><li>
msgid "½ hour to install"
@@ -82,7 +83,9 @@ msgid "Install from Debian, Ubuntu, or Mint"
msgstr "Installa da Debian o Ubuntu"
#. type: Content of: <div><div>
-msgid "|debian/usb/overview]] [["
+#, fuzzy
+#| msgid "|debian/usb/overview]] [["
+msgid "|debian/usb-overview]] [["
msgstr "|debian/usb/overview]] [["
#. type: Content of: <div><div><div><div><h3><small>
@@ -98,7 +101,9 @@ msgid "the</small> command line <small>and</small> GnuPG"
msgstr "terminale <small> e </small> GnuPG"
#. type: Content of: <div><div>
-msgid "|expert/usb/overview]]"
+#, fuzzy
+#| msgid "|expert/usb/overview]]"
+msgid "|expert/usb-overview]]"
msgstr "|expert/usb/overview]]"
#. type: Content of: <div><div>
@@ -108,12 +113,22 @@ msgid "You can also:"
msgstr "<small> Puoi anche:"
#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd]]"
+#, fuzzy
+#| msgid "[[Burn Tails on a DVD|dvd]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
msgstr "[[Masterizzare Tails su un DVD|dvd]]"
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+#, fuzzy
+#| msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Avviare Tails in una macchina virtuale|vm]]"
+#, fuzzy
+#~| msgid "<strong>Debian or Ubuntu</strong>"
+#~ msgid ""
+#~ "<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
+#~ msgstr "<strong>Debian o Ubuntu</strong>"
+
#~ msgid "</small>"
#~ msgstr "</small>"
diff --git a/wiki/src/install/debian.pt.po b/wiki/src/install/debian.pt.po
index 8bf7478..093cde9 100644
--- a/wiki/src/install/debian.pt.po
+++ b/wiki/src/install/debian.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,15 +24,6 @@ msgid ""
"tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
-#. type: Content of: <div>
-msgid "[[Back|install/os]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
-msgstr ""
-
#. type: Content of: <div><div>
msgid ""
"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
@@ -43,7 +34,7 @@ msgid "Install from another Tails"
msgstr ""
#. type: Content of: <div><div>
-msgid "|install/debian/clone/overview]]"
+msgid "|install/debian/clone-overview]]"
msgstr ""
#. type: Content of: <div><div><h3>
@@ -77,7 +68,7 @@ msgid "Install from Debian, Ubuntu, or Mint"
msgstr ""
#. type: Content of: <div><div>
-msgid "|debian/usb/overview]] [["
+msgid "|debian/usb-overview]] [["
msgstr ""
#. type: Content of: <div><div><div><div><h3><small>
@@ -89,7 +80,7 @@ msgid "the</small> command line <small>and</small> GnuPG"
msgstr ""
#. type: Content of: <div><div>
-msgid "|expert/usb/overview]]"
+msgid "|expert/usb-overview]]"
msgstr ""
#. type: Content of: <div><div>
@@ -97,9 +88,9 @@ msgid "You can also:"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr ""
diff --git a/wiki/src/install/win/clone/overview.de.po b/wiki/src/install/debian/clone-overview.de.po
index 7a2116f..81243aa 100644
--- a/wiki/src/install/win/clone/overview.de.po
+++ b/wiki/src/install/debian/clone-overview.de.po
@@ -6,17 +6,26 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2016-02-19 21:37+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
+"PO-Revision-Date: 2017-02-09 19:11+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.6\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -24,28 +33,17 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Von einem anderen Tails aus installieren\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
"\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de"
-"\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr "[[Zurück|install/win]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Von einem <strong>anderen Tails</strong> aus installieren"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
+"\" raw=\"yes\" sort=\"age\"]] [[<span class=\"back\">Zurück</span>|install/"
+"debian]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -54,3 +52,16 @@ msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#, fuzzy
+#~| msgid "|install/clone]]"
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "|install/clone]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Von einem <strong>anderen Tails</strong> aus installieren."
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/clone/overview.fa.po b/wiki/src/install/debian/clone-overview.fa.po
index 8ae0d20..85cc216 100644
--- a/wiki/src/install/win/clone/overview.fa.po
+++ b/wiki/src/install/debian/clone-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/debian/clone-overview.fr.po b/wiki/src/install/debian/clone-overview.fr.po
new file mode 100644
index 0000000..5367110
--- /dev/null
+++ b/wiki/src/install/debian/clone-overview.fr.po
@@ -0,0 +1,63 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
+"PO-Revision-Date: 2017-02-09 19:12+0100\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
+"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
+msgstr ""
+"[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
+"[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw="
+"\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr "Allons-y !"
+
+#. type: Content of: outside any tag (error?)
+msgid "|install/clone]]"
+msgstr "|install/clone]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Retour|install/debian]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installer depuis un <strong>autre Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/clone/overview.html b/wiki/src/install/debian/clone-overview.html
index e081692..9e1cb1e 100644
--- a/wiki/src/install/win/clone/overview.html
+++ b/wiki/src/install/debian/clone-overview.html
@@ -7,10 +7,6 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
-<div id="back">[[Back|install/win]]</div>
-
-<h1 class="text-center">Install from <strong>another Tails</strong></h1>
-
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
diff --git a/wiki/src/install/debian/clone/overview.it.po b/wiki/src/install/debian/clone-overview.it.po
index 2b3633e..81d7c3b 100644
--- a/wiki/src/install/debian/clone/overview.it.po
+++ b/wiki/src/install/debian/clone-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-05 14:00+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-07-23 14:37+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -17,6 +17,15 @@ msgstr ""
"X-Generator: Poedit 1.8.7.1\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -24,7 +33,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Installa da un'altra Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -34,19 +44,6 @@ msgstr ""
"[[!inline pages=\"install/inc/tails-installation-assistant.inline.it\" raw="
"\"yes\" sort=\"age\"]]"
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Indietro|install/debian.it]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installa da <strong>un'altra Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
@@ -54,3 +51,14 @@ msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone.it]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Indietro|install/debian.it]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installa da <strong>un'altra Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/clone/overview.pt.po b/wiki/src/install/debian/clone-overview.pt.po
index 8ae0d20..85cc216 100644
--- a/wiki/src/install/win/clone/overview.pt.po
+++ b/wiki/src/install/debian/clone-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/debian/clone/overview.de.po b/wiki/src/install/debian/clone/overview.de.po
deleted file mode 100644
index 76f62c1..0000000
--- a/wiki/src/install/debian/clone/overview.de.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2017-02-09 19:11+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Von einem anderen Tails aus installieren\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]] [[<span class=\"back\">Zurück</span>|install/debian]]"
-
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/clone]]"
-msgid "[[Back|install/debian]]"
-msgstr "|install/clone]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Von einem <strong>anderen Tails</strong> aus installieren."
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr "Los geht's!"
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/clone]]"
-msgstr "|install/clone]]"
diff --git a/wiki/src/install/debian/clone/overview.fa.po b/wiki/src/install/debian/clone/overview.fa.po
deleted file mode 100644
index cdf9365..0000000
--- a/wiki/src/install/debian/clone/overview.fa.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/clone]]"
-msgstr ""
diff --git a/wiki/src/install/debian/clone/overview.fr.po b/wiki/src/install/debian/clone/overview.fr.po
deleted file mode 100644
index 8f97952..0000000
--- a/wiki/src/install/debian/clone/overview.fr.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2017-02-09 19:12+0100\n"
-"Last-Translator: \n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Retour|install/debian]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installer depuis un <strong>autre Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr "Allons-y !"
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/clone]]"
-msgstr "|install/clone]]"
diff --git a/wiki/src/install/debian/clone/overview.pt.po b/wiki/src/install/debian/clone/overview.pt.po
deleted file mode 100644
index cdf9365..0000000
--- a/wiki/src/install/debian/clone/overview.pt.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
-"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/clone]]"
-msgstr ""
diff --git a/wiki/src/install/debian/usb-download.de.po b/wiki/src/install/debian/usb-download.de.po
new file mode 100644
index 0000000..288ffe0
--- /dev/null
+++ b/wiki/src/install/debian/usb-download.de.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/debian/usb-download.fa.po b/wiki/src/install/debian/usb-download.fa.po
new file mode 100644
index 0000000..288ffe0
--- /dev/null
+++ b/wiki/src/install/debian/usb-download.fa.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/debian/usb-download.fr.po b/wiki/src/install/debian/usb-download.fr.po
new file mode 100644
index 0000000..288ffe0
--- /dev/null
+++ b/wiki/src/install/debian/usb-download.fr.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/debian/usb-download.it.po b/wiki/src/install/debian/usb-download.it.po
new file mode 100644
index 0000000..288ffe0
--- /dev/null
+++ b/wiki/src/install/debian/usb-download.it.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/debian/usb-download.mdwn b/wiki/src/install/debian/usb-download.mdwn
new file mode 100644
index 0000000..0984eec
--- /dev/null
+++ b/wiki/src/install/debian/usb-download.mdwn
@@ -0,0 +1,11 @@
+[[!meta title="Install from Debian, Ubuntu, or Mint"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/download"]]
+[[!meta link="https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl" rel="chrome-webstore-item"]]
+
+[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/debian/usb-download.pt.po b/wiki/src/install/debian/usb-download.pt.po
new file mode 100644
index 0000000..288ffe0
--- /dev/null
+++ b/wiki/src/install/debian/usb-download.pt.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/debian/usb/overview.de.po b/wiki/src/install/debian/usb-overview.de.po
index 28edf72..c41d311 100644
--- a/wiki/src/install/debian/usb/overview.de.po
+++ b/wiki/src/install/debian/usb-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-07 10:46+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -27,13 +27,14 @@ msgstr ""
#| "\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline"
#| "\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Von Debian oder Ubuntu aus installieren\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -43,29 +44,29 @@ msgstr ""
"[[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw="
"\"yes\"]] [[<span class=\"back\">Zurück</span>|install/win]]"
-#. type: Content of: <div>
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr "Los geht's!"
+
+#. type: Content of: outside any tag (error?)
#, fuzzy
#| msgid "|install/debian/usb]]"
-msgid "[[Back|install/debian]]"
+msgid "|install/debian/usb-download]]"
msgstr "|install/debian/usb]]"
-#. type: Content of: <h1>
#, fuzzy
-#| msgid "Install from <strong>Debian or Ubuntu</strong>"
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr "Von <strong>Debian oder Ubuntu</strong> aus installieren"
+#~| msgid "|install/debian/usb]]"
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "|install/debian/usb]]"
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr "Los geht's!"
+#, fuzzy
+#~| msgid "Install from <strong>Debian or Ubuntu</strong>"
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong>"
+#~ msgstr "Von <strong>Debian oder Ubuntu</strong> aus installieren"
-#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
-msgstr "|install/debian/usb]]"
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/linux/usb/overview.fa.po b/wiki/src/install/debian/usb-overview.fa.po
index ea0b0fb..0164e7a 100644
--- a/wiki/src/install/linux/usb/overview.fa.po
+++ b/wiki/src/install/debian/usb-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,25 +18,14 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Linux: overview\"]] [[!meta stylesheet="
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!"
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/linux]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Linux</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/linux/usb]]"
+msgid "|install/debian/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/debian/usb-overview.fr.po b/wiki/src/install/debian/usb-overview.fr.po
new file mode 100644
index 0000000..33138d3
--- /dev/null
+++ b/wiki/src/install/debian/usb-overview.fr.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
+"PO-Revision-Date: 2017-02-09 19:13+0100\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
+
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!"
+#| "meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
+msgstr ""
+"[[!meta title=\"Installer depuis Debian, Ubuntu ou Mint : vue d'ensemble\"]] "
+"[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
+"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr"
+"\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr "Allons-y !"
+
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid "|install/debian/usb]]"
+msgid "|install/debian/usb-download]]"
+msgstr "|install/debian/usb]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Retour|install/debian]]"
+
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong>"
+#~ msgstr ""
+#~ "Installer depuis <strong>Debian</strong>, <strong>Ubuntu</strong> ou "
+#~ "<strong>Mint</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/debian/usb/overview.html b/wiki/src/install/debian/usb-overview.html
index 73d5124..90a3325 100644
--- a/wiki/src/install/debian/usb/overview.html
+++ b/wiki/src/install/debian/usb-overview.html
@@ -1,4 +1,4 @@
-[[!meta title="Install from Debian, Ubuntu, or Mint: overview"]]
+[[!meta title="Install from Debian, Ubuntu, or Mint"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
@@ -7,10 +7,6 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
-<div id="back">[[Back|install/debian]]</div>
-
-<h1 class="text-center">Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong></h1>
-
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
@@ -19,6 +15,6 @@
<h3 class="panel-title text-center">Let's go!</h3>
</div>
</div>
-|install/debian/usb]]
+|install/debian/usb-download]]
<div class="clearfix"></div>
diff --git a/wiki/src/install/debian/usb-overview.it.po b/wiki/src/install/debian/usb-overview.it.po
new file mode 100644
index 0000000..c4d10d2
--- /dev/null
+++ b/wiki/src/install/debian/usb-overview.it.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
+"PO-Revision-Date: 2017-06-03 18:00+0200\n"
+"Last-Translator: \n"
+"Language-Team: ita <transitails@inventati.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!"
+#| "meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
+msgstr ""
+"[[!meta title=\"Installa da Debian o Ubuntu o MInt\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline.it\" raw=\"yes"
+"\"]] [[<span class=\"back\">Indietro</span>|install/win.it]]"
+
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr "Iniziamo!"
+
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid "|install/debian/usb]]"
+msgid "|install/debian/usb-download]]"
+msgstr "|install/debian/usb.it]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Indietro|install/debian]]"
+
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong>"
+#~ msgstr ""
+#~ "Installa da <strong>Debian</strong>, <strong>Ubuntu</strong> o "
+#~ "<strong>Mint</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/linux/usb/overview.pt.po b/wiki/src/install/debian/usb-overview.pt.po
index ea0b0fb..0164e7a 100644
--- a/wiki/src/install/linux/usb/overview.pt.po
+++ b/wiki/src/install/debian/usb-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,25 +18,14 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Linux: overview\"]] [[!meta stylesheet="
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!"
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/linux]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Linux</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/linux/usb]]"
+msgid "|install/debian/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/debian/usb.de.po b/wiki/src/install/debian/usb.de.po
index 19e5236..270b96d 100644
--- a/wiki/src/install/debian/usb.de.po
+++ b/wiki/src/install/debian/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2016-02-14 21:18+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -35,11 +35,6 @@ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" titl
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
@@ -50,13 +45,13 @@ msgstr "[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\
#. type: Plain text
#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<div class=\"hidden-step-1\"></div>\n"
+msgstr ""
#. type: Plain text
#, no-wrap
@@ -74,11 +69,6 @@ msgstr "Starten Sie in Debian oder Ubuntu."
msgid "[[!inline pages=\"install/inc/steps/debian_requirements.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/download.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-
#. type: Title =
#, no-wrap
msgid "Install <span class=\"application\">Tails Installer</span>\n"
@@ -485,6 +475,15 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.de\" raw=\
msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/download.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
#~ msgid ""
#~ "To add the *jessie-backports* repository, click <span class=\"button"
#~ "\">New</span> in the <span class=\"guilabel\">Repositories</span> dialog "
diff --git a/wiki/src/install/debian/usb.fa.po b/wiki/src/install/debian/usb.fa.po
index 2bd8f45..534fb00 100644
--- a/wiki/src/install/debian/usb.fa.po
+++ b/wiki/src/install/debian/usb.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,11 +33,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
@@ -48,12 +43,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<div class=\"hidden-step-1\"></div>\n"
msgstr ""
#. type: Plain text
@@ -70,11 +65,6 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/debian_requirements.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
#. type: Title =
#, no-wrap
msgid "Install <span class=\"application\">Tails Installer</span>\n"
diff --git a/wiki/src/install/debian/usb.fr.po b/wiki/src/install/debian/usb.fr.po
index 4e54db5..f4b8a94 100644
--- a/wiki/src/install/debian/usb.fr.po
+++ b/wiki/src/install/debian/usb.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
-"PO-Revision-Date: 2017-09-05 21:16+0000\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"PO-Revision-Date: 2017-10-29 12:34+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -33,11 +33,6 @@ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" titl
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
@@ -48,13 +43,13 @@ msgstr "[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\
#. type: Plain text
#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<div class=\"hidden-step-1\"></div>\n"
+msgstr ""
#. type: Plain text
#, no-wrap
@@ -70,11 +65,6 @@ msgstr "Démarrez Debian, Ubuntu ou Linux Mint."
msgid "[[!inline pages=\"install/inc/steps/debian_requirements.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/debian_requirements.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/download.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
#. type: Title =
#, no-wrap
msgid "Install <span class=\"application\">Tails Installer</span>\n"
@@ -420,10 +410,9 @@ msgstr ""
"span>."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/install_final_in_debian.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -435,6 +424,15 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.fr\" raw=\
msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/download.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
#~ msgid "Open a <span class=\"guimenuitem\">Root Terminal</span>."
#~ msgstr ""
#~ "Ouvrez un <span class=\"guimenuitem\">Terminal administrateur</span>."
@@ -574,10 +572,3 @@ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.fr\" raw=\
#~ msgstr ""
#~ "Après l'installation du `tails-installer`, fermez <span class="
#~ "\"application\">Ubuntu Software Center</span>."
-
-#~ msgid ""
-#~ "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw="
-#~ "\"yes\"]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"install/inc/steps/install_tails_installer.inline.fr\" "
-#~ "raw=\"yes\"]]\n"
diff --git a/wiki/src/install/debian/usb.it.po b/wiki/src/install/debian/usb.it.po
index 2586082..7095fd6 100644
--- a/wiki/src/install/debian/usb.it.po
+++ b/wiki/src/install/debian/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -34,11 +34,6 @@ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" titl
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
@@ -49,13 +44,13 @@ msgstr "[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\
#. type: Plain text
#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<div class=\"hidden-step-1\"></div>\n"
+msgstr ""
#. type: Plain text
#, no-wrap
@@ -71,11 +66,6 @@ msgstr "Avviare in Debian o Ubuntu o Mint."
msgid "[[!inline pages=\"install/inc/steps/debian_requirements.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-
#. type: Title =
#, no-wrap
msgid "Install <span class=\"application\">Tails Installer</span>\n"
@@ -410,6 +400,15 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"ye
msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+
#~ msgid ""
#~ "To add the *jessie-backports* repository, click <span class=\"button"
#~ "\">New</span> in the <span class=\"guilabel\">Repositories</span> dialog "
diff --git a/wiki/src/install/debian/usb.mdwn b/wiki/src/install/debian/usb.mdwn
index 23ac0f7..60ed61b 100644
--- a/wiki/src/install/debian/usb.mdwn
+++ b/wiki/src/install/debian/usb.mdwn
@@ -2,21 +2,19 @@
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
+<div class="hidden-step-1"></div>
+
<div class="step-image">[[!img install/inc/infography/os-debian-ubuntu.png link="no" alt=""]]</div>
Start in Debian, Ubuntu, or Linux Mint.
[[!inline pages="install/inc/steps/debian_requirements.inline" raw="yes" sort="age"]]
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
Install <span class="application">Tails Installer</span>
========================================================
diff --git a/wiki/src/install/debian/usb.pt.po b/wiki/src/install/debian/usb.pt.po
index 2bd8f45..534fb00 100644
--- a/wiki/src/install/debian/usb.pt.po
+++ b/wiki/src/install/debian/usb.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,11 +33,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
@@ -48,12 +43,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<div class=\"hidden-step-1\"></div>\n"
msgstr ""
#. type: Plain text
@@ -70,11 +65,6 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/debian_requirements.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
#. type: Title =
#, no-wrap
msgid "Install <span class=\"application\">Tails Installer</span>\n"
diff --git a/wiki/src/install/debian/usb/overview.fa.po b/wiki/src/install/debian/usb/overview.fa.po
deleted file mode 100644
index 6a7fd41..0000000
--- a/wiki/src/install/debian/usb/overview.fa.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
-msgstr ""
diff --git a/wiki/src/install/debian/usb/overview.fr.po b/wiki/src/install/debian/usb/overview.fr.po
deleted file mode 100644
index a7ed9c2..0000000
--- a/wiki/src/install/debian/usb/overview.fr.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2017-02-09 19:13+0100\n"
-"Last-Translator: \n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis Debian, Ubuntu ou Mint : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Retour|install/debian]]"
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr ""
-"Installer depuis <strong>Debian</strong>, <strong>Ubuntu</strong> ou "
-"<strong>Mint</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr "Allons-y !"
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
-msgstr "|install/debian/usb]]"
diff --git a/wiki/src/install/debian/usb/overview.it.po b/wiki/src/install/debian/usb/overview.it.po
deleted file mode 100644
index a08c467..0000000
--- a/wiki/src/install/debian/usb/overview.it.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-05 14:00+0200\n"
-"PO-Revision-Date: 2017-06-03 18:00+0200\n"
-"Last-Translator: \n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-"[[!meta title=\"Installa da Debian o Ubuntu o MInt\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline.it\" raw=\"yes"
-"\"]] [[<span class=\"back\">Indietro</span>|install/win.it]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Indietro|install/debian]]"
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr ""
-"Installa da <strong>Debian</strong>, <strong>Ubuntu</strong> o <strong>Mint</"
-"strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr "Iniziamo!"
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
-msgstr "|install/debian/usb.it]]"
diff --git a/wiki/src/install/debian/usb/overview.pt.po b/wiki/src/install/debian/usb/overview.pt.po
deleted file mode 100644
index 6a7fd41..0000000
--- a/wiki/src/install/debian/usb/overview.pt.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
-msgstr ""
diff --git a/wiki/src/install/download.de.po b/wiki/src/install/download.de.po
index 68c8cd2..7108ee5 100644
--- a/wiki/src/install/download.de.po
+++ b/wiki/src/install/download.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
"PO-Revision-Date: 2016-02-14 23:40+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -32,8 +32,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
@@ -47,11 +48,18 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"styles
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
#. type: Plain text
#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/download.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/install/download.fa.po b/wiki/src/install/download.fa.po
index b922b3b..2c99bab 100644
--- a/wiki/src/install/download.fa.po
+++ b/wiki/src/install/download.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -48,7 +48,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/download.fr.po b/wiki/src/install/download.fr.po
index a883220..e00b4cc 100644
--- a/wiki/src/install/download.fr.po
+++ b/wiki/src/install/download.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
"PO-Revision-Date: 2016-11-01 12:39-0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -32,8 +32,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
@@ -47,11 +48,18 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"styles
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
#. type: Plain text
#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/download.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/install/download.it.po b/wiki/src/install/download.it.po
index 817c279..ae4421c 100644
--- a/wiki/src/install/download.it.po
+++ b/wiki/src/install/download.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
"PO-Revision-Date: 2017-06-03 18:04+0200\n"
"Last-Translator: transitails <transitails>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -33,8 +33,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
@@ -48,11 +49,18 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"styles
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
#. type: Plain text
#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/download.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/install/download.mdwn b/wiki/src/install/download.mdwn
index 0aea95c..b75f448 100644
--- a/wiki/src/install/download.mdwn
+++ b/wiki/src/install/download.mdwn
@@ -2,9 +2,10 @@
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/dave" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
+[[!meta script="install/inc/js/download"]]
+[[!meta link="https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl" rel="chrome-webstore-item"]]
[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/download.pt.po b/wiki/src/install/download.pt.po
index b922b3b..2c99bab 100644
--- a/wiki/src/install/download.pt.po
+++ b/wiki/src/install/download.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
@@ -48,7 +48,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/download/openpgp.de.po b/wiki/src/install/download/openpgp.de.po
deleted file mode 100644
index 412daf0..0000000
--- a/wiki/src/install/download/openpgp.de.po
+++ /dev/null
@@ -1,705 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-09-12 17:31+0300\n"
-"PO-Revision-Date: 2017-02-09 19:16+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: DE <LL@li.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify using OpenPGP\"]]\n"
-msgstr "[[!meta title=\"Herunterladen und mit OpenPGP verifizieren\"]]\n"
-
-#. type: Plain text
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have *GPG* installed but might need guidance on performing "
-"the verification."
-msgstr ""
-"Diese Anweisungen sind für Personen, die bereits mit der grundsätzlichen "
-"Benutzung von OpenPGP vertraut sind und *GPG* installiert haben, aber "
-"möglicherweise Hilfe zur Durchführung der Verifizierung benötigen."
-
-#. type: Plain text
-msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> (<span class="
-"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
-"\"yes\" sort=\"age\"]]</span>)."
-msgstr ""
-"Laden Sie das <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\"]] ISO-Image herunter</a> (<span class="
-"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
-"\"yes\" sort=\"age\"]]</span>)."
-
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
-#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
-#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
-#| "of the latest Tails ISO image and save it to the same folder where you "
-#| "saved the ISO image."
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
-msgstr ""
-"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
-"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
-"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
-"Image gespeichert haben."
-
-#. type: Bullet: '1. '
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
-msgstr ""
-"Wenn Sie die Verifizierung zum ersten Mal durchführen, laden Sie den "
-"[[Signaturschlüssel von Tails|tails-signing.key]] herunter und importieren "
-"Sie ihn in Ihren Schlüsselbund. Wenn Sie von einem Tails aus arbeiten, ist "
-"der Signaturschlüssel bereits enthalten."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" All our ISO images are signed with the same signing key, so you only\n"
-" have to import it once. Still, you have to verify the ISO image every\n"
-" time you download a new one.\n"
-msgstr ""
-" Alle ISO-Images sind mit dem gleichen Signaturschlüssel signiert, somit\n"
-" müssen Sie ihn nur einmal importieren. Dennoch werden Sie jedes mal, wenn Sie\n"
-" ein neues ISO-Image herunterladen, es erneut verifizieren müssen.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>This download of the Tails signing key is protected using HTTPS.\n"
-" But you could still download a malicious signing key if our website is\n"
-" compromised or if you are victim of a [[man-in-the-middle\n"
-" attack|doc/about/warning#man-in-the-middle]].</p>\n"
-msgstr ""
-" <div class=\"tip\">\n"
-" <p>Dieser Download des Signaturschlüssels von Tails wird durch HTTPS geschützt.\n"
-" Dennoch könnten Sie, falls unsere Webseite kompromittiert ist oder Sie Opfer eines\n"
-" [[Man-in-the-Middle-Angriffs|doc/about/warning#man-in-the-middle]] sind,\n"
-" einen bösartigen Signaturschlüssel herunterladen.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>For additional verification, you can <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-" </div>\n"
-msgstr ""
-" <p>Für zusätzliche Verifizierung <a href=\"#wot\">authentifizieren Sie den Signaturschlüssel\n"
-" durch das OpenPGP Web of Trust</a>.</p>\n"
-" </div>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Verify the ISO image\n"
-msgstr "Das ISO-Image verifizieren\n"
-
-#. type: Plain text
-msgid "This section provides simplified instructions:"
-msgstr "Dieser Abschnitt bietet vereinfachte Anweisungen:"
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
-"span></a>"
-msgstr ""
-"<a href=\"#windows\">Unter Windows mit <span class=\"application\">Gpg4win</"
-"span></a>"
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
-"a>"
-msgstr ""
-"<a href=\"#mac\">Unter macOS mit <span class=\"application\">GPGTools</"
-"span></a>"
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#tails\">In Tails</a>"
-msgstr "<a href=\"#tails\">In Tails</a>"
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#command-line\">Using the command line</span></a>"
-msgstr "<a href=\"#command-line\">Mittels der Kommandozeile</span></a>"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>As explained above in step 3, this simple OpenPGP verification\n"
-"provides a level of verification equivalent to HTTPS, like the [[Firefox\n"
-"extension or BitTorrent|install/download]], unless you also\n"
-"<a href=\"#wot\">authenticate the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-msgstr ""
-"<p>Wie weiter oben in Schritt 3 beschrieben, bietet diese einfache, mit HTTPS vergleichbare\n"
-"Verifizierung mit OpenPGP ein Verifizierungsniveau, welches mit der [[Firefoxerweiterung\n"
-"oder BitTorrent|install/download]] vergleichbar ist, es sei denn Sie\n"
-"<a href=\"#wot\">authentifizieren den Signaturschlüssel zusätzlich durch das OpenPGP Web of Trust</a>.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"windows\"></a>\n"
-msgstr "<a id=\"windows\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In Windows with <span class=\"application\">Gpg4win</span>"
-msgstr "Unter Windows mit <span class=\"application\">Gpg4win</span>"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"See the [[<span class=\"application\">Gpg4win</span> documentation on\n"
-"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].\n"
-msgstr ""
-"Lesen Sie die entsprechende [[<span class=\"application\">Gpg4win</span>-Dokumentation zum\n"
-"Prüfen von Signaturen|http://www.gpg4win.org/doc/de/gpg4win-compendium_24.html#id5]].\n"
-
-#. type: Plain text
-msgid ""
-"Verify the date of the signature to make sure that you downloaded the latest "
-"version."
-msgstr ""
-"Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie die "
-"aktuellste Version heruntergeladen haben."
-
-#. type: Plain text
-msgid "If the following warning appears:"
-msgstr "Wenn die folgende Warnung erscheint:"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<pre>\n"
-"Not enough information to check the signature validity.\n"
-"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
-"The validity of the signature cannot be verified.\n"
-"</pre>\n"
-msgstr ""
-"<pre>\n"
-"Es sind nicht genügend Informationen zur Überprüfung der Signatur vorhanden.\n"
-"Signiert am ... von tails@boum.org (Schlüssel-ID: 0x58ACD84F\n"
-"Die Gültigkeit der Signatur kann nicht überprüft werden.\n"
-"</pre>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Then the ISO image is still correct according to the signing key that you\n"
-"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate the\n"
-"signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-"Dann ist das ISO-Image dennoch im Bezug auf den von Ihnen heruntergeladenen Signaturschlüssel\n"
-"korrekt. Um diese Warnung zu entfernen, müssen Sie den Signaturschlüssel durch das \n"
-"<a href=\"#wot\">OpenPGP Web of Trust authentifizieren</a>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mac\"></a>\n"
-msgstr "<a id=\"mac\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In macOS using <span class=\"application\">GPGTools</span>"
-msgstr "Unter macOS mit <span class=\"application\">GPGTools</span>"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
-msgstr ""
-"Öffnen Sie den <span class=\"application\">Finder</span> und navigieren Sie "
-"zu dem Ordner, in dem Sie das ISO-Image und die Signatur gespeichert haben."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on the ISO image and choose\n"
-" <span class=\"guimenuchoice\">\n"
-" <span class=\"guisubmenu\">Services</span> ▸\n"
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>.\n"
-msgstr ""
-"1. Rechtsklicken Sie auf das ISO-Image und wählen Sie\n"
-" <span class=\"guimenuchoice\">\n"
-" <span class=\"guisubmenu\">Dienste</span> ▸\n"
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"tails\"></a>\n"
-msgstr "<a id=\"tails\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In Tails"
-msgstr "In Tails"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
-msgstr ""
-"Öffnen Sie den Dateibrowser und navigieren Sie zu dem Ordner, in dem Sie das "
-"ISO-Image und die Signatur gespeichert haben."
-
-#. type: Bullet: '1. '
-msgid ""
-"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
-"With Verify Signature</span>."
-msgstr ""
-"Rechtsklicken Sie auf die Signatur und wählen Sie <span class=\"guimenuitem"
-"\">Mit Signatur-Datei überprüfen öffnen</span>."
-
-#. type: Bullet: '1. '
-msgid "The verification of the ISO image starts automatically:"
-msgstr "Die Verifizierung des ISO-Image startet automatisch:"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
-msgstr " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
-
-#. type: Bullet: '1. '
-msgid ""
-"After the verification finishes, click on the notification counter in the "
-"bottom-right corner and on the notification with a transparent background on "
-"the right of the notification area:"
-msgstr ""
-"Klicken Sie, nachdem die Verifizierung beendet wurde, auf den "
-"Benachrichtigungs-Zähler im unteren, rechten Bereich und auf die "
-"Benachrichtigung mit einem durchsichtigen Hintergrund auf der rechten Seite "
-"des Benachrichtigungsbereichs:"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]\n"
-msgstr " [[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " Verify the date of the signature to make sure that you downloaded the latest version.\n"
-msgstr " Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie die aktuellste Version heruntergeladen haben.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"command-line\"></a>\n"
-msgstr "<a id=\"command-line\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "Using the command line"
-msgstr "Mithilfe der Kommandozeile"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
-msgstr ""
-"Öffnen Sie ein Terminal und navigieren Sie zu dem Ordner, in dem Sie das ISO-"
-"Image und die Signatur gespeichert haben."
-
-#. type: Bullet: '1. '
-msgid "Execute:"
-msgstr "Führen Sie aus:"
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " The output of this command should be the following:\n"
-msgstr " Die Ausgabe des Befehls sollte folgende sein:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " If the output also includes:\n"
-msgstr " Wenn die Ausgabe auch folgendes enthält:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <pre>\n"
-" gpg: WARNING: This key is not certified with a trusted signature!\n"
-" gpg: There is no indication that the signature belongs to the owner.</pre>\n"
-msgstr ""
-" <pre>\n"
-" gpg: WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n"
-" gpg: Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen Besitzer gehört.</pre>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Then the ISO image is still correct according to the signing key that you\n"
-" downloaded. To remove this warning you need to <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-" Ist das ISO-Image dennoch im Bezug auf den von Ihnen heruntergeladenen Signaturschlüssel\n"
-" korrekt. Um diese Warnung zu entfernen, müssen Sie den Signaturschlüssel durch das \n"
-" <a href=\"#wot\">OpenPGP Web of Trust authentifizieren</a>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"wot\"></a>\n"
-msgstr "<a id=\"wot\"></a>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Authenticate the signing key through the OpenPGP Web of Trust\n"
-msgstr "Authentifizieren Sie den Signaturschlüssel durch das OpenPGP Web of Trust\n"
-
-#. type: Plain text
-msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
-msgstr ""
-"Die bisher vorgestellten Methoden zur Verifizierung ([[Firefoxerweiterung, "
-"BitTorrent|install/download]] oder OpenPGP-Verfizierung) basieren alle auf "
-"einigen, sicher mit HTTPS von unserer Webseite heruntergeladenen "
-"Informationen:"
-
-#. type: Bullet: ' - '
-msgid "The *checksum* for the Firefox extension"
-msgstr "Die *Prüfsumme* für die Firefoxerweiterung"
-
-#. type: Bullet: ' - '
-msgid "The *Torrent file* for BitTorrent"
-msgstr "Die *Torrentdatei* für BitTorrent"
-
-#. type: Bullet: ' - '
-msgid "The *Tails signing key* for the OpenPGP verification"
-msgstr "Der *Signaturschlüssel von Tails* für die OpenPGP-Verfizierung"
-
-#. type: Plain text
-msgid ""
-"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
-"about/warning#man-in-the-middle]]."
-msgstr ""
-"Jedoch könnten Sie, wenn unsere Website kompromittiert wurde oder Sie ein "
-"Opfer eines [[Man-in-the-Middle-Angriffs|doc/about/warning#man-in-the-"
-"middle]] sind, gefälschte Informationen herunterladen."
-
-#. type: Plain text
-msgid ""
-"The OpenPGP verification is the only technique that allows you to verify the "
-"ISO image even better by also authenticating the Tails signing key through "
-"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
-"way to completely protect you from malicious downloads."
-msgstr ""
-"Die Verifikation mit OpenPGP ist die einzige Vorgehensweise, die Ihnen durch "
-"das zusätzliche Authentifizeren mit dem OpenPGP Web of Trust eine noch "
-"bessere Authentifizierung bietet. Durch das Vertrauen in das OpenPGP Web of "
-"Trust können Sie sich vollständig gegen schadhafte Downloads schützen."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are verifying an ISO image from inside Tails already, for\n"
-"example to do a manual upgrade, then the Tails signing key is already\n"
-"included in Tails. You can trust this signing key as much as you are trusting your\n"
-"Tails installation already because you are not downloading it.</p>\n"
-msgstr ""
-"<p>Wenn Sie das ISO-Image bereits von einem Tails aus verifizieren, zum Beispiel\n"
-"wenn Sie eine manuelle Aktualisierung durchführen, ist der Signaturschlüssel von Tails\n"
-"bereits in dem Tails enthalten. Da Sie ihn nicht herunterladen, können Sie diesem\n"
-"Signaturschlüssel in dem gleichen Maße, wie dem bereits installierten Tails vertrauen.</p>\n"
-
-#. type: Plain text
-msgid ""
-"One of the inherent problems of standard HTTPS is that the trust we usually "
-"put in a website is defined by certificate authorities: a hierarchical and "
-"closed set of companies and governmental institutions approved by your web "
-"browser vendor. This model of trust has long been criticized and proved "
-"several times to be vulnerable to attacks [[as explained on our warning page|"
-"doc/about/warning#man-in-the-middle]]."
-msgstr ""
-"Eine der grundlegenden Probleme von üblichem HTTPS ist, dass das Vertrauen, "
-"welches wir in eine Webseite setzen, von Zertifizierungsstellen abhängt: "
-"Eine hierarchische und geschlossene Gruppe von Firmen und staatlichen "
-"Institutionen, die durch Webbrowser verifiziert werden. Dieses "
-"Vertrauensmodell wird schon lange kritisiert und ist erwiesenermaßen durch "
-"Angriffe verwundbar, [[wie wir es auf unserer Warnungsseite beschreiben|"
-"about/warning#man-in-the-middle]]."
-
-#. type: Plain text
-msgid ""
-"We believe that, instead, users should be given the final say when trusting "
-"a website, and that designation of trust should be done on the basis of "
-"human interactions."
-msgstr ""
-"Stattdessen glauben wir, dass den Nutzenden bezüglich dem Vertrauen zu einer "
-"Webseite die letztendliche Entscheidung überlassen werden sollte und dass "
-"das Herstellen von Vertrauen auf der Basis von menschlicher Interaktion "
-"geschehen sollte."
-
-#. type: Plain text
-msgid ""
-"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
-"on OpenPGP keys that can help solving this problem. Let's see this with an "
-"example:"
-msgstr ""
-"Das OpenPGP [[!wikipedia_de Web_of_Trust desc=\"Web of Trust\"]] ist ein auf "
-"OpenPGP-Schlüsseln basierendes, dezentrales Vertrauensmodell. Werfen wir mit "
-"einem Beispiel einen Blick darauf:"
-
-#. type: Bullet: '1. '
-msgid ""
-"*You are friend with Alice and really trust her way of managing OpenPGP "
-"keys. So you are trusting Alice's key.*"
-msgstr ""
-"*Sie sind mit Alice befreundet und vertrauen ihr wirklich, wie sie ihre "
-"OpenPGP-Schlüssel verwaltet.\n"
-"Sie vertrauen dem Schlüssel von Alice.*"
-
-#. type: Bullet: '1. '
-msgid ""
-"*Furthermore, Alice met Bob, a Tails developer, in a conference and "
-"certified Bob's key. So Alice is trusting Bob's key.*"
-msgstr ""
-"*Hinzu kommt, dass Alice Bob, einen Tails-Entwickler, bei einer Konferenz "
-"trifft und\n"
-"Bobs Schlüssel signiert. Alice vertraut Bobs Schlüssel.*"
-
-#. type: Bullet: '1. '
-msgid ""
-"*Bob is a Tails developer who directly owns the Tails signing key. So Bob "
-"fully trusts the Tails signing key.*"
-msgstr ""
-"*Bob ist ein Tails Entwickler, welcher direkt den Signaturschlüssel von "
-"Tails besitzt. Bob\n"
-"vertraut dem Signaturschlüssel von Tails vollständig.*"
-
-#. type: Plain text
-msgid ""
-"In this scenario, Alice found a path to trust the Tails signing key without "
-"the need to rely on certificate authorities."
-msgstr ""
-"Dieses Szenario erzeugt einen Vertrauenspfad von Ihnen zum Signaturschlüssel "
-"von Tails, welcher es Ihnen erlauben kann, ihm ohne die Abhängigkeit von "
-"Zertifizierungsstellen zu vertrauen."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>If you are on Debian or Ubuntu, you can install the\n"
-#| "<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
-#| "all Debian developers. Some Debian developers have certified the Tails\n"
-#| "signing key and you can use these certifications to build a trust path.\n"
-#| "This technique is explained in detail in our instructions on\n"
-#| "[[installing Tails from Debian or Ubuntu using the command\n"
-#| "line|install/expert/usb]].</p>\n"
-msgid ""
-"<p>If you are on Debian, Ubuntu, or Linux Mint, you can install the\n"
-"<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
-"all Debian developers. Some Debian developers have certified the Tails\n"
-"signing key and you can use these certifications to build a trust path.\n"
-"This technique is explained in detail in our instructions on\n"
-"[[installing Tails from Debian, Ubuntu, or Linux Mint using the command\n"
-"line|install/expert/usb]].</p>\n"
-msgstr ""
-"<p>Wenn Sie Debian oder Ubuntu benutzen, können Sie das Paket\n"
-"<code>debian-keyring</code>, welches die OpenPGP-Schlüssel aller\n"
-"Entwickelnden von Debian enthält, installieren. Einige Entwickelnde von Debian\n"
-"haben, um einen Vertrauenspfad aufzubauen, den Signaturschlüssel von Tails zertifiziert.\n"
-"Diese Vorgehensweise wird in unseren Anweisungen zur\n"
-"[[Installation von Tails auf einem USB-Stick unter Verwendung der Kommandozeile\n"
-"von Debian oder Ubuntu aus|install/expert/usb]] näher beschrieben.</p>\n"
-
-#. type: Plain text
-msgid ""
-"Relying on the Web of Trust requires both caution and intelligent "
-"supervision by the users. The technical details are outside of the scope of "
-"this document."
-msgstr ""
-"Dieses Vertrauensmodell ist auch nicht perfekt und benötigt sowohl Vorsicht "
-"als auch intelligente Kontrolle durch Nutzende. Die technischen Details "
-"übersteigen den Umfang dieses Dokuments."
-
-#. type: Plain text
-msgid ""
-"Since the Web of Trust is actually based on human relationships and real-"
-"life interactions, the best is to get in touch with people knowledgeable "
-"about OpenPGP and build trust relationships in order to find your own trust "
-"path to the Tails signing key."
-msgstr ""
-"Da das Web of Trust tatsächlich auf zwischenmenschlichen Beziehungen und "
-"Interaktion im realen Leben basiert, wäre es das Beste, Kontakte zu Menschen "
-"aufzubauen, die sich mit OpenPGP auskennen und zu beginnen, es selbst zu "
-"benutzen und Vertrauensverhältnisse aufzubauen, damit Sie Ihren eigenen "
-"Vertrauenspfad zum Signaturschlüssel von Tails finden."
-
-#. type: Plain text
-msgid ""
-"For example, you can start by contacting a local [[!wikipedia "
-"Linux_User_Group]], [[an organization offering Tails training|support/"
-"learn]], or other Tails enthusiasts near you and exchange about their "
-"OpenPGP practices."
-msgstr ""
-"Sie könnten damit beginnen, indem Sie mit einer lokalen [[!wikipedia_de "
-"Linux_User_Group desc=\"%s\"]] oder anderen Enthusiasten von Tails in Ihrer "
-"Umgebung in Kontakt treten und sich über deren Methoden bezüglich OpenPGP "
-"austauschen."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>After you built a trust path, you can certify the Tails signing key by\n"
-"signing it with your own key to get rid of some warnings during the\n"
-"verification process.</p>\n"
-msgstr ""
-"<p>Nachdem Sie einen Vertrauenspfad aufgebaut haben, können Sie den\n"
-"Signaturschlüssel von Tails mit Ihrem eigenen Schlüssel zertifizieren, um einige der\n"
-"Warnungen während des Verifizierungsprozesses loszuwerden.</p>\n"
-
-#. type: Title #
-#, no-wrap
-msgid "Further reading on OpenPGP"
-msgstr "Weitere Literatur zu OpenPGP"
-
-#. type: Bullet: '- '
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr ""
-"[[!wikipedia_de GnuPG desc=\"Wikipedia: %s\"]], eine freie OpenPGP Software"
-
-#. type: Bullet: '- '
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[Debian: Schlüsselsignierung|http://www.debian.org/events/keysigning.de."
-"html]], ein Tutorial zum Signieren der Schlüssel von anderen Personen"
-
-#. type: Bullet: '- '
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: Erklärungen zum PGP Web of Trust|http://www.rubin.ch/pgp/"
-"weboftrust.de.html]]"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: Zertifikatsprüfung|http://www.gpg4win.org/doc/de/gpg4win-"
-"compendium_16.html]], Anweisungen zum Verwalten von Vertrauen in Schlüssel "
-"mit Gpg4win"
-
-#~ msgid ""
-#~ "<p>Tails [[transitioned to a new signing\n"
-#~ "key|news/signing_key_transition]] in March 2015.\n"
-#~ "If you had the previous signing key, make sure\n"
-#~ "to [[import and verify the new signing\n"
-#~ "key|news/signing_key_transition#index1h1]].</p>\n"
-#~ msgstr ""
-#~ "<p>Tails ist im März 2015 [[zu einem neuen\n"
-#~ "Signaturschlüssel|news/signing_key_transition]] gewechselt.\n"
-#~ "Falls Sie den vorherigen Signaturschlüssel besessen haben, stellen Sie sicher,\n"
-#~ "dass Sie den [[neuen Signaturschlüssel importieren und\n"
-#~ "verifizieren|news/signing_key_transition#index1h1]].</p>\n"
-
-#~ msgid ""
-#~ "We also acknowledge that not everybody might be able to create good trust "
-#~ "path to Tails signing key since it based on a network of direct human "
-#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
-#~ msgstr ""
-#~ "Wir gestehen auch ein, dass nicht alle Menschen in der Lage sein könnten, "
-#~ "einen zuverlässigen Vertrauenspfad zum Signaturschlüssel von Tails "
-#~ "aufzubauen, da es auf einem Netzwerk von direkten menschlichen "
-#~ "Beziehungen und dem Fachwissen über recht komplexe Werkzeuge wie OpenPGP "
-#~ "basiert."
-
-#~ msgid ""
-#~ "Note that since all Tails releases are signed with the same key, you will "
-#~ "not have to verify the key every time and the trust you might "
-#~ "progressively build in it will be built once and for all. Still, you will "
-#~ "have to check the ISO image every time you download a new one!"
-#~ msgstr ""
-#~ "Bitte beachten Sie, dass alle Versionen von Tails mit dem gleichen "
-#~ "Schlüssel signiert sind, weshalb Sie den Schlüssel nicht jedes Mal aufs "
-#~ "Neue verifizieren müssen und Sie das Vertrauen, welches Sie "
-#~ "möglicherweise zunehmend in ihn aufbauen, ein für alle Mal tun. Dennoch "
-#~ "werden Sie das ISO-Image jedes Mal, wenn Sie ein neues herunterladen, "
-#~ "überprüfen müssen."
-
-#~ msgid ""
-#~ "If you want to be extra cautious and really authenticate Tails signing "
-#~ "key in a stronger way than what standard HTTPS offers you, you will need "
-#~ "to use the OpenPGP Web of Trust."
-#~ msgstr ""
-#~ "Wenn Sie besonders vorsichtig sein und den Tails Signaturschlüssel "
-#~ "wirklich auf eine sicherere Weise verifizieren wollen, als es Ihnen "
-#~ "übliches HTTPS bietet, möchten, wird es nötig sein, dass Sie das OpenPGP "
-#~ "Web of Trust nutzen."
-
-#~ msgid ""
-#~ "We will present you three techniques from the easiest to the safest. "
-#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
-#~ "them according to your possibilities and technical skills."
-#~ msgstr ""
-#~ "Wir werden Ihnen drei Vorgehensweisen, von der einfachsten bis zur "
-#~ "sichersten, vorstellen. Nochmals, keine von diesen ist eine magische "
-#~ "Komplettlösung. Zögern Sie nicht, sie entsprechend Ihrer Möglichkeiten "
-#~ "und technischer Kenntnisse kennenzulernen."
diff --git a/wiki/src/install/download/openpgp.fa.po b/wiki/src/install/download/openpgp.fa.po
deleted file mode 100644
index 5489462..0000000
--- a/wiki/src/install/download/openpgp.fa.po
+++ /dev/null
@@ -1,650 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2017-09-12 17:31+0300\n"
-"PO-Revision-Date: 2015-10-06 16:41+0000\n"
-"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
-"trusting_tails_signing_key/fa/>\n"
-"Language: fa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.4-dev\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify using OpenPGP\"]]\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have *GPG* installed but might need guidance on performing "
-"the verification."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> (<span class="
-"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
-"\"yes\" sort=\"age\"]]</span>)."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "Note that since all Tails releases are signed with the same key, you will not have to verify the key every time and the trust you might progressively build in it will be built once and for all. Still, you will have to check the ISO image every time you download a new one!"
-msgid ""
-" All our ISO images are signed with the same signing key, so you only\n"
-" have to import it once. Still, you have to verify the ISO image every\n"
-" time you download a new one.\n"
-msgstr "توجه داشته باشید از آن‌جا که تمام نسخه‌های تیلز با کلید مشابه امضاء شده‌اند لازم نیست هر بار نیازی به تأیید کلید نیست و اعتمادی که ممکن است به مرور به آن پیدا کنید، یک بار برای همیشه در دسترس است. با این‌حال باید هر بار که فایل ایزوی جدید دانلود می‌کنید، آن را بررسی کنید."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>This download of the Tails signing key is protected using HTTPS.\n"
-" But you could still download a malicious signing key if our website is\n"
-" compromised or if you are victim of a [[man-in-the-middle\n"
-" attack|doc/about/warning#man-in-the-middle]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>For additional verification, you can <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Verify the ISO image\n"
-msgstr ""
-
-#. type: Plain text
-msgid "This section provides simplified instructions:"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
-"span></a>"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
-"a>"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#tails\">In Tails</a>"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#command-line\">Using the command line</span></a>"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>As explained above in step 3, this simple OpenPGP verification\n"
-"provides a level of verification equivalent to HTTPS, like the [[Firefox\n"
-"extension or BitTorrent|install/download]], unless you also\n"
-"<a href=\"#wot\">authenticate the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"windows\"></a>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "In Windows with <span class=\"application\">Gpg4win</span>"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"See the [[<span class=\"application\">Gpg4win</span> documentation on\n"
-"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Verify the date of the signature to make sure that you downloaded the latest "
-"version."
-msgstr ""
-
-#. type: Plain text
-msgid "If the following warning appears:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<pre>\n"
-"Not enough information to check the signature validity.\n"
-"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
-"The validity of the signature cannot be verified.\n"
-"</pre>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Then the ISO image is still correct according to the signing key that you\n"
-"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate the\n"
-"signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mac\"></a>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "In macOS using <span class=\"application\">GPGTools</span>"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on the ISO image and choose\n"
-" <span class=\"guimenuchoice\">\n"
-" <span class=\"guisubmenu\">Services</span> ▸\n"
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"tails\"></a>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "In Tails"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
-"With Verify Signature</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "The verification of the ISO image starts automatically:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"After the verification finishes, click on the notification counter in the "
-"bottom-right corner and on the notification with a transparent background on "
-"the right of the notification area:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Verify the date of the signature to make sure that you downloaded the latest version.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"command-line\"></a>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "Using the command line"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " The output of this command should be the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " If the output also includes:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <pre>\n"
-" gpg: WARNING: This key is not certified with a trusted signature!\n"
-" gpg: There is no indication that the signature belongs to the owner.</pre>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Then the ISO image is still correct according to the signing key that you\n"
-" downloaded. To remove this warning you need to <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"wot\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Authenticate the signing key through the OpenPGP Web of Trust\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "The *checksum* for the Firefox extension"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "The *Torrent file* for BitTorrent"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "The *Tails signing key* for the OpenPGP verification"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
-"about/warning#man-in-the-middle]]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"The OpenPGP verification is the only technique that allows you to verify the "
-"ISO image even better by also authenticating the Tails signing key through "
-"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
-"way to completely protect you from malicious downloads."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are verifying an ISO image from inside Tails already, for\n"
-"example to do a manual upgrade, then the Tails signing key is already\n"
-"included in Tails. You can trust this signing key as much as you are trusting your\n"
-"Tails installation already because you are not downloading it.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "One of the inherent problems of standard HTTPS is that the trust we "
-#| "usually put on a website is defined by certificate authorities: a "
-#| "hierarchical and closed set of companies and governmental institutions "
-#| "approved by web browser vendors. This model of trust has long been "
-#| "criticized and proved several times to be vulnerable to attacks [[as "
-#| "explained on our warning page|about/warning#man-in-the-middle]]."
-msgid ""
-"One of the inherent problems of standard HTTPS is that the trust we usually "
-"put in a website is defined by certificate authorities: a hierarchical and "
-"closed set of companies and governmental institutions approved by your web "
-"browser vendor. This model of trust has long been criticized and proved "
-"several times to be vulnerable to attacks [[as explained on our warning page|"
-"doc/about/warning#man-in-the-middle]]."
-msgstr ""
-"یکی از مشکلات اصلی اچ‌تی‌تی‌پی‌اس استاندارد این است که اعتمادی که معمولاً‌ به یک "
-"تارنما می‌کنیم از طریق مراجع صور گواهی دیجیتال تعریف می‌شود: یعنی گروهی بسته و "
-"سلسله‌مراتبی از شرکت‌ها و نهادهای دولتی مورد تأیید توسعه‌دهندگان مروگرهای وب. "
-"این مدل از اعتماد مدت‌ها است که مورد انتقاد قرار گرفته و [[همان‌طور که در صفحهٔ "
-"هشدار ما آمده|about/warning#man-in-the-middle]] بارها مشخص شده که در برابر "
-"حملات آسیب‌پذیر است"
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "We believe instead that users should be given the final say when trusting "
-#| "a website, and that designation of trust should be done on the basis of "
-#| "human interaction."
-msgid ""
-"We believe that, instead, users should be given the final say when trusting "
-"a website, and that designation of trust should be done on the basis of "
-"human interactions."
-msgstr ""
-"ما در عوض معتقدیم کاربران باید نظر نهایی در مورد اعتماد به یک تارنما را "
-"بدهند و اعتماد باید بر مبنای تعاملات انسانی باشد."
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "The OpenPGP [[!wikipedia Web_of_Trust desc=\"Web of Trust\"]] is a "
-#| "decentralized trust model based on OpenPGP keys. Let's see that with an "
-#| "example."
-msgid ""
-"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
-"on OpenPGP keys that can help solving this problem. Let's see this with an "
-"example:"
-msgstr ""
-"[[!wikipedia Web_of_Trust desc=\"شبکهٔ اعتماد\"]] اُپن‌پی‌جی‌پی یک مدل اعتماد "
-"مرکززدایی‌شده بر مبنای کلیدهای اُپن‌پی‌جی‌پی است. بیایید مثالی در این مورد ببینیم."
-
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "*You're a friend of Alice and really trust her way of managing OpenPGP "
-#| "keys.\n"
-#| "You're trusting Alice's key.*\n"
-msgid ""
-"*You are friend with Alice and really trust her way of managing OpenPGP "
-"keys. So you are trusting Alice's key.*"
-msgstr ""
-"*شما دوست آلیس هستید و واقعاً‌ به نحوهٔ مدیریت کلیدهای اُپن‌پی‌جی‌پی از سوی اعتماد "
-"دارید.\n"
-"شما به کلید آلیس اعتماد دارید.*\n"
-
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "*Furthermore, Alice met Bob, a Tails developer, in a conference, and "
-#| "signed\n"
-#| "Bob's key. Alice is trusting Bob's key.*\n"
-msgid ""
-"*Furthermore, Alice met Bob, a Tails developer, in a conference and "
-"certified Bob's key. So Alice is trusting Bob's key.*"
-msgstr ""
-"*همین‌طور آلیس در یک کنفرانس، باب، یک برنامه‌نویس تیلز، را ملاقات\n"
-"و کلید باب را امضا کرده است. آلیس به کلید باب اعتماد دارد.*\n"
-
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "*Bob is a Tails developer who directly owns the Tails signing key. Bob "
-#| "fully\n"
-#| "trusts Tails signing key.*\n"
-msgid ""
-"*Bob is a Tails developer who directly owns the Tails signing key. So Bob "
-"fully trusts the Tails signing key.*"
-msgstr ""
-"*باب یک برنامه‌نویس تیلز است که مستقیماً صاحب یک کلید امضای تیلز است.\n"
-"باب به کلید امضای تیلز اعتماد کامل دارد.*\n"
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This scenario creates a trust path from you to Tails signing key that "
-#| "could allow you to trust it without having to depend on certificate "
-#| "authorities."
-msgid ""
-"In this scenario, Alice found a path to trust the Tails signing key without "
-"the need to rely on certificate authorities."
-msgstr ""
-"این روابط مسیری از اعتماد بین شما و کلید امضای تیلز ایجاد می‌کند که به شما "
-"اجازه می‌دهد بدون نیاز به اتکا به مراجع صدور گواهی دیجیتال به این کلید اعتماد "
-"کنید."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are on Debian, Ubuntu, or Linux Mint, you can install the\n"
-"<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
-"all Debian developers. Some Debian developers have certified the Tails\n"
-"signing key and you can use these certifications to build a trust path.\n"
-"This technique is explained in detail in our instructions on\n"
-"[[installing Tails from Debian, Ubuntu, or Linux Mint using the command\n"
-"line|install/expert/usb]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This trust model is not perfect either and requires both caution and "
-#| "intelligent supervision by users. The technical details of creating, "
-#| "managing and trusting OpenPGP keys is outside of the scope of this "
-#| "document."
-msgid ""
-"Relying on the Web of Trust requires both caution and intelligent "
-"supervision by the users. The technical details are outside of the scope of "
-"this document."
-msgstr ""
-"این مدل اعتماد نیز بی‌نقص نبوده و مستلزم احتیاط و نظارت هوشمندانه از سوی "
-"کاربران است. جزییات فنی ایجاد و مدیریت کلیدهای اُپن‌پی‌جی‌پی و اعتماد به آن‌ها "
-"خارج از حوصلهٔ این سند است."
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Since the Web of Trust is actually based on human relationships and real-"
-#| "life interactions the best would be to start establishing contacts with "
-#| "people knowledgeable about OpenPGP, start using it yourself and build "
-#| "trust relationships in order to find your own trust path to Tails signing "
-#| "key."
-msgid ""
-"Since the Web of Trust is actually based on human relationships and real-"
-"life interactions, the best is to get in touch with people knowledgeable "
-"about OpenPGP and build trust relationships in order to find your own trust "
-"path to the Tails signing key."
-msgstr ""
-"از آن‌جا که شبکهٔ اعتماد بر مبنای روابط انسانی و تعاملات زندگی واقعی است، "
-"بهترین کار برقراری ارتباط با افراد آشنا با اُپن‌پی‌جی‌پی، استفاده از آن توسط "
-"خودتان و ایجاد روابط اعتماد برای یافتن مسیر اعتماد خود به کلید امضای تیلز "
-"است."
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "You could start by contacting a local [[!wikipedia Linux_User_Group desc="
-#| "\"%s\"]] or other Tails enthusiasts near you and exchange about their "
-#| "OpenPGP practices."
-msgid ""
-"For example, you can start by contacting a local [[!wikipedia "
-"Linux_User_Group]], [[an organization offering Tails training|support/"
-"learn]], or other Tails enthusiasts near you and exchange about their "
-"OpenPGP practices."
-msgstr ""
-"می‌توانید این کار را با تماس گرفتن با علاقه‌مندان محلی تیلز یا [[!wikipedia "
-"Linux_User_Group desc=\"%s\"]] و مبادلهٔ کارهای اُپن‌پی‌جی‌پی آن‌ها آغاز کنید."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>After you built a trust path, you can certify the Tails signing key by\n"
-"signing it with your own key to get rid of some warnings during the\n"
-"verification process.</p>\n"
-msgstr ""
-
-#. type: Title #
-#, no-wrap
-msgid "Further reading on OpenPGP"
-msgstr "منابع مطالعاتی بیشتر در مورد اُپن‌پی‌جی‌پی"
-
-#. type: Bullet: '- '
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr ""
-"[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]]، یک نرم‌افزار آزاد اُپن‌پی‌جی‌پی"
-
-#. type: Bullet: '- '
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr ""
-"[[آپاچی: چگونگی استفاده از اُپن‌پی‌جی‌پی|http://www.apache.org/dev/openpgp.html]]"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[دبیان: امضای کلید|http://www.debian.org/events/keysigning]]، آموزش کلیدهای "
-"امضای افراد دیگر"
-
-#. type: Bullet: '- '
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: توضیح شبکهٔ اعتماد اُپن‌پی‌جی‌پی|http://www.rubin.ch/pgp/weboftrust."
-"en.html]]"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: بازرسی گواهی|http://www.gpg4win.org/doc/en/gpg4win-compendium_16."
-"html]]، راهنمایی برای مدیریت کلیدها با Gpg4win"
-
-#, fuzzy
-#~| msgid ""
-#~| "<p>Tails [[transitioned to a new signing\n"
-#~| "key|news/signing_key_transition]] between Tails 1.3 (February 24) and\n"
-#~| "Tails 1.3.1 (March 31). If you had the previous signing key, make sure\n"
-#~| "to [[import and verify the new signing\n"
-#~| "key|news/signing_key_transition#index1h1]].</p>\n"
-#~ msgid ""
-#~ "<p>Tails [[transitioned to a new signing\n"
-#~ "key|news/signing_key_transition]] in March 2015.\n"
-#~ "If you had the previous signing key, make sure\n"
-#~ "to [[import and verify the new signing\n"
-#~ "key|news/signing_key_transition#index1h1]].</p>\n"
-#~ msgstr ""
-#~ "<p>تیلز [[به یک کلید امضای جدید منتقل\n"
-#~ "می‌شود|news/signing_key_transition]]. این انتقال بین تیلز ۱٫۳ (۲۴ فوریه)\n"
-#~ "و تیلز ۱٫۳٫۱ (۳۱ مارس) انجام می‌شود. اگر کلید امضای قبلی را داشتید مطمئن شوید که\n"
-#~ "[[کلید امضای جدید را وارد و تأیید\n"
-#~ "می‌کنید|news/signing_key_transition#index1h1]].</p>\n"
-
-#~ msgid "<!-- l10n placeholder for language-specific link -->"
-#~ msgstr "<!-- l10n placeholder for language-specific link -->"
-
-#~ msgid ""
-#~ "We also acknowledge that not everybody might be able to create good trust "
-#~ "path to Tails signing key since it based on a network of direct human "
-#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
-#~ msgstr ""
-#~ "ما همچنین تصدیق می‌کنیم که هر کسی ممکن است بتواند یک مسیر اعتماد خوب به "
-#~ "کلید امضای تیلز ایجاد کند، چرا که این مسیر بر مبنای ارتباطات مستقیم "
-#~ "انسانی و دانش ابزارهای بسیار پیچیده‌ای مانند اُپن‌پی‌جی‌پی است."
-
-#~ msgid ""
-#~ "Note that since all Tails releases are signed with the same key, you will "
-#~ "not have to verify the key every time and the trust you might "
-#~ "progressively build in it will be built once and for all. Still, you will "
-#~ "have to check the ISO image every time you download a new one!"
-#~ msgstr ""
-#~ "توجه داشته باشید از آن‌جا که تمام نسخه‌های تیلز با کلید مشابه امضاء شده‌اند "
-#~ "لازم نیست هر بار نیازی به تأیید کلید نیست و اعتمادی که ممکن است به مرور "
-#~ "به آن پیدا کنید، یک بار برای همیشه در دسترس است. با این‌حال باید هر بار که "
-#~ "فایل ایزوی جدید دانلود می‌کنید، آن را بررسی کنید."
-
-#~ msgid ""
-#~ "If you want to be extra cautious and really authenticate Tails signing "
-#~ "key in a stronger way than what standard HTTPS offers you, you will need "
-#~ "to use the OpenPGP Web of Trust."
-#~ msgstr ""
-#~ "اگر می‌خواهید خیلی محتاط باشید و از روشی قوی‌تر از چیزی که اچ‌تی‌تی‌پی‌اس "
-#~ "استاندارد در اختیارتان می‌گذارد کاملاً‌ از صحت کلید امضای تیلز مطمئن شوید، "
-#~ "باید از شبکهٔ اعتماد اُپن‌پی‌جی‌پی استفاده کنید."
-
-#~ msgid ""
-#~ "We will present you three techniques from the easiest to the safest. "
-#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
-#~ "them according to your possibilities and technical skills."
-#~ msgstr ""
-#~ "سه شگرد به ترتیب ساده‌ترین تا امن‌ترین را به شما معرفی می‌کنیم. باز هم باید "
-#~ "در نظر داشت که هیچ کدام از این راه‌حل‌ها بی‌نقص و جادویی نیستند. می‌توانید "
-#~ "بسته به امکانات و توانایی‌های فنی خود این شگردها را بررسی کنید."
diff --git a/wiki/src/install/download/openpgp.fr.po b/wiki/src/install/download/openpgp.fr.po
deleted file mode 100644
index 7d19469..0000000
--- a/wiki/src/install/download/openpgp.fr.po
+++ /dev/null
@@ -1,687 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-09-12 17:31+0300\n"
-"PO-Revision-Date: 2017-09-14 11:04+0000\n"
-"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify using OpenPGP\"]]\n"
-msgstr "[[!meta title=\"Télécharger et vérifier avec OpenPGP\"]]\n"
-
-#. type: Plain text
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have *GPG* installed but might need guidance on performing "
-"the verification."
-msgstr ""
-"Ces instructions sont destinées aux personnes étant déjà familières avec "
-"OpenPGP et ayant déjà *GPG* installé mais pouvant avoir besoin d'aide pour "
-"effectuer la vérification."
-
-#. type: Plain text
-msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
-msgstr ""
-"Si vous n'avez pas l'habitude d'OpenPGP, téléchargez plutôt en utilisant "
-"soit [[notre module complémentaire Firefox soit BitTorrent|install/"
-"download]]."
-
-#. type: Bullet: '1. '
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> (<span class="
-"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
-"\"yes\" sort=\"age\"]]</span>)."
-msgstr ""
-"Téléchargez l'<a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\"]]' class=\"use-mirror-pool\">image ISO de Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\"]]</a> (<span class=\"remove-extra-space\">"
-"[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
-"span>)."
-
-#. type: Bullet: '1. '
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
-msgstr ""
-"Téléchargez la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'>signature OpenPGP de Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a> et sauvegardez-la dans "
-"le dossier où vous avez enregistré l'image ISO."
-
-#. type: Bullet: '1. '
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
-msgstr ""
-"Si vous faites cette vérification pour la première fois, téléchargez la "
-"[[clé de signature de Tails|tails-signing.key]] et importez-la dans votre "
-"trousseau de clés. Si vous travaillez depuis Tails, la clé de signature est "
-"déjà inclue."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" All our ISO images are signed with the same signing key, so you only\n"
-" have to import it once. Still, you have to verify the ISO image every\n"
-" time you download a new one.\n"
-msgstr ""
-" Toutes les images ISO sont signées avec la même clé, vous n'aurez donc à\n"
-" l'importer qu'une seule fois. Vous devrez quand même vérifier l'image ISO\n"
-" chaque fois que vous en téléchargerez une nouvelle.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>This download of the Tails signing key is protected using HTTPS.\n"
-" But you could still download a malicious signing key if our website is\n"
-" compromised or if you are victim of a [[man-in-the-middle\n"
-" attack|doc/about/warning#man-in-the-middle]].</p>\n"
-msgstr ""
-" <div class=\"tip\">\n"
-" <p>Le téléchargement de la clé de signature est protégé par l'utilisation de HTTPS.\n"
-" Mais vous pourriez tout de même télécharger une clé malveillante si\n"
-" notre site web était compromis ou si vous étiez victime d'une attaque de [[l'homme du\n"
-" milieu|doc/about/warning#man-in-the-middle]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>For additional verification, you can <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-" </div>\n"
-msgstr ""
-" <p>Pour une vérification supplémentaire, vous pouvez <a href=\"#wot\">authentifier\n"
-" la clé de signature via la Toile de Confiance OpenPGP</a>.</p>\n"
-" </div>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Verify the ISO image\n"
-msgstr "Vérifier l'image ISO\n"
-
-#. type: Plain text
-msgid "This section provides simplified instructions:"
-msgstr "Cette section contient des instructions simplifiées :"
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
-"span></a>"
-msgstr ""
-"<a href=\"#windows\">Pour Windows avec <span class=\"application\">Gpg4win</"
-"span></a>"
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
-"a>"
-msgstr ""
-"<a href=\"#mac\">Pour macOS avec <span class=\"application\">GPGTools</"
-"span></a>"
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#tails\">In Tails</a>"
-msgstr "<a href=\"#tails\">Pour Tails</a>"
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#command-line\">Using the command line</span></a>"
-msgstr "<a href=\"#command-line\">En utilisant la ligne de commande</span></a>"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>As explained above in step 3, this simple OpenPGP verification\n"
-"provides a level of verification equivalent to HTTPS, like the [[Firefox\n"
-"extension or BitTorrent|install/download]], unless you also\n"
-"<a href=\"#wot\">authenticate the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-msgstr ""
-"<p>Comme expliqué à la troisième étape, cette simple vérification avec OpenPGP\n"
-"fournit un niveau de vérification équivalent à HTTPS, comme [[le module\n"
-"complémentaire pour Firefox ou BitTorrent|install/download]], sauf si vous\n"
-"<a href=\"#wot\">authentifiez la clé de signature via la Toile de Confiance OpenPGP</a>.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"windows\"></a>\n"
-msgstr "<a id=\"windows\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In Windows with <span class=\"application\">Gpg4win</span>"
-msgstr "Pour Windows avec <span class=\"application\">Gpg4win</span>"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"See the [[<span class=\"application\">Gpg4win</span> documentation on\n"
-"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].\n"
-msgstr ""
-"Voir la documentation de [[<span class=\"application\">Gpg4win</span> sur la\n"
-"vérification des signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]] (en anglais).\n"
-
-#. type: Plain text
-msgid ""
-"Verify the date of the signature to make sure that you downloaded the latest "
-"version."
-msgstr ""
-"Vérifiez la date de la signature pour vous assurer que vous avez téléchargé "
-"la dernière version."
-
-#. type: Plain text
-msgid "If the following warning appears:"
-msgstr "Si l'avertissement suivant apparaît :"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<pre>\n"
-"Not enough information to check the signature validity.\n"
-"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
-"The validity of the signature cannot be verified.\n"
-"</pre>\n"
-msgstr ""
-"<pre>\n"
-"Not enough information to check the signature validity.\n"
-"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
-"The validity of the signature cannot be verified.\n"
-"</pre>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Then the ISO image is still correct according to the signing key that you\n"
-"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate the\n"
-"signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-"Alors l'image ISO est tout de même correctement signée par la clé que vous\n"
-"avez téléchargé. Pour supprimer cet avertissement vous devez <a href=\"#wot\">authentifier\n"
-"la clé de signature via la Toile de Confiance OpenPGP</a>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mac\"></a>\n"
-msgstr "<a id=\"mac\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In macOS using <span class=\"application\">GPGTools</span>"
-msgstr "Pour macOS en utilisant <span class=\"application\">GPGTools</span>"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
-msgstr ""
-"Ouvrez <span class=\"application\">Finder</span> et naviguez jusqu'au "
-"dossier où vous avez enregistré l'image ISO et la signature."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on the ISO image and choose\n"
-" <span class=\"guimenuchoice\">\n"
-" <span class=\"guisubmenu\">Services</span> ▸\n"
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>.\n"
-msgstr ""
-"1. Faites un clic droit sur l'image ISO puis sur\n"
-" <span class=\"guimenuchoice\">\n"
-" <span class=\"guisubmenu\">Services</span> ▸\n"
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"tails\"></a>\n"
-msgstr "<a id=\"tails\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In Tails"
-msgstr "Pour Tails"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
-msgstr ""
-"Ouvrez le navigateur de fichier et naviguez jusqu'au dossier où vous avez "
-"enregistré l'image ISO et la signature."
-
-#. type: Bullet: '1. '
-msgid ""
-"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
-"With Verify Signature</span>."
-msgstr ""
-"Faites un clic droit sur la signature puis sur <span class=\"guimenuitem"
-"\">Ouvrir avec Vérifier la signature</span>."
-
-#. type: Bullet: '1. '
-msgid "The verification of the ISO image starts automatically:"
-msgstr "La vérification de l'image ISO démarre automatiquement :"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
-msgstr " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
-
-#. type: Bullet: '1. '
-msgid ""
-"After the verification finishes, click on the notification counter in the "
-"bottom-right corner and on the notification with a transparent background on "
-"the right of the notification area:"
-msgstr ""
-"Une fois la vérification terminée, cliquez sur le compteur de notification "
-"dans l'angle en bas à droite puis sur la notification avec un fond "
-"transparent à droite de la zone de notification :"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]\n"
-msgstr " [[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " Verify the date of the signature to make sure that you downloaded the latest version.\n"
-msgstr " Vérifiez la date de la signature pour vous assurer que vous avez téléchargé la dernière version.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"command-line\"></a>\n"
-msgstr "<a id=\"command-line\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "Using the command line"
-msgstr "En ligne de commande"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
-msgstr ""
-"Ouvrez un terminal et naviguez jusqu'au dossier où vous avez enregistré "
-"l'image ISO et la signature."
-
-#. type: Bullet: '1. '
-msgid "Execute:"
-msgstr "Exécutez la commande :"
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " The output of this command should be the following:\n"
-msgstr " La sortie de cette commande devrait être :\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " If the output also includes:\n"
-msgstr " Si la sortie inclut aussi :\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <pre>\n"
-" gpg: WARNING: This key is not certified with a trusted signature!\n"
-" gpg: There is no indication that the signature belongs to the owner.</pre>\n"
-msgstr ""
-" <pre>\n"
-" gpg: WARNING: This key is not certified with a trusted signature!\n"
-" gpg: There is no indication that the signature belongs to the owner.</pre>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Then the ISO image is still correct according to the signing key that you\n"
-" downloaded. To remove this warning you need to <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-" Alors l'image ISO est tout de même correctement signée par la clé que vous\n"
-" avez téléchargé. Pour supprimer cet avertissement vous devez <a href=\"#wot\">authentifier\n"
-" la clé de signature via la Toile de Confiance OpenPGP</a>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"wot\"></a>\n"
-msgstr "<a id=\"wot\"></a>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Authenticate the signing key through the OpenPGP Web of Trust\n"
-msgstr "Authentifier la clé de signature via la Toile de Confiance OpenPGP\n"
-
-#. type: Plain text
-msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
-msgstr ""
-"Les techniques de vérifications présentées jusqu'à maintenant ([[le module "
-"complémentaire pour Firefox, BitTorrent|install/download]] et la "
-"vérification OpenPGP) dépendent toutes d'informations téléchargées de "
-"manière sécurisée via HTTPS depuis notre site web :"
-
-#. type: Bullet: ' - '
-msgid "The *checksum* for the Firefox extension"
-msgstr "La *somme de contrôle* pour l'extension Firefox"
-
-#. type: Bullet: ' - '
-msgid "The *Torrent file* for BitTorrent"
-msgstr "Le *fichier Torrent* pour BitTorrent"
-
-#. type: Bullet: ' - '
-msgid "The *Tails signing key* for the OpenPGP verification"
-msgstr "La *clé de signature de Tails* pour la vérification OpenPGP"
-
-#. type: Plain text
-msgid ""
-"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
-"about/warning#man-in-the-middle]]."
-msgstr ""
-"Mais, si notre site web était compromis ou que vous étiez victime d'une "
-"[[attaque de l'homme du milieu|doc/about/warning#man-in-the-middle]] vous "
-"pourriez télécharger des informations malveillantes."
-
-#. type: Plain text
-msgid ""
-"The OpenPGP verification is the only technique that allows you to verify the "
-"ISO image even better by also authenticating the Tails signing key through "
-"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
-"way to completely protect you from malicious downloads."
-msgstr ""
-"La vérification OpenPGP est la seule méthode qui vous permet une "
-"vérification encore plus poussée de l'image ISO en authentifiant aussi la "
-"clé de signature de Tails via la Toile de Confiance OpenPGP. Se fier à la "
-"Toile de Confiance OpenPGP est la seule manière de vous protéger "
-"complètement des téléchargements malveillants."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are verifying an ISO image from inside Tails already, for\n"
-"example to do a manual upgrade, then the Tails signing key is already\n"
-"included in Tails. You can trust this signing key as much as you are trusting your\n"
-"Tails installation already because you are not downloading it.</p>\n"
-msgstr ""
-"<p>Si vous vérifiez l'image ISO depuis Tails, par\n"
-"exemple pour faire une mise à jour manuelle, la clé de signature de Tails est déjà\n"
-"fournie. Vous pouvez avoir confiance en cette clé autant qu'en votre installation de Tails.</p>\n"
-
-#. type: Plain text
-msgid ""
-"One of the inherent problems of standard HTTPS is that the trust we usually "
-"put in a website is defined by certificate authorities: a hierarchical and "
-"closed set of companies and governmental institutions approved by your web "
-"browser vendor. This model of trust has long been criticized and proved "
-"several times to be vulnerable to attacks [[as explained on our warning page|"
-"doc/about/warning#man-in-the-middle]]."
-msgstr ""
-"Un problème inhérent au standard HTTPS est le fait que la confiance "
-"généralement accordée à un site web est définie par des autorités de "
-"certification : un ensemble fermé et hiérarchique d'entreprises et "
-"d'institutions gouvernementales approuvées par le fabricant de votre "
-"navigateur. La critique de ce modèle de confiance a été faite depuis "
-"longtemps et il a été montré de nombreuses fois qu'il était sujet à "
-"certaines attaques [[comme expliqué dans notre page d'avertissements|doc/"
-"about/warning#man-in-the-middle]]."
-
-#. type: Plain text
-msgid ""
-"We believe that, instead, users should be given the final say when trusting "
-"a website, and that designation of trust should be done on the basis of "
-"human interactions."
-msgstr ""
-"Nous pensons plutôt que le dernier mot, lorsqu'il s'agit de faire confiance "
-"à un site web, doit revenir aux individus et que la construction de la "
-"confiance devrait être basée sur des relations humaines."
-
-#. type: Plain text
-msgid ""
-"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
-"on OpenPGP keys that can help solving this problem. Let's see this with an "
-"example:"
-msgstr ""
-"La [[!wikipedia_fr Toile_de_confiance desc=\"Toile de Confiance\"]] OpenPGP "
-"est un modèle de confiance décentralisé basé sur les clés OpenPGP. Voyons ça "
-"avec un exemple :"
-
-#. type: Bullet: '1. '
-msgid ""
-"*You are friend with Alice and really trust her way of managing OpenPGP "
-"keys. So you are trusting Alice's key.*"
-msgstr ""
-"*Vous êtes un ami d'Alice et lui faites vraiment confiance quant à sa "
-"manière de gérer les clés OpenPGP. Vous avez confiance dans la clé d'Alice.*"
-
-#. type: Bullet: '1. '
-msgid ""
-"*Furthermore, Alice met Bob, a Tails developer, in a conference and "
-"certified Bob's key. So Alice is trusting Bob's key.*"
-msgstr ""
-"*De plus, Alice a rencontré Bob, un développeur de Tails, lors d'une "
-"conférence et a signé sa clé. Alice a confiance dans la clé de Bob.*"
-
-#. type: Bullet: '1. '
-msgid ""
-"*Bob is a Tails developer who directly owns the Tails signing key. So Bob "
-"fully trusts the Tails signing key.*"
-msgstr ""
-"*Bob est un développeur de Tails qui possède la clé de signature de Tails. "
-"Bob a pleinement confiance dans la clé de signature de Tails.*"
-
-#. type: Plain text
-msgid ""
-"In this scenario, Alice found a path to trust the Tails signing key without "
-"the need to rely on certificate authorities."
-msgstr ""
-"Dans ce scénario, Alice a trouvé un chemin de confiance jusqu'à la clé de "
-"signature de Tails sans avoir besoin d'autorités de certification."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are on Debian, Ubuntu, or Linux Mint, you can install the\n"
-"<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
-"all Debian developers. Some Debian developers have certified the Tails\n"
-"signing key and you can use these certifications to build a trust path.\n"
-"This technique is explained in detail in our instructions on\n"
-"[[installing Tails from Debian, Ubuntu, or Linux Mint using the command\n"
-"line|install/expert/usb]].</p>\n"
-msgstr ""
-"<p>Si vous utilisez Debian, Ubuntu ou Linux Mint, vous pouvez installer le\n"
-"paquet <code>debian-keyring</code> qui contient les clés OpenPGP de tous les\n"
-"développeurs Debian. Certains développeurs Debian ont certifié la clé de signature\n"
-"de Tails, vous pouvez donc utiliser ces certifications pour construire un chemin de confiance.\n"
-"Cette méthode est expliquée en détail dans nos instructions sur\n"
-"[[installer Tails depuis Debian, Ubuntu ou Linux Mint en ligne\n"
-"de commande|install/expert/usb]].</p>\n"
-
-#. type: Plain text
-msgid ""
-"Relying on the Web of Trust requires both caution and intelligent "
-"supervision by the users. The technical details are outside of the scope of "
-"this document."
-msgstr ""
-"Se fier à la Toile de Confiance demande à la fois prudence et intelligence "
-"de la part des personnes l'utilisant. Les détails techniques sont au-delà de "
-"la portée de ce document."
-
-#. type: Plain text
-msgid ""
-"Since the Web of Trust is actually based on human relationships and real-"
-"life interactions, the best is to get in touch with people knowledgeable "
-"about OpenPGP and build trust relationships in order to find your own trust "
-"path to the Tails signing key."
-msgstr ""
-"La toile de confiance étant basée sur des relations humaines et des "
-"interactions dans la vraie vie, le mieux serait d'entrer en contact avec des "
-"personnes s'y connaissant en OpenPGP et de construire des liens de confiance "
-"afin de vous frayer votre propre chemin de confiance jusqu'à la clé de "
-"signature de Tails."
-
-#. type: Plain text
-msgid ""
-"For example, you can start by contacting a local [[!wikipedia "
-"Linux_User_Group]], [[an organization offering Tails training|support/"
-"learn]], or other Tails enthusiasts near you and exchange about their "
-"OpenPGP practices."
-msgstr ""
-"Vous pourriez commencer par prendre contact avec un [[!wikipedia_fr "
-"Groupe_d'utilisateurs_Linux]], [[une organisation proposant des formations à "
-"propos de Tails|support/learn]] ou d'autres amis de Tails proches de chez "
-"vous et échanger à propos de leurs pratiques d'OpenPGP."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>After you built a trust path, you can certify the Tails signing key by\n"
-"signing it with your own key to get rid of some warnings during the\n"
-"verification process.</p>\n"
-msgstr ""
-"<p>Après avoir construit un chemin de confiance, vous pouvez certifier la clé de signature Tails\n"
-"en la signant avec votre propre clé pour vous débarrasser des avertissements durant le\n"
-"processus de vérification.</p>\n"
-
-#. type: Title #
-#, no-wrap
-msgid "Further reading on OpenPGP"
-msgstr "En lire plus à propos de OpenPGP"
-
-#. type: Bullet: '- '
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr ""
-"[[!wikipedia_fr GNU_Privacy_Guard desc=\"Wikipédia : GnuPG\"]], un logiciel "
-"OpenPGP libre"
-
-#. type: Bullet: '- '
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr ""
-"[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]] (en "
-"anglais)"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[Debian : Signature de clés|http://www.debian.org/events/keysigning.fr."
-"html]], un tutoriel sur le fait de signer les clés d'autres personnes"
-
-#. type: Bullet: '- '
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]] (en anglais)"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions en anglais pour la gestion de la "
-"confiance des clés avec Gpg4win"
-
-#~ msgid ""
-#~ "<p>Tails [[transitioned to a new signing\n"
-#~ "key|news/signing_key_transition]] in March 2015.\n"
-#~ "If you had the previous signing key, make sure\n"
-#~ "to [[import and verify the new signing\n"
-#~ "key|news/signing_key_transition#index1h1]].</p>\n"
-#~ msgstr ""
-#~ "<p>Tails [[a changé de clé de signature\n"
-#~ "|news/signing_key_transition]] en mars 2015.\n"
-#~ "Si vous aviez l'ancienne clé, n'oubliez-pas\n"
-#~ "d'[[importer et vérifier la nouvelle clé\n"
-#~ "de signature|news/signing_key_transition#index1h1]].</p>\n"
-
-#~ msgid ""
-#~ "We also acknowledge that not everybody might be able to create good trust "
-#~ "path to Tails signing key since it based on a network of direct human "
-#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
-#~ msgstr ""
-#~ "Nous reconnaissons quand même qu'il n'est pas donné à tout le monde de "
-#~ "pouvoir établir un bon chemin de confiance jusqu'à la clé de signature de "
-#~ "Tails, cela étant basé sur un réseau de relations humaines ainsi que sur "
-#~ "le savoir-faire relativement complexe d'outils comme OpenPGP."
-
-#~ msgid ""
-#~ "Note that since all Tails releases are signed with the same key, you will "
-#~ "not have to verify the key every time and the trust you might "
-#~ "progressively build in it will be built once and for all. Still, you will "
-#~ "have to check the ISO image every time you download a new one!"
-#~ msgstr ""
-#~ "Notez que toutes les versions de Tails étant signées par la même clé, "
-#~ "vous n'aurez pas à vérifier la clé à chaque fois et que la confiance que "
-#~ "vous pourriez progressivement lui accorder le sera une fois pour toute. "
-#~ "En revanche, il vous faudra vérifier l'image ISO à chaque fois que vous "
-#~ "en téléchargez une nouvelle !"
-
-#~ msgid ""
-#~ "If you want to be extra cautious and really authenticate Tails signing "
-#~ "key in a stronger way than what standard HTTPS offers you, you will need "
-#~ "to use the OpenPGP Web of Trust."
-#~ msgstr ""
-#~ "Si vous voulez être très prudent et réellement authentifier la clé de "
-#~ "signature de Tails d'une manière plus forte que ce que le HTTPS standard "
-#~ "vous permet, vous allez devoir utiliser la toile de confiance OpenPGP."
-
-#~ msgid ""
-#~ "We will present you three techniques from the easiest to the safest. "
-#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
-#~ "them according to your possibilities and technical skills."
-#~ msgstr ""
-#~ "Nous allons vous montrer trois techniques, de la plus simple à la plus "
-#~ "sûre. Encore une fois, aucune de celles-ci n'est une solution magique ou "
-#~ "parfaite. N'hésitez pas à les tester selon vos possibilités et "
-#~ "compétences techniques."
diff --git a/wiki/src/install/download/openpgp.it.po b/wiki/src/install/download/openpgp.it.po
deleted file mode 100644
index e3d0434..0000000
--- a/wiki/src/install/download/openpgp.it.po
+++ /dev/null
@@ -1,643 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-12 17:31+0300\n"
-"PO-Revision-Date: 2017-02-09 19:18+0100\n"
-"Last-Translator: \n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify using OpenPGP\"]]\n"
-msgstr "[[!meta title=\"Scarica e verifica usando OpenPGP\"]]\n"
-
-#. type: Plain text
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have *GPG* installed but might need guidance on performing "
-"the verification."
-msgstr ""
-"Queste istruzioni sono per persone che sono già familiari con un uso base di "
-"OpenPGP e hanno *GPG* installato, ma potrebbero avere necessità di una guida "
-"per effettuare la verifica."
-
-#. type: Plain text
-msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> (<span class="
-"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
-"\"yes\" sort=\"age\"]]</span>)."
-msgstr ""
-"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\"]] immagine ISO </a> (<span class=\"remove-"
-"extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-"\"age\"]]</span>)."
-
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
-#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
-#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
-#| "of the latest Tails ISO image and save it to the same folder where you "
-#| "saved the ISO image."
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
-msgstr ""
-"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
-"sort=\"age\"]] firma OpenPGP</a> dell'ultima immagine ISO Tails e salvala "
-"nella stessa cartella in cui hai savato l'immagine ISO."
-
-#. type: Bullet: '1. '
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
-msgstr ""
-"Se stai facendo la verifica per la prima volta, scarica la [[chiave di "
-"firma Tails|tails-signing.key]] e importala nel tuo portachiavi. Se stai "
-"lavorando da Tails, la chiave di firma è già inclusa."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" All our ISO images are signed with the same signing key, so you only\n"
-" have to import it once. Still, you have to verify the ISO image every\n"
-" time you download a new one.\n"
-msgstr ""
-" Tutte le immagini ISO sono firmate con la stessa chiave, quindi devi\n"
-" importarla solo una volta. In ogni caso, devi verificare l'immagine ISO\n"
-" ogni volta in cui ne scarichi una nuova.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>This download of the Tails signing key is protected using HTTPS.\n"
-" But you could still download a malicious signing key if our website is\n"
-" compromised or if you are victim of a [[man-in-the-middle\n"
-" attack|doc/about/warning#man-in-the-middle]].</p>\n"
-msgstr ""
-" <div class=\"tip\">\n"
-" <p> Questo download della chiave di firma Tails è protetto usato HTTPS.\n"
-" Ma potresti comunque scaricare una chiave di firma maligna se il tuo sito è\n"
-" compromesso o se sei vittima di un [[attacco \n"
-" man-in-the-middle|doc/about/warning#man-in-the-middle]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>For additional verification, you can <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-" </div>\n"
-msgstr ""
-" <p>Per verifiche aggiuntive, puoi <a href=\"#wot\">autenticare\n"
-" la chiave di firma attraverso la Web of Trust di OpenPGP</a>.</p>\n"
-" </div>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Verify the ISO image\n"
-msgstr "Verificare l'immagine ISO\n"
-
-#. type: Plain text
-msgid "This section provides simplified instructions:"
-msgstr "Questa sezione fornisce istruzioni semplificate:"
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
-"span></a>"
-msgstr ""
-"<a href=\"#windows\">In Windows con <span class=\"application\">Gpg4win</"
-"span></a>"
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
-"a>"
-msgstr ""
-"<a href=\"#mac\">In macOS con <span class=\"application\">GPGTools</span></a>"
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#tails\">In Tails</a>"
-msgstr "<a href=\"#tails\">In Tails</a>"
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#command-line\">Using the command line</span></a>"
-msgstr "<a href=\"#command-line\">Usando la riga di comando</span></a>"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>As explained above in step 3, this simple OpenPGP verification\n"
-"provides a level of verification equivalent to HTTPS, like the [[Firefox\n"
-"extension or BitTorrent|install/download]], unless you also\n"
-"<a href=\"#wot\">authenticate the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-msgstr ""
-"<p>Come spiegato precedentemente al passaggio 3, questa semplice verica OpenPGP\n"
-"fornisce un livello di verifica equivalente all'HTTPS, come un'[[estensione\n"
-"Firefox o BitTorrent|install/download]], a meno che tu non\n"
-"<a href=\"#wot\">autentichi la chiave di firma utilizzando la Web of Trust OpenPGP</a>.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"windows\"></a>\n"
-msgstr "<a id=\"windows\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In Windows with <span class=\"application\">Gpg4win</span>"
-msgstr "In Windows con <span class=\"application\">Gpg4win</span>"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"See the [[<span class=\"application\">Gpg4win</span> documentation on\n"
-"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].\n"
-msgstr ""
-"Guarda la documentazione [[<span class=\"application\">Gpg4win</span> su come\n"
-"verificare le firme|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].\n"
-
-#. type: Plain text
-msgid ""
-"Verify the date of the signature to make sure that you downloaded the latest "
-"version."
-msgstr ""
-"Verifica la data della firma per essere certa che hai scaricato l'ultima "
-"versione."
-
-#. type: Plain text
-msgid "If the following warning appears:"
-msgstr "Se compare il seguente avviso:"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<pre>\n"
-"Not enough information to check the signature validity.\n"
-"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
-"The validity of the signature cannot be verified.\n"
-"</pre>\n"
-msgstr ""
-"<pre>\n"
-"Not enough information to check the signature validity.\n"
-"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
-"The validity of the signature cannot be verified.\n"
-"</pre>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Then the ISO image is still correct according to the signing key that you\n"
-"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate the\n"
-"signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-"Significa che l'immagine ISO è ancora corretta secondo la chiave di firma che\n"
-"hai scaricato. Per rimuovere questo avviso devi <a href=\"#wot\">autenticare la\n"
-"chiave di firma attraverso la Web of Trust OpenPGP</a>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mac\"></a>\n"
-msgstr "<a id=\"mac\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In macOS using <span class=\"application\">GPGTools</span>"
-msgstr "In macOS usando <span class=\"application\">GPGTools</span>"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
-msgstr ""
-"Apri il <span class=\"application\">Finder</span> e naviga nella cartella "
-"dove hai salvato l'immagine ISO e la firma."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on the ISO image and choose\n"
-" <span class=\"guimenuchoice\">\n"
-" <span class=\"guisubmenu\">Services</span> ▸\n"
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>.\n"
-msgstr ""
-"1. Clicca con il tasto destro sull'immagine ISO e scegli\n"
-" <span class=\"guimenuchoice\">\n"
-" <span class=\"guisubmenu\">Services</span> ▸\n"
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"tails\"></a>\n"
-msgstr "<a id=\"tails\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "In Tails"
-msgstr "Su Tails"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
-msgstr ""
-"Apri il navigatore di file e arriva nella cartella dove hai salvato "
-"l'immagine ISO e la firma."
-
-#. type: Bullet: '1. '
-msgid ""
-"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
-"With Verify Signature</span>."
-msgstr ""
-"Clicca con il tasto destro sulla firma e scegli <span class=\"guimenuitem"
-"\">Open With Verify Signature</span>."
-
-#. type: Bullet: '1. '
-msgid "The verification of the ISO image starts automatically:"
-msgstr "La verifica dell'immagine ISO inizierà automaticamente:"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
-msgstr " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
-
-#. type: Bullet: '1. '
-msgid ""
-"After the verification finishes, click on the notification counter in the "
-"bottom-right corner and on the notification with a transparent background on "
-"the right of the notification area:"
-msgstr ""
-"Quando la verifica è completata, clicca sul contatore di notifiche "
-"nell'angolo in basso a destra e sulla notifica con uno sfondo trasparente "
-"sulla destra dell'area di notifica:"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]\n"
-msgstr " [[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " Verify the date of the signature to make sure that you downloaded the latest version.\n"
-msgstr " Verifica la data della firma per assicurarti di aver scaricato l'ultima versione.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"command-line\"></a>\n"
-msgstr "<a id=\"riga di comando\"></a>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "Using the command line"
-msgstr "Usare la riga di comando"
-
-#. type: Bullet: '1. '
-msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
-msgstr ""
-"Apri un terminale e naviga nella cartella dove hai salvato l'immagine ISO e "
-"la firma."
-
-#. type: Bullet: '1. '
-msgid "Execute:"
-msgstr "Esegui:"
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " The output of this command should be the following:\n"
-msgstr " L'output di questo comando dovrebbe essere il seguente:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " If the output also includes:\n"
-msgstr " Se l'output include anche:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <pre>\n"
-" gpg: WARNING: This key is not certified with a trusted signature!\n"
-" gpg: There is no indication that the signature belongs to the owner.</pre>\n"
-msgstr ""
-" <pre>\n"
-" gpg: WARNING: This key is not certified with a trusted signature!\n"
-" gpg: There is no indication that the signature belongs to the owner.</pre>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Then the ISO image is still correct according to the signing key that you\n"
-" downloaded. To remove this warning you need to <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-" L'immagine ISO è ancora corretta secondo la chiave di firma che hai\n"
-" scaricato. Per rimuovere questo avviso devi <a href=\"#wot\">autenticare\n"
-" la chiave di firma attraverso la Web of Trust OpenPGP</a>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"wot\"></a>\n"
-msgstr "<a id=\"wot\"></a>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Authenticate the signing key through the OpenPGP Web of Trust\n"
-msgstr "Autenticare la chiave di firma attraverso la Web of Trust OpenPGP\n"
-
-#. type: Plain text
-msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
-msgstr ""
-"Le tecniche di verifica presentate fino a ora ([[Firefox extension, "
-"BitTorrent|install/download]], o verifica OpenPGP) si basano tutte sul'aver "
-"scaricato alcune informazioni dal nostro sito in maniera sicura utilizzando "
-"HTTPS:"
-
-#. type: Bullet: ' - '
-msgid "The *checksum* for the Firefox extension"
-msgstr "La *checksum* per l'estensione Firefox"
-
-#. type: Bullet: ' - '
-msgid "The *Torrent file* for BitTorrent"
-msgstr "Il *file Torrent* per BitTorrent"
-
-#. type: Bullet: ' - '
-msgid "The *Tails signing key* for the OpenPGP verification"
-msgstr "La *chiave di firma Tails* per la verifica OpenPGP"
-
-#. type: Plain text
-msgid ""
-"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
-"about/warning#man-in-the-middle]]."
-msgstr ""
-"Ma, facendo una di queste cose, potresti scaricare informazioni malevole se "
-"il nostro sito è stato compromesso o se sei vittima di un attacco [[man-in-"
-"the-middle attack|doc/about/warning#man-in-the-middle]]."
-
-#. type: Plain text
-msgid ""
-"The OpenPGP verification is the only technique that allows you to verify the "
-"ISO image even better by also authenticating the Tails signing key through "
-"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
-"way to completely protect you from malicious downloads."
-msgstr ""
-"La verifica OpenPGP è l'unica tecnica che ti consente di verificare "
-"l'immagine ISO ancora meglio attraverso l'autenticazione della chiave di "
-"firma Tails tramite la Web of Trust OpenPGP. Affidarsi alla Web of Trust "
-"OpenPGP è l'unico modo per proteggerti completamente da download malevoli."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are verifying an ISO image from inside Tails already, for\n"
-"example to do a manual upgrade, then the Tails signing key is already\n"
-"included in Tails. You can trust this signing key as much as you are trusting your\n"
-"Tails installation already because you are not downloading it.</p>\n"
-msgstr ""
-"<p>Se stai verificando un'immagine ISO essendo già in Tails, per\n"
-"esempio per fare un aggiornamento manuale, allora la chiave di firma Tails è già\n"
-"inclusa in Tails. Puoi avere fiducia in questa chiave di firma tanto quanto hai già fiducia\n"
-"nella tua installazione Tails, perché non lo stai scaricando.</p>\n"
-
-#. type: Plain text
-msgid ""
-"One of the inherent problems of standard HTTPS is that the trust we usually "
-"put in a website is defined by certificate authorities: a hierarchical and "
-"closed set of companies and governmental institutions approved by your web "
-"browser vendor. This model of trust has long been criticized and proved "
-"several times to be vulnerable to attacks [[as explained on our warning page|"
-"doc/about/warning#man-in-the-middle]]."
-msgstr ""
-"Uno dei problemi inerenti allo standard HTTPS è che la fiducia che "
-"generalmente riponiamo in un sito è definita da certificati di autorità: un "
-"insieme gerarchico e chiuso di aziende e instituzioni governative approvate "
-"dal rivenditore del tuo browser. Questo modello di fiducia è criticato da "
-"tempo e si è dimostrato svariate volte vulnerabile agli attacchi, [[come "
-"spiegato nella nostra pagina di avviso|doc/about/warning#man-in-the-middle]]."
-
-#. type: Plain text
-msgid ""
-"We believe that, instead, users should be given the final say when trusting "
-"a website, and that designation of trust should be done on the basis of "
-"human interactions."
-msgstr ""
-"Noi pensiamo che, invece, gli utilizzatori dovrebbero avere la parola finale "
-"sulla fiducia verso un sito internet, e che la fiducia vada riposta sulla "
-"base di interazioni umane."
-
-#. type: Plain text
-msgid ""
-"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
-"on OpenPGP keys that can help solving this problem. Let's see this with an "
-"example:"
-msgstr ""
-"La [[!wikipedia Web_of_Trust]] OpenPGP è un modello di fiducia "
-"decentralizzato basato su chiavi OpenPGP che possono aiutare a risolvere "
-"questo problema. Vediamolo con un esempio:"
-
-#. type: Bullet: '1. '
-msgid ""
-"*You are friend with Alice and really trust her way of managing OpenPGP "
-"keys. So you are trusting Alice's key.*"
-msgstr ""
-"*Sei amica di Alice e hai fiducia nel modo in cui gestisce le chiavi "
-"OpenPGP. Quindi di fidi della chiave di Alice.*"
-
-#. type: Bullet: '1. '
-msgid ""
-"*Furthermore, Alice met Bob, a Tails developer, in a conference and "
-"certified Bob's key. So Alice is trusting Bob's key.*"
-msgstr ""
-"*Inoltre, Alice incontra Bob, uno sviluppatore di Tails, in una conferenza e "
-"certifica la sua chiave. Quindi Alice ha fiducia nella chiave di Bob.*"
-
-#. type: Bullet: '1. '
-msgid ""
-"*Bob is a Tails developer who directly owns the Tails signing key. So Bob "
-"fully trusts the Tails signing key.*"
-msgstr ""
-"*Bob è uno sviluppatore di Tails che possiede direttamente le chiavi di "
-"firma di Tails. Quindi Bob si fida pienamente delle chiavi di firma di Tails."
-"*"
-
-#. type: Plain text
-msgid ""
-"In this scenario, Alice found a path to trust the Tails signing key without "
-"the need to rely on certificate authorities."
-msgstr ""
-"In questo scenario, Alice ha trovato un sentiero di fiducia nella chiave di "
-"firma Tails senza il bisogno di affidarsi ad autorità certificate."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are on Debian, Ubuntu, or Linux Mint, you can install the\n"
-"<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
-"all Debian developers. Some Debian developers have certified the Tails\n"
-"signing key and you can use these certifications to build a trust path.\n"
-"This technique is explained in detail in our instructions on\n"
-"[[installing Tails from Debian, Ubuntu, or Linux Mint using the command\n"
-"line|install/expert/usb]].</p>\n"
-msgstr ""
-"<p>Se sei su Debian o Ubuntu, puoi installare il\n"
-"pacchetto <code>debian-keyring</code> che contiene le chiavi OpenPGP di\n"
-"tutti gli sviluppatori Debian. Alcuni sviluppatori Debian hanno certificato la chiave\n"
-"di firma di Tails e puoi usare queste certificazioni per costruire un sentiero di fiducia\n"
-"This technique is explained in detail in our instructions on\n"
-"Questa tecnica è spiegata in dettaglio nelle nostre istruzioni su\n"
-"[[installare Tails from Debian or Ubuntu usando la riga di\n"
-"comando|install/expert/usb]].</p>\n"
-
-#. type: Plain text
-msgid ""
-"Relying on the Web of Trust requires both caution and intelligent "
-"supervision by the users. The technical details are outside of the scope of "
-"this document."
-msgstr ""
-"Affidarsi alla Web of Trust richiede sia cautela che supervisione "
-"intelligente da parte degli utilizzatori. I dettagli tecnici sono al di "
-"fuori degli scopi di questo documento."
-
-#. type: Plain text
-msgid ""
-"Since the Web of Trust is actually based on human relationships and real-"
-"life interactions, the best is to get in touch with people knowledgeable "
-"about OpenPGP and build trust relationships in order to find your own trust "
-"path to the Tails signing key."
-msgstr ""
-"Dato che la Web of Trust è basata su relazioni umane e interazioni nella "
-"vita offline, la cosa migliore è entrare in contatto con persone che hanno "
-"conoscenza di OpenPGP e costruire con loro relazioni per trovare la tua rete "
-"di fiducia nella chiave di firma Tails."
-
-#. type: Plain text
-msgid ""
-"For example, you can start by contacting a local [[!wikipedia "
-"Linux_User_Group]], [[an organization offering Tails training|support/"
-"learn]], or other Tails enthusiasts near you and exchange about their "
-"OpenPGP practices."
-msgstr ""
-"Per esempio, puoi iniziare contattando un [[!wikipedia Linux_User_Group]], "
-"[[un'organizzazione che offra training su Tails|support/learn]], o altri "
-"entusiasti di Tails vicino a te e scambiare informazioni sulle loro pratiche "
-"OpenPGP."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>After you built a trust path, you can certify the Tails signing key by\n"
-"signing it with your own key to get rid of some warnings during the\n"
-"verification process.</p>\n"
-msgstr ""
-"<p>Una volta che hai stabilito un sentiero di fiducia, puoi certificare la chiave di firma di Tails\n"
-"firmandola con la tua stessa chiave per liberarti di alcuni degli avvertimenti duranta il\n"
-"processo di verifica.</p>\n"
-
-#. type: Title #
-#, no-wrap
-msgid "Further reading on OpenPGP"
-msgstr "Altre letture su OpenPGP"
-
-#. type: Bullet: '- '
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], un software OpenPGP free"
-
-#. type: Bullet: '- '
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], un tutorial "
-"sulle chiavi di firma delle altre persone"
-
-#. type: Bullet: '- '
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], istruzioni su come gestire la fiducia nelle chiavi con "
-"Gpg4win"
-
-#~ msgid ""
-#~ "<p>Tails [[transitioned to a new signing\n"
-#~ "key|news/signing_key_transition]] in March 2015.\n"
-#~ "If you had the previous signing key, make sure\n"
-#~ "to [[import and verify the new signing\n"
-#~ "key|news/signing_key_transition#index1h1]].</p>\n"
-#~ msgstr ""
-#~ "<p>Tails [[è passato a una nuova chiave\n"
-#~ "di firma|news/signing_key_transition]] nel marzo 2015.\n"
-#~ "Se avevi la chiave di firma precedente, assicurati\n"
-#~ "di [[importare e verificare la nuova chiave\n"
-#~ "di firma|news/signing_key_transition#index1h1]].</p>\n"
diff --git a/wiki/src/install/download/openpgp.mdwn b/wiki/src/install/download/openpgp.mdwn
deleted file mode 100644
index e327e61..0000000
--- a/wiki/src/install/download/openpgp.mdwn
+++ /dev/null
@@ -1,236 +0,0 @@
-[[!meta title="Download and verify using OpenPGP"]]
-
-These instructions are for people who are already familiar with basic
-usage of OpenPGP and have *GPG* installed but might need guidance on
-performing the verification.
-
-If you are not familiar with OpenPGP, download using either [[our
-Firefox extension or BitTorrent|install/download]] instead.
-
-1. Download the <a href='[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]' class="use-mirror-pool">
- Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
- (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>).
-
-1. Download the <a href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>
- Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] OpenPGP signature</a>
- and save it to the same folder where
- you saved the ISO image.
-
-1. If you are doing the verification for the first time, download the
- [[Tails signing key|tails-signing.key]] and import it in your keyring.
- If you are working from Tails, the signing key is already included.
-
- All our ISO images are signed with the same signing key, so you only
- have to import it once. Still, you have to verify the ISO image every
- time you download a new one.
-
- <div class="tip">
- <p>This download of the Tails signing key is protected using HTTPS.
- But you could still download a malicious signing key if our website is
- compromised or if you are victim of a [[man-in-the-middle
- attack|doc/about/warning#man-in-the-middle]].</p>
-
- <p>For additional verification, you can <a href="#wot">authenticate
- the signing key through the OpenPGP Web of Trust</a>.</p>
- </div>
-
-Verify the ISO image
-====================
-
-This section provides simplified instructions:
-
- - <a href="#windows">In Windows with <span class="application">Gpg4win</span></a>
- - <a href="#mac">In macOS with <span class="application">GPGTools</span></a>
- - <a href="#tails">In Tails</a>
- - <a href="#command-line">Using the command line</span></a>
-
-<div class="caution">
-
-<p>As explained above in step 3, this simple OpenPGP verification
-provides a level of verification equivalent to HTTPS, like the [[Firefox
-extension or BitTorrent|install/download]], unless you also
-<a href="#wot">authenticate the signing key through the OpenPGP Web of Trust</a>.</p>
-
-</div>
-
-<a id="windows"></a>
-
-### In Windows with <span class="application">Gpg4win</span>
-
-See the [[<span class="application">Gpg4win</span> documentation on
-verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].
-
-Verify the date of the signature to make sure that you downloaded the latest version.
-
-If the following warning appears:
-
-<pre>
-Not enough information to check the signature validity.
-Signed on ... by tails@boum.org (Key ID: 0x58ACD84F
-The validity of the signature cannot be verified.
-</pre>
-
-Then the ISO image is still correct according to the signing key that you
-downloaded. To remove this warning you need to <a href="#wot">authenticate the
-signing key through the OpenPGP Web of Trust</a>.
-
-<a id="mac"></a>
-
-### In macOS using <span class="application">GPGTools</span>
-
-1. Open <span class="application">Finder</span> and navigate to the
- folder where you saved the ISO image and the signature.
-
-1. Right-click on the ISO image and choose
- <span class="guimenuchoice">
- <span class="guisubmenu">Services</span> ▸
- <span class="guimenuitem">OpenPGP: Verify Signature of File</span></span>.
-
-<a id="tails"></a>
-
-### In Tails
-
-1. Open the file browser and navigate to the folder where you saved the
- ISO image and the signature.
-
-1. Right-click on the signature and choose <span class="guimenuitem">Open With
- Verify Signature</span>.
-
-1. The verification of the ISO image starts automatically:
-
- [[!img install/inc/screenshots/verifying_in_tails.png link="no"]]
-
-1. After the verification finishes, click on the notification counter in
- the bottom-right corner and on the notification with a transparent
- background on the right of the notification area:
-
- [[!img install/inc/screenshots/notification_in_tails.png link="no"]]
-
- Verify the date of the signature to make sure that you downloaded the latest version.
-
-<a id="command-line"></a>
-
-### Using the command line
-
-1. Open a terminal and navigate to the folder where you saved the ISO
- image and the signature.
-
-1. Execute:
-
- <p class="pre">[[!inline pages="inc/stable_amd64_gpg_verify" raw="yes" sort="age"]]</p>
-
- The output of this command should be the following:
-
- <p class="pre">[[!inline pages="inc/stable_amd64_gpg_signature_output" raw="yes" sort="age"]]</p>
-
- Verify the date of the signature to make sure that you downloaded the latest version.
-
- If the output also includes:
-
- <pre>
- gpg: WARNING: This key is not certified with a trusted signature!
- gpg: There is no indication that the signature belongs to the owner.</pre>
-
- Then the ISO image is still correct according to the signing key that you
- downloaded. To remove this warning you need to <a href="#wot">authenticate
- the signing key through the OpenPGP Web of Trust</a>.
-
-<a id="wot"></a>
-
-Authenticate the signing key through the OpenPGP Web of Trust
-=============================================================
-
-The verification techniques presented until now ([[Firefox extension,
-BitTorrent|install/download]], or OpenPGP verification) all rely on some
-information being securely downloaded using HTTPS from our website:
-
- - The *checksum* for the Firefox extension
- - The *Torrent file* for BitTorrent
- - The *Tails signing key* for the OpenPGP verification
-
-But, while doing so, you could download malicious information if our
-website is compromised or if you are victim of a [[man-in-the-middle
-attack|doc/about/warning#man-in-the-middle]].
-
-The OpenPGP verification is the only technique that allows you to verify the ISO image even better
-by also authenticating the Tails signing key through the OpenPGP Web of
-Trust. Relying on the OpenPGP Web of Trust is the only way to completely
-protect you from malicious downloads.
-
-<div class="note">
-
-<p>If you are verifying an ISO image from inside Tails already, for
-example to do a manual upgrade, then the Tails signing key is already
-included in Tails. You can trust this signing key as much as you are trusting your
-Tails installation already because you are not downloading it.</p>
-
-</div>
-
-One of the inherent problems of standard HTTPS is that the trust we usually put
-in a website is defined by certificate authorities: a hierarchical and closed
-set of companies and governmental institutions approved by your web browser vendor.
-This model of trust has long been criticized and proved several times to be
-vulnerable to attacks [[as explained on our warning page|doc/about/warning#man-in-the-middle]].
-
-We believe that, instead, users should be given the final say when trusting a
-website, and that designation of trust should be done on the basis of human
-interactions.
-
-The OpenPGP [[!wikipedia Web_of_Trust]] is a
-decentralized trust model based on OpenPGP keys that can help solving
-this problem. Let's see this with an example:
-
-1. *You are friend with Alice and really trust her way of managing
- OpenPGP keys. So you are trusting Alice's key.*
-
-1. *Furthermore, Alice met Bob, a Tails developer, in a conference and certified
- Bob's key. So Alice is trusting Bob's key.*
-
-1. *Bob is a Tails developer who directly owns the Tails signing key. So
- Bob fully trusts the Tails signing key.*
-
-In this scenario, Alice found a path to trust the Tails signing key
-without the need to rely on certificate authorities.
-
-<div class="tip">
-
-<p>If you are on Debian, Ubuntu, or Linux Mint, you can install the
-<code>debian-keyring</code> package which contains the OpenPGP keys of
-all Debian developers. Some Debian developers have certified the Tails
-signing key and you can use these certifications to build a trust path.
-This technique is explained in detail in our instructions on
-[[installing Tails from Debian, Ubuntu, or Linux Mint using the command
-line|install/expert/usb]].</p>
-
-</div>
-
-Relying on the Web of Trust requires both caution and intelligent supervision
-by the users. The technical details are outside of the scope of this document.
-
-Since the Web of Trust is actually based on human relationships and
-real-life interactions, the best is to get in touch with people
-knowledgeable about OpenPGP and build trust relationships in order to
-find your own trust path to the Tails signing key.
-
-For example, you can start by contacting a local [[!wikipedia Linux_User_Group]],
-[[an organization offering Tails training|support/learn]], or other Tails
-enthusiasts near you and exchange about their OpenPGP practices.
-
-<div class="tip">
-
-<p>After you built a trust path, you can certify the Tails signing key by
-signing it with your own key to get rid of some warnings during the
-verification process.</p>
-
-</div>
-
-# Further reading on OpenPGP
-
-- [[!wikipedia GnuPG desc="Wikipedia: %s"]], a free OpenPGP software
-- [[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]
-- [[Debian: Keysigning|http://www.debian.org/events/keysigning]], a
- tutorial on signing keys of other people
-- [[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/weboftrust.en.html]]
-- [[Gpg4win: Certificate
- inspection|http://www.gpg4win.org/doc/en/gpg4win-compendium_16.html]],
- instructions to manage key trust with Gpg4win
diff --git a/wiki/src/install/download/openpgp.pt.po b/wiki/src/install/download/openpgp.pt.po
deleted file mode 100644
index 9c23ff1..0000000
--- a/wiki/src/install/download/openpgp.pt.po
+++ /dev/null
@@ -1,637 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-12 17:31+0300\n"
-"PO-Revision-Date: 2014-08-06 07:16-0300\n"
-"Last-Translator: Tails Developers <amnesia@boum.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify using OpenPGP\"]]\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have *GPG* installed but might need guidance on performing "
-"the verification."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> (<span class="
-"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
-"\"yes\" sort=\"age\"]]</span>)."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "Note that since all Tails releases are signed with the same key, you will not have to verify the key every time and the trust you might progressively build in it will be built once and for all. Still, you will have to check the ISO image every time you download a new one!"
-msgid ""
-" All our ISO images are signed with the same signing key, so you only\n"
-" have to import it once. Still, you have to verify the ISO image every\n"
-" time you download a new one.\n"
-msgstr "Note que, como todos os lançamentos do Tails são assinadas com a mesma chave, você não precisa verificar a chave toda vez. Além disso, a confiança que você pode adquirir progressivamente nesta chave em algum momento vai ser adquirida de uma vez por todas. Mesmo assim você tem que verificar a imagem ISO toda vez que baixar uma nova!"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>This download of the Tails signing key is protected using HTTPS.\n"
-" But you could still download a malicious signing key if our website is\n"
-" compromised or if you are victim of a [[man-in-the-middle\n"
-" attack|doc/about/warning#man-in-the-middle]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>For additional verification, you can <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Verify the ISO image\n"
-msgstr ""
-
-#. type: Plain text
-msgid "This section provides simplified instructions:"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
-"span></a>"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
-"a>"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#tails\">In Tails</a>"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "<a href=\"#command-line\">Using the command line</span></a>"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>As explained above in step 3, this simple OpenPGP verification\n"
-"provides a level of verification equivalent to HTTPS, like the [[Firefox\n"
-"extension or BitTorrent|install/download]], unless you also\n"
-"<a href=\"#wot\">authenticate the signing key through the OpenPGP Web of Trust</a>.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"windows\"></a>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "In Windows with <span class=\"application\">Gpg4win</span>"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"See the [[<span class=\"application\">Gpg4win</span> documentation on\n"
-"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Verify the date of the signature to make sure that you downloaded the latest "
-"version."
-msgstr ""
-
-#. type: Plain text
-msgid "If the following warning appears:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<pre>\n"
-"Not enough information to check the signature validity.\n"
-"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
-"The validity of the signature cannot be verified.\n"
-"</pre>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Then the ISO image is still correct according to the signing key that you\n"
-"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate the\n"
-"signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mac\"></a>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "In macOS using <span class=\"application\">GPGTools</span>"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on the ISO image and choose\n"
-" <span class=\"guimenuchoice\">\n"
-" <span class=\"guisubmenu\">Services</span> ▸\n"
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"tails\"></a>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "In Tails"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
-"With Verify Signature</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "The verification of the ISO image starts automatically:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"After the verification finishes, click on the notification counter in the "
-"bottom-right corner and on the notification with a transparent background on "
-"the right of the notification area:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Verify the date of the signature to make sure that you downloaded the latest version.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"command-line\"></a>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "Using the command line"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " The output of this command should be the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " If the output also includes:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <pre>\n"
-" gpg: WARNING: This key is not certified with a trusted signature!\n"
-" gpg: There is no indication that the signature belongs to the owner.</pre>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Then the ISO image is still correct according to the signing key that you\n"
-" downloaded. To remove this warning you need to <a href=\"#wot\">authenticate\n"
-" the signing key through the OpenPGP Web of Trust</a>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"wot\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Authenticate the signing key through the OpenPGP Web of Trust\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "The *checksum* for the Firefox extension"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "The *Torrent file* for BitTorrent"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "The *Tails signing key* for the OpenPGP verification"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
-"about/warning#man-in-the-middle]]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"The OpenPGP verification is the only technique that allows you to verify the "
-"ISO image even better by also authenticating the Tails signing key through "
-"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
-"way to completely protect you from malicious downloads."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are verifying an ISO image from inside Tails already, for\n"
-"example to do a manual upgrade, then the Tails signing key is already\n"
-"included in Tails. You can trust this signing key as much as you are trusting your\n"
-"Tails installation already because you are not downloading it.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "One of the inherent problems of standard HTTPS is that the trust we "
-#| "usually put on a website is defined by certificate authorities: a "
-#| "hierarchical and closed set of companies and governmental institutions "
-#| "approved by web browser vendors. This model of trust has long been "
-#| "criticized and proved several times to be vulnerable to attacks [[as "
-#| "explained on our warning page|about/warning#man-in-the-middle]]."
-msgid ""
-"One of the inherent problems of standard HTTPS is that the trust we usually "
-"put in a website is defined by certificate authorities: a hierarchical and "
-"closed set of companies and governmental institutions approved by your web "
-"browser vendor. This model of trust has long been criticized and proved "
-"several times to be vulnerable to attacks [[as explained on our warning page|"
-"doc/about/warning#man-in-the-middle]]."
-msgstr ""
-"Um dos problemas inerentes ao HTTPS padrão é que a confiança que geralmente "
-"se coloca em um sítio web é definida por autoridades certificadoras: um "
-"conjunto fechado e hierárquico de companhias e instituições governamentais "
-"aprovadas pelos desenvolvedores de navegadores. Este modelo de confiança tem "
-"sido criticado há muito tempo e provou muitas vezes ser vulnerável a ataques "
-"[[como explicado em nossa página de advertência|about/warning#man-in-the-"
-"middle]]."
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "We believe instead that users should be given the final say when trusting "
-#| "a website, and that designation of trust should be done on the basis of "
-#| "human interaction."
-msgid ""
-"We believe that, instead, users should be given the final say when trusting "
-"a website, and that designation of trust should be done on the basis of "
-"human interactions."
-msgstr ""
-"Ao invés disso, acreditamos que os usuários devem dar a última palavra "
-"quanto à confiança em um sítio web, e que a indicação de confiança deve ser "
-"feita com base em interação humana."
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "The OpenPGP [[!wikipedia Web_of_Trust desc=\"Web of Trust\"]] is a "
-#| "decentralized trust model based on OpenPGP keys. Let's see that with an "
-#| "example."
-msgid ""
-"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
-"on OpenPGP keys that can help solving this problem. Let's see this with an "
-"example:"
-msgstr ""
-"A [[!wikipedia Web_of_Trust desc=\"Rede de Confiança\"]] é um modelo de "
-"confiança descentralizado baseado em chaves OpenPGP. Vejamos um exemplo."
-
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "*You're a friend of Alice and really trust her way of managing OpenPGP "
-#| "keys.\n"
-#| "You're trusting Alice's key.*\n"
-msgid ""
-"*You are friend with Alice and really trust her way of managing OpenPGP "
-"keys. So you are trusting Alice's key.*"
-msgstr ""
-"*Você é amigo de Alice e realmente confia em sua forma de gerenciar chaves "
-"OpenPGP. Você está confiando na chave de Alice.*\n"
-
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "*Furthermore, Alice met Bob, a Tails developer, in a conference, and "
-#| "signed\n"
-#| "Bob's key. Alice is trusting Bob's key.*\n"
-msgid ""
-"*Furthermore, Alice met Bob, a Tails developer, in a conference and "
-"certified Bob's key. So Alice is trusting Bob's key.*"
-msgstr ""
-"*Além disso, Alice conheceu Bob, um desenvolvedor do Tails, em uma "
-"conferência, e assinou a chave de Bob. Alice está confiando na chave de "
-"Bob*.\n"
-
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "*Bob is a Tails developer who directly owns the Tails signing key. Bob "
-#| "fully\n"
-#| "trusts Tails signing key.*\n"
-msgid ""
-"*Bob is a Tails developer who directly owns the Tails signing key. So Bob "
-"fully trusts the Tails signing key.*"
-msgstr ""
-"*Bob é um desenvolvedor do Tails que possui diretamente a chave de "
-"assinatura do Tails. Bob confia completamente na chave de assinatura do "
-"Tails.\n"
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This scenario creates a trust path from you to Tails signing key that "
-#| "could allow you to trust it without having to depend on certificate "
-#| "authorities."
-msgid ""
-"In this scenario, Alice found a path to trust the Tails signing key without "
-"the need to rely on certificate authorities."
-msgstr ""
-"Este cenário cria um caminho de confiança de você até a chave de assinatura "
-"do Tails que pode te permitir confiar nela sem depender de autoridades "
-"certificadoras."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you are on Debian, Ubuntu, or Linux Mint, you can install the\n"
-"<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
-"all Debian developers. Some Debian developers have certified the Tails\n"
-"signing key and you can use these certifications to build a trust path.\n"
-"This technique is explained in detail in our instructions on\n"
-"[[installing Tails from Debian, Ubuntu, or Linux Mint using the command\n"
-"line|install/expert/usb]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This trust model is not perfect either and requires both caution and "
-#| "intelligent supervision by users. The technical details of creating, "
-#| "managing and trusting OpenPGP keys is outside of the scope of this "
-#| "document."
-msgid ""
-"Relying on the Web of Trust requires both caution and intelligent "
-"supervision by the users. The technical details are outside of the scope of "
-"this document."
-msgstr ""
-"Este modelo de confiança também não é perfeito e requer ambos cautela e "
-"supervisão inteligente por parte dos usuários. Os detalhes técnicos sobre a "
-"criação, gerenciamento e confiança em chaves GPG estão fora do escopo deste "
-"documento."
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Since the Web of Trust is actually based on human relationships and real-"
-#| "life interactions the best would be to start establishing contacts with "
-#| "people knowledgeable about OpenPGP, start using it yourself and build "
-#| "trust relationships in order to find your own trust path to Tails signing "
-#| "key."
-msgid ""
-"Since the Web of Trust is actually based on human relationships and real-"
-"life interactions, the best is to get in touch with people knowledgeable "
-"about OpenPGP and build trust relationships in order to find your own trust "
-"path to the Tails signing key."
-msgstr ""
-"Uma vez que a Rede de Confiança é de fato baseada em relações humanas e "
-"interações na vida real, o melhor é começar a estabelecer contatos com "
-"pessoas que tenham conhecimento sobre OpenPGP, começar a usá-lo você mesmo/a "
-"e construir relações de confiança para encontrar seu próprio caminho de "
-"confiança na chave de assinatura do Tails."
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "You could start by contacting a local [[!wikipedia Linux_User_Group desc="
-#| "\"%s\"]] or other Tails enthusiasts near you and exchange about their "
-#| "OpenPGP practices."
-msgid ""
-"For example, you can start by contacting a local [[!wikipedia "
-"Linux_User_Group]], [[an organization offering Tails training|support/"
-"learn]], or other Tails enthusiasts near you and exchange about their "
-"OpenPGP practices."
-msgstr ""
-"Você pode começar contatando um [[!wikipedia Linux_User_Group desc=\"Grupo "
-"de Usuários de Linux\" ou outros/as entusiastas do Tails próximos/as a você "
-"e trocando ideia sobre suas práticas com OpenPGP."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>After you built a trust path, you can certify the Tails signing key by\n"
-"signing it with your own key to get rid of some warnings during the\n"
-"verification process.</p>\n"
-msgstr ""
-
-#. type: Title #
-#, no-wrap
-msgid "Further reading on OpenPGP"
-msgstr "Mais leituras sobre o OpenPGP"
-
-#. type: Bullet: '- '
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr ""
-"[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], um software livre que "
-"implementa OpenPGP"
-
-#. type: Bullet: '- '
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr ""
-"[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]] (em inglês)"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], um tutorial "
-"sobre como assinar chaves de outras pessoas (em inglês)"
-
-#. type: Bullet: '- '
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: Explicação da rede de confiança do PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]] (em inglês)"
-
-#. type: Bullet: '- '
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: inspeção de certificado|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instruções para gerenciar confiança em chaves usando "
-"Gpg4win"
-
-#~ msgid "<!-- l10n placeholder for language-specific link -->"
-#~ msgstr "<!-- l10n placeholder for language-specific link -->"
-
-#~ msgid ""
-#~ "We also acknowledge that not everybody might be able to create good trust "
-#~ "path to Tails signing key since it based on a network of direct human "
-#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
-#~ msgstr ""
-#~ "Nós também reconhecemos que nem todos podem conseguir criar um bom "
-#~ "caminho de confiança até a chave de assinatura uma vez que isto está "
-#~ "baseado em uma rede de relações humanas diretas e conhecimento de "
-#~ "ferramentas tão complexas quanto OpenPGP."
-
-#~ msgid ""
-#~ "Note that since all Tails releases are signed with the same key, you will "
-#~ "not have to verify the key every time and the trust you might "
-#~ "progressively build in it will be built once and for all. Still, you will "
-#~ "have to check the ISO image every time you download a new one!"
-#~ msgstr ""
-#~ "Note que, como todos os lançamentos do Tails são assinadas com a mesma "
-#~ "chave, você não precisa verificar a chave toda vez. Além disso, a "
-#~ "confiança que você pode adquirir progressivamente nesta chave em algum "
-#~ "momento vai ser adquirida de uma vez por todas. Mesmo assim você tem que "
-#~ "verificar a imagem ISO toda vez que baixar uma nova!"
-
-#~ msgid ""
-#~ "If you want to be extra cautious and really authenticate Tails signing "
-#~ "key in a stronger way than what standard HTTPS offers you, you will need "
-#~ "to use the OpenPGP Web of Trust."
-#~ msgstr ""
-#~ "Se você quiser ser extra cuidadoso e realmente autenticar a chave de uma "
-#~ "forma mais forte que o HTTPS padrão te oferece, você vai precisar usar a "
-#~ "Rede de Confiança OpenPGP."
-
-#~ msgid ""
-#~ "We will present you three techniques from the easiest to the safest. "
-#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
-#~ "them according to your possibilities and technical skills."
-#~ msgstr ""
-#~ "Nós vamos apresentar agora três técnicas: desde a mais fácil até a mais "
-#~ "segura. Reforçamos que nenhuma delas é uma solução mágica e perfeita. "
-#~ "Sinta-se à vontade para explorá-las de acordo com suas possibilidades e "
-#~ "habilidades técnicas."
diff --git a/wiki/src/install/download_2.de.po b/wiki/src/install/download_2.de.po
deleted file mode 100644
index a005205..0000000
--- a/wiki/src/install/download_2.de.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-23 21:01+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
-"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
-"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
diff --git a/wiki/src/install/download_2.fa.po b/wiki/src/install/download_2.fa.po
deleted file mode 100644
index a005205..0000000
--- a/wiki/src/install/download_2.fa.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-23 21:01+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
-"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
-"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
diff --git a/wiki/src/install/download_2.fr.po b/wiki/src/install/download_2.fr.po
deleted file mode 100644
index a005205..0000000
--- a/wiki/src/install/download_2.fr.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-23 21:01+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
-"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
-"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
diff --git a/wiki/src/install/download_2.html b/wiki/src/install/download_2.html
deleted file mode 100644
index 40b6b35..0000000
--- a/wiki/src/install/download_2.html
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!meta title="Download and verify"]]
-
-[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/dave_2" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave_2"]]
-
-[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/download_2.it.po b/wiki/src/install/download_2.it.po
deleted file mode 100644
index a005205..0000000
--- a/wiki/src/install/download_2.it.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-23 21:01+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
-"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
-"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
diff --git a/wiki/src/install/download_2.pt.po b/wiki/src/install/download_2.pt.po
deleted file mode 100644
index a005205..0000000
--- a/wiki/src/install/download_2.pt.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-23 21:01+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
-"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
-"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
diff --git a/wiki/src/install/dvd-download.de.po b/wiki/src/install/dvd-download.de.po
new file mode 100644
index 0000000..3c530ba
--- /dev/null
+++ b/wiki/src/install/dvd-download.de.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/dvd-download.fa.po b/wiki/src/install/dvd-download.fa.po
new file mode 100644
index 0000000..3c530ba
--- /dev/null
+++ b/wiki/src/install/dvd-download.fa.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/dvd-download.fr.po b/wiki/src/install/dvd-download.fr.po
new file mode 100644
index 0000000..3c530ba
--- /dev/null
+++ b/wiki/src/install/dvd-download.fr.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/dvd-download.it.po b/wiki/src/install/dvd-download.it.po
new file mode 100644
index 0000000..3c530ba
--- /dev/null
+++ b/wiki/src/install/dvd-download.it.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/dvd-download.mdwn b/wiki/src/install/dvd-download.mdwn
new file mode 100644
index 0000000..0ae187f
--- /dev/null
+++ b/wiki/src/install/dvd-download.mdwn
@@ -0,0 +1,11 @@
+[[!meta title="Burning Tails on a DVD"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dvd" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/download"]]
+[[!meta link="https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl" rel="chrome-webstore-item"]]
+
+[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/dvd-download.pt.po b/wiki/src/install/dvd-download.pt.po
new file mode 100644
index 0000000..3c530ba
--- /dev/null
+++ b/wiki/src/install/dvd-download.pt.po
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:43+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"install/inc/js/download\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta link=\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
diff --git a/wiki/src/install/dvd.de.po b/wiki/src/install/dvd.de.po
index 3921237..067f60f 100644
--- a/wiki/src/install/dvd.de.po
+++ b/wiki/src/install/dvd.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2016-02-19 17:29+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -22,54 +22,11 @@ msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
msgstr "[[!meta title=\"Tails auf eine DVD brennen\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/download.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Burn a Tails DVD\n"
-msgstr "Tails auf eine DVD brennen\n"
-
-#. type: Plain text
-msgid ""
-"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or macOS, refer to the Ubuntu documentation:"
+#, fuzzy
+#| msgid ""
+#| "For detailed instructions on how to burn an ISO image on a DVD from "
+#| "Windows, Ubuntu, or macOS, refer to the Ubuntu documentation:"
+msgid "For detailed instructions, refer to the Ubuntu documentation:"
msgstr ""
"Für detailliertere Anweisungen, wie ein ISO-Image unter Windows, Ubuntu oder "
"macOS auf eine DVD gebrannt wird, schlagen Sie in der Dokumentation von "
@@ -94,3 +51,30 @@ msgid ""
"[Burning from macOS](https://help.ubuntu.com/community/"
"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr "[Von macOS aus brennen](https://wiki.ubuntuusers.de/Ubuntu-CD/)"
+
+#~ msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/download.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "Burn a Tails DVD\n"
+#~ msgstr "Tails auf eine DVD brennen\n"
diff --git a/wiki/src/install/dvd.fa.po b/wiki/src/install/dvd.fa.po
index a5374a6..eaa835a 100644
--- a/wiki/src/install/dvd.fa.po
+++ b/wiki/src/install/dvd.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,54 +22,7 @@ msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Burn a Tails DVD\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or macOS, refer to the Ubuntu documentation:"
+msgid "For detailed instructions, refer to the Ubuntu documentation:"
msgstr ""
#. type: Bullet: ' - '
diff --git a/wiki/src/install/dvd.fr.po b/wiki/src/install/dvd.fr.po
index c445a11..d3765f0 100644
--- a/wiki/src/install/dvd.fr.po
+++ b/wiki/src/install/dvd.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
-"PO-Revision-Date: 2017-06-25 10:16+0000\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"PO-Revision-Date: 2017-09-26 19:30+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -22,58 +22,14 @@ msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
msgstr "[[!meta title=\"Graver Tails sur un DVD\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/download.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Burn a Tails DVD\n"
-msgstr "Graver Tails sur un DVD\n"
-
-#. type: Plain text
-msgid ""
-"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or macOS, refer to the Ubuntu documentation:"
+#, fuzzy
+#| msgid ""
+#| "For detailed instructions on how to burn an ISO image on a DVD from "
+#| "Windows, Ubuntu, or macOS, refer to the Ubuntu documentation:"
+msgid "For detailed instructions, refer to the Ubuntu documentation:"
msgstr ""
"Pour des instructions détaillées sur comment graver une image ISO sur un DVD "
-"depuis Windows, Ubuntu ou macOS, se rapporter à la documentation d'Ubuntu-"
-"fr :"
+"depuis Windows, Ubuntu ou macOS, se reporter à la documentation d'Ubuntu-fr :"
#. type: Bullet: ' - '
msgid ""
@@ -98,3 +54,30 @@ msgid ""
msgstr ""
"[Graver depuis macOS](https://doc.ubuntu-fr.org/tutoriel/"
"graver_cd_ubuntu_depuis_mac_os)"
+
+#~ msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/download.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "Burn a Tails DVD\n"
+#~ msgstr "Graver Tails sur un DVD\n"
diff --git a/wiki/src/install/dvd.it.po b/wiki/src/install/dvd.it.po
index 868e871..6ec9bd7 100644
--- a/wiki/src/install/dvd.it.po
+++ b/wiki/src/install/dvd.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2016-07-17 14:41+0200\n"
"Last-Translator: transitails <transitails>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -22,54 +22,11 @@ msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
msgstr "[[!meta title=\"Masterizzare Tails su un DVD\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Burn a Tails DVD\n"
-msgstr "Crea un DVD con Tails\n"
-
-#. type: Plain text
-msgid ""
-"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or macOS, refer to the Ubuntu documentation:"
+#, fuzzy
+#| msgid ""
+#| "For detailed instructions on how to burn an ISO image on a DVD from "
+#| "Windows, Ubuntu, or macOS, refer to the Ubuntu documentation:"
+msgid "For detailed instructions, refer to the Ubuntu documentation:"
msgstr ""
"Per istruzioni dettagliate su come masterizzare una immagine ISO su un DVD "
"da Windows, o macOS, o Ubuntu, fai riferimento alla documentazione:"
@@ -97,3 +54,30 @@ msgid ""
msgstr ""
"[Masterizzare da macOS](http://wiki.ubuntu-it.org/Hardware/"
"DispositiviPartizioni/MasterizzareIso#Masterizzare_con_Mac_OS_X)"
+
+#~ msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "Burn a Tails DVD\n"
+#~ msgstr "Crea un DVD con Tails\n"
diff --git a/wiki/src/install/dvd.mdwn b/wiki/src/install/dvd.mdwn
index 4f05c23..96bcc42 100644
--- a/wiki/src/install/dvd.mdwn
+++ b/wiki/src/install/dvd.mdwn
@@ -1,21 +1,6 @@
[[!meta title="Burning Tails on a DVD"]]
-[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dvd" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
-
-[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
-
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
-Burn a Tails DVD
-================
-
-For detailed instructions on how to burn an ISO image on a DVD from Windows,
-Ubuntu, or macOS, refer to the Ubuntu documentation:
+For detailed instructions, refer to the Ubuntu documentation:
- [Burning from Windows](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Windows)
- [Burning from Ubuntu](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Ubuntu)
diff --git a/wiki/src/install/dvd.pt.po b/wiki/src/install/dvd.pt.po
index a5374a6..eaa835a 100644
--- a/wiki/src/install/dvd.pt.po
+++ b/wiki/src/install/dvd.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-22 14:33+0300\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,54 +22,7 @@ msgid "[[!meta title=\"Burning Tails on a DVD\"]]\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/dvd\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Burn a Tails DVD\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or macOS, refer to the Ubuntu documentation:"
+msgid "For detailed instructions, refer to the Ubuntu documentation:"
msgstr ""
#. type: Bullet: ' - '
diff --git a/wiki/src/install/expert/usb/overview.de.po b/wiki/src/install/expert/usb-overview.de.po
index 78b5449..d677743 100644
--- a/wiki/src/install/expert/usb/overview.de.po
+++ b/wiki/src/install/expert/usb-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-14 02:51+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -29,12 +29,13 @@ msgstr ""
#| "\">Back</span>|install/debian]]"
msgid ""
"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Installation von Debian oder Ubuntu aus unter Nutzung der "
"Kommandozeile und GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet"
@@ -45,21 +46,6 @@ msgstr ""
"installation-assistant.inline.de\" raw=\"yes\"]] [[<span class=\"back"
"\">Zurück</span>|install/debian]]"
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
@@ -68,6 +54,11 @@ msgstr "Los geht's!"
msgid "|install/expert/usb]]"
msgstr "|install/expert/usb]]"
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
+
#, fuzzy
#~| msgid "<small>Install from Debian or Ubuntu using the</small>"
#~ msgid "<small>Install from Debian, Ubuntu, or Mint using the</small>"
diff --git a/wiki/src/install/expert/usb-overview.fa.po b/wiki/src/install/expert/usb-overview.fa.po
new file mode 100644
index 0000000..8c288df
--- /dev/null
+++ b/wiki/src/install/expert/usb-overview.fa.po
@@ -0,0 +1,37 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: outside any tag (error?)
+msgid ""
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr ""
+
+#. type: Content of: outside any tag (error?)
+msgid "|install/expert/usb]]"
+msgstr ""
diff --git a/wiki/src/install/expert/usb-overview.fr.po b/wiki/src/install/expert/usb-overview.fr.po
new file mode 100644
index 0000000..c9b4cfc
--- /dev/null
+++ b/wiki/src/install/expert/usb-overview.fr.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
+"PO-Revision-Date: 2017-02-09 19:23+0100\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
+
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command "
+#| "line and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel="
+#| "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant"
+#| "\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+#| "overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+#| "stylesheets/expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+#| "\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+#| "\"]]"
+msgid ""
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
+msgstr ""
+"[[!meta title=\"Installer depuis Debian, Ubuntu ou Mint avec la ligne de "
+"commande et GnuPG : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age"
+"\"]]"
+
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr "Allons-y !"
+
+#. type: Content of: outside any tag (error?)
+msgid "|install/expert/usb]]"
+msgstr "|install/expert/usb]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Retour|install/debian]]"
+
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong> <small>using the command line and GnuPG</small>"
+#~ msgstr ""
+#~ "Installer depuis <strong>Debian</strong>, <strong>Ubuntu</strong> ou "
+#~ "<strong>Mint</strong> <small>avec la ligne de commande et GnuPG</small>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/expert/usb/overview.html b/wiki/src/install/expert/usb-overview.html
index e040957b..43c4f34 100644
--- a/wiki/src/install/expert/usb/overview.html
+++ b/wiki/src/install/expert/usb-overview.html
@@ -1,4 +1,4 @@
-[[!meta title="Install from Debian, Ubuntu, or Mint using the command line and GnuPG: overview"]]
+[[!meta title="Install from Debian, Ubuntu, or Mint using the command line and GnuPG"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
@@ -7,10 +7,6 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
-<div id="back">[[Back|install/debian]]</div>
-
-<h1 class="text-center">Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong> <small>using the command line and GnuPG</small></h1>
-
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
diff --git a/wiki/src/install/expert/usb/overview.it.po b/wiki/src/install/expert/usb-overview.it.po
index af31b43..c2db0e7 100644
--- a/wiki/src/install/expert/usb/overview.it.po
+++ b/wiki/src/install/expert/usb-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-17 15:20+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -29,12 +29,13 @@ msgstr ""
#| "class=\"back\">Back</span>|install/debian]]"
msgid ""
"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Installa da Devian o Ubuntu usando la riga di comando e GnuPG"
"\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!"
@@ -44,22 +45,6 @@ msgstr ""
"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-"<small>Installa da <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>usando la riga di comando e GnuPG</small>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
@@ -67,3 +52,15 @@ msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
msgid "|install/expert/usb]]"
msgstr "|install/expert/usb]]"
+
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong> <small>using the command line and GnuPG</small>"
+#~ msgstr ""
+#~ "<small>Installa da <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong>usando la riga di comando e GnuPG</small>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/expert/usb-overview.pt.po b/wiki/src/install/expert/usb-overview.pt.po
new file mode 100644
index 0000000..8c288df
--- /dev/null
+++ b/wiki/src/install/expert/usb-overview.pt.po
@@ -0,0 +1,37 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: outside any tag (error?)
+msgid ""
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr ""
+
+#. type: Content of: outside any tag (error?)
+msgid "|install/expert/usb]]"
+msgstr ""
diff --git a/wiki/src/install/expert/usb.de.po b/wiki/src/install/expert/usb.de.po
index 34dbaca..b1f3a11 100644
--- a/wiki/src/install/expert/usb.de.po
+++ b/wiki/src/install/expert/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 19:21+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -109,10 +109,16 @@ msgstr ""
"OpenPGP Keys</a> (engl.) von <em>Riseup</em> nach.</p>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This verification technique uses the OpenPGP Web of Trust and the "
+#| "certification made by official Debian developers on the Tails signing "
+#| "key. [[Learn more about the OpenPGP Web of Trust|install/download/"
+#| "openpgp#wot]]."
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
msgstr ""
"Diese Methode zur Verifizierung benutzt das OpenPGP Web of Trust und die von "
"offiziellen Debian-Entwicklern vorgenommenen Zertifizierungen über den "
diff --git a/wiki/src/install/expert/usb.fa.po b/wiki/src/install/expert/usb.fa.po
index c3eb3d1..a8fb485 100644
--- a/wiki/src/install/expert/usb.fa.po
+++ b/wiki/src/install/expert/usb.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -97,7 +97,7 @@ msgstr ""
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/expert/usb.fr.po b/wiki/src/install/expert/usb.fr.po
index d95353c..fe79cdd 100644
--- a/wiki/src/install/expert/usb.fr.po
+++ b/wiki/src/install/expert/usb.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
-"PO-Revision-Date: 2017-02-09 19:22+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
+"PO-Revision-Date: 2017-10-29 12:34+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -104,10 +104,16 @@ msgstr ""
"des clés OpenPGP</a> par <em>Riseup</em>.</p>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This verification technique uses the OpenPGP Web of Trust and the "
+#| "certification made by official Debian developers on the Tails signing "
+#| "key. [[Learn more about the OpenPGP Web of Trust|install/download/"
+#| "openpgp#wot]]."
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
msgstr ""
"Cette méthode de vérification utilise la toile de confiance OpenPGP et les "
"certifications faites par des développeurs Debian officiels à la clé de "
@@ -420,10 +426,9 @@ msgid " sudo apt install tails-installer\n"
msgstr " sudo apt install tails-installer\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/install_final_in_debian.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/expert/usb.it.po b/wiki/src/install/expert/usb.it.po
index e09d2b9..c51abe2 100644
--- a/wiki/src/install/expert/usb.it.po
+++ b/wiki/src/install/expert/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 19:22+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -104,10 +104,16 @@ msgstr ""
"OpenPGP Keys</a> di <em>Riseup</em>.</p>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This verification technique uses the OpenPGP Web of Trust and the "
+#| "certification made by official Debian developers on the Tails signing "
+#| "key. [[Learn more about the OpenPGP Web of Trust|install/download/"
+#| "openpgp#wot]]."
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
msgstr ""
"Questa tecnica di verifica usa la Web of Trust OpenPGP e la certificazione "
"fatta da sviluppatori Debian ufficiali sulla chiave di firma Tails. [[Impara "
diff --git a/wiki/src/install/expert/usb.mdwn b/wiki/src/install/expert/usb.mdwn
index 8ef1ef3..012d0a6 100644
--- a/wiki/src/install/expert/usb.mdwn
+++ b/wiki/src/install/expert/usb.mdwn
@@ -36,7 +36,7 @@ OpenPGP Keys</a> by <em>Riseup</em>.</p>
This verification technique uses the OpenPGP Web of Trust and the
certification made by official Debian developers on the Tails signing
key. [[Learn more about the OpenPGP Web of
-Trust|install/download/openpgp#wot]].
+Trust|install/download#openpgp]].
1. Import the Tails signing key in your <span class="application">GnuPG</span> keyring:
diff --git a/wiki/src/install/expert/usb.pt.po b/wiki/src/install/expert/usb.pt.po
index c3eb3d1..a8fb485 100644
--- a/wiki/src/install/expert/usb.pt.po
+++ b/wiki/src/install/expert/usb.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -97,7 +97,7 @@ msgstr ""
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download#openpgp]]."
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/expert/usb/overview.fa.po b/wiki/src/install/expert/usb/overview.fa.po
deleted file mode 100644
index ddc34fc..0000000
--- a/wiki/src/install/expert/usb/overview.fa.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/expert/usb]]"
-msgstr ""
diff --git a/wiki/src/install/expert/usb/overview.fr.po b/wiki/src/install/expert/usb/overview.fr.po
deleted file mode 100644
index 809fb73..0000000
--- a/wiki/src/install/expert/usb/overview.fr.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2017-02-09 19:23+0100\n"
-"Last-Translator: \n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis Debian, Ubuntu ou Mint avec la ligne de commande et GnuPG : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Retour|install/debian]]"
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-"Installer depuis <strong>Debian</strong>, <strong>Ubuntu</strong> ou "
-"<strong>Mint</strong> <small>avec la ligne de commande et GnuPG</small>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr "Allons-y !"
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/expert/usb]]"
-msgstr "|install/expert/usb]]"
diff --git a/wiki/src/install/expert/usb/overview.pt.po b/wiki/src/install/expert/usb/overview.pt.po
deleted file mode 100644
index ddc34fc..0000000
--- a/wiki/src/install/expert/usb/overview.pt.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "|install/expert/usb]]"
-msgstr ""
diff --git a/wiki/src/install/inc/icons/check.png b/wiki/src/install/inc/icons/check.png
index 7583289..0ec124a 100644
--- a/wiki/src/install/inc/icons/check.png
+++ b/wiki/src/install/inc/icons/check.png
Binary files differ
diff --git a/wiki/src/install/inc/icons/dialog-warning-small.png b/wiki/src/install/inc/icons/dialog-warning-small.png
new file mode 100644
index 0000000..8f53491
--- /dev/null
+++ b/wiki/src/install/inc/icons/dialog-warning-small.png
Binary files differ
diff --git a/wiki/src/install/inc/icons/failed.png b/wiki/src/install/inc/icons/failed.png
index c1999e4..290cff1 100644
--- a/wiki/src/install/inc/icons/failed.png
+++ b/wiki/src/install/inc/icons/failed.png
Binary files differ
diff --git a/wiki/src/install/inc/icons/pause.png b/wiki/src/install/inc/icons/pause.png
deleted file mode 100644
index 97bb802..0000000
--- a/wiki/src/install/inc/icons/pause.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/icons/play.png b/wiki/src/install/inc/icons/play.png
deleted file mode 100644
index 5850881..0000000
--- a/wiki/src/install/inc/icons/play.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/js/dave.js b/wiki/src/install/inc/js/dave.js
deleted file mode 100644
index f1fbc4e..0000000
--- a/wiki/src/install/inc/js/dave.js
+++ /dev/null
@@ -1,59 +0,0 @@
-(function() {
- var chromeSupported = false;
- var minVer = {
- "firefox": 38,
- "chrome": 44,
- "tor": 5
- };
-
- function setBrowser(browser) {
- document.documentElement.dataset.browser = browser ? "sb-" + browser : "unsupported";
- }
- function forId(id, cb) {
- var el = document.getElementById(id);
- if (el) cb(el);
- }
- var forClass = document.getElementsByClassName ? function(cn, cb) {
- var ee = document.getElementsByClassName(cn);
- for (var j = ee.length; j-- > 0;) cb(ee[j]);
- } : function () {};
-
- var browser,
- v = navigator.userAgent.match(/\b(Chrome|Firefox)\/(\d+)/)
- ;
- v = v && parseInt(v[2]) || 0;
- var override = location.search.match(/\boverride=(\w+)/);
- if (override) {
- browser = override[1];
- } else if (window.InstallTrigger) {
- if (v >= minVer.firefox || minVer.firefox === 38 && new RegExp("").source) // see Fx 38 RegExp @ https://developer.mozilla.org/it/Firefox/Releases/38
- browser = "firefox";
- else {
- addEventListener("DOMContentLoaded", function() {
- forId("unsupported-other", function(el) { el.style.display = "none"; });
- if (!v) v = "< 38";
- forClass("current-firefox", function(el) { el.innerHTML = v || "< 38"; });
- }, true);
- }
- } else {
- addEventListener("DOMContentLoaded", function() { forId("unsupported-firefox", function(el) { el.style.display = "none"; }); }, true);
- if (chromeSupported &&
- /\bChrom/.test(navigator.userAgent) && /\bGoogle Inc\./.test(navigator.vendor) &&
- v >= minVer.chrome) {
- browser = "chrome";
- }
- }
- setBrowser(browser);
- var style = document.createElement("style");
- style.innerHTML = "#download-and-verify { display: none !important } #dave-init { display: block }";
- document.documentElement.firstChild.appendChild(style);
-
- addEventListener("load", function(ev) {
- style.innerHTML = "#dave-init { display: none }";
- forId("self-url", function (el) { el.textContent = location.href; });
- for (var browser in minVer) {
- forClass("minver-" + browser, function(el) { el.innerHTML = minVer[browser]; });
- }
- }, true);
-
-})();
diff --git a/wiki/src/install/inc/js/dave_2.js b/wiki/src/install/inc/js/dave_2.js
deleted file mode 100644
index efc8373..0000000
--- a/wiki/src/install/inc/js/dave_2.js
+++ /dev/null
@@ -1,192 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-
- function showFloatingToggleableLinks() {
- var links = document.getElementsByClassName('floating-toggleable-link');
- for (let i = 0; i < links.length; i++) {
- links[i].style.display = 'block';
- }
- }
- showFloatingToggleableLinks();
-
- function opaque(elm) {
- elm.style.opacity = '1.0';
- var siblings = elm.querySelectorAll('a');
- for (let i = 0; i < siblings.length; i++) {
- siblings[i].style.pointerEvents = 'auto';
- }
- }
-
- function transparent(elm) {
- elm.style.opacity = '0.3';
- var siblings = elm.querySelectorAll('a');
- for (let i = 0; i < siblings.length; i++) {
- siblings[i].style.pointerEvents = 'none';
- }
- }
-
- function toggleOpacity(elm, mode) {
- for(var i = 0; i < elm.length; i++) {
- if(mode == 'opaque') {
- opaque(elm[i]);
- } else {
- transparent(elm[i]);
- }
- }
- }
-
- function hide(elm) {
- elm.style.display = 'none';
- }
-
- function show(elm) {
- elm.style.display = 'initial';
- if(elm.classList.contains('block')) {
- elm.style.display = 'block';
- }
- if(elm.classList.contains('inline-block')) {
- elm.style.display = 'inline-block';
- }
- }
-
- function toggleDisplay(elm, mode) {
- for(var i = 0; i < elm.length; i++) {
- if(mode == 'hide') {
- hide(elm[i]);
- } else {
- show(elm[i]);
- }
- }
- }
-
- function detectBrowser() {
- // XXX: This should be set by the browser detection script
- var vendor = 'firefox';
- if(vendor == 'firefox') {
- showVersionForSupportedBrowser();
- toggleDisplay(document.getElementsByClassName('chrome'), 'hide');
- toggleDisplay(document.getElementsByClassName('firefox'), 'show');
- }
- if(vendor == 'chrome') {
- showVersionForSupportedBrowser();
- toggleDisplay(document.getElementsByClassName('firefox'), 'hide');
- toggleDisplay(document.getElementsByClassName('chrome'), 'show');
- }
- }
-
- function showVersionForSupportedBrowser() {
- toggleDisplay(document.getElementsByClassName('no-js'), 'hide');
- toggleDisplay(document.getElementsByClassName('supported-browser'), 'show');
- toggleDirectBitTorrent('direct');
- }
-
- function toggleContinueLink(method, state) {
- if(method == 'direct') {
- hide(document.getElementById('skip-download-direct'));
- hide(document.getElementById('skip-verification-direct'));
- hide(document.getElementById('next-direct'));
- show(document.getElementById(state));
- }
- if(method == 'bittorrent') {
- hide(document.getElementById('skip-download-bittorrent'));
- hide(document.getElementById('next-bittorrent'));
- show(document.getElementById(state));
- }
- }
-
- function showUpdateExtension() {
- hide(document.getElementById('install-extension'));
- hide(document.getElementById('extension-installed'));
- show(document.getElementById('update-extension'));
- show(document.getElementById('extension-updated'));
- }
-
- function resetVerificationResult(result) {
- hide(document.getElementById('verifying-download'));
- hide(document.getElementById('verification-successful'));
- hide(document.getElementById('verification-failed'));
- hide(document.getElementById('verification-failed-again'));
- toggleContinueLink('direct', 'skip-verification-direct');
- }
-
- function showVerifyingDownload() {
- hide(document.getElementById('verify-download'));
- show(document.getElementById('verifying-download'));
- }
-
- function showVerificationResult(result) {
- hide(document.getElementById('verify-download'));
- resetVerificationResult();
- if(result == 'successful') {
- show(document.getElementById('verification-successful'));
- opaque(document.getElementById('step-continue-direct'));
- toggleContinueLink('direct', 'next-direct');
- }
- if(result == 'failed') {
- show(document.getElementById('verification-failed'));
- }
- if(result == 'failed-again') {
- show(document.getElementById('verification-failed-again'));
- }
- }
-
- function toggleDirectBitTorrent(method) {
- transparent(document.getElementById('step-verify-direct'));
- transparent(document.getElementById('step-continue-direct'));
- transparent(document.getElementById('continue-link-direct'));
- transparent(document.getElementById('step-verify-bittorrent'));
- transparent(document.getElementById('step-continue-bittorrent'));
- transparent(document.getElementById('continue-link-bittorrent'));
- if(method == 'direct') {
- opaque(document.getElementById('step-verify-direct'));
- opaque(document.getElementById('continue-link-direct'));
- show(document.getElementById('verify-download'));
- }
- if(method == 'bittorrent') {
- opaque(document.getElementById('step-verify-bittorrent'));
- opaque(document.getElementById('step-continue-bittorrent'));
- opaque(document.getElementById('continue-link-bittorrent'));
- toggleContinueLink('bittorrent', 'next-bittorrent');
- }
- }
-
- detectBrowser();
- toggleDirectBitTorrent('none');
- toggleContinueLink('direct', 'skip-download-direct');
- toggleContinueLink('bittorrent', 'skip-download-bittorrent');
- opaque(document.getElementById('continue-link-direct'));
- opaque(document.getElementById('continue-link-bittorrent'));
-
- // Display "Verify with your browser" when ISO image is clicked
- document.getElementById('download-iso').onclick = function() {
- toggleDirectBitTorrent('direct');
- resetVerificationResult();
- }
-
- // Display "Verify with BitTorrent" when Torrent file is clicked
- document.getElementById('download-torrent').onclick = function() {
- toggleDirectBitTorrent('bittorrent');
- }
-
- // Display "Update extension" instead of "Install extension"
- // XXX: This should be done by the extension instead
- showUpdateExtension();
-
- // Display "Verify download" when "Install extension" or "Update extension" is clicked
- // XXX: This should be done by the extension instead
- var buttons = document.getElementsByClassName('install-extension-btn');
- for (let i = 0; i < buttons.length; i++) {
- buttons[i].addEventListener('click', function() {
- hide(document.getElementById('install-extension'));
- hide(document.getElementById('update-extension'));
- show(document.getElementById('verification'));
- });
- }
-
- // Display "Verification successful" when "Verify download" is clicked
- // XXX: This should be done by the extension instead
- document.getElementById('verify-download').onclick = function() {
- showVerifyingDownload();
- setTimeout(function(){showVerificationResult('successful')}, 1500);
- }
-
-});
diff --git a/wiki/src/install/inc/js/download.js b/wiki/src/install/inc/js/download.js
new file mode 100644
index 0000000..7c5e707
--- /dev/null
+++ b/wiki/src/install/inc/js/download.js
@@ -0,0 +1,296 @@
+document.addEventListener("DOMContentLoaded", function() {
+
+ window.addEventListener("message", receiveMessage);
+
+ function receiveMessage(event) {
+ if (event.source !== window || event.origin !== "https://tails.boum.org" || !event.data) {
+ return;
+ }
+ if (event.data.action === "verifying") {
+ showVerifyingDownload(event.data.fileName);
+ }
+ else if (event.data.action === "verification-failed") {
+ showVerificationResult("failed");
+ }
+ else if (event.data.action === "verification-failed-again") {
+ showVerificationResult("failed-again");
+ }
+ else if (event.data.action === "verification-success") {
+ showVerificationResult("successful");
+ }
+ else if (event.data.action === "progress") {
+ showVerificationProgress(event.data.percentage);
+ }
+ else if (event.data.action === "extension-installed") {
+ if (document.documentElement.dataset.extension === "up-to-date") {
+ showVerifyDownload();
+ }
+ else if (document.documentElement.dataset.extension === "outdated") {
+ showUpdateExtension();
+ }
+ }
+ }
+
+ // Display floating-toggleable-links to prevent people without JS to
+ // either always see the toggles or have broken toggle links.
+ function showFloatingToggleableLinks() {
+ var links = document.getElementsByClassName("floating-toggleable-link");
+ for (let i = 0; i < links.length; i++) {
+ show(links[i]);
+ }
+ }
+ showFloatingToggleableLinks();
+
+ function opaque(elm) {
+ elm.classList.remove('transparent');
+ var siblings = elm.querySelectorAll("a");
+ for (let i = 0; i < siblings.length; i++) {
+ siblings[i].style.pointerEvents = "auto";
+ }
+ }
+
+ function transparent(elm) {
+ elm.classList.add('transparent');
+ var siblings = elm.querySelectorAll("a");
+ for (let i = 0; i < siblings.length; i++) {
+ siblings[i].style.pointerEvents = "none";
+ }
+ }
+
+ function toggleOpacity(elm, mode) {
+ for (let i = 0; i < elm.length; i++) {
+ if (mode == "opaque") {
+ opaque(elm[i]);
+ } else {
+ transparent(elm[i]);
+ }
+ }
+ }
+
+ function hide(elm) {
+ elm.style.display = "none";
+ }
+
+ function show(elm) {
+ elm.style.display = "initial";
+ if (elm.classList.contains("block")) {
+ elm.style.display = "block";
+ }
+ if (elm.classList.contains("inline-block")) {
+ elm.style.display = "inline-block";
+ }
+ }
+
+ function toggleDisplay(elm, mode) {
+ for (let i = 0; i < elm.length; i++) {
+ if (mode == "hide") {
+ hide(elm[i]);
+ } else {
+ show(elm[i]);
+ }
+ }
+ }
+
+ function detectBrowser() {
+ /* To list the APIs that our extension is using, execute: git grep "chrome."
+ Browser compatibility:
+
+ - https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Browser_support_for_JavaScript_APIs
+ - https://developer.chrome.com/extensions/api_index
+ */
+ minVersion = {
+ "firefox": 45, // First release with chrome.runtime.getManifest
+ "chrome": 22, // First release with chrome.runtime.getManifest
+ "torbrowser": 6 // First release based on Firefox 45
+ };
+ document.getElementById("min-version-firefox").textContent = minVersion.firefox.toString();
+ document.getElementById("min-version-chrome").textContent = minVersion.chrome.toString();
+ document.getElementById("min-version-tor-browser").textContent = minVersion.torbrowser.toString();
+
+ version = navigator.userAgent.match(/\b(Chrome|Firefox)\/(\d+)/);
+ version = version && parseInt(version[2]) || 0;
+ overrideVersion = location.search.match(/\bversion=(\w+)/);
+ if (overrideVersion) {
+ version = overrideVersion[1];
+ }
+
+ overrideBrowser = location.search.match(/\bbrowser=(\w+)/);
+ if (overrideBrowser) {
+ browser = overrideBrowser[1];
+ } else if (window.InstallTrigger) {
+ browser = "Firefox";
+ } else if ((/\bChrom/).test(navigator.userAgent) && (/\bGoogle Inc\./).test(navigator.vendor)) {
+ browser = "Chrome";
+ }
+
+ if (browser === "Firefox" || browser === "Chrome") {
+ document.getElementById("detected-browser").textContent = browser + " " + version.toString();
+ } else {
+ // Don't bother displaying version number for unsupported browsers as it's probably more error prone.
+ document.getElementById("detected-browser").textContent = browser;
+ }
+
+ toggleDisplay(document.getElementsByClassName("no-js"), "hide");
+ if (browser === "Firefox") {
+ if (version >= minVersion.firefox) {
+ // Supported Firefox
+ toggleDisplay(document.getElementsByClassName("supported-browser"), "show");
+ toggleDisplay(document.getElementsByClassName("chrome"), "hide");
+ toggleDisplay(document.getElementsByClassName("firefox"), "show");
+ } else {
+ // Outdated Firefox
+ toggleDisplay(document.getElementsByClassName("outdated-browser"), "show");
+ }
+ } else if (browser === "Chrome") {
+ if (version >= minVersion.chrome) {
+ // Supported Chrome
+ toggleDisplay(document.getElementsByClassName("supported-browser"), "show");
+ toggleDisplay(document.getElementsByClassName("firefox"), "hide");
+ toggleDisplay(document.getElementsByClassName("chrome"), "show");
+ } else {
+ // Outdated Chrome
+ toggleDisplay(document.getElementsByClassName("outdated-browser"), "show");
+ }
+ } else {
+ toggleDisplay(document.getElementsByClassName("unsupported-browser"), "show");
+ }
+ }
+
+ function toggleContinueLink(method, state) {
+ if (method == "direct") {
+ hide(document.getElementById("skip-download-direct"));
+ hide(document.getElementById("skip-verification-direct"));
+ hide(document.getElementById("next-direct"));
+ show(document.getElementById(state));
+ }
+ if(method == "bittorrent") {
+ hide(document.getElementById("skip-download-bittorrent"));
+ hide(document.getElementById("next-bittorrent"));
+ show(document.getElementById(state));
+ }
+ }
+
+ function resetVerificationResult(result) {
+ hide(document.getElementById("verifying-download"));
+ hide(document.getElementById("verification-successful"));
+ hide(document.getElementById("verification-failed"));
+ hide(document.getElementById("verification-failed-again"));
+ toggleContinueLink("direct", "skip-verification-direct");
+ }
+
+ function showUpdateExtension() {
+ hide(document.getElementById("verification"));
+ hide(document.getElementById("install-extension"));
+ show(document.getElementById("update-extension"));
+ }
+
+ function showVerifyDownload() {
+ hide(document.getElementById("install-extension"));
+ hide(document.getElementById("update-extension"));
+ show(document.getElementById("verification"));
+ }
+
+ function showVerifyingDownload(filename) {
+ hide(document.getElementById("verify-download-wrapper"));
+ if (filename) {
+ document.getElementById("filename").textContent = filename;
+ }
+ show(document.getElementById("verifying-download"));
+ }
+
+ function showVerificationProgress(percentage) {
+ showVerifyingDownload();
+ document.getElementById("progress-bar").style.width = percentage + "%";
+ document.getElementById("progress-bar").setAttribute("aria-valuenow", percentage.toString());
+ }
+
+ function showVerificationResult(result) {
+ toggleDirectBitTorrent("direct");
+ showVerifyDownload();
+ hide(document.getElementById("verify-download-wrapper"));
+ resetVerificationResult();
+ if (result === "successful") {
+ show(document.getElementById("verification-successful"));
+ opaque(document.getElementById("step-continue-direct"));
+ toggleContinueLink("direct", "next-direct");
+ }
+ else if (result === "failed") {
+ show(document.getElementById("verification-failed"));
+ replaceUrlPrefixWithRandomMirror(document.querySelectorAll(".use-mirror-pool")); // Try again with different mirrors
+ }
+ else if (result === "failed-again") {
+ show(document.getElementById("verification-failed-again"));
+ replaceUrlPrefixWithRandomMirror(document.querySelectorAll(".use-mirror-pool")); // Change mirrors in case people try again anyway
+ }
+ }
+
+ function toggleDirectBitTorrent(method) {
+ transparent(document.getElementById("step-verify-direct"));
+ transparent(document.getElementById("step-continue-direct"));
+ transparent(document.getElementById("continue-link-direct"));
+ transparent(document.getElementById("step-verify-bittorrent"));
+ transparent(document.getElementById("step-continue-bittorrent"));
+ transparent(document.getElementById("continue-link-bittorrent"));
+ if (method == "direct") {
+ opaque(document.getElementById("step-verify-direct"));
+ opaque(document.getElementById("continue-link-direct"));
+ show(document.getElementById("verify-download-wrapper"));
+ }
+ if (method == "bittorrent") {
+ opaque(document.getElementById("step-verify-bittorrent"));
+ opaque(document.getElementById("step-continue-bittorrent"));
+ opaque(document.getElementById("continue-link-bittorrent"));
+ toggleContinueLink("bittorrent", "next-bittorrent");
+ }
+ }
+
+ // Reset the page to its initial state:
+ // - Detect the browser version and display the relevant variant
+ detectBrowser();
+ // - Show the download steps of both direct and BitTorrent downloads
+ toggleDirectBitTorrent("none");
+ // - Display 'Skip download' as continue link
+ toggleContinueLink("direct", "skip-download-direct");
+ toggleContinueLink("bittorrent", "skip-download-bittorrent");
+ opaque(document.getElementById("continue-link-direct"));
+ opaque(document.getElementById("continue-link-bittorrent"));
+
+ // Display "Verify with your browser" when ISO image is clicked
+ document.getElementById("download-iso").onclick = function() {
+ toggleDirectBitTorrent("direct");
+ resetVerificationResult();
+ }
+
+ // Display "Verify with your browser" when "I already" is clicked
+ document.getElementById("already-downloaded").onclick = function() {
+ toggleDirectBitTorrent("direct");
+ resetVerificationResult();
+ }
+
+ // Reset verification when downloading again after failure
+ document.getElementById("download-iso-again").onclick = function() {
+ toggleDirectBitTorrent("direct");
+ resetVerificationResult();
+ }
+
+ // Display "Verify with BitTorrent" when Torrent file is clicked
+ document.getElementById("download-torrent").onclick = function() {
+ toggleDirectBitTorrent("bittorrent");
+ }
+
+ // Install Chrome extension when clicking "chrome" links
+ // See https://developer.chrome.com/webstore/inline_installation
+ var chromeInstallationLinks = document.getElementsByClassName("chrome");
+ for (let i = 0; i < chromeInstallationLinks.length; i++) {
+ chromeInstallationLinks[i].onclick = function() {
+ chrome.webstore.install();
+ }
+ }
+
+ // To debug the display of the different states:
+ // showVerificationResult("successful");
+ // showVerificationResult("failed");
+ // showVerificationResult("failed-again");
+ // showVerificationProgress('50');
+
+});
diff --git a/wiki/src/install/inc/screenshots/allow_js.png b/wiki/src/install/inc/screenshots/allow_js.png
new file mode 100644
index 0000000..55a1d6b
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/allow_js.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/notification_in_tails.png b/wiki/src/install/inc/screenshots/notification_in_tails.png
index 9c699a2..5c0b291 100644
--- a/wiki/src/install/inc/screenshots/notification_in_tails.png
+++ b/wiki/src/install/inc/screenshots/notification_in_tails.png
Binary files differ
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.de.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.de.po
deleted file mode 100644
index b49bfab..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.de.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-04-29 15:20+0000\n"
-"PO-Revision-Date: 2016-06-12 17:23-0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr ""
-"Ihr BitTorrent-Client verifiziert automatisch Ihren Download anhand der in "
-"der Torrent-Datei enthaltenen kryptographischen Prüfsumme."
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the OpenPGP signature included in the Torrent file. [[Learn how to do "
-"this.|install/download/openpgp]]"
-msgstr ""
-"Wenn Sie sich mit OpenPGP auskennen, können Sie mithilfe der in der Torrent-"
-"Datei enthaltenen OpenPGP-Signatur eine zusätzliche Verifizierung "
-"durchführen. [[Lernen Sie, wie so etwas gemacht wird.|install/download/"
-"openpgp]]"
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po
deleted file mode 100644
index cbfe8bc..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-04-29 15:20+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the OpenPGP signature included in the Torrent file. [[Learn how to do "
-"this.|install/download/openpgp]]"
-msgstr ""
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po
deleted file mode 100644
index c25ea81..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-02-24 23:12+0100\n"
-"PO-Revision-Date: 2017-03-31 07:19+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr "Votre client BitTorrent vérifie automatiquement ce que vous téléchargez en se basant sur une somme de contrôle cryptographique dans le fichier Torrent."
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification using the OpenPGP signature included in the Torrent file. [[Learn how to do this.|"
-"install/download/openpgp]]"
-msgstr ""
-"Si vous avez l'habitude d'OpenPGP, vous pouvez également vérifier la signature OpenPGP inclue dans le fichier Torrent. [[Apprendre comment faire.|install/"
-"download/openpgp]]"
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.html b/wiki/src/install/inc/steps/bittorrent_verification.inline.html
deleted file mode 100644
index f7df64e..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>Your BitTorrent client verifies your download automatically based on a
-cryptographic checksum in the Torrent file.</p>
-
-<p class="openpgp">If you are knowledgeable about OpenPGP, you can do
-additional verification using the OpenPGP signature included in the
-Torrent file. [[Learn how to do this.|install/download/openpgp]]</p>
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.it.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.it.po
deleted file mode 100644
index 9267819..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.it.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: trasitails\n"
-"POT-Creation-Date: 2016-05-17 09:40+0200\n"
-"PO-Revision-Date: 2016-06-30 19:59-0000\n"
-"Last-Translator: anoni\n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr ""
-"Il tuo software BitTorrent (client) automaticamente analizza il file che hai "
-"scaricato, sulla base di un checksum cifrato situato nel file Torrent."
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the OpenPGP signature included in the Torrent file. [[Learn how to do "
-"this.|install/download/openpgp]]"
-msgstr ""
-"Se conosci OpenPGP, puoi avere una verifica addizionale usando la firma "
-"della chiave OpenPGP inclusa nel file Torrent. [[Vedi come si fa.|install/"
-"download/openpgp]]"
diff --git a/wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po b/wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po
deleted file mode 100644
index 115a07b..0000000
--- a/wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2016-02-24 23:12+0100\n"
-"PO-Revision-Date: 2016-04-30 12:05-0300\n"
-"Last-Translator: Tails Developers <amnesia@boum.org>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Content of: <p>
-msgid ""
-"Your BitTorrent client verifies your download automatically based on a "
-"cryptographic checksum in the Torrent file."
-msgstr ""
-"Seu cliente de BitTorrent automaticamente verifica o download baseado em uma "
-"soma de verificação criptográfica incluída no arquivo Torrent."
-
-#. type: Content of: <p>
-msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the OpenPGP signature included in the Torrent file. [[Learn how to do "
-"this.|install/download/openpgp]]"
-msgstr ""
-"Se você tem conhecimento sobre OpenPGP, você pode fazer uma verificação "
-"adicional usando a assinatura OpenPGP incluída no arquivo Torrent. [[Aprenda "
-"como fazer isto|doc/get/verify]]."
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.de.po b/wiki/src/install/inc/steps/create_persistence.inline.de.po
index b1c14ed..4f36bfe 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.de.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.de.po
@@ -369,9 +369,9 @@ msgstr " <div class=\"col-md-6\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid " [[!img lib/admon-caution.png link=\"no\"]]\n"
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
-msgstr " [[!img lib/admon-caution.png link=\"no\"]]\n"
+#| msgid " [[!img lib/dialog-warning.png link=\"no\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgstr " [[!img lib/dialog-warning.png link=\"no\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.fa.po b/wiki/src/install/inc/steps/create_persistence.inline.fa.po
index 527d8f0..e6aeceb 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fa.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fa.po
@@ -283,7 +283,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.fr.po b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
index 8b67034..42daed7 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fr.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2017-05-19 17:19+0200\n"
-"PO-Revision-Date: 2017-06-05 13:52-0000\n"
+"PO-Revision-Date: 2017-09-26 19:29+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -352,8 +352,8 @@ msgstr " <div class=\"col-md-6\">\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
-msgstr " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgstr " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
#. type: Plain text
#, no-wrap
@@ -381,7 +381,7 @@ msgid ""
" error</span> launcher on the Tails desktop or visit our [[support\n"
" pages|support]].</p>\n"
msgstr ""
-" <p>Si vous rencontrez des problèmes, lancez l'outil <span class=\"guilabel\">Rapporter\n"
+" <p>Si vous rencontrez des problèmes, lancez l'outil <span class=\"guilabel\">Signaler\n"
" une erreur</span> qui se trouve sur le bureau de Tails ou visitez nos [[pages\n"
" de support|support]].</p>\n"
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.it.po b/wiki/src/install/inc/steps/create_persistence.inline.it.po
index f0651c8..64f3a14 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.it.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.it.po
@@ -353,7 +353,7 @@ msgstr " <div class=\"col-md-6\">\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.mdwn b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
index ef07ce6..298132f 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.mdwn
+++ b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
@@ -139,7 +139,7 @@ Restart and activate the persistent storage
<div class="col-md-6">
- [[!img lib/admon-caution.png link="no" alt="" class="float-left"]]
+ [[!img lib/dialog-warning.png link="no" alt="" class="float-left"]]
<p>Tails does not protect you from everything! Have a look at our
[[warnings|doc/about/warning]].</p>
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.pt.po b/wiki/src/install/inc/steps/create_persistence.inline.pt.po
index b179ad2..b3e0a91 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.pt.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.pt.po
@@ -370,9 +370,9 @@ msgstr " <div class=\"col-md-6\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid " [[!img lib/admon-caution.png link=\"no\"]]\n"
-msgid " [[!img lib/admon-caution.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
-msgstr " [[!img lib/admon-caution.png link=\"no\"]]\n"
+#| msgid " [[!img lib/dialog-warning.png link=\"no\"]]\n"
+msgid " [[!img lib/dialog-warning.png link=\"no\" alt=\"\" class=\"float-left\"]]\n"
+msgstr " [[!img lib/dialog-warning.png link=\"no\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.de.po b/wiki/src/install/inc/steps/debian_requirements.inline.de.po
index 607db5b..b7a90bb 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.de.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2016-07-12 18:42+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
#. type: Plain text
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.fa.po b/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
index de52bad..0a19b24 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
#. type: Plain text
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.fr.po b/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
index 3b997ee..5a5cef1 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
-"PO-Revision-Date: 2016-11-26 14:18-0000\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"PO-Revision-Date: 2017-09-26 19:30+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
msgid "These instructions require:"
@@ -33,9 +33,15 @@ msgid "Linux Mint 18 (Sarah) or later"
msgstr "Linux Mint 18 (Sarah) ou plus récent"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If your version of Debian, Ubuntu, or Linux Mint is not supported, you "
+#| "can follow the instructions for [[other Linux distributions|install/linux/"
+#| "usb/overview]] instead. But they are more complicated and require two USB "
+#| "sticks instead of one."
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
@@ -59,7 +65,7 @@ msgid ""
msgstr ""
"<p>Pour connaître votre version de Debian ou Ubuntu, ouvrez\n"
"<span class=\"application\">Paramètres</span> et cliquez sur\n"
-"<span class=\"guilabel\">Détails</span>. Pour Debian, se rapporter à\n"
+"<span class=\"guilabel\">Détails</span>. Pour Debian, se reporter à\n"
"l'information <span class=\"guilabel\">Distribution</span>.</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.it.po b/wiki/src/install/inc/steps/debian_requirements.inline.it.po
index 301d3a4..fda4612 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.it.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
#. type: Plain text
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.mdwn b/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
index 1b1b919..c2f86da 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
@@ -5,7 +5,7 @@ These instructions require:
- Linux Mint 18 (Sarah) or later
If your version of Debian, Ubuntu, or Linux Mint is not supported, you can follow the
-instructions for [[other Linux distributions|install/linux/usb/overview]]
+instructions for [[other Linux distributions|install/linux/usb-overview]]
instead. But they are more complicated and require two USB sticks instead of
one.
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.pt.po b/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
index d91b841..7f496c9 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2017-05-26 12:49+0200\n"
+"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2016-07-12 18:42+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -43,7 +43,7 @@ msgstr ""
#| "of one."
msgid ""
"If your version of Debian, Ubuntu, or Linux Mint is not supported, you can "
-"follow the instructions for [[other Linux distributions|install/linux/usb/"
+"follow the instructions for [[other Linux distributions|install/linux/usb-"
"overview]] instead. But they are more complicated and require two USB sticks "
"instead of one."
msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.de.po b/wiki/src/install/inc/steps/download.inline.de.po
index fbff786..243db96 100644
--- a/wiki/src/install/inc/steps/download.inline.de.po
+++ b/wiki/src/install/inc/steps/download.inline.de.po
@@ -3,11 +3,10 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-12-03 16:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,388 +15,1276 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. type: Content of: <div>
+msgid "0.95"
+msgstr ""
+
#. type: Content of: <h1>
-msgid "Download and verify the Tails ISO image"
+msgid ""
+"Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
-#. type: Content of: <div>
+#. type: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
+"</a>"
+msgstr ""
+"Laden Sie das <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]] ISO-Image herunter</a> (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)."
+
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
+"<a>I already downloaded Tails <span class=\"remove-extra-space\">&nbsp;[[!"
+"inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span>."
+"</a>"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
-"this step you</span> <span class=\"download-only\">You</span> will download "
-"Tails as an ISO image: a single file containing the whole operating system. "
-"For your security, it is very important to also verify your download. We "
-"propose you two techniques to do this verification automatically."
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div>
-msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><p>
-msgid "Please wait…"
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
msgstr ""
-#. type: Content of: <div><div>
-msgid "0.2.8"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"We failed to detect your browser vendor, maybe because JavaScript is "
-"disabled."
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You can download and verify the ISO image via:"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "With an unverified download, you might:"
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Browser add-on"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Lose time if your download is incomplete or broken due to an error during "
+"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
-"for <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+</a> or <a href=\"https://www.torproject.org/download/"
-"download-easy.html.en\">Tor Browser <span class=\"minver-tor\">5</span>+</a>"
+"Get hacked while using Tails if our download mirrors have been compromised "
+"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "A Firefox add-on to download and verify Tails automatically."
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are not in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if your download is modified on the fly by an "
+"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "Copy and paste this link in Firefox or Tor Browser:"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/</"
-"code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/install/"
-"mac/usb/</code></span> <span class=\"mac-dvd\"><code>https://tails.boum.org/"
-"install/mac/dvd/</code></span> <span class=\"debian\"><code>https://tails."
-"boum.org/install/debian/usb/</code></span> <span class=\"linux"
-"\"><code>https://tails.boum.org/install/linux/usb/</code></span> <span class="
-"\"upgrade-tails\"><code>https://tails.boum.org/upgrade/tails/</code></span> "
-"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/</code></span> "
-"<span class=\"vm\"><code>https://tails.boum.org/install/vm/</code></span> "
-"<span class=\"download-only\"><code>https://tails.boum.org/install/download/"
-"</code></span>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are already in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"You seem to have JavaScript disabled. To use our browser extension, please "
+"allow all this page:"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[!img screenshots/allow_js.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Install Firefox add-on</a>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "BitTorrent"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "<u>Tails Verification</u> extension installed!"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Download "
-"Torrent file</a>"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"label>"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Verifying <span id=\"filename\">$FILENAME</span>&hellip;"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You seem to be using an unsupported browser."
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"You are running Firefox <span class=\"current-firefox\">1.0</span>. Please "
-"update to Firefox <span class=\"minver-firefox\">38.0.1</span>, Tor Browser "
-"<span class=\"minver-tor\">5</span>, or newer and visit this link:"
+"[[!toggleable id=\"why-failed\" text=\"\"\" [[!toggle id=\"why-failed\" text="
+"\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Most likely, the verification failed because of an error or interruption "
+"during the download."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser and already have our "
-"Firefox add-on installed."
+"Less likely, the verification might have failed because of a malicious "
+"download from our download mirrors or due to a network attack in your "
+"country or local network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "Downloading again is usually enough to fix this problem."
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
msgstr ""
-#. type: Content of: <div><div><div><a><div>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed-again\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"<span class=\"label label-default state already\">Already installed</span>"
+"[[!toggleable id=\"why-failed-again\" text=\"\"\" [[!toggle id=\"why-failed-"
+"again\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div>
-msgid "</a>"
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "The verification might have failed again because of:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A software problem in our verification extension"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A malicious download from our download mirrors"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A network attack in your country or local network"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Trying from a different place or a different computer might solve any of "
+"these issues."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
+"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
+"span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id=\"use-text-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
+"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
+"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
+"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
+"download|upgrade/tails]]</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser but have an outdated "
-"version of our Firefox add-on."
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Update "
-"Firefox add-on</span>"
+"Firefox <span id=\"min-version-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a href=\"https://www.mozilla.org/firefox/new/\">Download</a>)"
msgstr ""
-#. type: Content of: <div><div><div><a><div>
-msgid "<span class=\"label label-default state restartless\">No restart</span>"
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<span id=\"update-button-label\" class=\"pull-left\">Update Firefox add-on</"
-"span>"
+"Tor Browser <span id=\"min-version-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a href=\"https://www.torproject.org/download/download-easy.html"
+"\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "We detected that you are running Firefox or Tor Browser."
+msgid "Please update your browser to the latest version."
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"You can download the ISO image via our Firefox add-on. The add-on verifies "
-"your download [[!toggle id=\"extension-verification\" text=\"automatically"
-"\"]]."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!toggle id=\"what-is-bittorrent\" text=\"What is BitTorrent?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div>
msgid ""
-"The verification is based on a cryptographic checksum downloaded from our "
-"website."
+"[[!toggleable id=\"what-is-bittorrent\" text=\"\"\" [[!toggle id=\"what-is-"
+"bittorrent\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
msgid ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Install Firefox add-on</span>"
+"BitTorrent is a peer-to-peer technology for file sharing that makes your "
+"download faster and easier to resume."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<span id=\"install-text-label\" class=\"pull-left\">Install Firefox add-on</"
-"span>"
+"You need to install BitTorrent software on your computer, like <a href="
+"\"https://transmissionbt.com/\">Transmission</a> (for Windows, macOS, and "
+"Linux)."
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "BitTorrent doesn't work over Tor or in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"or [[!toggle id=\"bittorrent-verification\" text=\"Download and verify via "
-"BitTorrent\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
#. type: Content of: <div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
+"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
+"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] Torrent file</a>"
+msgstr ""
+"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
+"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
+"Image gespeichert haben."
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id="
-"\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/"
-"bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download Torrent file</a>"
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "\"\"\"]]"
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Open and download the Torrent file with your BitTorrent client. It contains "
+"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
+"\"]] ISO image that you will use in the next step."
msgstr ""
-#. type: Content of: <div><div><div><p>
-msgid "or [[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">seconds</span> <span class=\"singular\">second</span> "
-"</span> </small>"
+"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
+"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
+"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
+"Image gespeichert haben."
-#. type: Content of: <div><div><div><div><div><div>
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complete</span> <span class=\"progress-label\">$PROGRESS</span>"
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
msgid ""
-"<small id=\"download-path\">Downloading to <span class=\"download-path\">"
-"$PATH</span></small> <small id=\"downloaded-path\">Downloaded to <span class="
-"\"verify-file-path\">$PATH</span></small>"
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "This section provides simplified instructions:"
+msgstr "Dieser Abschnitt bietet vereinfachte Anweisungen:"
+
+#. type: Content of: <div><ul><li>
msgid ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"\">[[!img "
-"install/inc/icons/pause.png link=\"no\" alt=\"Pause\"]]</span> <span id="
-"\"download-button-state-resume\" class=\"\">[[!img install/inc/icons/play."
-"png link=\"no\" alt=\"Resume\"]]</span> <span id=\"download-button-state-"
-"cancel\" class=\"btn btn-link\">Cancel</span>"
+"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
+"span></a>"
msgstr ""
+"<a href=\"#windows\">Unter Windows mit <span class=\"application\">Gpg4win</"
+"span></a>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
msgid ""
-"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
-"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
-"\"Done\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
-"install/inc/icons/failed.png link=\"no\" alt=\"Failed\"]]</span>"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
+"a>"
msgstr ""
+"<a href=\"#mac\">Unter macOS mit <span class=\"application\">GPGTools</"
+"span></a>"
-#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click on the play button to resume."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#tails\">In Tails</a>"
+msgstr "<a href=\"#tails\">In Tails</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#command-line\">Using the command line</a>"
+msgstr "<a href=\"#command-line\">Mittels der Kommandozeile</a>"
+
+#. type: Content of: <div>
+msgid "<a id=\"windows\"></a>"
+msgstr "<a id=\"windows\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In Windows with <span class=\"application\">Gpg4win</span>"
+msgstr "Unter Windows mit <span class=\"application\">Gpg4win</span>"
+
+#. type: Content of: <div><p>
+msgid ""
+"See the [[<span class=\"application\">Gpg4win</span> documentation on "
+"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
msgstr ""
+"Lesen Sie die entsprechende [[<span class=\"application\">Gpg4win</span>-"
+"Dokumentation zum Prüfen von Signaturen|http://www.gpg4win.org/doc/de/"
+"gpg4win-compendium_24.html#id5]]."
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"The download of the ISO image failed! Please check your network connection "
-"and click <span class=\"guilabel\">Retry</span>…"
+"Verify the date of the signature to make sure that you downloaded the latest "
+"version."
msgstr ""
+"Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie die "
+"aktuellste Version heruntergeladen haben."
-#. type: Content of: <div><div><div><div><div>
-msgid "Verify ISO image"
+#. type: Content of: <div><p>
+msgid "If the following warning appears:"
+msgstr "Wenn die folgende Warnung erscheint:"
+
+#. type: Content of: <div><pre>
+#, no-wrap
+msgid ""
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
msgstr ""
+"Es sind nicht genügend Informationen zur Überprüfung der Signatur vorhanden.\n"
+"Signiert am ... von tails@boum.org (Schlüssel-ID: 0x58ACD84F\n"
+"Die Gültigkeit der Signatur kann nicht überprüft werden.\n"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"<small id=\"verify-text-calculating\">Computing SHA-256 checksum&hellip;</"
-"small>"
+"Then the ISO image is still correct according to the signing key that you "
+"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
+"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
+"Dann ist das ISO-Image dennoch im Bezug auf den von Ihnen heruntergeladenen "
+"Signaturschlüssel korrekt. Um diese Warnung zu entfernen, müssen Sie den "
+"Signaturschlüssel durch das <a href=\"#wot\">OpenPGP Web of Trust "
+"authentifizieren</a>."
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
+msgid "<a id=\"mac\"></a>"
+msgstr "<a id=\"mac\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr "Unter macOS mit <span class=\"application\">GPGTools</span>"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<span id=\"verify-text-state-calculating\" class=\"state calculating label "
-"label-info\"><span class=\"verify-progress\">$PROGRESS</span></span> <span "
-"id=\"verify-text-state-done\" class=\"state success done\">[[!img install/"
-"inc/icons/check.png link=\"no\" alt=\"Done\"]]</span> <span id=\"verify-text-"
-"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
-"link=\"no\" alt=\"Failed\"]]</span>"
+"Open <span class=\"application\">Finder</span> and navigate to the folder "
+"where you saved the ISO image and the signature."
msgstr ""
+"Öffnen Sie den <span class=\"application\">Finder</span> und navigieren Sie "
+"zu dem Ordner, in dem Sie das ISO-Image und die Signatur gespeichert haben."
-#. type: Content of: <div><div><div><div><p>
-msgid "You downloaded and verified the ISO image successfully!"
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
+"Verify Signature of File</span></span>."
msgstr ""
+"Rechtsklicken Sie auf das ISO-Image und wählen Sie <span class="
+"\"guimenuchoice\"> <span class=\"guisubmenu\">Dienste</span> ▸ <span class="
+"\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>."
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div>
+msgid "<a id=\"tails\"></a>"
+msgstr "<a id=\"tails\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In Tails"
+msgstr "In Tails"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"You can now continue with the next step and <span class=\"windows"
-"\">[[Install an intermediary Tails|install/win/usb#next]].</span> <span "
-"class=\"mac-usb\">[[Install an intermediary Tails|install/mac/usb#next]].</"
-"span> <span class=\"mac-dvd\">[[Burn a Tails DVD|install/mac/dvd#next]].</"
-"span> <span class=\"debian\">[[Install <span class=\"application\">Tails "
-"Installer</span>|install/debian/usb#next]].</span> <span class=\"linux"
-"\">[[Install an intermediary Tails|install/linux/usb#next]].</span> <span "
-"class=\"upgrade-tails\">[[Install an intermediary Tails|upgrade/tails#next]]."
-"</span> <span class=\"dvd\">[[Burn Tails on a DVD|install/dvd#next]].</span> "
-"<span class=\"vm\">read our [[Introduction to virtual machines|install/"
-"vm#next]].</span>"
+"Open the file browser and navigate to the folder where you saved the ISO "
+"image and the signature."
msgstr ""
+"Öffnen Sie den Dateibrowser und navigieren Sie zu dem Ordner, in dem Sie das "
+"ISO-Image und die Signatur gespeichert haben."
-#. type: Content of: <div><div><div><div><div><p>
+#. type: Content of: <div><ol><li>
msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the [[!toggle id=\"openpgp\" text=\"OpenPGP signature\"]]."
+"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
+"With Verify Signature</span>."
msgstr ""
+"Rechtsklicken Sie auf die Signatur und wählen Sie <span class=\"guimenuitem"
+"\">Mit Signatur-Datei überprüfen öffnen</span>."
-#. type: Content of: <div><div><div><div><div>
-msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
+#. type: Content of: <div><ol><li>
+msgid "The verification of the ISO image starts automatically:"
+msgstr "Die Verifizierung des ISO-Image startet automatisch:"
+
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"After the verification finishes, click on the notification counter in the "
+"bottom-right corner and on the notification with a transparent background on "
+"the right of the notification area:"
msgstr ""
+"Klicken Sie, nachdem die Verifizierung beendet wurde, auf den "
+"Benachrichtigungs-Zähler im unteren, rechten Bereich und auf die "
+"Benachrichtigung mit einem durchsichtigen Hintergrund auf der rechten Seite "
+"des Benachrichtigungsbereichs:"
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div>
+msgid "<a id=\"command-line\"></a>"
+msgstr "<a id=\"command-line\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Using the command line"
+msgstr "Mithilfe der Kommandozeile"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download the OpenPGP signature</a>"
+"Open a terminal and navigate to the folder where you saved the ISO image and "
+"the signature."
msgstr ""
+"Öffnen Sie ein Terminal und navigieren Sie zu dem Ordner, in dem Sie das ISO-"
+"Image und die Signatur gespeichert haben."
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Download the Tails signing key|tails-signing.key]]"
+#. type: Content of: <div><ol><li><p>
+msgid "Execute:"
+msgstr "Führen Sie aus:"
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Learn how to do this|install/download/openpgp]]"
+#. type: Content of: <div><ol><li><p>
+msgid "The output of this command should be the following:"
+msgstr " Die Ausgabe des Befehls sollte folgende sein:"
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "If the output also includes:"
+msgstr "Wenn die Ausgabe auch folgendes enthält:"
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: WARNING: This key is not certified with a trusted signature!"
+msgstr "gpg: WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!"
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+"gpg: Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
+"Besitzer gehört."
+
+#. type: Content of: <div>
+#, fuzzy
+#| msgid "<a id=\"wot\"></a>"
+msgid "\"\"\"]] <a id=\"wot\"></a>"
+msgstr "<a id=\"wot\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Authenticate the signing key through the OpenPGP Web of Trust"
+msgstr ""
+"Authentifizieren Sie den Signaturschlüssel durch das OpenPGP Web of Trust"
+
+#. type: Content of: <div><p>
msgid ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Download again</a>"
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div>
msgid ""
-"The verification of the ISO image failed! Please try to download "
-"again&hellip;"
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The verification techniques presented until now ([[Firefox extension, "
+#| "BitTorrent|install/download]], or OpenPGP verification) all rely on some "
+#| "information being securely downloaded using HTTPS from our website:"
+msgid ""
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
+msgstr ""
+"Die bisher vorgestellten Methoden zur Verifizierung ([[Firefoxerweiterung, "
+"BitTorrent|install/download]] oder OpenPGP-Verfizierung) basieren alle auf "
+"einigen, sicher mit HTTPS von unserer Webseite heruntergeladenen "
+"Informationen:"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>checksum</em> for the Firefox extension"
+msgstr "Die <em>Prüfsumme</em> für die Firefoxerweiterung"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Torrent file</em> for BitTorrent"
+msgstr "Die <em>Torrentdatei</em> für BitTorrent"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Tails signing key</em> for the OpenPGP verification"
+msgstr "Der <em>Signaturschlüssel von Tails</em> für die OpenPGP-Verfizierung"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "But, while doing so, you could download malicious information if our "
+#| "website is compromised or if you are victim of a [[man-in-the-middle "
+#| "attack|doc/about/warning#man-in-the-middle]]."
+msgid ""
+"But, while doing so, you could download malicious information if our website "
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
+"about/warning#man-in-the-middle]]."
+msgstr ""
+"Jedoch könnten Sie, wenn unsere Website kompromittiert wurde oder Sie ein "
+"Opfer eines [[Man-in-the-Middle-Angriffs|doc/about/warning#man-in-the-"
+"middle]] sind, gefälschte Informationen herunterladen."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP verification is the only technique that allows you to verify the "
+"ISO image even better by also authenticating the Tails signing key through "
+"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
+"way to completely protect you from malicious downloads."
+msgstr ""
+"Die Verifikation mit OpenPGP ist die einzige Vorgehensweise, die Ihnen durch "
+"das zusätzliche Authentifizeren mit dem OpenPGP Web of Trust eine noch "
+"bessere Authentifizierung bietet. Durch das Vertrauen in das OpenPGP Web of "
+"Trust können Sie sich vollständig gegen schadhafte Downloads schützen."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are verifying an ISO image from inside Tails already, for example to "
+"do a manual upgrade, then the Tails signing key is already included in "
+"Tails. You can trust this signing key as much as you are trusting your Tails "
+"installation already because you are not downloading it."
+msgstr ""
+"Wenn Sie das ISO-Image bereits von einem Tails aus verifizieren, zum "
+"Beispiel wenn Sie eine manuelle Aktualisierung durchführen, ist der "
+"Signaturschlüssel von Tails bereits in dem Tails enthalten. Da Sie ihn nicht "
+"herunterladen, können Sie diesem Signaturschlüssel in dem gleichen Maße, wie "
+"dem bereits installierten Tails vertrauen."
+
+#. type: Content of: <div><p>
+msgid ""
+"One of the inherent problems of standard HTTPS is that the trust we usually "
+"put in a website is defined by certificate authorities: a hierarchical and "
+"closed set of companies and governmental institutions approved by your web "
+"browser vendor. This model of trust has long been criticized and proved "
+"several times to be vulnerable to attacks [[as explained on our warning page|"
+"doc/about/warning#man-in-the-middle]]."
+msgstr ""
+"Eine der grundlegenden Probleme von üblichem HTTPS ist, dass das Vertrauen, "
+"welches wir in eine Webseite setzen, von Zertifizierungsstellen abhängt: "
+"Eine hierarchische und geschlossene Gruppe von Firmen und staatlichen "
+"Institutionen, die durch Webbrowser verifiziert werden. Dieses "
+"Vertrauensmodell wird schon lange kritisiert und ist erwiesenermaßen durch "
+"Angriffe verwundbar, [[wie wir es auf unserer Warnungsseite beschreiben|"
+"about/warning#man-in-the-middle]]."
+
+#. type: Content of: <div><p>
+msgid ""
+"We believe that, instead, users should be given the final say when trusting "
+"a website, and that designation of trust should be done on the basis of "
+"human interactions."
+msgstr ""
+"Stattdessen glauben wir, dass den Nutzenden bezüglich dem Vertrauen zu einer "
+"Webseite die letztendliche Entscheidung überlassen werden sollte und dass "
+"das Herstellen von Vertrauen auf der Basis von menschlicher Interaktion "
+"geschehen sollte."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
+"on OpenPGP keys that can help solving this problem. Let's see this with an "
+"example:"
+msgstr ""
+"Das OpenPGP [[!wikipedia_de Web_of_Trust desc=\"Web of Trust\"]] ist ein auf "
+"OpenPGP-Schlüsseln basierendes, dezentrales Vertrauensmodell. Werfen wir mit "
+"einem Beispiel einen Blick darauf:"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<em>You are friend with Alice and really trust her way of managing "
+#| "OpenPGP keys. So you are trusting Alice's key.</em>"
+msgid ""
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
+"keys. So you are trusting Alice's key.</em>"
+msgstr ""
+"<em>Sie sind mit Alice befreundet und vertrauen ihr wirklich, wie sie ihre "
+"OpenPGP-Schlüssel verwaltet. Sie vertrauen dem Schlüssel von Alice.</em>"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
+"certified Bob's key. So Alice is trusting Bob's key.</em>"
+msgstr ""
+"<em>Hinzu kommt, dass Alice Bob, einen Tails-Entwickler, bei einer Konferenz "
+"trifft und Bobs Schlüssel signiert. Alice vertraut Bobs Schlüssel.</em>"
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
+"fully trusts the Tails signing key.</em>"
+msgstr ""
+"<em>Bob ist ein Tails Entwickler, welcher direkt den Signaturschlüssel von "
+"Tails besitzt. Bob vertraut dem Signaturschlüssel von Tails vollständig.</em>"
+
+#. type: Content of: <div><p>
+msgid ""
+"In this scenario, Alice found a path to trust the Tails signing key without "
+"the need to rely on certificate authorities."
+msgstr ""
+"Dieses Szenario erzeugt einen Vertrauenspfad von Ihnen zum Signaturschlüssel "
+"von Tails, welcher es Ihnen erlauben kann, ihm ohne die Abhängigkeit von "
+"Zertifizierungsstellen zu vertrauen."
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<p>If you are on Debian or Ubuntu, you can install the\n"
+#| "<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
+#| "all Debian developers. Some Debian developers have certified the Tails\n"
+#| "signing key and you can use these certifications to build a trust path.\n"
+#| "This technique is explained in detail in our instructions on\n"
+#| "[[installing Tails from Debian or Ubuntu using the command\n"
+#| "line|install/expert/usb]].</p>\n"
msgid ""
-"The verification of the ISO image failed again! Please try to download again "
-"from a different place or a different computer&hellip;"
+"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
+"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
+"Debian developers. Some Debian developers have certified the Tails signing "
+"key and you can use these certifications to build a trust path. This "
+"technique is explained in detail in our instructions on [[installing Tails "
+"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
+"usb]]."
+msgstr ""
+"Wenn Sie Debian oder Ubuntu benutzen, können Sie das Paket <code>debian-"
+"keyring</code>, welches die OpenPGP-Schlüssel aller Entwickelnden von Debian "
+"enthält, installieren. Einige Entwickelnde von Debian haben, um einen "
+"Vertrauenspfad aufzubauen, den Signaturschlüssel von Tails zertifiziert. "
+"Diese Vorgehensweise wird in unseren Anweisungen zur [[Installation von "
+"Tails auf einem USB-Stick unter Verwendung der Kommandozeile von Debian oder "
+"Ubuntu aus|install/expert/usb]] näher beschrieben."
+
+#. type: Content of: <div><p>
+msgid ""
+"Relying on the Web of Trust requires both caution and intelligent "
+"supervision by the users. The technical details are outside of the scope of "
+"this document."
msgstr ""
+"Dieses Vertrauensmodell ist auch nicht perfekt und benötigt sowohl Vorsicht "
+"als auch intelligente Kontrolle durch Nutzende. Die technischen Details "
+"übersteigen den Umfang dieses Dokuments."
-#. type: Content of: outside any tag (error?)
-msgid "<a id=\"next\"></a>"
+#. type: Content of: <div><p>
+msgid ""
+"Since the Web of Trust is actually based on human relationships and real-"
+"life interactions, the best is to get in touch with people knowledgeable "
+"about OpenPGP and build trust relationships in order to find your own trust "
+"path to the Tails signing key."
msgstr ""
+"Da das Web of Trust tatsächlich auf zwischenmenschlichen Beziehungen und "
+"Interaktion im realen Leben basiert, wäre es das Beste, Kontakte zu Menschen "
+"aufzubauen, die sich mit OpenPGP auskennen und zu beginnen, es selbst zu "
+"benutzen und Vertrauensverhältnisse aufzubauen, damit Sie Ihren eigenen "
+"Vertrauenspfad zum Signaturschlüssel von Tails finden."
+
+#. type: Content of: <div><p>
+msgid ""
+"For example, you can start by contacting a local [[!wikipedia "
+"Linux_User_Group]], [[an organization offering Tails training|support/"
+"learn]], or other Tails enthusiasts near you and exchange about their "
+"OpenPGP practices."
+msgstr ""
+"Sie könnten damit beginnen, indem Sie mit einer lokalen [[!wikipedia_de "
+"Linux_User_Group desc=\"%s\"]] oder anderen Enthusiasten von Tails in Ihrer "
+"Umgebung in Kontakt treten und sich über deren Methoden bezüglich OpenPGP "
+"austauschen."
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "After you built a trust path, you can certify the Tails signing key by "
+#| "signing it with your own key to get rid of some warnings during the "
+#| "verification process."
+msgid ""
+"After you build a trust path, you can certify the Tails signing key by "
+"signing it with your own key to get rid of some warnings during the "
+"verification process."
+msgstr ""
+"Nachdem Sie einen Vertrauenspfad aufgebaut haben, können Sie den "
+"Signaturschlüssel von Tails mit Ihrem eigenen Schlüssel zertifizieren, um "
+"einige der Warnungen während des Verifizierungsprozesses loszuwerden."
+
+#~ msgid "Download and verify using OpenPGP"
+#~ msgstr "Herunterladen und mit OpenPGP verifizieren"
+
+#~ msgid ""
+#~ "These instructions are for people who are already familiar with basic "
+#~ "usage of OpenPGP and have <em>GPG</em> installed but might need guidance "
+#~ "on performing the verification."
+#~ msgstr ""
+#~ "Diese Anweisungen sind für Personen, die bereits mit der grundsätzlichen "
+#~ "Benutzung von OpenPGP vertraut sind und <em>GPG</em> installiert haben, "
+#~ "aber möglicherweise Hilfe zur Durchführung der Verifizierung benötigen."
+
+#~ msgid ""
+#~ "If you are doing the verification for the first time, download the "
+#~ "[[Tails signing key|tails-signing.key]] and import it in your keyring. "
+#~ "If you are working from Tails, the signing key is already included."
+#~ msgstr ""
+#~ "Wenn Sie die Verifizierung zum ersten Mal durchführen, laden Sie den "
+#~ "[[Signaturschlüssel von Tails|tails-signing.key]] herunter und "
+#~ "importieren Sie ihn in Ihren Schlüsselbund. Wenn Sie von einem Tails aus "
+#~ "arbeiten, ist der Signaturschlüssel bereits enthalten.[[!meta title="
+#~ "\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" rel="
+#~ "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+#~ "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/"
+#~ "inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#~ "stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title="
+#~ "\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel="
+#~ "\"stylesheet\" title=\"\"]] [[!meta script=\"install/inc/js/download\"]] "
+#~ "[[!meta link=\"https://chrome.google.com/webstore/detail/"
+#~ "gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]] [[!"
+#~ "inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age"
+#~ "\"]]"
+
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Alle ISO-Images sind mit dem gleichen Signaturschlüssel signiert, somit "
+#~ "müssen Sie ihn nur einmal importieren. Dennoch werden Sie jedes mal, wenn "
+#~ "Sie ein neues ISO-Image herunterladen, es erneut verifizieren müssen."
+
+#~ msgid ""
+#~ "This download of the Tails signing key is protected using HTTPS. But you "
+#~ "could still download a malicious signing key if our website is "
+#~ "compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+#~ "about/warning#man-in-the-middle]]."
+#~ msgstr ""
+#~ "Dieser Download des Signaturschlüssels von Tails wird durch HTTPS "
+#~ "geschützt. Dennoch könnten Sie, falls unsere Webseite kompromittiert ist "
+#~ "oder Sie Opfer eines [[Man-in-the-Middle-Angriffs|doc/about/warning#man-"
+#~ "in-the-middle]] sind, einen bösartigen Signaturschlüssel herunterladen."
+
+#~ msgid ""
+#~ "For additional verification, you can <a href=\"#wot\">authenticate the "
+#~ "signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Für zusätzliche Verifizierung <a href=\"#wot\">authentifizieren Sie den "
+#~ "Signaturschlüssel durch das OpenPGP Web of Trust</a>."
+
+#~ msgid "Verify the ISO image"
+#~ msgstr "Das ISO-Image verifizieren"
+
+#~ msgid ""
+#~ "As explained above in step 3, this simple OpenPGP verification provides a "
+#~ "level of verification equivalent to HTTPS, like the [[Firefox extension "
+#~ "or BitTorrent|install/download]], unless you also <a href=\"#wot"
+#~ "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Wie weiter oben in Schritt 3 beschrieben, bietet diese einfache, mit "
+#~ "HTTPS vergleichbare Verifizierung mit OpenPGP ein Verifizierungsniveau, "
+#~ "welches mit der [[Firefoxerweiterung oder BitTorrent|install/download]] "
+#~ "vergleichbar ist, es sei denn Sie <a href=\"#wot\">authentifizieren den "
+#~ "Signaturschlüssel zusätzlich durch das OpenPGP Web of Trust</a>."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "Weitere Literatur zu OpenPGP"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia_de GnuPG desc=\"Wikipedia: %s\"]], eine freie OpenPGP "
+#~ "Software"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian: Schlüsselsignierung|http://www.debian.org/events/keysigning.de."
+#~ "html]], ein Tutorial zum Signieren der Schlüssel von anderen Personen"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Erklärungen zum PGP Web of Trust|http://www.rubin.ch/pgp/"
+#~ "weboftrust.de.html]]"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: Zertifikatsprüfung|http://www.gpg4win.org/doc/de/gpg4win-"
+#~ "compendium_16.html]], Anweisungen zum Verwalten von Vertrauen in "
+#~ "Schlüssel mit Gpg4win"
+
+#, fuzzy
+#~| msgid ""
+#~| "Verify the date of the signature to make sure that you downloaded the "
+#~| "latest version."
+#~ msgid ""
+#~ "Verify the date of the signature to make sure that you downloaded the "
+#~ "latest version. If the output also includes:"
+#~ msgstr ""
+#~ "Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie die "
+#~ "aktuellste Version heruntergeladen haben."
+
+#, fuzzy
+#~| msgid ""
+#~| " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
+#~ msgid ""
+#~ "The verification of the ISO image starts automatically: [[!img install/"
+#~ "inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ " [[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]\n"
+
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
+
+#~ msgid "</div>\n"
+#~ msgstr "</div>\n"
+
+#~ msgid ""
+#~ " Verify the date of the signature to make sure that you downloaded the "
+#~ "latest version.\n"
+#~ msgstr ""
+#~ " Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie "
+#~ "die aktuellste Version heruntergeladen haben.\n"
+
+#~ msgid ""
+#~ " Then the ISO image is still correct according to the signing key that "
+#~ "you\n"
+#~ " downloaded. To remove this warning you need to <a href=\"#wot"
+#~ "\">authenticate\n"
+#~ " the signing key through the OpenPGP Web of Trust</a>.\n"
+#~ msgstr ""
+#~ " Ist das ISO-Image dennoch im Bezug auf den von Ihnen heruntergeladenen "
+#~ "Signaturschlüssel\n"
+#~ " korrekt. Um diese Warnung zu entfernen, müssen Sie den "
+#~ "Signaturschlüssel durch das \n"
+#~ " <a href=\"#wot\">OpenPGP Web of Trust authentifizieren</a>.\n"
+
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
+
+#~ msgid "<div class=\"tip\">\n"
+#~ msgstr "<div class=\"tip\">\n"
+
+#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>Tails ist im März 2015 [[zu einem neuen\n"
+#~ "Signaturschlüssel|news/signing_key_transition]] gewechselt.\n"
+#~ "Falls Sie den vorherigen Signaturschlüssel besessen haben, stellen Sie "
+#~ "sicher,\n"
+#~ "dass Sie den [[neuen Signaturschlüssel importieren und\n"
+#~ "verifizieren|news/signing_key_transition#index1h1]].</p>\n"
+
+#~ msgid ""
+#~ "We also acknowledge that not everybody might be able to create good trust "
+#~ "path to Tails signing key since it based on a network of direct human "
+#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
+#~ msgstr ""
+#~ "Wir gestehen auch ein, dass nicht alle Menschen in der Lage sein könnten, "
+#~ "einen zuverlässigen Vertrauenspfad zum Signaturschlüssel von Tails "
+#~ "aufzubauen, da es auf einem Netzwerk von direkten menschlichen "
+#~ "Beziehungen und dem Fachwissen über recht komplexe Werkzeuge wie OpenPGP "
+#~ "basiert."
+
+#~ msgid ""
+#~ "Note that since all Tails releases are signed with the same key, you will "
+#~ "not have to verify the key every time and the trust you might "
+#~ "progressively build in it will be built once and for all. Still, you will "
+#~ "have to check the ISO image every time you download a new one!"
+#~ msgstr ""
+#~ "Bitte beachten Sie, dass alle Versionen von Tails mit dem gleichen "
+#~ "Schlüssel signiert sind, weshalb Sie den Schlüssel nicht jedes Mal aufs "
+#~ "Neue verifizieren müssen und Sie das Vertrauen, welches Sie "
+#~ "möglicherweise zunehmend in ihn aufbauen, ein für alle Mal tun. Dennoch "
+#~ "werden Sie das ISO-Image jedes Mal, wenn Sie ein neues herunterladen, "
+#~ "überprüfen müssen."
+
+#~ msgid ""
+#~ "If you want to be extra cautious and really authenticate Tails signing "
+#~ "key in a stronger way than what standard HTTPS offers you, you will need "
+#~ "to use the OpenPGP Web of Trust."
+#~ msgstr ""
+#~ "Wenn Sie besonders vorsichtig sein und den Tails Signaturschlüssel "
+#~ "wirklich auf eine sicherere Weise verifizieren wollen, als es Ihnen "
+#~ "übliches HTTPS bietet, möchten, wird es nötig sein, dass Sie das OpenPGP "
+#~ "Web of Trust nutzen."
+
+#~ msgid ""
+#~ "We will present you three techniques from the easiest to the safest. "
+#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
+#~ "them according to your possibilities and technical skills."
+#~ msgstr ""
+#~ "Wir werden Ihnen drei Vorgehensweisen, von der einfachsten bis zur "
+#~ "sichersten, vorstellen. Nochmals, keine von diesen ist eine magische "
+#~ "Komplettlösung. Zögern Sie nicht, sie entsprechend Ihrer Möglichkeiten "
+#~ "und technischer Kenntnisse kennenzulernen."
diff --git a/wiki/src/install/inc/steps/download.inline.fa.po b/wiki/src/install/inc/steps/download.inline.fa.po
index fbff786..80a7188 100644
--- a/wiki/src/install/inc/steps/download.inline.fa.po
+++ b/wiki/src/install/inc/steps/download.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-12-03 16:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,388 +16,1094 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. type: Content of: <div>
+msgid "0.95"
+msgstr ""
+
#. type: Content of: <h1>
-msgid "Download and verify the Tails ISO image"
+msgid ""
+"Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
-#. type: Content of: <div>
+#. type: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><div>
msgid ""
-"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
-"this step you</span> <span class=\"download-only\">You</span> will download "
-"Tails as an ISO image: a single file containing the whole operating system. "
-"For your security, it is very important to also verify your download. We "
-"propose you two techniques to do this verification automatically."
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
+"</a>"
msgstr ""
-#. type: Content of: <div>
-msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"<a>I already downloaded Tails <span class=\"remove-extra-space\">&nbsp;[[!"
+"inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span>."
+"</a>"
msgstr ""
-#. type: Content of: <div><p>
-msgid "Please wait…"
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div><div>
-msgid "0.2.8"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"We failed to detect your browser vendor, maybe because JavaScript is "
-"disabled."
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You can download and verify the ISO image via:"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "With an unverified download, you might:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Lose time if your download is incomplete or broken due to an error during "
+"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Browser add-on"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if our download mirrors have been compromised "
+"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
-"for <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+</a> or <a href=\"https://www.torproject.org/download/"
-"download-easy.html.en\">Tor Browser <span class=\"minver-tor\">5</span>+</a>"
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "A Firefox add-on to download and verify Tails automatically."
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if your download is modified on the fly by an "
+"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are not in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "Copy and paste this link in Firefox or Tor Browser:"
+#. type: Content of: <div>
+msgid "\"\"\"]]"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/</"
-"code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/install/"
-"mac/usb/</code></span> <span class=\"mac-dvd\"><code>https://tails.boum.org/"
-"install/mac/dvd/</code></span> <span class=\"debian\"><code>https://tails."
-"boum.org/install/debian/usb/</code></span> <span class=\"linux"
-"\"><code>https://tails.boum.org/install/linux/usb/</code></span> <span class="
-"\"upgrade-tails\"><code>https://tails.boum.org/upgrade/tails/</code></span> "
-"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/</code></span> "
-"<span class=\"vm\"><code>https://tails.boum.org/install/vm/</code></span> "
-"<span class=\"download-only\"><code>https://tails.boum.org/install/download/"
-"</code></span>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are already in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"You seem to have JavaScript disabled. To use our browser extension, please "
+"allow all this page:"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[!img screenshots/allow_js.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Install Firefox add-on</a>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "BitTorrent"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "<u>Tails Verification</u> extension installed!"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Download "
-"Torrent file</a>"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"label>"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Verifying <span id=\"filename\">$FILENAME</span>&hellip;"
msgstr ""
-#. type: Content of: <div><div><p>
-msgid "You seem to be using an unsupported browser."
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"You are running Firefox <span class=\"current-firefox\">1.0</span>. Please "
-"update to Firefox <span class=\"minver-firefox\">38.0.1</span>, Tor Browser "
-"<span class=\"minver-tor\">5</span>, or newer and visit this link:"
+"[[!toggleable id=\"why-failed\" text=\"\"\" [[!toggle id=\"why-failed\" text="
+"\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser and already have our "
-"Firefox add-on installed."
+"Most likely, the verification failed because of an error or interruption "
+"during the download."
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"Less likely, the verification might have failed because of a malicious "
+"download from our download mirrors or due to a network attack in your "
+"country or local network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "Downloading again is usually enough to fix this problem."
msgstr ""
-#. type: Content of: <div><div><div><a><div>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"<span class=\"label label-default state already\">Already installed</span>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
msgstr ""
-#. type: Content of: <div><div><div>
-msgid "</a>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed-again\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-failed-again\" text=\"\"\" [[!toggle id=\"why-failed-"
+"again\" text=\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "The verification might have failed again because of:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A software problem in our verification extension"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A malicious download from our download mirrors"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A network attack in your country or local network"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Trying from a different place or a different computer might solve any of "
+"these issues."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
+"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
+"span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id=\"use-text-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
+"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
+"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
+"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
+"download|upgrade/tails]]</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser but have an outdated "
-"version of our Firefox add-on."
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Update "
-"Firefox add-on</span>"
+"Firefox <span id=\"min-version-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a href=\"https://www.mozilla.org/firefox/new/\">Download</a>)"
msgstr ""
-#. type: Content of: <div><div><div><a><div>
-msgid "<span class=\"label label-default state restartless\">No restart</span>"
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<span id=\"update-button-label\" class=\"pull-left\">Update Firefox add-on</"
-"span>"
+"Tor Browser <span id=\"min-version-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a href=\"https://www.torproject.org/download/download-easy.html"
+"\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "We detected that you are running Firefox or Tor Browser."
+msgid "Please update your browser to the latest version."
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"You can download the ISO image via our Firefox add-on. The add-on verifies "
-"your download [[!toggle id=\"extension-verification\" text=\"automatically"
-"\"]]."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!toggle id=\"what-is-bittorrent\" text=\"What is BitTorrent?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div>
msgid ""
-"The verification is based on a cryptographic checksum downloaded from our "
-"website."
+"[[!toggleable id=\"what-is-bittorrent\" text=\"\"\" [[!toggle id=\"what-is-"
+"bittorrent\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
msgid ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Install Firefox add-on</span>"
+"BitTorrent is a peer-to-peer technology for file sharing that makes your "
+"download faster and easier to resume."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<span id=\"install-text-label\" class=\"pull-left\">Install Firefox add-on</"
-"span>"
+"You need to install BitTorrent software on your computer, like <a href="
+"\"https://transmissionbt.com/\">Transmission</a> (for Windows, macOS, and "
+"Linux)."
msgstr ""
#. type: Content of: <div><div><div><p>
+msgid "BitTorrent doesn't work over Tor or in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"or [[!toggle id=\"bittorrent-verification\" text=\"Download and verify via "
-"BitTorrent\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
#. type: Content of: <div><div><div>
msgid ""
-"[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id="
-"\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/"
-"bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
+"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
+"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] Torrent file</a>"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><h3>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download Torrent file</a>"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "\"\"\"]]"
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "or [[Download and verify using OpenPGP|install/download/openpgp]]"
+msgid ""
+"Open and download the Torrent file with your BitTorrent client. It contains "
+"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
+"\"]] ISO image that you will use in the next step."
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">seconds</span> <span class=\"singular\">second</span> "
-"</span> </small>"
+"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div>
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complete</span> <span class=\"progress-label\">$PROGRESS</span>"
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
msgid ""
-"<small id=\"download-path\">Downloading to <span class=\"download-path\">"
-"$PATH</span></small> <small id=\"downloaded-path\">Downloaded to <span class="
-"\"verify-file-path\">$PATH</span></small>"
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "This section provides simplified instructions:"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
msgid ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"\">[[!img "
-"install/inc/icons/pause.png link=\"no\" alt=\"Pause\"]]</span> <span id="
-"\"download-button-state-resume\" class=\"\">[[!img install/inc/icons/play."
-"png link=\"no\" alt=\"Resume\"]]</span> <span id=\"download-button-state-"
-"cancel\" class=\"btn btn-link\">Cancel</span>"
+"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
+"span></a>"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
msgid ""
-"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
-"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
-"\"Done\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
-"install/inc/icons/failed.png link=\"no\" alt=\"Failed\"]]</span>"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
+"a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click on the play button to resume."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#tails\">In Tails</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#command-line\">Using the command line</a>"
+msgstr ""
+
+#. type: Content of: <div>
+msgid "<a id=\"windows\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "In Windows with <span class=\"application\">Gpg4win</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"The download of the ISO image failed! Please check your network connection "
-"and click <span class=\"guilabel\">Retry</span>…"
+"See the [[<span class=\"application\">Gpg4win</span> documentation on "
+"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "Verify ISO image"
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"Verify the date of the signature to make sure that you downloaded the latest "
+"version."
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "If the following warning appears:"
+msgstr ""
+
+#. type: Content of: <div><pre>
+#, no-wrap
msgid ""
-"<small id=\"verify-text-calculating\">Computing SHA-256 checksum&hellip;</"
-"small>"
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"<span id=\"verify-text-state-calculating\" class=\"state calculating label "
-"label-info\"><span class=\"verify-progress\">$PROGRESS</span></span> <span "
-"id=\"verify-text-state-done\" class=\"state success done\">[[!img install/"
-"inc/icons/check.png link=\"no\" alt=\"Done\"]]</span> <span id=\"verify-text-"
-"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
-"link=\"no\" alt=\"Failed\"]]</span>"
+"Then the ISO image is still correct according to the signing key that you "
+"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
+"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "You downloaded and verified the ISO image successfully!"
+#. type: Content of: <div>
+msgid "<a id=\"mac\"></a>"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><h3>
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"You can now continue with the next step and <span class=\"windows"
-"\">[[Install an intermediary Tails|install/win/usb#next]].</span> <span "
-"class=\"mac-usb\">[[Install an intermediary Tails|install/mac/usb#next]].</"
-"span> <span class=\"mac-dvd\">[[Burn a Tails DVD|install/mac/dvd#next]].</"
-"span> <span class=\"debian\">[[Install <span class=\"application\">Tails "
-"Installer</span>|install/debian/usb#next]].</span> <span class=\"linux"
-"\">[[Install an intermediary Tails|install/linux/usb#next]].</span> <span "
-"class=\"upgrade-tails\">[[Install an intermediary Tails|upgrade/tails#next]]."
-"</span> <span class=\"dvd\">[[Burn Tails on a DVD|install/dvd#next]].</span> "
-"<span class=\"vm\">read our [[Introduction to virtual machines|install/"
-"vm#next]].</span>"
+"Open <span class=\"application\">Finder</span> and navigate to the folder "
+"where you saved the ISO image and the signature."
msgstr ""
-#. type: Content of: <div><div><div><div><div><p>
+#. type: Content of: <div><ol><li>
msgid ""
-"If you are knowledgeable about OpenPGP, you can do additional verification "
-"using the [[!toggle id=\"openpgp\" text=\"OpenPGP signature\"]]."
+"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
+"Verify Signature of File</span></span>."
msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
+#. type: Content of: <div>
+msgid "<a id=\"tails\"></a>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><h3>
+msgid "In Tails"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download the OpenPGP signature</a>"
+"Open the file browser and navigate to the folder where you saved the ISO "
+"image and the signature."
msgstr ""
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Download the Tails signing key|tails-signing.key]]"
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
+"With Verify Signature</span>."
msgstr ""
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Learn how to do this|install/download/openpgp]]"
+#. type: Content of: <div><ol><li>
+msgid "The verification of the ISO image starts automatically:"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Download again</a>"
+"After the verification finishes, click on the notification counter in the "
+"bottom-right corner and on the notification with a transparent background on "
+"the right of the notification area:"
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div>
+msgid "<a id=\"command-line\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "Using the command line"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
msgid ""
-"The verification of the ISO image failed! Please try to download "
-"again&hellip;"
+"Open a terminal and navigate to the folder where you saved the ISO image and "
+"the signature."
msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "Execute:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "The output of this command should be the following:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "If the output also includes:"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: WARNING: This key is not certified with a trusted signature!"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+
+#. type: Content of: <div>
+msgid "\"\"\"]] <a id=\"wot\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "Authenticate the signing key through the OpenPGP Web of Trust"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"The verification of the ISO image failed again! Please try to download again "
-"from a different place or a different computer&hellip;"
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
msgstr ""
-#. type: Content of: outside any tag (error?)
-msgid "<a id=\"next\"></a>"
+#. type: Content of: <div><ul><li>
+msgid "The <em>checksum</em> for the Firefox extension"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Torrent file</em> for BitTorrent"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Tails signing key</em> for the OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"But, while doing so, you could download malicious information if our website "
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
+"about/warning#man-in-the-middle]]."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP verification is the only technique that allows you to verify the "
+"ISO image even better by also authenticating the Tails signing key through "
+"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
+"way to completely protect you from malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are verifying an ISO image from inside Tails already, for example to "
+"do a manual upgrade, then the Tails signing key is already included in "
+"Tails. You can trust this signing key as much as you are trusting your Tails "
+"installation already because you are not downloading it."
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "One of the inherent problems of standard HTTPS is that the trust we "
+#| "usually put on a website is defined by certificate authorities: a "
+#| "hierarchical and closed set of companies and governmental institutions "
+#| "approved by web browser vendors. This model of trust has long been "
+#| "criticized and proved several times to be vulnerable to attacks [[as "
+#| "explained on our warning page|about/warning#man-in-the-middle]]."
+msgid ""
+"One of the inherent problems of standard HTTPS is that the trust we usually "
+"put in a website is defined by certificate authorities: a hierarchical and "
+"closed set of companies and governmental institutions approved by your web "
+"browser vendor. This model of trust has long been criticized and proved "
+"several times to be vulnerable to attacks [[as explained on our warning page|"
+"doc/about/warning#man-in-the-middle]]."
+msgstr ""
+"یکی از مشکلات اصلی اچ‌تی‌تی‌پی‌اس استاندارد این است که اعتمادی که معمولاً‌ به یک "
+"تارنما می‌کنیم از طریق مراجع صور گواهی دیجیتال تعریف می‌شود: یعنی گروهی بسته و "
+"سلسله‌مراتبی از شرکت‌ها و نهادهای دولتی مورد تأیید توسعه‌دهندگان مروگرهای وب. "
+"این مدل از اعتماد مدت‌ها است که مورد انتقاد قرار گرفته و [[همان‌طور که در صفحهٔ "
+"هشدار ما آمده|about/warning#man-in-the-middle]] بارها مشخص شده که در برابر "
+"حملات آسیب‌پذیر است"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We believe instead that users should be given the final say when trusting "
+#| "a website, and that designation of trust should be done on the basis of "
+#| "human interaction."
+msgid ""
+"We believe that, instead, users should be given the final say when trusting "
+"a website, and that designation of trust should be done on the basis of "
+"human interactions."
msgstr ""
+"ما در عوض معتقدیم کاربران باید نظر نهایی در مورد اعتماد به یک تارنما را "
+"بدهند و اعتماد باید بر مبنای تعاملات انسانی باشد."
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The OpenPGP [[!wikipedia Web_of_Trust desc=\"Web of Trust\"]] is a "
+#| "decentralized trust model based on OpenPGP keys. Let's see that with an "
+#| "example."
+msgid ""
+"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
+"on OpenPGP keys that can help solving this problem. Let's see this with an "
+"example:"
+msgstr ""
+"[[!wikipedia Web_of_Trust desc=\"شبکهٔ اعتماد\"]] اُپن‌پی‌جی‌پی یک مدل اعتماد "
+"مرکززدایی‌شده بر مبنای کلیدهای اُپن‌پی‌جی‌پی است. بیایید مثالی در این مورد ببینیم."
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "*You're a friend of Alice and really trust her way of managing OpenPGP "
+#| "keys.\n"
+#| "You're trusting Alice's key.*\n"
+msgid ""
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
+"keys. So you are trusting Alice's key.</em>"
+msgstr ""
+"*شما دوست آلیس هستید و واقعاً‌ به نحوهٔ مدیریت کلیدهای اُپن‌پی‌جی‌پی از سوی اعتماد "
+"دارید.\n"
+"شما به کلید آلیس اعتماد دارید.*\n"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "*Furthermore, Alice met Bob, a Tails developer, in a conference, and "
+#| "signed\n"
+#| "Bob's key. Alice is trusting Bob's key.*\n"
+msgid ""
+"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
+"certified Bob's key. So Alice is trusting Bob's key.</em>"
+msgstr ""
+"*همین‌طور آلیس در یک کنفرانس، باب، یک برنامه‌نویس تیلز، را ملاقات\n"
+"و کلید باب را امضا کرده است. آلیس به کلید باب اعتماد دارد.*\n"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "*Bob is a Tails developer who directly owns the Tails signing key. Bob "
+#| "fully\n"
+#| "trusts Tails signing key.*\n"
+msgid ""
+"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
+"fully trusts the Tails signing key.</em>"
+msgstr ""
+"*باب یک برنامه‌نویس تیلز است که مستقیماً صاحب یک کلید امضای تیلز است.\n"
+"باب به کلید امضای تیلز اعتماد کامل دارد.*\n"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This scenario creates a trust path from you to Tails signing key that "
+#| "could allow you to trust it without having to depend on certificate "
+#| "authorities."
+msgid ""
+"In this scenario, Alice found a path to trust the Tails signing key without "
+"the need to rely on certificate authorities."
+msgstr ""
+"این روابط مسیری از اعتماد بین شما و کلید امضای تیلز ایجاد می‌کند که به شما "
+"اجازه می‌دهد بدون نیاز به اتکا به مراجع صدور گواهی دیجیتال به این کلید اعتماد "
+"کنید."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
+"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
+"Debian developers. Some Debian developers have certified the Tails signing "
+"key and you can use these certifications to build a trust path. This "
+"technique is explained in detail in our instructions on [[installing Tails "
+"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
+"usb]]."
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This trust model is not perfect either and requires both caution and "
+#| "intelligent supervision by users. The technical details of creating, "
+#| "managing and trusting OpenPGP keys is outside of the scope of this "
+#| "document."
+msgid ""
+"Relying on the Web of Trust requires both caution and intelligent "
+"supervision by the users. The technical details are outside of the scope of "
+"this document."
+msgstr ""
+"این مدل اعتماد نیز بی‌نقص نبوده و مستلزم احتیاط و نظارت هوشمندانه از سوی "
+"کاربران است. جزییات فنی ایجاد و مدیریت کلیدهای اُپن‌پی‌جی‌پی و اعتماد به آن‌ها "
+"خارج از حوصلهٔ این سند است."
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Since the Web of Trust is actually based on human relationships and real-"
+#| "life interactions the best would be to start establishing contacts with "
+#| "people knowledgeable about OpenPGP, start using it yourself and build "
+#| "trust relationships in order to find your own trust path to Tails signing "
+#| "key."
+msgid ""
+"Since the Web of Trust is actually based on human relationships and real-"
+"life interactions, the best is to get in touch with people knowledgeable "
+"about OpenPGP and build trust relationships in order to find your own trust "
+"path to the Tails signing key."
+msgstr ""
+"از آن‌جا که شبکهٔ اعتماد بر مبنای روابط انسانی و تعاملات زندگی واقعی است، "
+"بهترین کار برقراری ارتباط با افراد آشنا با اُپن‌پی‌جی‌پی، استفاده از آن توسط "
+"خودتان و ایجاد روابط اعتماد برای یافتن مسیر اعتماد خود به کلید امضای تیلز "
+"است."
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "You could start by contacting a local [[!wikipedia Linux_User_Group desc="
+#| "\"%s\"]] or other Tails enthusiasts near you and exchange about their "
+#| "OpenPGP practices."
+msgid ""
+"For example, you can start by contacting a local [[!wikipedia "
+"Linux_User_Group]], [[an organization offering Tails training|support/"
+"learn]], or other Tails enthusiasts near you and exchange about their "
+"OpenPGP practices."
+msgstr ""
+"می‌توانید این کار را با تماس گرفتن با علاقه‌مندان محلی تیلز یا [[!wikipedia "
+"Linux_User_Group desc=\"%s\"]] و مبادلهٔ کارهای اُپن‌پی‌جی‌پی آن‌ها آغاز کنید."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"After you build a trust path, you can certify the Tails signing key by "
+"signing it with your own key to get rid of some warnings during the "
+"verification process."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| "Note that since all Tails releases are signed with the same key, you "
+#~| "will not have to verify the key every time and the trust you might "
+#~| "progressively build in it will be built once and for all. Still, you "
+#~| "will have to check the ISO image every time you download a new one!"
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "توجه داشته باشید از آن‌جا که تمام نسخه‌های تیلز با کلید مشابه امضاء شده‌اند "
+#~ "لازم نیست هر بار نیازی به تأیید کلید نیست و اعتمادی که ممکن است به مرور "
+#~ "به آن پیدا کنید، یک بار برای همیشه در دسترس است. با این‌حال باید هر بار که "
+#~ "فایل ایزوی جدید دانلود می‌کنید، آن را بررسی کنید."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "منابع مطالعاتی بیشتر در مورد اُپن‌پی‌جی‌پی"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]]، یک نرم‌افزار آزاد اُپن‌پی‌جی‌پی"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr ""
+#~ "[[آپاچی: چگونگی استفاده از اُپن‌پی‌جی‌پی|http://www.apache.org/dev/openpgp."
+#~ "html]]"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[دبیان: امضای کلید|http://www.debian.org/events/keysigning]]، آموزش "
+#~ "کلیدهای امضای افراد دیگر"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: توضیح شبکهٔ اعتماد اُپن‌پی‌جی‌پی|http://www.rubin.ch/pgp/"
+#~ "weboftrust.en.html]]"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: بازرسی گواهی|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]]، راهنمایی برای مدیریت کلیدها با Gpg4win"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>Tails [[transitioned to a new signing\n"
+#~| "key|news/signing_key_transition]] between Tails 1.3 (February 24) and\n"
+#~| "Tails 1.3.1 (March 31). If you had the previous signing key, make sure\n"
+#~| "to [[import and verify the new signing\n"
+#~| "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>تیلز [[به یک کلید امضای جدید منتقل\n"
+#~ "می‌شود|news/signing_key_transition]]. این انتقال بین تیلز ۱٫۳ (۲۴ فوریه)\n"
+#~ "و تیلز ۱٫۳٫۱ (۳۱ مارس) انجام می‌شود. اگر کلید امضای قبلی را داشتید مطمئن "
+#~ "شوید که\n"
+#~ "[[کلید امضای جدید را وارد و تأیید\n"
+#~ "می‌کنید|news/signing_key_transition#index1h1]].</p>\n"
+
+#~ msgid "<!-- l10n placeholder for language-specific link -->"
+#~ msgstr "<!-- l10n placeholder for language-specific link -->"
+
+#~ msgid ""
+#~ "We also acknowledge that not everybody might be able to create good trust "
+#~ "path to Tails signing key since it based on a network of direct human "
+#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
+#~ msgstr ""
+#~ "ما همچنین تصدیق می‌کنیم که هر کسی ممکن است بتواند یک مسیر اعتماد خوب به "
+#~ "کلید امضای تیلز ایجاد کند، چرا که این مسیر بر مبنای ارتباطات مستقیم "
+#~ "انسانی و دانش ابزارهای بسیار پیچیده‌ای مانند اُپن‌پی‌جی‌پی است."
+
+#~ msgid ""
+#~ "Note that since all Tails releases are signed with the same key, you will "
+#~ "not have to verify the key every time and the trust you might "
+#~ "progressively build in it will be built once and for all. Still, you will "
+#~ "have to check the ISO image every time you download a new one!"
+#~ msgstr ""
+#~ "توجه داشته باشید از آن‌جا که تمام نسخه‌های تیلز با کلید مشابه امضاء شده‌اند "
+#~ "لازم نیست هر بار نیازی به تأیید کلید نیست و اعتمادی که ممکن است به مرور "
+#~ "به آن پیدا کنید، یک بار برای همیشه در دسترس است. با این‌حال باید هر بار که "
+#~ "فایل ایزوی جدید دانلود می‌کنید، آن را بررسی کنید."
+
+#~ msgid ""
+#~ "If you want to be extra cautious and really authenticate Tails signing "
+#~ "key in a stronger way than what standard HTTPS offers you, you will need "
+#~ "to use the OpenPGP Web of Trust."
+#~ msgstr ""
+#~ "اگر می‌خواهید خیلی محتاط باشید و از روشی قوی‌تر از چیزی که اچ‌تی‌تی‌پی‌اس "
+#~ "استاندارد در اختیارتان می‌گذارد کاملاً‌ از صحت کلید امضای تیلز مطمئن شوید، "
+#~ "باید از شبکهٔ اعتماد اُپن‌پی‌جی‌پی استفاده کنید."
+
+#~ msgid ""
+#~ "We will present you three techniques from the easiest to the safest. "
+#~ "Again, none of them is a perfect and magic solution. Feel free to explore "
+#~ "them according to your possibilities and technical skills."
+#~ msgstr ""
+#~ "سه شگرد به ترتیب ساده‌ترین تا امن‌ترین را به شما معرفی می‌کنیم. باز هم باید "
+#~ "در نظر داشت که هیچ کدام از این راه‌حل‌ها بی‌نقص و جادویی نیستند. می‌توانید "
+#~ "بسته به امکانات و توانایی‌های فنی خود این شگردها را بررسی کنید."
diff --git a/wiki/src/install/inc/steps/download.inline.fr.po b/wiki/src/install/inc/steps/download.inline.fr.po
index c41d63d..1b38d4e 100644
--- a/wiki/src/install/inc/steps/download.inline.fr.po
+++ b/wiki/src/install/inc/steps/download.inline.fr.po
@@ -5,543 +5,1265 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
-"PO-Revision-Date: 2017-06-17 12:08+0000\n"
-"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2017-12-03 16:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+
+#. type: Content of: <div>
+msgid "0.95"
+msgstr ""
#. type: Content of: <h1>
-msgid "Download and verify the Tails ISO image"
-msgstr "Télécharger et vérifier l'image ISO de Tails"
+msgid ""
+"Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort="
+"\"age\"]]"
+msgstr ""
-#. type: Content of: <div>
+#. type: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw="
+#| "\"yes\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages="
+#| "\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> "
+#| "(<span class=\"remove-extra-space\">[[!inline pages=\"inc/"
+#| "stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)."
msgid ""
-"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
-"this step you</span> <span class=\"download-only\">You</span> will download "
-"Tails as an ISO image: a single file containing the whole operating system. "
-"For your security, it is very important to also verify your download. We "
-"propose you two techniques to do this verification automatically."
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
+"</a>"
msgstr ""
-"<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">À "
-"cette étape vous</span> <span class=\"download-only\">Vous</span> devez "
-"télécharger l'image ISO de Tails : un simple fichier contenant la totalité "
-"du système d'exploitation. Pour votre sécurité, il est très important de "
-"vérifier également ce que vous avez téléchargé. Nous vous proposons deux "
-"techniques pour faire cette vérification automatiquement."
+"Téléchargez l'<a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\">image ISO de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]]</a> (<span class=\"remove-extra-space\">"
+"[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)."
-#. type: Content of: <div>
-msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"<a>I already downloaded Tails <span class=\"remove-extra-space\">&nbsp;[[!"
+"inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span>."
+"</a>"
+msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <div><p>
-msgid "Please wait…"
-msgstr "Veuillez patienter…"
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+msgstr ""
-#. type: Content of: <div><div>
-msgid "0.2.8"
-msgstr "0.2.8"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
+msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"We failed to detect your browser vendor, maybe because JavaScript is "
-"disabled."
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-"Nous n'avons pas réussi à détecter le type de votre navigateur, peut-être "
-"parce que JavaScript est désactivé."
-#. type: Content of: <div><div><p>
-msgid "You can download and verify the ISO image via:"
-msgstr "Vous pouvez télécharger et vérifier l'image ISO avec :"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "With an unverified download, you might:"
+msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Browser add-on"
-msgstr "Module complémentaire pour navigateur"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Lose time if your download is incomplete or broken due to an error during "
+"the download. This is quite frequent."
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
-"for <a href=\"https://getfirefox.com\">Firefox <span class=\"minver-firefox"
-"\">38.0.1</span>+</a> or <a href=\"https://www.torproject.org/download/"
-"download-easy.html.en\">Tor Browser <span class=\"minver-tor\">5</span>+</a>"
+"Get hacked while using Tails if our download mirrors have been compromised "
+"and are serving malicious downloads."
msgstr ""
-"pour <a href=\"https://www.mozilla.org/fr/firefox/new/\">Firefox <span class="
-"\"minver-firefox\">38.0.1</span>+</a> ou <a href=\"https://www.torproject."
-"org/download/download-easy.html.en\">Navigateur Tor <span class=\"minver-tor"
-"\">5</span>+</a>"
-#. type: Content of: <div><div><div><div><p>
-msgid "A Firefox add-on to download and verify Tails automatically."
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
msgstr ""
-"Un module complémentaire Firefox pour télécharger et vérifier Tails "
-"automatiquement."
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are not in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"Get hacked while using Tails if your download is modified on the fly by an "
+"attacker on the network."
msgstr ""
-"<strong>Si vous n'êtes pas dans Firefox ou dans le Navigateur Tor :</strong>"
-#. type: Content of: <div><div><div><div><p>
-msgid "Copy and paste this link in Firefox or Tor Browser:"
-msgstr "Copiez et collez ce lien dans Firefox ou dans le Navigateur Tor :"
+#. type: Content of: <div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/</"
-"code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/install/"
-"mac/usb/</code></span> <span class=\"mac-dvd\"><code>https://tails.boum.org/"
-"install/mac/dvd/</code></span> <span class=\"debian\"><code>https://tails."
-"boum.org/install/debian/usb/</code></span> <span class=\"linux"
-"\"><code>https://tails.boum.org/install/linux/usb/</code></span> <span class="
-"\"upgrade-tails\"><code>https://tails.boum.org/upgrade/tails/</code></span> "
-"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/</code></span> "
-"<span class=\"vm\"><code>https://tails.boum.org/install/vm/</code></span> "
-"<span class=\"download-only\"><code>https://tails.boum.org/install/download/"
-"</code></span>"
-msgstr ""
-"<span class=\"windows\"><code>https://tails.boum.org/install/win/usb/index."
-"fr.html</code></span> <span class=\"mac-usb\"><code>https://tails.boum.org/"
-"install/mac/usb/index.fr.html</code></span> <span class=\"mac-dvd"
-"\"><code>https://tails.boum.org/install/mac/dvd/index.fr.html</code></span> "
-"<span class=\"debian\"><code>https://tails.boum.org/install/debian/usb/index."
-"fr.html</code></span> <span class=\"linux\"><code>https://tails.boum.org/"
-"install/linux/usb/index.fr.html</code></span> <span class=\"upgrade-tails"
-"\"><code>https://tails.boum.org/upgrade/tails/index.fr.html</code></span> "
-"<span class=\"dvd\"><code>https://tails.boum.org/install/dvd/index.fr.html</"
-"code></span> <span class=\"vm\"><code>https://tails.boum.org/install/vm/"
-"index.fr.html</code></span> <span class=\"download-only\"><code>https://"
-"tails.boum.org/install/download/index.fr.html</code></span>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<strong>If you are already in Firefox or Tor Browser:</strong>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"You seem to have JavaScript disabled. To use our browser extension, please "
+"allow all this page:"
msgstr ""
-"<strong>Si vous êtes déjà dans Firefox ou dans le Navigateur Tor :</strong>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[!img screenshots/allow_js.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Install Firefox add-on</a>"
+"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
+"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
-"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/673020/"
-"addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary browser-override"
-"\">Installer le module complémentaire Firefox</a>"
-#. type: Content of: <div><div><div><div><h2>
-msgid "BitTorrent"
-msgstr "BitTorrent"
+#. type: Content of: <div><div><div><div><div><p>
+msgid "<u>Tails Verification</u> extension installed!"
+msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Download "
-"Torrent file</a>"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"label>"
msgstr ""
-"[[!inline pages=\"install/inc/steps/bittorrent_verification.inline\" raw="
-"\"yes\" sort=\"age\"]] <a href='[[!inline pages=\"inc/stable_amd64_torrent_url"
-"\" raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary\">Télécharger "
-"le fichier Torrent</a>"
-#. type: Content of: <div><div><p>
-msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Verifying <span id=\"filename\">$FILENAME</span>&hellip;"
msgstr ""
-"[[Télécharger et vérifier en utilisant OpenPGP|install/download/openpgp]]"
-#. type: Content of: <div><div><p>
-msgid "You seem to be using an unsupported browser."
-msgstr "Il semble que vous utilisez un navigateur non supporté."
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
msgid ""
-"You are running Firefox <span class=\"current-firefox\">1.0</span>. Please "
-"update to Firefox <span class=\"minver-firefox\">38.0.1</span>, Tor Browser "
-"<span class=\"minver-tor\">5</span>, or newer and visit this link:"
+"[[!toggleable id=\"why-failed\" text=\"\"\" [[!toggle id=\"why-failed\" text="
+"\"X\"]]"
msgstr ""
-"Vous utilisez Firefox <span class=\"current-firefox\">1.0</span>. Merci de "
-"mettre à jour vers Firefox <span class=\"minver-firefox\">38.0.1</span>, le "
-"Navigateur Tor <span class=\"minver-tor\">5</span> ou plus récent et visitez "
-"ce lien :"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser and already have our "
-"Firefox add-on installed."
+"Most likely, the verification failed because of an error or interruption "
+"during the download."
msgstr ""
-"Nous détectons que vous utilisez Firefox ou le Navigateur Tor et que vous "
-"avez déjà notre module complémentaire Firefox installé."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><div><div><div><div><p>
msgid ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"Less likely, the verification might have failed because of a malicious "
+"download from our download mirrors or due to a network attack in your "
+"country or local network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "Downloading again is usually enough to fix this problem."
msgstr ""
-"<a id=\"use-button\" href=\"\" class=\"btn btn-lg btn-primary clearfix\"> "
-"<span id=\"use-button-label\" class=\"pull-left\">Utiliser le module "
-"complémentaire Firefox</span>"
-#. type: Content of: <div><div><div><a><div>
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
-"<span class=\"label label-default state already\">Already installed</span>"
-msgstr "<span class=\"label label-default state already\">Déjà installé</span>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
+msgstr ""
-#. type: Content of: <div><div><div>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-failed-again\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-failed-again\" text=\"\"\" [[!toggle id=\"why-failed-"
+"again\" text=\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid "The verification might have failed again because of:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A software problem in our verification extension"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A malicious download from our download mirrors"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><ul><li>
+msgid "A network attack in your country or local network"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><div><p>
+msgid ""
+"Trying from a different place or a different computer might solve any of "
+"these issues."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
+"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
+"span>"
+msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span id=\"use-text-label\" class=\"pull-left\">Use Firefox add-on</span>"
+"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
+"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
+"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
+"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
+"download|upgrade/tails]]</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
-"<span id=\"use-text-label\" class=\"pull-left\">Utiliser le module "
-"complémentaire Firefox</span>"
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Done\"]]</span>"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
-"<span class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" "
-"alt=\"Fait\"]]</span>"
#. type: Content of: <div><div><div><p>
msgid ""
-"We detected that you are running Firefox or Tor Browser but have an outdated "
-"version of our Firefox add-on."
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
msgstr ""
-"Nous détectons que vous utilisez Firefox ou le Navigateur Tor mais avec une "
-"version obsolète du module complémentaire Firefox."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Update "
-"Firefox add-on</span>"
+"Firefox <span id=\"min-version-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a href=\"https://www.mozilla.org/firefox/new/\">Download</a>)"
msgstr ""
-"<a id=\"update-button\" href=\"https://addons.mozilla.org/firefox/downloads/"
-"latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-primary "
-"clearfix\"> <span id=\"update-button-label\" class=\"pull-left\">Mettre à "
-"jour le module complémentaire Firefox</span>"
-#. type: Content of: <div><div><div><a><div>
-msgid "<span class=\"label label-default state restartless\">No restart</span>"
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
-"<span class=\"label label-default state restartless\">Pas de redémarrage</"
-"span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
-"<span id=\"update-button-label\" class=\"pull-left\">Update Firefox add-on</"
-"span>"
+"Tor Browser <span id=\"min-version-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a href=\"https://www.torproject.org/download/download-easy.html"
+"\">Download</a>)"
msgstr ""
-"<span id=\"update-button-label\" class=\"pull-left\">Mettre à jour le module "
-"complémentaire Firefox</span>"
#. type: Content of: <div><div><div><p>
-msgid "We detected that you are running Firefox or Tor Browser."
-msgstr "Nous détectons que vous utilisez Firefox ou le Navigateur Tor."
+msgid "Please update your browser to the latest version."
+msgstr ""
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"You can download the ISO image via our Firefox add-on. The add-on verifies "
-"your download [[!toggle id=\"extension-verification\" text=\"automatically"
-"\"]]."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
-"Vous pouvez télécharger l'image ISO avec notre module complémentaire "
-"Firefox. Le module complémentaire vérifie ce que vous avez téléchargé [[!"
-"toggle id=\"extension-verification\" text=\"automatiquement\"]]."
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
msgstr ""
-"[[!toggleable id=\"extension-verification\" text=\"\"\" [[!toggle id="
-"\"extension-verification\" text=\"X\"]]"
#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!toggle id=\"what-is-bittorrent\" text=\"What is BitTorrent?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div>
msgid ""
-"The verification is based on a cryptographic checksum downloaded from our "
-"website."
+"[[!toggleable id=\"what-is-bittorrent\" text=\"\"\" [[!toggle id=\"what-is-"
+"bittorrent\" text=\"X\"]]"
msgstr ""
-"La vérification se base sur une somme de contrôle cryptographique "
-"téléchargée depuis notre site web."
-#. type: Content of: <div><div><div><a>
+#. type: Content of: <div><div><div><p>
msgid ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Install Firefox add-on</span>"
+"BitTorrent is a peer-to-peer technology for file sharing that makes your "
+"download faster and easier to resume."
msgstr ""
-"\"\"\"]] <a id=\"install-button\" href=\"https://addons.mozilla.org/firefox/"
-"downloads/latest/673020/addon-673020-latest.xpi\" class=\"btn btn-lg btn-"
-"primary clearfix\"> <span id=\"install-button-label\" class=\"pull-left"
-"\">Installer le module complémentaire Firefox</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<span id=\"install-text-label\" class=\"pull-left\">Install Firefox add-on</"
-"span>"
+"You need to install BitTorrent software on your computer, like <a href="
+"\"https://transmissionbt.com/\">Transmission</a> (for Windows, macOS, and "
+"Linux)."
msgstr ""
-"<span id=\"install-text-label\" class=\"pull-left\">Installer le module "
-"complémentaire Firefox</span>"
#. type: Content of: <div><div><div><p>
+msgid "BitTorrent doesn't work over Tor or in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
msgid ""
-"or [[!toggle id=\"bittorrent-verification\" text=\"Download and verify via "
-"BitTorrent\"]]"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-"ou [[!toggle id=\"bittorrent-verification\" text=\"Télécharger et vérifier "
-"avec BitTorrent\"]]"
#. type: Content of: <div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
msgid ""
-"[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id="
-"\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/"
-"bittorrent_verification.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!toggleable id=\"bittorrent-verification\" text=\"\"\" [[!toggle id=\"bittorrent-verification\" text=\"X\"]] [[!inline pages=\"install/inc/steps/bittorrent_verification.inline.fr\" raw=\"yes\" sort=\"age\"]]"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
+"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
+"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] Torrent file</a>"
+msgstr ""
+"Téléchargez la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'>signature OpenPGP de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a> et sauvegardez-la dans "
+"le dossier où vous avez enregistré l'image ISO."
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><div><h3>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download Torrent file</a>"
-msgstr "<a href='[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort=\"age\"]]'>Télécharger le fichier Torrent</a>"
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+msgstr ""
-#. type: Content of: <div><div><div><div><div>
-msgid "\"\"\"]]"
-msgstr "\"\"\"]]"
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
+msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "or [[Download and verify using OpenPGP|install/download/openpgp]]"
+msgid ""
+"Open and download the Torrent file with your BitTorrent client. It contains "
+"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
+"\"]] ISO image that you will use in the next step."
msgstr ""
-"ou [[Télécharger et vérifier en utilisant OpenPGP|install/download/openpgp]]"
-#. type: Content of: <div><div>
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-"<a id=\"download-button\" href='[[!inline pages=\"inc/stable_amd64_iso_url\" "
-"raw=\"yes\" sort=\"age\"]]' class=\"btn btn-lg btn-primary clearfix iso-url "
-"use-mirror-pool\"> <span id=\"download-button-label\" class=\"pull-left"
-"\">Télécharger l'image ISO de Tails <span class=\"iso-version\">[[!inline "
-"pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> <small "
-"id=\"download-button-size\">(<span class=\"iso-size-MiB\">$SIZE</span> MiB)</"
-"small> </span> </a>"
-#. type: Content of: <div><div><div><div><div>
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"Download Tails <span class=\"iso-version\">[[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> ISO image <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> KB/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">seconds</span> <span class=\"singular\">second</span> "
-"</span> </small>"
-msgstr ""
-"Télécharger l'image ISO de Tails <span class=\"iso-version\">[[!inline pages="
-"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</span> <small id="
-"\"download-eta\"> <span class=\"speed-KBs\">$SPEED</span> Ko/s &mdash; <span "
-"class=\"downloaded-MiB\">$DOWNLOADED</span>/<span class=\"iso-size-MiB\">"
-"$SIZE</span> MiB, <span data-value=\"???\"> <span class=\"eta-mins\">???</"
-"span> <span class=\"plural\">minutes</span> <span class=\"singular\">minute</"
-"span> </span> <span data-value=\"???\"> <span class=\"eta-secs\">???</span> "
-"<span class=\"plural\">secondes</span> <span class=\"singular\">seconde</"
-"span> </span> </small>"
+"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
+msgstr ""
+"Téléchargez la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\" sort=\"age\"]]'>signature OpenPGP de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a> et sauvegardez-la dans "
+"le dossier où vous avez enregistré l'image ISO."
-#. type: Content of: <div><div><div><div><div><div>
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complete</span> <span class=\"progress-label\">$PROGRESS</span>"
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-"<span class=\"sr-only\"><span class=\"progress-label\">$PROGRESS</span> "
-"complété</span> <span class=\"progress-label\">$PROGRESS</span>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div>
msgid ""
-"<small id=\"download-path\">Downloading to <span class=\"download-path\">"
-"$PATH</span></small> <small id=\"downloaded-path\">Downloaded to <span class="
-"\"verify-file-path\">$PATH</span></small>"
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-"<small id=\"download-path\">Téléchargement dans <span class=\"download-path"
-"\">$PATH</span></small> <small id=\"downloaded-path\">Téléchargé dans <span "
-"class=\"verify-file-path\">$PATH</span></small>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><p>
+msgid "This section provides simplified instructions:"
+msgstr "Cette section contient des instructions simplifiées :"
+
+#. type: Content of: <div><ul><li>
msgid ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Retry</a> <span id=\"download-button-state-pause\" class=\"\">[[!img "
-"install/inc/icons/pause.png link=\"no\" alt=\"Pause\"]]</span> <span id="
-"\"download-button-state-resume\" class=\"\">[[!img install/inc/icons/play."
-"png link=\"no\" alt=\"Resume\"]]</span> <span id=\"download-button-state-"
-"cancel\" class=\"btn btn-link\">Cancel</span>"
+"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
+"span></a>"
msgstr ""
-"<a id=\"download-button-state-retry\" href=\"#\" class=\"btn btn-primary iso-"
-"url\">Réessayer</a> <span id=\"download-button-state-pause\" class=\"\">[[!"
-"img install/inc/icons/pause.png link=\"no\" alt=\"Pause\"]]</span> <span id="
-"\"download-button-state-resume\" class=\"\">[[!img install/inc/icons/play."
-"png link=\"no\" alt=\"Reprendre\"]]</span> <span id=\"download-button-state-"
-"cancel\" class=\"btn btn-link\">Annuler</span>"
+"<a href=\"#windows\">Pour Windows avec <span class=\"application\">Gpg4win</"
+"span></a>"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ul><li>
msgid ""
-"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
-"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
-"\"Done\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
-"install/inc/icons/failed.png link=\"no\" alt=\"Failed\"]]</span>"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
+"a>"
msgstr ""
-"<span id='download-text-pause'> </span> <span id =\"download-text-done\" "
-"class=\"state done\">[[!img install/inc/icons/check.png link=\"no\" alt="
-"\"Fait\"]]</span> <span id =\"download-text-failed\" class=\"state\">[[!img "
-"install/inc/icons/failed.png link=\"no\" alt=\"Échec\"]]</span>"
+"<a href=\"#mac\">Pour macOS avec <span class=\"application\">GPGTools</"
+"span></a>"
-#. type: Content of: <div><div><div><div><p>
-msgid "The download has been paused. Click on the play button to resume."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#tails\">In Tails</a>"
+msgstr "<a href=\"#tails\">Pour Tails</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#command-line\">Using the command line</a>"
+msgstr "<a href=\"#command-line\">En utilisant la ligne de commande</a>"
+
+#. type: Content of: <div>
+msgid "<a id=\"windows\"></a>"
+msgstr "<a id=\"windows\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "In Windows with <span class=\"application\">Gpg4win</span>"
+msgstr "Pour Windows avec <span class=\"application\">Gpg4win</span>"
+
+#. type: Content of: <div><p>
+msgid ""
+"See the [[<span class=\"application\">Gpg4win</span> documentation on "
+"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"html#id4]]."
msgstr ""
-"Le téléchargement a été mis en pause. Cliquez sur le bouton lecture pour "
-"reprendre."
+"Voir la documentation de [[<span class=\"application\">Gpg4win</span> sur la "
+"vérification des signatures|http://www.gpg4win.org/doc/en/gpg4win-"
+"compendium_24.html#id4]] (en anglais)."
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"The download of the ISO image failed! Please check your network connection "
-"and click <span class=\"guilabel\">Retry</span>…"
+"Verify the date of the signature to make sure that you downloaded the latest "
+"version."
msgstr ""
-"Le téléchargement de l'image ISO a échoué ! Veuillez vérifier votre "
-"connexion réseau et cliquer sur <span class=\"guilabel\">Réessayer</span>…"
+"Vérifiez la date de la signature pour vous assurer que vous avez téléchargé "
+"la dernière version."
-#. type: Content of: <div><div><div><div><div>
-msgid "Verify ISO image"
-msgstr "Vérification de l'image ISO"
+#. type: Content of: <div><p>
+msgid "If the following warning appears:"
+msgstr "Si l'avertissement suivant apparaît :"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><pre>
+#, no-wrap
msgid ""
-"<small id=\"verify-text-calculating\">Computing SHA-256 checksum&hellip;</"
-"small>"
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
msgstr ""
-"<small id=\"verify-text-calculating\">Calcul de la somme de contrôle "
-"SHA-256&hellip;</small>"
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><ol><li><p>
msgid ""
-"<span id=\"verify-text-state-calculating\" class=\"state calculating label "
-"label-info\"><span class=\"verify-progress\">$PROGRESS</span></span> <span "
-"id=\"verify-text-state-done\" class=\"state success done\">[[!img install/"
-"inc/icons/check.png link=\"no\" alt=\"Done\"]]</span> <span id=\"verify-text-"
-"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
-"link=\"no\" alt=\"Failed\"]]</span>"
+"Then the ISO image is still correct according to the signing key that you "
+"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
+"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
-"<span id=\"verify-text-state-calculating\" class=\"state calculating label "
-"label-info\"><span class=\"verify-progress\">$PROGRESS</span></span> <span "
-"id=\"verify-text-state-done\" class=\"state success done\">[[!img install/"
-"inc/icons/check.png link=\"no\" alt=\"Fait\"]]</span> <span id=\"verify-text-"
-"state-failed\" class=\"state failed\">[[!img install/inc/icons/failed.png "
-"link=\"no\" alt=\"Échec\"]]</span>"
+"Alors l'image ISO est tout de même correctement signée par la clé que vous "
+"avez téléchargé. Pour supprimer cet avertissement vous devez <a href=\"#wot"
+"\">authentifier la clé de signature via la Toile de Confiance OpenPGP</a>."
-#. type: Content of: <div><div><div><div><p>
-msgid "You downloaded and verified the ISO image successfully!"
-msgstr "Vous avez téléchargé et vérifié l'image ISO avec succès !"
+#. type: Content of: <div>
+msgid "<a id=\"mac\"></a>"
+msgstr "<a id=\"mac\"></a>"
-#. type: Content of: <div><div><div><div><p>
+#. type: Content of: <div><h3>
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr "Pour macOS en utilisant <span class=\"application\">GPGTools</span>"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"You can now continue with the next step and <span class=\"windows"
-"\">[[Install an intermediary Tails|install/win/usb#next]].</span> <span "
-"class=\"mac-usb\">[[Install an intermediary Tails|install/mac/usb#next]].</"
-"span> <span class=\"mac-dvd\">[[Burn a Tails DVD|install/mac/dvd#next]].</"
-"span> <span class=\"debian\">[[Install <span class=\"application\">Tails "
-"Installer</span>|install/debian/usb#next]].</span> <span class=\"linux"
-"\">[[Install an intermediary Tails|install/linux/usb#next]].</span> <span "
-"class=\"upgrade-tails\">[[Install an intermediary Tails|upgrade/tails#next]]."
-"</span> <span class=\"dvd\">[[Burn Tails on a DVD|install/dvd#next]].</span> "
-"<span class=\"vm\">read our [[Introduction to virtual machines|install/"
-"vm#next]].</span>"
-msgstr ""
-"Vous pouvez maintenant continuer à la prochaine étape et <span class="
-"\"windows\">[[Installer un Tails intermédiaire|install/win/usb#next]].</"
-"span> <span class=\"mac-usb\">[[Installer un Tails intermédiaire|install/mac/"
-"usb#next]].</span> <span class=\"mac-dvd\">[[Graver un DVD Tails|install/mac/"
-"dvd#next]].</span> <span class=\"debian\">[[Installer l'<span class="
-"\"application\">Installeur de Tails</span>|install/debian/usb#next]].</span> "
-"<span class=\"linux\">[[Installer un Tails intermédiaire|install/linux/"
-"usb#next]].</span> <span class=\"upgrade-tails\">[[Installer un Tails "
-"intermédiaire|upgrade/tails#next]].</span> <span class=\"dvd\">[[Graver "
-"Tails sur un DVD|install/dvd#next]].</span> <span class=\"vm\">lire notre "
-"[[Introduction aux machines virtuelles|install/vm#next]].</span>"
+"Open <span class=\"application\">Finder</span> and navigate to the folder "
+"where you saved the ISO image and the signature."
+msgstr ""
+"Ouvrez <span class=\"application\">Finder</span> et naviguez jusqu'au "
+"dossier où vous avez enregistré l'image ISO et la signature."
-#. type: Content of: <div><div><div><div><div><p>
-msgid "If you are knowledgeable about OpenPGP, you can do additional verification using the [[!toggle id=\"openpgp\" text=\"OpenPGP signature\"]]."
-msgstr "Si vous avez l'habitude d'OpenPGP, vous pouvez également vérifier en utilisant la [[!toggle id=\"openpgp\" text=\"signature OpenPGP\"]]."
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
+"Verify Signature of File</span></span>."
+msgstr ""
+"Faites un clic droit sur l'image ISO puis sur <span class=\"guimenuchoice\"> "
+"<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+"\">OpenPGP: Verify Signature of File</span></span>."
-#. type: Content of: <div><div><div><div><div>
-msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
-msgstr "[[!toggleable id=\"openpgp\" text=\"\"\""
+#. type: Content of: <div>
+msgid "<a id=\"tails\"></a>"
+msgstr "<a id=\"tails\"></a>"
-#. type: Content of: <div><div><div><div><div><ul><li>
+#. type: Content of: <div><h3>
+msgid "In Tails"
+msgstr "Pour Tails"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort="
-"\"age\"]]'>Download the OpenPGP signature</a>"
-msgstr "<a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]'>Télécharger la signature OpenPGP</a>"
+"Open the file browser and navigate to the folder where you saved the ISO "
+"image and the signature."
+msgstr ""
+"Ouvrez le navigateur de fichier et naviguez jusqu'au dossier où vous avez "
+"enregistré l'image ISO et la signature."
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Download the Tails signing key|tails-signing.key]]"
-msgstr "[[Télécharger la clé de signature de Tails|tails-signing.key]]"
+#. type: Content of: <div><ol><li>
+msgid ""
+"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
+"With Verify Signature</span>."
+msgstr ""
+"Faites un clic droit sur la signature puis sur <span class=\"guimenuitem"
+"\">Ouvrir avec Vérifier la signature</span>."
-#. type: Content of: <div><div><div><div><div><ul><li>
-msgid "[[Learn how to do this|install/download/openpgp]]"
-msgstr "[[Apprendre à le faire|install/download/openpgp]]"
+#. type: Content of: <div><ol><li>
+msgid "The verification of the ISO image starts automatically:"
+msgstr "La vérification de l'image ISO démarre automatiquement :"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Download again</a>"
+"After the verification finishes, click on the notification counter in the "
+"bottom-right corner and on the notification with a transparent background on "
+"the right of the notification area:"
msgstr ""
-"<a href=\"\" id=\"download-button-state-cancel\" class=\"download-again"
-"\">Télécharger à nouveau</a>"
+"Une fois la vérification terminée, cliquez sur le compteur de notification "
+"dans l'angle en bas à droite puis sur la notification avec un fond "
+"transparent à droite de la zone de notification :"
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div>
+msgid "<a id=\"command-line\"></a>"
+msgstr "<a id=\"command-line\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Using the command line"
+msgstr "En ligne de commande"
+
+#. type: Content of: <div><ol><li>
msgid ""
-"The verification of the ISO image failed! Please try to download "
-"again&hellip;"
+"Open a terminal and navigate to the folder where you saved the ISO image and "
+"the signature."
msgstr ""
-"La vérification de l'image ISO a échoué ! Veuillez réessayer le "
-"téléchargement&hellip;"
+"Ouvrez un terminal et naviguez jusqu'au dossier où vous avez enregistré "
+"l'image ISO et la signature."
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><ol><li><p>
+msgid "Execute:"
+msgstr "Exécutez la commande :"
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+msgid "The output of this command should be the following:"
+msgstr "La sortie de cette commande devrait être :"
+
+#. type: Content of: <div><ol><li><p>
msgid ""
-"The verification of the ISO image failed again! Please try to download again "
-"from a different place or a different computer&hellip;"
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
msgstr ""
-"La vérification de l'image ISO a échoué à nouveau ! Veuillez réessayer à "
-"nouveau depuis un autre endroit ou sur un autre ordinateur&hellip;"
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
-#. type: Content of: outside any tag (error?)
-msgid "<a id=\"next\"></a>"
-msgstr "<a id=\"next\"></a>"
+#. type: Content of: <div><ol><li><p>
+msgid "If the output also includes:"
+msgstr "Si la sortie inclut aussi :"
-#~ msgid "0.2.7rc55"
-#~ msgstr "0.2.7rc55"
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: WARNING: This key is not certified with a trusted signature!"
+msgstr "gpg: WARNING: This key is not certified with a trusted signature!"
+
+#. type: Content of: <div><ol><li><p>
+msgid "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+"gpg: There is no indication that the signature belongs to the owner."
+
+#. type: Content of: <div>
+#, fuzzy
+#| msgid "<a id=\"wot\"></a>"
+msgid "\"\"\"]] <a id=\"wot\"></a>"
+msgstr "<a id=\"wot\"></a>"
+
+#. type: Content of: <div><h3>
+msgid "Authenticate the signing key through the OpenPGP Web of Trust"
+msgstr "Authentifier la clé de signature via la Toile de Confiance OpenPGP"
+
+#. type: Content of: <div><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The verification techniques presented until now ([[Firefox extension, "
+#| "BitTorrent|install/download]], or OpenPGP verification) all rely on some "
+#| "information being securely downloaded using HTTPS from our website:"
+msgid ""
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
+msgstr ""
+"Les techniques de vérifications présentées jusqu'à maintenant ([[le module "
+"complémentaire pour Firefox, BitTorrent|install/download]] et la "
+"vérification OpenPGP) dépendent toutes d'informations téléchargées de "
+"manière sécurisée via HTTPS depuis notre site web :"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>checksum</em> for the Firefox extension"
+msgstr "La <em>somme de contrôle</em> pour l'extension Firefox"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Torrent file</em> for BitTorrent"
+msgstr "Le <em>fichier Torrent</em> pour BitTorrent"
+
+#. type: Content of: <div><ul><li>
+msgid "The <em>Tails signing key</em> for the OpenPGP verification"
+msgstr "La <em>clé de signature de Tails</em> pour la vérification OpenPGP"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "But, while doing so, you could download malicious information if our "
+#| "website is compromised or if you are victim of a [[man-in-the-middle "
+#| "attack|doc/about/warning#man-in-the-middle]]."
+msgid ""
+"But, while doing so, you could download malicious information if our website "
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
+"about/warning#man-in-the-middle]]."
+msgstr ""
+"Mais, si notre site web était compromis ou que vous étiez victime d'une "
+"[[attaque de l'homme du milieu|doc/about/warning#man-in-the-middle]] vous "
+"pourriez télécharger des informations malveillantes."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP verification is the only technique that allows you to verify the "
+"ISO image even better by also authenticating the Tails signing key through "
+"the OpenPGP Web of Trust. Relying on the OpenPGP Web of Trust is the only "
+"way to completely protect you from malicious downloads."
+msgstr ""
+"La vérification OpenPGP est la seule méthode qui vous permet une "
+"vérification encore plus poussée de l'image ISO en authentifiant aussi la "
+"clé de signature de Tails via la Toile de Confiance OpenPGP. Se fier à la "
+"Toile de Confiance OpenPGP est la seule manière de vous protéger "
+"complètement des téléchargements malveillants."
+
+#. type: Content of: <div><div><p>
+msgid ""
+"If you are verifying an ISO image from inside Tails already, for example to "
+"do a manual upgrade, then the Tails signing key is already included in "
+"Tails. You can trust this signing key as much as you are trusting your Tails "
+"installation already because you are not downloading it."
+msgstr ""
+"Si vous vérifiez l'image ISO depuis Tails, par exemple pour faire une mise à "
+"jour manuelle, la clé de signature de Tails est déjà fournie. Vous pouvez "
+"avoir confiance en cette clé autant qu'en votre installation de Tails."
+
+#. type: Content of: <div><p>
+msgid ""
+"One of the inherent problems of standard HTTPS is that the trust we usually "
+"put in a website is defined by certificate authorities: a hierarchical and "
+"closed set of companies and governmental institutions approved by your web "
+"browser vendor. This model of trust has long been criticized and proved "
+"several times to be vulnerable to attacks [[as explained on our warning page|"
+"doc/about/warning#man-in-the-middle]]."
+msgstr ""
+"Un problème inhérent au standard HTTPS est le fait que la confiance "
+"généralement accordée à un site web est définie par des autorités de "
+"certification : un ensemble fermé et hiérarchique d'entreprises et "
+"d'institutions gouvernementales approuvées par le fabricant de votre "
+"navigateur. La critique de ce modèle de confiance a été faite depuis "
+"longtemps et il a été montré de nombreuses fois qu'il était sujet à "
+"certaines attaques [[comme expliqué dans notre page d'avertissements|doc/"
+"about/warning#man-in-the-middle]]."
+
+#. type: Content of: <div><p>
+msgid ""
+"We believe that, instead, users should be given the final say when trusting "
+"a website, and that designation of trust should be done on the basis of "
+"human interactions."
+msgstr ""
+"Nous pensons plutôt que le dernier mot, lorsqu'il s'agit de faire confiance "
+"à un site web, doit revenir aux individus et que la construction de la "
+"confiance devrait être basée sur des relations humaines."
+
+#. type: Content of: <div><p>
+msgid ""
+"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
+"on OpenPGP keys that can help solving this problem. Let's see this with an "
+"example:"
+msgstr ""
+"La [[!wikipedia_fr Toile_de_confiance desc=\"Toile de Confiance\"]] OpenPGP "
+"est un modèle de confiance décentralisé basé sur les clés OpenPGP. Voyons ça "
+"avec un exemple :"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<em>You are friend with Alice and really trust her way of managing "
+#| "OpenPGP keys. So you are trusting Alice's key.</em>"
+msgid ""
+"<em>You are friends with Alice and really trust