Update PO files

20 files changed, 532 insertions, 342 deletions

diff --git a/wiki/src/home.de.po b/wiki/src/home.de.po
index 7498990..b4d5246 100644
--- a/wiki/src/home.de.po
+++ b/wiki/src/home.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-12 11:32+0300\n"
+"POT-Creation-Date: 2016-10-03 01:04+0000\n"
 "PO-Revision-Date: 2015-12-19 11:16-0000\n"
 "Last-Translator: Tails translators <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,45 +16,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
-msgstr "[[!meta title=\"Neuigkeiten\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta title=\"News\"]]\n"
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr "[[!meta title=\"Neuigkeiten\"]]\n"
-
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
 msgid ""
-"<div id=\"tor_check\">\n"
-"<a href=\"https://check.torproject.org/\">\n"
+"[[!meta title=\"Dear Tails users,\"]] [[!meta robots=\"noindex\"]] [[!meta "
+"stylesheet=\"home\" rel=\"stylesheet\" title=\"\"]]"
 msgstr ""
-"<div id=\"tor_check\">\n"
-"<a href=\"https://check.torproject.org/\">\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
-msgstr "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+#.  Note for translators: You can use <span class="twolines">
+#.  if your
+#. translation of the label below is long and gets split into two lines. 
+#. type: Content of: <div>
+msgid ""
+"<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link=\"no"
+"\"]] <span>Tor check</span> </a>"
+msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: <div><p>
 msgid ""
-"<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
-"translation of the label below is long and gets split into two lines. -->\n"
-"<span>Tor check</span>\n"
-"</a>\n"
-"</div>\n"
+"We are asking you to help Tails. You downloaded Tails for free because we "
+"believe that nobody should have to pay to be safe while using computers. And "
+"we want to keep it this way. <span class=\"highlight\">If everybody using "
+"Tails today donated 12€, our fundraising would be done for the whole year.</"
+"span> We are a very small non-profit and our yearly budget is ridiculously "
+"small compared to the value of Tails. If you appreciate our work, please "
+"take one minute to keep Tails alive."
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "[[Donate|donate]]"
 msgstr ""
-"<span class=\"twolines\">Verbindung testen</span>\n"
-"</a>\n"
-"</div>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"news\" raw=\"yes\"]]\n"
+#. type: Content of: outside any tag (error?)
+msgid "[[!inline pages=\"news\" raw=\"yes\"]]"
 msgstr ""
+
+#~ msgid "[[!meta title=\"News\"]]\n"
+#~ msgstr "[[!meta title=\"Neuigkeiten\"]]\n"
+
+#, fuzzy
+#~| msgid "[[!meta title=\"News\"]]\n"
+#~ msgid "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta title=\"Neuigkeiten\"]]\n"
+
+#~ msgid ""
+#~ "<div id=\"tor_check\">\n"
+#~ "<a href=\"https://check.torproject.org/\">\n"
+#~ msgstr ""
+#~ "<div id=\"tor_check\">\n"
+#~ "<a href=\"https://check.torproject.org/\">\n"
+
+#~ msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+#~ msgstr "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+
+#~ msgid ""
+#~ "<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
+#~ "translation of the label below is long and gets split into two lines. -->\n"
+#~ "<span>Tor check</span>\n"
+#~ "</a>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<span class=\"twolines\">Verbindung testen</span>\n"
+#~ "</a>\n"
+#~ "</div>\n"
diff --git a/wiki/src/home.fa.po b/wiki/src/home.fa.po
index bd7429b..bd480d0 100644
--- a/wiki/src/home.fa.po
+++ b/wiki/src/home.fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-09-12 11:32+0300\n"
+"POT-Creation-Date: 2016-10-03 01:04+0000\n"
 "PO-Revision-Date: 2015-10-16 15:08+0000\n"
 "Last-Translator: sprint5 <translation5@451f.org>\n"
 "Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/news/fa/"
@@ -19,47 +19,67 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 2.4-dev\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
-msgstr "[[!meta title=\"اخبار\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta title=\"News\"]]\n"
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr "[[!meta title=\"اخبار\"]]\n"
-
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
 msgid ""
-"<div id=\"tor_check\">\n"
-"<a href=\"https://check.torproject.org/\">\n"
+"[[!meta title=\"Dear Tails users,\"]] [[!meta robots=\"noindex\"]] [[!meta "
+"stylesheet=\"home\" rel=\"stylesheet\" title=\"\"]]"
 msgstr ""
-"<div id=\"tor_check\">\n"
-"<a href=\"https://check.torproject.org/\">\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
-msgstr "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+#.  Note for translators: You can use <span class="twolines">
+#.  if your
+#. translation of the label below is long and gets split into two lines. 
+#. type: Content of: <div>
+msgid ""
+"<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link=\"no"
+"\"]] <span>Tor check</span> </a>"
+msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: <div><p>
 msgid ""
