ajout lien vers exonerator - traduction - corrections

[website.git] / À_propos.en.po

diff --git a/À_propos.en.po b/À_propos.en.po
index 2bf7b8dbe674d84bfdbabfeabf35f507ca4204d9..2b2856fb2f40c0faaa47010b6c8d3e22060a1a58 100644 (file)
--- a/À_propos.en.po
+++ b/À_propos.en.po
@@ -211,7 +211,12 @@ msgstr ""
 #. type: Title =
 #, no-wrap
 msgid "Recherche d'information sur une connexion : ExoneraTor\n"
+<<<<<<< HEAD
+msgstr ""
+"Searching information on a connection : ExoneraTor\n"
+=======
 msgstr "Searching information on a connection : ExoneraTor"
+>>>>>>> 5bcef4ce8d80941a1d1847be96b3cd931d8ea3b4
 
 #. type: Plain text
 #, fuzzy
@@ -244,7 +249,12 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "   *https://metrics.torproject.org/exonerator.html?ip=89.234.157.254&timestamp=19-03-10&lang=fr*\n"
+<<<<<<< HEAD
+msgstr ""
+"   *https://metrics.torproject.org/exonerator.html?ip=89.234.157.254&timestamp=2019-03-10*\n"
+=======
 msgstr "   *https://metrics.torproject.org/exonerator.html?ip=89.234.157.254&timestamp=19-03-10*\n"
+>>>>>>> 5bcef4ce8d80941a1d1847be96b3cd931d8ea3b4
 
 #. type: Plain text
 msgid ""