Merge branch 'master' into stable

wiki/src/about.de.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-11 23:45+0100\n"
+"POT-Creation-Date: 2012-02-26 09:41+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"
@@ -53,9 +53,10 @@ msgid ""
 "It helps you to use the Internet anonymously almost anywhere you go and on "
 "any computer but leave no trace using unless you ask it explicitly."
 msgstr ""
-"Es hilft Ihnen, fast überall und auf jedem Computer das Internet anonym zu "
-"benutzen, dabei aber keine Spuren zu hinterlassen, ausser Sie wollen es "
-"explizit."
+"Tails ist ein Live-Betriebssystem, das darauf ausgerichtet ist, Ihre "
+"Privatsphäre und Anonymität zu bewahren. Es hilft Ihnen dabei das Internet "
+"so gut wie überall und an jedem Computer anonym zu nutzen und ohne Spuren zu "
+"hinterlassen, sofern Sie dies nicht ausdruecklich wünschen."
 
 #. type: Plain text
 msgid ""
@@ -249,7 +250,7 @@ msgstr ""
 msgid ""
 "Automatically encrypt with HTTPS all your communications to a number of "
 "major websites using [HTTPS Everywhere](https://www.eff.org/https-"
-"everywhere), a Firefox extension developped by the [Electronic Frontier "
+"everywhere), a Firefox extension developed by the [Electronic Frontier "
 "Foundation](https://www.eff.org)."
 msgstr ""
 
@@ -257,7 +258,7 @@ msgstr ""
 msgid ""
 "Encrypt and sign your emails and documents, using the *de facto* standard "
 "<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
-"email client or file browser."
+"email client, text editor or file browser."
 msgstr ""
 
 #. type: Bullet: '  - '
@@ -267,6 +268,19 @@ msgid ""
 "cryptographic tool that provides encryption, authentication and deniability."
 msgstr ""
 
