merged code from main branch, fixed merged conflict

This commit is contained in:
Calvin Jhunjhnuwala
2020-08-31 14:05:10 -07:00
14 changed files with 2722 additions and 272 deletions

View File

@@ -68,7 +68,7 @@
</table>
</div>
</section>
<section class="row mb-50">
<h6 class="section-marker">{% trans %}Finite Supply of XRP {% endtrans %}</h6>
@@ -78,10 +78,10 @@
<div class="col-lg-4 order-2 order-lg-1">
<p>{% trans %}XRP can be sent directly without needing a central intermediary, making it a convenient instrument in bridging two different currencies quickly and efficiently. It is freely exchanged on the open market and used in the real world for enabling cross-border payments and microtransactions.{% endtrans %}</p>
<p>{% trans %}Unlike Bitcoin, there is a finite amount of XRP. All XRP is already in existence today—100 billion in total.{% endtrans %}</p>
<a href="#" class="btn btn-clear">{% trans %}History of XRP{% endtrans %}</a>
<a href="history.html" class="btn btn-clear">{% trans %}History of XRP{% endtrans %}</a>
</div>
</section>
<section class="row mb-50">
<h6 class="section-marker">{% trans %}XRP Validators{% endtrans %}</h6>
<div class="col-md-4 mb-10">
@@ -101,7 +101,7 @@
</div>
<div class="col-lg-5 offset-lg-1">
<h4 class="mb-10">{% trans %}Anyone can operate a validator; currently, over 150 validators are active on the ledger, operated by universities, exchanges, businesses and individuals.{% endtrans %}</h4>
<a href="#" class="btn btn-clear">{% trans %}Get Technical{% endtrans %}</a>
<a href="consensus-network.html" class="btn btn-clear">{% trans %}Get Technical{% endtrans %}</a>
</div>
</section>
@@ -115,17 +115,17 @@
<div class="col-md-4 mb-20">
<h4>{% trans %}Businesses{% endtrans %}</h4>
<p class="my-10">{% trans %}Many businesses are building on the XRP Ledger, pursuing powerful use cases in micropayments, gaming, web monetization and more. Additionally, Ripple, the technology company, is focused on building a network and infrastructure that leverages XRP to power faster, more affordable cross-border payments around the world.{% endtrans %}</p>
<a href="#" class="text-white bold arrow-link">{% trans %}More About Businesses{% endtrans %}</a>
<a href="businesses.html" class="text-white bold arrow-link">{% trans %}More About Businesses{% endtrans %}</a>
</div>
<div class="col-md-4 mb-20">
<h4>{% trans %}Individuals{% endtrans %}</h4>
<p class="my-10">{% trans %}Individual consumers can use XRP to move different currencies around the world. For example, through the PayID solution, anyone can use XRP—or any currency, be it fiat or digital assets—to easily make purchases across any payments network.{% endtrans %}</p>
<a href="#" class="text-white bold arrow-link">{% trans %}More About Uses{% endtrans %}</a>
<a href="uses.html" class="text-white bold arrow-link">{% trans %}More About Uses{% endtrans %}</a>
</div>
<div class="col-md-4">
<h4>{% trans %}Developers{% endtrans %}</h4>
<p class="my-10">{% trans %}By building on the XRP Ledger, developers can easily integrate payments into their products—seamlessly putting money at the center of their applications. Projects like the <a href="#">Xpring developer platform</a> are making it easier for developers to leverage XRP. {% endtrans %}</p>
<a href="#" class="text-white bold arrow-link">{% trans %}More About Developers{% endtrans %}</a>
<p class="my-10">{% trans %}By building on the XRP Ledger, developers can easily integrate payments into their products—seamlessly putting money at the center of their applications. Projects like the <a href="https://xpring.io/">Xpring developer platform</a> are making it easier for developers to leverage XRP. {% endtrans %}</p>
<a href="docs.html" class="text-white bold arrow-link">{% trans %}More About Developers{% endtrans %}</a>
</div>
</section>
@@ -177,7 +177,7 @@
</div>
</div>
<div class="text-center">
<a href="#" class="btn btn-clear">{% trans %}Explore Uses{% endtrans %}</a>
<a href="uses.html" class="btn btn-clear">{% trans %}Explore Uses{% endtrans %}</a>
</div>
</section>
@@ -186,26 +186,26 @@
<div class="row">
<div class="col-md-6 order-1 order-md-2 mb-10">
<div class="d-flex flex-wrap w-100">
<a class="square square-50 d-flex card-b" href="#">
<a class="square square-50 d-flex card-b" href="https://www.coinbase.com/">
<img class="mw-100" src="./img/exchanges/coinbase.png">
</a>
<a class="square square-50 d-flex card-b" href="#">
<a class="square square-50 d-flex card-b" href="https://www.binance.com/">
<img class="mw-100" src="./img/exchanges/binance.png">
</a>
<a class="square square-50 d-flex card-b" href="#">
<a class="square square-50 d-flex card-b" href="https://www.bitstamp.net/">
<img class="mw-100" src="./img/exchanges/bitstamp.png">
</a>
<a class="square square-50 d-flex card-b" href="#">
<a class="square square-50 d-flex card-b" href="https://www.kraken.com/">
<img class="mw-100" src="./img/exchanges/kraken.png">
</a>
</div>
</div>
<div class="col-md-5 order-2 order-md-1">
<h2 class="mb-10">{% trans %}How Is XRP Used in Trading?{% endtrans %}</h2>
<p>{% trans %}XRP is traded on more than 140 markets and <a href="/exchanges">exchanges</a> worldwide.{% endtrans %}</p>
<p>{% trans %}XRP is traded on more than 140 markets and <a href="exchanges.html">exchanges</a> worldwide.{% endtrans %}</p>
<p>{% trans %}XRPs low transaction fees, reliability and high speed enable traders to use the digital asset as high-speed, cost-efficient and reliable collateral across trading venues—seizing arbitrage opportunities, servicing margin calls and managing general trading inventory in real time.{% endtrans %}</p>
<p>{% trans %}Because of the properties inherent to XRP and the ecosystem around it, traders worldwide are able to shift collateral, bridge currencies and switch from one crypto into another nearly instantly, across any exchange on the planet.{% endtrans %}</p>
<a href="#" class="mt-10 btn btn-clear">{% trans %}Find Out More{% endtrans %}</a>
<a href="exchanges.html" class="mt-10 btn btn-clear">{% trans %}Find Out More{% endtrans %}</a>
</div>
</div>
</section>
@@ -219,7 +219,7 @@
<div class="col-md-5 offset-md-1">
<h2 class="mb-10">{% trans %}What Is the Relationship Between Ripple and XRP?{% endtrans %}</h2>
<p>{% trans %}Ripple is a technology company that makes it easier to build a high-performance, global payments business through its platform, RippleNet. XRP is a digital asset independent of this, and is used in Ripples On-Demand Liquidity service to facilitate efficient and cost-effective cross-border transactions.{% endtrans %}</p>
<a href="#" class="mt-10 btn btn-clear">{% trans %}Visit Ripple's Website{% endtrans %}</a>
<a href="https://ripple.com/" class="mt-10 btn btn-clear">{% trans %}Visit Ripple's Website{% endtrans %}</a>
</div>
</div>
</section>
@@ -233,7 +233,7 @@
<div class="col-md-5 order-2 order-md-1">
<h2 class="mb-10">{% trans %}XRPL.org: For the Community, by the Community{% endtrans %}</h2>
<p>{% trans %}XRPL.org is a community-driven resource for all things XRP and XRP Ledger (XRPL). If youd like to suggest additional information around XRP, you can suggest changes here.{% endtrans %}</p>
<a href="#" class="mt-10 btn btn-clear">{% trans %}Suggest Changes{% endtrans %}</a>
<a href="contribute.html" class="mt-10 btn btn-clear">{% trans %}Suggest Changes{% endtrans %}</a>
</div>
</div>
</section>