diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-03-02 05:04:55 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-03-02 05:04:55 +0800 |
commit | 0c16f0ea221d65e66942c27a69dda1c54f49e775 (patch) | |
tree | 5530d18fcd6e6c5e15272de3cb915fc2025c01bf /packages/website/translations | |
parent | 003d43b03ae373ca24d6d728ffa6b0f2dfcda79a (diff) | |
parent | 451a0dacbe85d7a0d16ef007c1eb945a4c1977cb (diff) | |
download | dexon-sol-tools-0c16f0ea221d65e66942c27a69dda1c54f49e775.tar dexon-sol-tools-0c16f0ea221d65e66942c27a69dda1c54f49e775.tar.gz dexon-sol-tools-0c16f0ea221d65e66942c27a69dda1c54f49e775.tar.bz2 dexon-sol-tools-0c16f0ea221d65e66942c27a69dda1c54f49e775.tar.lz dexon-sol-tools-0c16f0ea221d65e66942c27a69dda1c54f49e775.tar.xz dexon-sol-tools-0c16f0ea221d65e66942c27a69dda1c54f49e775.tar.zst dexon-sol-tools-0c16f0ea221d65e66942c27a69dda1c54f49e775.zip |
Merge branch 'development' into feature/sra-reporter
* development: (71 commits)
Set max to 2 ETH/2 ZRX
Add missing types from website
Add dependencies
Update the README
Move BaseContract to its own package
Upgrate prettier
remove unused import
Move more configs into docsInfo and remove logic that does not belong there elsewhere
Fix a bug with displaying solidity functions returning multiple return values
Add ethers-contracts as a dependency
Include types for ethers-contracts
Fix the version
Include types for ethers-contracts
Rename idx to i
Remove tslint disable
Move BaseContract to web3Wrapper
Merge ifs
Fix an option description
Add link to the docs
Improve CHANGELOG entry
...
Diffstat (limited to 'packages/website/translations')
-rw-r--r-- | packages/website/translations/english.json | 6 | ||||
-rw-r--r-- | packages/website/translations/russian.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/website/translations/english.json b/packages/website/translations/english.json index 8aebe1848..9a1c9b2c8 100644 --- a/packages/website/translations/english.json +++ b/packages/website/translations/english.json @@ -67,7 +67,7 @@ "STANDARD_RELAYER_API": "standard relayer API", "PORTAL_DAPP": "portal dApp", "WEBSITE": "website", - "DEVELOPERS": "home", - "HOME": "rocket.chat", - "ROCKETCHAT": "developers" + "DEVELOPERS": "developers", + "HOME": "home", + "ROCKETCHAT": "rocket.chat" } diff --git a/packages/website/translations/russian.json b/packages/website/translations/russian.json index a4e47264b..c103960c0 100644 --- a/packages/website/translations/russian.json +++ b/packages/website/translations/russian.json @@ -3,7 +3,7 @@ "TOP_TAGLINE": "0x — это протокол с открытым кодом, позволяющий торговать токенами ERC20, на блокчейне Ethereum.", "BUILD_CALL_TO_ACTION": "Разрабатывайте на 0x", "COMMUNITY_CALL_TO_ACTION": "Сообщество", - "PROJECTS_HEADER": "Прожкты разработанные на 0х", + "PROJECTS_HEADER": "Проекты разработанные на 0х", "FULL_LIST_PROMPT": "Просмотреть", "FULL_LIST_LINK": "полный список", "TOKENIZED_SECTION_HEADER": "Сегодняшний мир движется к токенизации ценности", |