on tente de virer ce qui est deja la ....

[website.git] / Services.en.po

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

-"POT-Creation-Date: 2013-11-17 14:57+0100\n"
-"PO-Revision-Date: 2013-11-17 14:45+0100\n"
+"POT-Creation-Date: 2015-02-21 21:11+0100\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"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"
 "Language: en\n"


@@ -10,83 +10,285 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"assets/l10n.fr\"]]\n"
+msgstr "[[!meta script=\"assets/l10n.en\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"assets/relays\"]]\n"
+msgstr "[[!meta script=\"assets/relays\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"assets/d3/d3.v3.min\"]]\n"
+msgstr "[[!meta script=\"assets/d3/d3.v3.min\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"assets/bw_graphs\"]]\n"
+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"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta script=\"assets/pie_graphs\"]]\n"
+msgstr "[[!meta script=\"assets/pie_graphs\"]]\n"
+

 #. type: Plain text
 #, no-wrap
 msgid "[[!meta title=\"Services\"]]\n"
 msgstr "[[!meta title=\"Services\"]]\n"
 
 #. type: Plain text
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta title=\"Services\"]]\n"
 msgstr "[[!meta title=\"Services\"]]\n"
 
 #. type: Plain text

-msgid "Nos oignons fait actuellement fonctionner les relais Tor suivants :"
-msgstr "Nos Oignons currently runs the following Tor relays:"
+#, no-wrap
+msgid "<script>\n"
+msgstr "<script>\n"

 
 #. type: Plain text
 
 #. type: Plain text

