From f7c4b09161da666d7adf2ad80327f81e2230c21c Mon Sep 17 00:00:00 2001 From: opi Date: Fri, 20 Nov 2015 22:15:13 +0100 Subject: [PATCH 01/16] Pas d'espace avant les deux-points en anglais. --- "Actualit\303\251s.en.po" | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git "a/Actualit\303\251s.en.po" "b/Actualit\303\251s.en.po" index efa4224..0c15254 100644 --- "a/Actualit\303\251s.en.po" +++ "b/Actualit\303\251s.en.po" @@ -60,17 +60,17 @@ msgstr "" "---------------\n" #. type: Bullet: '- ' -msgid "pump.io : [identi.ca/nosoignons](https://identi.ca/nosoignons)" +msgid "pump.io: [identi.ca/nosoignons](https://identi.ca/nosoignons)" msgstr "" #. type: Bullet: '- ' msgid "" -"Diaspora* : [nos_oignons@framasphere.org](https://framasphere.org/" +"Diaspora*: [nos_oignons@framasphere.org](https://framasphere.org/" "people/56b138606b4601334a3e2a0000053625)" msgstr "" #. type: Bullet: '- ' -msgid "Twitter : [@NosOignons](https://twitter.com/NosOignons)" +msgid "Twitter: [@NosOignons](https://twitter.com/NosOignons)" msgstr "" #. type: Plain text -- 2.39.5 From 9cd12bc3d576c4626ac07ee01cb3e28db4dc8015 Mon Sep 17 00:00:00 2001 From: opi Date: Fri, 20 Nov 2015 22:40:16 +0100 Subject: [PATCH 02/16] Elles sont belles mes urls, elles sont belles. --- "Actualit\303\251s.en.po" | 14 ++++++++------ "Actualit\303\251s.mdwn" | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git "a/Actualit\303\251s.en.po" "b/Actualit\303\251s.en.po" index 0c15254..33200f8 100644 --- "a/Actualit\303\251s.en.po" +++ "b/Actualit\303\251s.en.po" @@ -60,18 +60,20 @@ msgstr "" "---------------\n" #. type: Bullet: '- ' -msgid "pump.io: [identi.ca/nosoignons](https://identi.ca/nosoignons)" -msgstr "" +msgid "pump.io : [nosoignons@identi.ca](https://identi.ca/nosoignons)" +msgstr "pump.io: [nosoignons@identi.ca](https://identi.ca/nosoignons)" #. type: Bullet: '- ' msgid "" -"Diaspora*: [nos_oignons@framasphere.org](https://framasphere.org/" -"people/56b138606b4601334a3e2a0000053625)" +"Diaspora* : [nos_oignons@framasphere.org](https://framasphere.org/" +"u/nos_oignons)" msgstr "" +"Diaspora*: [nos_oignons@framasphere.org](https://framasphere.org/" +"u/nos_oignons)" #. type: Bullet: '- ' -msgid "Twitter: [@NosOignons](https://twitter.com/NosOignons)" -msgstr "" +msgid "Twitter : [@NosOignons](https://twitter.com/NosOignons)" +msgstr "Twitter: [@NosOignons](https://twitter.com/NosOignons)" #. type: Plain text #, no-wrap diff --git "a/Actualit\303\251s.mdwn" "b/Actualit\303\251s.mdwn" index 20fb2b6..e687755 100644 --- "a/Actualit\303\251s.mdwn" +++ "b/Actualit\303\251s.mdwn" @@ -17,8 +17,8 @@ lettre d'information : Réseaux sociaux --------------- -- pump.io : [identi.ca/nosoignons](https://identi.ca/nosoignons) -- Diaspora* : [nos_oignons@framasphere.org](https://framasphere.org/people/56b138606b4601334a3e2a0000053625) +- pump.io : [nosoignons@identi.ca](https://identi.ca/nosoignons) +- Diaspora* : [nos_oignons@framasphere.org](https://framasphere.org/u/nos_oignons) - Twitter : [@NosOignons](https://twitter.com/NosOignons) Historique des actualités -- 2.39.5 From 0a60f323fc68e0d781fd421ce35c6917673be266 Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 6 Dec 2015 17:44:07 +0100 Subject: [PATCH 03/16] s/carte bleue/carte bancaire/ --- Donnez.en.po | 4 ++-- Donnez.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Donnez.en.po b/Donnez.en.po index 0dc5735..a51d979 100644 --- a/Donnez.en.po +++ b/Donnez.en.po @@ -63,14 +63,14 @@ msgstr "" "exit node. Below 3 months, we shall have to close an existing relay." #. type: Content of:

-msgid "Par carte bleue" +msgid "Par carte bancaire" msgstr "By credit card" #. type: Content of:

msgid "" "Les banques faisant des misères aux Fonds de " "Défense de la Neutralité du Net, nous sommes temporairement incapable " -"d'accepter les dons par carte bleue. Il est toujours possible d'utiliser " +"d'accepter les dons par carte bancaire. Il est toujours possible d'utiliser " "PayPal, même si cela nous coûte plus cher." msgstr "" "As banks are being bad to the Fund for " diff --git a/Donnez.html b/Donnez.html index 4db5ac0..82d62f0 100644 --- a/Donnez.html +++ b/Donnez.html @@ -20,12 +20,12 @@ Un oignon correspond à 1 mois de fonctionnementFonds de Défense de la Neutralité du Net, nous sommes temporairement incapable - d'accepter les dons par carte bleue. Il est toujours possible d'utiliser + d'accepter les dons par carte bancaire. Il est toujours possible d'utiliser PayPal, même si cela nous coûte plus cher.

-- 2.39.5 From 610ba225a0c3649cfc5fa8e0e69dd8a18939d7f3 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Wed, 9 Dec 2015 23:55:54 +0100 Subject: [PATCH 04/16] sidebar: Ajout d'un lien vers wiki-admin --- sidebar.en.po | 6 +++++- sidebar.mdwn | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sidebar.en.po b/sidebar.en.po index b412294..0da8095 100644 --- a/sidebar.en.po +++ b/sidebar.en.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Nos oignons website\n" -"POT-Creation-Date: 2014-06-23 15:46+0300\n" +"POT-Creation-Date: 2015-12-09 23:47+0100\n" "PO-Revision-Date: 2013-11-17 14:50+0100\n" "Last-Translator: Nos oignons \n" "Language-Team: English >\n" @@ -42,6 +42,10 @@ msgstr "[[Spread the word|Diffusez]]" msgid "[[Partenaires|Partenaires]]" msgstr " " +#. type: Bullet: '* ' +msgid "[Documentation](/wiki-admin/)" +msgstr "[Documentation (french)](/wiki-admin/)" + #. type: Bullet: '* ' msgid "[[Contact|Contact]]" msgstr "[[Contact|Contact]]" diff --git a/sidebar.mdwn b/sidebar.mdwn index c4e9135..3b2a365 100644 --- a/sidebar.mdwn +++ b/sidebar.mdwn @@ -6,4 +6,5 @@ * [[Services|Services]] * [[Diffusez|Diffusez]] * [[Partenaires|Partenaires]] +* [Documentation](/wiki-admin/) * [[Contact|Contact]] -- 2.39.5 From f0b949752ce816a90418a3f6b03d153266c3343b Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Wed, 9 Dec 2015 23:56:46 +0100 Subject: [PATCH 05/16] =?utf8?q?Actualit=C3=A9s/ouverture=20documentation?= =?utf8?q?=20adminsys:=20correction=20du=20fichier=20po?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../20151104_ouverture_documentation_adminsys.en.po" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Actualit\303\251s/20151104_ouverture_documentation_adminsys.en.po" "b/Actualit\303\251s/20151104_ouverture_documentation_adminsys.en.po" index 0358d37..3ab3522 100644 --- "a/Actualit\303\251s/20151104_ouverture_documentation_adminsys.en.po" +++ "b/Actualit\303\251s/20151104_ouverture_documentation_adminsys.en.po" @@ -71,7 +71,7 @@ msgid "" "hack.lu) devant plus de 400 personnes, dont nos camarades de [Frënn vun der " "Ënn](https://enn.lu), l'équivalent luxembourgeois de Nos oignons." msgstr "" -"To celebrate this, one of our sysadmin gave a "lighting talk" at the " +"To celebrate this, one of our sysadmin gave a “lighting talk” at the " "[hack.lu]( http://2015.hack.lu ), before over 400 people, including our friends " "of [Frënn vun der Ënn]( https://enn.lu ), the luxembourgish equivalent of Nos oignons." -- 2.39.5 From a0414a74a4ac7529d0c66be4aa70312470a03601 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Wed, 9 Dec 2015 23:57:24 +0100 Subject: [PATCH 06/16] =?utf8?q?Participez:=20Ajout=20d'un=20paragraphe=20?= =?utf8?q?sur=20l'=C3=A9dition=20du=20site?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Participez.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Participez.mdwn b/Participez.mdwn index ffa1b5c..b9438d4 100644 --- a/Participez.mdwn +++ b/Participez.mdwn @@ -16,6 +16,20 @@ Comment participer à *Nos oignons* ? * **Concrètement** : en rejoignant la [liste de discussion des bénévoles](https://nos-oignons.net/mailman/listinfo/benevoles). +En particulier, pour suggérer des modifications du site, vous pouvez : + + * Tout simplement écrire à [la liste des bénévoles]( + mailto:benevoles@nos-oignons.net). + * Obtenir un [copie du site via Git](/gitweb/website.git), le modifier à votre + guise, et nous envoyer les modifications [par mail]( + mailto:benevoles@nos-oignons.net). + C'est même possible d'envoyer les patches automatiquement : + + git format-patch -M origin/master -o mail/ + git send-email --compose --thread \ + --to='benevoles@nos-oignons.net' \ + mail/* + Comment participer au réseau Tor ? ================================== -- 2.39.5 From 95210ec74f9a5d2e30921e6f145b9b0d732854fe Mon Sep 17 00:00:00 2001 From: opi Date: Thu, 10 Dec 2015 09:35:38 +0100 Subject: [PATCH 07/16] Prise en compte des relais inactifs dans le script de bande passante. --- assets/bw_graphs.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js index bed5e11..ebfc192 100644 --- a/assets/bw_graphs.js +++ b/assets/bw_graphs.js @@ -61,6 +61,13 @@ BwDrawer.color.domain(nos_oignons_relays.map(function(r) {return r.fingerprint}) BwDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color})); BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) { + // Purge non running relays + raw_data.relays.forEach(function(r, i) { + if (typeof r.read_history === 'undefined' || typeof r.write_history === 'undefined') { + raw_data.relays.splice(i, 1); + } + }); + var update_period; var svg = d3.select(selector).append("svg") -- 2.39.5 From 20e5426ae793980fc849d6b921786cc8e165b2f3 Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 13 Dec 2015 18:44:14 +0100 Subject: [PATCH 08/16] Suppression de la marge haute des paragraphes dans un liste. --- local.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/local.css b/local.css index c1e2a8e..53b5b54 100644 --- a/local.css +++ b/local.css @@ -280,6 +280,9 @@ main a:hover { main p { margin: 1em 0 1em 0; } +main li p { + margin-top: 0; +} main hr { border: none; -- 2.39.5 From 8fc4756ee6bc2c47363c9a2e95cc05119a09d1f2 Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 13 Dec 2015 18:45:50 +0100 Subject: [PATCH 09/16] =?utf8?q?Fichiers=20PO=20mis=20=C3=A0=20jour.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- "\303\200_propos.en.po" | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git "a/\303\200_propos.en.po" "b/\303\200_propos.en.po" index 0a49942..3bd3300 100644 --- "a/\303\200_propos.en.po" +++ "b/\303\200_propos.en.po" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Nos oignons website\n" -"POT-Creation-Date: 2014-07-14 15:37+0300\n" +"POT-Creation-Date: 2015-12-13 18:45+0100\n" "PO-Revision-Date: 2014-07-14 16:11+0100\n" "Last-Translator: Nos oignons \n" "Language-Team: English \n" @@ -45,6 +45,12 @@ msgstr "" "piece of software, a network of relays made of more than 4,000 servers and a " "project around which fortyish people gravitate." +#. type: Plain text +msgid "" +"Plus d'information sur le fonctionnement du réseau Tor sur [Wikipedia]" +"(https://fr.wikipedia.org/wiki/Tor_%28r%C3%A9seau%29)." +msgstr "" + #. type: Plain text #, no-wrap msgid "" @@ -105,7 +111,8 @@ msgid "" msgstr "" "Of course, this costs more than a simple broadband connection. This is why " "we created a not-for-profit organization and continously collect donations " -"from the community.\n\n" +"from the community.\n" +"\n" "About the name: in French the idiom for “mind your own business” is “mind " "your own onions”. So, we are minding ours, and these are your onions." @@ -184,8 +191,8 @@ msgstr "" "lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0031:En:HTML): we do " "not initiate the transmissions, we do not select the receiver of the " "transmission, and we do not select or modify the information contained in " -"the transmission. Therefore, we are not liable for the " -"information transmitted." +"the transmission. Therefore, we are not liable for the information " +"transmitted." #. type: Plain text msgid "" -- 2.39.5 From 3af22a1882791c8620bfb0b68f22ab4f3a97891b Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 13 Dec 2015 18:46:32 +0100 Subject: [PATCH 10/16] =?utf8?q?Ajout=20d'un=20lien=20vers=20la=20page=20W?= =?utf8?q?ikipedia=20sur=20le=20r=C3=A9seau=20Tor.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- "\303\200_propos.mdwn" | 3 +++ 1 file changed, 3 insertions(+) diff --git "a/\303\200_propos.mdwn" "b/\303\200_propos.mdwn" index 4c4d133..1a6de0e 100644 --- "a/\303\200_propos.mdwn" +++ "b/\303\200_propos.mdwn" @@ -11,6 +11,9 @@ connexions et de contourner la censure dans le réseau Internet. Tor est à la fois un logiciel, un réseau de relais composé de plus de 4 000 serveurs et un projet autour duquel gravite une quarantaine de personnes. +Plus d'information sur le fonctionnement du réseau Tor sur +[Wikipedia](https://fr.wikipedia.org/wiki/Tor_%28r%C3%A9seau%29). + Comment ça s'utilise ? ====================== -- 2.39.5 From 168b5cd91db52936e847e4499c0d685c7b34e61b Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 13 Dec 2015 18:49:59 +0100 Subject: [PATCH 11/16] Traduction du lien wikipedia. --- "\303\200_propos.en.po" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/\303\200_propos.en.po" "b/\303\200_propos.en.po" index 3bd3300..43e01b2 100644 --- "a/\303\200_propos.en.po" +++ "b/\303\200_propos.en.po" @@ -50,6 +50,8 @@ msgid "" "Plus d'information sur le fonctionnement du réseau Tor sur [Wikipedia]" "(https://fr.wikipedia.org/wiki/Tor_%28r%C3%A9seau%29)." msgstr "" +"More information about Tor network on [Wikipedia]" +"(https://en.wikipedia.org/wiki/Tor)" #. type: Plain text #, no-wrap -- 2.39.5 From 986428bd895052b072495dc93bb0fd6216ada285 Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 13 Dec 2015 18:51:01 +0100 Subject: [PATCH 12/16] Oubli point final. --- "\303\200_propos.en.po" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/\303\200_propos.en.po" "b/\303\200_propos.en.po" index 43e01b2..eb19585 100644 --- "a/\303\200_propos.en.po" +++ "b/\303\200_propos.en.po" @@ -51,7 +51,7 @@ msgid "" "(https://fr.wikipedia.org/wiki/Tor_%28r%C3%A9seau%29)." msgstr "" "More information about Tor network on [Wikipedia]" -"(https://en.wikipedia.org/wiki/Tor)" +"(https://en.wikipedia.org/wiki/Tor)." #. type: Plain text #, no-wrap -- 2.39.5 From 45d4353f0893d9ce16f0ae9c9d97d722cc4fa177 Mon Sep 17 00:00:00 2001 From: Lunar Date: Mon, 14 Dec 2015 10:08:22 +0100 Subject: [PATCH 13/16] =?utf8?q?Prochain=20=C3=A9v=C3=A8nement=C2=A0:=2032?= =?utf8?q?C3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Donnez.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Donnez.html b/Donnez.html index 82d62f0..329cb29 100644 --- a/Donnez.html +++ b/Donnez.html @@ -49,7 +49,7 @@ Au dela de 6 mois, nous essayons de mettre en place un nouveau relai. En dessous

En bitcoins

-- 2.39.5 From 60299a3a4a61577f4f4e94d5b3e7ecae0129024e Mon Sep 17 00:00:00 2001 From: website Date: Mon, 14 Dec 2015 10:08:59 +0100 Subject: [PATCH 14/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 | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Donnez.en.po b/Donnez.en.po index a51d979..23a15be 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-10-20 14:17+0300\n" +"POT-Creation-Date: 2015-12-14 10:08+0100\n" "PO-Revision-Date: 2015-08-24 13:42+0200\n" "Last-Translator: Nos oignons \n" "Language-Team: English \n" @@ -112,10 +112,18 @@ msgstr "" "receive in person donations." #. type: Content of:
  • +#, fuzzy +#| msgid "" +#| "Chaos Communication Camp, 13 au 17 août 2015, " +#| "Mildenberg, Allemagne" msgid "" -"Bazar du libre, 21 " -"& 22 novembre 2015, Toulouse, France" +"32nd Chaos Communication " +"Congress, 27-30 décembre 2015, Hambourg, Allemagne" msgstr "" +"Chaos Communication Camp, August 13-17, 2015, Mildenberg, " +"Germany" #. type: Content of:

    msgid "En bitcoins" @@ -366,15 +374,6 @@ msgstr "" "2 :  Stripped " "onions represent known future donations." -#~ msgid "" -#~ "Chaos Communication Camp, 13 au 17 août 2015, " -#~ "Mildenberg, Allemagne" -#~ msgstr "" -#~ "Chaos Communication Camp, August 13-17, 2015, " -#~ "Mildenberg, Germany" - #~ msgid "" #~ "DebConf, 15 au 22 août " #~ "2015, Heidelberg, Allemagne" -- 2.39.5 From 5a5c2625252fdd12290f5392a5c0dc3f6d761d9e Mon Sep 17 00:00:00 2001 From: Lunar Date: Mon, 14 Dec 2015 10:10:36 +0100 Subject: [PATCH 15/16] =?utf8?q?Mise=20=C3=A0=20jour=20des=20traductions?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Donnez.en.po | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/Donnez.en.po b/Donnez.en.po index 23a15be..39cfd4e 100644 --- a/Donnez.en.po +++ b/Donnez.en.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Nos oignons website\n" "POT-Creation-Date: 2015-12-14 10:08+0100\n" -"PO-Revision-Date: 2015-08-24 13:42+0200\n" +"PO-Revision-Date: 2015-12-14 10:10+0100\n" "Last-Translator: Nos oignons \n" "Language-Team: English \n" "Language: en\n" @@ -112,18 +112,12 @@ msgstr "" "receive in person donations." #. type: Content of:
    • -#, fuzzy -#| msgid "" -#| "Chaos Communication Camp, 13 au 17 août 2015, " -#| "Mildenberg, Allemagne" msgid "" "32nd Chaos Communication " "Congress, 27-30 décembre 2015, Hambourg, Allemagne" msgstr "" -"Chaos Communication Camp, August 13-17, 2015, Mildenberg, " -"Germany" +"32nd Chaos Communication " +"Congress, December 27-30, 2015, Hamburg, Germany" #. type: Content of:

      msgid "En bitcoins" @@ -373,10 +367,3 @@ msgid "" msgstr "" "2 :  Stripped " "onions represent known future donations." - -#~ msgid "" -#~ "DebConf, 15 au 22 août " -#~ "2015, Heidelberg, Allemagne" -#~ msgstr "" -#~ "DebConf, August 15-22, " -#~ "2015, Heidelberg, Germany" -- 2.39.5 From 93f8d26a1cdb9b0064501be670a788c71b0f19c3 Mon Sep 17 00:00:00 2001 From: Lunar Date: Mon, 14 Dec 2015 10:11:54 +0100 Subject: [PATCH 16/16] =?utf8?q?Fran=C3=A7isation?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Donnez.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Donnez.html b/Donnez.html index 329cb29..1a2f478 100644 --- a/Donnez.html +++ b/Donnez.html @@ -49,7 +49,7 @@ Au dela de 6 mois, nous essayons de mettre en place un nouveau relai. En dessous

      En bitcoins

      -- 2.39.5