X-Git-Url: https://www.nos-oignons.net/gitweb/website.git/blobdiff_plain/031f5b291bbe83ecec4e523bcaa81c9cd35eee4e..78dce7d9c663c11f9f4ffbd04aea372c816d5c81:/Services.en.po

diff --git a/Services.en.po b/Services.en.po
index 0bfd256..a91ac72 100644
--- a/Services.en.po
+++ b/Services.en.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
-"POT-Creation-Date: 2013-11-23 19:45+0100\n"
-"PO-Revision-Date: 2013-11-23 19:51+0100\n"
+"POT-Creation-Date: 2016-06-03 14:17+0200\n"
+"PO-Revision-Date: 2014-11-19 12:28+0100\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"
 "Language: en\n"
@@ -54,66 +54,36 @@ msgstr "<script>\n"
 #, no-wrap
 msgid ""
 "var content = d3.select(\"#content\");\n"
-"var consensus_div = content.append(\"div\")\n"
-"consensus_div.append(\"div\")\n"
-"  .attr(\"id\", \"consensus-pie\")\n"
-"  .style(\"width\", PieDrawer.width + \"px\")\n"
-"  .style(\"height\", PieDrawer.height + \"px\")\n"
-"  .style(\"float\", \"left\");\n"
-"consensus_div.append(\"div\")\n"
-"  .style(\"width\", \"400px\")\n"
-"  .style(\"margin-left\", \"5px\")\n"
-"  .style(\"line-height\", PieDrawer.height + \"px\")\n"
-"  .style(\"font-weight\", \"bold\")\n"
-"  .style(\"float\", \"left\")\n"
+"var consensus_figure = content.append(\"figure\")\n"
+"  .attr('class', 'graph graph-consensus')\n"
+"consensus_figure.append(\"span\")\n"
+"  .attr(\"id\", \"consensus-pie\");\n"
+"consensus_figure.append(\"figcaption\")\n"
 "  .text(L10n.consensus_weight);\n"
 msgstr ""
 "var content = d3.select(\"#content\");\n"
-"var consensus_div = content.append(\"div\")\n"
-"consensus_div.append(\"div\")\n"
-"  .attr(\"id\", \"consensus-pie\")\n"
-"  .style(\"width\", PieDrawer.width + \"px\")\n"
-"  .style(\"height\", PieDrawer.height + \"px\")\n"
-"  .style(\"float\", \"left\");\n"
-"consensus_div.append(\"div\")\n"
-"  .style(\"width\", \"400px\")\n"
-"  .style(\"margin-left\", \"5px\")\n"
-"  .style(\"line-height\", PieDrawer.height + \"px\")\n"
-"  .style(\"font-weight\", \"bold\")\n"
-"  .style(\"float\", \"left\")\n"
+"var consensus_figure = content.append(\"figure\")\n"
+"  .attr('class', 'graph graph-consensus')\n"
+"consensus_figure.append(\"span\")\n"
+"  .attr(\"id\", \"consensus-pie\");\n"
+"consensus_figure.append(\"figcaption\")\n"
 "  .text(L10n.consensus_weight);\n"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"var exit_div = content.append(\"div\")\n"
-"exit_div.append(\"div\")\n"
-"  .attr(\"id\", \"exit-pie\")\n"
-"  .style(\"width\", PieDrawer.width)\n"
-"  .style(\"height\", PieDrawer.height)\n"
-"  .style(\"clear\", \"left\")\n"
-"  .style(\"float\", \"left\");\n"
-"exit_div.append(\"div\")\n"
-"  .style(\"width\", \"460px\")\n"
-"  .style(\"margin-left\", \"5px\")\n"
-"  .style(\"line-height\", PieDrawer.height + \"px\")\n"
-"  .style(\"font-weight\", \"bold\")\n"
-"  .style(\"float\", \"left\")\n"
+"var exit_figure = content.append(\"figure\")\n"
+"  .attr('class', 'graph graph-exit')\n"
+"exit_figure.append(\"span\")\n"
+"  .attr(\"id\", \"exit-pie\");\n"
+"exit_figure.append(\"figcaption\")\n"
 "  .text(L10n.exit_probability);\n"
 msgstr ""
-"var exit_div = content.append(\"div\")\n"
-"exit_div.append(\"div\")\n"
-"  .attr(\"id\", \"exit-pie\")\n"
-"  .style(\"width\", PieDrawer.width)\n"
-"  .style(\"height\", PieDrawer.height)\n"
-"  .style(\"clear\", \"left\")\n"
-"  .style(\"float\", \"left\");\n"
-"exit_div.append(\"div\")\n"
-"  .style(\"width\", \"460px\")\n"
-"  .style(\"margin-left\", \"5px\")\n"
-"  .style(\"line-height\", PieDrawer.height + \"px\")\n"
-"  .style(\"font-weight\", \"bold\")\n"
-"  .style(\"float\", \"left\")\n"
+"var exit_figure = content.append(\"figure\")\n"
+"  .attr('class', 'graph graph-exit')\n"
+"exit_figure.append(\"span\")\n"
+"  .attr(\"id\", \"exit-pie\");\n"
+"exit_figure.append(\"figcaption\")\n"
 "  .text(L10n.exit_probability);\n"
 
 #. type: Plain text
