Correction suite à un conflit git mal géré

[website.git] / Donnez.en.po

diff --git a/Donnez.en.po b/Donnez.en.po
index ebc9822bba05e22986b23a6d08967b3a21f6d372..06b14047624d8b14ba1798dd030794a6dbcae09b 100644 (file)
--- a/Donnez.en.po
+++ b/Donnez.en.po
@@ -1,16 +1,18 @@
 # SOME DESCRIPTIVE TITLE
 # SOME DESCRIPTIVE TITLE

+# Lunar <lunar@anargeek.net>, 2018.
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"

-"POT-Creation-Date: 2017-07-19 21:48+0200\n"
-"PO-Revision-Date: 2017-04-07 10:00-0000\n"
-"Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
-"Language-Team: English <webmaster@nos-oignons.net>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: Poedit 1.6.10\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

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


@@ -22,14 +24,13 @@ msgstr "Support the Tor network!"
 
 #. type: Content of: <p>
 msgid ""
 
 #. type: Content of: <p>
 msgid ""

-"Pour vous faire une idée, avec nos estimations actuelles, chaque relai "
-"100 Mbit/s devrait nous coûter un peu moins de 300 € par mois. Un don de "
-"10 € couvre donc une journée de fonctionnement d'un relai."
+"Le budget de Nos oignons tourne actuellement autour 12 000 € par an.  Nous "
+"dépensons donc en moyenne 200 € par relai et par mois.  Un don de 10 € "
+"couvre donc une journée et demi de fonctionnement d'un relai."

 msgstr ""
 msgstr ""

-"To get an idea, with our current estimates, each 100 Mbit/s relay costs "
-"sligthly\n"
-"less than 300 € per month. A 10 € donation will let us run one relay for one "
-"day."
+"Nos Oignons' annual budget is currently around 12,000€. We spend on average "
+"200€ per relay per month. A 10€ donation covers about a day and a half of "
+"one relay."

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


@@ -63,20 +64,69 @@ 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"
 

-#. type: Content of: <p>
+#. type: Content of: <div><h3>
+msgid "Par HelloAsso"
+msgstr "By HelloAsso"
+
+#. type: Content of: <div><p>
+msgid ""
+"Les dons par <a href=\"https://www.helloasso.com/associations/nos-oignons/"
+"\">HelloAsso</a> nous sont intégralement reversés. Toutefois, le site vous "
+"incite à verser, en plus de votre don, un pourboire à destination de "
+"HelloAsso. <strong>Le montant est libre. N’hésitez pas à le modifier.</"
+"strong> Les « pourboires » suggérés peuvent être au-delà de 20% du don ! Les "
+"autres prestataires coûtent en général entre 1% et 5%. HelloAsso peut "
+"toutefois être intéressant pour les dons réguliers : vous pouvez choisir de "
+"ne laisser aucun pourboire, alors que la plupart des autres services "
+"prendront un pourcentage à chacun des transferts."
+msgstr ""
+"<a href=\"https://www.helloasso.com/associations/nos-oignons/\">HelloAsso</"
+"a> do not take a percentage of your donation. 100% of what you donate is "
+"transfered to the organization. However, their interface will prompt you to "
+"make a donation to HelloAsso as well. <strong>You can choose the amount. "
+"Feel free to change the suggested value.</strong> and beware, the default "
+"“tip” can be over 20% of your donation! (Other services will usually cost "
+"between 1% and 5%.) HelloAsso can also be a good option for recurring "
+"donations, as you can select “no tip”, whereas other services will take a "
+"percentage every time you donate."
+
+#. type: Content of: <div><p>

 msgid ""
 msgid ""