+#. type: Bullet: '  - '
+msgid ""
+"[[Securely delete your files|doc/encryption_and_privacy/secure_deletion]] "
+"and clean your diskspace using [[Nautilus Wipe|http://wipetools.tuxfamily."
+"org/nautilus-wipe.html]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"[[Read more about those tools in the documentation.|doc/"
+"encryption_and_privacy]]"
+msgstr ""
+
 #. type: Title =
 #, no-wrap
 msgid "What's next?\n"
@@ -296,6 +310,10 @@ msgstr ""
 "weitere Details zu [[Funktionen und Software|doc/about/features]], die in "
 "Tails enthalten sind,"
 
+#. type: Bullet: '  - '
+msgid "our [[documentation|doc]] explaining in details how to use Tails,"
+msgstr ""
+
 #. type: Bullet: '  - '
 msgid "some hints on why [[should you trust Tails|doc/about/trust]],"
 msgstr ""

wiki/src/about.fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tails-about-fr\n"
-"POT-Creation-Date: 2012-01-11 23:45+0100\n"
+"POT-Creation-Date: 2012-02-26 09:41+0100\n"
 "PO-Revision-Date: 2012-01-30 00:33+0100\n"
 "Last-Translator: \n"
 "Language-Team: nada-fr <LL@li.org>\n"
@@ -84,17 +84,14 @@ msgid "Anonymity online through Tor\n"
 msgstr "Anonymat en ligne avec Tor\n"
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tails relies on the Tor anonymity network to protect your privacy online: "
-#| "all outgoing connections to the Internet are forced to go through Tor."
 msgid ""
 "Tails relies on the Tor anonymity network to protect your privacy online: "
 "all software are configured to connect through Tor, and direct (non-"
 "anonymous)  connections are blocked."
 msgstr ""
 "Tails se base sur le réseau Tor pour protéger votre vie privée en ligne: "
-"toutes les connections sortantes passent par Tor."
+"tous les logiciels sont configurés pour passer par Tor, et les connexion "
+"directes (qui ne garantissent pas votre anonymat) sont bloquées."
 
 #. type: Plain text
 msgid ""
@@ -156,7 +153,9 @@ msgstr ""
 msgid ""
 "[Understanding and Using Tor — An Introduction for the Layman](https://trac."
 "torproject.org/projects/tor/wiki/doc/TorALaymansGuide)"
-msgstr "[Comprendre et utilisez Tor — Une introduction aux novices (en anglais)](https://trac.torproject.org/projects/tor/wiki/doc/TorALaymansGuide)"
+msgstr ""
+"[Comprendre et utilisez Tor — Une introduction aux novices (en anglais)]"
+"(https://trac.torproject.org/projects/tor/wiki/doc/TorALaymansGuide)"
 
 #. type: Title =
 #, no-wrap
@@ -216,31 +215,21 @@ msgstr ""
 "utilisant un chiffrement robuste:"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "Encrypt your USB sticks or external hard-disks using <span class="
-#| "\"definition\">[[!wikipedia LUKS]]</span>, the Linux standard for disk-"
-#| "encryption."
 msgid ""
 "[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
 "encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
 "span>, the Linux standard for disk-encryption."
 msgstr ""
-"Chiffrer votre clé USB ou votre disque dur externe avec <span class="
-"\"definition\">[[!wikipedia Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, "
-"le standard chez Linux en matière de chiffrement de volume."
+"[[Chiffrez votre clé USB ou votre disque dur externe|doc/"
+"encryption_and_privacy/encrypted_volumes]] avec <span class=\"definition\">"
+"[[!wikipedia Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, le standard de "
+"Linux en matière de chiffrement de volume."
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "Automatically encrypt with HTTPS all your communications to a number of "
-#| "major websites using [HTTPS Everywhere](https://www.eff.org/https-"
-#| "everywhere), a Firefox extension developped by the [Electronic Frontier "
-#| "Foundation](https://www.eff.org)."
 msgid ""
 "Automatically encrypt with HTTPS all your communications to a number of "
 "major websites using [HTTPS Everywhere](https://www.eff.org/https-"
-"everywhere), a Firefox extension developped by the [Electronic Frontier "
+"everywhere), a Firefox extension developed by the [Electronic Frontier "
 "Foundation](https://www.eff.org)."
 msgstr ""
 "Chiffrez automatiquement en HTTPS toutes vos communications vers de nombreux "
@@ -253,19 +242,17 @@ msgstr ""
 #| msgid ""
 #| "Encrypt and sign your emails and documents, using the *de facto* standard "
 #| "<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from "
-#| "Tails browser with FireGPG, or Tails email client or file browser."
+#| "Tails email client or file browser."
 msgid ""
 "Encrypt and sign your emails and documents, using the *de facto* standard "
 "<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
-"email client or file browser."
+"email client, text editor or file browser."
 msgstr ""
 "Chiffrez et signez vos e-mails et vos documents, en utlisant <span class="
-"\"definition\">[[!wikipedia OpenPGP]]</span> soit depuis le navigateur web "
-"de Tails avec FireGPG, ou avec un client mail de Tails ou encore avec un "
-"lecteur de documents."
+"\"definition\">[[!wikipedia OpenPGP]]</span>, le standard de référence, soit "
+"depuis le client mail de Tails ou un navigateur de fichiers."
 
 #. type: Bullet: '  - '
-#, fuzzy
 msgid ""
 "Protect your instant messaging conversations using <span class=\"definition"
 "\">[[!wikipedia Off-the-Record_Messaging desc=\"OTR\"]]</span>, a "
@@ -273,8 +260,21 @@ msgid ""
 msgstr ""
 "Protégez vos conversations par messagerie instantanée en utilisant <span "
 "class=\"definition\">[[!wikipedia Off-the-Record_Messaging desc=\"OTR\"]]</"
-"span>, un outils cryptographique qui fournit chiffrement, authentification "
-"ainsi que possibilité de deniability."
+"span>, un outil cryptographique qui fournit chiffrement, authentification "
+"ainsi que la possibilité du déni plausible."
+
+#. type: Bullet: '  - '
+msgid ""
+"[[Securely delete your files|doc/encryption_and_privacy/secure_deletion]] "
+"and clean your diskspace using [[Nautilus Wipe|http://wipetools.tuxfamily."
+"org/nautilus-wipe.html]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"[[Read more about those tools in the documentation.|doc/"
+"encryption_and_privacy]]"
+msgstr ""
 
 #. type: Title =
 #, no-wrap
@@ -302,6 +302,10 @@ msgstr ""
 "une revue détaillée des [[fonctionnalités et logiciels inclus|doc/about/"
 "features]] dans Tails,"
 
+#. type: Bullet: '  - '
+msgid "our [[documentation|doc]] explaining in details how to use Tails,"
+msgstr ""
+
 #. type: Bullet: '  - '
 msgid "some hints on why [[should you trust Tails|doc/about/trust]],"
 msgstr "pourquoi [[faire confiance à Tails ?|doc/about/trust]]"
@@ -357,6 +361,9 @@ msgid ""
 "improvements to our [[contribute/design/memory_erasure]] procedure) has been "
 "borrowed from [Liberté Linux](http://dee.su/liberte)."
 msgstr ""
+"Certaines idées (en particulier [[tordate|contribute/design/Time_syncing]] "
+"et plusieurs améliorations de notre [[contribute/design/memory_erasure]] "
+"procédure) ont été empruntées à [Liberté Linux](http://dee.su/liberte)."
 
 #. type: Bullet: '  - '
 msgid ""
@@ -369,15 +376,15 @@ msgstr ""
 #. type: Title =
 #, no-wrap
 msgid "Related projects\n"
-msgstr ""
+msgstr "Projets liés\n"
 
 #. type: Plain text
 msgid ""
 "Feel free to contact us if you think that your project is missing, or if "
 "some project is listed in the wrong category."
 msgstr ""
-"N'hésitez pas à nous contacter si vous pensez que votre projet manque, "
-"ou si un projet est dans la mauvaise catégorie."
+"N'hésitez pas à nous contacter si vous pensez que votre projet manque, ou si "
+"un projet est dans la mauvaise catégorie."
 
 #. type: Title ##
 #, no-wrap

wiki/src/about.mdwn

@@ -81,17 +81,23 @@ encryption:
   - Automatically encrypt with HTTPS all your communications to a number of
     major websites using [HTTPS
     Everywhere](https://www.eff.org/https-everywhere), a Firefox extension
-    developped by the [Electronic Frontier Foundation](https://www.eff.org).
+    developed by the [Electronic Frontier Foundation](https://www.eff.org).
 
   - Encrypt and sign your emails and documents, using the *de facto* standard
     <span class="definition">[[!wikipedia OpenPGP]]</span> either from Tails
-    email client or file browser.
+    email client, text editor or file browser.
 
   - Protect your instant messaging conversations using <span
     class="definition">[[!wikipedia Off-the-Record_Messaging
     desc="OTR"]]</span>, a cryptographic tool that provides encryption,
     authentication and deniability.
 
+  - [[Securely delete your files|doc/encryption_and_privacy/secure_deletion]]
+    and clean your diskspace using [[Nautilus
+    Wipe|http://wipetools.tuxfamily.org/nautilus-wipe.html]].
+
+[[Read more about those tools in the documentation.|doc/encryption_and_privacy]]
+
 What's next?
 ============
 
@@ -99,6 +105,7 @@ To continue discovering Tails, you can now read:
 
   - the [[warning page|doc/about/warning]] page to understand better the security limitations of Tails and Tor,
   - more details about the [[features and software|doc/about/features]] included in Tails,
+  - our [[documentation|doc]] explaining in details how to use Tails,
   - some hints on why [[should you trust Tails|doc/about/trust]],
   - our [[design document|contribute/design]] about Tails specification, threat model and implementation.
 

wiki/src/bugs/Can__39__t_hear_any_sound.mdwn

+I can't get any sound with Tails 0.10.1 on my laptop. It's too low to hear. Had the same problem on my friend's laptop.
+
+> Please use the "report a bug" application from *both* these
+> computers so that we get enough information. (Someone already sent
+> us a similar bug report over email, but it was lacking much
+> necessary information and we had no way to ask for more, so
+> unfortunately I deleted it. Maybe another Tails developer could
+> resend it?)
+
+Didn't have this issue before 0.10.1 so is it about the linux kernel? (sounds working on Windows 7)
+
+> Can you please confirm Tails **0.10** does not expose this problem?

wiki/src/bugs/Can__39__t_use_headphones_in_TAILS.mdwn

@@ -5,3 +5,7 @@ I'm not sure if it's intentional or not, but you can't use headphones in TAILS.
 > Please [[report the bug|support/found_a_problem]] with the
 > integrated bug reporting application to give us enough information.
 > Else there's barely anything we can do about it.
+
+>> No reply from OP, closing.
+
+[[done]]

wiki/src/bugs/Monitor_No_Signal.mdwn

+My monitor does not pick up the signal from tails.
+
+> Please tell us a bit more about it: what exactly do you see on
+> the screen?
+
+Is there a way to boot using different resolutions, etc?
+
+> Yes. E.g. pass `xorg-driver=vesa` or `xorg-resolution=FIXME` to the
+> kernel command-line, in the syslinux boot menu. See the
+> `live-config(7)` manpage for details.

wiki/src/bugs/Mouse_don__39__t_work.mdwn

+From version 0.9 I was not able to use mouse anymore.
+
+> Without any more information about your hardware, there's strictly nothing we can do about it. Sorry.

wiki/src/bugs/Replace_Scroogle_with_Startpage.com___40__anonymous_search_by_Ixquick__47___using_Google__41__.mdwn

+Scroogle no longer works. 
+
+I suggest adding startpage.com to the search plugins of Iceweasel as a replace of Scroogle. 
+
+Using 
+https://startpage.com/eng/make-startpage-your-homepage.html
+and/or
+https://startpage.com/do/preferences.pl?language_ui=english
+
+Startpage can be added as as default search. It's also possible to add special language versions. 
+
+Startpage.com is powered by the privacy organisation www.ixquick.com and uses Google search. 
+
+> [[done]] in [Tails 0.10.1](https://tails.boum.org/news/version_0.10.1/), update ! (also for security reasons, didn't you get a warning message while booting Tails?)

wiki/src/bugs/Tails_.10_wont_open_.onion_webpages.mdwn

@@ -18,3 +18,6 @@ Here is the actual error message:
 > extra care *not* trying to connect to any .onion before a desktop
 > notification tells you it's ok to do so?
 
+>> No reply from OP, should be fixed in 0.10.1, closing.
+
+[[done]]

wiki/src/bugs/broken_foxyproxy_i2p_pattern.mdwn

+Currently (e.g. in Tails 0.10.1) "http://www.i2p2.de" is captured by
+the I2P pattern, which is incorrect. In fact, every domain that has
+the string ".i2p" in it is affected. It seems isMultiLine="false" does
+*not* make RE into ^RE$ any longer.
+
+Fixed in branch bugfix/foxyproxy_regex => [[!taglink pending]]

wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn

@@ -10,3 +10,9 @@ If iceweasel was started once, then everything goes well.
 > instance doesn't load the check.torproject.org page, but as we are
 > considering removing it I guess we can nevertheless tag this bug 
 > [[done]].
+
+>> This seems to be a common bug to Iceweasel. If no instance of Iceweasel is
+>> started, the first URL passed in argument is overwritten by the homepage
+>> preference. So the homepage shows up instead of the URL. On top of that, in
+>> Tails (but not on all Debian), the URL passed as second argument appear in
+>> the location bar but the actual page is not loaded.

wiki/src/bugs/ondemand_governor_not_enabled_on_some_processors.mdwn

+In Tails 0.10.1, on AMD Phenom II x6 1100T, ondemand governor is not
+automatically enabled. Even if I do enable it manually it works only
+partly because of the missing SMP support. The first CPU then goes
+into power-saving mode, while all other CPUs don't. With properly
+working CPU powersaving in Linux that desktop machine idles at around
+55 W, while with Tails it needs more than 120 W when idle (with the
+CPU fan running at full speed).
+

wiki/src/contribute/build/squid-deb-proxy/squid-deb-proxy.conf

@@ -73,6 +73,10 @@ refresh_pattern Sources\.gz$    0       20%     4320 refresh-ims
 refresh_pattern Sources\.lzma$  0       20%     4320 refresh-ims
 refresh_pattern Release$        0       20%     4320 refresh-ims
 refresh_pattern Release\.gpg$   0       20%     4320 refresh-ims
+refresh_pattern Translation-en\.bzip2$ 0       20%     4320 refresh-ims
+refresh_pattern Translation-en\.bz2$   0       20%     4320 refresh-ims
+refresh_pattern Translation-en\.gz$    0       20%     4320 refresh-ims
+refresh_pattern Translation-en\.lzma$  0       20%     4320 refresh-ims
 refresh_pattern Translation-fr\.bzip2$ 0       20%     4320 refresh-ims
 refresh_pattern Translation-fr\.bz2$   0       20%     4320 refresh-ims
 refresh_pattern Translation-fr\.gz$    0       20%     4320 refresh-ims

wiki/src/contribute/git.mdwn

@@ -130,9 +130,48 @@ Developers with write access to the repositories should instead:
 
 	git clone 'ssh://git@git.immerda.ch/tails_live-config.git'
 
-We have a Gitweb available or [our custom
+We have a Gitweb available for [our custom
 live-config](http://git.immerda.ch/?p=tails_live-config.git).
 
+liveusb-creator
+=============
+
+Anyone can check it out like this:
+
+	git clone git://git.immerda.ch/tails/liveusb-creator.git
+
+Developers with write access to the repositories should instead:
+
+	git clone git@git.immerda.ch:tails/liveusb-creator.git
+
+We have a Gitweb available for [liveusb-creator](http://git.immerda.ch/?p=tails/liveusb-creator.git).
+
+tails-greeter
+=============
+
+Anyone can check it out like this:
+
+	git clone git://git.immerda.ch/tails/tails-greeter.git
+
+Developers with write access to the repositories should instead:
+
+	git clone git@git.immerda.ch:tails/tails-greeter.git
+
+We have a Gitweb available for [tails-greeter](http://git.immerda.ch/?p=tails/tails-greeter.git).
+
+tails-persistence-setup
+=======================
+
+Anyone can check it out like this:
+
+	git clone git://git.immerda.ch/tails/persistence-setup.git
+
+Developers with write access to the repositories should instead:
+
+	git clone 'git@git.immerda.ch:tails/persistence-setup.git'
+
+We have a Gitweb available for [tails-persistence-setup](http://git.immerda.ch/?p=tails/persistence-setup.git).
+
 Vidalia
 =======
 
@@ -144,7 +183,7 @@ Developers with write access to the repositories should instead:
 
 	git clone 'ssh://git@git.immerda.ch/tails_vidalia.git'
 
-We have a Gitweb available or [our custom
+We have a Gitweb available for [our custom
 Vidalia](http://git.immerda.ch/?p=tails_vidalia.git).
 
 FireGPG
@@ -158,9 +197,23 @@ Developers with write access to the repositories should instead:
 
 	git clone 'ssh://git@git.immerda.ch/tails/firegpg.git'
 
-We have a Gitweb available or [our custom
+We have a Gitweb available for [our custom
 FireGPG](http://git.immerda.ch/?p=tails/firegpg.git).
 
+htp
+===
+
+Anyone can check it out like this:
+
+	git clone git://git.immerda.ch/tails_htp.git
+
+Developers with write access to the repositories should instead:
+
+	git clone ssh://git@git.immerda.ch/tails_htp.git
+
+We have a Gitweb available for [our custom
+htp](http://git.immerda.ch/?p=tails_htp.git).
+
 icedove
 =======
 

wiki/src/contribute/how/translate.mdwn

@@ -15,8 +15,15 @@ Welcome aboard! Please read-on.</p>
 
 Tails ships with several custom programs that need to be translated.
 
-The (gettext) PO files are in [[!tails_devel_gitweb_dir
-config/chroot_local-includes/usr/share/locale]].
+One can find the (gettext) PO files:
+
+* in [[!tails_devel_gitweb_dir config/chroot_local-includes/usr/share/locale]]
+* [liveusb-creator
+  gitweb](http://git.immerda.ch/?p=tails/liveusb-creator.git;a=tree;f=po;hb=HEAD)
+* [tails-greeter
+  gitweb](http://git.immerda.ch/?p=tails/tails-greeter.git;a=tree;f=po;hb=HEAD)
+* [tails-persistence-setup
+  gitweb](http://git.immerda.ch/?p=tails/persistence-setup.git;a=tree;f=po;hb=HEAD)
 
 ## Website and documentation
 

wiki/src/contribute/release_process/test.mdwn

@@ -44,6 +44,8 @@ Check the image size has not changed much since the last release.
 * Browsing (by IP) a FTP server on the LAN should be possible.
 * Entering `about:plugins` in the location bar should say no plugin is
   installed.
+* Does playing HTML5 videos work? In particular, (due to its popularity)
+  do [youtube](http://www.youtube.com) videos work?
 
 # Pidgin
 
@@ -208,6 +210,7 @@ steps that are worth [[a dedicated page|test/erase_memory_on_shutdown]].
     (implying that the I2P network is reachable but UDP is blocked).
 * Check that you can reach some eepsites within Iceweasel, like
   <http://www.i2p2.i2p> and <http://forum.i2p>.
+* Check that you can connect to the I2P IRC server through Pidgin.
 
 # Git
 
@@ -216,6 +219,9 @@ steps that are worth [[a dedicated page|test/erase_memory_on_shutdown]].
 
 # Misc
 
+* Check that there are no weird applications listening to external
+  connections with `sudo netstat -ltupn` (everything should be
+  `127.0.0.1` (IPv4) or `::1` (IPv6)).
 * Check that links to the online website (`Mirror:`) at the bottom of
   bundled static web pages are working. Else, it probably means the
   wiki was not built with the needed patched ikiwiki version.

wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn

@@ -7,6 +7,8 @@
 Pick one of those:
 
 * [[erase_memory_on_shutdown/qemu_pmemsave]] (pros: no initial setup)
+* [[erase_memory_on_shutdown/virtualbox_dumpguestcore.mdwn]]
+  (pros: no initial setup)
 * [[erase_memory_on_shutdown/pxedump]] (pros: works for bare metal,
   possible to `|grep` and avoid writting the huge dump file to disk;
   cons: initial setup)

wiki/src/contribute/release_process/test/erase_memory_on_shutdown/virtualbox_dumpguestcore.mdwn

+Run the following from the host:
+
+    vboxmanage debugvm "${VM_NAME}" dumpguestcore --filename tails.dump
+
+and that's it.
+
+VirtualBox' VM core is an ELF that contains [some headers and other
+state](http://www.virtualbox.org/manual/ch12.html#guestcoreformat) of
+the Tails guest in addition to the memory dump, but there's no
+reasonable possibility of finding the pattern as false positives there
+so there's no reason to bother cutting the headers away.

wiki/src/doc.de.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-20 16:40+0100\n"
+"POT-Creation-Date: 2012-02-27 22:44+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"
@@ -74,16 +74,23 @@ msgstr "[[Neuer Benutzer?|download#index1h1]]"
 msgid "[[Download the ISO image|download#index2h1]]"
 msgstr "[[Download des ISO-Images|download#index2h1]] (CD-Abbild)"
 
-#. type: Bullet: '- '
-msgid "[[Verify the ISO image|download#index3h1]]"
-msgstr "[[Das ISO-Image verifizieren|download#index3h1]]"
-
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "- [[Burn a CD or install onto a USB stick|download#index4h1]]\n"
+#| "    - [[Installing onto a USB stick, for Linux|installing_onto_a_usb_stick/linux]]\n"
+#| "    - [[Installing onto a USB stick, for Windows|installing_onto_a_usb_stick/windows]]\n"
+#| "- [[Stay tuned|download#index5h1]]\n"
+#| "- [[Starting Tails!|download#index6h1]]\n"
 msgid ""
+"- [[Verify the ISO image|download#index3h1]]\n"
+"  - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
+"  - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
+"  - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
 "- [[Burn a CD or install onto a USB stick|download#index4h1]]\n"
-"    - [[Installing onto a USB stick, for Linux|installing_onto_a_usb_stick/linux]]\n"
-"    - [[Installing onto a USB stick, for Windows|installing_onto_a_usb_stick/windows]]\n"
+"  - [[Installing onto a USB stick, for Linux|installing_onto_a_usb_stick/linux]]\n"
+"  - [[Installing onto a USB stick, for Windows|installing_onto_a_usb_stick/windows]]\n"
+"  - [[Installing onto a USB stick, for Mac|installing_onto_a_usb_stick/mac]]\n"
 "- [[Stay tuned|download#index5h1]]\n"
 "- [[Starting Tails!|download#index6h1]]\n"
 msgstr ""
@@ -143,6 +150,9 @@ msgstr ""
 msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
 msgstr ""
 
+#~ msgid "[[Verify the ISO image|download#index3h1]]"
+#~ msgstr "[[Das ISO-Image verifizieren|download#index3h1]]"
+
 #~ msgid "[[About|about]]"
 #~ msgstr "[[Über Tails|about]]"