Commit 05c9f32a authored by tchou's avatar tchou

tentative de merge.

parent 446db357
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"POT-Creation-Date: 2016-08-15 14:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,11 +16,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu using the command line\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"POT-Creation-Date: 2016-08-15 14:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,11 +16,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu using the command line\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"POT-Creation-Date: 2016-08-15 14:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,11 +16,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu using the command line\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"POT-Creation-Date: 2016-08-15 14:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,11 +16,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Installing Tails on a USB stick from Debian or Ubuntu using the command line\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
......
......@@ -6,12 +6,21 @@
#, fuzzy
msgid ""
msgstr ""
<<<<<<< Updated upstream
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-01-20 13:52+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
=======
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-08-15 12:10+0200\n"
"PO-Revision-Date: 2016-02-14 21:26+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
"Language: de\n"
>>>>>>> Stashed changes
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -21,6 +30,7 @@ msgid "You need:"
msgstr ""
#. type: Content of: <div><div><div><div>
<<<<<<< Updated upstream
msgid "[[!img install/inc/icons/clock.png link=\"no\"]]"
msgstr ""
......@@ -45,6 +55,24 @@ msgid ""
"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
=======
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
#. type: Content of: <div><div><div><div><div><h4>
#, fuzzy
#| msgid "your Tails"
msgid "Your Tails"
msgstr "Ihr Tails"
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 other Tails"
msgstr "1 anderes Tails"
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>DVD or USB</small>"
msgstr "<small>DVD oder USB</small>"
>>>>>>> Stashed changes
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
......@@ -62,6 +90,7 @@ msgstr ""
msgid "<small>All data will be lost!</small>"
msgstr ""
<<<<<<< Updated upstream
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr ""
......@@ -70,6 +99,8 @@ msgstr ""
msgid "your Tails"
msgstr ""
=======
>>>>>>> Stashed changes
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 USB stick"
msgstr ""
......@@ -82,13 +113,47 @@ msgstr ""
msgid "1 DVD"
msgstr ""
<<<<<<< Updated upstream
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 other Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>DVD or USB</small>"
=======
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/clock.png link=\"no\"]]"
msgstr "[[!img install/inc/icons/clock.png link=\"no\"]]"
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
"<span class=\"upgrade-clone\">¼ hour</span>"
msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 Stunden</span> <span class="
"\"debian expert\">1½ Stunden</span> <span class=\"install-clone\">½ Stunde</"
"span> <span class=\"upgrade-clone\">¼ Stunde</span>"
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] to "
"download</small>"
>>>>>>> Stashed changes
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
"install</small></span> <span class=\"debian expert\"><small>½ hour to "
"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 Stunde zum "
"Installieren</small></span> <span class=\"debian expert\"><small>½ Stunde "
"zum Installieren</small></span> <span class=\"upgrade-tails\"><small>½ "
"Stunde zum Aktualisieren</small></span>"
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/screens.png link=\"no\"]]"
......@@ -208,4 +273,22 @@ msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Configure"
<<<<<<< Updated upstream
msgstr ""
=======
msgstr "<span class=\"step-number\"></span>Konfigurieren"
#, fuzzy
#~| msgid ""
#~| "<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails"
#~| "\"> <small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] to "
#~| "download</small>"
#~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails"
#~ "\"> <small>[[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes\"]] "
#~ "to download</small>"
#~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails"
#~ "\"> <small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] zum "
#~ "herunterladen</small>"
>>>>>>> Stashed changes
......@@ -7,7 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< Updated upstream
"POT-Creation-Date: 2016-01-20 13:52+0100\n"
=======
"POT-Creation-Date: 2016-08-15 12:10+0200\n"
>>>>>>> Stashed changes
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -21,10 +25,11 @@ msgid "You need:"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/clock.png link=\"no\"]]"
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
<<<<<<< Updated upstream
msgid ""
"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
......@@ -36,16 +41,22 @@ msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes\"]] to "
"download</small>"
=======
msgid "Your Tails"
>>>>>>> Stashed changes
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
"install</small></span> <span class=\"debian expert\"><small>½ hour to "
"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgid "1 other Tails"
msgstr ""
<<<<<<< Updated upstream
=======
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>DVD or USB</small>"
msgstr ""
>>>>>>> Stashed changes
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
msgstr ""
......@@ -62,14 +73,6 @@ msgstr ""
msgid "<small>All data will be lost!</small>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "your Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 USB stick"
msgstr ""
......@@ -82,14 +85,35 @@ msgstr ""
msgid "1 DVD"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/clock.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 other Tails"
msgid ""
"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
"<span class=\"upgrade-clone\">¼ hour</span>"
msgstr ""
<<<<<<< Updated upstream
=======
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] to "
"download</small>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>DVD or USB</small>"
msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
"install</small></span> <span class=\"debian expert\"><small>½ hour to "
"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
>>>>>>> Stashed changes
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/screens.png link=\"no\"]]"
msgstr ""
......
......@@ -6,12 +6,21 @@
#, fuzzy
msgid ""
msgstr ""
<<<<<<< Updated upstream
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-01-20 13:52+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
=======
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2016-08-15 12:10+0200\n"
"PO-Revision-Date: 2016-02-19 19:27-0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
>>>>>>> Stashed changes
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -21,6 +30,7 @@ msgid "You need:"
msgstr ""
#. type: Content of: <div><div><div><div>
<<<<<<< Updated upstream
msgid "[[!img install/inc/icons/clock.png link=\"no\"]]"
msgstr ""
......@@ -45,6 +55,24 @@ msgid ""
"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
=======
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
#. type: Content of: <div><div><div><div><div><h4>
#, fuzzy
#| msgid "your Tails"
msgid "Your Tails"
msgstr "votre Tails"
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 other Tails"
msgstr "1 autre Tails"
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>DVD or USB</small>"
msgstr "<small>sur un DVD ou une clé USB</small>"
>>>>>>> Stashed changes
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
......@@ -62,6 +90,7 @@ msgstr ""
msgid "<small>All data will be lost!</small>"
msgstr ""
<<<<<<< Updated upstream
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr ""
......@@ -70,6 +99,8 @@ msgstr ""
msgid "your Tails"
msgstr ""
=======
>>>>>>> Stashed changes
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 USB stick"
msgstr ""
......@@ -82,13 +113,47 @@ msgstr ""
msgid "1 DVD"
msgstr ""
<<<<<<< Updated upstream
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 other Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>DVD or USB</small>"
=======
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/clock.png link=\"no\"]]"
msgstr "[[!img install/inc/icons/clock.png link=\"no\"]]"
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
"<span class=\"upgrade-clone\">¼ hour</span>"
msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 heures</span> <span class="
"\"debian expert\">1 heure ½</span> <span class=\"install-clone\">½ heure</"
"span> <span class=\"upgrade-clone\">¼ d'heure</span>"
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] to "
"download</small>"
>>>>>>> Stashed changes
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
"install</small></span> <span class=\"debian expert\"><small>½ hour to "
"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 heure pour "
"l'installation</small></span> <span class=\"debian expert\"><small>½ heure "
"pour l'installation</small></span> <span class=\"upgrade-tails\"><small>½ "
"heure pour la mise à jour</small></span>"
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/screens.png link=\"no\"]]"
......@@ -208,4 +273,22 @@ msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Configure"
<<<<<<< Updated upstream
msgstr ""
=======
msgstr "<span class=\"step-number\"></span>Configuration"
#, fuzzy
#~| msgid ""
#~| "<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails"
#~| "\"> <small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] to "
#~| "download</small>"
#~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails"
#~ "\"> <small>[[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes\"]] "
#~ "to download</small>"
#~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails"
#~ "\"> <small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] à "
#~ "télécharger</small>"
>>>>>>> Stashed changes
<div id="overview">
<h2>overview</h2>
<h2>overview XXXXX</h2>
</div>
<div class="row">
......@@ -250,4 +250,4 @@
</ol>
</div>
</div>
</div>
</div>
\ No newline at end of file
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-08-15 12:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><h3>
msgid "You need:"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "Your Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 other Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>DVD or USB</small>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "2 USB sticks"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>4 GB minimum</small>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>All data will be lost!</small>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 USB stick"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-dvd.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 DVD"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/clock.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
"\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
"<span class=\"upgrade-clone\">¼ hour</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> "
"<small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] to "
"download</small>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
"install</small></span> <span class=\"debian expert\"><small>½ hour to "
"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/screens.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "a smartphone"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><small>
msgid "<small> another computer,"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><small>
msgid "or a printer"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "to follow the instructions </small>"
msgstr ""
#. type: Content of: <div><h3>
msgid "Your steps:"
msgstr ""
#. type: Content of: <div><ol><li><h4>
msgid ""
"First you will <span class=\"windows linux mac-usb\">install an intermediary "
"Tails on the first USB stick.</span> <span class=\"mac-dvd\">burn an "
"intermediary Tails on a DVD.</span> <span class=\"debian expert\">install a "
"Tails on your USB stick.</span> <span class=\"install-clone upgrade-clone"
"\">restart on the other Tails.</span> <span class=\"upgrade-tails\">install "
"and upgrade an intermediary Tails.</span>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Download"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Restart"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid ""
"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "Install"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/insert-dvd.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "Upgrade"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/icons/restart.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "Restart"
msgstr ""
#. type: Content of: <div><ol><li><h4>
msgid ""
"Then you will <span class=\"windows linux mac-usb\">install the final Tails "
"on the second USB stick.</span> <span class=\"mac-dvd\">install the final "
"Tails on your USB stick.</span> <span class=\"install-clone\">install Tails "
"on your USB stick.</span> <span class=\"debian expert\">configure it.</span> "
"<span class=\"upgrade-clone upgrade-tails\">upgrade your Tails.</span>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid ""
"<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
"class=\"upgrade\">Upgrade</span>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Install"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Configure"
msgstr ""
......@@ -6,10 +6,17 @@
#, fuzzy
msgid ""
msgstr ""
<<<<<<< Updated upstream
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-01-20 13:52+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
=======
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-08-15 12:10+0200\n"
"PO-Revision-Date: 2016-04-30 11:52-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
>>>>>>> Stashed changes
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
......@@ -21,6 +28,7 @@ msgid "You need:"
msgstr ""
#. type: Content of: <div><div><div><div>
<<<<<<< Updated upstream
msgid "[[!img install/inc/icons/clock.png link=\"no\"]]"
msgstr ""
......@@ -45,6 +53,24 @@ msgid ""
"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
=======
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
#. type: Content of: <div><div><div><div><div><h4>
#, fuzzy
#| msgid "your Tails"
msgid "Your Tails"
msgstr "seu Tails"
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 other Tails"
msgstr "1 outro Tails"