test bouton don traduction

diff --git a/Donnez.en.po b/Donnez.en.po
index cac2ae328b78dde2fbf9363a03e80ad4a6e311fd..ad7b89f7da04c67f1823676a22d338ea91505421 100644 (file)
--- a/Donnez.en.po
+++ b/Donnez.en.po
@@ -125,35 +125,18 @@ msgstr ""
 "percentage every time you donate."
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "<a style=\"font: 1.2em sans-serif; text-transform: uppercase;max-width: "
-#| "181px; text-decoration: none; display: block;background: #5ab330; text-"
-#| "align: center;padding: .5em .25em; color: #FFF;\"href=\"https://www."
-#| "helloasso.com/associations/nos-oignons/formulaires/1\">Faire un don</a>"
 msgid ""
 "<a style=\"font: 1.2em sans-serif; text-transform: uppercase; max-width: "
-<<<<<<< HEAD
 "181px; text-decoration: none; display: block; background: #5ab330; "
 "text-align: center; padding: .5em .25em; color: #FFF;\" "
-"href="https://www.helloasso.com/associations/nos-oignons/formulaires/1\">"
+"href=\"https://www.helloasso.com/associations/nos-oignons/formulaires/1\">"
 "Faire un don</a>"
 msgstr ""
 "<a style=\"font: 1.2em sans-serif; text-transform: uppercase; max-width: "
 "181px; text-decoration: none; display: block; background: #5ab330; "
 "text-align: center; padding: .5em .25em; color: #FFF;\" "
-"href="https://www.helloasso.com/associations/nos-oignons/formulaires/1/en\">"
+"href=\"https://www.helloasso.com/associations/nos-oignons/formulaires/1/en\">"
 "Donate</a>"
-=======
-"181px; text-decoration: none; display: block; background: #5ab330; text-"
-"align: center; padding: .5em .25em; color: #FFF;\" href=\"https://www."
-"helloasso.com/associations/nos-oignons/formulaires/1\"> Faire un don</a>"
-msgstr ""
-"<a style=\"font: 1.2em sans-serif; text-transform: uppercase;max-width: "
-"181px; text-decoration: none; display: block;background: #5ab330; text-"
-"align: center;padding: .5em .25em; color: #FFF;\"href=\"https://www."
-"helloasso.com/associations/nos-oignons/formulaires/1/en\">Donate</a>"
->>>>>>> 4fb3db12f6aa00b250b45ca114c9e6f8fc98e033
 
 #. type: Content of: <div><h3>
 msgid "Par PayPal"