-"<em> Les banques faisant des misères au <a href=\"https://fdn2.org/\">Fonds "
-"de Défense de la Neutralité du Net</a>, il est impossible d'utiliser notre "
-"solution préférée pour accepter les dons par carte bancaire. Il est toujours "
-"possible d'utiliser PayPal ou HelloAsso.  </em>"
+"<a style=\"font: 1.2em sans-serif; text-transform: uppercase; max-width: "
+"181px; text-decoration: none; display: block; background: #5ab330; text-"
+"align: center; padding: .5em .25em; color: #FFF;\" href=\"https://nos-"
+"oignons.donnerenligne.fr/?lang=fr\">Faire un don</a>"

 msgstr ""
 msgstr ""

-"em>As banks are being bad to the <a href=\"https://fdn2.org/en/\">Fund for "
-"Defense of Net Neutrality</a>, our preferred way to to accept credit cards "
-"is unavailable. It is still possible to use PayPal or HelloAsso.</em>"
+"<a style=\"font: 1.2em sans-serif; text-transform: uppercase; max-width: "
+"181px; text-decoration: none; display: block; background: #5ab330; text-"
+"align: center; padding: .5em .25em; color: #FFF;\" href=\"https://nos-"
+"oignons.donnerenligne.fr/?lang=en\">Donate</a>"

 
 #. type: Content of: <div><h3>
 msgid "Par PayPal"
 
 #. type: Content of: <div><h3>
 msgid "Par PayPal"


@@ -166,54 +216,17 @@ msgstr ""
 "<a class=\"cancel\" href=\"https://www.paypal.com/cgi-bin/webscr?cmd=_subscr-"
 "find&alias=JY9VMDPLR3RA2\">Unsubscribe</a>"
 
 "<a class=\"cancel\" href=\"https://www.paypal.com/cgi-bin/webscr?cmd=_subscr-"
 "find&alias=JY9VMDPLR3RA2\">Unsubscribe</a>"
 

-#. type: Content of: <div><h3>
-msgid "Par HelloAsso"
-msgstr "By HelloAsso"
-
-#. type: Content of: <div><p>
-msgid ""
-"Les dons par <a href=\"https://www.helloasso.com/associations/nos-oignons/"
-"\">HelloAsso</a> nous sont intégralement reversés. Toutefois, le site vous "
-"incite à verser, en plus de votre don, un pourboire à destination de "
-"HelloAsso. Le montant est libre. Si on compare à d'autres prestataires, 1€ "
-"représente beaucoup d'argent pour une simple transaction bancaire, mais cela "
-"devient intéressant dans le contexte des dons récurrents."
-msgstr ""
-"Donations made using <a href=\"https://www.helloasso.com/associations/nos-"
-"oignons/\">HelloAsso</a> get to us in full. The site still incites to give "
-"an extra tip for HelloAsso. The amount is free. Compared to other companies, "
-"1€ is quite costly for a simple bank transaction. But it's great for "
-"recurring payments."
-
-#. type: Content of: <div><p>
-msgid ""
-"<a style=\"font: 1.2em sans-serif; text-transform: uppercase; max-width: "
-"181px; text-decoration: none; display: block; background: #5ab330; text-"
-"align: center; padding: .5em .25em; color: #FFF;\" href=\"https://nos-"
-"oignons.donnerenligne.fr/?lang=fr\">Faire un don</a>"
-msgstr ""
-"<a style=\"font: 1.2em sans-serif; text-transform: uppercase; max-width: "
-"181px; text-decoration: none; display: block; background: #5ab330; text-"
-"align: center; padding: .5em .25em; color: #FFF;\" href=\"https://nos-"
-"oignons.donnerenligne.fr/?lang=en\">Donate</a>"
-

 #. type: Content of: <h2>
 msgid "Donner par virement"
 msgstr "Donate by wire transfer"
 
 #. type: Content of: <p>
 msgid ""
 #. type: Content of: <h2>
 msgid "Donner par virement"
 msgstr "Donate by wire transfer"
 
 #. type: Content of: <p>
 msgid ""

