Commit 5ea0eadd authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' into stable

parents 7dfadbc0 7e60ac50
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-04-25 00:39+0300\n" "POT-Creation-Date: 2012-06-20 20:33+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -110,11 +110,12 @@ msgid "" ...@@ -110,11 +110,12 @@ msgid ""
"several minutes:" "several minutes:"
msgstr "" msgstr ""
#. type: Content of: <pre> #. type: Content of: <p>
#, no-wrap msgid "cd [the ISO image directory]"
msgid "" msgstr ""
"cd [the ISO image directory]\n"
"gpg --verify tails-i386-0.9.iso.pgp tails-i386-0.9.iso\n" #. type: Content of: <p>
msgid "[[!inline pages=\"inc/stable_i386_gpg_verify\" raw=\"yes\"]]"
msgstr "" msgstr ""
#. type: Content of: <p> #. type: Content of: <p>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-04-25 00:39+0300\n" "POT-Creation-Date: 2012-06-20 20:33+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -124,14 +124,13 @@ msgstr "" ...@@ -124,14 +124,13 @@ msgstr ""
"<strong>Lancez alors la vérification</strong>, qui peut prendre plusieurs " "<strong>Lancez alors la vérification</strong>, qui peut prendre plusieurs "
"minutes :" "minutes :"
#. type: Content of: <pre> #. type: Content of: <p>
#, no-wrap msgid "cd [the ISO image directory]"
msgid "" msgstr ""
"cd [the ISO image directory]\n"
"gpg --verify tails-i386-0.9.iso.pgp tails-i386-0.9.iso\n" #. type: Content of: <p>
msgid "[[!inline pages=\"inc/stable_i386_gpg_verify\" raw=\"yes\"]]"
msgstr "" msgstr ""
"cd [le répertoire contenant l'image ISO]\n"
"gpg --verify tails-i386-0.9.iso.pgp tails-i386-0.9.iso\n"
#. type: Content of: <p> #. type: Content of: <p>
msgid "" msgid ""
...@@ -201,3 +200,10 @@ msgid "" ...@@ -201,3 +200,10 @@ msgid ""
"gpg: using RSA key 1202821CBE2CD9C1\n" "gpg: using RSA key 1202821CBE2CD9C1\n"
"gpg: BAD signature from \"Tails developers (signing key) &lt;tails@boum.org&gt;\"\n" "gpg: BAD signature from \"Tails developers (signing key) &lt;tails@boum.org&gt;\"\n"
msgstr "" msgstr ""
#~ msgid ""
#~ "cd [the ISO image directory]\n"
#~ "gpg --verify tails-i386-0.12.iso.pgp tails-i386-0.12.iso\n"
#~ msgstr ""
#~ "cd [le répertoire contenant l'image ISO]\n"
#~ "gpg --verify tails-i386-0.12.iso.pgp tails-i386-0.12.iso\n"
...@@ -55,10 +55,10 @@ image:</p> ...@@ -55,10 +55,10 @@ image:</p>
<p>Then, <strong>start the cryptographic verification</strong>, it can take several <p>Then, <strong>start the cryptographic verification</strong>, it can take several
minutes:</p> minutes:</p>
<pre> <p class="pre">
cd [the ISO image directory] cd [the ISO image directory]<br />
gpg --verify tails-i386-0.9.iso.pgp tails-i386-0.9.iso [[!inline pages="inc/stable_i386_gpg_verify" raw="yes"]]
</pre> </p>
<p><strong>If the ISO image is correct</strong> the output will tell you <p><strong>If the ISO image is correct</strong> the output will tell you
that the signature is good:</p> that the signature is good:</p>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -100,7 +100,7 @@ msgstr "" ...@@ -100,7 +100,7 @@ msgstr ""
msgid "" msgid ""
"If you're not sure what the cryptographic signature is, please go on and " "If you're not sure what the cryptographic signature is, please go on and "
"read the part on [[verifying the ISO image|download#verify]]." "read the part on [[verifying the ISO image|download#verify]]."
msgstr "Falls kryptographische Signaturen neu für Dich sind, informiere im Abschnitt [[verifying the ISO image|download#verify]]." msgstr "Falls kryptographische Signaturen neu für Dich sind, informiere dich im Abschnitt [[verifying the ISO image|download#verify]]."
#. type: Content of: <div><div><div><h3> #. type: Content of: <div><div><div><h3>
msgid "Set up a web mirror" msgid "Set up a web mirror"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment