diff --git a/content/pages/duniter-v2-in-english.md b/content/pages/duniter-v2-in-english.md index 2014942c3fd51f94390a1ff194a9e858598ebb9c..0d660d3d8876cd1b419297d9bc1ca96e656ee14a 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> @@ -117,7 +113,7 @@ Version 2 is still open source software, and is a new blockchain that will start **All your Ğ1s, certifications and transactions will still be there** . <alert type="info"> -*Cesium+ data (profiles, messaging, notifications, etc.) is currently being processed, and may not be available from the start-up date!* +\*Cesium+ data (profiles, messaging, notifications, etc.) is currently being processed, and may not be available from the start-up date!\* </alert> A new blockchain requires new software (Césium 2, Gecko, Tikka, G1nkgo 2, ....). @@ -126,9 +122,8 @@ It will not be possible to trade between two different blockchains, so after the **To make sure you don't miss out on this changeover, stay tuned to this site, the forum and the social networks!** - <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> @@ -221,11 +216,11 @@ Authentication by secret identifier and password is not sufficiently secure for 1. Gecko is designed to work only with accounts created by mnemonic, for security reasons. For other software, nothing definitive yet. 2. Gecko offers to ‘migrate’ your old accounts (id/mdp) to a new account that you have created with a mnemonic. -1. This can allow you to group all your accounts in a single safe deposit box, which is easier to use. -2. Migration of a member account means transferring your identity with nickname, certifications, whether or not you are a member, and ğ1. -3. Migration of a single wallet account, is simply a transfer of all ğ1. -4. Once migrated, the new account (with mnemonic) will be usable for all your transactions whatever the portfolio management software (Césium, Gecko, Tikka, Gcli) and the old account will only be an empty portfolio. -5. The old account can still be used like any other portfolio. But this would defeat the purpose of having migrated it. +3. This can allow you to group all your accounts in a single safe deposit box, which is easier to use. +4. Migration of a member account means transferring your identity with nickname, certifications, whether or not you are a member, and ğ1. +5. Migration of a single wallet account, is simply a transfer of all ğ1. +6. Once migrated, the new account (with mnemonic) will be usable for all your transactions whatever the portfolio management software (Césium, Gecko, Tikka, Gcli) and the old account will only be an empty portfolio. +7. The old account can still be used like any other portfolio. But this would defeat the purpose of having migrated it. - - - @@ -308,11 +303,11 @@ 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> -<div style="float:left; margin: 0 1em 0;"><a href="/uploads/what-will-change-in-english1.jpf" target="_blank"> +<div style="float:left; margin: 0 1em 0;"><a href="/uploads/what-will-change-in-english1.jpg" 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"> @@ -326,18 +321,15 @@ 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 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. * **The power of the blacksmiths**, who decide whether or not to accept updates. In V2, blacksmiths will no longer need to decide whether or not to accept an update; updates will be made automatically unless they refuse (principle of freedom). * **The ability to exchange for other currencies**: Everyone has always been free to exchange ğ1 for other currencies. Other currencies are objects to which everyone is free to give a value. [See here an extract from the TRM in French](https://forum.monnaie-libre.fr/t/g1-et-plateformes-de-change/29900/61) -* **The implementation of the Ğ1 on exchange platforms** is no more planned in V2 than in V1. But it is in any case impossible to prevent anyone from creating such a possibility (it's the FREE world). If it hasn't already been done, it's only because no-one has found it sufficiently interesting. +* **The implementation of the Ğ1 on exchange platforms** is no more planned in V2 than in V1. But it is in any case impossible to prevent anyone from creating such a possibility (it's the FREE world). If it hasn't already been done, it's only because no-one has found it sufficiently interesting.\ Further explanations in French on the forum: https://forum.monnaie-libre.fr/t/g1-et-plateformes-de-change/29900/78 <h2 style="color:#34a1ff" id="switchover">How will the switchover work for users?</h2> @@ -361,7 +353,7 @@ The Mà J-V2 collective is communicating as much as possible about this switchove #### The end of V1 -**The switchover scenario has not yet been formally established **. +**The switchover scenario has not yet been formally established** . The time **0** (date and time) at which Duniter 2.0 will start has not yet been definitively chosen. @@ -393,10 +385,22 @@ The Mà J-V2 collective is communicating as much as possible about this switchove Details in French on the [technical forum](https://forum.duniter.org/t/chronologie-de-la-migration/12605) - <details> <summary> <b>Author </b></summary> [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/gb-_what_remains_the_same_and_transition_process-sophie-t_page_1.jpg" target="_blank"> +<img src="/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_1.jpg" width="200"/></a><br/> translated by @Sophie T</div> + +<div style="float:left; margin: 0 1em 0;"><a href="/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_2.jpg" target="_blank"> +<img src="/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_2.jpg" width="200"/></a><br/>translated by @Sophie T</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 diff --git a/static/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_1.jpg b/static/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..055c87062fd2343374aa3d3cbede0b719eae82e7 Binary files /dev/null and b/static/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_1.jpg differ diff --git a/static/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_2.jpg b/static/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b7baca8565fba0797d967308e9e768375e0f9e95 Binary files /dev/null and b/static/uploads/gb-_what_remains_the_same_and_transition_process-sophie-t_page_2.jpg differ