summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-04-08 22:03:29 +0200
committerTails developers <amnesia@boum.org>2012-04-08 22:03:29 +0200
commit264014b086bbabd746d39ad20ad1830b2caeb541 (patch)
tree142becb9a4c31e19b437ff7ee77ddb9cc1f3c24b
parent0c9b948f165005ad9945756acbb807a133aade15 (diff)
doc: Replace CD by DVD.
-rw-r--r--wiki/src/about.de.po6
-rw-r--r--wiki/src/about.es.po8
-rw-r--r--wiki/src/about.fr.po8
-rw-r--r--wiki/src/about.mdwn4
-rw-r--r--wiki/src/contribute/release_process/test.mdwn8
-rw-r--r--wiki/src/doc/about/requirements.de.po4
-rw-r--r--wiki/src/doc/about/requirements.es.po4
-rw-r--r--wiki/src/doc/about/requirements.fr.po6
-rw-r--r--wiki/src/doc/about/requirements.mdwn4
-rw-r--r--wiki/src/doc/about/trust.de.po2
-rw-r--r--wiki/src/doc/about/trust.es.po4
-rw-r--r--wiki/src/doc/about/trust.fr.po4
-rw-r--r--wiki/src/doc/about/trust.mdwn2
-rw-r--r--wiki/src/doc/advanced_topics/cold_boot_attacks.de.po2
-rw-r--r--wiki/src/doc/advanced_topics/cold_boot_attacks.es.po2
-rw-r--r--wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po4
-rw-r--r--wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn2
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.de.po2
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.es.po2
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.fr.po4
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.de.po2
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.es.po2
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.fr.po4
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.de.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.es.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.fr.po8
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.mdwn4
-rw-r--r--wiki/src/doc/first_steps/usb_installer.de.po9
-rw-r--r--wiki/src/doc/first_steps/usb_installer.es.po9
-rw-r--r--wiki/src/doc/first_steps/usb_installer.fr.po9
-rw-r--r--wiki/src/doc/first_steps/usb_installer.mdwn4
-rw-r--r--wiki/src/doc/get.index.de.po6
-rw-r--r--wiki/src/doc/get.index.es.po2
-rw-r--r--wiki/src/doc/get.index.fr.po4
-rw-r--r--wiki/src/doc/get.index.mdwn2
-rw-r--r--wiki/src/doc/upgrade.de.po6
-rw-r--r--wiki/src/doc/upgrade.es.po2
-rw-r--r--wiki/src/doc/upgrade.fr.po6
-rw-r--r--wiki/src/doc/upgrade.html4
-rw-r--r--wiki/src/download.de.po16
-rw-r--r--wiki/src/download.es.po26
-rw-r--r--wiki/src/download.fr.po34
-rw-r--r--wiki/src/download.html16
-rw-r--r--wiki/src/index.de.po8
-rw-r--r--wiki/src/index.es.po6
-rw-r--r--wiki/src/index.fr.po4
-rw-r--r--wiki/src/index.html2
49 files changed, 146 insertions, 143 deletions
diff --git a/wiki/src/about.de.po b/wiki/src/about.de.po
index e23cf6a..b4b31f0 100644
--- a/wiki/src/about.de.po
+++ b/wiki/src/about.de.po
@@ -60,7 +60,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"It is a complete operating-system designed to be used from a CD or a USB "
+"It is a complete operating-system designed to be used from a DVD or a USB "
"stick independently of the computer's original operating system. It is "
"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|http://"
"www.debian.org/]]."
@@ -187,13 +187,13 @@ msgstr "Überall nutzen, ohne Spuren zu hinterlassen\n"
msgid ""
"Using Tails on a computer doesn't alter or depend on the operating system "
"installed on it. So you can use it in the same way on yours, the computer of "
-"a friend or one at your local library. After removing your Tails CD or USB "
+"a friend or one at your local library. After removing your Tails DVD or USB "
"stick the computer can start again on its usual operating system."
msgstr ""
"Tails auf einem Computer zu benutzen verändert weder das installierte "
"Betriebssystem, noch ist es von diesem abhängig. Dadurch können Sie es auf "
"die gleiche Weise auf Ihrem, dem Computer eines Freundes, oder dem der "
-"örtlichen Bibliothek verwenden. Nachdem Sie Ihre Tails-CD oder den USB-Stick "
+"örtlichen Bibliothek verwenden. Nachdem Sie Ihre Tails-DVD oder den USB-Stick "
"entfernt haben, kann der Computer wieder wie gewohnt von seinem eigenen "
"Betriebssystem starten."
diff --git a/wiki/src/about.es.po b/wiki/src/about.es.po
index aa6ca6c..fc74943 100644
--- a/wiki/src/about.es.po
+++ b/wiki/src/about.es.po
@@ -54,12 +54,12 @@ msgstr ""
#. type: Plain text
msgid ""
-"It is a complete operating-system designed to be used from a CD or a USB "
+"It is a complete operating-system designed to be used from a DVD or a USB "
"stick independently of the computer's original operating system. It is "
"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|http://"
"www.debian.org/]]."
msgstr ""
-"Es un Sistema Operativo diseñado para usarse desde un CD o memoria USB, "
+"Es un Sistema Operativo diseñado para usarse desde un DVD o memoria USB, "
"funcionando independientemente del sistema operativo de la computadora en "
"que lo uses. Es [[Software Libre|doc/about/license]] basado en [[Debian GNU/"
"Linux|http://www.debian.org/]]."
@@ -167,12 +167,12 @@ msgstr "Úsalo donde sea sin dejar rastro\n"
msgid ""
"Using Tails on a computer doesn't alter or depend on the operating system "
"installed on it. So you can use it in the same way on yours, the computer of "
-"a friend or one at your local library. After removing your Tails CD or USB "
+"a friend or one at your local library. After removing your Tails DVD or USB "
"stick the computer can start again on its usual operating system."
msgstr ""
"Usar Tails en una computadora no la altera ni depende del sistema operativo "
"instalado en ésta. De modo que puedes usar tu computadora, la computadora de "
-"un amigo o de la biblioteca. Después de quitar tu CD o memoria USB con Tails "
+"un amigo o de la biblioteca. Después de quitar tu DVD o memoria USB con Tails "
"la computadora puede iniciarse normalmente con el sistema operativo "
"instalado en ésta."
diff --git a/wiki/src/about.fr.po b/wiki/src/about.fr.po
index b1ea0ba..6f1069a 100644
--- a/wiki/src/about.fr.po
+++ b/wiki/src/about.fr.po
@@ -52,13 +52,13 @@ msgstr ""
#. type: Plain text
msgid ""
-"It is a complete operating-system designed to be used from a CD or a USB "
+"It is a complete operating-system designed to be used from a DVD or a USB "
"stick independently of the computer's original operating system. It is "
"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|http://"
"www.debian.org/]]."
msgstr ""
"Tails est un système d'exploitation complet destiné à être utilisé depuis un "
-"CD ou une clef USB indépendamment du système installé sur l'ordinateur. "
+"DVD ou une clef USB indépendamment du système installé sur l'ordinateur. "
"C'est un [[logiciel libre|doc/about/license]] basé sur [[Debian GNU/Linux|"
"http://www.debian.org/]]."
@@ -166,12 +166,12 @@ msgstr "Utilisez le partout, ne laissez pas de traces\n"
msgid ""
"Using Tails on a computer doesn't alter or depend on the operating system "
"installed on it. So you can use it in the same way on yours, the computer of "
-"a friend or one at your local library. After removing your Tails CD or USB "
+"a friend or one at your local library. After removing your Tails DVD or USB "
"stick the computer can start again on its usual operating system."
msgstr ""
"L'utilisation de Tails ne modifie pas le système d'exploitation installé sur "
"l'ordinateur. Vous pouvez donc l'utiliser que vous soyez chez vous, chez un "
-"ami ou à la bibliothèque du coin. Une fois votre CD ou clef USB Tails "
+"ami ou à la bibliothèque du coin. Une fois votre DVD ou clef USB Tails "
"retirée de l'ordinateur, celui-ci peut redémarrer sur le système "
"d'exploitation habituel."
diff --git a/wiki/src/about.mdwn b/wiki/src/about.mdwn
index 4a485b6..2299734 100644
--- a/wiki/src/about.mdwn
+++ b/wiki/src/about.mdwn
@@ -10,7 +10,7 @@ Tails is a live system that aims at preserving your privacy and anonymity. 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.
-It is a complete operating-system designed to be used from a CD or a USB stick
+It is a complete operating-system designed to be used from a DVD or a USB stick
independently of the computer's original operating system. It is [[Free
Software|doc/about/license]] and based on [[Debian GNU/Linux|http://www.debian.org/]].
@@ -53,7 +53,7 @@ Use anywhere but leave no trace
Using Tails on a computer doesn't alter or depend on the operating system
installed on it. So you can use it in the same way on yours, the computer of a
-friend or one at your local library. After removing your Tails CD or USB stick
+friend or one at your local library. After removing your Tails DVD or USB stick
the computer can start again on its usual operating system.
Tails is configured with a special care to not use the computer's hard-disks,
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 3718235..00c0d30 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -116,10 +116,10 @@ Check the image size has not changed much since the last release.
partition not managed by LVM. This swap partition must not be used
by Tails.
* is a Live system found on a local hard-disk partition used? boot the
- CD/USB stick you are testing on a (possibly virtual) machine that
+ DVD/USB stick you are testing on a (possibly virtual) machine that
has a Tails system copied on a cleartext partition not managed by
- LVM. The CD/USB ramdisk must use the Tails system found on the
- CD/USB, and not the one found on the hard disk. (Also check that
+ LVM. The DVD/USB ramdisk must use the Tails system found on the
+ DVD/USB, and not the one found on the hard disk. (Also check that
without Tails, that other Live system boots.)
# Claws
@@ -231,7 +231,7 @@ steps that are worth [[a dedicated page|test/erase_memory_on_shutdown]].
some arbitrary time; Tor and Vidalia must be autostarted and end up
in working state.
* Doing an apt-get update and installing random packages.
-* Boot on bare-metal on USB and CD.
+* Boot on bare-metal on USB and DVD.
* Boot and check basic functionality is working for every supported
language. The virtual keyboard must work and be auto-configured to
use the same keyboard layout as the X session.
diff --git a/wiki/src/doc/about/requirements.de.po b/wiki/src/doc/about/requirements.de.po
index 77d9924..6fdaa5d 100644
--- a/wiki/src/doc/about/requirements.de.po
+++ b/wiki/src/doc/about/requirements.de.po
@@ -29,8 +29,8 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Either **a CD reader** or possibility to **boot from a USB stick** or an "
-"external USB CD reader."
+"Either **a DVD reader** or possibility to **boot from a USB stick** or an "
+"external USB DVD reader."
msgstr ""
#. type: Bullet: '- '
diff --git a/wiki/src/doc/about/requirements.es.po b/wiki/src/doc/about/requirements.es.po
index 77d9924..6fdaa5d 100644
--- a/wiki/src/doc/about/requirements.es.po
+++ b/wiki/src/doc/about/requirements.es.po
@@ -29,8 +29,8 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Either **a CD reader** or possibility to **boot from a USB stick** or an "
-"external USB CD reader."
+"Either **a DVD reader** or possibility to **boot from a USB stick** or an "
+"external USB DVD reader."
msgstr ""
#. type: Bullet: '- '
diff --git a/wiki/src/doc/about/requirements.fr.po b/wiki/src/doc/about/requirements.fr.po
index 96370c5..6182c7d 100644
--- a/wiki/src/doc/about/requirements.fr.po
+++ b/wiki/src/doc/about/requirements.fr.po
@@ -30,10 +30,10 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Either **a CD reader** or possibility to **boot from a USB stick** or an "
-"external USB CD reader."
+"Either **a DVD reader** or possibility to **boot from a USB stick** or an "
+"external USB DVD reader."
msgstr ""
-"Ou bien **un lecteur CD** (ou un lecteur CD externe) ou si votre ordinateur permet le boot USB, une **clé USB**"
+"Ou bien **un lecteur de DVD** (ou un lecteur de DVD externe) ou si votre ordinateur permet le boot USB, une **clé USB**"
#. type: Bullet: '- '
msgid ""
diff --git a/wiki/src/doc/about/requirements.mdwn b/wiki/src/doc/about/requirements.mdwn
index cb1bb83..451ed0d 100644
--- a/wiki/src/doc/about/requirements.mdwn
+++ b/wiki/src/doc/about/requirements.mdwn
@@ -3,8 +3,8 @@
Tails should work on any reasonably recent PC computer, say manufactured after 2005.
Here is a detailed list of requirements:
-- Either **a CD reader** or possibility to **boot from a USB stick** or an
- external USB CD reader.
+- Either **a DVD reader** or possibility to **boot from a USB stick** or an
+ external USB DVD reader.
- Tails requires an <span class="definition">[[!wikipedia x86]]</span>
compatible processor: **<span class="definition">[[!wikipedia
IBM_PC_compatible]]</span>** and others but not <span
diff --git a/wiki/src/doc/about/trust.de.po b/wiki/src/doc/about/trust.de.po
index d505e4b..58be6ab 100644
--- a/wiki/src/doc/about/trust.de.po
+++ b/wiki/src/doc/about/trust.de.po
@@ -59,7 +59,7 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a backdoor, "
"is present. Furthermore, with the source code it is possible to build the "
"software, and then compare the result against any version that is already "
-"built and being distributed, like the Tails CD images [[you can download from "
+"built and being distributed, like the Tails ISO images [[you can download from "
"us|download]]. That way it can be determined whether the distributed version "
"actually was built with the source code, or if any malicious changes have "
"been made."
diff --git a/wiki/src/doc/about/trust.es.po b/wiki/src/doc/about/trust.es.po
index 1d09b6f..e6763cb 100644
--- a/wiki/src/doc/about/trust.es.po
+++ b/wiki/src/doc/about/trust.es.po
@@ -42,8 +42,8 @@ msgid "Free software and public scrutiny\n"
msgstr "Software Libre y escrutinio público\n"
#. type: Plain text
-msgid "Free software, [[like Tails|about/license]], enables its users to check exactly what the software distribution consists of and how it functions since the source code must be made available to all who receive it. Hence a thorough audit of the code can reveal if any malicious code, like a backdoor, is present. Furthermore, with the source code it is possible to build the software, and then compare the result against any version that is already built and being distributed, like the Tails CD images [[you can download from us|download]]. That way it can be determined whether the distributed version actually was built with the source code, or if any malicious changes have been made."
-msgstr "El Software Libre, [[como Tails|about/license]], permite a sus usuarios revisar exactamente cómo se lleva a cabo la distribución de las aplicaciones y cómo funcionan, ya que el código fuente debe estar disponible para todo aquel que lo reciba. Por lo tanto una auditoría completa del código puede revelar si hay presente código malicioso, como un backdoor. Además, con el código fuente es posible compilar las aplicaciones y entonces comparar el resultado con cualquier versión que ya esté compilada y sea distribuida, como la imagen en CD de Tails [[aquí puedes descargarla|download]]. De esta forma puede determinarse si la versión distribuida actualmente fue compilada con el código fuente, o si se le hicieron cambios maliciosos."
+msgid "Free software, [[like Tails|about/license]], enables its users to check exactly what the software distribution consists of and how it functions since the source code must be made available to all who receive it. Hence a thorough audit of the code can reveal if any malicious code, like a backdoor, is present. Furthermore, with the source code it is possible to build the software, and then compare the result against any version that is already built and being distributed, like the Tails ISO images [[you can download from us|download]]. That way it can be determined whether the distributed version actually was built with the source code, or if any malicious changes have been made."
+msgstr "El Software Libre, [[como Tails|about/license]], permite a sus usuarios revisar exactamente cómo se lleva a cabo la distribución de las aplicaciones y cómo funcionan, ya que el código fuente debe estar disponible para todo aquel que lo reciba. Por lo tanto una auditoría completa del código puede revelar si hay presente código malicioso, como un backdoor. Además, con el código fuente es posible compilar las aplicaciones y entonces comparar el resultado con cualquier versión que ya esté compilada y sea distribuida, como la imagen en ISO de Tails [[aquí puedes descargarla|download]]. De esta forma puede determinarse si la versión distribuida actualmente fue compilada con el código fuente, o si se le hicieron cambios maliciosos."
#. type: Plain text
msgid "Of course, most people do not have the knowledge, skills or time required to do this, but due to public scrutiny anyone can have a certain degree of implicit trust in Free software, at least if it is popular enough that other developers look into the source code and do what was described in the previous paragraph. After all, there is a strong tradition within the Free software community to publicly report serious issues that are found within software."
diff --git a/wiki/src/doc/about/trust.fr.po b/wiki/src/doc/about/trust.fr.po
index 8eef0c7..e06af83 100644
--- a/wiki/src/doc/about/trust.fr.po
+++ b/wiki/src/doc/about/trust.fr.po
@@ -73,7 +73,7 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a backdoor, "
"is present. Furthermore, with the source code it is possible to build the "
"software, and then compare the result against any version that is already "
-"built and being distributed, like the Tails CD images [[you can download from "
+"built and being distributed, like the Tails ISO images [[you can download from "
"us|download]]. That way it can be determined whether the distributed version "
"actually was built with the source code, or if any malicious changes have "
"been made."
@@ -89,7 +89,7 @@ msgstr ""
"une porte d'entrée per exemple. De plus, il est possible de construire le\n"
"logiciel depuis le code source, et de comparer le résultat obtenu avec "
"n'importe\n"
-"quelle version déjà existante et publiée, telles que les images CD de Tails "
+"quelle version déjà existante et publiée, telles que les images ISO de Tails "
"que\n"
"[[vous pouvez télécharger|download]]. Il est ainsi possible de savoir si la\n"
"version distribuée est celle provenant du code source, ou bien si des\n"
diff --git a/wiki/src/doc/about/trust.mdwn b/wiki/src/doc/about/trust.mdwn
index 175da14..1670c74 100644
--- a/wiki/src/doc/about/trust.mdwn
+++ b/wiki/src/doc/about/trust.mdwn
@@ -28,7 +28,7 @@ receive it. Hence a thorough audit of the code can reveal if any
malicious code, like a backdoor, is present. Furthermore, with the
source code it is possible to build the software, and then compare the
result against any version that is already built and being
-distributed, like the Tails CD images [[you can download from
+distributed, like the Tails ISO images [[you can download from
us|download]]. That way it can be determined whether the distributed
version actually was built with the source code, or if any malicious
changes have been made.
diff --git a/wiki/src/doc/advanced_topics/cold_boot_attacks.de.po b/wiki/src/doc/advanced_topics/cold_boot_attacks.de.po
index 10018d6..310ed8c 100644
--- a/wiki/src/doc/advanced_topics/cold_boot_attacks.de.po
+++ b/wiki/src/doc/advanced_topics/cold_boot_attacks.de.po
@@ -47,7 +47,7 @@ msgstr ""
#. type: Plain text
msgid ""
"So, what should you do when you hear an attacker knocking at your door? You "
-"could just remove the USB stick or CD you are running Tails from. It will "
+"could just remove the USB stick or DVD you are running Tails from. It will "
"start to wipe the contents of the RAM by filling it out with random junk, "
"thus erasing everything that was stored there before, including the "
"encryption key of the encrypted storage devices you might use and the traces "
diff --git a/wiki/src/doc/advanced_topics/cold_boot_attacks.es.po b/wiki/src/doc/advanced_topics/cold_boot_attacks.es.po
index 10018d6..310ed8c 100644
--- a/wiki/src/doc/advanced_topics/cold_boot_attacks.es.po
+++ b/wiki/src/doc/advanced_topics/cold_boot_attacks.es.po
@@ -47,7 +47,7 @@ msgstr ""
#. type: Plain text
msgid ""
"So, what should you do when you hear an attacker knocking at your door? You "
-"could just remove the USB stick or CD you are running Tails from. It will "
+"could just remove the USB stick or DVD you are running Tails from. It will "
"start to wipe the contents of the RAM by filling it out with random junk, "
"thus erasing everything that was stored there before, including the "
"encryption key of the encrypted storage devices you might use and the traces "
diff --git a/wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po b/wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po
index fed0508..2ebff44 100644
--- a/wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po
+++ b/wiki/src/doc/advanced_topics/cold_boot_attacks.fr.po
@@ -33,8 +33,8 @@ msgid "In both cases the RAM contents can be analysed in a computer forensics la
msgstr "Dans les deux cas, le contenu de la RAM peut être analysé dans un laboratoire d'informatique judiciaire, ce qui peut se révéler être un véritable désastre en fonction de ce qu'ils ou elles y trouvent."
#. type: Plain text
-msgid "So, what should you do when you hear an attacker knocking at your door? You could just remove the USB stick or CD you are running Tails from. It will start to wipe the contents of the RAM by filling it out with random junk, thus erasing everything that was stored there before, including the encryption key of the encrypted storage devices you might use and the traces of your session. Then you wait, possibly trying to buy valuable time by barricading your door."
-msgstr "Alors, que faire quand vous entendez un-e attaquant-e potentiel-le frapper à votre porte ? Retirez simplement la clé USB ou le CD sur lequel vous utilisez Tails. L'effacement du contenu de la RAM débutera en la remplissant de données aléatoires, ce qui effacera tout ce qui s'y trouvait auparavant, notamment les clés de chiffrement des volumes chiffrés (clés USB, disques durs) que vous avez utilisés ainsi que les traces de votre session. Ensuite vous pouvez attendre, ou essayer de gagner un temps précieux en barricadant votre porte."
+msgid "So, what should you do when you hear an attacker knocking at your door? You could just remove the USB stick or DVD you are running Tails from. It will start to wipe the contents of the RAM by filling it out with random junk, thus erasing everything that was stored there before, including the encryption key of the encrypted storage devices you might use and the traces of your session. Then you wait, possibly trying to buy valuable time by barricading your door."
+msgstr "Alors, que faire quand vous entendez un-e attaquant-e potentiel-le frapper à votre porte ? Retirez simplement la clé USB ou le DVD sur lequel vous utilisez Tails. L'effacement du contenu de la RAM débutera en la remplissant de données aléatoires, ce qui effacera tout ce qui s'y trouvait auparavant, notamment les clés de chiffrement des volumes chiffrés (clés USB, disques durs) que vous avez utilisés ainsi que les traces de votre session. Ensuite vous pouvez attendre, ou essayer de gagner un temps précieux en barricadant votre porte."
#. type: Plain text
msgid "As far as the authors know, cold boot attacks are not standard procedure within law enforcements and similar organisations anywhere in the world yet, but it might still be good to be prepared and stay on the safe side."
diff --git a/wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn b/wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn
index ce22679..67816b2 100644
--- a/wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn
+++ b/wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn
@@ -18,7 +18,7 @@ laboratory which might turn into a major disaster depending on what they
find.
So, what should you do when you hear an attacker knocking at your door?
-You could just remove the USB stick or CD you are running Tails from. It
+You could just remove the USB stick or DVD you are running Tails from. It
will start to wipe the contents of the RAM by filling it out with random
junk, thus erasing everything that was stored there before, including
the encryption key of the encrypted storage devices you might use and
diff --git a/wiki/src/doc/advanced_topics/virtualization.de.po b/wiki/src/doc/advanced_topics/virtualization.de.po
index 3bd78d0..a3c3b5a 100644
--- a/wiki/src/doc/advanced_topics/virtualization.de.po
+++ b/wiki/src/doc/advanced_topics/virtualization.de.po
@@ -90,7 +90,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, just run Tails from a CD or USB "
+"If you are unsure, and if you can afford it, just run Tails from a DVD or USB "
"stick."
msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization.es.po b/wiki/src/doc/advanced_topics/virtualization.es.po
index 3bd78d0..a3c3b5a 100644
--- a/wiki/src/doc/advanced_topics/virtualization.es.po
+++ b/wiki/src/doc/advanced_topics/virtualization.es.po
@@ -90,7 +90,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, just run Tails from a CD or USB "
+"If you are unsure, and if you can afford it, just run Tails from a DVD or USB "
"stick."
msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization.fr.po b/wiki/src/doc/advanced_topics/virtualization.fr.po
index 252f8c6..0c35c6a 100644
--- a/wiki/src/doc/advanced_topics/virtualization.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization.fr.po
@@ -107,10 +107,10 @@ msgstr ""
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, just run Tails from a CD or USB "
+"If you are unsure, and if you can afford it, just run Tails from a DVD or USB "
"stick."
msgstr ""
-"Si vous n'êtes pas sûr, et si vous pouvez vous le permettre, utilisez Tails depuis un CD ou une clé USB."
+"Si vous n'êtes pas sûr, et si vous pouvez vous le permettre, utilisez Tails depuis un DVD ou une clé USB."
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/advanced_topics/virtualization.mdwn b/wiki/src/doc/advanced_topics/virtualization.mdwn
index 5160dc5..fa38c0b 100644
--- a/wiki/src/doc/advanced_topics/virtualization.mdwn
+++ b/wiki/src/doc/advanced_topics/virtualization.mdwn
@@ -41,7 +41,7 @@ machine: there could be a [[bug|support/found_a_problem]] in the
virtualization detection software Tails uses... or something really
weird is happening.
-If you are unsure, and if you can afford it, just run Tails from a CD
+If you are unsure, and if you can afford it, just run Tails from a DVD
or USB stick.
Tips and tricks
diff --git a/wiki/src/doc/anonymous_internet/thunderbird.de.po b/wiki/src/doc/anonymous_internet/thunderbird.de.po
index 3200e18..7519a89 100644
--- a/wiki/src/doc/anonymous_internet/thunderbird.de.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.de.po
@@ -73,7 +73,7 @@ msgid ""
"might be useful. However, this initial configuration requires writing down "
"the addresses of the servers involved, downloading mail, etc. which will "
"take some time. It is a bit annoying to have to redo everytime you start "
-"Tails, which is necessary when running from a CD, so you might want to "
+"Tails, which is necessary when running from a DVD, so you might want to "
"consider using a persistent home directory by [running from USB](#usb) if you "
"plan to use Thunderbird often. One more thing to consider is that Tor exit "
"nodes usually block the plaintext SMTP port (25) in order to prevent spam. "
diff --git a/wiki/src/doc/anonymous_internet/thunderbird.es.po b/wiki/src/doc/anonymous_internet/thunderbird.es.po
index 3200e18..7519a89 100644
--- a/wiki/src/doc/anonymous_internet/thunderbird.es.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.es.po
@@ -73,7 +73,7 @@ msgid ""
"might be useful. However, this initial configuration requires writing down "
"the addresses of the servers involved, downloading mail, etc. which will "
"take some time. It is a bit annoying to have to redo everytime you start "
-"Tails, which is necessary when running from a CD, so you might want to "
+"Tails, which is necessary when running from a DVD, so you might want to "
"consider using a persistent home directory by [running from USB](#usb) if you "
"plan to use Thunderbird often. One more thing to consider is that Tor exit "
"nodes usually block the plaintext SMTP port (25) in order to prevent spam. "
diff --git a/wiki/src/doc/anonymous_internet/thunderbird.fr.po b/wiki/src/doc/anonymous_internet/thunderbird.fr.po
index f9405f9..0670e17 100644
--- a/wiki/src/doc/anonymous_internet/thunderbird.fr.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.fr.po
@@ -91,7 +91,7 @@ msgid ""
"might be useful. However, this initial configuration requires writing down "
"the addresses of the servers involved, downloading mail, etc. which will "
"take some time. It is a bit annoying to have to redo everytime you start "
-"Tails, which is necessary when running from a CD, so you might want to "
+"Tails, which is necessary when running from a DVD, so you might want to "
"consider using a persistent home directory by [running from USB](#usb) if you "
"plan to use Thunderbird often. One more thing to consider is that Tor exit "
"nodes usually block the plaintext SMTP port (25) in order to prevent spam. "
@@ -108,7 +108,7 @@ msgstr ""
"initiale demande l'écriture des adresses des serveurs concérnés, télécharger "
"les mails, etc. Ce qui prendra un peu de temps. C'est un peu ennuyant d'avoir "
"a le refairechaque fois que vous démarrez Tails, ce qui est nécessaire quand "
-"vous démarrez a partir d'un CD, donc vous pourrait vouloir considérer "
+"vous démarrez a partir d'un DVD, donc vous pourrait vouloir considérer "
"l'utilisation d'un home directory persistent en [démarrant à partir d'une clé "
"USB](#usb) si vous envisagez d'utiliser souvent Thunderbird . Une autre chose "
"a prendre en considération est que les relais de sortie de Tor habituellement "
diff --git a/wiki/src/doc/anonymous_internet/thunderbird.mdwn b/wiki/src/doc/anonymous_internet/thunderbird.mdwn
index 7dfccee..8a6ec34 100644
--- a/wiki/src/doc/anonymous_internet/thunderbird.mdwn
+++ b/wiki/src/doc/anonymous_internet/thunderbird.mdwn
@@ -33,7 +33,7 @@ might be useful. However, this initial configuration requires writing
down the addresses of the servers involved, downloading mail, etc.
which will take some time. It is a bit annoying to have to redo
everytime you start Tails, which is necessary when running from a
-CD, so you might want to consider using a persistent home directory by
+DVD, so you might want to consider using a persistent home directory by
[running from USB](#usb) if you plan to use Thunderbird often. One
more thing to consider is that Tor exit nodes usually block the
plaintext SMTP port (25) in order to prevent spam. This is easily
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.de.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.de.po
index 17408b1..0ed0afc 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.de.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.de.po
@@ -34,7 +34,7 @@ msgid ""
"the operating system actually installed on your hard drive: as a live "
"system, Tails doesn't need to use your hard drive during the whole session. "
"Be your hard drive absent or damaged, it wouldn't prevent your computer to "
-"start Tails. Consequently, removing the CD or USB stick containing Tails is "
+"start Tails. Consequently, removing the DVD or USB stick containing Tails is "
"enough to retrieve your usual operating system."
msgstr ""
@@ -43,7 +43,7 @@ msgid ""
"A consequence of this amnesia is that you can't save anything on the device "
"containing Tails, be it files you create or download or any configuration "
"you might do. You should save anything you want to keep for later access "
-"into a separate device (other USB stick, other CD or any device you would "
+"into a separate device (other USB stick, other DVD or any device you would "
"choose). Future versions of Tails will propose a feature to save some files "
"or configuration, but it is still being developed."
msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.es.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.es.po
index 17408b1..0ed0afc 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.es.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.es.po
@@ -34,7 +34,7 @@ msgid ""
"the operating system actually installed on your hard drive: as a live "
"system, Tails doesn't need to use your hard drive during the whole session. "
"Be your hard drive absent or damaged, it wouldn't prevent your computer to "
-"start Tails. Consequently, removing the CD or USB stick containing Tails is "
+"start Tails. Consequently, removing the DVD or USB stick containing Tails is "
"enough to retrieve your usual operating system."
msgstr ""
@@ -43,7 +43,7 @@ msgid ""
"A consequence of this amnesia is that you can't save anything on the device "
"containing Tails, be it files you create or download or any configuration "
"you might do. You should save anything you want to keep for later access "
-"into a separate device (other USB stick, other CD or any device you would "
+"into a separate device (other USB stick, other DVD or any device you would "
"choose). Future versions of Tails will propose a feature to save some files "
"or configuration, but it is still being developed."
msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.fr.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.fr.po
index 835751a..2b808cf 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.fr.po
@@ -35,7 +35,7 @@ msgid ""
"the operating system actually installed on your hard drive: as a live "
"system, Tails doesn't need to use your hard drive during the whole session. "
"Be your hard drive absent or damaged, it wouldn't prevent your computer to "
-"start Tails. Consequently, removing the CD or USB stick containing Tails is "
+"start Tails. Consequently, removing the DVD or USB stick containing Tails is "
"enough to retrieve your usual operating system."
msgstr ""
"Démarrer un ordinateur sur un média contenant Tails ne change absolument rien au"
@@ -43,7 +43,7 @@ msgstr ""
"live, Tails n'a jamais besoin de votre disque dur pendant toute la durée de "
"votre session. Le fait que votre disque dur soit absent ou endommagé "
"n'empêcherait aucunement Tails de fonctionner sur votre ordinateur. Par "
-"conséquent, retirer le CD ou la clé USB qui contient Tails suffit à "
+"conséquent, retirer le DVD ou la clé USB qui contient Tails suffit à "
"retrouver intact votre système d'exploitation d'origine."
#. type: Plain text
@@ -51,14 +51,14 @@ msgid ""
"A consequence of this amnesia is that you can't save anything on the device "
"containing Tails, be it files you create or download or any configuration "
"you might do. You should save anything you want to keep for later access "
-"into a separate device (other USB stick, other CD or any device you would "
+"into a separate device (other USB stick, other DVD or any device you would "
"choose). Future versions of Tails will propose a feature to save some files "
"or configuration, but it is still being developed."
msgstr ""
"Une des conséquences de cette amnésie est que vous ne pouvez rien sauvegarder "
"sur le média contenant Tails, quoi que vous fassiez ou configuriez. Vous devriez "
"sauvegarder tout ce que vous voulez garder pour plus tard sur un média séparé "
-"(une autre clé USB, un autre CD, ou un quelconque média que vous choisiriez). "
+"(une autre clé USB, un autre DVD, ou un quelconque média que vous choisiriez). "
"Les prochaines versions de Tails proposeront une fonction afin de sauvegarder "
"certains fichiers ou certaines configurations, mais cela est encore en "
"développement."
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.mdwn b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.mdwn
index d6e775d..cb754b8 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked.mdwn
@@ -8,12 +8,12 @@ Starting a computer on a media containing Tails doesn't change anything on the
operating system actually installed on your hard drive: as a live system, Tails
doesn't need to use your hard drive during the whole session. Be your hard drive absent
or damaged, it wouldn't prevent your computer to start Tails. Consequently,
-removing the CD or USB stick containing Tails is enough to retrieve your usual
+removing the DVD or USB stick containing Tails is enough to retrieve your usual
operating system.
A consequence of this amnesia is that you can't save anything on the device
containing Tails, be it files you create or download or any configuration you
might do. You should save anything you want to keep for later access into a
-separate device (other USB stick, other CD or any device you would choose).
+separate device (other USB stick, other DVD or any device you would choose).
Future versions of Tails will propose a feature to save some files or
configuration, but it is still being developed.
diff --git a/wiki/src/doc/first_steps/usb_installer.de.po b/wiki/src/doc/first_steps/usb_installer.de.po
index c5455fe..c9a77ff 100644
--- a/wiki/src/doc/first_steps/usb_installer.de.po
+++ b/wiki/src/doc/first_steps/usb_installer.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-24 21:01+0100\n"
+"POT-Creation-Date: 2012-04-08 21:38+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"
@@ -42,7 +42,7 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
-msgid "**[[Burn a Tails CD.|download#index4h1]]** (recommended)."
+msgid "**[[Burn a Tails DVD|download#index4h1]]** (recommended)."
msgstr ""
#. type: Bullet: ' - '
@@ -54,7 +54,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"**[[Manually install Tails onto another USB stick|manual_usb_installation]]"
-"**, if you can't use a CD."
+"**, if you can't use a DVD."
msgstr ""
#. type: Title =
@@ -83,7 +83,8 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails USB installer</span></span>\n"
+" <span class=\"guimenuitem\">Tails USB installer</span>\n"
+" </span>\n"
" to start <span class=\"application\">Tails USB installer</span>.\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_installer.es.po b/wiki/src/doc/first_steps/usb_installer.es.po
index c5455fe..c9a77ff 100644
--- a/wiki/src/doc/first_steps/usb_installer.es.po
+++ b/wiki/src/doc/first_steps/usb_installer.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-24 21:01+0100\n"
+"POT-Creation-Date: 2012-04-08 21:38+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"
@@ -42,7 +42,7 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
-msgid "**[[Burn a Tails CD.|download#index4h1]]** (recommended)."
+msgid "**[[Burn a Tails DVD|download#index4h1]]** (recommended)."
msgstr ""
#. type: Bullet: ' - '
@@ -54,7 +54,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"**[[Manually install Tails onto another USB stick|manual_usb_installation]]"
-"**, if you can't use a CD."
+"**, if you can't use a DVD."
msgstr ""
#. type: Title =
@@ -83,7 +83,8 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails USB installer</span></span>\n"
+" <span class=\"guimenuitem\">Tails USB installer</span>\n"
+" </span>\n"
" to start <span class=\"application\">Tails USB installer</span>.\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_installer.fr.po b/wiki/src/doc/first_steps/usb_installer.fr.po
index c5455fe..c9a77ff 100644
--- a/wiki/src/doc/first_steps/usb_installer.fr.po
+++ b/wiki/src/doc/first_steps/usb_installer.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-24 21:01+0100\n"
+"POT-Creation-Date: 2012-04-08 21:38+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"
@@ -42,7 +42,7 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
-msgid "**[[Burn a Tails CD.|download#index4h1]]** (recommended)."
+msgid "**[[Burn a Tails DVD|download#index4h1]]** (recommended)."
msgstr ""
#. type: Bullet: ' - '
@@ -54,7 +54,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"**[[Manually install Tails onto another USB stick|manual_usb_installation]]"
-"**, if you can't use a CD."
+"**, if you can't use a DVD."
msgstr ""
#. type: Title =
@@ -83,7 +83,8 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails USB installer</span></span>\n"
+" <span class=\"guimenuitem\">Tails USB installer</span>\n"
+" </span>\n"
" to start <span class=\"application\">Tails USB installer</span>.\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_installer.mdwn b/wiki/src/doc/first_steps/usb_installer.mdwn
index ef0c7e2..137db09 100644
--- a/wiki/src/doc/first_steps/usb_installer.mdwn
+++ b/wiki/src/doc/first_steps/usb_installer.mdwn
@@ -10,10 +10,10 @@ In order to use <span class="application">Tails USB installer</span>, you need
to start Tails from another media, and clone it onto the USB stick that you want
to install. You can either:
- - **[[Burn a Tails CD|download#index4h1]]** (recommended).
+ - **[[Burn a Tails DVD|download#index4h1]]** (recommended).
- **Use another Tails USB stick**, version 0.11 or later, for example from a friend.
- **[[Manually install Tails onto another USB
- stick|manual_usb_installation]]**, if you can't use a CD.
+ stick|manual_usb_installation]]**, if you can't use a DVD.
Instructions
============
diff --git a/wiki/src/doc/get.index.de.po b/wiki/src/doc/get.index.de.po
index 85953f3..8aecf53 100644
--- a/wiki/src/doc/get.index.de.po
+++ b/wiki/src/doc/get.index.de.po
@@ -22,7 +22,7 @@ msgstr "[[Neuer Benutzer?|download#index1h1]]"
#. type: Bullet: ' - '
msgid "[[Download the ISO image|download#index2h1]]"
-msgstr "[[Download des ISO-Images|download#index2h1]] (CD-Abbild)"
+msgstr "[[Download des ISO-Images|download#index2h1]] (DVD-Abbild)"
#. type: Plain text
#, no-wrap
@@ -31,7 +31,7 @@ msgid ""
" - [[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"
+" - [[Burn a DVD or install onto a USB stick|download#index4h1]]\n"
" - [[Stay tuned|download#index5h1]]\n"
" - [[Starting Tails!|download#index6h1]]\n"
msgstr ""
@@ -39,6 +39,6 @@ msgstr ""
" - [[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"
-" - [[Eine CD brennen, oder auf einem USB-Stick installieren|download#index4h1]]\n"
+" - [[Eine DVD brennen, oder auf einem USB-Stick installieren|download#index4h1]]\n"
" - [[Auf dem aktuellen Stand bleiben!|download#index5h1]]\n"
" - [[Tails starten!|download#index6h1]]\n"
diff --git a/wiki/src/doc/get.index.es.po b/wiki/src/doc/get.index.es.po
index d0e9e7d..1e7854f 100644
--- a/wiki/src/doc/get.index.es.po
+++ b/wiki/src/doc/get.index.es.po
@@ -31,7 +31,7 @@ msgid ""
" - [[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"
+" - [[Burn a DVD or install onto a USB stick|download#index4h1]]\n"
" - [[Stay tuned|download#index5h1]]\n"
" - [[Starting Tails!|download#index6h1]]\n"
msgstr ""
diff --git a/wiki/src/doc/get.index.fr.po b/wiki/src/doc/get.index.fr.po
index 11eb9e8..a360aa0 100644
--- a/wiki/src/doc/get.index.fr.po
+++ b/wiki/src/doc/get.index.fr.po
@@ -31,7 +31,7 @@ msgid ""
" - [[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"
+" - [[Burn a DVD or install onto a USB stick|download#index4h1]]\n"
" - [[Stay tuned|download#index5h1]]\n"
" - [[Starting Tails!|download#index6h1]]\n"
msgstr ""
@@ -39,6 +39,6 @@ msgstr ""
" - [[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"
-" - [[Graver un CD ou installer sur une clef USB|download#index4h1]]\n"
+" - [[Graver un DVD ou installer sur une clef USB|download#index4h1]]\n"
" - [[Suivez les nouveautés|download#index5h1]]\n"
" - [[Démarrer Tails !|download#index6h1]]\n"
diff --git a/wiki/src/doc/get.index.mdwn b/wiki/src/doc/get.index.mdwn
index d569384..40c9f13 100644
--- a/wiki/src/doc/get.index.mdwn
+++ b/wiki/src/doc/get.index.mdwn
@@ -4,6 +4,6 @@
- [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]
- [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]
- [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]
- - [[Burn a CD or install onto a USB stick|download#index4h1]]
+ - [[Burn a DVD or install onto a USB stick|download#index4h1]]
- [[Stay tuned|download#index5h1]]
- [[Starting Tails!|download#index6h1]]
diff --git a/wiki/src/doc/upgrade.de.po b/wiki/src/doc/upgrade.de.po
index a2b94da..f0f31d2 100644
--- a/wiki/src/doc/upgrade.de.po
+++ b/wiki/src/doc/upgrade.de.po
@@ -26,11 +26,11 @@ msgstr "Tails zu upgraden funktioniert genauso wie die Erstinstallation:"
#. type: Content of: <ul><li>
msgid ""
-"if you are using Tails on a CD, just burn a new one; time to get a CD-RW to "
+"if you are using Tails on a DVD, just burn a new one; time to get a DVD-RW to "
"ease the process?"
msgstr ""
-"wenn du Tails von einer CD aus benutzt, brenn einfach eine neue; oder ist es "
-"etwa an der Zeit sich eine wiederbeschreibbare CD (CD-RW) zu kaufen, um sich "
+"wenn du Tails von einer DVD aus benutzt, brenn einfach eine neue; oder ist es "
+"etwa an der Zeit sich eine wiederbeschreibbare DVD (DVD-RW) zu kaufen, um sich "
"den Vorgang erheblich leichter zu machen?"
#. type: Content of: <ul><li>
diff --git a/wiki/src/doc/upgrade.es.po b/wiki/src/doc/upgrade.es.po
index 39cb1b3..e70dd51 100644
--- a/wiki/src/doc/upgrade.es.po
+++ b/wiki/src/doc/upgrade.es.po
@@ -26,7 +26,7 @@ msgstr ""
#. type: Content of: <ul><li>
msgid ""
-"if you are using Tails on a CD, just burn a new one; time to get a CD-RW to "
+"if you are using Tails on a DVD, just burn a new one; time to get a DVD-RW to "
"ease the process?"
msgstr ""
diff --git a/wiki/src/doc/upgrade.fr.po b/wiki/src/doc/upgrade.fr.po
index 7a06d33..3dd06e8 100644
--- a/wiki/src/doc/upgrade.fr.po
+++ b/wiki/src/doc/upgrade.fr.po
@@ -27,11 +27,11 @@ msgstr ""
#. type: Content of: <ul><li>
msgid ""
-"if you are using Tails on a CD, just burn a new one; time to get a CD-RW to "
+"if you are using Tails on a DVD, just burn a new one; time to get a DVD-RW to "
"ease the process?"
msgstr ""
-"si vous utilisez Tails sur un CD, gravez-en simplement un\n"
-"nouveau... c'est peut-etre le moment de se procurer des CD-RW ;)"
+"si vous utilisez Tails sur un DVD, gravez-en simplement un\n"
+"nouveau... c'est peut-etre le moment de se procurer des DVD-RW ;)"
#. type: Content of: <ul><li>
msgid ""
diff --git a/wiki/src/doc/upgrade.html b/wiki/src/doc/upgrade.html
index 55fd747..09bd142 100644
--- a/wiki/src/doc/upgrade.html
+++ b/wiki/src/doc/upgrade.html
@@ -3,8 +3,8 @@
<p>Upgrading Tails is just like installing it for the first time:</p>
<ul>
- <li>if you are using Tails on a CD, just burn a new one; time to get a
- CD-RW to ease the process?</li>
+ <li>if you are using Tails on a DVD, just burn a new one; time to get a
+ DVD-RW to ease the process?</li>
<li>if you are using Tails on a USB stick, just install the latest version
on it; <strong>beware</strong>: any personal data stored on the stick will be lost!</li>
</ul>
diff --git a/wiki/src/download.de.po b/wiki/src/download.de.po
index cad808b..24edea6 100644
--- a/wiki/src/download.de.po
+++ b/wiki/src/download.de.po
@@ -67,7 +67,7 @@ msgstr "Lade das ISO-Image herunter"
msgid ""
"You will download Tails in the form of an <span class=\"definition\">[[!"
"wikipedia ISO_image desc=\"ISO image\"]]</span>: a single file that you will "
-"later burn on a CD or installed onto a USB stick."
+"later burn on a DVD or installed onto a USB stick."
msgstr ""
#. type: Content of: <div><div><div><h2>
@@ -340,26 +340,26 @@ msgid "[[Trusting Tails signing key|doc/trusting_tails_signing_key]]"
msgstr ""
#. type: Content of: <div><div><h1>
-msgid "Burn a CD or install onto a USB stick"
+msgid "Burn a DVD or install onto a USB stick"
msgstr ""
#. type: Content of: <div><div><h2>
-msgid "Burning a CD"
+msgid "Burning a DVD"
msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"CDs are read-only so your Tails can't be altered by a virus or an attacker."
+"DVDs are read-only so your Tails can't be altered by a virus or an attacker."
msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"CDs are cheap but you will need to burn a new CD each time you will update "
+"DVDs are cheap but you will need to burn a new DVD each time you will update "
"your Tails version."
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "You could also use a CD-RW but those are not read-only."
+msgid "You could also use a DVD-RW but those are not read-only."
msgstr ""
#. type: Content of: <div><div><p>
@@ -484,13 +484,13 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"Now that you have a Tails CD or USB stick you can shutdown your computer and "
+"Now that you have a Tails DVD or USB stick you can shutdown your computer and "
"start using Tails without altering your existing operating system."
msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"<strong>If you're using a CD:</strong> Put the Tails CD into the CD/DVD-"
+"<strong>If you're using a DVD:</strong> Put the Tails DVD into the CD/DVD-"
"drive and restart the computer. You should see a welcome screen prompting "
"you to choose your language."
msgstr ""
diff --git a/wiki/src/download.es.po b/wiki/src/download.es.po
index ec91cc0..1c5b6b2 100644
--- a/wiki/src/download.es.po
+++ b/wiki/src/download.es.po
@@ -70,11 +70,11 @@ msgstr "Descargar la imagen ISO"
msgid ""
"You will download Tails in the form of an <span class=\"definition\">[[!"
"wikipedia ISO_image desc=\"ISO image\"]]</span>: a single file that you will "
-"later burn on a CD or installed onto a USB stick."
+"later burn on a DVD or installed onto a USB stick."
msgstr ""
"Descarga Tails como una <span class=\"definition\">[[!wikipedia ISO_image "
"desc=\"Imagen ISO\"]]</span>: Un archivo único que luego deberás grabar en "
-"un CD o instalar en una memoria USB"
+"un DVD o instalar en una memoria USB"
#. type: Content of: <div><div><div><h2>
msgid "Direct download"
@@ -302,26 +302,26 @@ msgid "[[Trusting Tails signing key|doc/trusting_tails_signing_key]]"
msgstr ""
#. type: Content of: <div><div><h1>
-msgid "Burn a CD or install onto a USB stick"
-msgstr "Grabar un CD o instalar en una memoria USB"
+msgid "Burn a DVD or install onto a USB stick"
+msgstr "Grabar un DVD o instalar en una memoria USB"
#. type: Content of: <div><div><h2>
-msgid "Burning a CD"
-msgstr "Grabando un CD"
+msgid "Burning a DVD"
+msgstr "Grabando un DVD"
#. type: Content of: <div><div><ul><li>
msgid ""
-"CDs are read-only so your Tails can't be altered by a virus or an attacker."
+"DVDs are read-only so your Tails can't be altered by a virus or an attacker."
msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"CDs are cheap but you will need to burn a new CD each time you will update "
+"DVDs are cheap but you will need to burn a new DVD each time you will update "
"your Tails version."
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "You could also use a CD-RW but those are not read-only."
+msgid "You could also use a DVD-RW but those are not read-only."
msgstr ""
#. type: Content of: <div><div><p>
@@ -453,20 +453,20 @@ msgstr "¡Inicia Tails!"
#. type: Content of: <div><div><p>
msgid ""
-"Now that you have a Tails CD or USB stick you can shutdown your computer and "
+"Now that you have a Tails DVD or USB stick you can shutdown your computer and "
"start using Tails without altering your existing operating system."
msgstr ""
-"Ahora que tienes Tails en un CD o en una memoria USB, puedes apagar tu "
+"Ahora que tienes Tails en un DVD o en una memoria USB, puedes apagar tu "
"computador y empezar a usar Tails sin alterar en nada tu sistema operativo "
"actual."
#. type: Content of: <div><div><p>
msgid ""
-"<strong>If you're using a CD:</strong> Put the Tails CD into the CD/DVD-"
+"<strong>If you're using a DVD:</strong> Put the Tails DVD into the CD/DVD-"
"drive and restart the computer. You should see a welcome screen prompting "
"you to choose your language."
msgstr ""
-"<strong>Si estás usando un CD:</strong> Pon el CD de Tails en la unidad de "
+"<strong>Si estás usando un DVD:</strong> Pon el DVD de Tails en la unidad de "
"CD/DVD y reinicia el computador. Deberías ver una pantalla de bienvenida "
"para elegir tu idioma."
diff --git a/wiki/src/download.fr.po b/wiki/src/download.fr.po
index fc2d70a..44b04ee 100644
--- a/wiki/src/download.fr.po
+++ b/wiki/src/download.fr.po
@@ -70,11 +70,11 @@ msgstr "Télécharger l'image ISO"
msgid ""
"You will download Tails in the form of an <span class=\"definition\">[[!"
"wikipedia ISO_image desc=\"ISO image\"]]</span>: a single file that you will "
-"later burn on a CD or installed onto a USB stick."
+"later burn on a DVD or installed onto a USB stick."
msgstr ""
"Vous téléchargerez Tails sous forme d'une <span class=\"definition\">[[!"
"wikipedia ISO_image desc=\"image ISO\"]]</span>: un unique fichier que vous "
-"graverez ensuite sur un CD ou que vous installerez sur une clé USB."
+"graverez ensuite sur un DVD ou que vous installerez sur une clé USB."
#. type: Content of: <div><div><div><h2>
msgid "Direct download"
@@ -341,18 +341,18 @@ msgstr ""
"trusting_tails_signing_key]]"
#. type: Content of: <div><div><h1>
-msgid "Burn a CD or install onto a USB stick"
-msgstr "Graver un CD ou installer sur une clef USB"
+msgid "Burn a DVD or install onto a USB stick"
+msgstr "Graver un DVD ou installer sur une clef USB"
#. type: Content of: <div><div><h2>
-msgid "Burning a CD"
-msgstr "Graver un CD"
+msgid "Burning a DVD"
+msgstr "Graver un DVD"
#. type: Content of: <div><div><ul><li>
msgid ""
-"CDs are read-only so your Tails can't be altered by a virus or an attacker."
+"DVDs are read-only so your Tails can't be altered by a virus or an attacker."
msgstr ""
-"Les CD sont en \"lecture seule\" ; votre Tails ne peut donc pas être modifié "
+"Les DVD sont en \"lecture seule\" ; votre Tails ne peut donc pas être modifié "
"par un virus ou un attaquant."
#. type: Content of: <div><div><ul><li>
@@ -361,14 +361,14 @@ msgstr ""
#| "CDs are cheap but you will need to burn a new CD each time you will "
#| "update your Tails version (hint: CD-RW)."
msgid ""
-"CDs are cheap but you will need to burn a new CD each time you will update "
+"DVDs are cheap but you will need to burn a new DVD each time you will update "
"your Tails version."
msgstr ""
-"Les CD sont moins cher mais vous devrez graver un nouveau CD pour chaque "
-"nouvelle version de Tails (astuce: utiliser un CD-RW)."
+"Les DVD sont moins cher mais vous devrez graver un nouveau DVD pour chaque "
+"nouvelle version de Tails (astuce: utiliser un DVD-RW)."
#. type: Content of: <div><div><ul><li>
-msgid "You could also use a CD-RW but those are not read-only."
+msgid "You could also use a DVD-RW but those are not read-only."
msgstr ""
# Trouver une documentation équivalente en Français
@@ -538,20 +538,20 @@ msgstr "Démarrer Tails !"
#. type: Content of: <div><div><p>
msgid ""
-"Now that you have a Tails CD or USB stick you can shutdown your computer and "
+"Now that you have a Tails DVD or USB stick you can shutdown your computer and "
"start using Tails without altering your existing operating system."
msgstr ""
-"Maintenant que vous avez Tails sur CD ou sur une clef USB vous pouvez "
+"Maintenant que vous avez Tails sur DVD ou sur une clef USB vous pouvez "
"redémarrer votre ordinateur et commencer à utiliser Tails sans altérer vos "
"autres systèmes d'exploitation."
#. type: Content of: <div><div><p>
msgid ""
-"<strong>If you're using a CD:</strong> Put the Tails CD into the CD/DVD-"
+"<strong>If you're using a DVD:</strong> Put the Tails DVD into the CD/DVD-"
"drive and restart the computer. You should see a welcome screen prompting "
"you to choose your language."
msgstr ""
-"<strong>Si vous utilisez un CD : </strong>Insérer le CD dans le lecteur et "
+"<strong>Si vous utilisez un DVD : </strong>Insérer le DVD dans le lecteur et "
"redémarrez l'ordinateur. Vous devriez voir apparaître un écran d'accueil "
"vous invitant à choisir votre langue."
@@ -592,7 +592,7 @@ msgid ""
msgstr ""
"Si le menu n'apparait pas, vous pourriez avoir besoin d'<a href=\"http://doc."
"ubuntu-fr.org//tutoriel/modifier_ordre_amorcage_du_bios\">éditer le BIOS de "
-"votre ordinateur</a>. C'est la même manip que pour démarrer depuis un CD, "
+"votre ordinateur</a>. C'est la même manip que pour démarrer depuis un DVD, "
"sélectionnez simplement \"Removable Device\" ou \"USB Media\" et déplacer en "
"haut de la liste. Sauvegardez les modifications et redémarrez votre ordi. "
"Pour accéder au BIOS, il vous faudra presser une touche durant le démarrage "
diff --git a/wiki/src/download.html b/wiki/src/download.html
index 9919ebc..d002330 100644
--- a/wiki/src/download.html
+++ b/wiki/src/download.html
@@ -31,7 +31,7 @@ share it without restriction.</strong>
<p>You will download Tails in the form of an <span
class="definition">[[!wikipedia ISO_image desc="ISO image"]]</span>: a
- single file that you will later burn on a CD or installed onto a USB
+ single file that you will later burn on a DVD or installed onto a USB
stick.</p>
<div id="http">
@@ -186,15 +186,15 @@ share it without restriction.</strong>
<div id="support">
- <h1 class="bullet-number-four">Burn a CD or install onto a USB stick</h1>
+ <h1 class="bullet-number-four">Burn a DVD or install onto a USB stick</h1>
- <h2>Burning a CD</h2>
+ <h2>Burning a DVD</h2>
<ul>
- <li>CDs are read-only so your Tails can't be altered by a virus or an
+ <li>DVDs are read-only so your Tails can't be altered by a virus or an
attacker.</li>
- <li>CDs are cheap but you will need to burn a new CD each time you
+ <li>DVDs are cheap but you will need to burn a new DVD each time you
will update your Tails version.</li>
- <li>You could also use a CD-RW but those are not read-only.</li>
+ <li>You could also use a DVD-RW but those are not read-only.</li>
</ul>
<p>For detailed instructions on how to burn an ISO image under Linux,
@@ -279,11 +279,11 @@ share it without restriction.</strong>
<h1 class="bullet-number-six">Start Tails!</h1>
- <p>Now that you have a Tails CD or USB stick you can shutdown your
+ <p>Now that you have a Tails DVD or USB stick you can shutdown your
computer and start using Tails without altering your existing operating
system.</p>
- <p><strong>If you're using a CD:</strong> Put the Tails CD into the
+ <p><strong>If you're using a DVD:</strong> Put the Tails DVD into the
CD/DVD-drive and restart the computer. You should see a welcome screen
prompting you to choose your language.</p>
diff --git a/wiki/src/index.de.po b/wiki/src/index.de.po
index 6bb54dc..0ab0494 100644
--- a/wiki/src/index.de.po
+++ b/wiki/src/index.de.po
@@ -22,13 +22,13 @@ msgstr "[[!meta title=\"Privatsphäre für jeden, überall\"]]"
#. type: Content of: <div><div><p>
msgid ""
-"Tails is a <span class=\"definition\">[[!wikipedia live_CD]]</span> or <span "
+"Tails is a <span class=\"definition\">[[!wikipedia live_CD desc=\"live DVD\"]]</span> or <span "
"class=\"definition\">[[!wikipedia live_USB]]</span> that aims at preserving "
"your <strong>privacy</strong> and <strong>anonymity</strong>."
msgstr ""
-"Tails ist eine [[!wikipedia_de Live-CD]] oder ein Live-USB-"
-"Stick mit dem Ziel, Ihre <strong>Privatsphäre</strong> und "
-"<strong>Anonymität</strong> zu bewahren."
+"Tails ist eine <span class=\"definition\">[[!wikipedia_de Live-CD desc=\"live "
+"DVD\"]]</span> oder ein Live-USB-Stick</span> mit "
+"dem Ziel, Ihre <strong>Privatsphäre</strong> und <strong>Anonymität</strong> zu bewahren."
#. type: Content of: <div><div><p>
msgid "It helps you to:"
diff --git a/wiki/src/index.es.po b/wiki/src/index.es.po
index 5370441..d84c1cd 100644
--- a/wiki/src/index.es.po
+++ b/wiki/src/index.es.po
@@ -22,12 +22,12 @@ msgstr "[[!meta title=\"Privacidad para todos, en todas partes\"]]"
#. type: Content of: <div><div><p>
msgid ""
-"Tails is a <span class=\"definition\">[[!wikipedia live_CD]]</span> or <span "
+"Tails is a <span class=\"definition\">[[!wikipedia live_CD desc=\"live DVD\"]]</span> or <span "
"class=\"definition\">[[!wikipedia live_USB]]</span> that aims at preserving "
"your <strong>privacy</strong> and <strong>anonymity</strong>."
msgstr ""
-"Tails es un <span class=\"definition\">[[!wikipedia live_CD]]</span> o <span "
-"class=\"definition\">[[!wikipedia live_USB]]</span> que intenta mantener tu "
+"Tails es un <span class=\"definition\">[[!wikipedia_es live_CD desc=\"live DVD\"]]</span> o <span "
+"class=\"definition\">[[!wikipedia_es live_USB]]</span> que intenta mantener tu "
"<strong>privacidad</strong> y tu <strong>anonimato</strong>."
#. type: Content of: <div><div><p>
diff --git a/wiki/src/index.fr.po b/wiki/src/index.fr.po
index 6b6375a..132e81f 100644
--- a/wiki/src/index.fr.po
+++ b/wiki/src/index.fr.po
@@ -22,11 +22,11 @@ msgstr "[[!meta title=\"Confidentialité et anonymat, pour tous et partout\"]]"
#. type: Content of: <div><div><p>
msgid ""
-"Tails is a <span class=\"definition\">[[!wikipedia live_CD]]</span> or <span "
+"Tails is a <span class=\"definition\">[[!wikipedia live_CD desc=\"live DVD\"]]</span> or <span "
"class=\"definition\">[[!wikipedia live_USB]]</span> that aims at preserving "
"your <strong>privacy</strong> and <strong>anonymity</strong>."
msgstr ""
-"Tails est un <span class=\"definition\">[[!wikipedia_fr live_CD]]</span> ou "
+"Tails est un <span class=\"definition\">[[!wikipedia_fr live_CD desc=\"live DVD\"]]</span> ou "
"<span class=\"definition\">[[!wikipedia_fr live_USB]]</span> dont le but est "
"de préserver votre <strong>vie privée</strong> et votre <strong>anonymat</"
"strong>."
diff --git a/wiki/src/index.html b/wiki/src/index.html
index 0034d02..1da8581 100644
--- a/wiki/src/index.html
+++ b/wiki/src/index.html
@@ -5,7 +5,7 @@
<div id="intro">
<p>
-Tails is a <span class="definition">[[!wikipedia live_CD]]</span> or <span
+Tails is a <span class="definition">[[!wikipedia live_CD desc="live DVD"]]</span> or <span
class="definition">[[!wikipedia live_USB]]</span> that aims at preserving your
<strong>privacy</strong> and <strong>anonymity</strong>.<br/> It helps you to:
</p>