From 9452e3eaa34658bc58ff4866b0f73024c0f783d3 Mon Sep 17 00:00:00 2001 From: Daniel Jakots Date: Mon, 6 Apr 2015 08:46:37 +0200 Subject: [PATCH 01/16] mon vim n'aime vraiment pas l'utf-8 decidement --- .../20150205_500_mbits_de_plus_pour_le_reseau_tor.mdwn" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.mdwn" "b/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.mdwn" index b51a991..9e879ac 100644 --- "a/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.mdwn" +++ "b/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.mdwn" @@ -7,7 +7,7 @@ Ce nouveau relai, opérationnel depuis le samedi 15 novembre 2014, va progressiv Nous l'avons nommé *Marylou* en référence au personnage du roman [L'Oiseau d'Amérique](http://fr.wikipedia.org/wiki/L%27Oiseau_d%27Am%C3%A9rique) de Walter Tevis. Marylou rejoint donc les [[3 autres noeuds|Services]] mis en place par Nos oignons. -Pour limiter l'encombrement et la consommation électrique, nous avons mis en oeuvre Marylou sur un boitier Intel NUC Ii5-4250U, 8Go de RAM DDR3 so-dimm, et un SSD Crucial M500 de 120Go. +Pour limiter l'encombrement et la consommation électrique, nous avons mis en oeuvre Marylou sur un boitier Intel NUC i5-4250U, 8Go de RAM DDR3 so-dimm, et un SSD Crucial M500 de 120Go. Merci à toutes celles et tous ceux qui ont permis de rendre possible sa mise en œuvre. -- 2.39.5 From ead6f2094ed5d583919ae8757ff90347b33a6f80 Mon Sep 17 00:00:00 2001 From: website Date: Mon, 6 Apr 2015 08:46:48 +0200 Subject: [PATCH 02/16] =?utf8?q?Fichiers=20PO=20mis=20=C3=A0=20jour.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git "a/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" "b/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" index dc90074..3a46728 100644 --- "a/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" +++ "b/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-04-06 08:45+0300\n" +"POT-Creation-Date: 2015-04-06 08:46+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -69,7 +69,7 @@ msgstr "" #| "dimm, et un SSD Crucial M500 de 120Go." msgid "" "Pour limiter l'encombrement et la consommation électrique, nous avons mis en " -"oeuvre Marylou sur un boitier Intel NUC Ii5-4250U, 8Go de RAM DDR3 so-dimm, " +"oeuvre Marylou sur un boitier Intel NUC i5-4250U, 8Go de RAM DDR3 so-dimm, " "et un SSD Crucial M500 de 120Go." msgstr "" "In order to limit the use of physical space and the power consumption, " -- 2.39.5 From ce33f554913d2b747dba54c0df12ab138392c143 Mon Sep 17 00:00:00 2001 From: Daniel Jakots Date: Mon, 6 Apr 2015 08:48:29 +0200 Subject: [PATCH 03/16] mise a jour traduction --- .../20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git "a/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" "b/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" index 3a46728..3b52e8b 100644 --- "a/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" +++ "b/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" @@ -62,7 +62,6 @@ msgstr "" "Services]] set up by Nos oignons." #. type: Plain text -#, fuzzy #| msgid "" #| "Pour limiter l'encombrement et la consommation électrique, nous avons mis " #| "en oeuvre Marylou sur un boitier Intel NUC I5-4520, 8Go de RAM DDR3 so-" @@ -73,7 +72,7 @@ msgid "" "et un SSD Crucial M500 de 120Go." msgstr "" "In order to limit the use of physical space and the power consumption, " -"Marylou is running on an Intel NUC I5-4520, 8GB of RAM DDR3 so-dimm and a " +"Marylou is running on an Intel NUC i5-4250U, 8GB of RAM DDR3 so-dimm and a " "SSD Crucial M500 of 120GB." #. type: Plain text -- 2.39.5 From d331526a9981247ab5306456513b8e13bcede54d Mon Sep 17 00:00:00 2001 From: Lunar Date: Wed, 8 Apr 2015 11:25:58 +0200 Subject: [PATCH 04/16] Supression des graphes 3 jours et 1 semaine MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Onionoo ne donne plus les données. cf. https://lists.torproject.org/pipermail/onionoo-announce/2015/000003.html --- assets/bw_graphs.js | 2 -- assets/l10n.en.js | 2 -- assets/l10n.fr.js | 2 -- 3 files changed, 6 deletions(-) diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js index b79ebf4..b6147b6 100644 --- a/assets/bw_graphs.js +++ b/assets/bw_graphs.js @@ -40,8 +40,6 @@ BwDrawer.write_stack = d3.layout.stack() BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net"; BwDrawer.periods = [ - { id: "3_days", label: L10n.t_3_days }, - { id: "1_week", label: L10n.t_1_week }, { id: "1_month", label: L10n.t_1_month }, { id: "3_months", label: L10n.t_3_months }, { id: "1_year", label: L10n.t_1_year }, diff --git a/assets/l10n.en.js b/assets/l10n.en.js index 21a9cbf..06c8d92 100644 --- a/assets/l10n.en.js +++ b/assets/l10n.en.js @@ -5,8 +5,6 @@ L10n.exit_probability = "Probability to use one of our exit nodes"; L10n.bandwidth = "Bandwidth"; L10n.nos_oignons = "Nos oignons"; L10n.others = "Others"; -L10n.t_3_days = "3 days"; -L10n.t_1_week = "1 week"; L10n.t_1_month = "1 month"; L10n.t_3_months = "3 months"; L10n.t_1_year = "1 year"; diff --git a/assets/l10n.fr.js b/assets/l10n.fr.js index 028cb1e..4586e1b 100644 --- a/assets/l10n.fr.js +++ b/assets/l10n.fr.js @@ -5,8 +5,6 @@ L10n.exit_probability = "Probabilité d'utiliser un de nos nœuds de sortie"; L10n.bandwidth = "Bande passante"; L10n.nos_oignons = "Nos oignons"; L10n.others = "Autres"; -L10n.t_3_days = "3 jours"; -L10n.t_1_week = "1 semaine"; L10n.t_1_month = "1 mois"; L10n.t_3_months = "3 mois"; L10n.t_1_year = "1 an"; -- 2.39.5 From 6a054f281efe43f7f1ecf058d76c08f2eb7f60cb Mon Sep 17 00:00:00 2001 From: website Date: Fri, 8 May 2015 15:39:28 +0200 Subject: [PATCH 05/16] =?utf8?q?Fichiers=20PO=20mis=20=C3=A0=20jour.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git "a/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" "b/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" index 3b52e8b..c3db9aa 100644 --- "a/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" +++ "b/Actualit\303\251s/20150205_500_mbits_de_plus_pour_le_reseau_tor.en.po" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-04-06 08:46+0300\n" +"POT-Creation-Date: 2015-05-08 15:39+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,10 +62,6 @@ msgstr "" "Services]] set up by Nos oignons." #. type: Plain text -#| msgid "" -#| "Pour limiter l'encombrement et la consommation électrique, nous avons mis " -#| "en oeuvre Marylou sur un boitier Intel NUC I5-4520, 8Go de RAM DDR3 so-" -#| "dimm, et un SSD Crucial M500 de 120Go." msgid "" "Pour limiter l'encombrement et la consommation électrique, nous avons mis en " "oeuvre Marylou sur un boitier Intel NUC i5-4250U, 8Go de RAM DDR3 so-dimm, " -- 2.39.5 From 96f7ef3f6db2a86f4eadb4668744b96bc794406e Mon Sep 17 00:00:00 2001 From: Lunar Date: Fri, 8 May 2015 16:11:38 +0200 Subject: [PATCH 06/16] =?utf8?q?Ajout=20d'une=20liste=20d'=C3=A9v=C3=A8nem?= =?utf8?q?ents=20o=C3=B9=20il=20est=20possible=20de=20donner=20en=20main?= =?utf8?q?=20propre?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Donnez.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Donnez.html b/Donnez.html index 3f3c925..b937040 100644 --- a/Donnez.html +++ b/Donnez.html @@ -43,6 +43,21 @@ visibilité pour le financement des nœuds dans le temps.

