Release/0.18

src/common/containers/Company/lib/Whitepaper/View.jsx

@@ -28,7 +28,7 @@ const Whitepaper = ({ classes, onWhitepaperClick }) => (
 
       <Button
         onClick={onWhitepaperClick}
-        href={fileUrl('images/whitepaper_v0.pdf')}
+        href={fileUrl('whitepaper_v0.pdf')}
         target="_blank"
         secondary
       >

src/common/containers/Developers/lib/SmartContractsInfo/index.jsx

@@ -21,7 +21,7 @@ const WavesNgInfo = () => (
       <Typography inverted type="display1">
         <FormattedMessage
           id="developers.smart.title"
-          defaultMessage="Smart Contracts & Smart Accounts"
+          defaultMessage="Versatile functionality for any use case"
         />
       </Typography>
       <Typography inverted type="body2">
@@ -34,7 +34,7 @@ const WavesNgInfo = () => (
       <Typography inverted>
         <FormattedHTMLMessage
           id="developers.smart.text"
-          defaultMessage="We have created a new programming language, RIDE, which makes it very easy for anyone to set up a Smart Account. To bring you the sophisticated tools required for launching a dApp, we are creating Smart Contracts, which enables users to execute any set of instructions on the Waves blockchain."
+          defaultMessage="RIDE, our purpose-designed programming language, makes it straightforward to apply scripted conditions to both accounts and assets. We are currently creating Turing-complete smart contracts to enable the launch of fully-fledged dApps and the execution of any set of instructions on the blockchain."
         />
       </Typography>
       <Margin />

src/common/containers/SmartContracts/View.jsx

@@ -40,7 +40,7 @@ const PageLayout = ({ onDocumentationClick, classes }) => (
               <Typography type="body2" weight={400} inverted>
                 <FormattedMessage
                   id="smartContracts.block1.text"
-                  defaultMessage="Waves platform is building a blockchain based solutions for real-world business. We are providing smart and flexible tools that will fit for most of the business cases and able to work with real-world data."
+                  defaultMessage="Waves platform is building blockchain-based solutions for enterprise applications. We provide smart and flexible tools capable of interacting with real-world data, designed to meet most business use cases."
                 />
               </Typography>
             </Col>

src/common/containers/SmartContracts/lib/Features/index.jsx

@@ -21,7 +21,7 @@ const MultisigWallet = () => (
       text={
         <FormattedHTMLMessage
           id="smartContracts.features.1.text"
-          defaultMessage="Two-factor authentication<br/>Cannot be controlled by one person alone<br/>The necessary parties must provide their private keys simultaneously"
+          defaultMessage="Two-factor authentication<br/>Cannot be controlled by one person alone<br/>The specified parties must all provide their private keys"
         />
       }
       inverted
@@ -67,7 +67,7 @@ const TokenFreeze = () => (
       text={
         <FormattedMessage
           id="smartContracts.features.3.text"
-          defaultMessage="Preventing buyers from selling or transferring tokens out of their address for a certain amount of time"
+          defaultMessage="Preventing buyers from selling or transferring tokens for a certain period of time"
         />
       }
       inverted
@@ -91,7 +91,7 @@ const DecentralizedApps = () => (
       text={
         <FormattedMessage
           id="smartContracts.features.4.text"
-          defaultMessage="dApps based on Turing-complete smart contracts will be able to undertake complex processes on the blockchain according to a range of different conditions"
+          defaultMessage="dApps based on Turing-complete smart contracts will be able to undertake complex processes on the blockchain according to a wide range of different conditions"
         />
       }
       inverted

src/common/containers/SmartContracts/lib/TwoStageImplementation/index.jsx

@@ -25,7 +25,7 @@ const FEATURES_LIST = [
     rightColumn: [
       <FormattedMessage
         id="smartContracts.plans.stage1.right.text"
-        defaultMessage="Lightweight implementation of smart contracts via smart assets and smart accounts. Release in a testnet in Spring 2018."
+        defaultMessage="Lightweight implementation of smart contracts with limited functionality, based on the most popular and in-demand use cases."
       />,
     ],
   },
@@ -38,16 +38,35 @@ const FEATURES_LIST = [
       />,
       <FormattedMessage
         id="smartContracts.plans.stage2.left.subtitle"
-        defaultMessage="Smart Contracts"
+        defaultMessage="Smart Assets"
       />,
     ],
     rightColumn: [
       <FormattedMessage
         id="smartContracts.plans.stage2.right.text"
-        defaultMessage="Decentralised applications based on Turing-complete smart contracts will be able to undertake complex processes on the blockchain according to a range of different conditions. After the release of Smart Accounts, we'll continue smart contract development to implement sophisticated logic to address almost any computational task."
+        defaultMessage="A unique feature that dramatically extends token functionality, offering the ability to script token behaviour and providing the flexibility to satisfy any developer’s needs."
       />,
     ],
   },
+
+  {
+        leftColumn: [
+            <FormattedMessage
+                id="smartContracts.plans.stage3.left.title"
+                defaultMessage="Stage 3"
+            />,
+            <FormattedMessage
+                id="smartContracts.plans.stage3.left.subtitle"
+                defaultMessage="Smart Contracts"
+            />,
+        ],
+        rightColumn: [
+            <FormattedMessage
+                id="smartContracts.plans.stage3.right.text"
+                defaultMessage="Decentralised applications based on Turing-complete smart contracts will be able to carry out almost any computational task on the blockchain."
+            />,
+        ],
+    },
 ];
 
 const Block = ({ classes, leftColumn, rightColumn }) => (
@@ -92,7 +111,7 @@ const TwoStageImplementation = ({ classes }) => (
     <Typography type="display3" inverted>
       <FormattedMessage
         id="smartContracts.plans.title"
-        defaultMessage="Two-stage Implementation"
+        defaultMessage="Smart Contracts Development Plan"
       />
     </Typography>
     <Margin bottom={4} />

src/server/locale/en.json

@@ -60,9 +60,9 @@
   "developers.ng.subtitle": "Based on the Waves-NG protocol, our system supports up to 6,000 transactions per minute, leaving other blockchains far behind.",
   "developers.ng.text": "In the NG model, the next miner is selected in advance. This miner creates a ‘key block’, which is then immediately filled with microblocks containing transactions, which requires no further proof-of-work. Whilst maintaining the open structure of the protocol, this allows transactions to be confirmed as fast as network latency will allow.",
   "developers.ng.cta": "Learn more",
-  "developers.smart.title": "Smart Contracts & Smart Accounts",
+  "developers.smart.title": "Versatile functionality for any use case",
   "developers.smart.subtitle": "We are building simple, scalable, reliable and robust tools to perform secure and transparent business operations on the Waves blockchain.",
-  "developers.smart.text": "We have created a new programming language, RIDE, which makes it very easy for anyone to set up a Smart Account. To bring you the sophisticated tools required for launching a dApp, we are creating Smart Contracts, which enables users to execute any set of instructions on the Waves blockchain.",
+  "developers.smart.text": "RIDE, our purpose-designed programming language, makes it straightforward to apply scripted conditions to both accounts and assets. We are currently creating Turing-complete smart contracts to enable the launch of fully-fledged dApps and the execution of any set of instructions on the blockchain.",
   "developers.smart.cta": "Learn more",
   "developers.text": "These apps run on a custom built blockchain, an enormously powerful shared global infrastructure that can move value around and represent the ownership of property.",
   "developers.title": "Build applications on the blockchain",
@@ -339,23 +339,26 @@
   "smartContracts.title": "RIDE on Waves blockchain with smart contracts",
   "smartContracts.description": "Scalable failsafe language to serve both basic account security cases and rich decentralized application.",
   "smartContracts.cta.documentation": "Download Whitepaper",
-  "smartContracts.block1.text": "Waves platform is building a blockchain based solutions for real-world business. We are providing smart and flexible tools that will fit for most of the business cases and able to work with real-world data.",
+  "smartContracts.block1.text": "Waves platform is building blockchain-based solutions for enterprise applications. We provide smart and flexible tools capable of interacting with real-world data, designed to meet most business use cases.",
   "smartContracts.features.title": "What Will Smart Contracts Bring to Waves?",
   "smartContracts.features.1.title": "Multisignature Wallet",
-  "smartContracts.features.1.text": "Two-factor authentication<br/>Cannot be controlled by one person alone<br/>The necessary parties must provide their private keys simultaneously",
+  "smartContracts.features.1.text": "Two-factor authentication<br/>Cannot be controlled by one person alone<br/>The specified parties must all provide their private keys",
   "smartContracts.features.2.title": "Atomic Swaps",
   "smartContracts.features.2.text": "Trustless exchange of cryptocurrencies hosted on different blockchains",
   "smartContracts.features.3.title": "Token Freeze",
-  "smartContracts.features.3.text": "Preventing buyers from selling or transferring tokens out of their address for a certain amount of time",
+  "smartContracts.features.3.text": "Preventing buyers from selling or transferring tokens for a certain period of time",
   "smartContracts.features.4.title": "Decentralised applications",
-  "smartContracts.features.4.text": "dApps based on Turing-complete smart contracts will be able to undertake complex processes on the blockchain according to a range of different conditions",
-  "smartContracts.plans.title": "Two-stage Implementation",
+  "smartContracts.features.4.text": "dApps based on Turing-complete smart contracts will be able to undertake complex processes on the blockchain according to a wide range of different conditions",
+  "smartContracts.plans.title": "Smart Contracts Development Plan",
   "smartContracts.plans.stage1.left.title": "Stage 1",
   "smartContracts.plans.stage1.left.subtitle": "Smart Accounts",
   "smartContracts.plans.stage1.right.text": "Lightweight implementation of smart contracts with limited functionality, based on the most popular and in-demand use cases.",
   "smartContracts.plans.stage2.left.title": "Stage 2",
-  "smartContracts.plans.stage2.left.subtitle": "Smart Contracts",
-  "smartContracts.plans.stage2.right.text": "Decentralised applications based on Turing-complete smart contracts will be able to undertake complex processes on the blockchain according to a range of different conditions. After the release of Smart Accounts, we'll continue smart contract development to implement sophisticated logic to address almost any computational task.",
+  "smartContracts.plans.stage2.left.subtitle": "Smart Assets",
+  "smartContracts.plans.stage2.right.text": "A unique feature that dramatically extends token functionality, offering the ability to script token behaviour and providing the flexibility to satisfy any developer’s needs.",
+  "smartContracts.plans.stage3.left.title": "Stage 3",
+  "smartContracts.plans.stage3.left.subtitle": "Smart Contracts",
+  "smartContracts.plans.stage3.right.text": "Decentralised applications based on Turing-complete smart contracts will be able to carry out almost any computational task on the blockchain.",
   "smartContracts.usefulLinks.title": "Useful links",
   "smartContracts.usefulLinks.contracts.title": "Smart Contracts",
   "smartContracts.usefulLinks.contracts.capabilities": "Approach and capabilities",

src/server/locale/ru.json

@@ -54,10 +54,6 @@
   "developers.friendlyAPI.subtitle": "Waves — платформа с открытым кодом. Вы можете использовать API для разработки собственных приложений.",
   "developers.friendlyAPI.text": "Ноды предоставляют доступ ко всей информации в блокчейне Waves, включая историю транзакций, состояние баланса и другой. Через REST API можно легко осуществить перевод, обмен или выпуск токенов, а также сдать баланс в лизинг.",
   "developers.friendlyAPI.title": "Удобный API",
-  "developers.smart.title": "Смарт-контракты и Смарт-аккаунты",
-  "developers.smart.subtitle": "Мы создаем простые, надежные и масштабируемые, инструменты для выполнения безопасных и прозрачных бизнес-операций на блокчейне Waves.",
-  "developers.smart.text": "Мы придумали новый язык программирования, оптимизированный для работы в блокчейн среде и упрощающий создание смарт-контрактов — RIDE. Мы разрабатываем экосистему, которая позволит запускать децентрализованные приложения и реализовывать любой функционал на блокчейне Waves.",
-  "developers.smart.cta": "Узнать больше",
   "developers.text": " Ваши приложения могут работать на блокчейне — мощной, глобально распределенной инфраструктуре. Блокчейн Waves один из самых быстрых NG, масштабируемых и легких в использовании.",
   "developers.title": "Создавайте приложения с использованием блокчейна",
   "developers.wavesEcosystem.explorer": "Многофункциональный блокчейн-explorer",
@@ -333,23 +329,6 @@
   "smartContracts.title": "Используй RIDE на блокчейне Waves для программирования смарт-контрактов",
   "smartContracts.description": "Масштабируемый и отказоустойчивый язык программирования, созданный специально для разработки на блокчейне Waves",
   "smartContracts.cta.documentation": "Скачать Whitepaper",
-  "smartContracts.block1.text": "Платформа Waves строит блокчейн-решения для реального бизнеса. Мы разрабатываем умные и гибкие инструменты, подходящие для большинства бизнес-кейсов и способные работать с данными из реального мира.",
-  "smartContracts.features.title": "Что нового дают смарт-контракты?",
-  "smartContracts.features.1.title": "Мультиподпись",
-  "smartContracts.features.1.text": "Двухфакторная аутентификация<br/>Не может контролироваться одним человеком<br/>Транзакции производятся только по согласию всех участников одновременно",
-  "smartContracts.features.2.title": "Атомик свопы",
-  "smartContracts.features.2.text": "Безопасный обмен токенов, которые находятся на разных блокчейнах",
-  "smartContracts.features.3.title": "Заморозка токенов",
-  "smartContracts.features.3.text": "Внедрение параметра, предотвращающего продажу, или передачу токена на определенное время.",
-  "smartContracts.features.4.title": "Децентрализованные приложения",
-  "smartContracts.features.4.text": "Децентрализованные приложения на Тьюринг-полных смарт-контрактах, способные осуществлять комплексные процессы на блокчейне с учетом широкого спектра входящих данных.. ",
-  "smartContracts.plans.title": "План разработки смарт-контрактов",
-  "smartContracts.plans.stage1.left.title": "Первая стадия",
-  "smartContracts.plans.stage1.left.subtitle": "Смарт-аккаунты",
-  "smartContracts.plans.stage1.right.text": "Облегченная версия смарт-контрактов с ограниченным функционалом, основанная на наиболее популярных и востребованных вариантах использования.",
-  "smartContracts.plans.stage2.left.title": "Вторая стадия",
-  "smartContracts.plans.stage2.left.subtitle": "Смарт-контракты",
-  "smartContracts.plans.stage2.right.text": "Децентрализованные приложения на основе Тьюринг-полных смарт-контрактов смогут осуществлять сложные процессы на блокчейне в соответствии с целым рядом различных условий. После выпуска смарт-аккаунтов мы продолжим разработку смарт-контрактов для реализации сложной логики и решения практически любых вычислительных задач.",
   "smartContracts.usefulLinks.title": "Полезные ссылки",
   "smartContracts.usefulLinks.contracts.title": "Смарт-контракты",
   "smartContracts.usefulLinks.contracts.capabilities": "Подход и возможности",