From: ned Date: Mon, 29 May 2023 13:41:59 +0000 (+0200) Subject: resolutionconflit X-Git-Url: https://nos-oignons.net/gitweb/website.git/commitdiff_plain/7c59f2b0a0e82b5fbc77aee5f422e182b08e139d?ds=inline;hp=-c resolutionconflit --- 7c59f2b0a0e82b5fbc77aee5f422e182b08e139d diff --combined "Actualit\303\251s/20230529_Campagne_et_video.en.po" index 5951d89,fca7583..0af4f10 --- "a/Actualit\303\251s/20230529_Campagne_et_video.en.po" +++ "b/Actualit\303\251s/20230529_Campagne_et_video.en.po" @@@ -7,7 -7,7 +7,7 @@@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" - "POT-Creation-Date: 2023-05-29 14:16+0200\n" + "POT-Creation-Date: 2023-05-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -17,33 -17,28 +17,28 @@@ "Content-Transfer-Encoding: 8bit\n" #. type: Plain text - #, markdown-text, no-wrap + #, no-wrap msgid "[[!meta title=\"Campagne de dons Nos oignons et vidéo\"]]\n" - msgstr "" - "[[!meta title=\"Nos Oignons' donation campain and video\"]]\n" + msgstr "[[!meta title=\"Nos Oignons' donation campain and video\"]]\n" #. type: Plain text - #, markdown-text, no-wrap + #, no-wrap msgid "[[!meta date=\"2023-05-29 14:12:42\"]]\n" msgstr "" #. type: Plain text - #, markdown-text msgid "Campagne de dons Nos oignons et vidéo - Printemps 2023" - msgstr "" - "Nos Oignons' donation campain and video - Spring 2023" + msgstr "Nos Oignons' donation campain and video - Spring 2023" #. type: Plain text - #, markdown-text msgid "" - "Participez au réseau Tor en soutenant l'association [Nos " - "oignons](https://nos-oignons.net/) !" + "Participez au réseau Tor en soutenant l'association [Nos oignons](https://" + "nos-oignons.net/) !" msgstr "" - "Take part to the Tor network by supporting " - "[Nos oignons](https://nos-oignons.net/)!" + "Take part to the Tor network by supporting [Nos oignons](https://nos-oignons." + "net/)!" #. type: Plain text - #, markdown-text msgid "" "Pour sa 10ème année d'existence, Nos oignons lance une nouvelle campagne de " "dons." @@@ -52,7 -47,6 +47,6 @@@ msgstr " "donation campain." #. type: Plain text - #, markdown-text msgid "" "Le [navigateur Tor]( https://torproject.org ) est gratuit. Tout comme l’est " "l’usage du réseau Tor. Cependant, faire tourner les ordinateurs qui le " @@@ -61,94 -55,88 +55,89 @@@ "mais aussi, si possible, d'en ouvrir d'autres et de continuer à contribuer " "au développement du réseau Tor en France, nous vous sollicitons de nouveau." msgstr "" - "The [Tor Browser](https://torproject.org ) is, like the usage of the Tor network," - " free. But maintaining the computers composing the network costs money, and our " - "financial capacities are currently quite low. To continue to run our " - "[relays](https://nos-oignons.net/Services/index.en.html), but also, if possible, " - "to open new ones et keep growing the Tor network in France, " + "The [Tor Browser](https://torproject.org ) is, like the usage of the Tor " + "network, free. But maintaining the computers composing the network costs " + "money, and our financial capacities are currently quite low. To continue to " + "run our [relays](https://nos-oignons.net/Services/index.en.html), but also, " + "if possible, to open new ones et keep growing the Tor network in France, " "we're asking again for donations." #. type: Plain text - #, markdown-text msgid "" "Tor est plus que jamais nécessaire ! Nous avons fait réaliser[1] une vidéo " "explicative sur le fonctionnement de Tor et les raisons de le soutenir, " "découvrez-la :" msgstr "" "Tor is now more than ever essential. We commissioned[1] a explainatory video " - "(with english subtitles) on Tor's details and on the reasons to make it thrive:" + "(with english subtitles) on Tor's details and on the reasons to make it " + "thrive:" #. type: Bullet: '* ' - #, markdown-text msgid "" - "[sur notre instance peertube chez Globenet]( " - "https://videos.globenet.org/w/sCRtA3eExJB4tgtXF6Z1r4 )" + "[sur notre instance peertube chez Globenet]( https://videos.globenet.org/w/" + "sCRtA3eExJB4tgtXF6Z1r4 )" msgstr "" - "[on our peertube instance]( " - "https://videos.globenet.org/w/sCRtA3eExJB4tgtXF6Z1r4 )" - + "[on our peertube instance]( https://videos.globenet.org/w/" + "sCRtA3eExJB4tgtXF6Z1r4 )" #. type: Bullet: '* ' - #, markdown-text msgid "ou [sur youtube]( https://youtu.be/uroe-xe0tcM )." - msgstr "" - "or [on youtube]( https://youtu.be/uroe-xe0tcM )." + msgstr "or [on youtube]( https://youtu.be/uroe-xe0tcM )." #. type: Plain text - #, markdown-text + #, fuzzy + #| msgid "" + #| "Aidez-nous à faire pousser Nos oignons de printemps, [faites un don pour " + #| "aider le réseau Tor !]( https://nos-oignons.net/Donnez )Si vous le " + #| "pouvez, un don récurrent est encore plus apprécié car il consolide notre " + #| "situation financière en nous donnant de la visibilité dans la durée." msgid "" "Aidez-nous à faire pousser Nos oignons de printemps, [faites un don pour " -"aider le réseau Tor !]( https://nos-oignons.net/Donnez ) Si vous le pouvez, " -"un don récurrent est encore plus apprécié car il consolide notre situation " +"aider le réseau Tor !]( https://nos-oignons.net/Donnez ) " +"Si vous le pouvez, un " +"don récurrent est encore plus apprécié car il consolide notre situation " "financière en nous donnant de la visibilité dans la durée." msgstr "" - "Help us grow our \"Springs onions\" for the Tor network by making a donation: " - "https://nos-oignons.net/Donnez/index.en.html" - "If you're able to, recuring donations are even more appreciated, since they" - " allow us to plan in advance." + "Help us grow our \"Springs onions\" for the Tor network by making a " + "donation: https://nos-oignons.net/Donnez/index.en.htmlIf you're able to, " + "recuring donations are even more appreciated, since they allow us to plan in " + "advance." #. type: Plain text - #, markdown-text msgid "" - "Il nous reste quelques " - "[cartes](https://nos-oignons.net/assets/contrepartie-trois-cartes.jpg) et " - "[affiches]( " - "https://nos-oignons.net/assets/contrepartie-affiche-et-cartes.jpg) de notre " - "[précédente campagne,](https://nos-oignons.net/campagne2018/) nous les " - "enverrons, jusqu'à épuisement du stock, aux personnes mettant en place un " - "don récurrent ou faisant un don supérieur à 30 euros (nous signaler par mail " - "à ca@nos-oignons.net la date, la modalité de paiement, et le montant du don " - "- la livraison en France se fait en [point " - "relais](https://www.mondialrelay.fr/trouver-le-point-relais-le-plus-proche-de-chez-moi/))." + "Il nous reste quelques [cartes](https://nos-oignons.net/assets/contrepartie-" + "trois-cartes.jpg) et [affiches]( https://nos-oignons.net/assets/contrepartie-" + "affiche-et-cartes.jpg) de notre [précédente campagne,](https://nos-oignons." + "net/campagne2018/) nous les enverrons, jusqu'à épuisement du stock, aux " + "personnes mettant en place un don récurrent ou faisant un don supérieur à 30 " + "euros (nous signaler par mail à ca@nos-oignons.net la date, la modalité de " + "paiement, et le montant du don - la livraison en France se fait en [point " + "relais](https://www.mondialrelay.fr/trouver-le-point-relais-le-plus-proche-" + "de-chez-moi/))." msgstr "" - "We still have some [cards](https://nos-oignons.net/assets/contrepartie-trois-cartes.jpg)" - " (in french) and [posters]( https://nos-oignons.net/assets/contrepartie-affiche-et-cartes.jpg) " - "from our [previous campain](https://nos-oignons.net/campagne2018/index.en.html), " - "and we'll send them until there is none, to anyone making a recuring donation, or a one-shot " - "one above 30 euros (send us an email to ca@nos-oignons.net with the date, how you " - "sent us the money, and the amount - delivery in France is done via [\"point relais\"]" - "(https://www.mondialrelay.fr/trouver-le-point-relais-le-plus-proche-de-chez-moi/))." - + "We still have some [cards](https://nos-oignons.net/assets/contrepartie-trois-" + "cartes.jpg) (in french) and [posters]( https://nos-oignons.net/assets/" + "contrepartie-affiche-et-cartes.jpg) from our [previous campain](https://nos-" + "oignons.net/campagne2018/index.en.html), and we'll send them until there is " + "none, to anyone making a recuring donation, or a one-shot one above 30 euros " + "(send us an email to ca@nos-oignons.net with the date, how you sent us the " + "money, and the amount - delivery in France is done via [\"point relais\"]" + "(https://www.mondialrelay.fr/trouver-le-point-relais-le-plus-proche-de-chez-" + "moi/))." #. type: Plain text - #, markdown-text msgid "" "Nous sommes également toujours intéressé·e·s par des propositions " - "d'hébergement pour d'éventuels futurs relais, [contactez-nous " - "!](https://nos-oignons.net/Contact)" + "d'hébergement pour d'éventuels futurs relais, [contactez-nous !](https://nos-" + "oignons.net/Contact)" msgstr "" - "We're also always interested about hosting opportunities for new relays. " - "Let us [know](https://nos-oignons.net/Contact) is this is something you can provide!" - - #. type: Bullet: ' - ' - #, markdown-text - msgid "----" - msgstr "" - "----" + "We're also always interested about hosting opportunities for new relays. Let " + "us [know](https://nos-oignons.net/Contact) is this is something you can " + "provide!" #. type: Plain text - #, markdown-text msgid "[1] par [Magali Magraph](https://www.magraphist.com/)" - msgstr "" - "[1] by [Magali Magraph](https://www.magraphist.com/)" + msgstr "[1] by [Magali Magraph](https://www.magraphist.com/)" + + #~ msgid "----" + #~ msgstr "----"