Fichiers PO mis à jour.

diff --git a/Actualités.en.po b/Actualités.en.po
index 4a907e7d785601450c5a1bc9baabcf6ba5e3db68..4a51f56d5b20bbed9755b440b772686696e500d0 100644 (file)
--- a/Actualités.en.po
+++ b/Actualités.en.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"

-"POT-Creation-Date: 2024-03-31 16:15+0200\n"
+"POT-Creation-Date: 2025-06-19 15:02+0200\n"

 "PO-Revision-Date: 2019-10-08 13:48+0000\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"
 "PO-Revision-Date: 2019-10-08 13:48+0000\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"


@@ -11,6 +11,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text

+#, no-wrap

 msgid "[[!meta title=\"Actualités\"]]\n"
 msgstr "[[!meta title=\"News\"]]\n"
 
 msgid "[[!meta title=\"Actualités\"]]\n"
 msgstr "[[!meta title=\"News\"]]\n"
 


@@ -35,10 +36,6 @@ msgstr "Social networks"
 msgid "Mastodon : [@nos_oignons@mamot.fr](https://mamot.fr/@nos_oignons)"
 msgstr "Mastodon: [@nos_oignons@mamot.fr](https://mamot.fr/@nos_oignons)"
 
 msgid "Mastodon : [@nos_oignons@mamot.fr](https://mamot.fr/@nos_oignons)"
 msgstr "Mastodon: [@nos_oignons@mamot.fr](https://mamot.fr/@nos_oignons)"
 

-#. type: Bullet: ' * '
-msgid "Twitter : [@NosOignons](https://twitter.com/NosOignons)"
-msgstr "Twitter: [@NosOignons](https://twitter.com/NosOignons)"
-

 #. type: Plain text
 msgid "Historique des actualités"
 msgstr "Past news"
 #. type: Plain text
 msgid "Historique des actualités"
 msgstr "Past news"

