Correction suite à un conflit git mal géré

[website.git] / Donnez.en.po

diff --git a/Donnez.en.po b/Donnez.en.po
index bb1fbdd30e4cf793a413dc941fcccffe8e6cf107..06b14047624d8b14ba1798dd030794a6dbcae09b 100644 (file)
--- a/Donnez.en.po
+++ b/Donnez.en.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"

-"POT-Creation-Date: 2019-11-16 10:48+0100\n"
-"PO-Revision-Date: 2019-11-16 09:50+0000\n"
+"POT-Creation-Date: 2020-09-20 13:27+0200\n"
+"PO-Revision-Date: 2020-01-25 20:27+0000\n"

 "Last-Translator: Lunar <lunar@anargeek.net>\n"
 "Language-Team: French <contact@nos-oignons.net>\n"
 "Language: en\n"
 "Last-Translator: Lunar <lunar@anargeek.net>\n"
 "Language-Team: French <contact@nos-oignons.net>\n"
 "Language: en\n"


@@ -324,28 +324,6 @@ msgstr ""
 "public. It's one of the reasons why the system works. It means there are \n"
 "several ways to link a Bitcoin address and who uses it."
 
 "public. It's one of the reasons why the system works. It means there are \n"
 "several ways to link a Bitcoin address and who uses it."
 

-#. type: Content of: <div><h2>
-msgid "Par Flattr"
-msgstr "By Flattr"
-
-#. type: Content of: <div><p>
-msgid ""
-"Vous pouvez nous soutenir à travers la plateforme de micropaiements Flattr :"
-msgstr "You can support us through the Flattr micropayment platform:"
-
-#. type: Content of: <div><p>
-msgid ""
-"<a href=\"https://flattr.com/submit/auto?user_id=nos_oignons&url=https://nos-"
-"oignons.net/&title=Nos%20oignons&description=N%C5%93uds%20de%20sortie%20Tor"
-"%20financ%C3%A9s%20par%20la%20communaut"
-"%C3%A9&language=fr_FR&tags=tor&category=software\" >[[!img assets/flattr-"
-"badge-large.png link=no alt=\"Donnez à Nos oignons avec Flattr\"]]</a>"
-msgstr ""
-"<a href=\"https://flattr.com/submit/auto?user_id=nos_oignons&url=https://nos-"
-"oignons.net/&title=Tor%20exit%20nodes%20funded%20by%20the"
-"%20community&language=en_US&tags=tor&category=software\" >[[!img assets/"
-"flattr-badge-large.png link=no alt=\"Support Nos oignons using Flattr\"]]</a>"
-

 #. type: Content of: <div><h2>
 msgid "Par Liberapay"
 msgstr "By Liberapay"
 #. type: Content of: <div><h2>
 msgid "Par Liberapay"
 msgstr "By Liberapay"


@@ -377,30 +355,6 @@ msgstr ""
 "Members of Nos oignons are often present at public events to receive in "
 "person donations. Invite us!"
 
 "Members of Nos oignons are often present at public events to receive in "
 "person donations. Invite us!"
 

-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"https://2019.capitoledulibre.org/\">Capitole du Libre</a>, 16-17 "
-"novembre 2019, Toulouse, France"
-msgstr ""
-"<a href=\"https://2019.capitoledulibre.org/\">Capitole du Libre</a>, 16-17 "
-"November 2019, Toulouse, France"
-
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://campus-du-libre.org/\">Campus du Libre</a>, 23 novembre "
-"2019, Lyon, France"
-msgstr ""
-"<a href=\"http://campus-du-libre.org/\">Campus du Libre</a>, 23 November "
-"2019, Lyon, France"
-
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"https://fdln.insa-rennes.fr/\">Festival des Libertés Numériques</"
-"a>, 1-16 février 2020, France"
-msgstr ""
-"<a href=\"https://fdln.insa-rennes.fr/\">Festival des Libertés Numériques</"
-"a>, 1-16 February 2020, France"
-

 #. type: Content of: <h2>
 msgid "Comment sont dépensés les sous ?"
 msgstr "How is the money spent?"
 #. type: Content of: <h2>
 msgid "Comment sont dépensés les sous ?"
 msgstr "How is the money spent?"


@@ -413,6 +367,18 @@ msgstr ""
 "Every year, we publish a financial report with details on how donations have "
 "been used:"
 
 "Every year, we publish a financial report with details on how donations have "
 "been used:"
 

+#. type: Content of: <ul><li>
+msgid "[[Rapport financier 2020|Association/Rapport_financier_2020.pdf]]"
+msgstr ""
+"[[Financial report for 2020|Association/Rapport_financier_2020.pdf]] (in "
+"French)"
+
+#. type: Content of: <ul><li>
+msgid "[[Rapport financier 2019|Association/Rapport_financier_2019.pdf]]"
+msgstr ""
+"[[Financial report for 2019|Association/Rapport_financier_2019.pdf]] (in "
+"French)"
+

 #. type: Content of: <ul><li>
 msgid "[[Rapport financier 2018|Association/Rapport_financier_2018.pdf]]"
 msgstr ""
 #. type: Content of: <ul><li>
 msgid "[[Rapport financier 2018|Association/Rapport_financier_2018.pdf]]"
 msgstr ""