diff --git a/_i18n/en.yml b/_i18n/en.yml index 63dc6cb..0f9d5c8 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -21,14 +21,14 @@ pages: 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 + evo-prototype-heading: Dash Evolution Prototype + evo-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). + evo-prototype-btn: Dash Prototype slack-btn: Slack Chanel forum-btn: Dash Forums - component-heading: Dash Evolution Prototype + component-heading: Components component-text: > Included below is our current work on Evolution, that adds many components such as: @@ -48,21 +48,43 @@ pages: proposal-btn: Proposals proposal-submit-btn: Submit a Proposal - evolution-research-heading: EVOLUTION RESEARCH - evolution-research-text: - 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. + prototype-heading: Evolution Prototype + prototype-text: + Explore all of the features of the Dash Evolution prototype. Including Registration, Validation of the account, login, friending, pay-to-alias and pay-with-dash buttons. - The prototype was pretty basic, with user interaction limited to just paying a few friends and user data stored on a dev server, but at least it proved the concept. - What we set out to do then was to design and prototype all the key technologies that would make these functions work in a purely P2P way, with data secured on the Dash blockchain and accessible from anywhere on any device, with integrated SPV based security and no centralized intermediary services required, and using the most common and censorship resistant protocol available – HTTP(S) - evolution-research-btn: Network Stats - launching-heading: LAUNCHING DATES - launching-text: > - Launching a new software release on the network requires that all budget proposals be re-submitted into the system. + We will be releasing many more documents not here yet in the near future, please keep coming back to see updates and progress of Evolution. + prototype-btn: Network Stats - Due to the timing of superblocks, we have a short window to launch, near the beginning of the month. In order to ensure we launch the most stable possible version of the software without interfering with the budget system, we would like to hold off until early February to launch 12.1. Launch date: February 5th, 2017. - launching-btn: Budgets - launching-link: https://www.dashcentral.org/budget + explore-heading: Explore Dash + explore-text: + Explore all of the features of the Dash Evolution prototype. Including Registration, Validation of the account, login, friending, pay-to-alias and pay-with-dash buttons. + + + Since the original research phase, documentation, specifications, plans and diagrams have been being drafted, growing into a collection of documents that will be put into a wiki with full documentation for Evolution’s end-to-end design and implementation. + + subscribe-btn: Subscribe to News + follow-soc-btn: Follow Twitter + + merchants-heading: MERCHANTS + merchants-text: + Add Dash payments to your app in minutes using common web standards. + + Forget about complex infrastructure or centralized services being needed to handle your customer's funds. Keep full control of your funds without the hassle or hidden costs of centralized payment processors. + + merchants-btn: For Merchants + merchants-plugin-btn: Woocommerce Plugin + + + social-heading: Dash Social + + social-text: > + Create an account you can access securely from anywhere on any device. Invite and connect with friends to make and receive payments by username. + + Track payments with contacts and share payment descriptions with payees. Clear your transaction history at any time to stay private, as easy as clearing your browser history. + + social-btn: Budgets + social-link: https://www.dashcentral.org/budget update: title: Dash Official Website | Dash Crypto Currency diff --git a/evolution/index.html b/evolution/index.html index 2c8ae95..b8af01b 100755 --- a/evolution/index.html +++ b/evolution/index.html @@ -31,18 +31,18 @@ description: pages.evolution.description
-

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

+

{% t pages.evolution.evo-prototype-heading %}

- {% tmd pages.evolution.prototype-text %} + {% tmd pages.evolution.evo-prototype-text %} - {% t pages.evolution.prototype-btn %} + {% t pages.evolution.evo-prototype-btn %}
@@ -167,66 +167,92 @@ description: pages.evolution.description {% t pages.evolution.docs-btn %}
- {% t pages.home.docs-heading %} + {% t pages.evolution.docs-heading %}
-
-
-
-
-

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

- - {% tmd pages.update.update-text %} - -
-
- {% t pages.update.update-heading %} -
-
-
-
- -
-

{% t pages.update.evolution-research-heading %}

+

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

- {% tmd pages.update.evolution-research-text %} + {% tmd pages.evolution.prototype-text %} - {% t pages.update.evolution-research-btn %} + {% t pages.evolution.prototype-btn %}
- {% t pages.update.research-heading %} + {% t pages.update.research-heading %} +
+
+
+
+ + + +
+
+
+
+

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

+ + {% tmd pages.evolution.explore-text %} + {% t pages.evolution.subscribe-btn %} + {% t pages.evolution. follow-soc-btn %} +
+
+ {% t pages.evolution.explore-heading %}
+
+
+
+
+

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

+ + {% tmd pages.evolution.merchants-text %} + + {% t pages.evolution.merchants-btn %} + {% t pages.evolution.merchants-plugin-btn %} +
+
+ {% t pages.evolution.merchants-heading %} +
+
+
+
+ + + +
-

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

+

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

- {% tmd pages.update.launching-text %} + {% tmd pages.evolution.social-text %} - {% t pages.update.launching-btn %} + {% t pages.evolution.subscribe-btn %} + {% t pages.evolution.follow-soc-btn %}
- Dash Evolution + Dash Evolution