diff --git a/Actualités.mdwn b/Actualités.mdwn
index eace2e74554d8c59949ad0f62ab3ff840870db48..0326bfe556ab9c4753a6d7092005273cf1dffd6b 100644 (file)
--- a/Actualités.mdwn
+++ b/Actualités.mdwn
@@ -10,7 +10,6 @@ Réseaux sociaux
 ---------------
 
  * Mastodon : [@nos_oignons@mamot.fr](https://mamot.fr/@nos_oignons)
 ---------------
 
  * Mastodon : [@nos_oignons@mamot.fr](https://mamot.fr/@nos_oignons)

- * Twitter : [@NosOignons](https://twitter.com/NosOignons)

 
 Historique des actualités
 -------------------------
 
 Historique des actualités
 -------------------------

diff --git a/Actualités/20250615_fin_ekumen.en.po b/Actualités/20250615_fin_ekumen.en.po
new file mode 100644 (file)
index 0000000..dee1361
--- /dev/null
+++ b/Actualités/20250615_fin_ekumen.en.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2025-06-15 21:59+0200\n"
+"PO-Revision-Date: 2025-06-15 22:07+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.4.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Fin d'ekumen\"]]\n"
+msgstr "[[!meta title=\"The end of ekumen\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta date=\"2025-06-15 21:42:42\"]]\n"
+msgstr "[[!meta date=\"2025-06-15 21:42:42\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[ekumen](https://nos-oignons.net/Actualit%C3%A9s/20131127_125_mbits_de_plus_pour_le_reseau_tor) "
+"a été l'un de nos premiers relai, lancé en 2013 chez Gandi, qui a généreusement sponsorisé sa "
+"bande passante quand leur politique de prix a rendu le déploiement de nœuds Tor sur leur "
+"infrastructure financièrement impossible.  Malheureusement, aujourd'hui, son débit est "
+"ridiculement faible pour un coût non-négligeable. Le rachat de l'entreprise Gandi nous a aussi "
+"fait perdre nos contacts historiques là-bas.  Face à des difficultés pour maintenir l'ensemble "
+"de nos relais sur le long terme, nous avons donc décidé de couper ekumen pour nous concentrer "
+"sur nos relais plus puissants et rentables."
+msgstr ""
+"[ekumen](https://nos-oignons.net/Actualit%C3%A9s/20131127_125_mbits_de_plus_pour_le_reseau_tor/"
+"index.en.html() was one of our first relays, launched in 2013 and hosted by Gandi which "
+"generously sponsored the bandwidth costs when their change in price policy made Tor relays "
+"deployement financially impractical. Unfortunately, its bandwifth is ridiculously compared to "
+"today's standards, for a non-negligible cost. Moreover, the acquisition of Gandi made us lose "
+"our contacts there. Facing difficulties to maintain our current set of relays on the long term, "
+"we decided to turn ekumen down to focus on our more powerful and profitable relays."
+
+#. type: Plain text
+msgid "Merci au Gandi historique de nous avoir fait confiance et soutenu toutes ces années."
+msgstr "Thank you to historical Gandi for having trusted and supported us all these years."

diff --git a/Actualités/20250615_fin_ekumen.mdwn b/Actualités/20250615_fin_ekumen.mdwn
new file mode 100644 (file)
index 0000000..58a4153
--- /dev/null
+++ b/Actualités/20250615_fin_ekumen.mdwn
@@ -0,0 +1,9 @@
+[[!meta title="Fin d'ekumen"]]
+[[!meta date="2025-06-15 21:42:42"]]
+
+[ekumen](https://nos-oignons.net/Actualit%C3%A9s/20131127_125_mbits_de_plus_pour_le_reseau_tor) a été l'un de nos premiers relai, lancé en 2013 chez Gandi,
+qui a généreusement sponsorisé sa bande passante quand leur politique de prix a rendu le déploiement de nœuds Tor sur leur infrastructure financièrement impossible.
+Malheureusement, aujourd'hui, son débit est ridiculement faible pour un coût non-négligeable. Le rachat de l'entreprise Gandi nous a aussi fait perdre nos contacts historiques là-bas.
+Face à des difficultés pour maintenir l'ensemble de nos relais sur le long terme, nous avons donc décidé de couper ekumen pour nous concentrer sur nos relais plus puissants et rentables. 
+
+Merci au Gandi historique de nous avoir fait confiance et soutenu toutes ces années.

diff --git a/Donnez.en.po b/Donnez.en.po
index eb8d2aaae03575985776deb5feb52467d170a8d8..ce0ed4d48546cc60c7a62b18f21057f5518405fd 100644 (file)
--- a/Donnez.en.po
+++ b/Donnez.en.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"

-"POT-Creation-Date: 2025-04-13 20:49+0200\n"
+"POT-Creation-Date: 2025-09-20 11:20+0200\n"

 "PO-Revision-Date: 2020-01-25 20:27+0000\n"
 "Last-Translator: Lunar <lunar@anargeek.net>\n"
 "Language-Team: French <contact@nos-oignons.net>\n"
 "PO-Revision-Date: 2020-01-25 20:27+0000\n"
 "Last-Translator: Lunar <lunar@anargeek.net>\n"
 "Language-Team: French <contact@nos-oignons.net>\n"


@@ -185,6 +185,14 @@ msgstr ""
 msgid "Don mensuel"
 msgstr "Monthly donation"
 
 msgid "Don mensuel"
 msgstr "Monthly donation"
 

+#. type: Content of: <div><div><form><select>
+msgid ""
+"<input type=\"hidden\" name=\"cmd\" value=\"_s-xclick\" /> <input "
+"type=\"hidden\" name=\"hosted_button_id\" value=\"HXJ9BDH45MVSL\" /> <input "
+"type=\"hidden\" name=\"on0\" value=\"Choisissez le montant de votre don "
+"mensuel\" /> <select name=\"os0\">"
+msgstr ""
+

 #. type: Content of: <div><div><form><select><option>
 msgid "5,00 EUR"
 msgstr "5.00 EUR"
 #. type: Content of: <div><div><form><select><option>
 msgid "5,00 EUR"
 msgstr "5.00 EUR"

diff --git a/Donnez.html b/Donnez.html
index 1ab2c9a3ec8225b940819ac55ddafa85836c7b6a..acd668ba0f0c81cd64837b4dc4bb1c4a162d21e0 100644 (file)
--- a/Donnez.html
+++ b/Donnez.html
@@ -10,9 +10,9 @@
 
 <h3>État de la trésorerie<sup><a href="#fn-last-update" id="ref-last-update">1</a></sup></h3>
 
 
 <h3>État de la trésorerie<sup><a href="#fn-last-update" id="ref-last-update">1</a></sup></h3>
 

-<div class="progress-bar-wrapper" data-total='14551€'>
-    <div class="progress-bar" title="Fonds disponibles" style='width: 58%;' data-current='7758€'></div>
-    <div class="progress-bar progress-bar-promises" title="Promesses de dons" style='width: 70%'></div>
+<div class="progress-bar-wrapper" data-total='12161€'>
+    <div class="progress-bar" title="Fonds disponibles" style='width: 58%;' data-current='10525€'></div>
+    <div class="progress-bar progress-bar-promises" title="Promesses de dons" style='width: 86%'></div>

 </div>
 <p>
 Un oignon correspond à 1 mois de fonctionnement<sup><a href="#fn-blurry" id="ref-blurry">2</a></sup>.
 </div>
 <p>
 Un oignon correspond à 1 mois de fonctionnement<sup><a href="#fn-blurry" id="ref-blurry">2</a></sup>.

diff --git a/Services.en.po b/Services.en.po
index 8b3140acfd840526d0167a407275c5c6f2b7aadc..b0edb8e1a8ba02c73bab7245c150bc0ca9cdf4b8 100644 (file)
--- a/Services.en.po
+++ b/Services.en.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"

-"POT-Creation-Date: 2025-05-12 23:18+0200\n"
+"POT-Creation-Date: 2025-06-19 14:57+0200\n"

 "PO-Revision-Date: 2020-03-07 11:14+0000\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"
 "PO-Revision-Date: 2020-03-07 11:14+0000\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"


@@ -100,12 +100,6 @@ msgstr "Nos Oignons currently runs the following Tor relays:"
 #| "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 #| "    </tr>\n"
 #| "    <tr>\n"
 #| "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 #| "    </tr>\n"
 #| "    <tr>\n"

-#| "      <td><a href=\"https://www.gandi.net/\">Gandi</a><sup>3</sup></td>\n"
-#| "      <td><a href=\"https://metrics.torproject.org/rs.html#details/9BA84E8C90083676F86C7427C8D105925F13716C\">ekumen</a></td>\n"
-#| "      <td><code>9BA8 4E8C 9008 3676 F86C 7427 C8D1 0592 5F13 716C</code></td>\n"
-#| "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
-#| "    </tr>\n"
-#| "    <tr>\n"

 #| "      <td><a href=\"https://tetaneutral.net/\">tetaneutral.net</a></td>\n"
 #| "      <td><a href=\"https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06\">marylou1</a><sup>4</sup></td>\n"
 #| "      <td><code>578E 007E 5E45 35FB FEF7 758D 8587 B07B 4C8C 5D06</code></td>\n"
 #| "      <td><a href=\"https://tetaneutral.net/\">tetaneutral.net</a></td>\n"
 #| "      <td><a href=\"https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06\">marylou1</a><sup>4</sup></td>\n"
 #| "      <td><code>578E 007E 5E45 35FB FEF7 758D 8587 B07B 4C8C 5D06</code></td>\n"


@@ -157,12 +151,6 @@ msgstr "Nos Oignons currently runs the following Tor relays:"
 #| "        utiliser toute la bande passante disponible.\n"
 #| "      </td>\n"
 #| "    </tr>\n"
 #| "        utiliser toute la bande passante disponible.\n"
 #| "      </td>\n"
 #| "    </tr>\n"

-#| "    <tr>\n"
-#| "      <td colspan=\"4\">\n"
-#| "        3 : Gandi nous fournit gracieusement la bande passante pour faire tourner\n"
-#| "        ce noeud.\n"
-#| "      </td>\n"
-#| "    </tr>\n"

 #| "  </tfoot>\n"
 #| "</table>\n"
 msgid ""
 #| "  </tfoot>\n"
 #| "</table>\n"
 msgid ""


@@ -256,11 +244,6 @@ msgid ""
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
 "    <tr>\n"
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
 "    <tr>\n"

-"      <td><a href=\"https://www.gandi.net/\">Gandi</a><sup>1</sup></td>\n"
-"      <td><a href=\"https://metrics.torproject.org/rs.html#details/9BA84E8C90083676F86C7427C8D105925F13716C\">ekumen</a></td>\n"
-"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
-"    </tr>\n"
-"    <tr>\n"

 "      <td><a href=\"https://tetaneutral.net/\">tetaneutral.net</a></td>\n"
 "      <td><a href=\"https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06\">marylou1</a></td>\n"
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "      <td><a href=\"https://tetaneutral.net/\">tetaneutral.net</a></td>\n"
 "      <td><a href=\"https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06\">marylou1</a></td>\n"
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"


@@ -412,24 +395,47 @@ msgid ""
 "      <td><a href=\"https://metrics.torproject.org/rs.html#details/9F652C63770018EC6E1990C1ED3908EECABB7BAF\">lunar8</a></td>\n"
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
 "      <td><a href=\"https://metrics.torproject.org/rs.html#details/9F652C63770018EC6E1990C1ED3908EECABB7BAF\">lunar8</a></td>\n"
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"

-"</tbody>\n"
-"  <tfoot class=\"footnotes\">\n"

 "    <tr>\n"
 "    <tr>\n"

-"      <td colspan=\"4\">\n"
-"        Les nœuds avec un numéro sont sur une même machine. Afin de pallier des\n"
-"        limitations techniques du logiciel dans la gestion du multi-cœur, il\n"
-"        est nécessaire de faire fonctionner plusieurs relais afin de pouvoir\n"
-"        utiliser toute la bande passante disponible.\n"
-"      </td>\n"
+"      <td><a href=\"https://moji.fr/\">moji</a></td>\n"
+"      <td><a href=\"https://metrics.torproject.org/rs.html#details/88BE6B434C135557C70A013D374E53A28DA40D6A\">lunar9</a></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"

 "    </tr>\n"
 "    <tr>\n"
 "    </tr>\n"
 "    <tr>\n"

-"      <td colspan=\"4\">\n"
-"        1 : Gandi nous fournit gracieusement la bande passante pour faire tourner\n"
-"        ce noeud.\n"
-"      </td>\n"
+"      <td><a href=\"https://moji.fr/\">moji</a></td>\n"
+"      <td><a href=\"https://metrics.torproject.org/rs.html#details/6012069CA4DE5780EB9A0518F15A58A274FE6F38\">lunar10</a></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"

 "    </tr>\n"
 "    </tr>\n"

-"  </tfoot>\n"
-"</table>\n"
+"    <tr>\n"
+"      <td><a href=\"https://moji.fr/\">moji</a></td>\n"
+"      <td><a href=\"https://metrics.torproject.org/rs.html#details/1D3C3EA26EFDF8C9740DDA0402CB7222BCAAAE89\">lunar11</a></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td><a href=\"https://moji.fr/\">moji</a></td>\n"
+"      <td><a href=\"https://metrics.torproject.org/rs.html#details/E231DA63981425B322614331F58C7A1654EAD630\">lunar12</a></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td><a href=\"https://moji.fr/\">moji</a></td>\n"
+"      <td><a href=\"https://metrics.torproject.org/rs.html#details/98697EF93E26DD52CD96D3F998BF20B2A4162291\">lunar13</a></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td><a href=\"https://moji.fr/\">moji</a></td>\n"
+"      <td><a href=\"https://metrics.torproject.org/rs.html#details/51FDFE083BFFBF0E427178C3DEA659DF1E948819\">lunar14</a></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td><a href=\"https://moji.fr/\">moji</a></td>\n"
+"      <td><a href=\"https://metrics.torproject.org/rs.html#details/2EF5F5304DE04CBB5A0B361F8800AD9CC79928CC\">lunar15</a></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td><a href=\"https://moji.fr/\">moji</a></td>\n"
+"      <td><a href=\"https://metrics.torproject.org/rs.html#details/8E0F24062F440B4459E0AA5A6A501DAE78425516\">lunar16</a></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
+"    </tr>\n"
+"</tbody>\n"

 msgstr ""
 "<table class=\"tor-nodes\">\n"
 "  <thead>\n"
 msgstr ""
 "<table class=\"tor-nodes\">\n"
 "  <thead>\n"


@@ -454,12 +460,6 @@ msgstr ""
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
 "    <tr>\n"
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
 "    <tr>\n"

-"      <td><a href=\"https://www.gandi.net/\">Gandi</a><sup>3</sup></td>\n"
-"      <td><a href=\"https://metrics.torproject.org/rs.html#details/9BA84E8C90083676F86C7427C8D105925F13716C\">ekumen</a></td>\n"
-"      <td><code>9BA8 4E8C 9008 3676 F86C 7427 C8D1 0592 5F13 716C</code></td>\n"
-"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
-"    </tr>\n"
-"    <tr>\n"

 "      <td><a href=\"https://tetaneutral.net/\">tetaneutral.net</a></td>\n"
 "      <td><a href=\"https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06\">marylou1</a><sup>4</sup></td>\n"
 "      <td><code>578E 007E 5E45 35FB FEF7 758D 8587 B07B 4C8C 5D06</code></td>\n"
 "      <td><a href=\"https://tetaneutral.net/\">tetaneutral.net</a></td>\n"
 "      <td><a href=\"https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06\">marylou1</a><sup>4</sup></td>\n"
 "      <td><code>578E 007E 5E45 35FB FEF7 758D 8587 B07B 4C8C 5D06</code></td>\n"


@@ -502,22 +502,34 @@ msgstr ""
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
 "  </tbody>\n"
 "      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
 "  </tbody>\n"

+
+#. type: Plain text
+#, no-wrap
+msgid ""

 "  <tfoot class=\"footnotes\">\n"
 "    <tr>\n"
 "      <td colspan=\"4\">\n"
 "  <tfoot class=\"footnotes\">\n"
 "    <tr>\n"
 "      <td colspan=\"4\">\n"

-"        1,2; 4,5 and 6,7: These two nodes are on the same server. Due to technical\n"
-"        limitations in how the software handle multicore, we need to run two distinct\n"
-"        relays in order to use all available bandwidth.\n"
+"        Les nœuds avec un numéro sont sur une même machine. Afin de pallier des\n"
+"        limitations techniques du logiciel dans la gestion du multi-cœur, il\n"
+"        est nécessaire de faire fonctionner plusieurs relais afin de pouvoir\n"
+"        utiliser toute la bande passante disponible.\n"

 "      </td>\n"
 "    </tr>\n"
 "      </td>\n"
 "    </tr>\n"

+"  </tfoot>\n"
+"</table>\n"
+msgstr ""
+"  <tfoot class=\"footnotes\">\n"

 "    <tr>\n"
 "      <td colspan=\"4\">\n"
 "    <tr>\n"
 "      <td colspan=\"4\">\n"

-"        3 : Bandwidth kindly sponsored by Gandi.\n"
+"        1,2; 4,5 and 6,7: These two nodes are on the same server. Due to technical\n"
+"        limitations in how the software handle multicore, we need to run two distinct\n"
+"        relays in order to use all available bandwidth.\n"

 "      </td>\n"
 "    </tr>\n"
 "  </tfoot>\n"
 "</table>\n"
 
 "      </td>\n"
 "    </tr>\n"
 "  </tfoot>\n"
 "</table>\n"
 

+

 #. type: Plain text
 #, no-wrap
 msgid "<script type=\"text/javascript\" src=\"../assets/services-plot.js\"></script>\n"
 #. type: Plain text
 #, no-wrap
 msgid "<script type=\"text/javascript\" src=\"../assets/services-plot.js\"></script>\n"

diff --git a/Services.mdwn b/Services.mdwn
index 3378b81a983296f4f3c97c517622b0107c6d0ea4..3345a670e5870137fdced61ad02aa683cf412c19 100644 (file)
--- a/Services.mdwn
+++ b/Services.mdwn
@@ -105,11 +105,6 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
       <td><a href="https://metrics.torproject.org/rs.html#details/F2A0F204670965A947A1AE5E2867C752E714032F">marcuse16</a></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
       <td><a href="https://metrics.torproject.org/rs.html#details/F2A0F204670965A947A1AE5E2867C752E714032F">marcuse16</a></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>

-    <tr>
-      <td><a href="https://www.gandi.net/">Gandi</a><sup>1</sup></td>
-      <td><a href="https://metrics.torproject.org/rs.html#details/9BA84E8C90083676F86C7427C8D105925F13716C">ekumen</a></td>
-      <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
-    </tr>

     <tr>
       <td><a href="https://tetaneutral.net/">tetaneutral.net</a></td>
       <td><a href="https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06">marylou1</a></td>
     <tr>
       <td><a href="https://tetaneutral.net/">tetaneutral.net</a></td>
       <td><a href="https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06">marylou1</a></td>


@@ -303,6 +298,7 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
 </tbody>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
 </tbody>

+

   <tfoot class="footnotes">
     <tr>
       <td colspan="4">
   <tfoot class="footnotes">
     <tr>
       <td colspan="4">


@@ -312,12 +308,6 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
         utiliser toute la bande passante disponible.
       </td>
     </tr>
         utiliser toute la bande passante disponible.
       </td>
     </tr>

-    <tr>
-      <td colspan="4">
-        1 : Gandi nous fournit gracieusement la bande passante pour faire tourner
-        ce noeud.
-      </td>
-    </tr>

   </tfoot>
 </table>
 
   </tfoot>
 </table>
 

diff --git a/assets/relays.js b/assets/relays.js
index 7f512b694ac19fea7ac3632fdf746fd3caa6fac2..2253031af856e6426445982ed2d9500bb85ea6d5 100644 (file)
--- a/assets/relays.js
+++ b/assets/relays.js
@@ -59,9 +59,6 @@ var nos_oignons_relays = [
        }, { name: "marcuse16",
                fingerprint: "F2A0F204670965A947A1AE5E2867C752E714032F",
                color: randomColor(),
        }, { name: "marcuse16",
                fingerprint: "F2A0F204670965A947A1AE5E2867C752E714032F",
                color: randomColor(),

-       }, { name: "ekumen",
-               fingerprint: "9BA84E8C90083676F86C7427C8D105925F13716C",
-               color: randomColor(),

        }, { name: "marylou1",
                fingerprint: "578E007E5E4535FBFEF7758D8587B07B4C8C5D06",
                color: randomColor(),
        }, { name: "marylou1",
                fingerprint: "578E007E5E4535FBFEF7758D8587B07B4C8C5D06",
                color: randomColor(),