Fixed pricing for ProtonVPN (#1829)

_includes/sections/email-providers.html

@@ -19,7 +19,7 @@ <h1 id="email" class="anchor"><a href="#email"><i class="fas fa-link anchor-icon
     <h2 id="protonmail" class="anchor"><a href="#protonmail"><i class="fas fa-link anchor-icon"></i></a> ProtonMail <span class="badge badge-info">Free</span></h2>
     <p><strong><a href="https://protonmail.com">ProtonMail.com</a></strong> is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since <strong>2013</strong>. ProtonMail is based in Genève, <span class="flag-icon flag-icon-ch"></span> Switzerland. Accounts start with 500 MB storage with their free plan.</p>
 
-    <p>Free accounts have some limitations and do not allow the use of the <a href="https://protonmail.com/bridge">ProtonMail Bridge</a>, which is required to use a <a href="/software/email">recommended email client</a> (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at <strong>€48/Year</strong> which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search <code>To:</code>, <code>From:</code>, <code>Date:</code> and <code>Subject:</code> (this is likely to change when <a href="https://reddit.com/comments/cqwk2a/comment/ex21b4e">v4.0</a> of ProtonMail is released).</p>
+    <p>Free accounts have some limitations and do not allow the use of the <a href="https://protonmail.com/bridge">ProtonMail Bridge</a>, which is required to use a <a href="/software/email">recommended email client</a> (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at <strong>€48/y</strong> which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search <code>To:</code>, <code>From:</code>, <code>Date:</code> and <code>Subject:</code> (this is likely to change when <a href="https://reddit.com/comments/cqwk2a/comment/ex21b4e">v4.0</a> of ProtonMail is released).</p>
 
     <h5><span class="badge badge-success">Domains and Aliases</span></h5>
     <p>Paid ProtonMail users can use their own domain with the service. <a href="https://protonmail.com/support/knowledge-base/catch-all/">Catch-all</a> addresses are supported with custom domains for Professional and Visionary plans. ProtonMail also supports <a href="https://protonmail.com/support/knowledge-base/creating-aliases/">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
@@ -54,7 +54,7 @@ <h5><span class="badge badge-info">Extra Functionality</span></h5>
         alt="Mailbox">
     </div>
     <div class="col">
-    <h2 id="mailbox" class="anchor"><a href="#mailbox"><i class="fas fa-link anchor-icon"></i></a> Mailbox.org <span class="badge badge-info">€12/Year</span></h2>
+    <h2 id="mailbox" class="anchor"><a href="#mailbox"><i class="fas fa-link anchor-icon"></i></a> Mailbox.org <span class="badge badge-info">€12/y</span></h2>
     <p><strong><a href="https://mailbox.org">Mailbox.org</a></strong> is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since <strong>2014</strong>. Mailbox.org is based in Berlin, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.</p>
 
     <h5><span class="badge badge-success">Domains and Aliases</span></h5>
@@ -91,7 +91,7 @@ <h5><span class="badge badge-info">Extra Functionality</span></h5>
         alt="Posteo">
     </div>
     <div class="col">
-    <h2 id="posteo" class="anchor"><a href="#posteo"><i class="fas fa-link anchor-icon"></i></a> Posteo <span class="badge badge-info">€12/Year</span></h2>
+    <h2 id="posteo" class="anchor"><a href="#posteo"><i class="fas fa-link anchor-icon"></i></a> Posteo <span class="badge badge-info">€12/y</span></h2>
     <p><strong><a href="https://posteo.de">Posteo.de</a></strong> is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since <strong>2009</strong>. Posteo is based in <span class="flag-icon flag-icon-de"></span> Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.</p>
 
     <h5><span class="badge badge-warning">Domains and Aliases</span></h5>
@@ -127,7 +127,7 @@ <h5><span class="badge badge-info">Extra Functionality</span></h5>
         alt="Soverin">
     </div>
     <div class="col">
-    <h2 id="soverin" class="anchor"><a href="#soverin"><i class="fas fa-link anchor-icon"></i></a> Soverin <span class="badge badge-info">€29/Year</span></h2>
+    <h2 id="soverin" class="anchor"><a href="#soverin"><i class="fas fa-link anchor-icon"></i></a> Soverin <span class="badge badge-info">€29/y</span></h2>
     <p><strong><a href="https://soverin.net">Soverin.net</a></strong> is an email provider which focuses on being private, ad-free, and powered by sustainable energy. They have been in operation since <strong>2015</strong>. Soverin is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam and does not have a free trial. Accounts start at 25 GB.</p>
 
     <h5><span class="badge badge-success">Domains and Aliases</span></h5>
@@ -229,7 +229,7 @@ <h5><span class="badge badge-danger">.onion Service</span></h5>
     <h5><span class="badge badge-info">Extra Functionality</span></h5>
     <p>Tutanota offers the business version of <a href="https://tutanota.com/blog/posts/secure-email-for-non-profit">Tutanota to non-profit organizations</a> for free or with a heavy discount.</p>
 
-    <p>Tutanota also has a business feature called <a href="https://tutanota.com/secure-connect/">Secure Connect</a>. This ensures customer contact to the business uses E2EE. The feature costs €240/year.</p>
+    <p>Tutanota also has a business feature called <a href="https://tutanota.com/secure-connect/">Secure Connect</a>. This ensures customer contact to the business uses E2EE. The feature costs €240/y.</p>
     </div>
   </div>
 </div>

_includes/sections/vpn.html

@@ -19,7 +19,7 @@ <h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></
     <div class="col">
     <h2 id="mullvad" class="anchor">
       <a href="#mullvad"><i class="fas fa-link anchor-icon"></i></a> Mullvad
-      <span class="badge badge-info">EUR €60/Year</span>
+      <span class="badge badge-info">EUR €60/y</span>
     </h2>
     <p><strong><a href="https://mullvad.net/">Mullvad.net</a> </strong> is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since <strong>2009</strong>. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial.</p>
     <h5><span class="badge badge-success">35 Countries</span></h5>
@@ -54,9 +54,10 @@ <h5><span class="badge badge-info">Extra Functionality</span></h5>
     <h2 id="protonvpn" class="anchor">
       <a href="#protonvpn"><i class="fas fa-link anchor-icon"></i></a> ProtonVPN
       <span class="badge badge-info">Free</span>
-      <span class="badge badge-info">USD $96/year</span>
+      <span class="badge badge-info">Basic USD $48/y</span>
+      <span class="badge badge-secondary">Plus USD $96/y</span>
     </h2>
-    <p><strong><a href="https://protonvpn.com/">ProtonVPN.com</a></strong> is a strong contender in the VPN space, and they have been in operation since <strong>2016</strong>. ProtonVPN is based in <span class="flag-icon flag-icon-ch"></span> Switzerland and offers a limited free pricing tier, as well as premium options.</p>
+    <p><strong><a href="https://protonvpn.com/">ProtonVPN.com</a></strong> is a strong contender in the VPN space, and they have been in operation since <strong>2016</strong>. ProtonVPN is based in <span class="flag-icon flag-icon-ch"></span> Switzerland and offers a limited free pricing tier, as well as premium options. They offer a further 14% discount for buying a 2 year subscription.</p>
     <h5><span class="badge badge-success">44 Countries</span></h5>
     <p>ProtonVPN has <a href="https://protonvpn.com/vpn-servers">servers in 44 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
     <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
@@ -81,8 +82,8 @@ <h5><span class="badge badge-info">Extra Functionality</span></h5>
     <div class="col">
     <h2 id="ivpn" class="anchor">
       <a href="#ivpn"><i class="fas fa-link anchor-icon"></i></a> IVPN
-      <span class="badge badge-info">Standard USD $60/Year</span>
-      <span class="badge badge-secondary">Pro USD $100/Year</span>
+      <span class="badge badge-info">Standard USD $60/y</span>
+      <span class="badge badge-secondary">Pro USD $100/y</span>
     </h2>
     <p><strong><a href="https://www.ivpn.net">IVPN.net</a></strong> is another premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial.</p>
     <h5><span class="badge badge-success">32 Countries</span></h5>