@@ -148,7 +118,7 @@ msgstr "Nos Oignons currently runs the following Tor relays:"
 #. type: Plain text
 #, no-wrap
 msgid ""
-"<table>\n"
+"<table class=\"tor-nodes\">\n"
 "  <thead>\n"
 "    <tr>\n"
 "      <th>Emplacement</th>\n"
@@ -160,42 +130,36 @@ msgid ""
 "  <tbody>\n"
 "    <tr>\n"
 "      <td><a href=\"http://www.liazo.fr/\">Liazo</a></td>\n"
-"      <td><a href=\"https://atlas.torproject.org/#details/011FDD1EE84DAC7758119B69829C74A9D197B35E\">marcuse1</a><sup>1</sup></td>\n"
-"      <td><code>011F DD1E E84D AC77 5811 9B69 829C 74A9 D197 B35E</code></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#details/EFAE44728264982224445E96214C15F9075DEE1D\">marcuse1</a><sup>1</sup></td>\n"
+"      <td><code>EFAE 4472 8264 9822 2444 5E96 214C 15F9 075D EE1D</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=\"http://www.liazo.fr/\">Liazo</a></td>\n"
-"      <td><a href=\"https://atlas.torproject.org/#details/1A503BBFFC82A4EFD75DB46A071A7340E11A9DB9\">marcuse2</a><sup>2</sup></td>\n"
-"      <td><code>1A50 3BBF FC82 A4EF D75D B46A 071A 7340 E11A 9DB9</code></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#details/C656B41AEFB40A141967EBF49D6E69603C9B4A11\">marcuse2</a><sup>2</sup></td>\n"
+"      <td><code>C656 B41A EFB4 0A14 1967 EBF4 9D6E 6960 3C9B 4A11</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://www.gandi.net/\">Gandi</a><sup>3</sup></td>\n"
-"      <td><a href=\"https://atlas.torproject.org/#details/7F2CD6BD548C5FFA09B20A0C5CB07893C9451653\">ekumen</a></td>\n"
-"      <td><code>7F2C D6BD 548C 5FFA 09B2 0A0C 5CB0 7893 C945 1653</code></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#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"
-"  </tbody>\n"
-"  <tfoot class=\"footnotes\">\n"
 "    <tr>\n"
-"      <td colspan=\"4\">\n"
-"        1,2 : <code>marcuse1</code> et <code>marcuse2</code> sont sur une même\n"
-"        machine. Afin de palier à des limitations techniques du logiciel dans\n"
-"        la gestion du multi-cœur, il est nécessaire de faire fonctionner deux\n"
-"        relais afin de pouvoir utiliser toute la bande passante disponible.\n"
-"      </td>\n"
+"      <td><a href=\"https://tetaneutral.net/\">tetaneutral.net</a></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#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://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
 "    <tr>\n"
-"      <td colspan=\"4\">\n"
-"        3 : Gandi nous fournit gracieusement les ressources pour faire tourner\n"
-"        ce noeud (machine virtuelle et bande passante).\n"
-"      </td>\n"
+"      <td><a href=\"https://tetaneutral.net/\">tetaneutral.net</a></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#details/90FD830C357A5109AB3C505287713F1AC811174C\">marylou2</a><sup>5</sup></td>\n"
+"      <td><code>90FD 830C 357A 5109 AB3C 5052 8771 3F1A C811 174C</code></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
 "    </tr>\n"
-"  </tfoot>\n"
-"</table>\n"
 msgstr ""
-"<table>\n"
+"<table class=\"tor-nodes\">\n"
 "  <thead>\n"
 "    <tr>\n"
 "      <th>Location</th>\n"
@@ -207,22 +171,65 @@ msgstr ""
 "  <tbody>\n"
 "    <tr>\n"
 "      <td><a href=\"http://www.liazo.fr/\">Liazo</a></td>\n"
