Correction suite à un conflit git mal géré

[website.git] / Donnez.en.po

diff --git a/Donnez.en.po b/Donnez.en.po
index 32b21728abc5db503801088ae177cbcd69a5bcf7..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: 2018-10-11 21:46+0200\n"
-"PO-Revision-Date: 2018-07-20 16:27+0200\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"


@@ -13,7 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

-"X-Generator: Gtranslator 2.91.7\n"

 
 #. type: Content of: outside any tag (error?)
 msgid "[[!meta title=\"Donnez !\"]]"
 
 #. type: Content of: outside any tag (error?)
 msgid "[[!meta title=\"Donnez !\"]]"


@@ -65,6 +64,28 @@ msgstr ""
 "Whenever we have funding for more than 6 months, we try to start a new\n"
 "exit node. Below 3 months, we shall have to close an existing relay."
 
 "Whenever we have funding for more than 6 months, we try to start a new\n"
 "exit node. Below 3 months, we shall have to close an existing relay."
 

+#. type: Content of: <h2>
+msgid "Affiches et cartes postales"
+msgstr "Posters and postcards"
+
+#. type: Content of: <p>
+msgid ""
+"Dans la continuité de notre <a href=\"https://nos-oignons.net/campagne2018/"
+"\">campagne 2018</a>, nous vous proposons toujours des contreparties en "
+"échanges de vos dons."
+msgstr ""
+"In the spirit of our <a href=\"https://nos-oignons.net/campagne2018/index.en."
+"html\">2018's campaign</a>, we'll still send you goodies to thank you for "
+"your donation."
+
+#. type: Content of: <p><center>
+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]]"
+

 #. type: Content of: <h2>
 msgid "Donner par carte bancaire"
 msgstr "Donate by credit card"
 #. type: Content of: <h2>
 msgid "Donner par carte bancaire"
 msgstr "Donate by credit card"


@@ -220,15 +241,73 @@ msgstr ""
 msgid "En bitcoins"
 msgstr "Using bitcoins"
 
 msgid "En bitcoins"
 msgstr "Using bitcoins"
 

-#. type: Content of: outside any tag (error?)
+#. type: Content of: <p>
+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>:"
+
+#. type: Content of: <ul><li>
+msgid ""
+"<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>"
+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 ""
+"<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>"
+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 ""
+"<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>"
+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 ""
 msgid ""

-"[[!img assets/bitcoin-address.png link="
-"\"bitcoin:1Nf16zXDSsbNt3b1VVr2SYiWcGR4wq44CF\" alt=\"QR code pour l’adresse "
-"Bitcoin\" caption=\"Adresse : 1Nf16zXDSsbNt3b1VVr2SYiWcGR4wq44CF\"]]"
+"<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>"

 msgstr ""
 msgstr ""

-"[[!img assets/bitcoin-address.png link="
-"\"bitcoin:1Nf16zXDSsbNt3b1VVr2SYiWcGR4wq44CF\" alt=\"QR code for the Bitcoin "
-"address\" caption=\"Address: 1Nf16zXDSsbNt3b1VVr2SYiWcGR4wq44CF\"]]"
+"<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 ""
+"<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>"
+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 ""


@@ -246,26 +325,22 @@ msgstr ""
 "several ways to link a Bitcoin address and who uses it."
 
 #. type: Content of: <div><h2>
 "several ways to link a Bitcoin address and who uses it."
 
 #. type: Content of: <div><h2>

-msgid "Par Flattr"
-msgstr "By Flattr"
+msgid "Par Liberapay"
+msgstr "By Liberapay"

 
 #. type: Content of: <div><p>
 msgid ""
 
 #. 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:"
+"Vous pouvez nous soutenir à travers la plateforme de dons récurrents "
+"Liberapay :"
+msgstr "You can support us through the Liberapay recurring payments platform:"

 
 #. type: Content of: <div><p>
 msgid ""
 
 #. 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>"
+"<a href=\"https://fr.liberapay.com/nos-oignons/donate\">[[!img assets/"
+"liberapay.png link=no alt=\"Donnez à Nos oignons avec Liberapay\"]]</a>"

 msgstr ""
 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>"
+"<a href=\"https://en.liberapay.com/nos-oignons/donate\">[[!img assets/"
+"liberapay.png link=no alt=\"Support Nos oignons using Liberapay\"]]</a>"

 
 #. type: Content of: <h2>
 msgid "De la main à la main"
 
 #. type: Content of: <h2>
 msgid "De la main à la main"


@@ -280,12 +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://cafe-vie-privee-lannion.bzh/\">Café Vie Privée</a>, 15 "
-"octobre 2018, Lannion, France"
-msgstr ""
-

 #. 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?"


@@ -298,6 +367,30 @@ 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 ""
+"[[Financial report for 2017|Association/Rapport_financier_2017.pdf]] (in "
+"French)"
+

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


@@ -345,19 +438,3 @@ msgid ""
 msgstr ""
 "<a name=\"fn-blurry\" href=\"#ref-blurry\">2</a>&nbsp;:&nbsp; Stripped "
 "onions represent known future donations."
 msgstr ""
 "<a name=\"fn-blurry\" href=\"#ref-blurry\">2</a>&nbsp;:&nbsp; Stripped "
 "onions represent known future donations."

-
-#~ msgid "Par Liberapay"
-#~ msgstr "By Liberapay"
-
-#~ msgid ""
-#~ "Vous pouvez nous soutenir à travers la plateforme de dons récurrents "
-#~ "Liberapay :"
-#~ msgstr ""
-#~ "You can support us through the Liberapay recurring payments platform:"
-
-#~ msgid ""
-#~ "<a href=\"https://fr.liberapay.com/nos-oignons/donate\">[[!img assets/"
-#~ "liberapay.png link=no alt=\"Donnez à Nos oignons avec Liberapay\"]]</a>"
-#~ msgstr ""
-#~ "<a href=\"https://en.liberapay.com/nos-oignons/donate\">[[!img assets/"
-#~ "liberapay.png link=no alt=\"Support Nos oignons using Liberapay\"]]</a>"