From e40a29932cca3a2cb1356c527f21cbc19a17bc2f Mon Sep 17 00:00:00 2001 From: Spiranne <annb@gmx.fr> Date: Mon, 27 Jan 2025 17:24:37 +0100 Subject: [PATCH] =?UTF-8?q?Update=20Page=20=E2=80=9Cduniter-v2-in-english?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/pages/duniter-v2-in-english.md | 33 ++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/content/pages/duniter-v2-in-english.md b/content/pages/duniter-v2-in-english.md index 2014942c..5af6e22a 100644 --- a/content/pages/duniter-v2-in-english.md +++ b/content/pages/duniter-v2-in-english.md @@ -20,11 +20,7 @@ description: Version 2 for Ğ1 software </div> -<div style = "display:inline-block; margin:auto;"> - -<span style="font-size:1.5em; font-weight: bold;"> Machine translation with [deepl](https://www.deepl.com/fr/translator).</span> - -</div> +<p style="float:left;"><strong> Machine translation with [deepl](https://www.deepl.com/fr/translator).</strong> </p> <div style = "display :inline-block; margin:5px auto 5px; text-align:center; width:400px; border:solid #3FB2FF 1px; background-color:#3FB2FF;border-radius: 10px; padding: 1em;"> <a style="font-size:1.5em; font-weight: bold; color: white;" href="https://www.helloasso.com/associations/axiom-team/collectes/finalisation-de-cesium-v2-et-duniter-v2">crowdfunding<img src="/uploads/crowfunding100.png" style="padding:5px;margin:auto;"/></a> @@ -36,7 +32,7 @@ When will you be informed of the project's progress? 1. **<p style="font-size:1.1em;"><strong style="color :#F7A212 ;">October :**</strong> [Why change?](#pourquoi)</p> 2. **<p style="font-size:1.1em;"><strong style="color :#F7A212 ;">November - December :** </strong> [what will change](#evolutions) </p> -3. **<p style="font-size:1.1em;"><strong style="color :#F7A212 ;">January :**</strong> what won't change <br/> and **how it will happen** </p> +3. **<p style="font-size:1.1em;"><strong style="color :#F7A212 ;">January :**</strong> [what won't change](#identique) <br/> [and **how it will happen**](#bascule) </p> 4. **<p style="font-size:1.1em;"><strong style="color :#F7A212 ;">February :**</strong> satellite software : **discovering, testing and using** </p> </div> @@ -128,7 +124,7 @@ It will not be possible to trade between two different blockchains, so after the <h2 id="flyers1"><a href="https://forum.monnaie-libre.fr/uploads/short-url/uM8FyjFvUqHt6mfYAKbCOfBDj8x.pdf" target="_blank" width="50%" style="color:#34A1FF; font-weight: bold;">Double-sided flyer to share -<img src="/uploads/clic40.png" style="padding-left:10px;"/></a></h2> +<img src="/uploads/clic40.png" style="padding-left:10px;display:inline;"/></a></h2> <p><strong>Click on the image to enlarge</strong></p> @@ -308,7 +304,7 @@ New features may be implemented after the launch of Duniter V2, if developers ar </details> <h2 id="flyers1"><a href="https://forum.monnaie-libre.fr/uploads/short-url/3uKlR64JYN3BiGAleP8EFyRc1W9.pdf" target="_blank" style="color:#34A1FF; font-weight: bold;">Double-sided flyer to share -<img src="/uploads/clic40.png" style="padding-left:10px;"/></a></h2> +<img src="/uploads/clic40.png" style="padding-left:10px;display:inline;"/></a></h2> <p><strong>Click on the image to enlarge</strong></p> @@ -326,12 +322,10 @@ New features may be implemented after the launch of Duniter V2, if developers ar * You will find all your Ǧ1 on the new version. * Validated certifications will keep the same expiry date in V2. * Currency creation rules remain the same (1 DUğ1 per day revalued every 6 months). +<img src="/uploads/rienechange.png" width="18%" align ="right" > * The rules for being a member of the Web of Trust remain the same: 5 certifications minimum respecting the distance rule. * The Ğ1 is still the leading free currency and still complies with the M.R.T. * DuniterV2s, Cesium2, Gecko, Tika, G1nkgo, Ğ1superbot are still free software. - -<img src="/uploads/rienechange.png" width="18%" align ="right" > - **The many discussions and questions** surrounding this V2 update have brought to light more clearly **things that already existed in V1**; * **The predominance of the developers**: since the start of Ğ1, they have been the ones choosing which updates to make. Once V2 gets underway, we'll be able to discuss a decision-making system at length. @@ -399,4 +393,19 @@ Details in French on the [technical forum](https://forum.duniter.org/t/chronolog [Maaltir](https://forum.monnaie-libre.fr/u/maaltir/summary) by Collectif Mà J-V2, validated by devs [hugotrentesaux](https://duniter.org/team/hugotrentesaux/), [bgallois](https://duniter.org/team/bgallois/), [Moul](https://duniter.org/team/moul/), [Tuxmain](https://duniter.org/team/tuxmain/), [Vit](https://duniter.org/team/vit/) -</details> \ No newline at end of file +</details> + +<h2 id="flyers1"><a href="https://forum.monnaie-libre.fr/uploads/short-url/k1W5u46pQSnrVqKOClRwdjTFpWd.pdf" target="_blank" style="color:#34A1FF; font-weight: bold;">Double-sided flyer to share +<img src="/uploads/clic40.png" style="padding-left:10px;display:inline;"/></a></h2> + +<p><strong>Click on the image to enlarge</strong></p> + + +<div style="float:left; margin: 0 1em 0;"><a href="/uploads/what-will-change-in-english1.jpf" target="_blank"> +<img src="/uploads/what-will-change-in-english1.jpg" width="200"/></a><br/> translated by @Jooam</div> + +<div style="float:left; margin: 0 1em 0;"><a href="/uploads/what-will-change-in-english2.jpg" target="_blank"> +<img src="/uploads/what-will-change-in-english2.jpg" width="200"/></a><br/>translated by @Jooam</div> + +<hr style=" border: 2px solid #34A1FF;margin:10px auto 50px; width: 100%;"/> +<img src="https://forum.monnaie-libre.fr/uploads/default/optimized/2X/b/b0cf4175b437b18b8f9f8f66ec5ddee2eb9d0daa_2_499x499.png" width="200" align ="center" > \ No newline at end of file -- GitLab