Merge branch 'master' into lemmy

README.md

@@ -4,7 +4,7 @@
 
 This README will walk you through everything you need to know to make changes, edits, or even completely new pages for the [getmonero.org website](https://getmonero.org/). It'll definitely be a bit of a ride, so strap yourself in. Feel free to skip down to a relevant section if you already know what you need.
 
-If you need support about something related to the website, please join `#monero-site` [Libera/IRC](irc://irc.libera.chat/#monero-site) or [Matrix](https://matrix.to/#/!txpwSzQzkuUaVbtsIx:matrix.org). For general info about Monero join `#monero`. We'll do whatever we can to help you.
+If you need support about something related to the website, please join `#monero-site` [Libera/IRC](irc://irc.libera.chat/#monero-site) or [Matrix](https://matrix.to/#/%23monero-site:monero.social). For general info about Monero join `#monero`. We'll do whatever we can to help you.
 
 ## What you'll need
 
@@ -293,6 +293,7 @@ Where `STATUS` can be:
 - `completed` for completed milestones
 - `ongoing` for milestones currently being worked on
 - `upcoming` for milestones not yet completed or in progress
+- `proposed` for milestones open to research and consideration
 
 If an entry is `completed`, a green tick symbol will be displayed on its left. if it's `ongoing` a roadwork sign and `upcoming` a compass.
 

_data/chats.yml

@@ -1,30 +1,30 @@
 chats:
 - monero:
-  matrix: https://matrix.to/#/#monero:monero.social
+  matrix: https://matrix.to/#/%23monero:monero.social
 
 - monero-community:
-  matrix: https://matrix.to/#/#monero-community:monero.social
+  matrix: https://matrix.to/#/%23monero-community:monero.social
 
 - monero-dev: 
-  matrix: https://matrix.to/#/#monero-dev:monero.social
+  matrix: https://matrix.to/#/%23monero-dev:monero.social
 
 - monero-markets:
-  matrix: https://matrix.to/#/#monero-markets:monero.social
+  matrix: https://matrix.to/#/%23monero-markets:monero.social
 
 - monero-offtopic:
-  matrix: https://matrix.to/#/#monero-offtopic:monero.social
+  matrix: https://matrix.to/#/%23monero-offtopic:monero.social
 
 - monero-pools:
-  matrix: https://matrix.to/#/#monero-pools:monero.social
+  matrix: https://matrix.to/#/%23monero-pools:monero.social
 
 - monero-research-lab:
-  matrix: https://matrix.to/#/#monero-research-lab:monero.social
+  matrix: https://matrix.to/#/%23monero-research-lab:monero.social
 
 - monero-translations:
-  matrix: https://matrix.to/#/#monero-translations:monero.social
+  matrix: https://matrix.to/#/%23monero-translations:monero.social
 
 - monero-hardware:
-  matrix: https://matrix.to/#/#monero-hardware:matrix.org
+  matrix: https://matrix.to/#/%23monero-hardware:matrix.org
 
 - monero-site:
-  matrix: https://matrix.to/#/#monero-site:monero.social
+  matrix: https://matrix.to/#/%23monero-site:monero.social

_i18n/el.yml

@@ -447,7 +447,7 @@ mining:
     επικίνδυνο
   hardware: Υλισμικό
   supportp: Αν έχετε ερωτήσεις ή απλά θέλετε να αντιπαρατεθείτε με άλλους εξορυκτές,
-    ελάτε να συζητήσετε στο Monero Pools. Στο <a href="https://matrix.to/#/#monero-pools:monero.social">Matrix</a>
+    ελάτε να συζητήσετε στο Monero Pools. Στο <a href="https://matrix.to/#/%23monero-pools:monero.social">Matrix</a>
     και στο <a href="irc://irc.libera.chat/#monero-pools">Libera</a>.
   softwarep: "Υπάρχουν διάφορες επιλογές όσον αφορά το λογισμικό εξόρυξης. Όπως έχει\
     \ ήδη ειπωθεί, για ατομική εξόρυξη, μπορούν να χρησιμοποιηθούν τα πορτοφόλια Περιβάλλοντος\

_i18n/en.yml

@@ -268,8 +268,6 @@ downloads:
   bootstrapnode1: Use a @remote-node while downloading the blockchain locally, this will allow you to use Monero immediately and switch to your local node once it's completely synced
   rpc: RPC Wallet and Daemon
   rpc1: included in the archive
-  payforrpc: Pay-for-RPC
-  payforrpc1: A new feature that allows node operators to get rewarded when their node is used
   verify: Verify
   verify1: You are strongly advised to verify the hashes of the archive you downloaded. This will confirm that the files you downloaded perfectly match the files uploaded by the Monero development workgroup. Please don't underestimate this step, a corrupted archive could result in lost funds.
   verify2: Always verify your downloads!
@@ -278,9 +276,9 @@ downloads:
   showhash2: and should be treated as canonical, with the signature checked against the appropriate GPG key
   showhash3: in the source code
   showhash4: "Two guides are available to guide you through the verification process:"
-  mobilelight1: The wallets listed below are mobile or light wallets that are deemed safe by respected members of the community. If you want to use a wallet that is not listed on this page, it is strongly recommended that you consult the community to find out if the wallet is safe and what are the risks in using it. Go to our
+  mobilelight1: The wallets listed below are non-custodial mobile or light wallets not managed by the Monero core team that have been around for some time. It is strongly recommended that you do your own research to find out if the wallets are safe and what are the risks of using them. Go to our
   mobilelight2: Hangouts
-  mobilelight3:  page to see where we are.
+  mobilelight3:  page to see where the Monero communities meet.
   installer: Installer
   avwarning: Be aware that some antiviruses and firewalls may flag the Monero executables and archives as malware.
   moreinfofaq: More info in the FAQ
@@ -333,6 +331,8 @@ press-kit:
   guerrillakitp: A document created by the Monero Outreach workgroup containing materials and tips for an effective guerrilla marketing campaign.
   promographics: "Monero Promotional graphics - Badges and stickers for websites"
   promographicsp: Various graphics and Badges created by TheMonera, for both merchants and simple enthusiasts.
+  xmrgraphics: Monero Graphics
+  xmrgraphicsp: Monero posters, illustrations, edits, wallpapers, stickers that can be used by everyone. 
   othersymbols: Other symbols and logos
   mrllogo_para: The logo of the Monero Research Lab in SVG format.
   contacts: Contacts
@@ -587,7 +587,7 @@ mining:
     There are several options when it comes to mining software. As already said, to solo mine, the CLI or GUI wallets can be used (CPU only). If you want to mine to a pool or mine with a GPU, you'll need dedicated software. Miners supporting Monero:
   software_para: Note that some miners may have developer fees.
   support: Support
-  supportp: If you have questions or just want to confront with fellow miners, come chat on Monero Pools. On <a href="https://matrix.to/#/#monero-pools:monero.social">Matrix</a> and <a href="irc://irc.libera.chat/#monero-pools">Libera</a>.
+  supportp: If you have questions or just want to confront with fellow miners, come chat on Monero Pools. On <a href="https://matrix.to/#/%23monero-pools:monero.social">Matrix</a> and <a href="irc://irc.libera.chat/#monero-pools">Libera</a>.
   p2poolh: "P2Pool: The best of both solo and pool mining"
   p2poolnew: >
     P2Pool is a clever new way of mining Monero, which allows miners to receive the frequent payouts offered by pools without needing to trust a centralized pool. P2Pool is a Peer-To-Peer mining pool that gives miners full control over their Monero node and what it mines. More details in <a href="/2021/10/05/p2pool-released.html">the announcement post</a>.
@@ -716,6 +716,7 @@ roadmap:
   completed: Completed task
   ongoing: Ongoing task
   upcoming: Upcoming task
+  proposed: Proposed task
   future: Future
 
   jan: January
@@ -818,29 +819,32 @@ roadmap:
   onionaddress: Onion address for Getmonero.org
   supercop: Wallet scanning speedups (support for supercop ASM)
   clsag: Concise linkable spontaneous anonymous group (CLSAG) signatures
-  tryptych: "Triptych: logarithmic-sized linkable ring signatures with applications"
   kastelo: "Kastelo: open source hardware wallet"
-  layer2: Second-layer solutions for speed and scalability
   released-0-16-0-0: CLI and GUI 0.16.0.0 released
   released-0-17: CLI and GUI 0.17 'Oxygen Orion' released
 
-  returnaddr: Return addresses
   atomicswaps: Monero <-> Bitcoin atomic swaps
   bplus: Bulletproofs+
   p2pool: P2Pool released
   haveno: Haveno
 
-  ringsize-sera-tryp: increase ring size to >100
-  seraphis-jamtis: Seraphis & Jamtis
+  seraphis-jamtis: Seraphis codebase & Jamtis
   ospead: OSPEAD
   released-0-18: CLI and GUI 0.18 "Flourine Fermi" released
   hardfork-v15: Network upgrade v15 Hardfork
   xmr-eth-atomicswaps: Monero <-> Ethereum Atomic Swaps
   bp++: Bulletproofs++
   lws-subaddress: Light Wallet Server subaddress support
+  view-tags: Wallet synchronization speed improved by +40% with one-byte view tags
 
   genimprov: "Multiple improvements like: block propagation delay reduced, tx_extra limited, wallet refresh and startup speedups"
-
+
+  xmrbch-atomicswap: XMR-BCH atomic swap is completed
+  haveno-mainnet: HavenoDEX released
+  fcmp-plus: Full-Chain Membership Proofs
+  mrl-tasks: Proposed tasks from Monero Research Lab
+  cuprate: Monerod Rust implementation - Cuprate
+
 research-lab:
   intro: Monero is not only committed to making a fungible currency, but also to continued research into the realm of financial privacy as it involves cryptocurrencies. Below you'll find the work of our very own Monero Research Lab, with more papers to come.
   intro_email: "To contact the Monero Research Lab, please email [email protected]."
@@ -1029,7 +1033,6 @@ tools:
 
   market: Market
   backtestking: Build or buy your own trading strategy/bot.
-  cryptofacile: Compare crypto prices from the best crypto exchanges
   cryptoradar: Marketplace comparison website
   kryptocheck: German marketplace comparison website
 

_i18n/en/resources/moneropedia/remote-node.md

@@ -19,7 +19,7 @@ Open nodes are cool because, as we said above, allow people who are not running
 
 Public nodes are reachable in the network using two systems:
 
-- **Node aggregators**, which are basically lists of open remote nodes. The operators of those nodes decided to add them to the aggregator so that other people can use them. The aggregator will provide to the person who want to use a remote node a simple URL. This URL connects to one of the nodes in the list and will need to be inserted in the Monero wallet (GUI or CLI). The wallet will then contact one of the nodes provided by the URL and will allow the end user to immediately receive and send transactions. One of the most famous node aggregators is [MoneroWorld](https://moneroworld.com/#nodes).
+- **A node aggregator**. Which is basically a list of public remote nodes. The operators of those nodes decided to add them to the aggregator so that other people can use them. The aggregator will provide the user with a list of remote nodes to choose from. The selected node will need to be manually entered into your Monero wallet of choice. The wallet will connect to the selected node, allowing the user to sync their wallet with the network as well as send and receive transactions. One of the most famous node aggregators is [Monero.fail](https://monero.fail/).
 
 - **Native public nodes**. This is one of the new coolest features the Monero devs came up with to improve the user experience and to make easier to connect to the network. The @daemon allows to make a node public by simply adding the flag `--public-node`. Doing so, it will be advertised on the P2P network and people will be able to connect to it (or to another public node advertising itself in the same way) using the related option in the GUI and CLI wallets.
 

_i18n/en/resources/moneropedia/tail-emission.md

@@ -7,7 +7,9 @@ summary: "the block reward at the end of the emission curve"
 
 ### The Basics
 
-Monero block rewards will never drop to zero. Block rewards will gradually drop until tail emission commences at the end of May 2022. At this point, rewards will be fixed at 0.6 XMR per block.
+Monero block rewards will never drop to zero. Block rewards gradually dropped until tail emission commenced at the end of May 2022. At this point, rewards will stay fixed at 0.6 XMR or less* per block.
+
+* Due to block size penalties.
 
 ### Why
 

_i18n/es.yml

@@ -1038,7 +1038,7 @@ mining:
     \ GUI (sólo para CPU). Si quieres minar en una pool o minar con una GPU, necesitarás\
     \ un software dedicado. Mineros que soportan Monero:\n"
   supportp: Si tienes preguntas o simplemente quieres charlar con otros mineros, ven
-    a chatear en Monero Pools. En <a href="https://matrix.to/#/#monero-pools:monero.social">Matrix</a>
+    a chatear en Monero Pools. En <a href="https://matrix.to/#/%23monero-pools:monero.social">Matrix</a>
     y <a href="irc://irc.libera.chat/#monero-pools">Libera</a>.
   conminfee: Sólo puedes utilizar software de terceros para minar en un pool, lo que
     puede quitarte un pequeño porcentaje de tus valores de hash.

_i18n/fr.yml

@@ -1068,7 +1068,7 @@ mining:
     \ une pool ou miner avec un GPU, vous aurez besoin d'un logiciel dédié. Mineurs\
     \ supportant Monero :\n"
   supportp: Si vous avez des questions ou si vous voulez simplement vous confronter
-    à d'autres mineurs, venez discuter sur Monero Pools. Sur <a href="https://matrix.to/#/#monero-pools:monero.social">Matrix</a>
+    à d'autres mineurs, venez discuter sur Monero Pools. Sur <a href="https://matrix.to/#/%23monero-pools:monero.social">Matrix</a>
     and <a href="irc://irc.libera.chat/#monero-pools">Libera</a>.
   efficiency: Monero peut être miné à la fois par des CPU et des GPU, mais le premier
     est beaucoup plus efficace.

_i18n/ru.yml

@@ -1023,7 +1023,7 @@ mining:
   software_para: Обратите внимание, что некоторые майнеры имеют сборы для разработчика
     за ипользование их программного обеспечения.
   supportp: Если у вас есть вопросы или вы просто хотите поговорить с другими майнерами,
-    посетите чат Monero Pools. В <a href="#https://matrix.to/#/monero-pools:monero.social">Matrix</a>
+    посетите чат Monero Pools. В <a href="https://matrix.to/#/%23monero-pools:monero.social">Matrix</a>
     и <a href="irc://irc.libera.chat/#monero-pools">Libera</a>.
   softwarep: "Когда дело доходит до программного обеспечения для майнинга, существует\
     \ несколько вариантов. Как уже было сказано ранее, для соло майнинга можно использовать\

community/hangouts/index.md

@@ -28,6 +28,9 @@ meta_descr: hangouts.intro
             <li>
                 <a class="ext-noicon" href="https://telegram.me/monero" target="_blank" rel="noreferrer noopener" aria-label="Telegram logo"><div class="social-icon telegram"></div></a>
             </li>
+            <li>
+                <a class="ext-noicon" href="https://discord.gg/SyGUMWBqvF" target="_blank" rel="noreferrer noopener" aria-label="Discord logo"><div class="social-icon discord"></div></a>
+            </li>
         </ul>
     </section>
 </div>
@@ -52,7 +55,7 @@ meta_descr: hangouts.intro
                                     <p><a href="https://translate.getmonero.org/" class="btn-link btn-fixed">Weblate</a></p>
                                 </div>
                                 <div class="col">
-                                    <p><a href="https://matrix.to/#/#monerospace:monero.social" class="btn-link btn-fixed">Matrix</a></p>
+                                    <p><a href="https://matrix.to/#/%23monerospace:monero.social" class="btn-link btn-fixed">Matrix</a></p>
                                 </div>
                                 <div class="col">
                                     <p><a href="https://taiga.getmonero.org/" class="btn-link btn-fixed">Taiga</a></p>

community/sponsorships/index.md

@@ -75,7 +75,7 @@ meta_descr: meta_descr.sponsorships
                 <div class="info-block">
                     <h2>{% t sponsorships.pastsponsors %}</h2>
                     <ul>
-                        <li><a href="https://globee.com">Globee</a></li>
+                        <li>Globee</li>
                         <li><a href="https://www.navicat.com">Navicat</a></li>
                         <li><a href="https://www.forked.net">Forked</a></li>
                         <li><a href="https://www.kitware.com/">Kitware</a></li>