.github/PULL_REQUEST_TEMPLATE.md

-*This repository has moved, PLEASE do not open a pull request here!*
-
-You can, instead, open a pull request on the self-hosted GitLab instance at: https://repo.getmonero.org/monero-project/monero-site
-
-- [ ] I have read the above message
-- [ ] Despite reading the above I've ignored it
-- [ ] I understand that if I open a PR it'll just be closed
-- [ ] But I'm a total idiot
-- [ ] Because of the above I'm opening a pull request anyway

.gitlab-ci.yml

+image: ruby:2.5
+stages:
+  - build
+
+variables:
+  LANG: "C.UTF-8"
+
+before_script:
+  - gem install bundler
+
+build_site:
+  stage: build
+  only:
+    - master
+  script:
+    - bundle install
+    - bundle exec jekyll build 

.gitlab/issue_templates/Merchant.md

+#### What's the name of your business?
+
+<!-- Write here -->
+
+#### What's the URL of the website?
+
+<!-- Write here. Referral links and/or trackers are not accepted -->
+
+#### Write a brief description of your business/service (max 50 characters)
+
+<!-- Write here. This text will be displayed on the Merchant page. Keep it short -->
+
+#### Enter the URL where a Monero mention can be found
+
+<!-- Be aware of the fact that to be listed, you must specify somewhere on your website that you accept Monero. -->
+
+https://
+
+#### How do you accept Monero? *(choose only one option)*
+
+- [ ] Monero integrations *(github.com/monero-integrations)*
+- [ ] Globee
+- [ ] Native wallet
+- [ ] Other payment gateaway (Coinpayments, Morphtoken, etc. *Please specify*)
+
+#### How would you categorize your business? *(choose only one option)*
+
+- [ ] Exchange
+- [ ] Block Explorer
+- [ ] Payment Gateway
+- [ ] Library and Helper
+- [ ] Tool
+- [ ] Service
+- [ ] Goods
+- [ ] Entertainment
+
+#### Comment
+
+<!-- Write here any additional comment -->

Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.3)
     colorator (1.1.0)
-    ffi (1.9.18)
+    concurrent-ruby (1.1.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.11.3)
     forwardable-extended (2.6.0)
-    jekyll (3.5.2)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.8.6)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
     jekyll-multiple-languages-plugin (1.5.1)
       jekyll (>= 2.0, < 4.0)
     jekyll-paginate (1.1.0)
-    jekyll-sass-converter (1.5.0)
+    jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    kramdown (1.14.0)
-    liquid (4.0.0)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (1.17.0)
+    liquid (4.0.3)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    pathutil (0.14.0)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (1.11.1)
+    public_suffix (4.0.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.14.0)
     rubysl-rexml (2.0.4)
-    safe_yaml (1.0.4)
-    sass (3.5.1)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -57,4 +67,4 @@ DEPENDENCIES
   rubysl-rexml
 
 BUNDLED WITH
-   1.15.4
+   1.17.3

LICENSE

+Copyright (c) 2014-2020, The Monero Project
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

