resolutionconflit

[website.git] / Actualités.en.po

diff --git a/Actualités.en.po b/Actualités.en.po
index 728b34cf4c75b9178d6f2c4842db9089aaf182ce..16a1bee77eefcf42258a3fed8fdd46d07bd7a316 100644 (file)
--- a/Actualités.en.po
+++ b/Actualités.en.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
-"POT-Creation-Date: 2019-11-11 21:53+0100\n"
+"POT-Creation-Date: 2022-07-09 19:18+0200\n"
 "PO-Revision-Date: 2019-10-08 13:48+0000\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"
@@ -16,50 +16,21 @@ msgid "[[!meta title=\"Actualités\"]]\n"
 msgstr "[[!meta title=\"News\"]]\n"
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Suivre l'actualité\n"
-#| "------------------\n"
 msgid "Suivre l'actualité"
-msgstr ""
-"Follow the news\n"
-"---------------\n"
-
-#. type: Plain text
-msgid ""
-"Pour suivre l'actualité de *Nos oignons*, il est possible de s'inscrire à "
-"notre lettre d'information :"
-msgstr ""
-"To follow the news for *Nos oignons*, you can subscribe to our newsletter:"
+msgstr "Follow the news"
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"<form method=\"post\" action=\"https://nos-oignons.net/mailman/subscribe/annonces\">\n"
-"  <div>\n"
-"    <label for=\"email\">Email :</label>\n"
-"    <input type=\"text\" id=\"email\" name=\"email\" size=\"30\" />\n"
-"    <input type=\"submit\" value=\"S'inscrire\" />\n"
-"  </div>\n"
-"</form>\n"
+"Pour suivre les actualités de *Nos oignons*, il est possible de s'inscrire à "
+"notre [lettre d'information](https://lists.nos-oignons.net/postorius/lists/"
+"annonces.nos-oignons.net/)."
 msgstr ""
-"<form method=\"post\" action=\"https://nos-oignons.net/mailman/subscribe/announces\">\n"
-"  <div>\n"
-"    <label for=\"email\">Email :</label>\n"
-"    <input type=\"text\" id=\"email\" name=\"email\" size=\"30\" />\n"
-"    <input type=\"submit\" value=\"Subscribe\" />\n"
-"  </div>\n"
-"</form>\n"
+"To follow the news for *Nos oignons*, you can subscribe to [our newsletter]"
+"(https://lists.nos-oignons.net/postorius/lists/announces.nos-oignons.net/)."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Réseaux sociaux\n"
-#| "---------------\n"
 msgid "Réseaux sociaux"
-msgstr ""
-"Social networks\n"
-"---------------\n"
+msgstr "Social networks"
 
 #. type: Bullet: ' * '
 msgid "Mastodon : [@nos_oignons@mamot.fr](https://mamot.fr/@nos_oignons)"
@@ -70,20 +41,11 @@ msgid "Twitter : [@NosOignons](https://twitter.com/NosOignons)"
 msgstr "Twitter: [@NosOignons](https://twitter.com/NosOignons)"
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Historique des actualités\n"
-#| "-------------------------\n"
 msgid "Historique des actualités"
-msgstr ""
-"Past news\n"
-"---------\n"
+msgstr "Past news"
 
 #. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"Actualités/* and !Actualités/*/* and currentlang()\" archive=\"yes\"\n"
-#| "          rss=\"yes\" atom=\"yes\" feedshow=\"10\" feedfile=\"news\"]]\n"
+#, no-wrap
 msgid ""
 "[[!inline pages=\"Actualités/* and !Actualités/*/* and currentlang()\" archive=\"yes\"\n"
 "          rss=\"yes\" atom=\"yes\" feedshow=\"10\" feedfile=\"news\"]]\n"
@@ -92,10 +54,9 @@ msgstr ""
 "          rss=\"yes\" atom=\"yes\" feedshow=\"10\" feedfile=\"news\"]]\n"
 
 #. type: Title -
-#, fuzzy, no-wrap
-#| msgid "Revue de presse\n"
-msgid "Revue de presse\n"
-msgstr "Media review\n"
+#, no-wrap
+msgid "Revue de presse"
+msgstr "Media review"
 
 #. type: Bullet: ' * '
 msgid ""
@@ -129,14 +90,15 @@ msgstr ""
 
 #. type: Bullet: ' * '
 msgid ""
-"2015-02-18 : [Intervention de Lunar pour l'émission \"Les nouvelles vagues\" "
-"sur France Culture](http://www.franceculture.fr/emission-les-nouvelles-"
-"vagues-le-secret-35-bienvenue-sur-tor-l%E2%80%99internet-secret-2015-02-18) "
-"(*fr*)."
+"2015-02-18 : [Intervention de Lunar pour l'émission \"Les nouvelles vagues\"]"
+"(http://www.franceculture.fr/emission-les-nouvelles-vagues-le-secret-35-"
+"bienvenue-sur-tor-l%E2%80%99internet-secret-2015-02-18) sur [France Culture]"
+"(https://www.franceculture.fr/) (*fr*)."
 msgstr ""
-"2015-02-18: [Interview of Lunar in the show \"Les nouvelles vagues\" aired "
-"on France Culture](http://www.franceculture.fr/emission-les-nouvelles-vagues-"
-"le-secret-35-bienvenue-sur-tor-l%E2%80%99internet-secret-2015-02-18) (*fr*)."
+"2015-02-18: [Interview of Lunar in the show \"Les nouvelles vagues\"](http://"
+"www.franceculture.fr/emission-les-nouvelles-vagues-le-secret-35-bienvenue-"
+"sur-tor-l%E2%80%99internet-secret-2015-02-18) aired on [France Culture]"
+"(https://www.franceculture.fr/) (*fr*)."
 
 #. type: Bullet: ' * '
 msgid ""
@@ -194,12 +156,12 @@ msgstr ""
 #. type: Bullet: ' * '
 msgid ""
 "2013-02-05 : [Roger's January 2013 trip report](https://blog.torproject.org/"
-"blog/trip-report-tor-trainings-dutch-and-belgian-police)  sur le [blog du "
+"blog/trip-report-tor-trainings-dutch-and-belgian-police) sur le [blog du "
 "projet Tor](https://blog.torproject.org/) (*en*)."
 msgstr ""
 "2013-02-05: [Roger's January 2013 trip report](https://blog.torproject.org/"
-"blog/trip-report-tor-trainings-dutch-and-belgian-police)  on the [Tor "
-"project blog](https://blog.torproject.org/) (*en*)."
+"blog/trip-report-tor-trainings-dutch-and-belgian-police) on the [Tor project "
+"blog](https://blog.torproject.org/) (*en*)."
 
 #. type: Bullet: ' * '
 msgid ""