Commit fb27af79 authored by Tails developers's avatar Tails developers

resolve faulty merge

parent 8d875ffd
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:50-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:53-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 11:28-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 13:35-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 21:02-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-10 15:02+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-21 17:11-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:35-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 13:58-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 13:37-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2013-08-05 11:04+0200\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:03-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 13:23-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 14:22-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:29-0000\n"
"Last-Translator: \n"
"Language-Team: <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:32-0000\n"
"Last-Translator: \n"
"Language-Team: sLANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 19:33-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 19:33-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 14:54-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 12:48-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 13:36-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 19:34-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-24 20:31+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 10:39-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -389,93 +389,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
<<<<<<< HEAD
msgid "<a id=\"problematic-usb-sticks\"></a>\n"
msgstr ""
#. type: Title -
#, no-wrap
msgid "Problematic USB sticks\n"
msgstr "Clés USB problématiques\n"
#. type: Plain text
msgid ""
"The following USB sticks have issues starting Tails. They are configured by "
"the manufacturer as a fixed disk, and not as a removable disk. As a "
"consequence, they require removing the `live-media=removable` boot "
"parameter, which [[is dangerous|doc/first_steps/bug_reporting/"
"tails_does_not_start#entirely]]."
msgstr ""
"Les clés USB suivantes posent des problèmes pour démarrer Tails. Elles sont "
"configurées par le constructeur comme des disques fixes, et non comme des "
"disques amovibles. En conséquence, il est nécessaire d'enlever le paramètre "
"de démarrage `live-media=removable`, ce qui [[est dangereux|doc/first_steps/"
"bug_reporting/tails_does_not_start#entirely]]."
#. type: Bullet: '* '
msgid "SanDisk Cruzer Edge 8GB"
msgstr "SanDisk Cruzer Edge 8GB"
#. type: Bullet: '* '
msgid "SanDisk Cruzer Extreme USB 3.0 16GB and 32GB"
msgstr "SanDisk Cruzer Extreme USB 3.0 16GB et 32GB"
#. type: Bullet: '* '
msgid "SanDisk Cruzer Fit USB 2.0 8GB, 16GB, and 32G"
msgstr "SanDisk Cruzer Fit USB 2.0 8GB, 16GB, et 32G"
#. type: Bullet: '* '
msgid "SanDisk Cruzer Force 8GB"
msgstr "SanDisk Cruzer Force 8GB"
#. type: Bullet: '* '
msgid "SanDisk Cruzer Glide 4GB, 8GB and 16GB"
msgstr "SanDisk Cruzer Glide 4GB, 8GB et 16GB"
#. type: Bullet: '* '
msgid "SanDisk Cruzer Switch USB 2.0 8GB and 32GB"
msgstr "SanDisk Cruzer Switch USB 2.0 8GB et 32GB"
#. type: Bullet: '* '
msgid "SanDisk Cruzer USB 3.0 64GB"
msgstr "SanDisk Cruzer USB 3.0 64GB"
#. type: Bullet: '* '
msgid "SanDisk Cruzer Blade 4GB"
msgstr "SanDisk Cruzer Blade 4GB"
#. type: Bullet: '* '
msgid "SanDisk Cruzer Facet"
msgstr "SanDisk Cruzer Facet"
#. type: Bullet: '* '
msgid "Staples Relay USB 2.0 16GB"
msgstr "Staples Relay USB 2.0 16GB"
#. type: Plain text
msgid ""
"SanDisk had begun the production of flash drives configured as fixed disk in "
"2012 to meet new requirements for Windows 8 Certification. The flash drives "
"that comply with this certification will have the Windows 8 logo on their "
"packaging. If a flash drive does not have the Windows 8 logo on its "
"packaging, then that drive will function as a removable disk about should "
"work with Tails."
msgstr ""
"SanDisk a débuté la production de lecteurs flash configurés comme des "
"disques fixes en 2012 pour faire face aux exigences de certification de "
"Windows 8. Les lecteurs flash qui respectent cette certification auront le "
"logo Windows 8 sur leur emballage. Si un lecteur flash n'a pas le logo "
"Windows 8 sur son emballage, alors celui-ci fonctionnera comme un disque "
"amovible et devrait fonctionner avec Tails."
#. type: Plain text
msgid "See also [[!tails_ticket 6397]]."
msgstr "Voir également [[!tails_ticket 6397]]."
#. type: Plain text
#, no-wrap
=======
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
msgid "<a id=\"chainloading\"></a>\n"
msgstr ""
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-25 11:05+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 14:35-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
Markdown is supported
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