resolutionconflit

[website.git] / Donnez.en.po

diff --git a/Donnez.en.po b/Donnez.en.po
index 092b62d17b2bb10f9da437b04cc53df9bc057471..ba835c9e8e249fa14a788b64fc6ff388da357d27 100644 (file)
--- a/Donnez.en.po
+++ b/Donnez.en.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
-"POT-Creation-Date: 2022-11-02 16:56+0100\n"
+"POT-Creation-Date: 2023-01-09 13:12+0100\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"
@@ -24,11 +24,11 @@ msgstr "Support the Tor network!"
 
 #. type: Content of: <p>
 msgid ""
-"Le budget de Nos oignons tourne actuellement autour 12 000 € par an.  Nous "
+"Le budget de Nos oignons tourne actuellement autour 15 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 ""
-"Nos Oignons' annual budget is currently around 12,000€. We spend on average "
+"Nos Oignons' annual budget is currently around 15,000€. We spend on average "
 "200€ per relay per month. A 10€ donation covers about a day and a half of "
 "one relay."
 
@@ -268,6 +268,30 @@ msgid ""
 "type=payment_button&requires_customer_email=false&requires_delivery_address=false"
 "\" > Payer avec Bitcoin 200€</a>"
 msgstr ""
+"<a class=\"paymium-btn\" title=\"Give using Bitcoin\" href=\"https://account."
+"paymium.com/invoice/b07d603b-d0d2-4c81-8494-ff9309a230a8?"
+"type=payment_button&requires_customer_email=false&requires_delivery_address=false"
+"\" > Give 5€ using Bitcoin</a> <a class=\"paymium-btn\" title=\"Give with "
+"Bitcoin\" href=\"https://account.paymium.com/invoice/6023f54a-b558-4b19-a8af-"
+"ed7edecce905?"
+"type=payment_button&requires_customer_email=false&requires_delivery_address=false"
+"\" > Give 10€ using Bitcoin</a> <a class=\"paymium-btn\" title=\"Give with "
+"Bitcoin\" href=\"https://account.paymium.com/invoice/aab1fbee-deee-4cb3-b91f-"
+"fadec707e4f6?"
+"type=payment_button&requires_customer_email=false&requires_delivery_address=false"
+"\" > Give 25€ using Bitcoin</a> <a class=\"paymium-btn\" title=\"Give with "
+"Bitcoin\" href=\"https://account.paymium.com/invoice/6bb4461f-e992-495d-a0b4-"
+"c3f015449530?"
+"type=payment_button&requires_customer_email=false&requires_delivery_address=false"
+"\" > Give 50€ using Bitcoin</a> <a class=\"paymium-btn\" title=\"Give with "
+"Bitcoin\" href=\"https://account.paymium.com/invoice/"
+"ad551eed-0e89-4d8e-9f6a-57a8dcfc7f20?"
+"type=payment_button&requires_customer_email=false&requires_delivery_address=false"
+"\" > Give 100€ using Bitcoin</a> <a class=\"paymium-btn\" title=\"Give with "
+"Bitcoin\" href=\"https://account.paymium.com/invoice/"
+"cdbefe3f-5d2b-4de8-9a37-2af0432d1e9f?"
+"type=payment_button&requires_customer_email=false&requires_delivery_address=false"
+"\" > Give 200€ using Bitcoin</a>"
 
 #. type: Content of: <div><h2>
 msgid "Par Liberapay"
@@ -373,17 +397,12 @@ msgid ""
 msgstr "<!-- N/A -->"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "<a name=\"fn-last-update\" href=\"#ref-last-update\">1</a>&nbsp;:&nbsp; "
-#| "Dernière mise à jour au [[!inline pagenames=\"data/last-update\" raw=\"yes"
-#| "\"]]"
 msgid ""
 "<a name=\"fn-last-update\" href=\"#ref-last-update\">1</a>&nbsp;:&nbsp; "
 "Dernière mise à jour : [[!inline pagenames=\"data/last-update\" raw=\"yes\"]]"
 msgstr ""
 "<a name=\"fn-last-update\" href=\"#ref-last-update\">1</a>&nbsp;:&nbsp; Last "
-"update on [[!inline pagenames=\"data/last-update\" raw=\"yes\"]]"
+"update: [[!inline pagenames=\"data/last-update\" raw=\"yes\"]]"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -393,98 +412,3 @@ msgid ""
 msgstr ""
 "<a name=\"fn-blurry\" href=\"#ref-blurry\">2</a>&nbsp;:&nbsp; Stripped "
 "onions represent known future donations."
-
-#, fuzzy
-#~| msgid ""
-#~| "<a class=\"paymium-btn\" href=\"https://www.paymium.com/invoice/"
-#~| "cdbefe3f-5d2b-4de8-9a37-2af0432d1e9f?type=payment_button&amp;"
-#~| "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
-#~| "inline pagenames=\"data/200-eur-and-btc\" raw=\"yes\"]]</a>"
-#~ msgid ""
-#~ "<a class=\"paymium-btn\" title=\"Payer avec Bitcoin\" href=\"https://"
-#~ "account.paymium.com/invoice/cdbefe3f-5d2b-4de8-9a37-2af0432d1e9f?"
-#~ "type=payment_button&requires_customer_email=false&requires_delivery_address=false"
-#~ "\" > Payer avec Bitcoin </a>"
-#~ msgstr ""
-#~ "<a class=\"paymium-btn\" href=\"https://www.paymium.com/invoice/"
-#~ "cdbefe3f-5d2b-4de8-9a37-2af0432d1e9f?type=payment_button&amp;"
-#~ "requires_customer_email=false&amp;requires_delivery_address=false\">[[!"
-#~ "inline pagenames=\"data/200-eur-and-btc\" raw=\"yes\"]]</a>"
-
-#~ 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>:"
-
-#~ 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>"
-
-#~ 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>"
-
-#~ 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>"
-
-#~ msgid ""
-#~ "<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 ""
-#~ "<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>"
-
-#~ 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>"
-
-#~ msgid ""
-#~ "<strong>Attention</strong> : contrairement à ce que racontent les médias, "
-#~ "les échanges en <em>bitcoins</em> ne sont pas anonymes. L'intégralité des "
-#~ "échanges est enregistré et l'historique est accessible publiquement. "
-#~ "C'est un des principes de fonctionnement du système. Il existe donc de "
-#~ "nombreuses possibilités d'analyse permettant de faire le lien entre une "
-#~ "adresse <em>bitcoin</em> et la personne qui s'en sert."
-#~ msgstr ""
-#~ "<strong>Watch out!</strong> Contrary to media stories, exchanges in "
-#~ "bitcoins \n"
-#~ "are not anonymous. All transactions are recorded and the whole history "
-#~ "is \n"
-#~ "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."