X-Git-Url: https://nos-oignons.net/gitweb/website.git/blobdiff_plain/fa3a5c972efa85e2e20986b0f6ae4ee2de86be60..8c1f5e37e92ef50b359b1282587441281cf84830:/%C3%80_propos.en.po?ds=inline

diff --git "a/\303\200_propos.en.po" "b/\303\200_propos.en.po"
index 2b2856f..c904293 100644
--- "a/\303\200_propos.en.po"
+++ "b/\303\200_propos.en.po"
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
-"POT-Creation-Date: 2019-03-19 15:21+0100\n"
+"POT-Creation-Date: 2019-04-12 11:52+0200\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"
@@ -208,55 +208,44 @@ msgstr ""
 "legifrance.gouv.fr/affichCodeArticle.do?"
 "idArticle=LEGIARTI000006465735&cidTexte=LEGITEXT000006070987)."
 
-#. 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 ""
-"Vous pouvez également facilement vérifier que [l'un de nos serveurs](https://"
-"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=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 "(The IP here is « marylou1 »'s IP, and the date March 10, 2019)"
+msgid "[[!inline  pages=\"Exonerator\" raw=\"yes\"]]\n"
+msgstr "[[!inline  pages=\"Exonerator_en\" raw=\"yes\"]]\n"
+
+#~ msgid "Recherche d'information sur une connexion : ExoneraTor\n"
+#~ msgstr "Searching information on a connection : ExoneraTor\n"
+
+#~ 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, 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."
+
+#~ msgid ""
+#~ "Vous pouvez également facilement vérifier que [l'un de nos serveurs]"
+#~ "(https://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/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 :"
+
+#~ msgid ""
+#~ "   *[https://metrics.torproject.org/exonerator.html?"
+#~ "ip=89.234.157.254&timestamp=2019-03-10&lang=fr](https://metrics."
+#~ "torproject.org/exonerator.html?"
+#~ "ip=89.234.157.254&timestamp=2019-03-10&lang=fr)*\n"
+#~ msgstr ""
+#~ "   *[https://metrics.torproject.org/exonerator.html?"
+#~ "ip=89.234.157.254&timestamp=2019-03-10](https://metrics.torproject.org/"
+#~ "exonerator.html?ip=89.234.157.254&timestamp=2019-03-10)*\n"
+
+#~ msgid ""
+#~ "(l'IP indiquée ici est celle de « marylou1 », et la date le 10 mars 2019)"
+#~ msgstr "(The IP here is « marylou1 »'s IP, and the date March 10, 2019)"