merge con nuovi file master tails

wiki/src/install/inc/overview.it.po

@@ -44,6 +44,9 @@ msgstr ""
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "1 other Tails"
 msgstr ""
+"<span class=\"windows linux mac-usb mac-dvd debian expert upgrade-tails\"> "
+"<small>[[!inline pages=\"inc/stable_i386_iso_size\" raw=\"yes\"]] da "
+"scaricare</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "<small>DVD or USB</small>"
@@ -74,21 +77,23 @@ msgstr "<small>Tutti i dati andranno persi!</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "1 USB stick"
-msgstr ""
+msgstr "1 chiavetta USB "
 
 #. type: Content of: <div><div><div><div>
+
 msgid "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "1 DVD"
-msgstr ""
+msgstr "1 DVD"
 
 #. type: Content of: <div><div><div><div>
 msgid "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
 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> "
@@ -152,6 +157,7 @@ msgstr ""
 "fare l'avanzamento di versione dalla Tails che fa l'intermediazione.</span>"
 
 #. type: Content of: <div><ol><li><div><div><div>
+
 msgid ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
 "image downloaded and verified\"]]"
@@ -184,6 +190,7 @@ msgid "Install"
 msgstr "Installa"
 
 #. type: Content of: <div><ol><li><div><div><div>
+
 msgid ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
 "\"Tails installed on USB stick on the left\"]]"
@@ -199,13 +206,16 @@ msgstr ""
 msgid ""
 "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"ISO "
 "image installed on USB stick on the left\"]]"
+
 msgstr ""
+
 #. type: Content of: <div><ol><li><div><div><div><div><h5>
 msgid "Upgrade"
 msgstr "Upgrade"
 
 #. type: Content of: <div><ol><li><div><div><div>
 
+
 msgid "[[!img install/inc/icons/restart.png link=\"no\" alt=\"\"]]"
 msgstr ""
 
@@ -256,6 +266,7 @@ msgstr "<span class=\"step-number\"></span>Installa"
 
 #. type: Content of: <div><ol><li><div><div><div>
 
+
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Encryption configured on USB stick on the right\"]]"

wiki/src/install/inc/steps/create_persistence.inline.it.po

@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 
+
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-17 09:18+0300\n"
 "PO-Revision-Date: 2016-06-30 22:58-0000\n"
@@ -246,6 +247,7 @@ msgstr "Clicca <span class=\"button\">Salva</span>."
 #. type: Plain text
 #, no-wrap
 
+
 msgid "   <div class=\"step-image\">[[!img install/inc/infography/restart-on-tails.png link=\"no\" alt=\"Computer restarted on USB stick on the right\"]]</div>\n"
 msgstr ""
 
@@ -334,6 +336,13 @@ msgstr ""
 "<div class=\"state-image debian expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
 "<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
 "<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
+<<<<<<< HEAD
+=======
+msgstr ""
+"<div class=\"state-image debian expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
+"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
+"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
+>>>>>>> def1062ef4b0dd68c9c6f0b1105d1d2d5a6d057e
 
 #. type: Plain text
 #, no-wrap
@@ -363,6 +372,7 @@ msgstr "  <div class=\"col-md-6\">\n"
 #. type: Plain text
 #, no-wrap
 
+
 msgid "    [[!img lib/admon-caution.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
@@ -383,6 +393,7 @@ msgstr "  </div>\n"
 #. type: Plain text
 #, no-wrap
 
+
 msgid "    [[!img lib/help-browser.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 

wiki/src/install/inc/steps/download.inline.it.po

@@ -6,10 +6,9 @@
 msgid ""
 msgstr ""
 
+
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-25 18:19+0300\n"
-"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2016-05-17 09:40+0200\n"
 "PO-Revision-Date: 2016-07-24 17:51-0000\n"
 "Last-Translator: ignifugo <ignifugo@insicuri.net>\n"
 "Language-Team: transitails <LL@li.org>\n"
@@ -30,7 +29,6 @@ msgid ""
 "image downloaded and verified\"]]"
 msgstr ""
 
-
 #. type: Content of: <p>
 msgid ""
 "<span class=\"windows mac-usb mac-dvd debian linux upgrade-tails dvd vm\">In "
@@ -48,6 +46,7 @@ msgstr ""
 
 #. type: Content of: <div>
 
+
 msgid "[[!img lib/spinner.png link=\"no\" alt=\"Wait\"]]"
 msgstr ""
 
@@ -398,6 +397,7 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
 
+
 msgid "The download has been paused. Click on the play button to resume."
 msgstr ""
 
@@ -477,6 +477,7 @@ msgstr ""
 "OpenPGP</a>. [[Vedi come si fa.|install/download/openpgp]]"
 
 
+
 #. type: Content of: <div><div><div><div><div>
 msgid "[[!toggleable id=\"openpgp\" text=\"\"\""
 msgstr ""

wiki/src/install/inc/steps/install_final.inline.it.po

@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 
+
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-17 09:18+0300\n"
 "PO-Revision-Date: 2016-07-24 18:14-0000\n"
@@ -108,6 +109,7 @@ msgstr "<div class=\"step-image\">\n"
 #. type: Plain text
 #, no-wrap
 
+
 msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
 msgstr ""
 
@@ -126,6 +128,7 @@ msgstr ""
 msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
 msgstr ""
 
+
 #. type: Bullet: '1. '
 msgid ""
 "Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
@@ -174,6 +177,7 @@ msgstr "   <p>Avvia <span class=\"application\">Tails Installer</span>.</p>\n"
 #. type: Plain text
 #, no-wrap
 
+
 msgid "   [[!img install/inc/icons/tails-installer.png link=\"no\" alt=\"Tails Installer\"]]\n"
 msgstr ""
 
@@ -195,6 +199,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 
+
 msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
 msgstr ""
 
@@ -203,7 +208,6 @@ msgstr ""
 msgid "   [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
 msgstr ""
 
-
 #. type: Plain text
 #, no-wrap
 msgid "   <div class=\"step-image\">\n"
@@ -212,6 +216,7 @@ msgstr "   <div class=\"step-image\">\n"
 #. type: Plain text
 #, no-wrap
 
+
 msgid "   [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
 msgstr ""
 

wiki/src/upgrade.it.po

@@ -6,9 +6,10 @@
 msgid ""
 msgstr ""
 
+
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-17 09:18+0300\n"
-"PO-Revision-Date: 2016-08-25 17:58-0000\n"
+"Project-Id-Version: transitails\n"
 "Last-Translator: transitails <transitails@inventati.org>\n"
 "Language-Team: transitails <LL@li.org>\n"
 "Language: it\n"

wiki/src/upgrade/tails.it.po

@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 
+
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-17 09:18+0300\n"
 "PO-Revision-Date: 2016-08-25 18:00-0000\n"