summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-03-16 19:01:31 +0000
committersajolida <sajolida@pimienta.org>2018-03-16 19:01:31 +0000
commitd44707ac06e0ae87f749b3b88e91fbc7505be13a (patch)
treea9822c81ee62ff2fcd25a30862884e03ecae0451
parentb98df0aaeb50b9dd1cc2719c9a080c2b729974a5 (diff)
parenteafa36b0c04a7ded275f1b4efdd1cb6d0136c322 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--wiki/src/contribute/release_process.mdwn4
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn7
-rw-r--r--wiki/src/index.pt.po18
-rw-r--r--wiki/src/news/version_3.6.de.po3
-rw-r--r--wiki/src/news/version_3.6.fa.po3
-rw-r--r--wiki/src/upgrade/tails.de.po26
-rwxr-xr-xwiki/src/upgrade/tails.es.po22
-rw-r--r--wiki/src/upgrade/tails.fa.po6
-rw-r--r--wiki/src/upgrade/tails.fr.po28
-rw-r--r--wiki/src/upgrade/tails.it.po20
-rw-r--r--wiki/src/upgrade/tails.pt.po23
11 files changed, 88 insertions, 72 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 810d0bc..be83d0d 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -10,7 +10,7 @@ Requirements
To release Tails you'll need some packages installed:
* `tidy mktorrent transmission-cli`
-* Aufs DKMS module for your running kernel.
+* aufs DKMS module for your running kernel.
* [[!debpts squashfs-tools]] that honors `$SOURCE_DATE_EPOCH`.
Install it from our custom `devel` APT suite.
* `tails-iuk` dependencies, including suggested packages (see
@@ -130,7 +130,7 @@ If we are at freeze time for a point-release:
1. Merge the `master` Git branch into `stable`:
- git checkout stable && git merge --no-ff origin/master
+ git checkout stable && git fetch && git merge --no-ff origin/master
2. [[Merge each APT overlay suite|APT_repository/custom#workflow-merge-overlays]]
listed in the `stable` branch's `config/APT_overlays.d/` into the `stable`
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index b946615..2f1e4e1 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -66,8 +66,9 @@ with GnuPG:
Filter the tarballs we want and make them available at build time,
when the tarballs are fetched:
- grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt > \
- config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
+ grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt \
+ | grep -v '\<tor-browser-linux64-debug\.tar\.xz$' \
+ > config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
Then update the URL to the one chosen above:
@@ -187,7 +188,7 @@ Import a new set of Tor Browser tarballs
)
done
-3. Move the tarballs into your local Git annex:
+2. Move the tarballs into your local Git annex:
cd "$TBB_ARCHIVE" && \
mkdir "$TBB_VERSION" && cd "$TBB_VERSION" && \
diff --git a/wiki/src/index.pt.po b/wiki/src/index.pt.po
index c52e9c5..d11c402 100644
--- a/wiki/src/index.pt.po
+++ b/wiki/src/index.pt.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: tails-index-pt\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-03-12 14:36+0100\n"
-"PO-Revision-Date: 2018-02-21 10:55+0000\n"
+"PO-Revision-Date: 2018-03-14 01:08-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: Portuguese <LL@li.org>\n"
"Language: pt\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10.1\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Content of: outside any tag (error?)
msgid ""
@@ -56,8 +56,8 @@ msgid ""
"all connections to the Internet are forced to go through [[the Tor network|"
"https://www.torproject.org/]];"
msgstr ""
-"todas as conexões feitas à Internet são passam necessariamente [[pela rede "
-"Tor|https://www.torproject.org/]];"
+"todas as conexões feitas à Internet passam necessariamente [[pela rede Tor|"
+"https://www.torproject.org/]];"
#. type: Content of: <div><ul><li>
msgid ""
@@ -73,7 +73,7 @@ msgid ""
"files, emails and instant messaging."
msgstr ""
"<strong>usar ferramentas criptográficas do estado da arte</strong> para "
-"criptografar seus arquivos, email e mensagens instantâneas."
+"criptografar seus arquivos, emails e mensagens instantâneas."
#. type: Content of: <div><p>
msgid "[[Learn more about Tails.|about]]"
@@ -155,20 +155,16 @@ msgid ""
msgstr ""
"Tails envia seu tráfego pelo <a href=\"https://torproject.org/\">Tor</a>."
-#. #debian-fs-tor
+#. #debian-fs-tor
#. type: Content of: outside any tag (error?)
msgid "<span class=\"clearfix\"></span>"
msgstr "<span class=\"clearfix\"></span>"
#. type: Content of: <div><h1>
msgid "Awards"
-msgstr "Prêmios"
+msgstr "Premiações"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Tails has received the Mozilla Open Source Support Award (2016), the "
-#| "Access Innovation Prize (2014) and the OpenITP award (2013)."
msgid ""
"Tails has received the Mozilla Open Source Support Award (2016), the Access "
"Innovation Prize (2014), the APC FLOSS prize (2014) and the OpenITP award "
diff --git a/wiki/src/news/version_3.6.de.po b/wiki/src/news/version_3.6.de.po
index 13a4a6c..dbb0c94 100644
--- a/wiki/src/news/version_3.6.de.po
+++ b/wiki/src/news/version_3.6.de.po
@@ -14,7 +14,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10.1\n"
+"X-Generator: Poedit 1.8.11\n"
+"Language-Team: \n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/news/version_3.6.fa.po b/wiki/src/news/version_3.6.fa.po
index 0d4fc2a..9618d32 100644
--- a/wiki/src/news/version_3.6.fa.po
+++ b/wiki/src/news/version_3.6.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-03-14 10:19+0100\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2018-03-14 10:28+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -241,7 +241,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"known-issues\"></a>\n"
msgid "<a id=\"upgrade\"></a>\n"
msgstr "<a id=\"upgrade\"></a>\n"
diff --git a/wiki/src/upgrade/tails.de.po b/wiki/src/upgrade/tails.de.po
index 601782f..035f1ac 100644
--- a/wiki/src/upgrade/tails.de.po
+++ b/wiki/src/upgrade/tails.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-03-16 13:21+0000\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2018-03-16 13:40+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: \n"
@@ -23,7 +23,6 @@ msgstr "[[!meta title=\"Manuell in Tails aktualisieren\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
@@ -156,19 +155,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"note\">\n"
msgid " <div class=\"bug\">\n"
msgstr " <div class=\"bug\">\n"
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "</div>\n"
msgid " </div>\n"
msgstr " </div>\n"
@@ -230,10 +226,13 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
-#~ "In diesem Schritt werden Sie ein zwischenzeitliches Tails installieren, indem Sie\n"
-#~ "mithilfe des <span class=\"application\">Tails Installers</span> Ihr veraltetes Tails auf einen anderen USB-Stick klonen.\n"
+#~ "In diesem Schritt werden Sie ein zwischenzeitliches Tails installieren, "
+#~ "indem Sie\n"
+#~ "mithilfe des <span class=\"application\">Tails Installers</span> Ihr "
+#~ "veraltetes Tails auf einen anderen USB-Stick klonen.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -244,8 +243,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Aktualisieren Sie das zwischenzeitliche Tails\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
@@ -262,7 +265,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
#~ " </span>\n"
-#~ " um den <span class=\"application\">Tails Installer</span> erneut zu starten.\n"
+#~ " um den <span class=\"application\">Tails Installer</span> erneut zu "
+#~ "starten.\n"
#~ msgid "Click on the <span class=\"button\">Upgrade from ISO</span> button."
#~ msgstr ""
diff --git a/wiki/src/upgrade/tails.es.po b/wiki/src/upgrade/tails.es.po
index d4380b2..667fe1b 100755
--- a/wiki/src/upgrade/tails.es.po
+++ b/wiki/src/upgrade/tails.es.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-03-16 13:21+0000\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2018-03-16 13:38+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -153,19 +153,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"note\">\n"
msgid " <div class=\"bug\">\n"
msgstr " <div class=\"bug\">\n"
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "</div>\n"
msgid " </div>\n"
msgstr " </div>\n"
@@ -227,10 +224,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
#~ "En este paso, instalarás un Tails intermedio clonando tu\n"
-#~ "Tails desactualizado en otra memoria USB usando el <span class=\"application\">Tails Installer</span>.\n"
+#~ "Tails desactualizado en otra memoria USB usando el <span class="
+#~ "\"application\">Tails Installer</span>.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -241,8 +240,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Actualiza el Tails intermedio\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
@@ -259,7 +262,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
#~ " </span>\n"
-#~ " para iniciar el <span class=\"application\">Tails Installer</span> nuevamente.\n"
+#~ " para iniciar el <span class=\"application\">Tails Installer</span> "
+#~ "nuevamente.\n"
#~ msgid "Click on the <span class=\"button\">Upgrade from ISO</span> button."
#~ msgstr ""
diff --git a/wiki/src/upgrade/tails.fa.po b/wiki/src/upgrade/tails.fa.po
index 22b3964..12d0a4d 100644
--- a/wiki/src/upgrade/tails.fa.po
+++ b/wiki/src/upgrade/tails.fa.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-03-16 13:21+0000\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2018-03-16 13:44+0000\n"
+"Last-Translator: Tails translators <amnesia@boum.org>\n"
+"Language-Team: \n"
"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Tails translators <amnesia@boum.org>\n"
-"Language-Team: \n"
"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
diff --git a/wiki/src/upgrade/tails.fr.po b/wiki/src/upgrade/tails.fr.po
index a630094..a6f47f7 100644
--- a/wiki/src/upgrade/tails.fr.po
+++ b/wiki/src/upgrade/tails.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-03-16 13:21+0000\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2018-03-16 13:45+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -154,19 +154,16 @@ msgstr " <a id=\"3.5\"></a>\n"
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"note\">\n"
msgid " <div class=\"bug\">\n"
msgstr " <div class=\"bug\">\n"
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "</div>\n"
msgid " </div>\n"
msgstr " </div>\n"
@@ -228,10 +225,13 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
-#~ "À cette étape, vous devrez installer un Tails intermédiaire en clonant votre\n"
-#~ "Tails obsolète sur une autre clé USB en utilisant l'<span class=\"application\">Installeur de Tails</span>.\n"
+#~ "À cette étape, vous devrez installer un Tails intermédiaire en clonant "
+#~ "votre\n"
+#~ "Tails obsolète sur une autre clé USB en utilisant l'<span class="
+#~ "\"application\">Installeur de Tails</span>.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -242,8 +242,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Mettre à jour le Tails intermédiaire\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
@@ -258,9 +262,11 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ " <span class=\"menuchoice\">\n"
#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-#~ " <span class=\"guimenuitem\">Programme d'installation de Tails</span>\n"
+#~ " <span class=\"guimenuitem\">Programme d'installation de Tails</"
+#~ "span>\n"
#~ " </span>\n"
-#~ " pour démarrer l'<span class=\"application\">Installeur de Tails</span> à nouveau.\n"
+#~ " pour démarrer l'<span class=\"application\">Installeur de Tails</span> "
+#~ "à nouveau.\n"
#~ msgid "Click on the <span class=\"button\">Upgrade from ISO</span> button."
#~ msgstr ""
diff --git a/wiki/src/upgrade/tails.it.po b/wiki/src/upgrade/tails.it.po
index 5040086..6670d69 100644
--- a/wiki/src/upgrade/tails.it.po
+++ b/wiki/src/upgrade/tails.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-02-21 18:45+0100\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2016-08-25 18:00-0000\n"
"Last-Translator: transitails <transitails@inventati.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -23,7 +23,6 @@ msgstr "[[!meta title=\"Aggiornamento Manuale dentro Tails\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
@@ -156,19 +155,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"note\">\n"
msgid " <div class=\"bug\">\n"
msgstr " <div class=\"bug\">\n"
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "</div>\n"
msgid " </div>\n"
msgstr " </div>\n"
@@ -230,10 +226,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
#~ "In questo passo, installerai una Tails intermedia clonando la tua\n"
-#~ "vecchia Tails su un altra pennetta USB <span class=\"application\">Installatore di Tails</span>.\n"
+#~ "vecchia Tails su un altra pennetta USB <span class=\"application"
+#~ "\">Installatore di Tails</span>.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -244,8 +242,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Aggiornare la Tails intermedia\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
diff --git a/wiki/src/upgrade/tails.pt.po b/wiki/src/upgrade/tails.pt.po
index b81a7bb..7fbb122 100644
--- a/wiki/src/upgrade/tails.pt.po
+++ b/wiki/src/upgrade/tails.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2018-02-21 18:45+0100\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2016-04-02 13:51-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -23,7 +23,6 @@ msgstr "[[!meta title=\"Atualizar manualmente dentro do Tails\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
@@ -158,19 +157,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"note\">\n"
msgid " <div class=\"bug\">\n"
msgstr " <div class=\"bug\">\n"
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "</div>\n"
msgid " </div>\n"
msgstr " </div>\n"
@@ -235,10 +231,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
#~ "Nesta etapa, você instalará um Tails intermediário clonando o\n"
-#~ "Tails desatualizado em outra unidade USB usando o <span class=\"application\">Tails Installer</span>.\n"
+#~ "Tails desatualizado em outra unidade USB usando o <span class="
+#~ "\"application\">Tails Installer</span>.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -248,8 +246,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Atualize o Tails intermediário\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
#~ msgid ""
@@ -267,7 +269,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
#~ " </span>\n"
-#~ " para iniciar o <span class=\"application\">Tails Installer</span> novamente.\n"
+#~ " para iniciar o <span class=\"application\">Tails Installer</span> "
+#~ "novamente.\n"
#~ msgid "Click on the <span class=\"button\">Upgrade from ISO</span> button."
#~ msgstr "Clique no botão <span class=\"button\">Atualizar de uma ISO</span>."