Correction suite à un conflit git mal géré

[website.git] / Donnez.en.po

diff --git a/Donnez.en.po b/Donnez.en.po
index 14dfec74aad88b1653e0bab77fcfab823fbc877a..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-09-08 22:19+0200\n"
-"PO-Revision-Date: 2019-03-06 11:21+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"


@@ -83,6 +83,8 @@ msgid ""
 "[[!img assets/contrepartie-trois-cartes.jpg]] [[!img assets/contrepartie-"
 "affiche-et-cartes.jpg]]"
 msgstr ""
 "[[!img assets/contrepartie-trois-cartes.jpg]] [[!img assets/contrepartie-"
 "affiche-et-cartes.jpg]]"
 msgstr ""

+"[[!img assets/contrepartie-trois-cartes.jpg]] [[!img assets/contrepartie-"
+"affiche-et-cartes.jpg]]"

 
 #. type: Content of: <h2>
 msgid "Donner par carte bancaire"
 
 #. type: Content of: <h2>
 msgid "Donner par carte bancaire"


@@ -240,15 +242,12 @@ msgid "En bitcoins"
 msgstr "Using bitcoins"
 
 #. type: Content of: <p>
 msgstr "Using bitcoins"
 
 #. type: Content of: <p>

-#| msgid ""
-#| "État de la trésorerie<sup><a href=\"#fn-last-update\" id=\"ref-last-update"
-#| "\">1</a></sup>"

 msgid ""
 "Faire un don en bitcoins équivalent<sup><a href=\"#fn-last-update\">1</a></"
 "sup> à :"
 msgstr ""
 msgid ""
 "Faire un don en bitcoins équivalent<sup><a href=\"#fn-last-update\">1</a></"
 "sup> à :"
 msgstr ""

-"Make a Bitcoin donation of approximatively<sup><a href=\"#fn-last-update\">1</a></"
-"sup>:"
+"Make a Bitcoin donation of approximatively<sup><a href=\"#fn-last-update"
+"\">1</a></sup>:"

 
 #. type: Content of: <ul><li>
 msgid ""
 
 #. type: Content of: <ul><li>
 msgid ""


@@ -257,6 +256,10 @@ msgid ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/5-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/5-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""

+"<a class=\"paymium-btn\" href=\"https://www.paymium.com/invoice/b07d603b-"
+"d0d2-4c81-8494-ff9309a230a8?type=payment_button&amp;"
+"requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
+"inline pagenames=\"data/5-eur-and-btc\" raw=\"yes\"]]</a>"

 
 #. type: Content of: <ul><li>
 msgid ""
 
 #. type: Content of: <ul><li>
 msgid ""


@@ -265,6 +268,10 @@ msgid ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/10-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/10-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""

+"<a class=\"paymium-btn\" href=\"https://www.paymium.com/invoice/6023f54a-"
+"b558-4b19-a8af-ed7edecce905?type=payment_button&amp;"
+"requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
+"inline pagenames=\"data/10-eur-and-btc\" raw=\"yes\"]]</a>"

 
 #. type: Content of: <ul><li>
 msgid ""
 
 #. type: Content of: <ul><li>
 msgid ""


@@ -273,6 +280,10 @@ msgid ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/25-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/25-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""

+"<a class=\"paymium-btn\" href=\"https://www.paymium.com/invoice/aab1fbee-"
+"deee-4cb3-b91f-fadec707e4f6?type=payment_button&amp;"
+"requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
+"inline pagenames=\"data/25-eur-and-btc\" raw=\"yes\"]]</a>"

 
 #. type: Content of: <ul><li>
 msgid ""
 
 #. type: Content of: <ul><li>
 msgid ""


@@ -281,6 +292,10 @@ msgid ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/50-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/50-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""

+"<a class=\"paymium-btn\" href=\"https://www.paymium.com/invoice/6bb4461f-"
+"e992-495d-a0b4-c3f015449530?type=payment_button&amp;"
+"requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
+"inline pagenames=\"data/50-eur-and-btc\" raw=\"yes\"]]</a>"

 
 #. type: Content of: <ul><li>
 msgid ""
 
 #. type: Content of: <ul><li>
 msgid ""


@@ -289,6 +304,10 @@ msgid ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/100-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""
 "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
 "inline pagenames=\"data/100-eur-and-btc\" raw=\"yes\"]]</a>"
 msgstr ""

+"<a class=\"paymium-btn\" href=\"https://www.paymium.com/invoice/"
+"ad551eed-0e89-4d8e-9f6a-57a8dcfc7f20?type=payment_button&amp;"
+"requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
+"inline pagenames=\"data/100-eur-and-btc\" raw=\"yes\"]]</a>"

 
 #. type: Content of: <p>
 msgid ""
 
 #. type: Content of: <p>
 msgid ""


@@ -305,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"


@@ -358,14 +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://jdll.org/\">Journées du logiciel libre</a>, 6-7 avril "
-"2019, Lyon, France"
-msgstr ""
-"<a href=\"https://jdll.org/\">Journées du logiciel libre</a>, 6-7 April "
-"2019, Lyon, 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?"


@@ -378,6 +367,24 @@ 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 ""
+"[[Financial report for 2018|Association/Rapport_financier_2018.pdf]] (in "
+"French)"
+

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