grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into ui-2

Browse Source 
# Conflicts:
#	js/src/modals/FirstRun/Welcome/welcome.js
This commit is contained in:
Jaco Greeff
2017-05-30 10:45:48 +02:00
parent fce0167991 de4c9507e6
commit d888190637
8 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/shell/FirstRun/Welcome/welcome.js
View File

@@ -45,7 +45,7 @@ export default function FirstRun () {
<p>
<FormattedMessage
id='firstRun.welcome.description'
defaultMessage='As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -'
defaultMessage='As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -'
/>
</p>
<div>