Merge pull request #1304

FAQ: add Monero videos ("Are there videos I can watch to learn about Monero?")

_i18n/en.yml

@@ -431,6 +431,19 @@ faq:
   qimporting: Can I manually import the blockchain?
   aimporting: >
     Yes, you can, but you probably shouldn't. Importing an external @blockchain is very resource intensive and forces you to trust the entity providing you with the blockchain. It's usually faster to download it the normal way: running a node and letting it synchronize with the other @nodes in the network. If you really need to import an external blockchain, you can download one in the 'Downloads' page of this website. Follow the guide below if you are using Windows. If you are a linux user, you can use the tool "monero-blockchain-import", which is included in the archive when you download the GUI or CLI wallets. Start syncing the imported blockchain with this command: "monero-blockchain-import --input-file blockchain.raw".
+  qhf: Is it true that Monero has a hard fork every 6 months?
+  ahf: Monero used to have 2 network upgrades (hard forks) a year, but this is not the case anymore. The choice of the biannual hard forks was taken in order to be able to introduce important consensus changes, which added privacy features and network-wide improvements (For example @bulletproofs and CLSAG both required a hard fork) and avoid the ossification of the protocol. Recently, the biannual hard forks included changes to the PoW algorithm, to preserve ASIC-resistance.
+  ahf1: The dev community and the Core Team agree that the protocol is stable and mature enough and biannual hard forks are not necessary anymore. Furthermore, the ecosystem around Monero has grown exponentially during the years and frequent protocol changes would be increasingly hard to coordinate, could be detrimental to the growth of the ecosystem and to the user experience. Cherry on the top, the new algorithm @randomx is ensuring long term ASIC-resistance, so regular changes are not needed anymore. Network upgrades will still be used to add important protocol improvements and consensus changes, but at a lower and less strict frequency (every 9-12 months).
+  qvideos: Are there videos I can watch to learn about Monero?
+  avideos: >
+    During the years the community has created a vast amount of informative content like articles and videos. Most of these videos are publicly available on platforms like YouTube. On this website we host a few videos that explain the fundamentals of Monero. To optimize their effectiveness, they should be viewed in sequence:
+  video_intro: Introduction to Monero
+  video_essentials: "Monero: The Essentials"
+  video_sa: Stealth Addresses
+  video_ringsig: Ring Signatures
+  mvideos: "More info on the Moneropedia entry:"
+  aavailable: also available in
+  and: and
 
 mining:
   intro1: Monero is a cryptocurrency that relies on proof-of-work mining to achieve distributed consensus. Below you'll find some information and resources on how to begin mining.

get-started/faq/index.md

@@ -31,6 +31,8 @@ permalink: /get-started/faq/index.html
                         <li><a href="#anchor-anonymous">{% t faq.q14 %}</a></li>
                         <li><a href="#antivirus">{% t faq.qantivirus %}</a></li>
                         <li><a href="#monero-meaning">{% t faq.qmoneromeaning %}</a></li>
+                        <li><a href="#hardforks">{% t faq.qhf %}</a></li>
+                        <li><a href="#videos">{% t faq.qvideos %}</a></li>
                     </ul>
                     <li class="category">{% t faq.advanced %}</li>
                     <ul class="logo">
@@ -166,6 +168,27 @@ permalink: /get-started/faq/index.html
                         <p>{% t faq.amoneromeaning %}</p>
                     </div>
                 </div>
+                <div class="tab" id="hardforks">
+                    <h3><a class="anchor" href="#monero-meaning"></a>{% t faq.qhf %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.ahf %}</p>
+                        <p>{% t faq.ahf1 %}</p>
+                        <p>{% t faq.additional %} <a href="{{ site.baseurl_root }}/2020/09/01/note-scheduled-upgrades.html">A note on scheduled protocol upgrades</a></p>
+                    </div>
+                </div>
+                <div class="tab" id="videos">
+                    <h3><a class="anchor" href="#videos"></a>{% t faq.qvideos %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.avideos %}</p>
+                        <ol>
+                            <li><a href="{{ site.baseurl_root }}/media/Monero_Promo.m4v">{% t faq.video_intro %}</a> ({% t faq.aavailable %} <a href="{{ site.baseurl_root }}/media/ru/Monero_Promo.m4v">Russian</a> {% t faq.and %} <a href="{{ site.baseurl_root }}/media/pt-br/Monero_Promo.m4v">Brazilian Portuguese</a>)</li>
+                            <li><a href="{{ site.baseurl_root }}/media/Monero%20-%20The%20Essentials.m4v">{% t faq.video_essentials %}</a></li>
+                            <li><a href="{{ site.baseurl_root }}/media/Monero%20-%20Stealth%20Addresses.m4v">{% t faq.video_sa %}</a> - {% t faq.mvideos %} @stealth-addresses</li>
+                            <li><a href="{{ site.baseurl_root }}/media/Monero%20-%20Ring%20Signatures.m4v">{% t faq.video_ringsig %}</a> - {% t faq.mvideos %} @ring-signatures</li>
+                            <li><a href="{{ site.baseurl_root }}/media/Monero%20-%20RingCT.m4v">RingCT</a> - {% t faq.mvideos %} @ring-ct</li>
+                        </ol>
+                    </div>
+                </div>
                 <div class="row center-xs">
                     <!-- 'Advanced' section-->
                     <div class="col"><h2>{% t faq.advanced %}</h2></div>