X-Git-Url: https://nos-oignons.net/gitweb/website.git/blobdiff_plain/03f947e6e6644b5a356c584ebcbcf1bc5af8b8d2..a62e1d8d021af6afc30267aa6cb8283e5480105a:/Services.en.po

diff --git a/Services.en.po b/Services.en.po
index 37b75dd..fca98b2 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: 2015-06-28 16:02+0200\n"
-"PO-Revision-Date: 2014-11-19 12:28+0100\n"
+"POT-Creation-Date: 2016-08-30 11:52+0200\n"
+"PO-Revision-Date: 2016-09-21 21:20+0200\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"
 "Language: en\n"
@@ -32,77 +32,33 @@ msgstr "[[!meta script=\"assets/bw_graphs\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta stylesheet=\"assets/bw_graphs\" rel=\"stylesheet\"]]\n"
-msgstr "[[!meta stylesheet=\"assets/bw_graphs\" rel=\"stylesheet\"]]\n"
+msgid "[[!meta stylesheet=\"assets/bw_graphs\" rel=\"stylesheet\" title=\"graphs\"]]\n"
+msgstr "[[!meta stylesheet=\"assets/bw_graphs\" rel=\"stylesheet\" title=\"graphs\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta script=\"assets/pie_graphs\"]]\n"
-msgstr "[[!meta script=\"assets/pie_graphs\"]]\n"
+msgid "[[!meta script=\"assets/weights_graphs\"]]\n"
+msgstr "[[!meta script=\"assets/weights_graphs\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta title=\"Services\"]]\n"
-msgstr "[[!meta title=\"Services\"]]\n"
+msgid "[[!meta stylesheet=\"assets/weights_graphs\" rel=\"stylesheet\" title=\"graphs\"]]\n"
+msgstr "[[!meta stylesheet=\"assets/weights_graphs\" rel=\"stylesheet\" title=\"graphs\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "<script>\n"
-msgstr "<script>\n"
-
-#. type: Plain text
-msgid ""
-"var content = d3.select(\"#content\");\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_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
-msgid ""
-"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_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"
+msgid "[[!meta script=\"assets/pie_graphs\"]]\n"
+msgstr "[[!meta script=\"assets/pie_graphs\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"content.append(\"div\")\n"
-"  .style(\"clear\", \"left\");\n"
-msgstr ""
-"content.append(\"div\")\n"
-"  .style(\"clear\", \"left\");\n"
+msgid "[[!meta title=\"Services\"]]\n"
+msgstr "[[!meta title=\"Services\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"new ConsensusPieDrawer(\"#consensus-pie\").draw();\n"
-"new ExitPieDrawer(\"#exit-pie\").draw();\n"
-"</script>\n"
-msgstr ""
-"new ConsensusPieDrawer(\"#consensus-pie\").draw();\n"
-"new ExitPieDrawer(\"#exit-pie\").draw();\n"
-"</script>\n"
+msgid "<script type=\"text/javascript\" src=\"../assets/services-pie.js\"></script>\n"
+msgstr "<script type=\"text/javascript\" src=\"../assets/services-pie.js\"></script>"
 
 #. type: Title =
 #, no-wrap
@@ -114,6 +70,7 @@ msgid "Nos oignons fait actuellement fonctionner les relais Tor suivants :"
 msgstr "Nos Oignons currently runs the following Tor relays:"
 
 #. type: Plain text
+#, no-wrap
 msgid ""
 "<table class=\"tor-nodes\">\n"
 "  <thead>\n"
@@ -155,13 +112,19 @@ msgid ""
 "      <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"
+"    <tr>\n"
+"      <td><a href=\"http://www.globenet.org/\">Globenet</a></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#details/8E6EDA78D8E3ABA88D877C3E37D6D4F0938C7B9F\">AlGrothendieck</a></td>\n"
+"      <td><code>8E6E DA78 D8E3 ABA8 8D87 7C3E 37D6 D4F0 938C 7B9F</code></td>\n"
+"      <td><a href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced Exit Policy</a></td>\n"
+"    </tr>\n"
 msgstr ""
 "<table class=\"tor-nodes\">\n"
 "  <thead>\n"
 "    <tr>\n"
 "      <th>Location</th>\n"
 "      <th>Relay</th>\n"
-"      <th>Fingeprint</th>\n"
+"      <th>Fingerprint</th>\n"
 "      <th>Exit policy</th>\n"
 "    </tr>\n"
 "  </thead>\n"
@@ -196,6 +159,12 @@ msgstr ""
 "      <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"
+"    <tr>\n"
+"      <td><a href=\"http://www.globenet.org/\">Globenet</a></td>\n"
+"      <td><a href=\"https://atlas.torproject.org/#details/8E6EDA78D8E3ABA88D877C3E37D6D4F0938C7B9F\">AlGrothendieck</a></td>\n"
+"      <td><code>8E6E DA78 D8E3 ABA8 8D87 7C3E 37D6 D4F0 938C 7B9F</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
@@ -205,7 +174,7 @@ msgid ""
 "    <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"
+"        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"
@@ -219,7 +188,7 @@ msgid ""
 "\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 palier à des limitations techniques du logiciel dans\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"
@@ -255,26 +224,5 @@ msgstr ""
 
 #. type: Plain text
 #, 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"
-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
-#, no-wrap
-msgid ""
-"new BwDrawer(\"#bandwidth\").draw();\n"
-"</script>\n"
-msgstr ""
-"new BwDrawer(\"#bandwidth\").draw();\n"
-"</script>\n"
+msgid "<script type=\"text/javascript\" src=\"../assets/services-plot.js\"></script>\n"
+msgstr "<script type=\"text/javascript\" src=\"../assets/services-plot.js\"></script>\n"