ajout lien vers exonerator - traduction - corrections 2

diff --git a/À_propos.en.po b/À_propos.en.po
index 2b2856fb2f40c0faaa47010b6c8d3e22060a1a58..f04df1d4b408ee9a7a93c61b2119db5da4b39655 100644 (file)
--- a/À_propos.en.po
+++ b/À_propos.en.po
@@ -211,27 +211,17 @@ 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
-#| msgid ""
-#| "Si vous souhaitez savoir si une connexion provient du réseau Tor, vous "
-#| "pouvez utiliser l'outil [ExoneraTor](https://metrics.torproject.org/"
-#| "exonerator.html). En renseignant l'adresse IP et la date, ce service vous "
-#| "indiquera si la connexion provient d'un relai de sortie Tor ou non."
 msgid ""
 "Si vous souhaitez savoir si une connexion provient du réseau Tor, vous "
 "pouvez utiliser l'outil [ExoneraTor](https://metrics.torproject.org/"
 "exonerator.html).  En renseignant l'adresse IP et la date, ce service vous "
 "indiquera si la connexion provient d'un relai de sortie Tor ou non."
 msgstr ""
-"If you want to know if a connection comes from Tor network, youcan use "
+"If you want to know if a connection comes from Tor network, you can use "
 "[ExoneraTor](https://metrics.torproject.org/exonerator.html). By filling the "
 "IP address and the date, this tool will indicates if this connection comes "
 "from an exit relay or not."
@@ -243,18 +233,13 @@ msgid ""
 "adaptant l'URL suivante à l'IP et la date souhaitée :"
 msgstr ""
 "You can also easily check if [one of our servers](https://nos-oignons.net/"
-"Services) was an exit relay at a specific date by adjusting the following "
+"Services/index.en.html) was an exit relay at a specific date by adjusting the following "
 "URL with the IP and date you want to check :"
 
 #. 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 ""