Commit e8007f06 authored by intrigeri's avatar intrigeri

Fix partially resolved merge conflicts.

parent 3c868234
......@@ -5,41 +5,24 @@
#
msgid ""
msgstr ""
<<<<<<< HEAD
"Project-Id-Version: \n"
"POT-Creation-Date: 2013-10-28 02:41+0000\n"
"PO-Revision-Date: 2015-11-20 22:51+0100\n"
"Last-Translator: \n"
=======
"Project-Id-Version: ITALIAN TEAM\n"
"POT-Creation-Date: 2013-10-28 02:41+0000\n"
"PO-Revision-Date: 2015-11-20 12:05+0100\n"
"Last-Translator: Zeyev <tbd@tbd.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
>>>>>>> a625dbddb831362ec3592950c61150853ed41c48
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< HEAD
"Language-Team: \n"
"X-Generator: Poedit 1.8.5\n"
=======
"X-Generator: Poedit 1.5.7\n"
>>>>>>> a625dbddb831362ec3592950c61150853ed41c48
#. type: Plain text
msgid ""
"To uninstall Tails from a USB stick or SD card, and use it for something "
"else, you have to reset it."
msgstr ""
<<<<<<< HEAD
"Per disinstallare Tails da una chiavetta USB o una scheda SD, e usarla per "
"qualcosaltro, devi formattarla."
=======
"Per disinstallare Tails da una chiave USB o una scheda SD e usarla per "
"qualcos'altro, devi resettarla."
>>>>>>> a625dbddb831362ec3592950c61150853ed41c48
#. type: Plain text
#, no-wrap
......@@ -50,16 +33,9 @@ msgid ""
"[[securely clean all the available disk space|encryption_and_privacy/secure_deletion#usb_and_ssd]]\n"
"afterwards.\n"
msgstr ""
<<<<<<< HEAD
"**Il contenuto del dispositivo sarà perduto nell'operazione,**ma un attaccante\n"
"potrebbe essere ancora in gado di dire che Tails e' stata installata sul dispositivo usando\n"
"[[tecniche di recupero dati|privacy_e_crittografia/cancellazione_sicura]] a meno che\n"
"[[cancellazione sicura di tutto lo spazio disponibile sul disco|crittografia_e_privacy/cancellazione_sicura#usb_and_ssd]]\n"
"successivamente.\n"
"\n"
=======
"**Il contenuto del dispositivo sarà perso in questa operazione,** ma un aggressore\n"
" potrebbe comunque essere in grado di vedere che Tails è stato installato su quel dispositivo usando [[tecniche di recupero dati|encryption_and_privacy/secure_deletion]],\n"
" a meno che tu non abbia [[pulito efficacemente tutto lo spazio disponibile sul disco|encryption_and_privacy/secure_deletion#usb_and_ssd]]\n"
" subito dopo.\n"
>>>>>>> a625dbddb831362ec3592950c61150853ed41c48
......@@ -5,48 +5,26 @@
#
msgid ""
msgstr ""
<<<<<<< HEAD
"Project-Id-Version: \n"
"POT-Creation-Date: 2014-07-23 00:14+0300\n"
"PO-Revision-Date: 2015-11-20 22:40+0100\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
=======
"Project-Id-Version: Tails italiano\n"
"POT-Creation-Date: 2015-11-22 13:07+0100\n"
"PO-Revision-Date: 2015-11-20 00:23+0100\n"
"Last-Translator: Zeyev <tbd@tbd.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
>>>>>>> a625dbddb831362ec3592950c61150853ed41c48
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< HEAD
"Language-Team: \n"
"X-Generator: Poedit 1.8.5\n"
=======
"X-Generator: Poedit 1.5.7\n"
>>>>>>> a625dbddb831362ec3592950c61150853ed41c48
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Uninstalling Tails or resetting a USB stick or SD card\"]]\n"
<<<<<<< HEAD
msgstr "[[!meta title=\"Disinstallare Tails o formattare una chiavetta USB o una scheda SD\"]]\n"
msgstr "[[!meta title=\"Disinstallare Tails o formattare una chiave USB o una scheda SD\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/usb_reset.intro.it\" raw=\"yes\"]]\n"
=======
msgstr "[[!meta title=\"Disinstallare Tails o resettare una chiave USB o una scheda SD\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/reset.intro\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/reset.intro.fr\" raw=\"yes\"]]\n"
>>>>>>> a625dbddb831362ec3592950c61150853ed41c48
#. type: Bullet: ' - '
msgid ""
......@@ -58,12 +36,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid "[[Instructions for Windows|reset/windows]]"
msgstr "[[Istruzioni per Windows|reset/windows]]"
<<<<<<< HEAD
=======
#. type: Bullet: ' - '
#, fuzzy
#| msgid "[[Instructions for Windows|reset/windows]]"
msgid "[[Instructions for Mac OS X|reset/mac]]"
msgstr "[[Istruzioni per Windows|reset/windows]]"
>>>>>>> a625dbddb831362ec3592950c61150853ed41c48
msgstr "[[Istruzioni per Mac OS X|reset/mac]]"
This diff is collapsed.
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