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=sidebyside resolutionconflit --- 7c59f2b0a0e82b5fbc77aee5f422e182b08e139d diff --cc "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" @@@ -76,79 -69,74 +69,75 @@@ msgid " "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 "----"