Commit 392b14e2 authored by anonym's avatar anonym

Fix more buggy master → devel merge conflict resolutions.

This commit reintroduces changes that were lost in the conflict
resolution of merge 770bfdf2, reported by xin as:
* faq.es.po, faq.fr.po and faq.it.po in f7d26a70
* download.inline.de.po and download.inline.it.po in 4c33052e

Will-fix: #16376
parent 8b8755d7
......@@ -865,7 +865,7 @@ msgstr "Die Verifizierung des ISO-Image startet automatisch:"
#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
#. type: Content of: <div><ol><li>
msgid ""
......@@ -1257,11 +1257,6 @@ msgstr ""
"Signaturschlüssel von Tails mit Ihrem eigenen Schlüssel zertifizieren, um "
"einige der Warnungen während des Verifizierungsprozesses loszuwerden."
#~ msgid ""
#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#~ msgstr ""
#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#~ msgid ""
#~ "Verify the date of the signature to make sure that you downloaded the "
#~ "latest version."
......
......@@ -1035,7 +1035,7 @@ msgstr "La vérification de l'image ISO démarre automatiquement :"
#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
#. type: Content of: <div><ol><li>
msgid ""
......
......@@ -882,7 +882,7 @@ msgstr "La verifica dell'immagine ISO inizierà automaticamente:"
#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
#. type: Content of: <div><ol><li>
msgid ""
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2019-01-18 14:46+0100\n"
"POT-Creation-Date: 2019-01-25 10:35+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"
......@@ -1297,7 +1297,7 @@ msgstr ""
msgid ""
"To verify the integrity of a DVD from a separate trusted system, you can "
"verify the signature of the ISO image as documented in [[verify the ISO "
"image using OpenPGP|install/download-iso#openpgp]] against the DVD itself."
"image using OpenPGP|install/download#openpgp]] against the DVD itself."
msgstr ""
#. type: Bullet: '- '
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2019-01-18 14:46+0100\n"
"POT-Creation-Date: 2019-01-25 10:35+0100\n"
"PO-Revision-Date: 2018-04-23 13:53+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Spanish <https://translate.tails.boum.org/projects/tails/faq/"
......@@ -1298,7 +1298,6 @@ msgstr ""
#. type: Bullet: ' - '
#, fuzzy
#| msgid "We try to limit the growth of the ISO image and automatic upgrades."
msgid "We try to limit the growth of the images and automatic upgrades."
msgstr ""
"Intentamos limitar el crecimiento de la imagen ISO y las actualizaciones "
......@@ -1614,7 +1613,7 @@ msgstr ""
msgid ""
"To verify the integrity of a DVD from a separate trusted system, you can "
"verify the signature of the ISO image as documented in [[verify the ISO "
"image using OpenPGP|install/download-iso#openpgp]] against the DVD itself."
"image using OpenPGP|install/download#openpgp]] against the DVD itself."
msgstr ""
"Para verificar la integridad de un DVD desde un sistema confiado separado, "
"puedes verificar la firma de la imagen ISO como está documentado en "
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2019-01-18 14:46+0100\n"
"POT-Creation-Date: 2019-01-25 10:35+0100\n"
"PO-Revision-Date: 2018-02-26 09:59+0100\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/faq/fa/"
......@@ -1637,7 +1637,7 @@ msgstr ""
msgid ""
"To verify the integrity of a DVD from a separate trusted system, you can "
"verify the signature of the ISO image as documented in [[verify the ISO "
"image using OpenPGP|install/download-iso#openpgp]] against the DVD itself."
"image using OpenPGP|install/download#openpgp]] against the DVD itself."
msgstr ""
"برای تأیید یکپارچگی یک دی‌وی‌دی از یک سیستم مورداعتماد دیگر، می‌توانید امضای "
"تصویر ایزو را همان‌طور که در [[تأیید تصویر ایزو با استفاده از خط فرمان|doc/"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2019-01-18 14:46+0100\n"
"POT-Creation-Date: 2019-01-25 10:35+0100\n"
"PO-Revision-Date: 2018-06-25 09:04+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -1327,7 +1327,6 @@ msgstr ""
#. type: Bullet: ' - '
#, fuzzy
#| msgid "We try to limit the growth of the ISO image and automatic upgrades."
msgid "We try to limit the growth of the images and automatic upgrades."
msgstr ""
"Nous essayons de limiter la taille de l'image ISO et des mises à jour "
......@@ -1647,7 +1646,7 @@ msgstr ""
msgid ""
"To verify the integrity of a DVD from a separate trusted system, you can "
"verify the signature of the ISO image as documented in [[verify the ISO "
"image using OpenPGP|install/download-iso#openpgp]] against the DVD itself."
"image using OpenPGP|install/download#openpgp]] against the DVD itself."
msgstr ""
"Pour vérifier l'intégrité d'un DVD depuis un système de confiance séparé, "
"vous pouvez vérifier la signature de l'image ISO comme documenté dans "
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2019-01-18 14:46+0100\n"
"POT-Creation-Date: 2019-01-25 10:35+0100\n"
"PO-Revision-Date: 2018-02-26 09:59+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
......@@ -1278,7 +1278,6 @@ msgstr ""
#. type: Bullet: ' - '
#, fuzzy
#| msgid "We try to limit the growth of the ISO image and automatic upgrades."
msgid "We try to limit the growth of the images and automatic upgrades."
msgstr ""
"Cerchiamo di limitare la crescita dell'immagine ISO e degli aggiornamenti "
......@@ -1587,15 +1586,20 @@ msgstr ""
"un bugiardo; la risposta di un vero bugiardo sarebbe sempre \"no\"."
#. type: Bullet: '- '
#, fuzzy
#| msgid ""
#| "To verify the integrity of a DVD from a separate trusted system, you can "
#| "verify the signature of the ISO image as documented in [[verify the ISO "
#| "image using OpenPGP|install/download#openpgp]] against the DVD itself."
msgid ""
"To verify the integrity of a DVD from a separate trusted system, you can "
"verify the signature of the ISO image as documented in [[verify the ISO "
"image using OpenPGP|install/download-iso#openpgp]] against the DVD itself."
"image using OpenPGP|install/download#openpgp]] against the DVD itself."
msgstr ""
"Per verificare l'integrità di un DVD da un sistema di fiducia separato, è "
"possibile verificare la firma dell'immagine ISO come documentato in "
"[[verificare l'immagine ISO utilizzando OpenPGP|install/download-"
"iso#openpgp]] rispetto al DVD stesso."
"[[verificare l'immagine ISO utilizzando OpenPGP|install/download#openpgp]] "
"rispetto al DVD stesso."
#. type: Bullet: '- '
#, fuzzy
......
......@@ -639,7 +639,7 @@ liar; the answer of a true liar would always be "no".
- To verify the integrity of a DVD from a separate trusted system, you can
verify the signature of the ISO image as documented in [[verify the ISO image
using OpenPGP|install/download-iso#openpgp]]
using OpenPGP|install/download#openpgp]]
against the DVD itself.
- There is no documented method of verifying the integrity of a Tails USB stick
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2019-01-18 14:46+0100\n"
"POT-Creation-Date: 2019-01-25 10:35+0100\n"
"PO-Revision-Date: 2018-04-29 20:24+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -1635,7 +1635,7 @@ msgstr ""
msgid ""
"To verify the integrity of a DVD from a separate trusted system, you can "
"verify the signature of the ISO image as documented in [[verify the ISO "
"image using OpenPGP|install/download-iso#openpgp]] against the DVD itself."
"image using OpenPGP|install/download#openpgp]] against the DVD itself."
msgstr ""
"Para verificar a integridade de um DVD a partir de um sistema independente "
"confiável, você pode verificar a assinatura da imagem ISO como documentado "
......
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