resolution conflit

[website.git] / Actualités / 20170311_liberapay.en.po

diff --git a/Actualités/20170311_liberapay.en.po b/Actualités/20170311_liberapay.en.po
index 7af10c23f8e9d5cdc0fa4dc1c8f0f791be864cf6..cc949c38966052cc2a88e05e172fc192d730849d 100644 (file)
--- a/Actualités/20170311_liberapay.en.po
+++ b/Actualités/20170311_liberapay.en.po
@@ -34,9 +34,9 @@ msgid "Liberapay est une association française à but non lucratif qui offre un
 msgstr "Liberapay is a french nonprofit organization. It offers a free way to donate money recurrently. There are payment processing fees only when moving money in or out of Liberapay."
 
 #. type: Plain text
 msgstr "Liberapay is a french nonprofit organization. It offers a free way to donate money recurrently. There are payment processing fees only when moving money in or out of Liberapay."
 
 #. type: Plain text

-msgid "[Liberapay est un projet libre](https://github.com/liberapay). Le service s'appuie sur [Mangopay](https://www.mangopay.com/legal-notices/)"
-msgstr "[Liberapay is an open source project](https://github.com/liberapay) based on [Mangopay](https://www.mangopay.com/legal-notices/)"
+msgid "[Liberapay est un projet libre](https://github.com/liberapay). Le service s'appuie sur [Mangopay](https://www.mangopay.com/legal-notices/)."
+msgstr "[Liberapay is an open source project](https://github.com/liberapay) based on [Mangopay](https://www.mangopay.com/legal-notices/)."

 
 #. type: Plain text
 
 #. type: Plain text

-msgid "Soutenez-nous, [faites un don à Nos oignons](https://nos-oignons.net/Donnez/) !"
-msgstr "Support Nos oignons and [donate] (https://nos-oignons.net/Donnez/)!"
+msgid "Soutenez-nous, [[faites un don à Nos oignons|Donnez]] !"
+msgstr "Support Nos oignons and [[donate|Donnez]]!"