summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrike Uhlig <u@451f.org>2018-12-14 11:29:38 +0100
committerUlrike Uhlig <u@451f.org>2018-12-14 11:29:38 +0100
commit3046a8a54d1a5acb9a9d1990397ff255120ec50a (patch)
tree38dc909678b0de8159fcff404c990d96b129ad0d
parentfb4b7d4d9b10225eac22bb46001e79ad0d16ccc6 (diff)
parent0e1c0e617502c6ef91f4e23d80db258125d58864 (diff)
Merge branch 'master' of d53ykjpeekuikgoq.onion:tails
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn28
-rw-r--r--wiki/src/blueprint/monthly_report/report_2018_11.mdwn91
-rw-r--r--wiki/src/contribute/how/documentation/release_notes.mdwn2
-rw-r--r--wiki/src/doc/about/license.de.po424
-rw-r--r--wiki/src/doc/about/license.es.po400
-rw-r--r--wiki/src/doc/about/license.fa.po330
-rw-r--r--wiki/src/doc/about/license.fr.po431
-rw-r--r--wiki/src/doc/about/license.it.po357
-rw-r--r--wiki/src/doc/about/license.mdwn117
-rw-r--r--wiki/src/doc/about/license.pt.po341
-rw-r--r--wiki/src/news/version_3.11.de.po35
-rw-r--r--wiki/src/news/version_3.11.es.po35
-rw-r--r--wiki/src/news/version_3.11.fa.po35
-rw-r--r--wiki/src/news/version_3.11.fr.po35
-rw-r--r--wiki/src/news/version_3.11.it.po35
-rw-r--r--wiki/src/news/version_3.11.mdwn4
-rw-r--r--wiki/src/news/version_3.11.pt.po35
17 files changed, 1816 insertions, 919 deletions
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index 6fb7cc0..db3055d 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -21,19 +21,39 @@ Qualche informazione sui file po:
IL weblate è raggiungibile qui:
-Ha questi link utili:
-
<https://translate.tails.boum.org/languages/it/tails/>
-you can order the component by:
+Puoi ordinare i componenti secondo:
* Translated Words Review
* Checks
* Suggestions
+
+In questo modo puoi trovare i file da revisionare. Conviene cercare quelli che hanno la barra verde più "piena" ed il minor numero di Suggestions/suggerimenti.
+Significa che la pagina arriverà più rapidamente ad essere pubblicata, perchè un requisito per la pubblicazione è che raggiunga la barra verde al 100%.
+(attenzione non esiste più il meccanismo barra blu... sapevatelo!)
+__________
+
+## Alcune cose a cui fare attenzione:
+
+* non sostituire gli spazi con i tre puntini. Ovvero anche se il weblate ti fa vedere che mancano tre puntini rossi, significa che bisogna mettere uno "space".
+
__________
+## Revisioni e sito compilato:
+
+
+Le versioni proposte di una frase tradotta sono in basso, quasi in fondo alla pagina e puoi vederne un link nella colonna di destra. Nella colonna di destra ci sono anche degli avvertimenti in caso di alcuni "test" non passati da quella frase, come.. manca il punto alla fine, o va a capo in modo strano,...
+
+Per revisionare bisogna dare un voto ad un suggerimento di un altr* traduttor*.
+Se abbiam dei dubbi scriviamo in mailinglist.
+Quello che fa fede è sempre l'inglese, come testo di riferimento.
+Il suggerimento deve ricevere due voti per essere approvato e quindi messo in "staging", ovvero la pagina con il sito compilato. E' possibile che il server voglia un po di tempo per farlo, quindi magari non si trova subito la frase modificata.
+
+Nelle revisioni è importante andare a vedere anche che la pagina funzioni prima di comunicare in lista che è pronta!
+Infatti ci sono parti di html che NON vanno tradotte: come i link, le class="applications", alcune liste con le parentesi quadre, ...
-Il wiki compilato per vedere se la pagina funziona:
+Il wiki compilato per vedere se la pagina funziona si trova qui:
<https://translate.tails.boum.org/staging/>
diff --git a/wiki/src/blueprint/monthly_report/report_2018_11.mdwn b/wiki/src/blueprint/monthly_report/report_2018_11.mdwn
index 028e177..955f604 100644
--- a/wiki/src/blueprint/monthly_report/report_2018_11.mdwn
+++ b/wiki/src/blueprint/monthly_report/report_2018_11.mdwn
@@ -1,30 +1,27 @@
[[!meta title="Tails report for November, 2018"]]
-[[!meta date="Tue, 10 Apr 2018 01:23:45 +0000"]] XXX: adjust date
+[[!meta date="Tue, 14 Dec 2018 01:23:45 +0000"]]
[[!pagetemplate template="news.tmpl"]]
[[!toc]]
+Welcome to Tails monthly report for November 2018! A lot has happened in the
+last month, but first of all, we want to point you to our [[ongoing donation
+campaign|donate]]! If everyone using Tails today donated $6, our fundraiser
+would be done in just one day!
+
Upcoming releases
=================
-* Very soon, we will drastically simplify the installation for Windows
- and macOS and improve support for UEFI computers! To this aim, with
- the Tails 3.12 release [[scheduled for January
- 29|contribute/calendar]], we will start distributing *USB images* in
- addition to *ISO images*.
+Very soon, we will drastically simplify the installation for Windows
+and macOS and improve support for UEFI computers! To this aim, with
+the Tails 3.12 release [[scheduled for January
+29|contribute/calendar]], we will start distributing *USB images* in
+addition to *ISO images*.
-* Tails 3.11, [[scheduled for December 11|contribute/calendar]],
- will fix a great number of long-standing problems and recent
- regressions.
Code
====
-XXX: If you feel like it and developers don't do it themselves,
- list important code work that is not covered already by the
- Release section (for example, the changes being worked on for
- the next version).
-
* We've been working hard since a few months on our USB image project
([[!tails_ticket 15292]]) and will soon send a call for testing.
The main remaining challenge is to build the USB image reproducibly
@@ -43,16 +40,10 @@ XXX: If you feel like it and developers don't do it themselves,
shutting down the network connection. ([[!tails_ticket 14754]],
[[!tails_ticket 15282]])
-Hot topics on our help desk
-===========================
-
-XXX: Ask tails-bugs@boum.org to list hot topics for the last month.
-
-1.
+* Tails 3.11, [[scheduled for December 11|contribute/calendar]] and [[released
+ on time|/news/version_3.11]] fixed a great number of long-standing problems
+ and recent regressions.
-1.
-
-1.
Infrastructure
==============
@@ -87,32 +78,64 @@ We continued working on our yearly donation campaign:
Outreach
========
-Past events
------------
+We published an [[extensive summary of our achievements in
+2018|news/achievements_in_2018]] and also announced that in addition to
+bitcoins, you can now donate using [[four new
+cryptocurrencies|news/new_cryptocurrencies]]. By the way, donations! Have you
+already met our [[donation campaign site|donate]]? Cryptocurrencies are only
+one way to donate, but wouldn't it be interesting to try to donate in every way
+possible?
Upcoming events
---------------
-On-going discussions
-====================
+* At the monthly meeting, the idea of attending
+ [FOSDEM](https://fosdem.org/2019/) came up
+
+* [sajolida pointed
+ out](https://mailman.boum.org/pipermail/tails-project/2018-November/001206.html)
+the [Internet Freedom Festival](https://internetfreedomfestival.org/), which
+will happen in April next year.
-XXX: Link to the thread on <https://mailman.boum.org/pipermail/tails-XXX/>.
Translation
===========
-XXX: Add the output of `contribute/l10n_tricks/language_statistics.sh`
-XXX: Add the output of (adjust month!):
+## All the website
+
+ - de: 50% (3112) strings translated, 7% strings fuzzy, 45% words translated
+ - es: 56% (3459) strings translated, 3% strings fuzzy, 47% words translated
+ - fa: 30% (1864) strings translated, 11% strings fuzzy, 33% words translated
+ - fr: 86% (5273) strings translated, 4% strings fuzzy, 86% words translated
+ - it: 32% (1986) strings translated, 6% strings fuzzy, 28% words translated
+ - pt: 25% (1541) strings translated, 8% strings fuzzy, 21% words translated
+
+Total original words: 64362
+
+## [[Core pages of the website|contribute/l10n_tricks/core_po_files.txt]]
+
+ - de: 81% (1544) strings translated, 10% strings fuzzy, 82% words translated
+ - es: 95% (1813) strings translated, 3% strings fuzzy, 95% words translated
+ - fa: 31% (591) strings translated, 13% strings fuzzy, 31% words translated
+ - fr: 96% (1835) strings translated, 3% strings fuzzy, 97% words translated
+ - it: 68% (1308) strings translated, 14% strings fuzzy, 69% words translated
+ - pt: 44% (836) strings translated, 14% strings fuzzy, 47% words translated
+
+Total original words: 17343
- git checkout $(git rev-list -n 1 --before="September 1" origin/master) && \
- git submodule update --init && \
- ./wiki/src/contribute/l10n_tricks/language_statistics.sh
Metrics
=======
-* Tails has been started more than 695 882 times this month. This makes BOOTS/DAY boots a day on average.
+* Tails has been started more than 695 882 times this month. This makes 23196
+ boots a day on average.
* 7 668 downloads of the OpenPGP signature of Tails ISO from our website.
* 66 bug reports were received through WhisperBack.
[[How do we know this?|support/faq#boot_statistics]]
+
+Oh, it's already the end of the monthly report! So now is probably the good
+time for whose of you who can donate to head over to our donation campaign
+page!
+
+<div id="donate-button"><a href="https://tails.boum.org/donate?r=novreport">Donate</a></div>
diff --git a/wiki/src/contribute/how/documentation/release_notes.mdwn b/wiki/src/contribute/how/documentation/release_notes.mdwn
index c0781fb..d75889b 100644
--- a/wiki/src/contribute/how/documentation/release_notes.mdwn
+++ b/wiki/src/contribute/how/documentation/release_notes.mdwn
@@ -77,5 +77,5 @@
- Put the period before ticket number
- "Bla bla. ([!tails_ticket 1234])"
- Prepare a tweet with highlights:
- - Tails x.y is out: https://tails.boum.org/news/version_x.y, bla bla bla, and more.
+ - Tails x.y is out: https://tails.boum.org/news/version_x.y/, bla bla bla, and more.
- Add it as a comment to the ticket for the release notes.
diff --git a/wiki/src/doc/about/license.de.po b/wiki/src/doc/about/license.de.po
index 6a0a5ce..0e634d1 100644
--- a/wiki/src/doc/about/license.de.po
+++ b/wiki/src/doc/about/license.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails Translation\n"
-"POT-Creation-Date: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2018-12-13 16:37+0000\n"
"PO-Revision-Date: 2018-03-21 16:36+0100\n"
"Last-Translator: Tails translators\n"
"Language-Team: Tails Translation <tails-l10n@boum.org>\n"
@@ -94,145 +94,285 @@ msgstr ""
"Auf dieser Website werden diverse Bilddateien verwendet, die urheber-, "
"lizenz- oder markenrechtlich geschützt sind:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-#| " Creative Commons — Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-#| " Creative Commons — Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-#| " Public Domain, by Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
-#| " Creative Commons — Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-#| " Creative Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-#| " Creative Commons — Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-#| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-#| " Public Domain, by Julian Norton.\n"
-#| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-#| " Creative Commons — Attribution, by Kervin Markle.\n"
-#| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-#| " Creative Commons — Attribution, by Wilson Joseph.\n"
-#| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-#| " Creative Commons — Attribution, by Richard de Vos.\n"
-#| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-#| " Creative Commons — Attribution, by Diego Naive.\n"
-#| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-#| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-#| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-#| " Public Domain, by Jean Yashu.\n"
-#| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-#| " Creative Commons — Attribution, by Thomas Helbig.\n"
-#| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-#| " Creative Commons — Attribution, by unlimicon.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - Das Tails-Logo basiert auf [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" von Ilsur Aptukov von The Noun Project.\n"
-" - Debian-Logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion-Logo: eingetragenes Markenzeichen von The Tor Project, Inc.; das Tails\n"
-"Project ist autorisiert, es unter bestimmten Bedingungen zu verwenden; lizenziert unter\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons von [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, von Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, von Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, von factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, von Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, von Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, von Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, von Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, von Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, von Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, von Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, von Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, von Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, von Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, von Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, von Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, von Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, von Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, von Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, von unlimicon.\n"
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek]]."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~| " Creative Commons — Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~| " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~| " Public Domain, by Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~| " Creative Commons — Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~| " Creative Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~| " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~| " Public Domain, by Julian Norton.\n"
+#~| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~| " Creative Commons — Attribution, by Kervin Markle.\n"
+#~| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~| " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~| " Creative Commons — Attribution, by Richard de Vos.\n"
+#~| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~| " Creative Commons — Attribution, by Diego Naive.\n"
+#~| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~| " Public Domain, by Jean Yashu.\n"
+#~| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~| " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~| " Creative Commons — Attribution, by unlimicon.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - Das Tails-Logo basiert auf [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " von Ilsur Aptukov von The Noun Project.\n"
+#~ " - Debian-Logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion-Logo: eingetragenes Markenzeichen von The Tor Project, Inc.; das Tails\n"
+#~ "Project ist autorisiert, es unter bestimmten Bedingungen zu verwenden; lizenziert unter\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons von [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, von Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, von Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, von factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, von Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, von Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, von Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, von Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, von Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, von Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, von Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, von Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, von Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, von Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, von Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, von Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, von Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, von Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, von Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, von unlimicon.\n"
diff --git a/wiki/src/doc/about/license.es.po b/wiki/src/doc/about/license.es.po
index 627b8f2..6a61458 100644
--- a/wiki/src/doc/about/license.es.po
+++ b/wiki/src/doc/about/license.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2018-12-13 16:37+0000\n"
"PO-Revision-Date: 2018-01-30 14:29+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -94,136 +94,276 @@ msgstr ""
"Esta página web usa varias imágenes con distintos derechos de autor, "
"licencias, marcas y términos de distribución:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-#| " Creative Commons — Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-#| " Creative Commons — Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-#| " Public Domain, by Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
-#| " Creative Commons — Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-#| " Creative Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-#| " Creative Commons — Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-#| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-#| " Public Domain, by Julian Norton.\n"
-#| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-#| " Creative Commons — Attribution, by Kervin Markle.\n"
-#| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-#| " Creative Commons — Attribution, by Wilson Joseph.\n"
-#| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-#| " Creative Commons — Attribution, by Richard de Vos.\n"
-#| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-#| " Creative Commons — Attribution, by Diego Naive.\n"
-#| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-#| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-#| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-#| " Public Domain, by Jean Yashu.\n"
-#| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-#| " Creative Commons — Attribution, by Thomas Helbig.\n"
-#| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-#| " Creative Commons — Attribution, by unlimicon.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - El logo de Tails está basado en [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" por Ilsur Aptukov del Proyecto Noun.\n"
-"- Logo de Debian: Copyright (c) 1999 Software en Public Interest.\n"
-"- Logo de la cebolla: marca registrada para el Proyecto Tor; el proyecto Tails está autorizado\n"
-"para utilizarlo bajo ciertas condiciones; licenciado bajo\n"
-"Creative Commons Attribution 3.0 licenciado en Estados Unidos.\n"
-" - Iconos de [Proyecto Noun|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-"Creative Commons - Atribución, por Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Atribución, por Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Atribución, por factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Dominio Público, por Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Atribución, por Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Atribución, por Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Atribución, por Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Atribución, por Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Domino Público, por Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Atribución, por Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Atribución, por Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Atribución, por Zech Nelson.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek]]."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~| " Creative Commons — Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~| " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~| " Public Domain, by Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~| " Creative Commons — Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~| " Creative Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~| " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~| " Public Domain, by Julian Norton.\n"
+#~| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~| " Creative Commons — Attribution, by Kervin Markle.\n"
+#~| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~| " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~| " Creative Commons — Attribution, by Richard de Vos.\n"
+#~| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~| " Creative Commons — Attribution, by Diego Naive.\n"
+#~| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~| " Public Domain, by Jean Yashu.\n"
+#~| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~| " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~| " Creative Commons — Attribution, by unlimicon.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - El logo de Tails está basado en [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " por Ilsur Aptukov del Proyecto Noun.\n"
+#~ "- Logo de Debian: Copyright (c) 1999 Software en Public Interest.\n"
+#~ "- Logo de la cebolla: marca registrada para el Proyecto Tor; el proyecto Tails está autorizado\n"
+#~ "para utilizarlo bajo ciertas condiciones; licenciado bajo\n"
+#~ "Creative Commons Attribution 3.0 licenciado en Estados Unidos.\n"
+#~ " - Iconos de [Proyecto Noun|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ "Creative Commons - Atribución, por Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Atribución, por Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Atribución, por factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Dominio Público, por Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Atribución, por Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Atribución, por Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Atribución, por Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Atribución, por Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Domino Público, por Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Atribución, por Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Atribución, por Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Atribución, por Zech Nelson.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
#~ msgid "Tails is released under the GNU/GPL (version 3 or above)."
#~ msgstr "Tails se publica bajo la licencia GNU/GPL (versión 3 o superior)."
diff --git a/wiki/src/doc/about/license.fa.po b/wiki/src/doc/about/license.fa.po
index 6c51ee2..b58c146 100644
--- a/wiki/src/doc/about/license.fa.po
+++ b/wiki/src/doc/about/license.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: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2018-12-13 16:37+0000\n"
"PO-Revision-Date: 2015-10-21 10:59+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/license/"
@@ -91,101 +91,241 @@ msgstr ""
"این تارنما از عکس‌های زیادی استفاده می‌کند که داری حق نشر، پروانه، نشان‌ تجاری "
"و شرایط توزیع گوناگونی هستند:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-#| " Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-#| " Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-#| " Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-#| " Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-#| " Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-#| " Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - نشان‌وارهٔ تیلز بر اساس [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" و توسط ایلسور آبتوکف از پروژهٔ Noun طراحی شده‌است.\n"
-" - نشان‌وارهٔ دبیان: حق نشر (c) 1999 Software in the Public Interest.\n"
-" - نشان‌وارهٔ پیاز تور: نشان تجاری ثبت‌شدهٔ پروژهٔ تور, Inc.; پروژهٔ تیلز، تحت پروانهٔ\n"
-"Creative Commons Attribution 3.0 United States License اجازه دارد در شرایط خاصی از این نشان‌واره استفاده کند.\n"
-" - نمایه‌های [[پروژهٔ Noun|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - ارجاع, توسط الیویه گویین.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: کریتیو کامنز —\n"
-" ارجاع, توسط آزیس.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: کریتیو کامنز —\n"
-" ارجاع, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: پروانهٔ مالکیت عمومی,توسط روهیس م.س..\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: کریتیو کامنز —\n"
-" ارجاع, توسط ادوارد بوتمن.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: کریتیو کامنز — ارجاع, توسط جو مورتل.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: کریتیو کامنز —\n"
-" ارجاع, توسط کریس دابینز.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" کریتیو کامنز — ارجاع, توسط کورنلیوس دنجر.\n"
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek]]."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
+#~| " Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
+#~| " Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
+#~| " Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
+#~| " Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
+#~| " Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
+#~| " Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - نشان‌وارهٔ تیلز بر اساس [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " و توسط ایلسور آبتوکف از پروژهٔ Noun طراحی شده‌است.\n"
+#~ " - نشان‌وارهٔ دبیان: حق نشر (c) 1999 Software in the Public Interest.\n"
+#~ " - نشان‌وارهٔ پیاز تور: نشان تجاری ثبت‌شدهٔ پروژهٔ تور, Inc.; پروژهٔ تیلز، تحت پروانهٔ\n"
+#~ "Creative Commons Attribution 3.0 United States License اجازه دارد در شرایط خاصی از این نشان‌واره استفاده کند.\n"
+#~ " - نمایه‌های [[پروژهٔ Noun|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - ارجاع, توسط الیویه گویین.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]: کریتیو کامنز —\n"
+#~ " ارجاع, توسط آزیس.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]: کریتیو کامنز —\n"
+#~ " ارجاع, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]: پروانهٔ مالکیت عمومی,توسط روهیس م.س..\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]: کریتیو کامنز —\n"
+#~ " ارجاع, توسط ادوارد بوتمن.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]: کریتیو کامنز — ارجاع, توسط جو مورتل.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]: کریتیو کامنز —\n"
+#~ " ارجاع, توسط کریس دابینز.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " کریتیو کامنز — ارجاع, توسط کورنلیوس دنجر.\n"
#, fuzzy
#~| msgid ""
diff --git a/wiki/src/doc/about/license.fr.po b/wiki/src/doc/about/license.fr.po
index 77028e38..2c622f3 100644
--- a/wiki/src/doc/about/license.fr.po
+++ b/wiki/src/doc/about/license.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2018-12-13 16:37+0000\n"
"PO-Revision-Date: 2018-01-18 13:40+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -93,148 +93,292 @@ msgstr ""
"Ce site utilise plusieurs images aux copyrights, licences, marques déposées "
"et termes de distribution distincts :"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-#| " Creative Commons — Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-#| " Creative Commons — Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-#| " Public Domain, by Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
-#| " Creative Commons — Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-#| " Creative Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-#| " Creative Commons — Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-#| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-#| " Public Domain, by Julian Norton.\n"
-#| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-#| " Creative Commons — Attribution, by Kervin Markle.\n"
-#| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-#| " Creative Commons — Attribution, by Wilson Joseph.\n"
-#| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-#| " Creative Commons — Attribution, by Richard de Vos.\n"
-#| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-#| " Creative Commons — Attribution, by Diego Naive.\n"
-#| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-#| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-#| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-#| " Public Domain, by Jean Yashu.\n"
-#| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-#| " Creative Commons — Attribution, by Thomas Helbig.\n"
-#| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-#| " Creative Commons — Attribution, by unlimicon.\n"
+#, fuzzy
+#| msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+"Logo Debian : Copyright (c) 1999 Software in the public Interest (\"Logiciel "
+"dans l'intérêt public\")."
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - Le logo Tails est basé sur [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" par Ilsur Aptukov du Noun Project.\n"
-" - Logo Debian : Copyright (c) 1999 Software in the Public Interest.\n"
-" - Logo Onion : marque déposée par The Tor Project, Inc. ; le projet Tails\n"
-"est autorisé à l'utiliser sous certaines conditions ; sous licence\n"
-"Creative Commons Attribution 3.0 États-Unis.\n"
-" - Icônes de [[The Noun Project|http://thenounproject.com/]] :\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]] :\n"
-" Creative Commons - Attribution, par Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]] :\n"
-" Creative Commons — Attribution, par Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]] :\n"
-" Creative Commons — Attribution, par factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]] :\n"
-" Domaine public, par Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]] :\n"
-" Creative Commons — Attribution, par Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]] :\n"
-" Creative Commons — Attribution, par Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]] :\n"
-" Creative Commons — Attribution, par Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]] :\n"
-" Creative Commons — Attribution, par Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]] :\n"
-" Domaine public, par Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]] :\n"
-" Creative Commons — Attribution, par Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]] :\n"
-" Creative Commons — Attribution, par Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]] :\n"
-" Creative Commons — Attribution, par Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]] :\n"
-" Creative Commons — Attribution, par Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]] :\n"
-" Creative Commons — Attribution, par Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]] :\n"
-" Creative Commons — Attribution, par Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]] :\n"
-" Creative Commons — Attribution, par Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]] :\n"
-" Domaine public, par Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]] :\n"
-" Creative Commons — Attribution, par Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]] :\n"
-" Creative Commons — Attribution, par unlimicon.\n"
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek]]."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~| " Creative Commons — Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~| " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~| " Public Domain, by Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~| " Creative Commons — Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~| " Creative Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~| " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~| " Public Domain, by Julian Norton.\n"
+#~| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~| " Creative Commons — Attribution, by Kervin Markle.\n"
+#~| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~| " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~| " Creative Commons — Attribution, by Richard de Vos.\n"
+#~| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~| " Creative Commons — Attribution, by Diego Naive.\n"
+#~| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~| " Public Domain, by Jean Yashu.\n"
+#~| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~| " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~| " Creative Commons — Attribution, by unlimicon.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - Le logo Tails est basé sur [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " par Ilsur Aptukov du Noun Project.\n"
+#~ " - Logo Debian : Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Logo Onion : marque déposée par The Tor Project, Inc. ; le projet Tails\n"
+#~ "est autorisé à l'utiliser sous certaines conditions ; sous licence\n"
+#~ "Creative Commons Attribution 3.0 États-Unis.\n"
+#~ " - Icônes de [[The Noun Project|http://thenounproject.com/]] :\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]] :\n"
+#~ " Creative Commons - Attribution, par Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]] :\n"
+#~ " Creative Commons — Attribution, par Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]] :\n"
+#~ " Creative Commons — Attribution, par factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]] :\n"
+#~ " Domaine public, par Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]] :\n"
+#~ " Creative Commons — Attribution, par Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]] :\n"
+#~ " Creative Commons — Attribution, par Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]] :\n"
+#~ " Creative Commons — Attribution, par Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]] :\n"
+#~ " Creative Commons — Attribution, par Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]] :\n"
+#~ " Domaine public, par Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]] :\n"
+#~ " Creative Commons — Attribution, par Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]] :\n"
+#~ " Creative Commons — Attribution, par Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]] :\n"
+#~ " Creative Commons — Attribution, par Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]] :\n"
+#~ " Creative Commons — Attribution, par Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]] :\n"
+#~ " Creative Commons — Attribution, par Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]] :\n"
+#~ " Creative Commons — Attribution, par Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]] :\n"
+#~ " Creative Commons — Attribution, par Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]] :\n"
+#~ " Domaine public, par Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]] :\n"
+#~ " Creative Commons — Attribution, par Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]] :\n"
+#~ " Creative Commons — Attribution, par unlimicon.\n"
#~ msgid "Tails is released under the GNU/GPL (version 3 or above)."
#~ msgstr "Tails est publié sous la licence GNU/GPL (version 3 ou supérieure)."
@@ -275,8 +419,3 @@ msgstr ""
#~ "courrier postal, pour un coût modique. Si vous avez seulement besoin d'un "
#~ "ou deux paquets source, Tails peut vous envoyer une copie électronique "
#~ "des paquets individuels."
-
-#~ msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
-#~ msgstr ""
-#~ "Logo Debian : Copyright (c) 1999 Software in the public Interest "
-#~ "(\"Logiciel dans l'intérêt public\")."
diff --git a/wiki/src/doc/about/license.it.po b/wiki/src/doc/about/license.it.po
index a9ffe5c..5f3710a 100644
--- a/wiki/src/doc/about/license.it.po
+++ b/wiki/src/doc/about/license.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION it\n"
-"POT-Creation-Date: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2018-12-13 16:37+0000\n"
"PO-Revision-Date: 2017-07-09 14:39+0000\n"
"Last-Translator: Zeyev <zeyev@autistici.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -88,110 +88,254 @@ msgstr ""
"Questo sito web utilizza parecchie immagini con differenti copyright, "
"licenze, trademark e termini di distribuzione:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+"Logo Debian : Copyright (c) 1999 Software in the public Interest (\"Logiciel "
+"dans l'intérêt public\")."
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-#| " Creative Commons — Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-#| " Creative Commons — Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-#| " Public Domain, by Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
-#| " Creative Commons — Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-#| " Creative Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-#| " Creative Commons — Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-#| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-#| " Public Domain, by Julian Norton.\n"
-#| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-#| " Creative Commons — Attribution, by Kervin Markle.\n"
-#| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - Il logo di Tails è basato su [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" di Ilsur Aptukov pubblicato su the Noun Project.\n"
-" - il logo di Debian è Copyright (c) 1999 Software in the Public Interest.\n"
-" - il logo Onion: è un trademark registrato da The Tor Project, Inc.; il progettoTails è autorizzato ad usarlo sotto certe condizioni; Creative Commons Attribution 3.0 United States License.\n"
-" - Icone da [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, di Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, di Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, di factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, di\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, di Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, di Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, di Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, di Cornelius Danger.\n"
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek]]."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~| " Creative Commons — Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~| " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~| " Public Domain, by Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~| " Creative Commons — Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~| " Creative Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~| " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~| " Public Domain, by Julian Norton.\n"
+#~| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~| " Creative Commons — Attribution, by Kervin Markle.\n"
+#~| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - Il logo di Tails è basato su [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " di Ilsur Aptukov pubblicato su the Noun Project.\n"
+#~ " - il logo di Debian è Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - il logo Onion: è un trademark registrato da The Tor Project, Inc.; il progettoTails è autorizzato ad usarlo sotto certe condizioni; Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icone da [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, di Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
+#~ " Attribution, di Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
+#~ " Attribution, di factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, di\n"
+#~ " Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
+#~ " Attribution, di Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
+#~ " Commons — Attribution, di Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
+#~ " Attribution, di Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, di Cornelius Danger.\n"
#~ msgid "Tails is released under the GNU/GPL (version 3 or above)."
#~ msgstr ""
@@ -232,8 +376,3 @@ msgstr ""
#~ "postale, per il solo prezzo di spedizione. Se necessiti soltanto uno o "
#~ "due pacchetti di sorgenti, Tails può organizzarsi con te e inviarti "
#~ "elettronicamente una copia dei singoli pacchetti."
-
-#~ msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
-#~ msgstr ""
-#~ "Logo Debian : Copyright (c) 1999 Software in the public Interest "
-#~ "(\"Logiciel dans l'intérêt public\")."
diff --git a/wiki/src/doc/about/license.mdwn b/wiki/src/doc/about/license.mdwn
index dcee1f1..8bc68e3 100644
--- a/wiki/src/doc/about/license.mdwn
+++ b/wiki/src/doc/about/license.mdwn
@@ -30,50 +30,73 @@ Website
This website uses several images with distinct copyright, licenses, trademarks
and distribution terms:
- - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]
- by Ilsur Aptukov from the Noun Project.
- - Debian logo: Copyright (c) 1999 Software in the Public Interest.
- - Onion logo: registered trademark of The Tor Project, Inc.; the Tails
-project is authorized to use it under certain conditions; licensed under
-Creative Commons Attribution 3.0 United States License.
- - Icons from [[The Noun Project|http://thenounproject.com/]]:
- - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:
- Creative Commons - Attribution, by Olivier Guin.
- - [[Code|http://thenounproject.com/term/code/18033/]]:
- Creative Commons — Attribution, by Azis.
- - [[Pen|http://thenounproject.com/term/pen/18907/]]:
- Creative Commons — Attribution, by factor[e] design initiative.
- - [[Loan|http://thenounproject.com/term/loan/19538/]]:
- Public Domain, by Rohith M S.
- - [[User|http://thenounproject.com/term/user/419/]]:
- Creative Commons — Attribution, by Edward Boatman.
- - [[Translation|http://thenounproject.com/term/translation/5735/]]:
- Creative Commons — Attribution, by Joe Mortell.
- - [[Gears|http://thenounproject.com/term/gears/8949/]]:
- Creative Commons — Attribution, by Cris Dobbins.
- - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:
- Creative Commons — Attribution, by Cornelius Danger.
- - [[Check Mark|https://thenounproject.com/term/check/4489/]]:
- Public Domain, by Julian Norton.
- - [[Delete|https://thenounproject.com/term/delete/49691/]]:
- Creative Commons — Attribution, by Kervin Markle.
- - [[Play|https://thenounproject.com/term/play/152052]]:
- Creative Commons — Attribution, by Zech Nelson.
- - [[Pause|https://thenounproject.com/term/pause/152046]]:
- Creative Commons — Attribution, by Zech Nelson.
- - [[USB|https://thenounproject.com/term/usb/28901]]:
- Creative Commons — Attribution, by Wilson Joseph.
- - [[Time|https://thenounproject.com/term/time/6732]]:
- Creative Commons — Attribution, by Richard de Vos.
- - [[Printer|https://thenounproject.com/term/printer/146674]]:
- Creative Commons — Attribution, by Diego Naive.
- - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:
- Creative Commons — Attribution, by Pham Thi Dieu Linh.
- - [[Laptop|https://thenounproject.com/term/laptop/6729]]:
- Public Domain, by Jean Yashu.
- - [[Love|https://thenounproject.com/term/love/218846/]]:
- Creative Commons — Attribution, by Thomas Helbig.
- - [[Survey|https://thenounproject.com/term/survey/1296072]]:
- Creative Commons — Attribution, by unlimicon.
- - [[Info|https://thenounproject.com/term/info/808461]]:
- Creative Commons — Attribution, by icongeek]].
+- The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]
+ by Ilsur Aptukov from the Noun Project.
+
+- Debian logo: Copyright (c) 1999 Software in the Public Interest.
+
+- Onion logo: registered trademark of The Tor Project, Inc.; the Tails
+ project is authorized to use it under certain conditions; licensed under
+ Creative Commons Attribution 3.0 United States License.
+
+- Icons from [[The Noun Project|http://thenounproject.com/]]:
+
+ - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:
+ Creative Commons - Attribution, by Olivier Guin.
+
+ - [[Code|http://thenounproject.com/term/code/18033/]]:
+ Creative Commons — Attribution, by Azis.
+
+ - [[Pen|http://thenounproject.com/term/pen/18907/]]:
+ Creative Commons — Attribution, by factor[e] design initiative.
+
+ - [[Loan|http://thenounproject.com/term/loan/19538/]]:
+ Public Domain, by Rohith M S.
+
+ - [[User|http://thenounproject.com/term/user/419/]]:
+ Creative Commons — Attribution, by Edward Boatman.
+
+ - [[Translation|http://thenounproject.com/term/translation/5735/]]:
+ Creative Commons — Attribution, by Joe Mortell.
+
+ - [[Gears|http://thenounproject.com/term/gears/8949/]]:
+ Creative Commons — Attribution, by Cris Dobbins.
+
+ - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:
+ Creative Commons — Attribution, by Cornelius Danger.
+
+ - [[Check Mark|https://thenounproject.com/term/check/4489/]]:
+ Public Domain, by Julian Norton.
+
+ - [[Delete|https://thenounproject.com/term/delete/49691/]]:
+ Creative Commons — Attribution, by Kervin Markle.
+
+ - [[Play|https://thenounproject.com/term/play/152052]]:
+ Creative Commons — Attribution, by Zech Nelson.
+
+ - [[Pause|https://thenounproject.com/term/pause/152046]]:
+ Creative Commons — Attribution, by Zech Nelson.
+
+ - [[USB|https://thenounproject.com/term/usb/28901]]:
+ Creative Commons — Attribution, by Wilson Joseph.
+
+ - [[Time|https://thenounproject.com/term/time/6732]]:
+ Creative Commons — Attribution, by Richard de Vos.
+
+ - [[Printer|https://thenounproject.com/term/printer/146674]]:
+ Creative Commons — Attribution, by Diego Naive.
+
+ - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:
+ Creative Commons — Attribution, by Pham Thi Dieu Linh.
+
+ - [[Laptop|https://thenounproject.com/term/laptop/6729]]:
+ Public Domain, by Jean Yashu.
+
+ - [[Love|https://thenounproject.com/term/love/218846/]]:
+ Creative Commons — Attribution, by Thomas Helbig.
+
+ - [[Survey|https://thenounproject.com/term/survey/1296072]]:
+ Creative Commons — Attribution, by unlimicon.
+
+ - [[Info|https://thenounproject.com/term/info/808461]]:
+ Creative Commons — Attribution, by icongeek]].
diff --git a/wiki/src/doc/about/license.pt.po b/wiki/src/doc/about/license.pt.po
index 5e979b1..d57104b 100644
--- a/wiki/src/doc/about/license.pt.po
+++ b/wiki/src/doc/about/license.pt.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: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2018-12-13 16:37+0000\n"
"PO-Revision-Date: 2014-05-23 12:05-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,104 +81,246 @@ msgstr ""
"Este site usa várias imagens com distintos direitos de cópia, licenças, "
"marcas e termos de distribuição:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-#| " Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-#| " Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-#| " Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-#| " Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-#| " Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-#| " Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - O logotipo do Tails logo é baseado em [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" por Ilsur Aptukov do Noun Project.\n"
-" - Logotipo Debian: Copyright (c) 1999 Software de interesse público.\n"
-" - Logotipo Onion: marca registrada do The Tor Project, Inc.; o projeto Tails\n"
-"está autorizado a usá-lo sob certas condições; licenciado sob\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Ícones do [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, por Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, por Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, por factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, por\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, por Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, por Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, por Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, por Cornelius Danger.\n"
+#, fuzzy
+#| msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr "Logo do Debian: Copyright (c) 1999 Software no Interesse Público"
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek]]."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
+#~| " Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
+#~| " Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
+#~| " Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
+#~| " Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
+#~| " Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
+#~| " Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - O logotipo do Tails logo é baseado em [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+#~ " por Ilsur Aptukov do Noun Project.\n"
+#~ " - Logotipo Debian: Copyright (c) 1999 Software de interesse público.\n"
+#~ " - Logotipo Onion: marca registrada do The Tor Project, Inc.; o projeto Tails\n"
+#~ "está autorizado a usá-lo sob certas condições; licenciado sob\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Ícones do [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, por Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
+#~ " Attribution, por Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
+#~ " Attribution, por factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, por\n"
+#~ " Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
+#~ " Attribution, por Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
+#~ " Commons — Attribution, por Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
+#~ " Attribution, por Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, por Cornelius Danger.\n"
#, fuzzy
#~| msgid ""
@@ -206,9 +348,6 @@ msgstr ""
#~ "fonte, podemos combinar com você de enviar uma cópia dos pacotes "
#~ "individuais por meios eletrônicos."
-#~ msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
-#~ msgstr "Logo do Debian: Copyright (c) 1999 Software no Interesse Público"
-
#~ msgid ""
#~ " - USB stick icon: [[source|http://www.openclipart.org/detail/29129]]; "
#~ "waived\n"
diff --git a/wiki/src/news/version_3.11.de.po b/wiki/src/news/version_3.11.de.po
index d28dfa7..fba9df6 100644
--- a/wiki/src/news/version_3.11.de.po
+++ b/wiki/src/news/version_3.11.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-12-11 11:58+0100\n"
+"POT-Creation-Date: 2018-12-11 17:58+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"
@@ -38,8 +38,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_3.10.1]]."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_3.10.1]]."
msgstr ""
#. type: Plain text
@@ -75,19 +75,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img upgrade.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/upgrade.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"When running from a virtual machine, warn about the trustworthiness of the "
-"operating system even when running from a free virtualization "
-"software. ([[!tails_ticket 16195]])"
+"operating system even when running from a free virtualization software. ([[!"
+"tails_ticket 16195]])"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img virtualization-warning.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/virtualization-warning.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
@@ -106,8 +106,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Update *Thunderbird* to "
-"[60.3.0](https://www.thunderbird.net/en-US/thunderbird/60.3.0/releasenotes/)."
+"- Update *Thunderbird* to [60.3.0](https://www.thunderbird.net/en-US/"
+"thunderbird/60.3.0/releasenotes/)."
msgstr ""
#. type: Title ##
@@ -117,8 +117,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Fix the opening of *Thunderbird* in non-English "
-"languages. ([[!tails_ticket 16113]])"
+"- Fix the opening of *Thunderbird* in non-English languages. ([[!"
+"tails_ticket 16113]])"
msgstr ""
#. type: Plain text
@@ -129,8 +129,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
msgstr ""
#. type: Plain text
@@ -161,14 +161,14 @@ msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
-msgid "- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
+msgid ""
+"- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If you cannot do an automatic upgrade or if Tails fails to start after "
-"an\n"
+" If you cannot do an automatic upgrade or if Tails fails to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
@@ -193,7 +193,6 @@ msgstr ""
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
msgstr ""
diff --git a/wiki/src/news/version_3.11.es.po b/wiki/src/news/version_3.11.es.po
index d28dfa7..fba9df6 100644
--- a/wiki/src/news/version_3.11.es.po
+++ b/wiki/src/news/version_3.11.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-12-11 11:58+0100\n"
+"POT-Creation-Date: 2018-12-11 17:58+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"
@@ -38,8 +38,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_3.10.1]]."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_3.10.1]]."
msgstr ""
#. type: Plain text
@@ -75,19 +75,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img upgrade.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/upgrade.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"When running from a virtual machine, warn about the trustworthiness of the "
-"operating system even when running from a free virtualization "
-"software. ([[!tails_ticket 16195]])"
+"operating system even when running from a free virtualization software. ([[!"
+"tails_ticket 16195]])"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img virtualization-warning.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/virtualization-warning.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
@@ -106,8 +106,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Update *Thunderbird* to "
-"[60.3.0](https://www.thunderbird.net/en-US/thunderbird/60.3.0/releasenotes/)."
+"- Update *Thunderbird* to [60.3.0](https://www.thunderbird.net/en-US/"
+"thunderbird/60.3.0/releasenotes/)."
msgstr ""
#. type: Title ##
@@ -117,8 +117,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Fix the opening of *Thunderbird* in non-English "
-"languages. ([[!tails_ticket 16113]])"
+"- Fix the opening of *Thunderbird* in non-English languages. ([[!"
+"tails_ticket 16113]])"
msgstr ""
#. type: Plain text
@@ -129,8 +129,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
msgstr ""
#. type: Plain text
@@ -161,14 +161,14 @@ msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
-msgid "- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
+msgid ""
+"- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If you cannot do an automatic upgrade or if Tails fails to start after "
-"an\n"
+" If you cannot do an automatic upgrade or if Tails fails to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
@@ -193,7 +193,6 @@ msgstr ""
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
msgstr ""
diff --git a/wiki/src/news/version_3.11.fa.po b/wiki/src/news/version_3.11.fa.po
index d28dfa7..fba9df6 100644
--- a/wiki/src/news/version_3.11.fa.po
+++ b/wiki/src/news/version_3.11.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-12-11 11:58+0100\n"
+"POT-Creation-Date: 2018-12-11 17:58+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"
@@ -38,8 +38,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_3.10.1]]."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_3.10.1]]."
msgstr ""
#. type: Plain text
@@ -75,19 +75,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img upgrade.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/upgrade.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"When running from a virtual machine, warn about the trustworthiness of the "
-"operating system even when running from a free virtualization "
-"software. ([[!tails_ticket 16195]])"
+"operating system even when running from a free virtualization software. ([[!"
+"tails_ticket 16195]])"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img virtualization-warning.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/virtualization-warning.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
@@ -106,8 +106,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Update *Thunderbird* to "
-"[60.3.0](https://www.thunderbird.net/en-US/thunderbird/60.3.0/releasenotes/)."
+"- Update *Thunderbird* to [60.3.0](https://www.thunderbird.net/en-US/"
+"thunderbird/60.3.0/releasenotes/)."
msgstr ""
#. type: Title ##
@@ -117,8 +117,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Fix the opening of *Thunderbird* in non-English "
-"languages. ([[!tails_ticket 16113]])"
+"- Fix the opening of *Thunderbird* in non-English languages. ([[!"
+"tails_ticket 16113]])"
msgstr ""
#. type: Plain text
@@ -129,8 +129,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
msgstr ""
#. type: Plain text
@@ -161,14 +161,14 @@ msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
-msgid "- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
+msgid ""
+"- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If you cannot do an automatic upgrade or if Tails fails to start after "
-"an\n"
+" If you cannot do an automatic upgrade or if Tails fails to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
@@ -193,7 +193,6 @@ msgstr ""
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
msgstr ""
diff --git a/wiki/src/news/version_3.11.fr.po b/wiki/src/news/version_3.11.fr.po
index d28dfa7..fba9df6 100644
--- a/wiki/src/news/version_3.11.fr.po
+++ b/wiki/src/news/version_3.11.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-12-11 11:58+0100\n"
+"POT-Creation-Date: 2018-12-11 17:58+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"
@@ -38,8 +38,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_3.10.1]]."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_3.10.1]]."
msgstr ""
#. type: Plain text
@@ -75,19 +75,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img upgrade.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/upgrade.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"When running from a virtual machine, warn about the trustworthiness of the "
-"operating system even when running from a free virtualization "
-"software. ([[!tails_ticket 16195]])"
+"operating system even when running from a free virtualization software. ([[!"
+"tails_ticket 16195]])"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img virtualization-warning.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/virtualization-warning.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
@@ -106,8 +106,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Update *Thunderbird* to "
-"[60.3.0](https://www.thunderbird.net/en-US/thunderbird/60.3.0/releasenotes/)."
+"- Update *Thunderbird* to [60.3.0](https://www.thunderbird.net/en-US/"
+"thunderbird/60.3.0/releasenotes/)."
msgstr ""
#. type: Title ##
@@ -117,8 +117,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Fix the opening of *Thunderbird* in non-English "
-"languages. ([[!tails_ticket 16113]])"
+"- Fix the opening of *Thunderbird* in non-English languages. ([[!"
+"tails_ticket 16113]])"
msgstr ""
#. type: Plain text
@@ -129,8 +129,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
msgstr ""
#. type: Plain text
@@ -161,14 +161,14 @@ msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
-msgid "- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
+msgid ""
+"- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If you cannot do an automatic upgrade or if Tails fails to start after "
-"an\n"
+" If you cannot do an automatic upgrade or if Tails fails to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
@@ -193,7 +193,6 @@ msgstr ""
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
msgstr ""
diff --git a/wiki/src/news/version_3.11.it.po b/wiki/src/news/version_3.11.it.po
index d28dfa7..fba9df6 100644
--- a/wiki/src/news/version_3.11.it.po
+++ b/wiki/src/news/version_3.11.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-12-11 11:58+0100\n"
+"POT-Creation-Date: 2018-12-11 17:58+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"
@@ -38,8 +38,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_3.10.1]]."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_3.10.1]]."
msgstr ""
#. type: Plain text
@@ -75,19 +75,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img upgrade.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/upgrade.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"When running from a virtual machine, warn about the trustworthiness of the "
-"operating system even when running from a free virtualization "
-"software. ([[!tails_ticket 16195]])"
+"operating system even when running from a free virtualization software. ([[!"
+"tails_ticket 16195]])"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img virtualization-warning.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/virtualization-warning.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
@@ -106,8 +106,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Update *Thunderbird* to "
-"[60.3.0](https://www.thunderbird.net/en-US/thunderbird/60.3.0/releasenotes/)."
+"- Update *Thunderbird* to [60.3.0](https://www.thunderbird.net/en-US/"
+"thunderbird/60.3.0/releasenotes/)."
msgstr ""
#. type: Title ##
@@ -117,8 +117,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Fix the opening of *Thunderbird* in non-English "
-"languages. ([[!tails_ticket 16113]])"
+"- Fix the opening of *Thunderbird* in non-English languages. ([[!"
+"tails_ticket 16113]])"
msgstr ""
#. type: Plain text
@@ -129,8 +129,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
msgstr ""
#. type: Plain text
@@ -161,14 +161,14 @@ msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
-msgid "- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
+msgid ""
+"- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If you cannot do an automatic upgrade or if Tails fails to start after "
-"an\n"
+" If you cannot do an automatic upgrade or if Tails fails to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
@@ -193,7 +193,6 @@ msgstr ""
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
msgstr ""
diff --git a/wiki/src/news/version_3.11.mdwn b/wiki/src/news/version_3.11.mdwn
index dbdc031..fd0aa3c 100644
--- a/wiki/src/news/version_3.11.mdwn
+++ b/wiki/src/news/version_3.11.mdwn
@@ -21,13 +21,13 @@ You should upgrade as soon as possible.
partially applied upgrades. ([[!tails_ticket 14754]] and
[[!tails_ticket 15282]])
- [[!img upgrade.png link="no"]]
+ [[!img version_3.11/upgrade.png link="no"]]
- When running from a virtual machine, warn about the trustworthiness of
the operating system even when running from a free virtualization
software. ([[!tails_ticket 16195]])
- [[!img virtualization-warning.png link="no"]]
+ [[!img version_3.11/virtualization-warning.png link="no"]]
- Disable *Autocrypt* in *Thunderbird* to prevent sending unencrypted
emails by mistake. ([[!tails_ticket 15923]])
diff --git a/wiki/src/news/version_3.11.pt.po b/wiki/src/news/version_3.11.pt.po
index d28dfa7..fba9df6 100644
--- a/wiki/src/news/version_3.11.pt.po
+++ b/wiki/src/news/version_3.11.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-12-11 11:58+0100\n"
+"POT-Creation-Date: 2018-12-11 17:58+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"
@@ -38,8 +38,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_3.10.1]]."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_3.10.1]]."
msgstr ""
#. type: Plain text
@@ -75,19 +75,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img upgrade.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/upgrade.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"When running from a virtual machine, warn about the trustworthiness of the "
-"operating system even when running from a free virtualization "
-"software. ([[!tails_ticket 16195]])"
+"operating system even when running from a free virtualization software. ([[!"
+"tails_ticket 16195]])"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img virtualization-warning.png link=\"no\"]]\n"
+msgid " [[!img version_3.11/virtualization-warning.png link=\"no\"]]\n"
msgstr ""
#. type: Bullet: '- '
@@ -106,8 +106,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Update *Thunderbird* to "
-"[60.3.0](https://www.thunderbird.net/en-US/thunderbird/60.3.0/releasenotes/)."
+"- Update *Thunderbird* to [60.3.0](https://www.thunderbird.net/en-US/"
+"thunderbird/60.3.0/releasenotes/)."
msgstr ""
#. type: Title ##
@@ -117,8 +117,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"- Fix the opening of *Thunderbird* in non-English "
-"languages. ([[!tails_ticket 16113]])"
+"- Fix the opening of *Thunderbird* in non-English languages. ([[!"
+"tails_ticket 16113]])"
msgstr ""
#. type: Plain text
@@ -129,8 +129,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
msgstr ""
#. type: Plain text
@@ -161,14 +161,14 @@ msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
-msgid "- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
+msgid ""
+"- To upgrade, automatic upgrades are available from 3.9 and 3.10.1 to 3.11."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" If you cannot do an automatic upgrade or if Tails fails to start after "
-"an\n"
+" If you cannot do an automatic upgrade or if Tails fails to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
@@ -193,7 +193,6 @@ msgstr ""
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate?r=3.11\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
msgstr ""