-# Repository moved to https://repo.getmonero.org/monero-project/monero-site
-
-This repository has recently been moved to https://repo.getmonero.org/monero-project/monero-site  
-Please submit your changes on the new repository.
-
-To contribute on https://repo.getmonero.org/ please proceed this way:
-
- * Create an account or login using OAuth2 with your GitHub account
- * Create a password
- * Fork the repository https://repo.getmonero.org/monero-project/monero-site
- * Push your branches to your newly forked repo, or contribute just like you did on GitHub.
-
-Thanks for your comprehension.
-
-# Monero Website Instructions
-
-Copyright (c) 2014-2018, The Monero Project
-
-## IMPORTANT MULTILANGUAGE UPDATE NOTICE
-The multilingual update has recently been rolled out. The website now requires more steps to update so everyone can have a smooth experience. Please read all instructions carefully and follow them all! If they are not all followed, this leads to a ton of work for the website maintainers. A warning will be issued to repeat offenders. If you need help/support, you can find it on `#monero-translations` and [Taiga](https://taiga.getmonero.org/project/erciccione-monero-localization/wiki/home)
-
 ## Table of Contents
 
-1.0 Introduction
-
-2.0 What you'll need
-
-3.0 General change recommendations
-
-4.0 How to make a blog post
-
-5.0 How to make a User Guide
-
-6.0 How to make a Moneropedia entry
-
-7.0 How to make a FFS Proposal
+- [Introduction](#introduction)
+- [What you'll need](#what-youll-need)
+- [General change recommendations](#general-change-recommendations)
+- [Translation](#translation)
+- [housekeeping](#housekeeping)
+- [How to make a blog post](#how-to-make-a-blog-post)
+- [Updates on User Guides](#updates-on-user-guides)
+- [How to make a blog post](#how-to-make-a-blog-post)
+- [How to make a User Guide](#how-to-make-a-user-guide)
+- [How to make a Moneropedia Entry](#how-to-make-a-moneropedia-entry)
+- [How to update the Team page](#how-to-update-the-team-page)
+- [How to update the Roadmap](#how-to-update-the-roadmap)
+- [How to add a new Merchant](#how-to-add-a-new-merchant)
+- [How to add a question to the FAQ](#how-to-add-a-question-to-the-faq)
+- [How to add a publication to the Library](#how-to-add-a-publication-to-the-library)
+
+## Introduction
+This README here to walk you through everything you need to know to make changes, edits, or even completely new pages for the new [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.
 
-8.0 How to update the Team page
+If you need support about something related to the website, plese join `#monero-site` [Freenode/IRC](irc://chat.freenode.net/#monero-site), [Matrix](https://matrix.to/#/!txpwSzQzkuUaVbtsIx:matrix.org) and MatterMost. For general info about Monero join `#monero`. We'll do whatever we can to help you.
 
-9.0 How to make an Event
+## What you'll need
 
-10.0 How to update the Roadmap
+* Jekyll: [getmonero.org](https://getmonero.org/) is made using a simple, static website generator called [Jekyll](https://jekyllrb.com/). You will need it installed on your system to test any changes that you made. Follow the instructions on the website to get up and going:
+  * Install Ruby dependencies as suggested [in the Jekyll documentation](https://jekyllrb.com/docs/installation/)
+  * Install Bundler: `gem install bundler`
+  * Install Jekyll with all dependencies (run from the project directory): `bundle`
 
-11.0 How to add a new Merchant
+* GitHub/GitLab: Pretty much everything in Monero is hosted on [GitHub](https://github.com/monero-project) or [getmonero GitLab](https://repo.getmonero.org/users/monero-project/projects) and uses Git as the primary version control system. If you're not familiar with how to use Git, you can check out [this tutorial](https://guides.github.com/activities/hello-world/) for a good overview. It will take you through pretty much everything you'll need to know to edit the website. If you haven't already, register on GitLab and fork the [Monero Website repository](https://repo.getmonero.org/monero-project/monero-site). Please note that GitLab accounts logged in using the "Log in with GitHub" option require manual intervention in order to be able to fork repositories. Either register your account using email/password or contact the Website Workgroup via GitLab or `#monero-site` to have your GitHub OAuth profile unlocked.
 
-12.0 How to add a question to the FAQ
+*Note: If you're confused, feel free to click other files in the same directory (folder) that you are in for the step that you are on to see some working examples. Compare them to the instructions and you should understand better.*
 
-13.0 How to add a publication to the Library
+Once you have the above list of things, it's typically a good idea to build the website from your local computer to make sure it works before you make any changes. To do this, complete the following steps:
 
-14.0 How to translate a page
+1. Navigate to your local `monero-site` repository.
+2. Serve the website: `bundle exec jekyll serve --baseurl ''`. If you want, you can speedup thi process by loading only the last blog post instead of all of them. Simply add `--limit_posts 1` to the command above. The resulting command will be `bundle exec jekyll serve --limit_posts 1 --baseurl ''`.
+3. Open a browser and go to [http://127.0.0.1:4000](http://127.0.0.1:4000).
+4. If all went well, you should see the Monero website and you're ready to make changes.
 
-15.0 How to add a new language
+## General change recommendations
+The average Monero user that will want to contribute to the website should probably start looking for issues labelled [⛑️ help needed](https://repo.getmonero.org/monero-project/monero-site/issues?label_name%5B%5D=%E2%9B%91%EF%B8%8F++help+needed) or making blog posts, user guides or Moneropedia entries; all of which are covered in this document. If this is all you want to do, don't worry, it's actually not a daunting task at all.
 
-16.0 License
+If you are a web developer and would like to make large macro-level changes, it would be best to open an issue first or to get in contact with the developers on `#monero-site` (IRC/Freenode, MatterMost, Matrix).
 
-## 1.0 Introduction
+This website is completely open-source however and anything and everything is available for changing should the community deem it necessary.
 
-This README here to walk you through everything you need to know to make changes, edits, or even completely new pages for the new [getmonero.org website](https://getmonero.org/). It'll definitely be a bit of a ride, so strap yourself in.
+Every section from here on out will talk about how to make a specific type of web page. It will start with a bullet point list of what to do for the advanced among you that just want a quick overview. For those who are still learning this list is followed by a detailed explanation, starting with example front matter. Any variable in the front matter written in all caps you are expected to change (make sure your changes are not all caps though). It will then lead you through the rest of the process until it's time to type your content.
 
-Feel free to skip down to a relevant section if you already know what you need. So to go to the 'How to make a User Guide' section use your find function and type '5.0'.
+A few random points of note:
 
-If for any reason you have questions or need to contact us, you can find us on the IRC channel #monero. We'll do whatever we can to help you.
+- After [a discussion](https://repo.getmonero.org/monero-project/monero-site/issues/982), the community decided to include only open source wallets in the 'Downloads' section of the website. Requests to add closed source wallets to that page will be rejected.
+- All external links must have `https://` in front of them or they will not redirect properly.
+- If you want to add a new page to the navigation, you should go to ALL LANGUAGES in the `_data/lang` folder and add the page.
+- It is strongly strongly STRONGLY encouraged that if you make a change, you - at the minimum - test it on your local machine before submitting a PR. Sometimes unexpected things may happen due to a change. If you change a page, check the whole page on multiple screen sizes and browsers to make sure there wasn't any collateral damage.
 
-## 2.0 What you'll need
+## Translation
+In this section you'll find the info you need to translate a page and add a new translation, but keep in mind that Monero has a [Localization Workgroup](https://github.com/monero-ecosystem/monero-translations) who coordinate and give support to translators-volunteers. For live support/request of infos, come chat on `#monero-translations` (Freenode/IRC, riot/matrix, MatterMost).
 
-* Jekyll: [getmonero.org](https://getmonero.org/) is made using a simple, static website generator called [Jekyll](https://jekyllrb.com/). You will need it installed on your system to test any changes that you made. If you're using Windows, you will want to check out [this site](http://jekyll-windows.juthilo.com/) for instructions on how to get Jekyll working on your system. If you're using a Linux-based system you can just follow the instructions on the website to get up and going:
-  * Install Ruby
-  * Install Bundler: `gem install bundler`
-  * Install Jekyll with all dependencies (run from the project directory): `bundle`
+The bulk of the website and the roadmap are translatable on Weblate, an easy to use localization platform that provide contributors with a user friendly interface: [translate.getmonero.org](https://translate.getmonero.org). Before translating, please read [the guide for translators](https://github.com/monero-ecosystem/monero-translations/blob/master/weblate.md), which contains all the info and workflows you need to know before starting.
 
-* GitHub: Pretty much everything in Monero is hosted on [GitHub](https://github.com) and uses Git as the primary version control system. If you're not familiar with how to use Git, you can check out [this tutorial](https://guides.github.com/activities/hello-world/) for a good overview. It will take you through pretty much everything you'll need to know to edit the website. If you haven't already, register for GitHub and fork the [Monero Website repository](https://github.com/monero-project/monero-site).
+We are trying to move most of the localization work on Weblate, but some parts of the website still need to be manually translated on the repository. The following instructions will tell you which files to translate and how to proceed.
 
-* Markdown experience: To write pages, you're going to need to know how to use Markdown. It's basically an in-between language that enables people who don't know HTML to just write, and it will be compiled into HTML for you. You can find a great Markdown cheat sheet with examples [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). IF you need more help, Google and YouTube are great resources.
+### 1. Quickstart
+* Navigate to the correct language in the /i18n folder and find the page you wish to translate
+* Do not translate any of the `*.yml` files in the /_18n folder
+* Click the file and translate the page, not touching any HTML or markdown
+* Remove `{% include untranslated.html %}` from the page
+* Test/Build
+* Submit PR
 
-*Note: If you're confused, feel free to click other files in the same directory (folder) that you are in for the step that you are on to see some working examples. Compare them to the instructions and you should understand better.*
+### 2. Navigate to correct file
+Go to the /i18n folder and find the two letter code for the language you wish to translate for. Enter that folder and find the file you wish to translate. The filenames are all in English and MUST NOT BE CHANGED.
 
-Once you have the above list of things, it's typically a good idea to build the website from your local computer to make sure it works before you make any changes. To do this, complete the following steps:
+### 3. Translate the file
+Here you can do your translation. Depending on the page, you may have to maneuver around some HTML or markdown. In general, anything between two tags (such as `<p>TRANSLATE THIS</p>`) should be fine. Testing is VERY important, so do NOT skip it. If during testing, the page appears different from the original English page (besides the translated text, of course), you did something wrong and may have to start again.
 
-1. Navigate to your local `monero-site` repository.
-2. Serve the website: `bundle exec jekyll serve`
-3. Open a browser and go to [http://127.0.0.1:4000](http://127.0.0.1:4000).
-4. If all went well, you should see the Monero website and you're ready to make changes.
+#### 3.1. Notes for Moneropedia Entries
+Moneropedia entries have two specificities:
 
-## 3.0 General change recommendations
+* The Front Matter:  
+Moneropedia Fron should be translated for both *entry:* and *summary:* elements. However, *terms:* should be extanded with their translation, leaving the English words **untouched**.
+This is really important for compatibility purposes. With this, if a new guide is added to the site, an English term on the untranslated version of the guide in another language could be linked to the moneropedia article (of the same language).
 
-The average Monero user that will want to contribute to the website should probably stick with making blog posts, user guides, Moneropedia entries, or a Forum Funding System proposal, all of which are covered in this document. If this is all you want to do, don't worry, it's actually not a daunting task at all. If you are not well versed in web development however, it is not recommended you try to do anything beyond that.
+* The old *untranslated* snippet must be removed, therefore the next section is irrelevant here.
 
-If you are a web developer and would like to make large macro-level changes, it would be best to get in contact with rehrar. The HTML/CSS framework is custom, though quite easy to use for a seasoned developer. Still, there are some pages that are more complicated than others and would require fair amounts of styling changes should the structure change significantly.
+Finally, your entry should go from:
+```
+---
+entry: "Entry name in English"
+terms: ["English", "terms"]
+summary: "English summary."
+---
 
-This website is completely open-source however and anything and everything is available for changing should the community deem it necessary.
+{% include untranslated.html %}
+```
+To:
+```
+---
+entry: "Translated entry name"
+terms: ["English", "terms", "translated", "terms"]
+summary: "Translated summary."
+---
+```
 
-Every section from here on out will talk about how to make a specific type of web page. It will start with a bullet point list of what to do for the advanced among you that just want a quick overview. For those who are still learning this list is followed by a detailed explanation, starting with example front matter. Any variable in the front matter written in all caps you are expected to change (make sure your changes are not all caps though). It will then lead you through the rest of the process until it's time to type your content.
+### 4. set the 'translated' snippet to true
+Somewhere on the page (usually the top) should be a snippet that says `{% include disclaimer.html translated="false" version=page.version %}`. Simply change this to `{% include disclaimer.html translated="true" version=page.version %}`. This will remove the orange bar from the bottom saying the page is untranslated.
 
-A few random points of note:
+## How to add a new language
+Adding a new language can be complicated. If you feel unsure about the steps necessary, contact the Website workgroup and somebody will add the new language for you.
 
-- All external links must have http:// or https:// in front of them or they will not redirect properly.
-- If you want to add a new page to the navigation, you should go to ALL LANGUAGES in the `_data/lang` folder including `template` and add the page.
-- It is strongly strongly STRONGLY encouraged that if you make a change, you - at the minimum - test it on your local machine before submitting a PR. Sometimes unexpected things may happen due to a change. If you change a page, check the whole page on multiple screen sizes and browsers to make sure there wasn't any collateral damage.
+### 1. \_config.yml file
+Navigate to the root folder of the whole website and find the file labeled `_config.yml`. Open it and find the line that says `languages:`. Add your two letter language code (Google it if you don't know it) in between the brackets after the others already present. You will need to put a comma after the previous last one.
 
-### 3.1 Housekeeping
+Example:
+```
+languages: ["en", "es", "NEW LANG HERE"]
+```
+Save and exit the file.
 
-#### Editing the Site
-When you make an edit to ANY page on the English language of this website, PLEASE copy your changes into the corresponding `/_i18n/template/` file as well.
+### 2. \_data folder
+Navigate to the `_data/lang` folder and copy the `en` folder. Paste it into the same folder and the copy renamed to the two letter language code of the language you will be translated to.
+**The 'en' folder itself should still be there. It should not be renamed. There should be a new folder in addition to the ones that were already there.**
 
-The Monero Translation workgroup will do their best to keep tabs on all changes of the site, but it'd be nice to notify them that you've changed a page so they can make sure the equivalent pages are changed accordingly in the other languages.
+Translate the content of the files. Do not touch anything labeled `url`.
 
-#### GitHub Issues
-We ask that if you open an issue on the site that you remain available for clarifying questions or corrections. We do our best to close issues that are resolved when we make changes to the site, but If your issue is resolved by a contributor and the issue is not closed we ask that you close it in a timely manner. A contributor (rehrar, SamsungGalaxyPlayer, or other community members, etc) may ask you to close an issue after it's confirmed fixed. Please review the changes to the site and close your issue if you can verify that it's fixed.
+### 3. \_i18n folder
+Navigate to the \_i18n folder and duplicate the en.yml file. Rename the duplicate to the two letter language code of your language with a `.yml`. Now duplicate the `en` folder and rename it with the correct language code.
+**The original folder and yml file themselves should still be there. They should not be renamed. There should be a new folder and yml file in addition to the ones that were already there.**
 
-#### Pull Requests
-Contributors should use [issue keywords](https://help.github.com/articles/closing-issues-using-keywords/) to make it easier for maintainers to close issues when they merge. Include close, closes, closed, fix, fixes, fixed, resolve, resolves, resolved, etc in the commit message or pull request description, so that the correct issue can be closed if your PR is merged. (Example: 'fixes #1234' could close Issue 1234 when merged.)
+### 4. Open an issue on the repo where the website is hosted
+After you've done all the above, you'll need to [open an issue on the repository](https://repo.getmonero.org/monero-project/monero-site/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=) asking to add the language you are working on to Weblate, where the core of the website is translated.
 
-Pull requests allow others to make comments or review your changes to the site. We ask that you remain available to comment or make changes to your PR. Pull requests with pending changes for more than 30 days will be closed and need to be resubmitted in the future. Sometimes someone else's changes might make your changes conflict with the current site. If that happens you may need to rebase your PR. (If you're unsure about how to do so, you can reach out to other contributors on IRC (freenode #monero) and someone should be able to walk you through it.
+## Housekeeping
 
-### 3.2 Updates on User Guides
+### GitLab Issues
+We ask that if you open an issue on the site that you remain available for clarifying questions or corrections. We do our best to close issues that are resolved when we make changes to the site, but If your issue is resolved by a contributor and the issue is not closed we ask that you close it in a timely manner. A contributor may ask you to close an issue after it's confirmed fixed. Please review the changes to the site and close your issue if you can verify that it's fixed.
 
+## Updates on User Guides
 User guides and developer guides may need regular updates, either to fix typos, to add explanations regarding new features, to update screenshots, and so on.
 As those guides are translated in several languages, it could be hard to keep all languages version up to date with the English version.
 To keep track of those changes, guides are versioned using a snippet at the top of each localized (\_i18n/en/resources/\*-guides) file:
@@ -147,19 +172,12 @@ And you will increment the version number in the following way:
 - Changes that add instructions or explanations (or screenshot updates with different field names and positions), without making the old version misleading for users: Increment the second number (Minor version number) and reset the third to 0. We want to let the user know the English version could be more accurate and helpful to read.
 - Changes that makes the old version false, or misleading to users: Increment the first number (Major version number) and reset the second and third to 1.0. We want to discourage users from reading this too outdated version that could lead them to do wrong things (for instance, buy the wrong algo of mining power on nicehash, after a pow change).
 
-## 4.0 How to make a blog post
+## How to make a blog post
 
-### 4.1 Quick Start
-* Make new .md file in \_posts (named whatever, no spaces)
-* Front Matter (below)
-* Write Blog Post
-* Test/Build
-* Submit PR
+### 1. Make a file
+Navigate to the \_posts folder of the website and make a new file. Be sure the file name has no spaces and the ending is .md. Take a look at the other posts to get an idea of how to name yours
 
-### 4.2 Make a file
-Navigate to the \_posts folder of the website and make a new file. Be sure the file name has no spaces and the ending is .md
-
-### 4.3 Front Matter
+### 2. Front Matter
 ```
 ---
 layout: post
@@ -170,21 +188,14 @@ author: YOUR NAME OR HANDLE HERE
 ---
 ```
 
-### 4.4 Write
+### 3. Write
 After the front matter is finished you are free to write the remainder of your blog post in markdown.
 
-### 4.5 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically and test that your page appears in the 'News' section of the website, as well as the sidebars.
-
-### 4.6 Submit Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
+## How to make a User Guide
 
-## 5.0 How to make a User Guide
-
-### 5.1 Quick Start
+### 1. Quick Start
 
 * Create file in /resources/user-guides with an .md ending and no spaces in filename.
-* File content as in 5.3
 * Create file in /\_i18n/en/resources/user-guides with the exact same filename as above ending in .md
 * Write User Guide
 * Add versioning snippet
@@ -194,10 +205,10 @@ You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure
 * Test/Build
 * Submit PR
 
-### 5.2 Make a file
+### 2. Make a file
 Navigate to the /resources/user-guides folder and make a new file. Be sure the file name has no spaces and the ending is .md
 
-### 5.3 Content of file
+### 3. Content of file
 ```
 ---
 layout: user-guide
@@ -214,10 +225,10 @@ mainVersion:
 
 Copy this exactly and merely change the files names where indicated.
 
-### 5.4 Create file in localization folders
+### 4. Create file in localization folders
 Navigate to the /i18n/ folder and choose the correct folder for your language. Navigate further into the `resources/user-guides` folders and make a .md file with the EXACT SAME filename as the you made before.
 
-### 5.5 Write
+### 5. Write
 Write your user guide. Be succinct but thorough. Remember, people will be using your guides when they need help. Make sure all the information is there. Feel free to use images or screenshots if necessary to help get your point across.
 
 The title should be at the top of the User Guide using a single `#` for an H1 tag. Titles will not be automatically put on these pages as with other pages. There should be NO front matter on this file.
@@ -229,13 +240,13 @@ Add the version snippet at the top of your guide (before your title):
 ```
 Your version should start at `1.1.0` as it is the first Major, first Minor, and no cosmetic changes have occurred.
 
-### 5.6 Copy User Guide file into all languages
-Copy your file and navigate to each language file in the /i18n folder. In each language folder (INCLUDING template) go to the resources/user-guides folder and paste your user guide (don't worry, you don't have to translate it) there. This is very important, and the site will not build if the file with the same name is not in each language folder.
+### 6. Copy User Guide file into all languages
+Copy your file and navigate to each language file in the /i18n folder. In each language folder go to the resources/user-guides folder and paste your user guide (don't worry, you don't have to translate it) there. This is very important, and the site will not build if the file with the same name is not in each language folder.
 
 As you paste into each folder, open up the file and edit the snippet at the top of the file (before your title) to mark it untranslated:
 `{% include disclaimer.html translated="false" version=page.version %}`. This does not need to be done in the original language that the User Guide was written in.
 
-### 5.7 Add Guide to the 'User Guide' landing page of EACH LANGUAGE
+### 7. Add Guide to the 'User Guide' landing page of EACH LANGUAGE
 In the /\_i18n/[ORIGINAL LANGUAGE OF USER GUIDE]/resources/user-guides folder, find the file labeled index.md and open it.
 
 DO NOT CHANGE ANYTHING IN THIS DOCUMENT BESIDES WHAT YOU ARE INSTRUCTED TO.
@@ -244,19 +255,13 @@ This file will look quite different because it's HTML. Don't panic. Simply Ctrl
 
 Once you've identified the non-indented area under the category you would like your User Guide to be under, you can use markdown to insert your link with the others in alphabetic order. `[TITLE OF USER GUIDE]({{site.baseurl}}/LINK-TO-USER-GUIDE.html)`. Please note that the file name in between the parentheses must be EXACTLY the same name as the permalink you made in step 5.3, but with a `.html` at the end instead of `.md` and the snippet `{{site.baseurl}}/` before the link.
 
-In the event that you think your User Guide should be in a new Category that doesn't exist yet, contact rehrar to make one for you.
-
-Repeat the above process for each language version of this index page INCLUDING THE template.
+In the event that you think your User Guide should be in a new Category that doesn't exist yet, contact the Website workgroup.
 
-### 5.8 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically and test that your link appears in the correct category and that it leads to your User Guide when clicked. Test your User Guide in the browser and contact rehrar if there are any bugs.
+Repeat the above process for each language version of this index page.
 
-### 5.9 Submit Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
+## How to make a Moneropedia Entry
 
-## 6.0 How to make a Moneropedia Entry
-
-### 6.1 Make a Global file
+### 1. Make a Global file
 Navigate to the /resources/moneropedia folder and make a new file. Be sure the file name has no spaces and the ending is .md
 Fil this file with this exact content:
 ```
@@ -271,7 +276,7 @@ layout: moneropedia
 
 ```
 
-### 6.2 Make the localized File
+### 2. Make the localized File
 Navigate to the /\_i18n/en/resources/moneropedia folder and make a new file. give it the same <name>.md than in previous step.
 Start the file with the front Matter:
 ```
@@ -286,10 +291,10 @@ There are two things to highlight:
 The `terms:` section of the front matter can be filled with as many terms as you would like. This is how other Moneropedia entries will link to this page. You can link to other Moneropedia entries as well in your page by putting an ampersand before the term used, i.e. `@THE-TERM-USED`. This will make an automatic link in the Moneropedia entry to the referred term, replace the @term with the word used in that terms `entry:` area of the front matter, and on hover it will show the summary. How cool is that?  
 The lines must not contain trailing whitespace, and it must be no blank lines added, otherwise the site with not build correctly.
 
-### 6.3 Write
+### 3. Write
 Write your Moneropedia entry. Remember that you can link to other Moneropedia entries using `@term-used-in-entry` as described above. Just go to the .md file of the Moneropedia entry you want to link to and use any of the terms in the `terms:` field of the front matter. Be sure to write whichever one you choose EXACTLY as shown and preceded by an ampersand.
 
-### 6.4 Copy to other languages
+### 4. Copy to other languages
 Copy the file from the /\_i18n/en/resources/moneropedia folder to the other /\_i18n/<language>/resources/moneropedia folders and add the untranslated snippet at the same time just after the front matter, so it looks like:
 ```
 ---
@@ -301,91 +306,11 @@ summary: "PUT SUMMARY OF YOUR ENTRY HERE IN QUOTES"
 {% include untranslated.html %}
 ```
 
-If you want to translate in your native language, go to the 14.3.2 section below to read about specificities.
-
-### 6.5 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically and test check the link to your entry is appearing on the alphabetical list of Moneropedia entries and that it leads to your entry when clicked. Test your Moneropedia entry in the browser and contact rehrar if there are any bugs.
-
-### 6.6 Submit Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
-
-## 7.0 How to make a FFS Proposal
-
-Before starting this section, it is recommended that you read the User Guide for [How the Forum Funding System works](#) as well as the [Forum Funding System Terms and Guidelines](#). If you do not read these expect your FFS proposal to be laughed at, not to mention not funded.
-
-### 7.1 Quick Start
-
-* Read [How the Forum Funding System works](#) and the [Forum Funding System Terms and Guidelines](#).
-* Make the .md file in the /forum-funding-system/proposals folder. Remember the name.
-* Choose your front matter layout based on whether your proposal is an Idea (`ffs-ideas`) or Open Task (`ffs-ot`) as specified in the above reading
-* Fill out the rest of the Front Matter below, leaving the `address` and `paymentid` sections empty
-* Edit the ffs.yml file. I strongly recommend you read this section.
-* Write the proposal
-* Test/Build
-* Submit PR
-
-### 7.2 Make the proposal
-
-Navigate to the /forum-funding-system/proposals folder and make a new file. Be sure the file name has no spaces and the ending is .md. It is very important that you remember the EXACT name of this file.
-
-### 7.3 Front Matter
-
-```
----
-layout: ffs-ideas OR ffs-ot
-title: NAME OF YOUR PROPOSAL
-summary: A BRIEF SUMMARY OF YOUR PROPOSAL
-author: YOUR NAME OR HANDLE
-address:
-paymentid:
----
-```
-
-The layout will depend on if you are simply presenting an idea that you do not plan to do yourself or if you are presenting an idea that you are capable and willing to do, the chosen layout will be `ffs-ideas` or `ffs-ot` respectively. You can get more information in the [How the Forum Funding System works](#) User Guide. Fill out the next three sections as normal (title, summary, author), but leave the last two (address, paymentid) blank. Again, DO NOT PUT ANYTHING HERE.
-
-### 7.4 Editing the .yml file
-
-Navigate to the /\_data folder and open the file titled `ffs.yml`. In this file you will find a long list of FFS proposals.
-
-**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
-
-Identify the section you will be placing your proposal in. If you used `ffs-ideas` in the layout variable in the front matter then you will be putting your proposal in `stage: ideas`, and if you used `ffs-ot` in the layout, then you will be putting your proposal in the `stage: Open Tasks`. Copy the following code:
-
-```
-- name:
-  url: /forum-funding-system/proposals/
-  summary:
-  author:
-```
-
-and paste it as the very top underneath the `proposals:`.
-
-**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail. If in doubt, put the line with the hyphen (-name) all the way to the left and press space four time, and then put the remainder of the variables all the way to the left and press space six times.**
-
-Fill in the information.
-* `name:` should be the same as the title chosen in 7.3  
-* for `url:` you should append the EXACT name of the file as chosen in 7.2 to the current string but with `.html` at the end instead of `.md`. So it should look like `/forum-funding-system/proposals/YOUR-FILE-NAME.html`
-* `summary:` should be the same summary copy and pasted from the front matter in 7.3
-* `author:` should be your name or handle, again the same as the front matter in 7.3
-
-Sorry for the repetition here, but it's how Jekyll is working to put things correctly.
-
-### 7.5 Write the proposal
-Go ahead and write your proposal now. Go back to your .md file in `/forum-funding-system/proposals`. Be sure to follow the [Forum Funding System Terms and Guidelines](#). Let me be the first to thank you for wanting to contribute your time and energy to better Monero.
-
-### 7.6 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `ffs.yml` file back in 7.4. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
-
-If the build is successful, go to the Forum Funding System section of the website and make sure that your proposal is showing up in the correct areas, and that when the linked is clicked it takes you to the correct page with your proposal. Use this time to read everything for accuracy and make any changes. If not, you will have to do multiple PRs to make edits and updates. It is this way by design so we can keep track of edits made by authors.
-
-### 7.7 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
-
-## 8.0 How to update the Team page
+## How to update the Team page
 
 If you are acting on behalf of another individual, please make sure you get their permission first before adding them onto the Team page.
 
-### 8.1 Change the .yml file
+### 1. Change the .yml file
 Navigate to the `/_data/` folder and open `team.yml`. You will notice a long list separated by main `-area:` tags.
 
 **DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
@@ -395,96 +320,46 @@ Find the area that you want to update and copy the code below:
 - name:
   url:
 ```
-Put the name or handle of the person in the `name` section and in the  `url:` section put the link to their GitHub URL (it must have https:// at the beginning). If they have no GitHub, then you may leave it blank, it won't mess anything up.
+Put the name or handle of the person in the `name` section and in the  `url:` section put the link to their GitHub or GitLab URL (it must have https:// at the beginning). If they have no GitHub, then you may leave it blank, it won't mess anything up.
 
 **Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
 
 Save the file.
 
-### 8.2 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `team.yml` file back in 8.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
-
-If the build is successful, go to the Team page `/community/team/` and check to see that the contributor is showing up in the correct place. Click their GitHub link (if applicable) and make sure it redirects correctly. Test the page and let rehrar know if there are any bugs.
-
-### 8.3 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
-
-## 9.0 How to make an Event
+## How to update the Roadmap
 
-### 9.1 Edit the .yml file
-Navigate to the `/_data/` folder and open `events.yml`. You will notice a  list separated by hyphenated `-event` tags.
+### 1. Edit the .yml file
+Navigate to the `/_data/` folder and open `lang/en/roadmap.yml`. You will notice this structure:
 
-**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
-
-Find the area that you want to update and copy the code below:
 ```
-- event:
-  where:
-  when:
-  description:
-  link:
+year_2014:
+- month:
+  STATUS:
+    - name:
 ```
-and paste it IN THE CHRONOLOGICAL ORDER that it will be in. So if there is an event happening before yours, make sure it is higher up than yours. If there is an event happening AFTER yours, make sure it is after your event.
-
-Fill in the data as follows:
-* `event:` The name of the event goes here as well as the date. The recommended format is: `Event Name - January 1st, 2000`
-* `where:` Where the event will take place. Venue name and address are recommended.
-* `when:` Date and time
-* `description:` Description of the happenings of your event
-* `link:` The website of your event (if applicable, this can be left blank and everything will be ok). This link must have http:// at the beginning if it is an external link.
-
-**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
+Where STATUS can be either `completed`, `ongoing` or `upcoming`.
 
-Save the file.
+Look for the year and month related to the entry you want to add, if the month and status are already present, simply add `- name: NAME OF YOUR ENTRY` in the correct position.
 
-### 9.2 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `events.yml` file back in 9.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
+For example, there was a new release on March 2020 and you would like to add it to the roadmap as "completed":
 
-If the build is successful, go to the Events page `/community/events/` and check to see that the event is showing up in the correct place. Click their Event url link (if applicable) and make sure it redirects correctly. Test the page and let rehrar know if there are any bugs.
+- Scroll the `roadmap.yml` file until you arrive to `year_2020`
+- The milestone happened in March so you need to look for that month (`- month: March`)
+- Since the milestione has been already achieved, look for the `completed:` status.
+- Under it add `-name: NAME OF YOUR ACHIEVED MULESTONE`. Which in our case would be `-name: release wallet WHATEVER`
 
-### 9.3 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
-
-## 10.0 How to update the Roadmap
-
-### 10.1 Edit the .yml file
-Navigate to the `/_data/` folder and open `roadmap.yml`. You will notice a list separated by hyphenated `-year` tags.
-
-**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
-
-Find the year that you want to update and copy the code below:
-```
-- name:
-  date:
-  status:
-```
-and paste it in the correct year's `accomplishments:` section IN THE CHRONOLOGICAL ORDER that it will be in. So if there is a accomplishment that happened/is happening before the one you are inputting, make sure it is higher up than yours. If there is an accomplishment that happened/is happening AFTER yours, make sure it is after yours. If you don't have exact dates, just do your best to estimate.
-
-Fill in the data as follows:
-* `name:` The name of the accomplishment. Try to keep it short, a sentence or two at most.
-* `date:` When the accomplishment happened (past) or when it is expected to happen (future)
-* `status:` If the task is done, put `completed`, if the task is currently in the works put `ongoing`, and if work on the task has not yet started to your knowledge, but is expected to, put `upcoming`.
+If a year, month or status is missing, simpluy adding by following the structure you see in the page.
 
 **Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
 
-Save the file.
-
-### 10.2 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `roadmap.yml` file back in 10.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
-
-If the build is successful, go to the Events page `/resources/roadmap/` and check to see that the newly added accomplishment is showing up in the correct place in the correct year. Test the page and let rehrar know if there are any bugs.
-
-### 10.3 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
+The translation of the roadmap happens [on Weblate](https://translate.getmonero.org/projects/getmonero/roadmap/).
 
-## 11.0 How to add a new Merchant
+## How to add a new Merchant
 
-### 11.1 Edit the .yml file
+### 1. Edit the .yml file
 Navigate to the `/_data/` folder and open `merchants.yml`. You will notice a list separated by hyphenated `-category` tags.
 
-**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
-
-Find the category that best describes your business/service and copy the code below:
+Find the category that best describes your business/service and copy the code below, making sure you are keeping the alphabetic order consistent:
 ```
 - name:
   url:
@@ -499,69 +374,21 @@ Fill in the data as follows:
 
 Save the file.
 
-### 11.2 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `merchants.yml` file back in 10.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
-
-If the build is successful, go to the Merchants page `/community/merchants/` and check to see that the business is showing up in the correct category and that the link is redirecting correctly. Test the page and let rehrar know if there are any bugs.
-
-### 11.3 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
-
-## 12.0 How to add a question to the FAQ
-
-### 12.1 Copy/Paste Code
-Navigate to the `/get-started/faq` folder and open the `index.md` file. Inside you will see HTML code, but you will see it is very repetitive.
-
-Copy the code below:
-```
-<div class="tab">
-    <input id="tab-CHANGETHIS" type="checkbox" name="tabs" class="accordian">
-    <label for="tab-CHANGETHIS" class="accordian">CHANGE QUESTION</label>
-
-<div class="tab-content" markdown="1">
-
-CHANGE ANSWER
-
-</div>
-
-</div>
-```
-And paste it at the very bottom of the file (literally underneath everything else).
-
-Now we're going to change just a couple of things. Find the section with:
-```
-<input id="tab-CHANGETHIS" type="checkbox" name="tabs" class="accordian">
-<label for="tab-CHANGETHIS" class="accordian">CHANGE QUESTION</label>
-```
-
-and change the sections in between the quotes that say 'CHANGETHIS'. Leave the first part `tab-` alone. You can change it to anything really, as long as they are identical in the input and label, but it's good to see what number is on the last FAQ question (i.e. `tab-nine`) and make it the next number.
-
-Now inside the label tag you're going to find where it says 'CHANGE QUESTION' and change it to the Question you want answered.
-
-Lastly, find the words 'CHANGE ANSWER' and change it to the answer of your question.
-
-**DO NOT MESS WITH THE INDENTATION HERE. The div that has `markdown=1` MUST be flush with the left side, the answer to the question must start flush with the left side, and the `</div>` MUST be flush with the left side.**
-
-### 12.2 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically. If the build is successful, go to the FAQ page `/get-started/faq/` and check to see that your question is showing up and, when clicked, the answer drops down. If not, check to make sure that the `id="tab-CHANGETHIS"` in the input and the `for="CHANGETHIS"` in the label are identical to each other. Test the page and let rehrar know if there are any bugs.
-
-### 12.3 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
+## How to add a question to the FAQ
+The structure of the FAQ is a bit more complex than it used to be and contains anchors, variables and a TOC. A step by step guide would be too complex to follow. A basic knowledge of HTML is necessary to edit the page. If you wish to add a new FAQ please open an issue in the repository or/and contact the Website workgroup.
 
-## 13.0 How to add a publication to the Library
+## How to add a publication to the Library
 
-### 13.1 Add your file
+### 1. Add your file
 Navigate to the `/library/` folder and drop your publication file here.
 
 Please remind to minimize the size of your publication. For PDF, you'll find a large amount of service to compress your file with a minimal loss in quality.
 
-### 13.2 Edit the .yml files
+### 2. Edit the .yml files
 Navigate to the `/_i18n/` folder and open `en.yml`.
 
 Go down until you find the `library` section. You will notice a list separated by hyphenated `-category` tags in a `books:` section.
 
-**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
-
 Find the category that best corresponds your publication and copy the code below:
 ```
 - name: "<name>"
@@ -581,118 +408,4 @@ Fill in the placeholders as follows:
 
 **Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
 
-Save the file.
-
-open other `*.yml` files and copy the same code to it, in the exact same place.
-
-### 13.3 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in a `*.yml` file back in 13.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
-
-If the build is successful, go to the Library page `/library/` and check to see that the publication is showing up in the correct category and that the link is downloading correctly. Test the page and let rehrar know if there are any bugs.
-
-### 13.4 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
-
-## 14.0 How to translate a page
-In this section you'll find the info you need to translate a page and add a new translation, but keep in mind that Monero has a [Localization Workgroup](https://taiga.getmonero.org/project/erciccione-monero-localization/) who coordinate and give support to translators-volunteers. You can find an updated guide and an example of the workflow we use on our [Guide on Taiga](https://taiga.getmonero.org/project/erciccione-monero-localization/wiki/translating-monero-website) (frequently updated), also, for live support/request of infos, come chat on `#monero-translations` (Freenode/IRC, riot/matrix, MatterMost).
-
-### 14.1 Quickstart
-* Navigate to the correct language in the /i18n folder and find the page you wish to translate
-* Click the file and translate the page, not touching any HTML or markdown.
-* Remove `{% include untranslated.html %}` from the page
-* Test/Build
-* Submit PR
-
-### 14.2 Naviate to correct file
-Go to the /i18n folder and find the two letter code for the language you wish to translate for. Enter that folder and find the file you wish to translate. The filenames are all in English and MUST NOT BE CHANGED.
-
-### 14.3 Translate the file
-Here you can do your translation. Depending on the page, you may have to maneuver around some HTML or markdown. In general, anything between two tags (such as `<p>TRANSLATE THIS</p>`) should be fine. Testing is VERY important, so do NOT skip step 13.4. If during testing, the page appears different from the original English page (besides the translated text of course), you did something wrong and may have to start again.
-
-#### 14.3.2 Notes for Moneropedia Entries
-Moneropedia entries have two specificities:
-
-* The Front Matter:  
-Moneropedia Fron should be translated for both *entry:* and *summary:* elements. However, *terms:* should be extanded with their translation, leaving the English words **untouched**.
-This is really important for compatibility purposes. With this, if a new guide is added to the site, an English term on the untranslated version of the guide in another language could be linked to the moneropedia article (of the same language).
-
-* The old *untranslated* snippet must be removed, therefore the next section 14.4 is irrelevant here.
-
-Finally, your entry should go from:
-```
----
-entry: "Entry name in English"
-terms: ["English", "terms"]
-summary: "English summary."
----
-
-{% include untranslated.html %}
-```
-To:
-```
----
-entry: "Translated entry name"
-terms: ["English", "terms", "translated", "terms"]
-summary: "Translated summary."
----
-```
-
-### 14.4 set the 'translated' snippet to true
-Somewhere on the page (usually the top) should be a snippet that says `{% include disclaimer.html translated="false" version=page.version %}`. Simply change this to `{% include disclaimer.html translated="true" version=page.version %}`. This will remove the orange bar from the bottom saying the page is untranslated.
-
-### 14.5 Build/Test
-Build your website using `jekyll serve` if it's not rebuilding automatically.
-
-If the build is successful, go to the correct page in the correct language and check to see that everything is translated, and that the page looks identical to the original English page (besides the translated text). Test the page and let rehrar know if there are any bugs.
-
-### 14.6 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
-
-## 15.0 How to add a new language
-Whoo boy, this is the big one. Please follow all directions exactly.
-
-### 15.1 \_config.yml file
-Navigate to the root folder of the whole website and find the file labeled `_config.yml`. Open it and find the line that says `languages:`. Add your two letter language code (Google it if you don't know it) in between the brackets after the others already present. You will need to put a comma after the previous last one.
-
-Example:
-```
-languages: ["en", "es", "NEW LANG HERE"]
-```
-Save and exit the file.
-
-### 15.2 \_data folder
-Navigate to the `_data/lang` folder and copy the `template` folder. Paste it into the same folder and the copy renamed to the two letter language code of the language you will be translated to.
-**The template folder itself should still be there. It should not be renamed. There should be a new folder in addition to the ones that were already there.**
-
-Translate the content of the files. Do not touch anything labeled `url`, and in the roadmap.yml ONLY translate the `name:` content.
-
-### 15.3 \_i18n folder
-Navigate to the \_i18n folder and duplicate the en.yml file. Rename the duplicate to the two letter language code of your language with a `.yml` at the end and change all sections marked 'translated: "yes"' to 'translated: "no"'. Change back to 'yes' once you have translated that section. Now duplicate the `en` folder and rename it with the correct language code.
-**The original folder and yml file themselves should still be there. They should not be renamed. There should be a new folder and yml file in addition to the ones that were already there.**
-
-Enter the .yml file and translate everything there.
-
-### 15.3 Translate
-If you will be translating the content, please refer to section 13.0 in this README for instructions on translating pages.
-
-### 15.4 Build/Test
-Build your website using `jekyll serve`. If the build is successful, navigate to any page on the site and check to make sure that your language is appearing in the dropdown for languages on both mobile and desktop.
-
-### 15.5 Submit a Pull Request
-You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
-
-## 16.0 Website License
-
-Copyright (c) 2014-2017, The Monero Project
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Save the file.
\ No newline at end of file

_config.yml

@@ -13,7 +13,7 @@ kramdown:
     smart_quotes: ["apos", "apos", "quot", "quot"]
     input: GFM
 
-exclude: ["README.md"]
+exclude: ["README.md", "CONTRIBUTING.md", "LICENSE"]
 
 # paginate
 paginate: 10
@@ -24,9 +24,10 @@ plugins:
   - jekyll-multiple-languages-plugin
 
 # jekyll-multiple-languages-plugin settings:
-languages: ["en", "es", "it", "pl", "fr", "ar"]
+languages: ["en", "es", "it", "pl", "fr", "ar", "ru", "de", "nl", "pt-br", "tr", "zh-cn", "zh-tw"]
 
-exclude_from_localizations: ["img", "css", "fonts", "media", "404", "feed.xml", "404", "meta", "forum-funding-system", "_posts", "legal"]
+
+exclude_from_localizations: ["img", "css", "fonts", "media", "404", "feed.xml", "404", "meta", "forum-funding-system", "_posts", "legal", "blog"]
 
 
 

_data/downloads.yml

-- platform: Windows, 64-bit
-  id: windows
-  icon: icon-windows
-  cli_url: win64
-  cli_hash: d809acd1ed688a4567716cf199c75b51e696a022e6953df3642a8922a48a734a
-  gui_url: win64
-  gui_hash: ff1b1467dc6252462e5e7818485857ad2ee253712670ff7f5716aa57241577c7
-  cli_version: 0.13.0.4
-  gui_version: 0.13.0.4
-  tag: Beryllium Bullet
-  blockchain: win
+gui:
+- version: "0.15.0.4 - Carbon Chamaeleon"
+  downloads:
+   - platform: Windows 64-bit (Installer)
+     hash: 874ebbfcf79d09c60e2d85d09e5b8b971066c6355dfc2a5eca6d109d32e45ddb
+     link: https://downloads.getmonero.org/gui/win64install
+     icon: icon-windows
+     vers: 
+   - platform: Windows 64-bit (Zip)
+     hash: 9b61fa807c66ebe3010869d1fa926fe033a2c82e6e660ca8acb75a8fba0248a0
+     link: https://downloads.getmonero.org/gui/win64
+     icon: icon-windows
+     vers: 
+   - platform: Mac OS X 64-bit
+     hash: 9b0164cd90345c5fd4014a6bc8258465c2e5aae7c527c7f64a2d795830db7ae4
+     link: https://downloads.getmonero.org/gui/mac64
+     icon: icon-apple
+     vers: 
+   - platform: Linux 64-bit
+     hash: 2d105c792b46ec03739d39aaa6db3801f268e074814ab26e3824435f954c6a1c
+     link: https://downloads.getmonero.org/gui/linux64
+     icon: icon-linux
+     vers: 
+   - platform: Source Code
+     link: https://github.com/monero-project/monero-gui
+     icon: icon-github
+     
 
-- platform: Windows, 32-bit
-  icon: icon-windows
-  cli_url: win32
-  cli_hash: f2034f3dc125097c3ae50dff5b0a46798863fab60da8e4f35e4cb8d7d2202741
-  gui_url: win32
-  gui_hash: 50feee5c42c7342140a7e5c95a88d330262bebf3b844817ed49e4be86787795b
-  cli_version: 0.13.0.4
-  gui_version: 0.13.0.4
-  tag: Beryllium Bullet
-  blockchain: win
-
-- platform: Mac OS X, 64-bit
-  id: mac
-  icon: icon-apple
-  cli_url: mac64
-  cli_hash: dd859659bf46a11f4bb2de5bddca7c19038758024e32eb7979bc6bf29ef72e56
-  gui_url: mac64
-  gui_hash: c425f1b984cf00ffd1a9f1322e5da876aa07c106e975ca9fe08ee0a2d2956335
-  cli_version: 0.13.0.4
-  gui_version: 0.13.0.4
-  tag: Beryllium Bullet
-  blockchain: mac
-
-- platform: Linux, 64-bit
-  id: linux
-  icon: icon-linux
-  cli_url: linux64
-  cli_hash: 693e1a0210201f65138ace679d1ab1928aca06bb6e679c20d8b4d2d8717e50d6
-  gui_url: linux64
-  gui_hash: 284d61981204246425a520087723edb65155c89b9cb807750dca8c8687156679
-  cli_version: 0.13.0.4
-  gui_version: 0.13.0.4
-  tag: Beryllium Bullet
-  blockchain: linux
-
-- platform: Linux, 32-bit
-  icon: icon-linux
-  cli_url: linux32
-  cli_hash: 3f02b0de407f944e524afc9d53d7e9ce92bf17ac6e6ef92cd3c22346afc2cb6c
-  gui_url: linux32
-  gui_hash: 53750002c3f630457a397ef097929eb3eaa204ac393ff65ef1a05916872eb788
-  cli_version: 0.13.0.4
-  gui_version: 0.13.0.4
-  tag: Beryllium Bullet
-  blockchain: linux
-
-- platform: FreeBSD, 64-bit
-  id: bsd
-  icon: icon-freebsd
-  cli_url: freebsd64
-  cli_hash: 95bbf57dcae4810077012835a8d369cf3ecac6e1be7b484d0d518c09868a0377
-  version: 0.13.0.4
-  tag: Beryllium Bullet
-  blockchain: freebsd
-
-- platform: ARMv7
-  id: arm
-  icon: icon-arm
-  cli_url: linuxarm7
-  cli_hash: 65e2ce5d0abf80ed3b4ecef5babc37445dc4f032457811aafa8a221af78f554a
-  version: 0.13.0.4
-  tag: Beryllium Bullet
-  blockchain: arm
-
-- platform: ARMv8
-  id: arm
-  icon: icon-arm
-  cli_url: linuxarm8
-  cli_hash: 7158380839f41ef7b25f303d5c01cab0deeec96c26fde5bf4aaac6798d114bb9
-  version: 0.13.0.4
-  tag: Beryllium Bullet
-  blockchain: arm
-
-- platform: Source Code & Blockchain
-  id: source
-  icon: icon-github
-  cli_url: https://github.com/monero-project/monero
-  cli_hash: source
-  version: Bleeding edge (possibly unstable)
-  
-- platform: Mobile & Light Wallets
-  id: mobilelight
-  
-- platform: Hardware Wallets
-  id: hardware
+cli:
+- version: "0.15.0.5 - Carbon Chamaeleon"
+  downloads:
+   - platform: Windows 64-bit
+     hash: 0286e21552d3fedfedbc7c7aba2f34c370ad4c21007a75fb67ac87994c5cec5a
+     link: https://downloads.getmonero.org/cli/win64
+     icon: icon-windows
+     vers: 
+   - platform: Windows 32-bit
+     hash: bdcc5af964b6271bbf05609edfc49093b690f15031b748dfb43ffe991ae9cc6e
+     link: https://downloads.getmonero.org/cli/win32
+     icon: icon-windows
+     vers:
+   - platform: Mac OS X 64-bit
+     hash: 8ef04398350b8de68e21da236801f276cf662641e03dc067f6e865180f9853f6
+     link: https://downloads.getmonero.org/cli/mac64
+     icon: icon-apple
+     vers:
+   - platform: Linux 64-bit
+     hash: 6cae57cdfc89d85c612980c6a71a0483bbfc1b0f56bbb30e87e933e7ba6fc7e7
+     link: https://downloads.getmonero.org/cli/linux64
+     icon: icon-linux
+     vers: 
+   - platform: Linux 32-bit
+     hash: fd2c32fc3efa47b2feda6526b0a2df4e1acc7325ec205a25d7947fbc843b24df
+     link: https://downloads.getmonero.org/cli/linux6432
+     icon: icon-linux
+     vers:
+   - platform: Linux ARMv8
+     hash: 04e73cf72f37f0bbdfa757c9bb5df2117aee473632a917041077da3c05169743
+     link: https://downloads.getmonero.org/cli/linuxarm8
+     icon: icon-linux
+     vers:
+   - platform: Linux ARMv7
+     hash: a23402ccf5ac432306fe263fae660646206ecb9d2aec3cfacb25afce34794067
+     link: https://downloads.getmonero.org/cli/linuxarm7
+     icon: icon-linux
+     vers:
+   - platform: Android ARMv8
+     hash: ceccc11723c4dff3cef420b37bc795850b74a8e71d23d44aa26faf5cd8fcc0e6
+     link: https://downloads.getmonero.org/cli/monero-android-armv8-v0.15.0.0.tar.bz2
+     icon: icon-android
+     vers:
+   - platform: Android ARMv7
+     hash: 52e46ead674275ed446e261795b2cde19e65f7098ce62902bfa275e67f9f10f7
+     link: https://downloads.getmonero.org/cli/monero-android-armv7-v0.15.0.0.tar.bz2
+     icon: icon-android
+     vers:
+   - platform: FreeBSD 64-bit
+     hash: b0ea91c4d0f68d8d85ba15ed537bdd81589fa796f88d96aec451543f87b9fdb7
+     link: https://downloads.getmonero.org/cli/freebsd64
+     icon: icon-freebsd
+     vers:

_data/ffs.yml

-- stage: Ideas
-  proposals:
-    - name: Fake. Nothing here yet. Check WiP and Completed Proposals.
-      url: #
-      summary: This is for the best ideas ever!
-      author: rehrar
-      
-- stage: Open Tasks
-  proposals:
-    - name: Fake. Nothing here yet. Check WiP and Completed Proposals.
-      url: #
-      summary: This is for the best ideas ever!
-      author: rehrar
-    - name: QR Codes for Funding Required
-      url: /forum-funding-system/proposals/qr-code-for-fr.html
-      summary: The title says it all!
-      author: m2049r
-      
-- stage: Funding Required
-  proposals:
-    - name: Monero Bounty For HackerOne
-      url: /forum-funding-system/proposals/monero-bounty-hackerone.html
-      summary: we need dedicated funds to satisfy bounty for Monero and all Monero sub-projects on hackerone.com/monero
-      author: anonimal
-      
-- stage: Work in Progress
-  proposals:
-    
-- stage: Completed Proposals
-  proposals:
-    - name: Documentation and cleanup of source code 
-      url: /forum-funding-system/proposals/documentation-cleanup.html
-      summary: Clean up and properly document (doxygen) the monero source code
-      author: tewinget
-    - name: What is Monero? is produced and open-sourced
-      url: /forum-funding-system/proposals/whatismonero-produced.html
-      summary: Make an introduction video to Monero.
-      author: savandra
-    - name: Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples
-      url: /forum-funding-system/proposals/improve-devguides-simplewallet.html
-      summary: Add examples to Developer Guides
-      author: bigredmachine
-    - name: A continuation for all purpose programming of what needs to get done in monero
-      url: /forum-funding-system/proposals/mooo-continuation-programming.html
-      summary: moneromooo continue coding for Monero
-      author: moneromooo
-    - name: Create End-User Kovri documentation
-      url: /forum-funding-system/proposals/kovri-end-user-docs.html
-      summary: The idea is to create user-friendly non-technical Kovri documentation.
-      author: anonimal
-    - name: fluffypony's Conference Circuit Jan 2017 Edition
-      url: /forum-funding-system/proposals/fp-conference-2017.html
-      summary: Cover fluffypony's expenses for January Monero speaking
-      author: fluffypony
-    - name: The official Qt GUI Project
-      url: /forum-funding-system/proposals/official-qt-gui.html
-      summary: Funding for the creation of the GUI
-      author: othe
-    - name: Justin's Local Meetup Talks Proposal 1
-      url: /forum-funding-system/proposals/justin-local-meetups-1.html
-      summary: Cover sgp's travel expenses for Monero speaking
-      author: samsunggalaxyplayer
-    - name: Justin's Local Meetup Talks Proposal 2
-      url: /forum-funding-system/proposals/justin-local-meetups-2.html
-      summary: Cover sgp's other travel expenses for Monero speaking
-      author: samsunggalaxyplayer
-    - name: More mooo coding goodness
-      url: /forum-funding-system/proposals/more-mooo-coding-goodness.html
-      summary: Moneromooo coding October 2016
-      author: moneromooo
-    - name: Funding for a Monero subforum on the largest chinese BTC forum 8BTC
-      url: /forum-funding-system/proposals/monero-subforum-8btc.html
-      summary: Make subforum on China's largest Bitcoin forum 8BTC
-      author: firperfect
-    - name: Additional GUI Developer
-      url: /forum-funding-system/proposals/additional-gui-dev.html
-      summary: Hire Jaquee as an additional GUI developer
-      author: Jaquee
-    - name: Getmonero.org Redesign
-      url: /forum-funding-system/proposals/getmonero-redesign.html
-      summary: Redesign the official getmonero.org website to make it more accessible and aesthetically pleasing.
-      author: rehrar
-    - name: Release of new/updated pool software
-      url: /forum-funding-system/proposals/release-pool-software.html
-      summary: An updated pool for usage within the XMR community
-      author: Snipa22
-    - name: Monero integrations with web apps
-      url: /forum-funding-system/proposals/monero-integrations.html
-      summary: Make open-source payment gateways for Monero on popular web apps
-      author: serhack

_data/lang/ar/footer-2.yml

 - name: قانوني
   url: legal
 - name: شفره المصدر
-  url: https://github.com/monero-project
-- name: المواصفات التقنيه
-  url: technical-specs/
+  url: https://repo.getmonero.org

_data/lang/ar/navigation.yml

@@ -16,14 +16,16 @@
   url: downloads/
 - title: آخر الأخبار
   subfolderitems:
-    - page: جميع المشاركات
-      url: blog
-    - page: خطابات
-      url: blog/tags/monero%20missives.html
-    - page: سجل الإجتماعات
-      url: blog/tags/dev%20diaries.html
+    - page: Urgent
+      url: blog/tags/urgent.html
     - page: الإصدارات
       url: blog/tags/releases.html
+    - page: Community
+      url: blog/tags/community.html
+    - page: سجل الإجتماعات
+      url: blog/tags/dev%20diaries.html
+    - page: جميع المشاركات
+      url: blog
 - title: المجتمع
   subfolderitems:
   - page: الفريق

_data/lang/ar/roadmap.yml

-- year: 2014
-  accomplishments:
+year_2014:
+- month: April
+  completed:
     - name: تم إنشاء المشروع علي Bitcointalk
-      date: 2014-04-18
-      status: completed
-    - name: تغيير الإسم من بيت مونيرو إلي مونيرو
-      date: 2014-04-23
-      status: completed
-    - name: تم التعافي من هجمه اسبام
-      date: 2014-09-04
-      status: completed
-    - name: تم نشر أول ورقتين بحث لمختبر بحث مونيرو
-      date: 2014-09-12
-      status: completed
-    - name: تم نشر الورقه البحثيه الثالثه لمختبر بحث مونيرو
-      date: 2014-09-25
-      status: completed
-    - name: 0.8.8.6 نشر الإصدار رقم
-      date: 2014-12-08
-      status: completed
-- year: 2015
-  accomplishments:
-    - name: الورقه البحثيه الرابعه لمختبر بحث مونيرو
-      date: 2015-01-26
-      status: completed
-- year: 2016
-  accomplishments:
-    - name: 0.9.0 نشر الإصدار رقم
-      date: 2016-01-01
-      status: completed
-    - name: الورقه البحثيه الخامسه لمختبر البحث
-      date: 2016-02-10
-      status: completed
-    - name: تحديث للشبكه لإستخدام 3 كأقل عدد لحجم الحلقات اللازم لكل المعاملات
-      date: 2016-03-22
-      status: completed
-    - name: 0.10.0 نشر الإصدار رقم
-      date: 2016-09-18
-      status: completed
-    - name: تحديث للشبكه لفصل معامله الاساس الي عده فئات
-      date: 2016-09-21
-      status: completed
-    - name: 0.10.1 نشر الإصدار
-      date: 2016-12-14
-      status: completed
-    - name: الإصدار التجريبي الاول للواجهه الرسوميه الرسميه
-      date: 2016-12-22
-      status: completed
-- year: 2017
-  accomplishments:
-    - name: تحديث الشبكه للسماح بمعاملات الحقل السريه
-      date: 2017-01-05
-      status: completed
-    - name: 0.10.2 الإصدار رقم , تم معالجه ثغيره خطيره
-      date: 2017-02-22
-      status: completed
-    - name: 0.10.3.1 الإصدار رقم
-      date: 2017-03-27
-      status: completed
-    - name: تحديث للشبكه لتعديل أقل حجم للكتل و خوارزميه الرسوم الديناميكية
-      date: 2017-04-15
-      status: completed
-    - name: إعاده تصميم الموقع
-      date: 2017-07-04
-      status: completed
-    - name: 0.11.0.0 إصدار رقم
-      date: 2017-09-07
-      status: completed
-    - name: الكتل الرقيقه
-      date: 2017-09-07
-      status: completed
-    - name: نهايه المرحله التجريبيه للواجهه الرسوميه
-      date: 2017-09-10
-      status: completed
-    - name: تحديث للشبكه لإستخدام 5 كأقل عدد لحجم الحلقات اللازم و إلزام معاملات الحقل السريه لكل المعاملات
-      date: 2017-09-15
-      status: completed
+    - name: Renamed from Bitmonero to Monero
+- month: September
+  completed:
+    - name: Recovered from a spam attack
+    - name: Monero Research Lab Papers 1 and 2 published
+    - name: Monero Research Lab Paper 3 published
+- month: December
+  completed:
+    - name: 0.8.8.6 released
+year_2015:
+- month: January
+  completed:
+    - name: Monero Research Lab Paper 4 published
+year_2016:
+- month: January
+  completed:
+    - name: 0.9.0 Hydrogen Helix released
+- month: February
+  completed:
+    - name: Monero Research Lab Paper 5 published
+- month: March
+  completed:
+    - name: Network Upgrade to require minimum ringsize of 3 on all transactions
+- month: September
+  completed:
+    - name: 0.10.0 Wolfram Warptangent released
+    - name: Network Upgrade to split coinbase into denominations
+- month: December
+  completed:
+    - name: 0.10.1 Wolfram Warptangent released
+    - name: Official GUI Beta 1 released
+year_2017:
+- month: January
+  completed:
+    - name: Network Upgrade to enable RingCT transactions
+- month: February
+  completed:
+    - name: 0.10.2 released; critical vulnerability patched
+- month: March
+  completed:
+    - name: 0.10.3.1 Wolfram Warptangent released
+- month: April
+  completed:
+    - name: Network Upgrade to adjust minimum blocksize and dynamic fee algorithm
+- month: July
+  completed:
+    - name: Website redesigned
+- month: September
+  completed:
+    - name: 0.11.0.0 Helium Hydra released
+    - name: Fluffy blocks
+    - name: GUI out of beta
+    - name: Network Upgrade to increase minimum ringsize to 5 and require RingCT transactions
+    - name: GUI 0.11.0.0 Helium Hydra released
     - name: 0MQ/ZeroMQ
-      date: September, 2017
-      status: completed
-    - name: العناوين الفرعيه
-      date: October, 2017
-      status: completed
-    - name: ثنائيه التوقيع (multisig)
-      date: December, 2017
-      status: completed
-- year: 2018
-  accomplishments:
-    - name: تقنيه إثبات العمل جديده CryptoNoteV7
-      date: 2018-04-06
-      status: completed
-    - name: تحديث للشبكه لإستخدام 7 كأقل عدد لحجم الحلقات اللازم, دمح ثنائيه التوقيع , العناوين الفرعيه , وتغيير تقنيه إثبات العمل
-      date: 2018-04-06
-      status: completed
-    - name: ترجمه الموقع إلي الفرنسيه والبولنديه
-      date: 2018-04-24
-      status: completed
-    - name: الإصدار الأول لمشروع كوفري
-      date: 2018-08-01
-      status: completed
-    - name: إعاده تصميم نظام التمويل بالمنتدي
-      date:
-      status: ongoing
-    - name: Implementation of BulletProofs instead of RingCT to reduce transaction sizes
-      date:
-      status: ongoing
-    - name: Kovri Integration
-      date:
-      status: upcoming
-- year: 2019
-  accomplishments:
-    - name: حلول الطبقه الثانيه للسرعه و قابليه التوسع
-      date:
-      status: upcoming
-    - name: أوراق بحثيه إضافيه لمختبر بحث مونيرو
-      date:
-      status: upcoming
+- month: October
+  completed:
+    - name: Subaddresses
+    - name: Monero Research Lab Paper 6 published
+    - name: 0.11.1.0 Helium Hydra released
+    - name: GUI 0.11.1.0 Helium Hydra released
+- month: December
+  completed:
+    - name: Multi-signatures (multisig)
+year_2018:
+- month: March
+  completed:
+    - name: 0.12.0.0 Lithium Luna released
+- month: April
+  completed:
+    - name: GUI 0.12.0.0 Lithium Luna released
+    - name: New Proof of Work CryptoNightV2
+    - name: Network upgrade to increase minimal ringsize to 7, integrate multisig, subaddresses, and change PoW algo
+    - name: Getmonero.org Localization in French and Polish
+- month: May
+  completed:
+    - name: 0.12.1.0 Lithium Luna released
+- month: June
+  completed:
+    - name: Ledger Hardware Wallets Support
+    - name: 0.12.2.0 Lithium Luna released
+- month: July
+  completed:
+    - name: 0.12.3.0 Lithium Luna released
+    - name: GUI 0.12.3.0 Lithium Luna released
+- month: August
+  completed:
+    - name: Kovri alpha release
+    - name: Getmonero.org Moneropedia open for Localization
+    - name: Getmonero.org Localization in Arabic
+- month: October
+  completed:
+    - name: 0.13.0.2 Beryllium Bullet released
+    - name: GUI 0.13.0.3 Beryllium Bullet released
+    - name: New Proof of Work CryptoNightV3
+    - name: Implementation of Bulletproofs to reduce transaction sizes
+    - name: Network upgrade to increase minimal ringsize to 11, integrate Bulletproofs, update fees calculation algorithm, and change PoW algo
+    - name: 0.13.0.4 Beryllium Bullet released
+- month: Nobember
+  completed:
+    - name: Monero Research Lab Papers 8 and 9 published
+    - name: GUI 0.13.0.4 Beryllium Bullet released
+    - name: Monero Research Lab Paper 7 published
+- month: December
+  completed:
+    - name: Monero Research Lab Paper 10 published
+    - name: Implementation of Monero Messaging System (MMS) to automate multisig wallets information exchange
+year_2019:
+- month: February
+  completed:
+    - name: Getmonero.org Localization in German
+    - name: 0.14.0.0 Boron Butterfly released
+- month: March
+  completed:
+    - name: GUI 0.14.0.0 Boron Butterfly released
+    - name: New Community Crowdfunding System (CCS) to replace the Forum Funding System (FFS)
+    - name: 0.14.0.2 Boron Butterfly released
+    - name: New Proof of Work CryptoNightR
+    - name: Getmonero.org Localization in Brazilian-Portuguese and Dutch
+- month: May
+  completed:
+    - name: "DLSAG: Non-Interactive Refund Transactions For Interoperable Payment Channels in Monero"
+- month: July
+  completed:
+    - name: Blockchain pruning
+    - name: Trezor model T support
+    - name: Ledger Nano X support
+    - name: Tor & I2P CLI wallet integration
+    - name: Multisig Messaging System
+- month: October
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+- month: November
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+    - name: Pay for service system using mining (RPC-Pay)
+    - name: IPv6 support
+    - name: Standalone (long) payment ID support removed
+    - name: GUI automatic remote nodes discovering and switching option
+    - name: New Proof of Work RandomX
+year_2020:
+- month: February
+  completed:
+    - name: Getmonero translatable on Weblate
+- month: March
+  completed:
+    - name: GUI 0.15.0.4 released
+- month: Coming Soon
+  ongoing: 
+    - name: Onion address for Getmonero.org
+    - name: Implementation of the Dandelion++ protocol
+    - name: Wallet scanning speedups (support for supercop ASM)
+    - name: Concise linkable spontaneous anonymous group (CLSAG) signatures
+    - name: "Triptych: logarithmic-sized linkable ring signatures with applications"
+    - name: "Kastelo: open source hardware wallet"
+  upcoming:
+    - name: Second-layer solutions for speed and scalability
+future:
+- month: Coming Soon
+  upcoming:
+    - name: Return addresses
\ No newline at end of file

_data/lang/de/footer-1.yml

+- title: Ressourcen
+  subfolderitems:
+  - name: Über Monero
+    url: resources/about/
+  - name: Moneropedia
+    url: resources/moneropedia/
+  - name: Anleitungen für Entwickler
+    url: resources/developer-guides/
+  - name: Anleitungen für Nutzer
+    url: resources/user-guides/
+  - name: Bibliothek
+    url: library
+  - name: RSS-Feed
+    url: https://getmonero.org/feed.xml
+- title: IRC-Channels
+  subfolderitems:
+  - name: monero
+    url: irc://chat.freenode.net/#monero
+  - name: monero-dev
+    url: irc://chat.freenode.net/#monero-dev
+  - name: monero-markets
+    url: irc://chat.freenode.net/#monero-markets
+  - name: monero-pools
+    url: irc://chat.freenode.net/#monero-pools
+  - name: monero-community
+    url: irc://chat.freenode.net/#monero-community
+  - name: monero-translations
+    url: irc://chat.freenode.net/#monero-translations
+  - name: monero-hardware
+    url: irc://chat.freenode.net/#monero-hardware
+- title: Community
+  subfolderitems:
+  - name: Reddit
+    url: https://reddit.com/r/monero
+  - name: Stack Exchange
+    url: https://monero.stackexchange.com/
+  - name: Thread auf BitcoinTalk
+    url: https://bitcointalk.org/index.php?topic=583449.0
+  - name: Mattermost-Chat
+    url: https://mattermost.getmonero.org/
+  - name: Telegram-Chat
+    url: https://telegram.me/bitmonero
+- title: Das Monero-Projekt
+  subfolderitems:
+  - name: OpenAlias
+    url: https://openalias.org/
+  - name: Kovri
+    url: https://kovri.io/
+  - name: Monero Research Lab
+    url: resources/research-lab/
+  - name: Monero-Presseunterlagen
+    url: press-kit

_data/lang/de/footer-2.yml

+- name: Rechtliches
+  url: legal
+- name: Quellcode
+  url: https://repo.getmonero.org

_data/lang/template/navigation.yml → _data/lang/de/navigation.yml

-- title: Get Started
-  subfolderitems:
-  - page: What is Monero?
-    url: get-started/what-is-monero
-  - page: Using
-    url: get-started/using
-  - page: Accepting
-    url: get-started/accepting
-  - page: Contributing
-    url: get-started/contributing
-  - page: Mining
-    url: get-started/mining
-  - page: FAQ
-    url: get-started/faq
-- title: Downloads
-  url: downloads/
-- title: Recent News
-  subfolderitems:
-    - page: All Posts
-      url: blog
-    - page: Missives
-      url: blog/tags/monero%20missives.html
-    - page: Meeting Logs
-      url: blog/tags/dev%20diaries.html
-    - page: Releases
-      url: blog/tags/releases.html
-- title: Community
-  subfolderitems:
-  - page: Team
-    url: community/team
-  - page: Hangouts
-    url: community/hangouts
-  - page: Sponsorships
-    url: community/sponsorships
-  - page: Merchants
-    url: community/merchants
-- title: Resources
-  subfolderitems:
-  - page: About
-    url: resources/about
-  - page: Roadmap
-    url: resources/roadmap
-  - page: Research Lab
-    url: resources/research-lab
-  - page: Moneropedia
-    url: resources/moneropedia
-  - page: User Guides
-    url: resources/user-guides
-  - page: Developer Guides
-    url: resources/developer-guides
-  - page: Technical Specs
-    url: technical-specs
-  - page: Library
-    url: library
\ No newline at end of file
+- title: Einstieg
+  subfolderitems:
+  - page: Was ist Monero?
+    url: get-started/what-is-monero
+  - page: Nutzen
+    url: get-started/using
+  - page: Akzeptieren
+    url: get-started/accepting
+  - page: Unterstützen
+    url: get-started/contributing
+  - page: Mining
+    url: get-started/mining
+  - page: Häufig gestellte Fragen
+    url: get-started/faq
+- title: Downloads
+  url: downloads/
+- title: Neuigkeiten
+  subfolderitems:
+    - page: Dringend
+      url: blog/tags/urgent.html
+    - page: Versionen
+      url: blog/tags/releases.html
+    - page: Gemeinschaft
+      url: blog/tags/community.html
+    - page: Protokolle
+      url: blog/tags/dev%20diaries.html
+    - page: Alle Einträge
+      url: blog
+- title: Community
+  subfolderitems:
+  - page: Team
+    url: community/team
+  - page: Hangouts
+    url: community/hangouts
+  - page: Sponsoren
+    url: community/sponsorships
+  - page: Händler
+    url: community/merchants
+- title: Ressourcen
+  subfolderitems:
+  - page: Über
+    url: resources/about
+  - page: Roadmap
+    url: resources/roadmap
+  - page: Research Lab
+    url: resources/research-lab
+  - page: Moneropedia
+    url: resources/moneropedia
+  - page: Anleitungen für Nutzer
+    url: resources/user-guides
+  - page: Anleitungen für Entwickler
+    url: resources/developer-guides
+  - page: Technische Spezifikationen
+    url: technical-specs
+  - page: Bibliothek
+    url: library
+  - page: Press Kit
+    url: press-kit
\ No newline at end of file

_data/lang/de/roadmap.yml

+year_2014:
+- month: April
+  completed:
+    - name: Veröffentlicht auf Bitcointalk
+    - name: Umbenennung von Bitmonero zu Monero
+- month: September
+  completed:
+    - name: Erholung von einer Spamattacke
+    - name: „Monero Research Lab“-Papers 1 und 2 veröffentlicht
+    - name: „Monero Research Lab“-Paper 3 veröffentlicht
+- month: December
+  completed:
+    - name: 0.8.8.6 veröffentlicht
+year_2015:
+- month: January
+  completed:
+    - name: „Monero Research Lab“-Paper 4 veröffentlicht
+year_2016:
+- month: January
+  completed:
+    - name: 0.9.0 Hydrogen Helix veröffentlicht
+- month: February
+  completed:
+    - name: „Monero Research Lab“-Paper 5 veröffentlicht
+- month: March
+  completed:
+    - name: Netzwerkupgrade, das eine minimale Ringgröße von 3 für alle Transaktionen voraussetzt
+- month: September
+  completed:
+    - name: 0.10.0 Wolfram Warptangent veröffentlicht
+    - name: Netzwerkupgrade um ungleiche Transaktionsbeträge unter den Ringen zu ermöglichen
+- month: December
+  completed:
+    - name: 0.10.1 Wolfram Warptangent veröffentlicht
+    - name: Offizielle GUI Beta 1 veröffentlicht
+year_2017:
+- month: January
+  completed:
+    - name: Netzwerkupgrade, um RingCT Transaktionen zu ermöglichen
+- month: February
+  completed:
+    - name: 0.10.2 veröffentlicht; kritische Schwachstelle gepatcht
+- month: March
+  completed:
+    - name: 0.10.3.1 Wolfram Warptangent veröffentlicht
+- month: April
+  completed:
+    - name: Netzwerkupgrade, das die kleinstmögliche Blockgröße und den dynamischen Gebührenalgorithmus anpasst
+- month: July
+  completed:
+    - name: Webseite neu gestaltet
+- month: September
+  completed:
+    - name: 0.11.0.0 Helium Hydra veröffentlicht
+    - name: Fluffy blocks
+    - name: Betaphase der GUI beendet
+    - name: Netzwerkupgrade, das die minimale Ringgröße auf 5 anhebt und RingCT voraussetzt
+    - name: GUI 0.11.0.0 Helium Hydra veröffentlicht
+    - name: 0MQ/ZeroMQ
+- month: October
+  completed:
+    - name: Subadressen
+    - name: „Monero Research Lab“-Paper 6 veröffentlicht
+    - name: 0.11.1.0 Helium Hydra veröffentlicht
+    - name: GUI 0.11.1.0 Helium Hydra veröffentlicht
+- month: December
+  completed:
+    - name: Mehrfachsignaturen (multisig)
+year_2018:
+- month: March
+  completed:
+    - name: 0.12.0.0 Lithium Luna veröffentlicht
+- month: April
+  completed:
+    - name: GUI 0.12.0.0 Lithium Luna veröffentlicht
+    - name: Neuer PoW CryptoNightV2
+    - name: Netzwerkupgrade, das die minimale Ringgröße auf 7 erhöht, Mehrfachsignaturen und Subadressen integriert und den PoW-Algorithmus ändert
+    - name: "Getmonero.org: Übersetzungen in Französisch und Polnisch"
+- month: May
+  completed:
+    - name: 0.12.1.0 Lithium Luna veröffentlicht
+- month: June
+  completed:
+    - name: Hardware-Wallets von Ledger werden unterstützt
+    - name: 0.12.2.0 Lithium Luna veröffentlicht
+- month: July
+  completed:
+    - name: 0.12.3.0 Lithium Luna veröffentlicht
+    - name: GUI 0.12.3.0 Lithium Luna veröffentlicht
+- month: August
+  completed:
+    - name: Kovri Alpha veröffentlicht
+    - name: Getmonero.org Moneropedia open for Localization
+    - name: "Getmonero.org: Übersetzungen in Arabisch"
+- month: October
+  completed:
+    - name: 0.13.0.2 Beryllium Bullet veröffentlicht
+    - name: GUI 0.13.0.3 Beryllium Bullet veröffentlicht
+    - name: Neuer PoW CryptoNightV3
+    - name: Implementation von BulletProofs anstelle von RingCT, um Transaktionsgrößen zu verringern
+    - name: Network upgrade to increase minimal ringsize to 11, integrate Bulletproofs, update fees calculation algorithm, and change PoW algo
+    - name: 0.13.0.4 Beryllium Bullet veröffentlicht
+- month: Nobember
+  completed:
+    - name: „Monero Research Lab“-Papers 8 und 9 veröffentlicht
+    - name: GUI 0.13.0.4 Beryllium Bullet veröffentlicht
+    - name: „Monero Research Lab“-Paper 7 veröffentlicht
+- month: December
+  completed:
+    - name: „Monero Research Lab“-Paper 10 veröffentlicht
+    - name: Implementation of Monero Messaging System (MMS) to automate multisig wallets information exchange
+year_2019:
+- month: February
+  completed:
+    - name: Getmonero.org Localization in German
+    - name: 0.14.0.0 Boron Butterfly released
+- month: March
+  completed:
+    - name: GUI 0.14.0.0 Boron Butterfly released
+    - name: New Community Crowdfunding System (CCS) to replace the Forum Funding System (FFS)
+    - name: 0.14.0.2 Boron Butterfly released
+    - name: New Proof of Work CryptoNightR
+    - name: Getmonero.org Localization in Brazilian-Portuguese and Dutch
+- month: May
+  completed:
+    - name: "DLSAG: Non-Interactive Refund Transactions For Interoperable Payment Channels in Monero"
+- month: July
+  completed:
+    - name: Blockchain pruning
+    - name: Trezor model T support
+    - name: Ledger Nano X support
+    - name: Tor & I2P CLI wallet integration
+    - name: Multisig Messaging System
+- month: October
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+- month: November
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+    - name: Pay for service system using mining (RPC-Pay)
+    - name: IPv6 support
+    - name: Standalone (long) payment ID support removed
+    - name: GUI automatic remote nodes discovering and switching option
+    - name: New Proof of Work RandomX
+year_2020:
+- month: February
+  completed:
+    - name: Getmonero translatable on Weblate
+- month: March
+  completed:
+    - name: GUI 0.15.0.4 released
+- month: Coming Soon
+  ongoing: 
+    - name: Onion address for Getmonero.org
+    - name: Implementation of the Dandelion++ protocol
+    - name: Wallet scanning speedups (support for supercop ASM)
+    - name: Concise linkable spontaneous anonymous group (CLSAG) signatures
+    - name: "Triptych: logarithmic-sized linkable ring signatures with applications"
+    - name: "Kastelo: open source hardware wallet"
+  upcoming:
+    - name: Second-layer solutions for speed and scalability
+future:
+- month: Coming Soon
+  upcoming:
+    - name: Return addresses
\ No newline at end of file

_data/lang/en/footer-1.yml

@@ -11,7 +11,7 @@
   - name: Library
     url: library
   - name: RSS Feed
-    url: https://getmonero.org/feed.xml
+    url: rss
 - title: IRC Channels
   subfolderitems:
   - name: monero

_data/lang/en/footer-2.yml

 - name: Legal
   url: legal
 - name: Source Code
-  url: https://github.com/monero-project
-- name: Technical Specs
-  url: technical-specs/
\ No newline at end of file
+  url: https://repo.getmonero.org

_data/lang/en/navigation.yml

@@ -16,14 +16,16 @@
   url: downloads/
 - title: Recent News
   subfolderitems:
-    - page: All Posts
-      url: blog
-    - page: Missives
-      url: blog/tags/monero%20missives.html
-    - page: Meeting Logs
-      url: blog/tags/dev%20diaries.html
+    - page: Urgent
+      url: blog/tags/urgent.html
     - page: Releases
       url: blog/tags/releases.html
+    - page: Community
+      url: blog/tags/community.html
+    - page: Meeting Logs
+      url: blog/tags/dev%20diaries.html
+    - page: All Posts
+      url: blog
 - title: Community
   subfolderitems:
   - page: Team
@@ -48,7 +50,7 @@
     url: resources/user-guides
   - page: Developer Guides
     url: resources/developer-guides
-  - page: Technical Specs
-    url: technical-specs
   - page: Library
-    url: library
\ No newline at end of file
+    url: library
+  - page: Press Kit
+    url: press-kit

_data/lang/en/roadmap.yml

-- year: 2014
-  accomplishments:
+year_2014:
+- month: April
+  completed:
     - name: Launched on Bitcointalk
-      date: 2014-04-18
-      status: completed
     - name: Renamed from Bitmonero to Monero
-      date: 2014-04-23
-      status: completed
+- month: September
+  completed:
     - name: Recovered from a spam attack
-      date: 2014-09-04
-      status: completed
     - name: Monero Research Lab Papers 1 and 2 published
-      date: 2014-09-12
-      status: completed
     - name: Monero Research Lab Paper 3 published
-      date: 2014-09-25
-      status: completed
+- month: December
+  completed:
     - name: 0.8.8.6 released
-      date: 2014-12-08
-      status: completed
-- year: 2015
-  accomplishments:
+year_2015:
+- month: January
+  completed:
     - name: Monero Research Lab Paper 4 published
-      date: 2015-01-26
-      status: completed
-- year: 2016
-  accomplishments:
+year_2016:
+- month: January
+  completed:
     - name: 0.9.0 Hydrogen Helix released
-      date: 2016-01-01
-      status: completed
+- month: February
+  completed:
     - name: Monero Research Lab Paper 5 published
-      date: 2016-02-10
-      status: completed
+- month: March
+  completed:
     - name: Network Upgrade to require minimum ringsize of 3 on all transactions
-      date: 2016-03-22
-      status: completed
+- month: September
+  completed:
     - name: 0.10.0 Wolfram Warptangent released
-      date: 2016-09-18
-      status: completed
     - name: Network Upgrade to split coinbase into denominations
-      date: 2016-09-21
-      status: completed
+- month: December
+  completed:
     - name: 0.10.1 Wolfram Warptangent released
-      date: 2016-12-14
-      status: completed
     - name: Official GUI Beta 1 released
-      date: 2016-12-22
-      status: completed
-- year: 2017
-  accomplishments:
+year_2017:
+- month: January
+  completed:
     - name: Network Upgrade to enable RingCT transactions
-      date: 2017-01-05
-      status: completed
+- month: February
+  completed:
     - name: 0.10.2 released; critical vulnerability patched
-      date: 2017-02-22
-      status: completed
+- month: March
+  completed:
     - name: 0.10.3.1 Wolfram Warptangent released
-      date: 2017-03-27
-      status: completed
+- month: April
+  completed:
     - name: Network Upgrade to adjust minimum blocksize and dynamic fee algorithm
-      date: 2017-04-15
-      status: completed
+- month: July
+  completed:
     - name: Website redesigned
-      date: 2017-07-04
-      status: completed
+- month: September
+  completed:
     - name: 0.11.0.0 Helium Hydra released
-      date: 2017-09-07
-      status: completed
     - name: Fluffy blocks
-      date: 2017-09-07
-      status: completed
     - name: GUI out of beta
-      date: 2017-09-10
-      status: completed
     - name: Network Upgrade to increase minimum ringsize to 5 and require RingCT transactions
-      date: 2017-09-15
-      status: completed
+    - name: GUI 0.11.0.0 Helium Hydra released
     - name: 0MQ/ZeroMQ
-      date: September, 2017
-      status: completed
+- month: October
+  completed:
     - name: Subaddresses
-      date: October, 2017
-      status: completed
+    - name: Monero Research Lab Paper 6 published
+    - name: 0.11.1.0 Helium Hydra released
+    - name: GUI 0.11.1.0 Helium Hydra released
+- month: December
+  completed:
     - name: Multi-signatures (multisig)
-      date: December, 2017
-      status: completed
-- year: 2018
-  accomplishments:
-    - name: New Proof of Work CryptoNoteV7
-      date: 2018-04-06
-      status: completed
+year_2018:
+- month: March
+  completed:
+    - name: 0.12.0.0 Lithium Luna released
+- month: April
+  completed:
+    - name: GUI 0.12.0.0 Lithium Luna released
+    - name: New Proof of Work CryptoNightV2
     - name: Network upgrade to increase minimal ringsize to 7, integrate multisig, subaddresses, and change PoW algo
-      date: 2018-04-06
-      status: completed
     - name: Getmonero.org Localization in French and Polish
-      date: 2018-04-24
-      status: completed
+- month: May
+  completed:
+    - name: 0.12.1.0 Lithium Luna released
+- month: June
+  completed:
     - name: Ledger Hardware Wallets Support
-      date: 2018-06-04
-      status: completed
+    - name: 0.12.2.0 Lithium Luna released
+- month: July
+  completed:
+    - name: 0.12.3.0 Lithium Luna released
+    - name: GUI 0.12.3.0 Lithium Luna released
+- month: August
+  completed:
     - name: Kovri alpha release
-      date: 2018-08-01
-      status: completed
-    - name: Forum Funding System redesign
-      date:
-      status: ongoing
-    - name: Implementation of BulletProofs instead of RingCT to reduce transaction sizes
-      date:
-      status: ongoing
-    - name: Kovri Integration
-      date:
-      status: upcoming
-- year: 2019
-  accomplishments:
+    - name: Getmonero.org Moneropedia open for Localization
+    - name: Getmonero.org Localization in Arabic
+- month: October
+  completed:
+    - name: 0.13.0.2 Beryllium Bullet released
+    - name: GUI 0.13.0.3 Beryllium Bullet released
+    - name: New Proof of Work CryptoNightV3
+    - name: Implementation of Bulletproofs to reduce transaction sizes
+    - name: Network upgrade to increase minimal ringsize to 11, integrate Bulletproofs, update fees calculation algorithm, and change PoW algo
+    - name: 0.13.0.4 Beryllium Bullet released
+- month: November
+  completed:
+    - name: Monero Research Lab Papers 8 and 9 published
+    - name: GUI 0.13.0.4 Beryllium Bullet released
+    - name: Monero Research Lab Paper 7 published
+- month: December
+  completed:
+    - name: Monero Research Lab Paper 10 published
+    - name: Implementation of Monero Messaging System (MMS) to automate multisig wallets information exchange
+year_2019:
+- month: February
+  completed:
+    - name: Getmonero.org Localization in German
+    - name: 0.14.0.0 Boron Butterfly released
+- month: March
+  completed:
+    - name: GUI 0.14.0.0 Boron Butterfly released
+    - name: New Community Crowdfunding System (CCS) to replace the Forum Funding System (FFS)
+    - name: 0.14.0.2 Boron Butterfly released
+    - name: New Proof of Work CryptoNightR
+    - name: Getmonero.org Localization in Brazilian-Portuguese and Dutch
+- month: May
+  completed:
+    - name: "DLSAG: Non-Interactive Refund Transactions For Interoperable Payment Channels in Monero"
+- month: July
+  completed:
+    - name: Blockchain pruning
+    - name: Trezor model T support
+    - name: Ledger Nano X support
+    - name: Tor & I2P CLI wallet integration
+    - name: Multisig Messaging System
+- month: October
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+- month: November
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+    - name: Pay for service system using mining (RPC-Pay)
+    - name: IPv6 support
+    - name: Standalone (long) payment ID support removed
+    - name: GUI automatic remote nodes discovering and switching option
+    - name: New Proof of Work RandomX
+year_2020:
+- month: February
+  completed:
+    - name: Getmonero translatable on Weblate
+- month: March
+  completed:
+    - name: GUI 0.15.0.4 released
+    - name: CLI 0.15.0.5 released
+- month: Coming Soon
+  ongoing: 
+    - name: Onion address for Getmonero.org
+    - name: Implementation of the Dandelion++ protocol
+    - name: Wallet scanning speedups (support for supercop ASM)
+    - name: Concise linkable spontaneous anonymous group (CLSAG) signatures
+    - name: "Triptych: logarithmic-sized linkable ring signatures with applications"
+    - name: "Kastelo: open source hardware wallet"
+  upcoming:
     - name: Second-layer solutions for speed and scalability
-      date:
-      status: upcoming
-    - name: Additional MRL research papers
-      date:
-      status: upcoming
+future:
+- month: Coming Soon
+  upcoming:
+    - name: Return addresses
\ No newline at end of file