-"<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
-"translation of the label below is long and gets split into two lines. -->\n"
-"<span>Tor check</span>\n"
-"</a>\n"
-"</div>\n"
+"We are asking you to help Tails. You downloaded Tails for free because we "
+"believe that nobody should have to pay to be safe while using computers. And "
+"we want to keep it this way. <span class=\"highlight\">If everybody using "
+"Tails today donated 12€, our fundraising would be done for the whole year.</"
+"span> We are a very small non-profit and our yearly budget is ridiculously "
+"small compared to the value of Tails. If you appreciate our work, please "
+"take one minute to keep Tails alive."
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "[[Donate|donate]]"
 msgstr ""
-"<!-- قابل توجه مترجم‌ها: اگر ترجمه‌تان از این برچسب طولانی است و تبدیل به دو خط می‌شود\n"
-"می‌توانید از <span class=\"twolines\"> استفاده کنید. -->\n"
-"<span>تست تور</span>\n"
-"</a>\n"
-"</div>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"news\" raw=\"yes\"]]\n"
+#. type: Content of: outside any tag (error?)
+msgid "[[!inline pages=\"news\" raw=\"yes\"]]"
 msgstr ""
+
+#~ msgid "[[!meta title=\"News\"]]\n"
+#~ msgstr "[[!meta title=\"اخبار\"]]\n"
+
+#, fuzzy
+#~| msgid "[[!meta title=\"News\"]]\n"
+#~ msgid "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta title=\"اخبار\"]]\n"
+
+#~ msgid ""
+#~ "<div id=\"tor_check\">\n"
+#~ "<a href=\"https://check.torproject.org/\">\n"
+#~ msgstr ""
+#~ "<div id=\"tor_check\">\n"
+#~ "<a href=\"https://check.torproject.org/\">\n"
+
+#~ msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+#~ msgstr "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+
+#~ msgid ""
+#~ "<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
+#~ "translation of the label below is long and gets split into two lines. -->\n"
+#~ "<span>Tor check</span>\n"
+#~ "</a>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<!-- قابل توجه مترجم‌ها: اگر ترجمه‌تان از این برچسب طولانی است و تبدیل به دو خط می‌شود\n"
+#~ "می‌توانید از <span class=\"twolines\"> استفاده کنید. -->\n"
+#~ "<span>تست تور</span>\n"
+#~ "</a>\n"
+#~ "</div>\n"
diff --git a/wiki/src/home.fr.po b/wiki/src/home.fr.po
index c2c70b5..50fbdde 100644
--- a/wiki/src/home.fr.po
+++ b/wiki/src/home.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-09-12 11:32+0300\n"
+"POT-Creation-Date: 2016-10-03 01:04+0000\n"
 "PO-Revision-Date: 2016-09-20 23:01+0100\n"
 "Last-Translator: AtomiKe <tails@atomike.ninja>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,44 +16,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
