moneropedia changes and fixes

_includes/footer.html

@@ -16,4 +16,12 @@
         $(document).ready(function(){
             $('[data-toggle="tooltip"]').tooltip();   
         });
+
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+        ga('create', 'UA-53312765-1', 'auto');
+        ga('send', 'pageview');
     </script>
\ No newline at end of file

_plugins/moneropedia.rb

@@ -54,7 +54,7 @@ module Jekyll
         # replace instances of @term with tooltips of the summary
         @@moneropedia.each do |entry|
           entry[:terms].each do |term|
-            content = content.gsub(/(\@#{term})\b/i, '<a href="/knowledge-base/moneropedia/' + entry[:file] + '" data-toggle="tooltip" data-placement="top" data-original-title="' + entry[:summary] + '">' + term + '</a>')
+            content = content.gsub(/(\@#{term})\b/i, '<a class="moneropedia" href="/knowledge-base/moneropedia/' + entry[:file] + '" data-toggle="tooltip" data-placement="top" data-original-title="' + entry[:summary] + '">' + term.gsub('-',' ') + '</a>')
           end
         end
         

_plugins/plugin.rb

@@ -36,6 +36,13 @@ module Jekyll
       if translation.nil? || translation.empty?
         Jekyll.logger.abort_with "Missing key: #{key}"
       end
+      
+      # If we have an @, pass the string through the markdown converter, so that we hit the Moneropedia plugin
+      if translation.include? '@'
+        converter = site.getConverterImpl(::Jekyll::Converters::Markdown)
+        translation = converter.convert(translation)[3..-6]
+      end
+
       translation
     end
   end

_strings_en.yml

@@ -42,7 +42,8 @@ menu:
   irc-mining: "#monero-pools (Mining)"
 index:
   page_title: "Monero - secure, private, untraceable"
-  what_is: What is
+  what_is_1: What is
+  what_is_2: " ?"
   what_is_orange_block: "Monero is a secure, private, untraceable currency that is open-source and freely available to all."
   what_is_text_block_1: "You are your own bank, you control and are responsible for your funds, and nobody can trace your transfers."
   what_is_text_block_2: "Want to find out more? An overview of Monero's main features are below, and if you'd like to try Monero for yourself the"
@@ -50,36 +51,27 @@ index:
   what_is_text_block_4: "section is an excellent launching point."
   news: News
   the_latest: The Latest
-  date_1: July 6th
-  date_2: July 27th
-  news_1: "Monero Missive #5"
-  news_2: "Monero Missive #4"
-  news_text_1: "includes an update on new features (rpcwallet and properly daemonizing the daemon) that are ready for testing."
-  news_text_2: "includes fluffypony at the Bitcoin Supernode conference, as well as major changes to keep the Monero daemon and wallet a lot more stable and reliable."
   private: Private
   secure: Secure
   untraceable: Untraceable
-  private_text: "Monero uses a cryptographically sound system to allow you to send and receive funds without your transactions being easily revealed on the blockchain (the ledger of transactions that everyone has). This ensures that your purchases, receipts, and all transfers remain absolutely private by default."
-  untraceable_text: "By taking advantage of ring signatures, a special property of certain types of cryptography, Monero is able to ensure that transactions are not only untraceable, but have an optional measure of ambiguity that ensures that transactions cannot easily be tied back to an individual user or computer."
-  secure_text: "Using the power of a distributed peer-to-peer consensus network, every transaction on the network is cryptographically secured. Individual wallets have a 24 word mnemonic that is only displayed once, and can be written down to backup the wallet. Wallet files are encrypted with a passphrase to ensure they are useless if stolen."
-  why_use: Why use
-  why_1: "It's private by default, optionally transparent (just like cash!) - the details of individual transactions, or even of an entire wallet, can be revealed publicly or privately"
-  why_2: "It has a a strong core team actively developing Monero, along with an amazing group of of mathematicians, cryptographers, developers, and marketing specialists actively working on it"
-  why_3: "A great deal of focus has been placed on improving the usability of Monero, with the aim of providing a cryptocurrency that is more readily accessible to end users"
-  why_4: "It was launched fairly and evenly, with no single entity unfairly controlling any significant amount of Monero or providing any sort of unfair advantage (such as an 'instamine' or 'premine')"
-  how_do_i: "How do I "
+  private_text: "Monero uses a cryptographically sound system to allow you to send and receive funds without your @transactions being easily revealed on the @blockchain (the distributed ledger of transactions). This ensures that your purchases, receipts, and all transfers remain absolutely private by default."
+  untraceable_text: "By taking advantage of @ring-signatures, a special property of certain types of cryptography, Monero is able to ensure that transactions are not only untraceable, but have an optional measure of ambiguity that ensures that transactions cannot easily be tied back to an individual user or computer."
+  secure_text: "Using the power of a distributed peer-to-peer @consensus network, every transaction on the network is cryptographically secured. Individual @accounts have a 25 word @mnemonic-seed that is only displayed once, and can be written down to backup the @account. Account files are encrypted with a passphrase to ensure they are useless if stolen."
+  how_do_i_1: "How do I "
+  how_do_i_2: " ?"
   get_started: get started
-  get_started_1: "The fastest way to start using Monero is by using a web wallet such as "
+  get_started_1: "The fastest way to start using Monero is by using a web @account manager such as "
   mymonero: "MyMonero"
   get_started_2: "."
-  get_started_3: "Alternatively, if you would like to run a full Monero node you can download the client and a kick-starter blockchain (to bring your local client up to speed) using the download link on the right."
+  get_started_3: "Alternatively, if you would like to run a [full Monero node](/getting-started/running) you can download the client and a kick-starter @blockchain (to bring your local client up to speed) using the download link on the right."
   where_can_i: Where can I
-  download: download
+  download_1: download
+  download_2: " ?"
   different_os: "Need it for a different operating system?"
   all_downloads: View all available downloads here
   c_download: Download
   monero_for: Monero for
-  latest_blockchain: Latest Blockchain
+  latest_blockchain: Latest @Blockchain
 blog:
   title_1: All
   title_2: Blog

home.php

@@ -7,7 +7,7 @@ Title: Home
       <div class="row info-boxes">
         <div class="col-md-5 monero-info">
             <!-- Icon is based on work by Freepik (http://www.freepik.com) and is licensed under Creative Commons BY 3.0 -->
-            <img src="//static.getmonero.org/images/icon_monero.svg" class="inline-icon" style="height: 60px;"><h2>{% t index.what_is %} <span class="kicks">{% t global.monero %}</span> ?</h2>
+            <img src="//static.getmonero.org/images/icon_monero.svg" class="inline-icon" style="height: 60px;"><h2>{% t index.what_is_1 %} <span class="kicks">{% t global.monero %}</span> {% t index.what_is_2 %}</h2>
             <p class="kicks text-important">{% t index.what_is_orange_block %}</p>
             <p>{% t index.what_is_text_block_1 %}</p>
             <p>{% t index.what_is_text_block_2 %} <a href="/{{ site.lang }}/getting-started/">{% t global.getting_started %}</a> {% t index.what_is_text_block_4 %}<br/>
@@ -56,7 +56,7 @@ Title: Home
           <!-- Icon is by Freepik (http://www.freepik.com) and is licensed under Creative Commons BY 3.0 -->
           <img src="//static.getmonero.org/images/icon_start.svg" class="icon" style="height: 60px;">
           <h2 class="inline">
-            {% t index.how_do_i %}<br><span class="softyellow-kicks">{% t index.get_started %}</span> ?
+            {% t index.how_do_i_1 %}<br><span class="softyellow-kicks">{% t index.get_started %}</span> {% t index.how_do_i_2 %}
           </h2>
           <p style="margin-top: 40px;">{% t index.get_started_1 %}<a href="https://mymonero.com">{% t index.mymonero %}</a>{% t index.get_started_2 %}</p>
           <p>{% t index.get_started_3 %}</p>
@@ -64,7 +64,7 @@ Title: Home
         <div class="col-md-6">
           <div class="left-pad">
           <!-- Icon is by Yannick (http://yanlu.de) and is licensed under Creative Commons BY 3.0 -->
-            <img src="//static.getmonero.org/images/icon_download.svg" class="icon" style="height: 60px;"><h2 class="no-margin hide-breaks inline">{% t index.where_can_i %} <span class="purple-kicks">{% t index.download %}</span> {% t global.monero %} ?</h2>
+            <img src="//static.getmonero.org/images/icon_download.svg" class="icon" style="height: 60px;"><h2 class="no-margin hide-breaks inline">{% t index.where_can_i %} <span class="purple-kicks">{% t index.download_1 %}</span> {% t global.monero %} {% t index.download_2 %}</h2>
           </div>
 
           <div class="left-pad download-links-container">

knowledge-base/moneropedia/account.md

@@ -9,7 +9,7 @@ summary: "similar in function to a bank account, contains all of your sent and r
 
 Those familiar with Monero's predecessors will be more familiar with the term *wallet* to describe this. In Monero we call this an account, and it is a private account owned and operated by a Monero user.
 
-Your account contains all of the Monero @transactions you have sent and received. Your account balance is a sum of all the Monero you've received, less the Monero you've sent. When using Monero you may notice that your account has two balances, a locked and an unlocked balance. The unlocked balance contains funds that can be spent immediately, and the locked balance contains funds that you can't spend right now. You may receive a transaction that has an @unlocktime set, or you may have sent some Monero and are waiting for the @change to come back to your wallet, both situations that could lead to those funds being locked for a time.
+Your account contains all of the Monero @transactions you have sent and received. Your account balance is a sum of all the Monero you've received, less the Monero you've sent. When using Monero you may notice that your account has two balances, a locked and an unlocked balance. The unlocked balance contains funds that can be spent immediately, and the locked balance contains funds that you can't spend right now. You may receive a transaction that has an @unlock-time set, or you may have sent some Monero and are waiting for the @change to come back to your wallet, both situations that could lead to those funds being locked for a time.
 
 A key difference between traditional electronic currency and Monero is that your account resides only under your control, normally on your computer, and cannot be accessed by anyone else if you [practice good security](#practicing-good-security).
 
@@ -23,13 +23,13 @@ This means that individuals can easily create a Monero account for themselves as
 
 Monero relies heavily on a cryptography principle known as *public/private key cryptography* or *asymmetric cryptography*, which is thoroughly detailed in [this Wikipedia article](https://en.wikipedia.org/wiki/Public-key_cryptography).
 
-Your account is based on two keys, a @spendkey and a @viewkey. The @spendkey is special in that it is the single key required to spend your Monero funds, whereas the @viewkey is allows you to reveal your @transactions to a third party, for example for auditing or accounting purposes. These keys in your account also play an important role in Monero's @transactionprivacy.
+Your account is based on two keys, a @spend-key and a @view-key. The @spend-key is special in that it is the single key required to spend your Monero funds, whereas the @view-key allows you to reveal your @transactions to a third party, for example for auditing or accounting purposes. These keys in your account also play an important role in Monero's @transaction-privacy.
 
 The private keys for both of these must be protected by you in order to retain your account privacy. On the other hand, the public keys are obviously public (they are part of your Monero account address). For normal public/private key cryptography someone could send you a private message by encrypting it with either of your public keys, and you would then be the only one able to decrypt it with your private keys.
 
 ### Backing Up Your Account
 
-Because no body holds your Monero on your behalf, you are responsible for your account. Thankfully, Monero makes it very easy to backup your account. When creating a Monero account for the first time you will be given a unique @mnemonicseed for your account that consists of 13 or 25 words in the language of your choosing. **This seed is the only thing you need to backup for your account**, and so it is imperative that it is written down.
+Because no body holds your Monero on your behalf, you are responsible for your account. Thankfully, Monero makes it very easy to backup your account. When creating a Monero account for the first time you will be given a unique @mnemonic-seed for your account that consists of 13 or 25 words in the language of your choosing. **This seed is the only thing you need to backup for your account**, and so it is imperative that it is written down.
 
 {:.cli-code}
 List of available languages for your wallet's seed:
@@ -58,10 +58,10 @@ As the example above indicates, it is incredibly important to store these words
 
 ### Practicing Good Security
 
-Over and above backing up your @mnemonicseed so that you have access to your account in the event of critical data loss, it is also important to practice good security. Use a secure password when creating a local Monero account (not used on [MyMonero](https://mymonero.com) or other web-based account systems).
+Over and above backing up your @mnemonic-seed so that you have access to your account in the event of critical data loss, it is also important to practice good security. Use a secure password when creating a local Monero account (not used on [MyMonero](https://mymonero.com) or other web-based account systems).
 
-Don't ever give your Monero account password to anyone, as this can be used to access the Monero on your computer without knowing your @mnemonicseed. Similarly, make sure you have running and up-to-date antivirus, especially on Windows computers. Finally, be careful when clicking links in emails or on unknown and untrusted websites, as malware installed on your computer can sit and wait for you to access your Monero account before taking the funds from it.
+Don't ever give your Monero account password to anyone, as this can be used to access the Monero on your computer without knowing your @mnemonic-seed. Similarly, make sure you have running and up-to-date antivirus, especially on Windows computers. Finally, be careful when clicking links in emails or on unknown and untrusted websites, as malware installed on your computer can sit and wait for you to access your Monero account before taking the funds from it.
 
 ### Leaving Your Account to Next of Kin
 
-Providing access to your Monero account to your next of kin is just as easy as it is to backup your Monero account. Simply leave your @mnemonicseed to them in your will, or store it somewhere save where it will be given to them upon the execution of your will. A key advantage to this is that your next of kin won't have to wait for months for a third party to release the funds to them.
+Providing access to your Monero account to your next of kin is just as easy as it is to backup your Monero account. Simply leave your @mnemonic-seed to them in your will, or store it somewhere save where it will be given to them upon the execution of your will. A key advantage to this is that your next of kin won't have to wait for months for a third party to release the funds to them.

knowledge-base/moneropedia/block.md

@@ -2,7 +2,7 @@
 layout: moneropedia
 entry: "Block"
 terms: ["block", "blocks"]
-summary: "a container of transactions"
+summary: "a container of transactions, a sequence of which forms a blockchain"
 ---
 
 ### The Basics

knowledge-base/moneropedia/blockchain.md

+---
+layout: moneropedia
+entry: "Blockchain"
+terms: ["blockchain", "blockchains"]
+summary: "a distributed ledger of all transactions both past and present, without revealing who the funds came from or went to"
+---
+
+### The Basics
+

knowledge-base/moneropedia/change.md

+---
+layout: moneropedia
+entry: "Change"
+terms: ["change"]
+summary: "Monero sent as part of a transaction, but unique in that returns to your account instead of going to a recipient"
+---
+
+### The Basics
+

knowledge-base/moneropedia/transaction.md

@@ -2,7 +2,7 @@
 layout: moneropedia
 entry: "Transactions"
 terms: ["transaction", "transactions"]
-summary: "sending Monero to a recipient or recipients"
+summary: "a cryptographically signed container that details the transfer of Monero to a recipient (or recipients)"
 ---
 
 ### The Basics

knowledge-base/moneropedia/unlocktime.md

+---
+layout: moneropedia
+entry: "Transaction Unlock Time"
+terms: ["unlock-time"]
+summary: "a special transaction where the recipient can only spend the funds after a future date, as set by the sender"
+---
+
+### The Basics
+