diff --git a/_i18n/en.yml b/_i18n/en.yml index 9edee4e..f7401a3 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -18,13 +18,19 @@ pages: video-btn: Overview Video sentinel-btn: Sentinel + slack-btn: Slack Chanel + forum-btn: Dash Forums + prototype-heading: Dash Evolution Prototype prototype-text: We will be writing the software for this project in stages, the first stage will take about 2 months to have a very early prototype for Dash Evolution that includes a basic implementation of DashDrive, Primitives, DAPI and a simple T3 wallet. In six to eight months, we should be entering testnet phase with most basic functionality. In 12-18 months, we plan for the first release version (a stable prototype). prototype-btn: Dash Prototype + slack-btn: Slack Chanel + forum-btn: Dash Forums + component-heading: Dash Evolution Prototype - component-text: We will be writing the software for this project in stages, the first stage will take about 2 months to have a very early prototype for Dash Evolution that includes a basic implementation of DashDrive, Primitives, DAPI and a simple T3 wallet. In six to eight months, we should be entering testnet phase with most basic functionality. In 12-18 months, we plan for the first release version (a stable prototype). - component-btn: Dash Prototype + component-text: > + Included below is our current work on Evolution, that adds many components such as: feature-private-heading: Private diff --git a/evolution/index.html b/evolution/index.html index 9f01d03..b8131be 100755 --- a/evolution/index.html +++ b/evolution/index.html @@ -47,9 +47,9 @@ description: pages.evolution.description
-

{% t pages.update.integrate-heading %}

+

{% t pages.evolution.component-heading %}

- {% tmd pages.update.integrate-text %} + {% tmd pages.evolution.component-text %}
@@ -60,8 +60,8 @@ description: pages.evolution.description
-

EVOLUTION

-

Lead evolution developer Andy Freer has been locked away producing huge amounts of documentation for the various concepts of Evolution.

+

DashDrive

+

A decentralized shared file system that lives on the second tier network

@@ -71,8 +71,8 @@ description: pages.evolution.description
-

RESEARCH

-

In January 2016 we released an early Evolution prototype based on Electrum which enabled basic functions such as registering a username and paying friends by name.

+

DAPI

+

A decentralized API which allows third tier users to access the network securely

@@ -82,8 +82,8 @@ description: pages.evolution.description
-

FRONTEND

-

The 3 main areas of frontend design and development have been to design a secure, SPV based Web Wallet, merchant tools to enable drag-and-drop checkout on a website, and an SDK that connects web clients to DAPI.

+

DashPay Decentralized Wallets

+

These wallets are light clients connected to the network via DAPI and run on various platforms

@@ -93,8 +93,8 @@ description: pages.evolution.description
-

BACKEND

-

The first has been to port BitPay’s Bitcore Platform to Dash including merging Bitcore Node to DashCore 12.1 for native API support.

+

Second Tier

+

The masternode network, which provides compensated infrastructure for the project

@@ -104,8 +104,8 @@ description: pages.evolution.description
-

CORE

-

Evolution Core work has been focused on first providing a basis to the new system in the form of Sentinel and improving DashCore to be implementation-agnostic to governance functions and objects.

+

Budgets

+

The second tier is given voting power to allocate funds for specific projects on the network via the budget system

@@ -115,8 +115,30 @@ description: pages.evolution.description
-

NETWORK

-

Enforcement will be turned off for this network upgrade, meaning nodes running the old version of the Dash software (12.0) will quickly stop being paid (contingent on miners upgrading).

+

Governance

+

The second tier is given voting power to govern the currency and chart the course the currency takes

+
+ + +
+ +
+ +
+
+

Quorum Chain

+

This feature introduces a permanent stable masternode list, which can be used to calculate past and present quorums

+
+ +
+
+ +
+ +
+
+

Social Wallet

+

We introduce a social wallet, which allows friends lists, grouping of users and shared multisig accounts.
@@ -124,37 +146,12 @@ description: pages.evolution.description
- {% t pages.update.slack-btn %} - {% t pages.update.forum-btn %} + {% t pages.evolution.slack-btn %} + {% t pages.evolution.forum-btn %}
- -
-
-
-
- {% t pages.home.feature-instant-heading %} -

{% t pages.home.feature-instant-heading %}

- {% tmd pages.home.feature-instant-text %} -
-
- {% t pages.home.feature-private-heading %} -

{% t pages.home.feature-private-heading %}

- {% tmd pages.home.feature-private-text %} -
-
- {% t pages.home.feature-secure-heading %} -

{% t pages.home.feature-secure-heading %}

- {% tmd pages.home.feature-secure-text %} -
-
-
-