+

De la main à la main

+ +

+ Des membres de Nos oignons seront présent·e·s pour recevoir des dons de la + main à la main pendant les évènements suivants : +

+ + +

Par Flattr

-- 2.39.5 From 612824e6a5b4f5f9dfd72ccf4d6570b91135493b Mon Sep 17 00:00:00 2001 From: website Date: Fri, 8 May 2015 16:14:22 +0200 Subject: [PATCH 07/16] =?utf8?q?Fichiers=20PO=20mis=20=C3=A0=20jour.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Donnez.en.po | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/Donnez.en.po b/Donnez.en.po index 5cb59d9..bc50a56 100644 --- a/Donnez.en.po +++ b/Donnez.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Nos oignons website\n" -"POT-Creation-Date: 2015-04-01 11:19+0300\n" +"POT-Creation-Date: 2015-05-08 16:14+0300\n" "PO-Revision-Date: 2014-07-11 10:42+0200\n" "Last-Translator: Nos oignons \n" "Language-Team: English \n" @@ -56,10 +56,9 @@ msgid "" "d'accepter les dons par carte bleue. Il est toujours possible d'utiliser " "PayPal, même si cela nous coûte plus cher." msgstr "" -"As banks are being bad to the Funds for " -"Defense de Network Neutrality, we are currently not able to accept " -"credit cards. It is still possible to use PayPal, however it is more " -"expensive for us." +"As banks are being bad to the Funds for Defense " +"de Network Neutrality, we are currently not able to accept credit cards. " +"It is still possible to use PayPal, however it is more expensive for us." #. type: Content of:

msgid "Par virement" @@ -82,6 +81,47 @@ msgstr "" "Most banks offer to setup periodic wire transfers. They surely help us plan " "the funding of the nodes better." +#. type: Content of:

+msgid "De la main à la main" +msgstr "" + +#. type: Content of:

+msgid "" +"Des membres de Nos oignons seront présent·e·s pour recevoir des dons de la " +"main à la main pendant les évènements suivants :" +msgstr "" + +#. type: Content of: