ajout lien vers exonerator - traduction - corrections

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

diff --git a/À_propos.en.po b/À_propos.en.po
index a1b6040694efc959fba51d4283c57e44b7c3db35..2b2856fb2f40c0faaa47010b6c8d3e22060a1a58 100644 (file)
--- a/À_propos.en.po
+++ b/À_propos.en.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
-"POT-Creation-Date: 2019-03-19 15:02+0100\n"
+"POT-Creation-Date: 2019-03-19 15:21+0100\n"
 "PO-Revision-Date: 2016-03-22 15:12-0000\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"
@@ -211,15 +211,30 @@ 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 "
+"[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."
 
 #. type: Plain text
 msgid ""
@@ -227,13 +242,21 @@ msgid ""
 "nos-oignons.net/Services) était bien relai de sortie à un moment donné, en "
 "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 "
+"URL with the IP and date you want to check :"
 
 #. type: Plain text
 #, no-wrap
-msgid "   *https://metrics.torproject.org/exonerator.html?ip?.234.157.254&timestamp 19-03-10&lang=fr*\n"
+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 ""
 "(l'IP indiquée ici est celle de « marylou1 », et la date le 10 mars 2019)"
-msgstr ""
+msgstr "(The IP here is « marylou1 »'s IP, and the date March 10, 2019)"