From 4cf1dc06e989b08371294eca3ecab3d425184e83 Mon Sep 17 00:00:00 2001 From: syl Date: Fri, 7 Jul 2017 07:10:00 +0000 Subject: [PATCH 01/16] Quelques corrections --- "Actualit\303\251s/20170706_don_framasoft.mdwn" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git "a/Actualit\303\251s/20170706_don_framasoft.mdwn" "b/Actualit\303\251s/20170706_don_framasoft.mdwn" index 78dfca1..72cf5f6 100644 --- "a/Actualit\303\251s/20170706_don_framasoft.mdwn" +++ "b/Actualit\303\251s/20170706_don_framasoft.mdwn" @@ -1,11 +1,11 @@ -[[!meta title="Don Framasoft"]] +[[!meta title="Don de Framasoft"]] [[!meta date="2017-07-06 06:42:00"]] Le 20 juin 2017, le réseau [Framasoft](https://framasoft.org) nous a fait un chouette don de 500 EUR, nous permettant de financer nos relais pour quelques semaines ! -Un Grand merci à eux, de contribuer à la diversification du réseau Tor, +Un Grand merci à elles et eux, de contribuer à la diversification du réseau Tor, notamment en France, en soutenant notre association. Comme Framasoft, soutenez-nous, [[faites un don à Nos oignons|Donnez]] ! -- 2.39.5 From 6159e9ec836e07499495a29feaaedeecac9894af Mon Sep 17 00:00:00 2001 From: website Date: Fri, 7 Jul 2017 09:10:39 +0200 Subject: [PATCH 02/16] =?utf8?q?Fichiers=20PO=20mis=20=C3=A0=20jour.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- "Actualit\303\251s/20170706_don_framasoft.en.po" | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git "a/Actualit\303\251s/20170706_don_framasoft.en.po" "b/Actualit\303\251s/20170706_don_framasoft.en.po" index 2693f1f..f5ab8d3 100644 --- "a/Actualit\303\251s/20170706_don_framasoft.en.po" +++ "b/Actualit\303\251s/20170706_don_framasoft.en.po" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-06 08:13+0200\n" +"POT-Creation-Date: 2017-07-07 09:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" #. type: Plain text #, no-wrap -msgid "[[!meta title=\"Don Framasoft\"]]\n" +msgid "[[!meta title=\"Don de Framasoft\"]]\n" msgstr "" #. type: Plain text @@ -35,10 +35,11 @@ msgstr "" #. type: Plain text msgid "" -"Un Grand merci à eux, de contribuer à la diversification du réseau Tor, " -"notamment en France, en soutenant notre association." +"Un Grand merci à elles et eux, de contribuer à la diversification du réseau " +"Tor, notamment en France, en soutenant notre association." msgstr "" #. type: Plain text -msgid "Comme Framasoft, soutenez-nous, [[faites un don à Nos oignons|Donnez]] !" +msgid "" +"Comme Framasoft, soutenez-nous, [[faites un don à Nos oignons|Donnez]] !" msgstr "" -- 2.39.5 From 196b448d585a67015a84ce50c919335f3d8ab372 Mon Sep 17 00:00:00 2001 From: Debian Live user Date: Fri, 7 Jul 2017 20:41:02 +0000 Subject: [PATCH 03/16] Traduction don Framasoft en anglais --- .../20170706_don_framasoft.en.po" | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git "a/Actualit\303\251s/20170706_don_framasoft.en.po" "b/Actualit\303\251s/20170706_don_framasoft.en.po" index f5ab8d3..17987b8 100644 --- "a/Actualit\303\251s/20170706_don_framasoft.en.po" +++ "b/Actualit\303\251s/20170706_don_framasoft.en.po" @@ -3,28 +3,28 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "POT-Creation-Date: 2017-07-07 09:10+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"PO-Revision-Date: 2017-07-07 20:40+0000\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Last-Translator: \n" +"Language-Team: \n" +"X-Generator: Poedit 1.8.11\n" #. type: Plain text #, no-wrap msgid "[[!meta title=\"Don de Framasoft\"]]\n" -msgstr "" +msgstr "[[!meta title=\"Framasoft donation\"]]\n" #. type: Plain text #, no-wrap msgid "[[!meta date=\"2017-07-06 06:42:00\"]]\n" -msgstr "" +msgstr "[[!meta date=\"2017-07-06 06:42:00\"]]\n" #. type: Plain text msgid "" @@ -32,14 +32,19 @@ msgid "" "chouette don de 500 EUR, nous permettant de financer nos relais pour " "quelques semaines !" msgstr "" +"On 20th June, 2017, the [Framasoft network](https://framasoft.org) gifted us " +"with a donation of 500EUR, allowing us to fund our relays for a few weeks!" #. type: Plain text msgid "" "Un Grand merci à elles et eux, de contribuer à la diversification du réseau " "Tor, notamment en France, en soutenant notre association." msgstr "" +"A big thank you to them, for contributing to the Tor network diversity, " +"especially in France, by supporting our non-profit organization." #. type: Plain text msgid "" "Comme Framasoft, soutenez-nous, [[faites un don à Nos oignons|Donnez]] !" msgstr "" +"Like Framasoft, you can support us by donating to [[Nos oignons|Donnez]]!" -- 2.39.5 From ff327c2929ded03426ee7e593db147c578e25c06 Mon Sep 17 00:00:00 2001 From: opi Date: Wed, 19 Jul 2017 17:09:40 +0200 Subject: [PATCH 04/16] =?utf8?q?Fichiers=20PO=20mis=20=C3=A0=20jour.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- "Actualit\303\251s/20170706_don_framasoft.en.po" | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git "a/Actualit\303\251s/20170706_don_framasoft.en.po" "b/Actualit\303\251s/20170706_don_framasoft.en.po" index 17987b8..c88721a 100644 --- "a/Actualit\303\251s/20170706_don_framasoft.en.po" +++ "b/Actualit\303\251s/20170706_don_framasoft.en.po" @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2017-07-07 09:10+0200\n" +"POT-Creation-Date: 2017-07-19 17:09+0200\n" "PO-Revision-Date: 2017-07-07 20:40+0000\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Last-Translator: \n" -"Language-Team: \n" "X-Generator: Poedit 1.8.11\n" #. type: Plain text -- 2.39.5 From 85aadc5cd27aa60e2954e0c3f735fd1cefa02b51 Mon Sep 17 00:00:00 2001 From: opi Date: Wed, 19 Jul 2017 17:42:49 +0200 Subject: [PATCH 05/16] =?utf8?q?Fichiers=20PO=20mis=20=C3=A0=20jour.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Donnez.en.po | 66 ++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/Donnez.en.po b/Donnez.en.po index adc558d..6f361a4 100644 --- a/Donnez.en.po +++ b/Donnez.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Nos oignons website\n" -"POT-Creation-Date: 2017-07-07 09:03+0200\n" +"POT-Creation-Date: 2017-07-19 17:42+0200\n" "PO-Revision-Date: 2017-04-07 10:00-0000\n" "Last-Translator: Nos oignons \n" "Language-Team: English \n" @@ -63,22 +63,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." -#. type: Content of:

+#. type: Content of:

msgid "Par carte bancaire" msgstr "By credit card" #. type: Content of:

+#, fuzzy +#| msgid "" +#| "Les banques faisant des misères au Fonds de " +#| "Défense de la Neutralité du Net, 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." msgid "" -"Les banques faisant des misères au Fonds de " -"Défense de la Neutralité du Net, il est impossible d'utiliser notre " +" Les banques faisant des misères au Fonds " +"de Défense de la Neutralité du Net, 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." +"possible d'utiliser PayPal ou HelloAsso. " msgstr "" "As banks are being bad to the Fund for " "Defense of Net Neutrality, our preferred way to to accept credit cards " "is unavailable. It is still possible to use PayPal or HelloAsso." -#. type: Content of:

+#. type: Content of:

msgid "Par PayPal" msgstr "By PayPal" @@ -166,7 +172,7 @@ msgstr "" "Unsubscribe" -#. type: Content of:

+#. type: Content of:

msgid "Par HelloAsso" msgstr "By HelloAsso" @@ -197,7 +203,7 @@ msgstr "" "align: center; padding: .5em .25em; color: #FFF;\" href=\"https://nos-" "oignons.donnerenligne.fr/?lang=en\">Donate" -#. type: Content of:

+#. type: Content of:

msgid "Par virement" msgstr "By wire transfer" @@ -224,20 +230,7 @@ msgstr "" "Most banks offer to setup periodic wire transfers. They surely help us plan " "the funding of the nodes better." -#. type: Content of:

-msgid "De la main à la main" -msgstr "In person" - -#. type: Content of:

-msgid "" -"Des membres de Nos oignons sont régulièrement présent·e·s à des évènements " -"publics pour recevoir des dons de la main à la main. N'hésitez pas à nous " -"inviter !" -msgstr "" -"Members of Nos oignons are often present at public events to receive in " -"person donations. Invite us!" - -#. type: Content of:

+#. type: Content of:

msgid "En bitcoins" msgstr "Using bitcoins" @@ -324,7 +317,7 @@ 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." -#. type: Content of:

+#. type: Content of:

msgid "Par Flattr" msgstr "By Flattr" @@ -346,7 +339,7 @@ msgstr "" "%20community&language=en_US&tags=tor&category=software\" >[[!img assets/" "flattr-badge-large.png link=no alt=\"Support Nos oignons using Flattr\"]]" -#. type: Content of:

+#. type: Content of:

msgid "Par Liberapay" msgstr "By Liberapay" @@ -364,15 +357,18 @@ msgstr "" "[[!img assets/" "liberapay.png link=no alt=\"Support Nos oignons using Liberapay\"]]" -#. type: Content of:

-msgid "Devenir membre" -msgstr "" +#. type: Content of:

+msgid "De la main à la main" +msgstr "In person" #. type: Content of:

msgid "" -"Pour les personnes qui souhaitent contribuer régulièrement, il est également " -"possible de [[devenir membre de l'association|Association]]." -msgstr "" +"Des membres de Nos oignons sont régulièrement présent·e·s à des évènements " +"publics pour recevoir des dons de la main à la main. N'hésitez pas à nous " +"inviter !" +msgstr "" +"Members of Nos oignons are often present at public events to receive in " +"person donations. Invite us!" #. type: Content of:

msgid "Comment sont dépensés les sous ?" @@ -404,6 +400,16 @@ msgstr "" "[[Financial report for 2013|Association/Rapport_financier_2013.pdf]] (in " "French)" +#. type: Content of:

+msgid "Devenir membre" +msgstr "" + +#. type: Content of:

+msgid "" +"Pour les personnes qui souhaitent contribuer régulièrement, il est également " +"possible de [[devenir membre de l'association|Association]]." +msgstr "" + #. type: Content of:

msgid "" "1 :  " -- 2.39.5 From cf4bd2bbcaef8ed6b789cb805f6abe7ba001a3f3 Mon Sep 17 00:00:00 2001 From: opi Date: Wed, 19 Jul 2017 17:48:20 +0200 Subject: [PATCH 06/16] =?utf8?q?Fichiers=20PO=20mis=20=C3=A0=20jour.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Donnez.en.po | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/Donnez.en.po b/Donnez.en.po index 6f361a4..8b69241 100644 --- a/Donnez.en.po +++ b/Donnez.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Nos oignons website\n" -"POT-Creation-Date: 2017-07-19 17:42+0200\n" +"POT-Creation-Date: 2017-07-19 17:48+0200\n" "PO-Revision-Date: 2017-04-07 10:00-0000\n" "Last-Translator: Nos oignons \n" "Language-Team: English \n" @@ -84,11 +84,11 @@ msgstr "" "Defense of Net Neutrality, our preferred way to to accept credit cards " "is unavailable. It is still possible to use PayPal or HelloAsso." -#. type: Content of:

+#. type: Content of:

msgid "Par PayPal" msgstr "By PayPal" -#. type: Content of:

+#. type: Content of:

msgid "" "Les dons par PayPal coûtent 0,25€ + 1,4% du versement. Pour 10€, PayPal " "gardera 0,39€. Pour 100€, PayPal gardera 1,65€." @@ -96,11 +96,11 @@ msgstr "" "Payments through PayPal costs 0.25€ + 1.4%. For 10€, PayPal will keep 0.39€. " "For 100€, PayPal will keep 1.65€." -#. type: Content of:

+#. type: Content of:
msgid "Don ponctuel" msgstr "Single Donation" -#. type: Content of:
+#. type: Content of:
msgid "" " " -#. type: Content of:
+#. type: Content of:
msgid "Don mensuel" msgstr "Monthly donation" -#. type: Content of:
msgid "" "