-msgstr "[[!meta title=\"Nouvelles\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr "[[!meta robots=\"noindex\"]]\n"
-
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
 msgid ""
-"<div id=\"tor_check\">\n"
-"<a href=\"https://check.torproject.org/\">\n"
+"[[!meta title=\"Dear Tails users,\"]] [[!meta robots=\"noindex\"]] [[!meta "
+"stylesheet=\"home\" rel=\"stylesheet\" title=\"\"]]"
 msgstr ""
-"<div id=\"tor_check\">\n"
-"<a href=\"https://check.torproject.org/\">\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
-msgstr "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+#.  Note for translators: You can use <span class="twolines">
+#.  if your
+#. translation of the label below is long and gets split into two lines. 
+#. type: Content of: <div>
+msgid ""
+"<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link=\"no"
+"\"]] <span>Tor check</span> </a>"
+msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: <div><p>
 msgid ""
-"<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
-"translation of the label below is long and gets split into two lines. -->\n"
-"<span>Tor check</span>\n"
-"</a>\n"
-"</div>\n"
+"We are asking you to help Tails. You downloaded Tails for free because we "
+"believe that nobody should have to pay to be safe while using computers. And "
+"we want to keep it this way. <span class=\"highlight\">If everybody using "
+"Tails today donated 12€, our fundraising would be done for the whole year.</"
+"span> We are a very small non-profit and our yearly budget is ridiculously "
+"small compared to the value of Tails. If you appreciate our work, please "
+"take one minute to keep Tails alive."
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "[[Donate|donate]]"
 msgstr ""
-"<span class=\"twolines\">Vérification de Tor</span>\n"
-"</a>\n"
-"</div>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"news\" raw=\"yes\"]]\n"
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid "[[!inline pages=\"news\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"news\" raw=\"yes\"]]"
 msgstr "[[!inline pages=\"news.fr\" raw=\"yes\"]]\n"
+
+#~ msgid "[[!meta title=\"News\"]]\n"
+#~ msgstr "[[!meta title=\"Nouvelles\"]]\n"
+
+#~ msgid "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta robots=\"noindex\"]]\n"
+
+#~ msgid ""
+#~ "<div id=\"tor_check\">\n"
+#~ "<a href=\"https://check.torproject.org/\">\n"
+#~ msgstr ""
+#~ "<div id=\"tor_check\">\n"
+#~ "<a href=\"https://check.torproject.org/\">\n"
+
+#~ msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+#~ msgstr "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+
+#~ msgid ""
+#~ "<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
+#~ "translation of the label below is long and gets split into two lines. -->\n"
+#~ "<span>Tor check</span>\n"
+#~ "</a>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "<span class=\"twolines\">Vérification de Tor</span>\n"
+#~ "</a>\n"
+#~ "</div>\n"
diff --git a/wiki/src/home.it.po b/wiki/src/home.it.po
index 508522f..6a9b3cf 100644
--- a/wiki/src/home.it.po
+++ b/wiki/src/home.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-20 22:24+0200\n"
+"POT-Creation-Date: 2016-10-03 01:04+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ita <transitails@inventati.org>\n"
@@ -15,39 +15,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex\"]]\n"
+#. type: Content of: outside any tag (error?)
+msgid ""
+"[[!meta title=\"Dear Tails users,\"]] [[!meta robots=\"noindex\"]] [[!meta "
+"stylesheet=\"home\" rel=\"stylesheet\" title=\"\"]]"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#.  Note for translators: You can use <span class="twolines">
+#.  if your
+#. translation of the label below is long and gets split into two lines. 
+#. type: Content of: <div>
 msgid ""
-"<div id=\"tor_check\">\n"
-"<a href=\"https://check.torproject.org/\">\n"
+"<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link=\"no"
+"\"]] <span>Tor check</span> </a>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+#. type: Content of: <div><p>
+msgid ""
+"We are asking you to help Tails. You downloaded Tails for free because we "
+"believe that nobody should have to pay to be safe while using computers. And "
+"we want to keep it this way. <span class=\"highlight\">If everybody using "
+"Tails today donated 12€, our fundraising would be done for the whole year.</"
+"span> We are a very small non-profit and our yearly budget is ridiculously "
+"small compared to the value of Tails. If you appreciate our work, please "
+"take one minute to keep Tails alive."
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
-"translation of the label below is long and gets split into two lines. -->\n"
-"<span>Tor check</span>\n"
-"</a>\n"
-"</div>\n"
+#. type: Content of: <div><div>
+msgid "[[Donate|donate]]"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"news\" raw=\"yes\"]]\n"
+#. type: Content of: outside any tag (error?)
+msgid "[[!inline pages=\"news\" raw=\"yes\"]]"
 msgstr ""
diff --git a/wiki/src/home.pt.po b/wiki/src/home.pt.po
index 6b9c2d4..a5127da 100644
--- a/wiki/src/home.pt.po
+++ b/wiki/src/home.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-12 11:32+0300\n"
+"POT-Creation-Date: 2016-10-03 01:04+0000\n"
 "PO-Revision-Date: 2015-07-07 16:19+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,40 +15,44 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
-msgstr "[[!meta title=\"Notícias\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta title=\"News\"]]\n"
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr "[[!meta title=\"Notícias\"]]\n"
-
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
 msgid ""
-"<div id=\"tor_check\">\n"
-"<a href=\"https://check.torproject.org/\">\n"
+"[[!meta title=\"Dear Tails users,\"]] [[!meta robots=\"noindex\"]] [[!meta "
+"stylesheet=\"home\" rel=\"stylesheet\" title=\"\"]]"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
+#.  Note for translators: You can use <span class="twolines">
+#.  if your
+#. translation of the label below is long and gets split into two lines. 
+#. type: Content of: <div>
+msgid ""
+"<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link=\"no"
+"\"]] <span>Tor check</span> </a>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: <div><p>
 msgid ""
-"<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
-"translation of the label below is long and gets split into two lines. -->\n"
-"<span>Tor check</span>\n"
-"</a>\n"
-"</div>\n"
+"We are asking you to help Tails. You downloaded Tails for free because we "
+"believe that nobody should have to pay to be safe while using computers. And "
+"we want to keep it this way. <span class=\"highlight\">If everybody using "
+"Tails today donated 12€, our fundraising would be done for the whole year.</"
+"span> We are a very small non-profit and our yearly budget is ridiculously "
+"small compared to the value of Tails. If you appreciate our work, please "
+"take one minute to keep Tails alive."
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"news\" raw=\"yes\"]]\n"
+#. type: Content of: <div><div>
+msgid "[[Donate|donate]]"
 msgstr ""
+
+#. type: Content of: outside any tag (error?)
+msgid "[[!inline pages=\"news\" raw=\"yes\"]]"
+msgstr ""
+
+#~ msgid "[[!meta title=\"News\"]]\n"
+#~ msgstr "[[!meta title=\"Notícias\"]]\n"
+
+#, fuzzy
+#~| msgid "[[!meta title=\"News\"]]\n"
+#~ msgid "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta title=\"Notícias\"]]\n"
diff --git a/wiki/src/install/inc/overview.de.po b/wiki/src/install/inc/overview.de.po
index 62b8e60..c4d6889 100644
--- a/wiki/src/install/inc/overview.de.po
+++ b/wiki/src/install/inc/overview.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-08-25 14:27+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2016-02-14 21:26+0100\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: \n"
@@ -57,7 +57,9 @@ msgid "<small>4 GB minimum</small>"
 msgstr "<small>mindestens 4 GB</small>"
 
 #. type: Content of: <div><div><div><div><div><h4><small>
-msgid "<small>All data will be lost!</small>"
+#, fuzzy
+#| msgid "<small>All data will be lost!</small>"
+msgid "<small>All data will be lost!"
 msgstr "<small>Alle Daten gehen verloren!</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -76,6 +78,10 @@ msgid "1 USB stick"
 msgstr "1 USB-Stick"
 
 #. type: Content of: <div><div><div><div><div><h4>
+msgid "<small>All data will be lost!</small>"
+msgstr "<small>Alle Daten gehen verloren!</small>"
+
+#. type: Content of: <div><div><div><div><div><h4>
 msgid "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
 msgstr ""
 
diff --git a/wiki/src/install/inc/overview.fa.po b/wiki/src/install/inc/overview.fa.po
index d6c01d1..19bd321 100644
--- a/wiki/src/install/inc/overview.fa.po
+++ b/wiki/src/install/inc/overview.fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-25 14:27+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\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"
@@ -72,6 +72,10 @@ msgid "1 USB stick"
 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 "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
 msgstr ""
 
diff --git a/wiki/src/install/inc/overview.fr.po b/wiki/src/install/inc/overview.fr.po
index 794aece..4c1cc07 100644
--- a/wiki/src/install/inc/overview.fr.po
+++ b/wiki/src/install/inc/overview.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-08-25 14:27+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\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"
@@ -58,7 +58,9 @@ msgid "<small>4 GB minimum</small>"
 msgstr "<small>d'au moins 4 Go</small>"
 
 #. type: Content of: <div><div><div><div><div><h4><small>
-msgid "<small>All data will be lost!</small>"
+#, fuzzy
+#| msgid "<small>All data will be lost!</small>"
+msgid "<small>All data will be lost!"
 msgstr "<small>Toutes les données seront perdues !</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -77,6 +79,10 @@ msgid "1 USB stick"
 msgstr "1 clé USB"
 
 #. type: Content of: <div><div><div><div><div><h4>
+msgid "<small>All data will be lost!</small>"
+msgstr "<small>Toutes les données seront perdues !</small>"
+
+#. type: Content of: <div><div><div><div><div><h4>
 msgid "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
 msgstr ""
 
diff --git a/wiki/src/install/inc/overview.it.po b/wiki/src/install/inc/overview.it.po
index 9075013..d3b1a66 100644
--- a/wiki/src/install/inc/overview.it.po
+++ b/wiki/src/install/inc/overview.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-20 22:24+0200\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2016-09-02 14:00+0200\n"
 "Last-Translator: ita team\n"
 "Language-Team: ita <transitails@inventati.org>\n"
@@ -55,15 +55,32 @@ msgstr "2 chiavette USB"
 msgid "<small>4 GB minimum</small>"
 msgstr "<small>4 GB almeno di spazio di archiviazione</small>"
 
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>All data will be lost!</small>"
+#. type: Content of: <div><div><div><div><div><h4><small>
+#, fuzzy
+#| msgid "<small>All data will be lost!</small>"
+msgid "<small>All data will be lost!"
 msgstr "<small>Tutti i dati andranno persi!</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
+msgid "[[!toggle id=\"why_two\" text=\"Why 2?\"]]</small>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
+"\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\"]] "
+"\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><h4>
 msgid "1 USB stick"
 msgstr "1 chiavetta USB "
 
 #. type: Content of: <div><div><div><div><div><h4>
+msgid "<small>All data will be lost!</small>"
+msgstr "<small>Tutti i dati andranno persi!</small>"
+
+#. type: Content of: <div><div><div><div><div><h4>
 msgid "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
 msgstr ""
 
@@ -166,6 +183,10 @@ msgid ""
 msgstr ""
 "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\"]]"
 
+#. type: Content of: <div><ol><li><div><div><div><div><h5>
+msgid "Restart"
+msgstr "Riavvia"
+
 #. type: Content of: <div><ol><li><div><div><div>
 msgid ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt="
@@ -203,10 +224,6 @@ msgstr "Aggiorna"
 msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
-msgid "Restart"
-msgstr "Riavvia"
-
 #. type: Content of: <div><ol><li><h4>
 msgid ""
 "Then you will <span class=\"windows linux mac-usb\">install the final Tails "
@@ -243,10 +260,6 @@ msgid ""
 "installed on USB stick on the right\"]]"
 msgstr ""
 
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
-msgid "<span class=\"step-number\"></span>Install"
-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="
@@ -256,3 +269,6 @@ msgstr ""
 #. type: Content of: <div><ol><li><div><div><div><div><h5>
 msgid "Configure"
 msgstr "Configura"
+
+#~ msgid "<span class=\"step-number\"></span>Install"
+#~ msgstr "<span class=\"step-number\"></span>Installa"
diff --git a/wiki/src/install/inc/overview.pt.po b/wiki/src/install/inc/overview.pt.po
index 898c46e..a1a1c0c 100644
--- a/wiki/src/install/inc/overview.pt.po
+++ b/wiki/src/install/inc/overview.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-08-25 14:27+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2016-04-30 11:52-0300\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,7 +57,9 @@ msgid "<small>4 GB minimum</small>"
 msgstr "<small>mínimo de 4 GB</small>"
 
 #. type: Content of: <div><div><div><div><div><h4><small>
-msgid "<small>All data will be lost!</small>"
+#, fuzzy
+#| msgid "<small>All data will be lost!</small>"
+msgid "<small>All data will be lost!"
 msgstr "<small>Todos os dados serão apagados!</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -76,6 +78,10 @@ msgid "1 USB stick"
 msgstr "1 memória USB"
 
 #. type: Content of: <div><div><div><div><div><h4>
+msgid "<small>All data will be lost!</small>"
+msgstr "<small>Todos os dados serão apagados!</small>"
+
+#. type: Content of: <div><div><div><div><div><h4>
 msgid "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
 msgstr ""
 
diff --git a/wiki/src/news.de.po b/wiki/src/news.de.po
index fddc340..7e93ae2 100644
--- a/wiki/src/news.de.po
+++ b/wiki/src/news.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-09-02 14:26+0300\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2016-08-21 20:15-0000\n"
 "Last-Translator: Tails translators <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,50 +16,75 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid "[[!meta title=\"News\"]]\n"
+msgid "[[!meta title=\"News\"]]"
 msgstr "[[!meta title=\"Neuigkeiten\"]]\n"
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: <ul><li><p>
 msgid ""
-"- Subscribe to the [[amnesia-news mailing\n"
-"  list|about/contact#amnesia-news]] to receive the same news\n"
-"  by email:\n"
-"  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-"          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-"          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
-"  </form>\n"
+"Subscribe to the [[amnesia-news mailing list|about/contact#amnesia-news]] to "
+"receive the same news by email:"
 msgstr ""
-"- Abonnieren Sie die [[amnesia-news\n"
-"  Mailingliste|about/contact#amnesia-news]], um die gleichen Neuigkeiten\n"
-"  als E-Mail zu empfangen:\n"
-"  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-"          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-"          <input class=\"button\" type=\"submit\" value=\"Abonnieren\"/>\n"
-"  </form>\n"
 
-#. type: Plain text
-msgid "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
+#. type: Content of: <ul><li><form>
+msgid ""
+"<input class=\"text\" name=\"email\" value=\"\"/> <input class=\"button\" "
+"type=\"submit\" value=\"Subscribe\"/>"
 msgstr ""
-"- Folgen Sie uns auf Twitter [@Tails_live](https://twitter.com/tails_live)."
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
-msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#. type: Content of: <ul><li><p>
+#, fuzzy
+#| msgid ""
+#| "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
+msgid ""
+"Follow us on Twitter <a href=\"https://twitter.com/tails_live\">@Tails_live</"
+"a>."
+msgstr ""
+"- Folgen Sie uns auf Twitter [@Tails_live](https://twitter.com/tails_live)."
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+#| "(currentlang() or news/report_2* or news/version_0* or news/test_0* or "
+#| "news/test_*-rc?) and tagged(announce)\"\n"
+#| "show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
 msgid ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
-"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?)\" show=\"10\"]] [[!inline pages=\"page(news/*) and !news/*/* "
+"and !news/discussion and (currentlang() or news/report_2* or news/version_0* "
+"or news/test_0* or news/test_*-rc?) and tagged(announce)\" show=\"10\" feeds="
+"\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]"
 msgstr ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?) and tagged(announce)\"\n"
 "show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
 
 #~ msgid ""
+#~ "- Subscribe to the [[amnesia-news mailing\n"
+#~ "  list|about/contact#amnesia-news]] to receive the same news\n"
+#~ "  by email:\n"
+#~ "  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+#~ "          <input class=\"text\" name=\"email\" value=\"\"/>\n"
+#~ "          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+#~ "  </form>\n"
+#~ msgstr ""
+#~ "- Abonnieren Sie die [[amnesia-news\n"
+#~ "  Mailingliste|about/contact#amnesia-news]], um die gleichen Neuigkeiten\n"
+#~ "  als E-Mail zu empfangen:\n"
+#~ "  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+#~ "          <input class=\"text\" name=\"email\" value=\"\"/>\n"
+#~ "          <input class=\"button\" type=\"submit\" value=\"Abonnieren\"/>\n"
+#~ "  </form>\n"
+
+#~ msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#~ msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+
+#~ msgid ""
 #~ "<div id=\"tor_check\">\n"
 #~ "<a href=\"https://check.torproject.org/\">\n"
 #~ msgstr ""
@@ -71,7 +96,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "<!-- Note for translators: You can use <span class=\"twolines\"> if your\n"
-#~ "translation of the label below is long and gets split into two lines. -->\n"
+#~ "translation of the label below is long and gets split into two lines. --"
+#~ ">\n"
 #~ "<span>Tor check</span>\n"
 #~ "</a>\n"
 #~ "</div>\n"
diff --git a/wiki/src/news.fa.po b/wiki/src/news.fa.po
index dd79c6a..87f434c 100644
--- a/wiki/src/news.fa.po
+++ b/wiki/src/news.fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-07-15 17:47+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2015-10-16 15:08+0000\n"
 "Last-Translator: sprint5 <translation5@451f.org>\n"
 "Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/news/fa/"
@@ -19,52 +19,78 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 2.4-dev\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid "[[!meta title=\"News\"]]\n"
+msgid "[[!meta title=\"News\"]]"
 msgstr "[[!meta title=\"اخبار\"]]\n"
 
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "- Subscribe to the [amnesia-news mailing\n"
-#| "  list](https://mailman.boum.org/listinfo/amnesia-news) to receive the same news\n"
-#| "  by email:\n"
-#| "  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-#| "          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-#| "          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
-#| "  </form>\n"
+#. type: Content of: <ul><li><p>
 msgid ""
-"- Subscribe to the [[amnesia-news mailing\n"
-"  list|about/contact#amnesia-news]] to receive the same news\n"
-"  by email:\n"
-"  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-"          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-"          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
-"  </form>\n"
+"Subscribe to the [[amnesia-news mailing list|about/contact#amnesia-news]] to "
+"receive the same news by email:"
 msgstr ""
-"- برای دریافت همان اخبار از طریق رایانامه عضو [amnesia-news mailing\n"
-"  list](https://mailman.boum.org/listinfo/amnesia-news) شوید:\n"
-"  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-"          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-"          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
-"  </form>\n"
 
-#. type: Plain text
-msgid "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
+#. type: Content of: <ul><li><form>
+msgid ""
+"<input class=\"text\" name=\"email\" value=\"\"/> <input class=\"button\" "
+"type=\"submit\" value=\"Subscribe\"/>"
 msgstr ""
-"- ما را در توییتر دنبال کنید [@Tails_live](https://twitter.com/tails_live)."
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
-msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#. type: Content of: <ul><li><p>
+#, fuzzy
+#| msgid ""
+#| "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
+msgid ""
+"Follow us on Twitter <a href=\"https://twitter.com/tails_live\">@Tails_live</"
+"a>."
+msgstr ""
+"- ما را در توییتر دنبال کنید [@Tails_live](https://twitter.com/tails_live)."
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+#| "(currentlang() or news/report_2* or news/version_0* or news/test_0* or "
+#| "news/test_*-rc?) and tagged(announce)\"\n"
+#| "show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
 msgid ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
-"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?)\" show=\"10\"]] [[!inline pages=\"page(news/*) and !news/*/* "
+"and !news/discussion and (currentlang() or news/report_2* or news/version_0* "
+"or news/test_0* or news/test_*-rc?) and tagged(announce)\" show=\"10\" feeds="
+"\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]"
 msgstr ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?) and tagged(announce)\"\n"
 "show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "- Subscribe to the [amnesia-news mailing\n"
+#~| "  list](https://mailman.boum.org/listinfo/amnesia-news) to receive the same news\n"
+#~| "  by email:\n"
+#~| "  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+#~| "          <input class=\"text\" name=\"email\" value=\"\"/>\n"
+#~| "          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+#~| "  </form>\n"
+#~ msgid ""
+#~ "- Subscribe to the [[amnesia-news mailing\n"
+#~ "  list|about/contact#amnesia-news]] to receive the same news\n"
+#~ "  by email:\n"
+#~ "  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+#~ "          <input class=\"text\" name=\"email\" value=\"\"/>\n"
+#~ "          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+#~ "  </form>\n"
+#~ msgstr ""
+#~ "- برای دریافت همان اخبار از طریق رایانامه عضو [amnesia-news mailing\n"
+#~ "  list](https://mailman.boum.org/listinfo/amnesia-news) شوید:\n"
+#~ "  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+#~ "          <input class=\"text\" name=\"email\" value=\"\"/>\n"
+#~ "          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+#~ "  </form>\n"
+
+#~ msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#~ msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
diff --git a/wiki/src/news.fr.po b/wiki/src/news.fr.po
index b40e55e..7a9c097 100644
--- a/wiki/src/news.fr.po
+++ b/wiki/src/news.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-07-15 17:47+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2016-05-06 22:53-0000\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,54 +16,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid "[[!meta title=\"News\"]]\n"
+msgid "[[!meta title=\"News\"]]"
 msgstr "[[!meta title=\"Nouvelles\"]]\n"
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: <ul><li><p>
 msgid ""
-"- Subscribe to the [[amnesia-news mailing\n"
-"  list|about/contact#amnesia-news]] to receive the same news\n"
-"  by email:\n"
-"  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-"          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-"          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
-"  </form>\n"
+"Subscribe to the [[amnesia-news mailing list|about/contact#amnesia-news]] to "
+"receive the same news by email:"
 msgstr ""
-"- Abonnez-vous à la [[liste de diffusion\n"
-"  amnesia-news|about/contact#amnesia-news]] pour\n"
-"  recevoir les mêmes nouvelles par courrier électronique :\n"
-"  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-"          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-"          <input class=\"button\" type=\"submit\" value=\"S'abonner\"/>\n"
-"  </form>\n"
 
-#. type: Plain text
-msgid "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
+#. type: Content of: <ul><li><form>
+msgid ""
+"<input class=\"text\" name=\"email\" value=\"\"/> <input class=\"button\" "
+"type=\"submit\" value=\"Subscribe\"/>"
 msgstr ""
-"- Suivez-nous sur Twitter [@Tails_live](https://twitter.com/tails_live)."
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
-msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#. type: Content of: <ul><li><p>
+#, fuzzy
+#| msgid ""
+#| "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
+msgid ""
+"Follow us on Twitter <a href=\"https://twitter.com/tails_live\">@Tails_live</"
+"a>."
+msgstr ""
+"- Suivez-nous sur Twitter [@Tails_live](https://twitter.com/tails_live)."
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+#| "(currentlang() or news/report_2* or news/version_0* or news/test_0* or "
+#| "news/test_*-rc?) and tagged(announce)\"\n"
+#| "show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
 msgid ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
-"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?)\" show=\"10\"]] [[!inline pages=\"page(news/*) and !news/*/* "
+"and !news/discussion and (currentlang() or news/report_2* or news/version_0* "
+"or news/test_0* or news/test_*-rc?) and tagged(announce)\" show=\"10\" feeds="
+"\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]"
 msgstr ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?) and tagged(announce)\"\n"
 "show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
 
 #~ msgid ""
+#~ "- Subscribe to the [[amnesia-news mailing\n"
+#~ "  list|about/contact#amnesia-news]] to receive the same news\n"
+#~ "  by email:\n"
+#~ "  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+#~ "          <input class=\"text\" name=\"email\" value=\"\"/>\n"
+#~ "          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+#~ "  </form>\n"
+#~ msgstr ""
+#~ "- Abonnez-vous à la [[liste de diffusion\n"
+#~ "  amnesia-news|about/contact#amnesia-news]] pour\n"
+#~ "  recevoir les mêmes nouvelles par courrier électronique :\n"
+#~ "  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+#~ "          <input class=\"text\" name=\"email\" value=\"\"/>\n"
+#~ "          <input class=\"button\" type=\"submit\" value=\"S'abonner\"/>\n"
+#~ "  </form>\n"
+
+#~ msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#~ msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+
+#~ msgid ""
 #~ "<!-- On each release `n` of Tails 3.0, 4.0, etc. this list should be\n"
 #~ "updated to include news/version_* and news/test_* for release `n-2`.\n"
-#~ "Also update ikiwiki.setup, ikiwiki-cgi.setup, index.html, and security.mdwn. -->\n"
+#~ "Also update ikiwiki.setup, ikiwiki-cgi.setup, index.html, and security."
+#~ "mdwn. -->\n"
 #~ msgstr ""
 #~ "<!-- On each release `n` of Tails 3.0, 4.0, etc. this list should be\n"
 #~ "updated to include news/version_* and news/test_* for release `n-2`.\n"
-#~ "Also update ikiwiki.setup, ikiwiki-cgi.setup, index.html, and security.mdwn. -->\n"
+#~ "Also update ikiwiki.setup, ikiwiki-cgi.setup, index.html, and security."
+#~ "mdwn. -->\n"
diff --git a/wiki/src/news.it.po b/wiki/src/news.it.po
index 922d389..621c464 100644
--- a/wiki/src/news.it.po
+++ b/wiki/src/news.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-07-15 17:47+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ita <transitails@inventati.org>\n"
@@ -15,35 +15,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
+#. type: Content of: outside any tag (error?)
+msgid "[[!meta title=\"News\"]]"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: <ul><li><p>
 msgid ""
-"- Subscribe to the [[amnesia-news mailing\n"
-"  list|about/contact#amnesia-news]] to receive the same news\n"
-"  by email:\n"
-"  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-"          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-"          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
-"  </form>\n"
+"Subscribe to the [[amnesia-news mailing list|about/contact#amnesia-news]] to "
+"receive the same news by email:"
 msgstr ""
 
-#. type: Plain text
-msgid "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
+#. type: Content of: <ul><li><form>
+msgid ""
+"<input class=\"text\" name=\"email\" value=\"\"/> <input class=\"button\" "
+"type=\"submit\" value=\"Subscribe\"/>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#. type: Content of: <ul><li><p>
+msgid ""
+"Follow us on Twitter <a href=\"https://twitter.com/tails_live\">@Tails_live</"
+"a>."
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
 msgid ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
-"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?)\" show=\"10\"]] [[!inline pages=\"page(news/*) and !news/*/* "
+"and !news/discussion and (currentlang() or news/report_2* or news/version_0* "
+"or news/test_0* or news/test_*-rc?) and tagged(announce)\" show=\"10\" feeds="
+"\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]"
 msgstr ""
diff --git a/wiki/src/news.pt.po b/wiki/src/news.pt.po
index 63e8851..be3eb65 100644
--- a/wiki/src/news.pt.po
+++ b/wiki/src/news.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-07-15 17:47+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2015-07-07 16:19+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,37 +15,49 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"News\"]]\n"
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid "[[!meta title=\"News\"]]\n"
+msgid "[[!meta title=\"News\"]]"
 msgstr "[[!meta title=\"Notícias\"]]\n"
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: <ul><li><p>
 msgid ""
-"- Subscribe to the [[amnesia-news mailing\n"
-"  list|about/contact#amnesia-news]] to receive the same news\n"
-"  by email:\n"
-"  <form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
-"          <input class=\"text\" name=\"email\" value=\"\"/>\n"
-"          <input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
-"  </form>\n"
+"Subscribe to the [[amnesia-news mailing list|about/contact#amnesia-news]] to "
+"receive the same news by email:"
 msgstr ""
 
-#. type: Plain text
-msgid "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
+#. type: Content of: <ul><li><form>
+msgid ""
+"<input class=\"text\" name=\"email\" value=\"\"/> <input class=\"button\" "
+"type=\"submit\" value=\"Subscribe\"/>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
-msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#. type: Content of: <ul><li><p>
+msgid ""
+"Follow us on Twitter <a href=\"https://twitter.com/tails_live\">@Tails_live</"
+"a>."
+msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+#| "(currentlang() or news/report_2* or news/version_0* or news/test_0* or "
+#| "news/test_*-rc?) and tagged(announce)\"\n"
+#| "show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
 msgid ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
-"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?)\" show=\"10\"]] [[!inline pages=\"page(news/*) and !news/*/* "
+"and !news/discussion and (currentlang() or news/report_2* or news/version_0* "
+"or news/test_0* or news/test_*-rc?) and tagged(announce)\" show=\"10\" feeds="
+"\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]"
 msgstr ""
-"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?) and tagged(announce)\"\n"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0* or news/"
+"test_*-rc?) and tagged(announce)\"\n"
 "show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+
+#~ msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
+#~ msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and (currentlang() or news/report_2* or news/version_0* or news/test_0* or news/test_*-rc?)\" show=\"10\"]]\n"
diff --git a/wiki/src/sidebar.de.po b/wiki/src/sidebar.de.po
index d14b2b2..3f18571 100644
--- a/wiki/src/sidebar.de.po
+++ b/wiki/src/sidebar.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-09-28 18:12+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2016-06-10 15:06-0000\n"
 "Last-Translator: Tails developers <tails@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<p id=\"donation-strip\"><a href=\"<TMPL_VAR BASEURL>donate#web\">Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u></a></p>\n"
+msgid "<p id=\"donation-strip\">[[Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u>|donate#web]]</p>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/wiki/src/sidebar.fa.po b/wiki/src/sidebar.fa.po
index 0a6b33c..0bc2cfb 100644
--- a/wiki/src/sidebar.fa.po
+++ b/wiki/src/sidebar.fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-09-28 18:12+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2015-10-20 22:29+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/sidebar/"
@@ -21,7 +21,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<p id=\"donation-strip\"><a href=\"<TMPL_VAR BASEURL>donate#web\">Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u></a></p>\n"
+msgid "<p id=\"donation-strip\">[[Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u>|donate#web]]</p>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/wiki/src/sidebar.fr.po b/wiki/src/sidebar.fr.po
index 7f9d583..c6357da 100644
--- a/wiki/src/sidebar.fr.po
+++ b/wiki/src/sidebar.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-28 18:12+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2014-10-08 08:29-0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<p id=\"donation-strip\"><a href=\"<TMPL_VAR BASEURL>donate#web\">Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u></a></p>\n"
+msgid "<p id=\"donation-strip\">[[Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u>|donate#web]]</p>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/wiki/src/sidebar.it.po b/wiki/src/sidebar.it.po
index ee02a3e..b531eda 100644
--- a/wiki/src/sidebar.it.po
+++ b/wiki/src/sidebar.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-09-28 18:12+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2016-09-07 21:39+0200\n"
 "Last-Translator: \n"
 "Language-Team: ita <transitails@inventati.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<p id=\"donation-strip\"><a href=\"<TMPL_VAR BASEURL>donate#web\">Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u></a></p>\n"
+msgid "<p id=\"donation-strip\">[[Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u>|donate#web]]</p>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/wiki/src/sidebar.pt.po b/wiki/src/sidebar.pt.po
index 6a7426f..001dea9 100644
--- a/wiki/src/sidebar.pt.po
+++ b/wiki/src/sidebar.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-09-28 18:12+0000\n"
+"POT-Creation-Date: 2016-10-03 01:03+0000\n"
 "PO-Revision-Date: 2016-04-15 11:21-0300\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<p id=\"donation-strip\"><a href=\"<TMPL_VAR BASEURL>donate#web\">Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u></a></p>\n"
+msgid "<p id=\"donation-strip\">[[Tails helps thousands of people staying safe online everyday, and it is free. <u>Donate today to keep Tails alive!</u>|donate#web]]</p>\n"
 msgstr ""
 
 #. type: Plain text