-#, fuzzy
-#| msgid ""
-#| "| Emplacement | Relai | Empreinte | Politique de sortie | | ----------- | "
-#| "----- | --------- | ------------------- | | [Liazo](http://www.liazo.fr/) "
-#| "| [marcuse1](https://atlas.torproject.org/"
-#| "#details/011FDD1EE84DAC7758119B69829C74A9D197B35E) | `011F DD1E E84D AC77 "
-#| "5811 9B69 829C 74A9 D197 B35E` | [Reduced Exit Policy](https://trac."
-#| "torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) | | [Liazo]"
-#| "(http://www.liazo.fr/) | [marcuse2](https://atlas.torproject.org/"
-#| "#details/1A503BBFFC82A4EFD75DB46A071A7340E11A9DB9) | `1A50 3BBF FC82 A4EF "
-#| "D75D B46A 071A 7340 E11A 9DB9` | [Reduced Exit Policy](https://trac."
-#| "torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) | | [Gandi]"
-#| "(https://www.gandi.net/) | [ekumen](https://atlas.torproject.org/"
-#| "#details/7F2CD6BD548C5FFA09B20A0C5CB07893C9451653) | `7F2C D6BD 548C 5FFA "
-#| "09B2 0A0C 5CB0 7893 C945 1653` | [Reduced Exit Policy](https://trac."
-#| "torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) |"
+#, no-wrap
+msgid ""
+"var content = d3.select(\"#content\");\n"
+"var consensus_figure = content.append(\"figure\")\n"
+"  .style(\"margin\", \"0\")\n"
+"  .style(\"width\", \"45%\")\n"
+"  .style(\"float\", \"left\")\n"
+"  .style(\"text-align\", \"center\");\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"
+"  .style(\"margin\", \"0\")\n"
+"  .style(\"width\", \"45%\")\n"
+"  .style(\"float\", \"left\")\n"
+"  .style(\"text-align\", \"center\");\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_figure = content.append(\"figure\")\n"
+"  .style(\"margin\", \"0 5% 0 0\")\n"
+"  .style(\"width\", \"44%\")\n"
+"  .style(\"float\", \"left\")\n"
+"  .style(\"text-align\", \"center\");\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"
+"  .style(\"margin\", \"0 5% 0 0\")\n"
+"  .style(\"width\", \"44%\")\n"
+"  .style(\"float\", \"left\")\n"
+"  .style(\"text-align\", \"center\");\n"
+"exit_figure.append(\"span\")\n"
+"  .attr(\"id\", \"exit-pie\");\n"
+"exit_figure.append(\"figcaption\")\n"
+"  .text(L10n.exit_probability);\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"content.append(\"div\")\n"
+"  .style(\"clear\", \"left\");\n"
+msgstr ""
+"content.append(\"div\")\n"
+"  .style(\"clear\", \"left\");\n"
+
+#. type: Plain text
+#, no-wrap

 msgid ""
 msgid ""

-"| Emplacement | Relai | Empreinte | Politique de sortie | | ----------- | "
-"----- | --------- | ------------------- | | [Liazo](http://www.liazo.fr/) | "
-"[marcuse1](https://atlas.torproject.org/"
-"#details/011FDD1EE84DAC7758119B69829C74A9D197B35E) [^1] | `011F DD1E E84D "
-"AC77 5811 9B69 829C 74A9 D197 B35E` | [Reduced Exit Policy](https://trac."
-"torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) | | [Liazo](http://"
-"www.liazo.fr/) | [marcuse2](https://atlas.torproject.org/"
-"#details/1A503BBFFC82A4EFD75DB46A071A7340E11A9DB9) [^2] | `1A50 3BBF FC82 "
-"A4EF D75D B46A 071A 7340 E11A 9DB9` | [Reduced Exit Policy](https://trac."
-"torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) | | [Gandi](https://"
-"www.gandi.net/) [^3] | [ekumen](https://atlas.torproject.org/"
-"#details/7F2CD6BD548C5FFA09B20A0C5CB07893C9451653) | `7F2C D6BD 548C 5FFA "
-"09B2 0A0C 5CB0 7893 C945 1653` | [Reduced Exit Policy](https://trac."
-"torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) |"
+"new ConsensusPieDrawer(\"#consensus-pie\").draw();\n"
+"new ExitPieDrawer(\"#exit-pie\").draw();\n"
+"</script>\n"

 msgstr ""
 msgstr ""

-"| Location | Relay | Fingerprint | Exit policy |\n"
-"| ----------- | ----- | --------- | ------------------- |\n"
-"| [Liazo](http://www.liazo.fr/) | [marcuse1](https://atlas.torproject.org/"
-"#details/011FDD1EE84DAC7758119B69829C74A9D197B35E) | `011F DD1E E84D AC77 "
-"5811 9B69 829C 74A9 D197 B35E` | [Reduced Exit Policy](https://trac."
-"torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) |\n"
-"| [Liazo](http://www.liazo.fr/) | [marcuse2](https://atlas.torproject.org/"
-"#details/1A503BBFFC82A4EFD75DB46A071A7340E11A9DB9) | `1A50 3BBF FC82 A4EF "
-"D75D B46A 071A 7340 E11A 9DB9` | [Reduced Exit Policy](https://trac."
-"torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) |\n"
-"| [Gandi](https://www.gandi.net/) | [ekumen](https://atlas.torproject.org/"
-"#details/7F2CD6BD548C5FFA09B20A0C5CB07893C9451653) | `7F2C D6BD 548C 5FFA "
-"09B2 0A0C 5CB0 7893 C945 1653` | [Reduced Exit Policy](https://trac."
-"torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) |"
+"new ConsensusPieDrawer(\"#consensus-pie\").draw();\n"
+"new ExitPieDrawer(\"#exit-pie\").draw();\n"
+"</script>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Relais\n"
+msgstr "Relays\n"
+
+#. type: Plain text
+msgid "Nos oignons fait actuellement fonctionner les relais Tor suivants :"
+msgstr "Nos Oignons currently runs the following Tor relays:"

 
 #. type: Plain text
 #, no-wrap
 
 #. type: Plain text
 #, no-wrap

+#| msgid ""
+#| "<table>\n"
+#| "  <thead>\n"
+#| "    <tr>\n"
+#| "      <th>Emplacement</th>\n"
+#| "      <th>Relai</th>\n"
+#| "      <th>Empreinte</th>\n"
+#| "      <th>Politique de sortie</th>\n"
+#| "    </tr>\n"
+#| "  </thead>\n"
+#| "  <tbody>\n"
+#| "    <tr>\n"
+#| "      <td><a href=\"http://www.liazo.fr/\">Liazo</a></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/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/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\">marylou</a></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"

 msgid ""
 msgid ""

-"Plus de détails à propos de ces noeuds\n"
-"======================================\n"
+"<table>\n"
+"  <thead>\n"
+"    <tr>\n"
+"      <th>Emplacement</th>\n"
+"      <th>Relai</th>\n"
+"      <th>Empreinte</th>\n"
+"      <th>Politique de sortie</th>\n"
+"    </tr>\n"
+"  </thead>\n"
+"  <tbody>\n"
+"    <tr>\n"
+"      <td><a href=\"http://www.liazo.fr/\">Liazo</a></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/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/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"

 msgstr ""
 msgstr ""

+"<table>\n"
+"  <thead>\n"
+"    <tr>\n"
+"      <th>Location</th>\n"
+"      <th>Relay</th>\n"
+"      <th>Fingeprint</th>\n"
+"      <th>Exit policy</th>\n"
+"    </tr>\n"
+"  </thead>\n"
+"  <tbody>\n"
+"    <tr>\n"
+"      <td><a href=\"http://www.liazo.fr/\">Liazo</a></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/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/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\">marylou</a></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"
+"  </tbody>\n"
+"  <tfoot class=\"footnotes\">\n"
+"    <tr>\n"
+"      <td colspan=\"4\">\n"
+"        1,2 : <code>marcuse1</code> and <code>marcuse2</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"
+"    <tr>\n"
+"      <td colspan=\"4\">\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"
+"</table>\n"

 
 #. type: Plain text
 
 #. type: Plain text

+#, no-wrap

 msgid ""
 msgid ""

-"[^1] et [^2] : Marcuse1 et Marcuse2 sont sur une même machine. Quand Tor est "
-"utilisé en tant que client (pour par exemple aller sur le web) celui-ci ne "
-"consomme que très peu de ressource. Sur un relais avec une forte capacité, "
-"la charge de Tor est beaucoup plus importante. Pour l'instant Tor ne gère "
-"pas bien les multi-processeurs, il est donc nécessaire de faire tourner "
-"plusieurs instances de Tor afin d'utiliser toute la capacité mise à notre "
-"disposition par l'hébergeur, d'où les deux noms."
+"<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 ""
 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
 
 #. type: Plain text

+#, no-wrap

 msgid ""
 msgid ""

-"[^3] : Gandi nous fournit gracieusement les ressources pour faire tourner ce "
-"noeud (machine virtuelle et bande passante."
+"new BwDrawer(\"#bandwidth\").draw();\n"
+"</script>\n"

 msgstr ""
 msgstr ""

+"new BwDrawer(\"#bandwidth\").draw();\n"
+"</script>\n"