-"Depuis le mercredi 14 janvier 2016, Nos oignons a de nouvelles coordonnées "
-"bancaires (RIB et IBAN). Vous pouvez les obtenir en écrivant à notre <a href="
-"\"mailto:donner@nos-oignons.net\">répondeur automatique</a>.  <b>Si vous "
-"aviez un don récurrent par virement, n'oubliez pas de mettre à jour nos "
-"coordonnées bancaires</b>."
-msgstr ""
-"Nos oignons' banking information (including our IBAN) changed on January "
-"14., 2016. You can receive the updated version by writing to our <a href="
-"\"mailto:donate@nos-oignons.net\">mail robot</a>.  <b>If you donate "
-"periodically through wire transfer, please remember to update the banking "
-"details</b>."
+"Pour obtenir les coordonnées bancaires (RIB et IBAN) de Nos oignons, écrivez "
+"à notre <a href=\"mailto:donner@nos-oignons.net\">répondeur automatique</a>."
+msgstr ""
+"You can get our wire transfer address (IBAN) by writing an email to <a href="
+"\"mailto:donate@nos-oignons.net\">our answering machine</a>."

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


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

-"Make a Bitcoin donation equivalent<sup><a href=\"#fn-last-update\">1</a></"
-"sup> to:"
+"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 ""


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


@@ -376,6 +367,36 @@ 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 ""
+"[[Financial report for 2016|Association/Rapport_financier_2016.pdf]] (in "
+"French)"
+

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


@@ -417,48 +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 "Devenir membre"
-#~ msgstr "<!-- N/A -->"
-
-#~ msgid ""
-#~ "<a href=\"https://passageenseine.fr/\">Pas Sage en Seine</a>, 29 juin - 2 "
-#~ "juillet 2017, Choisy-le-Roi, France"
-#~ msgstr ""
-#~ "<a href=\"https://passageenseine.fr/\">Pas Sage en Seine</a>, 29 June - 2 "
-#~ "July 2017, Choisy-le-Roi, France"
-
-#~ msgid ""
-#~ "<a href=\"https://2017.rmll.info/\">Rencontres Mondiales du Logiciel "
-#~ "Libre</a>, 1-7 juillet 2017, Saint-Étienne, France"
-#~ msgstr ""
-#~ "<a href=\"https://2017.rmll.info/en/\">Libre Software Meeting</a>, 1-7 "
-#~ "July 2017, Saint-Étienne, France"
-
-#~ msgid ""
-#~ "<a href=\"http://biblio.insa-rennes.fr/crypto/\">CryptoParty</a>, 28 "
-#~ "février, 2 et 4 mars 2017, Rennes, France"
-#~ msgstr ""
-#~ "<a href=\"http://biblio.insa-rennes.fr/crypto/\">CryptoParty</a>, 28 "
-#~ "February, 2 and 4 March 2017, Rennes, France"
-
-#~ msgid ""
-#~ "<a href=\"https://fosdem.org/2017/\">FOSDEM</a>, 4-5 février 2017, "
-#~ "Bruxelles, Belgique"
-#~ msgstr ""
-#~ "<a href=\"https://fosdem.org/2017/\">FOSDEM</a>, 4-5 February 2017, "
-#~ "Brussels, Belgium"
-
-#~ msgid ""
-#~ "<a href=\"https://2016.capitoledulibre.org/\">Capitole du Libre</a>, "
-#~ "19-20 novembre 2016, Toulouse, France"
-#~ msgstr ""
-#~ "<a href=\"https://2016.capitoledulibre.org/\">Capitole du Libre</a>, "
-#~ "19-20 November 2016, Toulouse, France"
-
-#~ msgid ""
-#~ "<a href=\"http://openbidouille.net/\">Open Bidouille Camp</a>, 24 "
-#~ "septembre 2016, Auxerre, France"
-#~ msgstr ""
-#~ "<a href=\"http://openbidouille.net/\">Open Bidouille Camp</a>, 24 "
-#~ "September 2016, Auxerre, France"