-"      <td><a href=\"https://atlas.torproject.org/#details/011FDD1EE84DAC7758119B69829C74A9D197B35E\">marcuse1</a><sup>1</sup></td>\n"
-"      <td><code>011F DD1E E84D AC77 5811 9B69 829C 74A9 D197 B35E</code></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#details/EFAE44728264982224445E96214C15F9075DEE1D\">marcuse1</a><sup>1</sup></td>\n"
+"      <td><code>EFAE 4472 8264 9822 2444 5E96 214C 15F9 075D EE1D</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=\"http://www.liazo.fr/\">Liazo</a></td>\n"
-"      <td><a href=\"https://atlas.torproject.org/#details/1A503BBFFC82A4EFD75DB46A071A7340E11A9DB9\">marcuse2</a><sup>2</sup></td>\n"
-"      <td><code>1A50 3BBF FC82 A4EF D75D B46A 071A 7340 E11A 9DB9</code></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#details/C656B41AEFB40A141967EBF49D6E69603C9B4A11\">marcuse2</a><sup>2</sup></td>\n"
+"      <td><code>C656 B41A EFB4 0A14 1967 EBF4 9D6E 6960 3C9B 4A11</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://www.gandi.net/\">Gandi</a><sup>3</sup></td>\n"
-"      <td><a href=\"https://atlas.torproject.org/#details/7F2CD6BD548C5FFA09B20A0C5CB07893C9451653\">ekumen</a></td>\n"
-"      <td><code>7F2C D6BD 548C 5FFA 09B2 0A0C 5CB0 7893 C945 1653</code></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#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://atlas.torproject.org/#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://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://atlas.torproject.org/#details/90FD830C357A5109AB3C505287713F1AC811174C\">marylou2</a><sup>5</sup></td>\n"
+"      <td><code>90FD 830C 357A 5109 AB3C 5052 8771 3F1A C811 174C</code></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
+"    </tr>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  </tbody>\n"
+"  <tfoot class=\"footnotes\">\n"
+"    <tr>\n"
+"      <td colspan=\"4\">\n"
+"        1,2 : <code>marcuse1</code> et <code>marcuse2</code> sont sur une même\n"
+"        machine. Afin de pallier à des limitations techniques du logiciel dans\n"
+"        la gestion du multi-cœur, il est nécessaire de faire fonctionner deux\n"
+"        relais afin de pouvoir 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"
+"\t<tr>\n"
+"      <td colspan=\"4\">\n"
+"        4,5 : <code>marylou1</code> et <code>marylou2</code> sont sur une même\n"
+"        machine. Afin de pallier à des limitations techniques du logiciel dans\n"
+"        la gestion du multi-cœur, il est nécessaire de faire fonctionner deux\n"
+"        relais afin de pouvoir utiliser toute la bande passante disponible.\n"
+"      </td>\n"
+"    </tr>\n"
+"  </tfoot>\n"
+"</table>\n"
+msgstr ""
 "  </tbody>\n"
 "  <tfoot class=\"footnotes\">\n"
 "    <tr>\n"
@@ -235,7 +242,15 @@ msgstr ""
 "    </tr>\n"
 "    <tr>\n"
 "      <td colspan=\"4\">\n"
-"        3 : All resources are kindly sponsored by Gandi (virtual machine and bandwidth).\n"
+"        3 : Bandwidth kindly sponsored by Gandi.\n"
+"      </td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td colspan=\"4\">\n"
+"        4,5 : <code>marylou1</code> and <code>marylou2</code> are on the same\n"
+"        server. Due to technical limitations in how the software handle\n"
+"        multicore, we need to run two distinct relays in order to use all\n"
+"        available bandwidth.\n"
 "      </td>\n"
 "    </tr>\n"
 "  </tfoot>\n"
@@ -259,10 +274,46 @@ msgstr ""
 "  .text(L10n.loading);\n"
 
 #. type: Plain text
-#, no-wrap
-msgid ""
+#, fuzzy
+#| msgid ""
+#| "new BwDrawer(\"#bandwidth\").draw();\n"
+#| "</script>\n"
+msgid "new BwDrawer(\"#bandwidth\").draw();"
+msgstr ""
 "new BwDrawer(\"#bandwidth\").draw();\n"
 "</script>\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<script>\n"
+#| "d3.select(\"#content\").append(\"h1\")\n"
+#| "  .text(L10n.bandwidth);\n"
+#| "d3.select(\"#content\").append(\"div\")\n"
+#| "  .attr(\"id\", \"bandwidth\")\n"
+#| "  .text(L10n.loading);\n"
+msgid ""
+"d3.select(\"#content\").append(\"h1\")\n"
+"  .text(L10n.weights);\n"
+"d3.select(\"#content\").append(\"div\")\n"
+"  .attr(\"id\", \"weights\")\n"
+"  .text(L10n.loading);\n"
+msgstr ""
+"<script>\n"
+"d3.select(\"#content\").append(\"h1\")\n"
+"  .text(L10n.bandwidth);\n"
+"d3.select(\"#content\").append(\"div\")\n"
+"  .attr(\"id\", \"bandwidth\")\n"
+"  .text(L10n.loading);\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "new BwDrawer(\"#bandwidth\").draw();\n"
+#| "</script>\n"
+msgid ""
+"new WeightsDrawer(\"#weights\").draw();\n"
+"</script>\n"
 msgstr ""
 "new BwDrawer(\"#bandwidth\").draw();\n"
 "</script>\n"