Skip to content

Commit

Permalink
Merge pull request #1323 from LiskHQ/1320-fix-strings
Browse files Browse the repository at this point in the history
Fix strings - Closes #1320
  • Loading branch information
slaweet committed Oct 8, 2018
2 parents cf142fd + 70c22d3 commit 7914917
Show file tree
Hide file tree
Showing 22 changed files with 58 additions and 58 deletions.
44 changes: 22 additions & 22 deletions i18n/locales/en/common.json
Expand Up @@ -2,8 +2,7 @@
" Chat": " Chat",
" FAQ": " FAQ",
" Make sure that you are using the latest version of Lisk Hub.": " Make sure that you are using the latest version of Lisk Hub.",
" or get in touch in the ": " or get in touch in the ",
"2nd passphrase (Fee: 5 LSK)": "2nd passphrase (Fee: 5 LSK)",
" or get in touch in via chat ": " or get in touch in via chat ",
"About": "About",
"Academy": "Academy",
"Access extra features": "Access extra features",
Expand All @@ -22,14 +21,14 @@
"Advanced features": "Advanced features",
"After 10 minutes of not using your passphrase,\n // your Lisk ID will be locked to prevent an unauthorized use of your Lisk ID. .\n // The timer will reset as soon as you make an transaction.\n // After 5 minutes, you can also reset the timer by clicking on \"reset\".": "After 10 minutes of not using your passphrase,\n // your Lisk ID will be locked to prevent an unauthorized use of your Lisk ID. .\n // The timer will reset as soon as you make an transaction.\n // After 5 minutes, you can also reset the timer by clicking on \"reset\".",
"After logging out of your account you will be able to access the Dashboard, Settings and Search.": "After logging out of your account you will be able to access the Dashboard, Settings and Search.",
"After registration, you will need it to use your Lisk ID, like sending and voting.": "After registration, you will need it to use your Lisk ID, like sending and voting.",
"After registration, your second passphrase will be required when confirming every transaction and every vote.": "After registration, your second passphrase will be required when confirming every transaction and every vote.",
"All": "All",
"Amount (LSK)": "Amount (LSK)",
"An error occoured while rendering this page": "An error occoured while rendering this page",
"An error occurred while creating the transaction.": "An error occurred while creating the transaction.",
"An error occurred while registering your second passphrase. Please try again.": "An error occurred while registering your second passphrase. Please try again.",
"Approval": "Approval",
"Are you sure to confirm this selection?": "Are you sure to confirm this selection?",
"Are you certain of your choice?": "Are you certain of your choice?",
"Auto-logout": "Auto-logout",
"Back": "Back",
"Back to overview": "Back to overview",
Expand All @@ -38,6 +37,7 @@
"Become a delegate (Fee: {{fee}} LSK)": "Become a delegate (Fee: {{fee}} LSK)",
"Blockchain Application Registration": "Blockchain Application Registration",
"Blocks": "Blocks",
"Browse through our tutorials, check out the FAQ or connect with our knowledgeable community.": "Browse through our tutorials, check out the FAQ or connect with our knowledgeable community.",
"By voting you decide who is trusted to verify transactions and maintain the Lisk network, whilst collecting the rewards for doing so.": "By voting you decide who is trusted to verify transactions and maintain the Lisk network, whilst collecting the rewards for doing so.",
"Cancel": "Cancel",
"Change account settings, enable delegate voting.": "Change account settings, enable delegate voting.",
Expand Down Expand Up @@ -87,26 +87,26 @@
"Date": "Date",
"Delegate": "Delegate",
"Delegate List": "Delegate List",
"Delegate Registration": "Delegate Registration",
"Delegate features": "Delegate features",
"Delegate registration": "Delegate registration",
"Delegate statistics": "Delegate statistics",
"Delegate vote_noun": "Delegate vote",
"Delegate voting": "Delegate voting",
"Delegates": "Delegates",
"Delegates have great responsibility within the Lisk system, securing the blockchain. Becoming a delegate requires the registration of a name. The top 101 delegates are eligible to forge.": "Delegates have great responsibility within the Lisk system, securing the blockchain. Becoming a delegate requires the registration of a name. The top 101 delegates are eligible to forge.",
"Delegates have great responsibility within the Lisk system for securing the blockchain. Becoming a delegate requires the registration of a name. The top 101 delegates are eligible to forge.": "Delegates have great responsibility within the Lisk system for securing the blockchain. Becoming a delegate requires the registration of a name. The top 101 delegates are eligible to forge.",
"Discard": "Discard",
"Done": "Done",
"Don’t be a stranger! Connect to our community all over the world.": "Don’t be a stranger! Connect to our community all over the world.",
"Don’t be a stranger! Connect with our worldwide community.": "Don’t be a stranger! Connect with our worldwide community.",
"Dowload started": "Dowload started",
"Drag to reveal": "Drag to reveal",
"Each LSK token is worth one vote.": "Each LSK token is worth one vote.",
"Edit": "Edit",
"Enter IP or domain address of the node": "Enter IP or domain address of the node",
"Enter a Lisk ID": "Enter a Lisk ID",
"Enter your 1st passphrase to confirm": "Enter your 1st passphrase to confirm",
"Enter your 2nd passphrase": "Enter your 2nd passphrase",
"Enter your 2nd passphrase to confirm": "Enter your 2nd passphrase to confirm",
"Enter your passphrase": "Enter your passphrase",
"Enter your second passphrase": "Enter your second passphrase",
"Enter your second passphrase to confirm": "Enter your second passphrase to confirm",
"Entered passphrase does not belong to the active account": "Entered passphrase does not belong to the active account",
"Error": "Error",
"Explain Blockchain Like I'm 5": "Explain Blockchain Like I'm 5",
Expand All @@ -130,7 +130,7 @@
"Go to settings": "Go to settings",
"Go to your Dashboard": "Go to your Dashboard",
"Got it": "Got it",
"Great!\nYou’re almost finished": "Great!\nYou’re almost finished",
"Great!\nYou’re almost done": "Great!\nYou’re almost done",
"Height": "Height",
"Help": "Help",
"Help Center": "Help Center",
Expand Down Expand Up @@ -163,6 +163,7 @@
"Language": "Language",
"Later": "Later",
"Latest activity": "Latest activity",
"Learn about blockchain with our comprehensive knowledge base.": "Learn about blockchain with our comprehensive knowledge base.",
"Learn how voting works": "Learn how voting works",
"Learn more": "Learn more",
"Learn more about Lisk ID initialization": "Learn more about Lisk ID initialization",
Expand All @@ -182,7 +183,7 @@
"Logout": "Logout",
"Mainnet": "Mainnet",
"Manage your application": "Manage your application",
"Max 20 characters a-z 0-1, no special characters except “!@$&_.”": "Max 20 characters a-z 0-1, no special characters except “!@$&_.”",
"Max 20 characters, a-z and 0-1, no special characters except for “!@$&.”": "Max 20 characters, a-z and 0-1, no special characters except for “!@$&.”",
"Maximum length exceeded": "Maximum length exceeded",
"Maximum of 101 votes in total": "Maximum of 101 votes in total",
"Maximum of {{maxcount}} votes at a time": "Maximum of {{maxcount}} votes at a time",
Expand All @@ -193,7 +194,7 @@
"Name is already taken!": "Name is already taken!",
"Name is available": "Name is available",
"Name too long": "Name too long",
"Names are unique. Once you register the name, it can't be changed.": "Names are unique. Once you register the name, it can't be changed.",
"Names are unique. Once you register a name, it can't be changed.": "Names are unique. Once you register a name, it can't be changed.",
"Network to connect to": "Network to connect to",
"New to Hub? Take a tour": "New to Hub? Take a tour",
"New version available": "New version available",
Expand Down Expand Up @@ -252,8 +253,8 @@
"Removed votes": "Removed votes",
"Report the error via E-Mail": "Report the error via E-Mail",
"Request": "Request",
"Request amount (LSK)": "Request amount (LSK)",
"Request specific amount": "Request specific amount",
"Request specific amount (LSK)": "Request specific amount (LSK)",
"Required": "Required",
"Reset": "Reset",
"Reset timer & continue": "Reset timer & continue",
Expand All @@ -263,11 +264,11 @@
"Search": "Search",
"Search for Lisk ID or Transaction ID": "Search for Lisk ID or Transaction ID",
"Search for a delegate": "Search for a delegate",
"Search for advice and answers in our extensive ": "Search for advice and answers in our extensive ",
"Search for answers in our extensive FAQ": "Search for answers in our extensive FAQ",
"Search for delegate, Lisk ID, transaction ID": "Search for delegate, Lisk ID, transaction ID",
"Search for delegates, addresses and transactions.": "Search for delegates, addresses and transactions.",
"Search through our tutorials, FAQs or connect to our community all over the world.": "Search through our tutorials, FAQs or connect to our community all over the world.",
"Second Passphrase Registration": "Second Passphrase Registration",
"Second passphrase (Fee: 5 LSK)": "Second passphrase (Fee: 5 LSK)",
"Second passphrase registration": "Second passphrase registration",
"Secure the use of your Lisk ID": "Secure the use of your Lisk ID",
"Secure the use of your Lisk ID with a second passphrase.": "Secure the use of your Lisk ID with a second passphrase.",
"Security": "Security",
Expand All @@ -293,7 +294,7 @@
"Show more": "Show more",
"Show passphrase": "Show passphrase",
"Sidechains": "Sidechains",
"Sidechains will revolutionize the way decentralised apps are developed. Here you will be able to find hosts, and monitor your sidechains soon.": "Sidechains will revolutionize the way decentralised apps are developed. Here you will be able to find hosts, and monitor your sidechains soon.",
"Sidechains will revolutionize the way decentralized apps are developed. Here you will be able to find hosts, and monitor your sidechains soon.": "Sidechains will revolutionize the way decentralized apps are developed. Here you will be able to find hosts, and monitor your sidechains soon.",
"Sign a message": "Sign a message",
"Sign back in": "Sign back in",
"Sign in": "Sign in",
Expand All @@ -311,7 +312,6 @@
"Tell us what you think": "Tell us what you think",
"Testnet": "Testnet",
"Thank you": "Thank you",
"The Lisk Academy aims to make learning about blockchain technology interactive and enjoyable.": "The Lisk Academy aims to make learning about blockchain technology interactive and enjoyable.",
"The Lisk Academy is an entirely free, unbiased and comprehensive educational platform about blockchain technology, containing something for everyone, regardless of what level of knowledge you are at.": "The Lisk Academy is an entirely free, unbiased and comprehensive educational platform about blockchain technology, containing something for everyone, regardless of what level of knowledge you are at.",
"The Wallet will show your recent transactions.": "The Wallet will show your recent transactions.",
"The download has started. Depending on your internet speed, it can take several minutes. You will be informed when it is finished and be prompted to restart the app.": "The download has started. Depending on your internet speed, it can take several minutes. You will be informed when it is finished and be prompted to restart the app.",
Expand Down Expand Up @@ -375,7 +375,7 @@
"Write to check availability": "Write to check availability",
"Yes! It's safe": "Yes! It's safe",
"You are looking into a saved account. In order to {{nextAction}} you need to enter your passphrase.": "You are looking into a saved account. In order to {{nextAction}} you need to enter your passphrase.",
"You are responsible for keeping your 2nd passphrase safe. No one can restore it, not even Lisk.": "You are responsible for keeping your 2nd passphrase safe. No one can restore it, not even Lisk.",
"You are responsible for safekeeping your second passphrase. No one can restore it, not even Lisk.": "You are responsible for safekeeping your second passphrase. No one can restore it, not even Lisk.",
"You can now use Lisk Hub.<br": {
" If you want to repeat the onboarding, navigate to \"Help\" on the sidebar.": "You can now use Lisk Hub.<br> If you want to repeat the onboarding, navigate to \"Help\" on the sidebar."
},
Expand All @@ -396,9 +396,9 @@
"Your request": "Your request",
"Your second passphrase registration is being processed and will be confirmed.": "Your second passphrase registration is being processed and will be confirmed.",
"Your selection": "Your selection",
"Your session was timed out after 10 minutes of no network activitiy. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.": "Your session was timed out after 10 minutes of no network activitiy. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.",
"Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.": "Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.",
"Your signed message": "Your signed message",
"You’re votes are being processed and will be confirmed. It may take up to 10 minutes to be secured in the blockchain.": "You’re votes are being processed and will be confirmed. It may take up to 10 minutes to be secured in the blockchain.",
"Your votes are being processed. It may take up to 10 minutes for it to be secured in the blockchain.": "Your votes are being processed. It may take up to 10 minutes for it to be secured in the blockchain.",
"You’ve completed the tour!": "You’ve completed the tour!",
"Zero not allowed": "Zero not allowed",
"by moving your mouse.": "by moving your mouse.",
Expand All @@ -409,7 +409,7 @@
"if the problem persists": "if the problem persists",
"missed": "missed",
"of": "of",
"with a 2nd passphrase": "with a 2nd passphrase",
"with a second passphrase": "with a second passphrase",
"{{count}} delegate(s) selected to unvote": "{{count}} delegate selected to unvote",
"{{count}} delegate(s) selected to unvote_plural": "{{count}} delegates selected to unvote",
"{{count}} delegate(s) selected to vote": "{{count}} delegate selected to vote",
Expand Down
2 changes: 1 addition & 1 deletion src/components/authInputs/authInputs.js
Expand Up @@ -37,7 +37,7 @@ class AuthInputs extends React.Component {
theme={this.props.theme}
/>)}
{(this.props.account.secondPublicKey &&
<PassphraseInput label={this.props.t('Enter your 2nd passphrase to confirm')}
<PassphraseInput label={this.props.t('Enter your second passphrase to confirm')}
className='second-passphrase'
error={this.props.secondPassphrase.error}
value={this.props.secondPassphrase.value}
Expand Down
4 changes: 2 additions & 2 deletions src/components/confirmVotes/confirmVotes.js
Expand Up @@ -27,7 +27,7 @@ class ConfirmVotes extends React.Component {
message = {
title: t('Votes submitted'),
success: true,
body: t('You’re votes are being processed and will be confirmed. It may take up to 10 minutes to be secured in the blockchain.'),
body: t('Your votes are being processed. It may take up to 10 minutes for it to be secured in the blockchain.'),
};
}
updateList(false);
Expand Down Expand Up @@ -58,7 +58,7 @@ class ConfirmVotes extends React.Component {
<article className={styles.content}>
<h2 className={styles.header}>{t('Final confirmation')}</h2>
<p className={styles.message}>
{t('Are you sure to confirm this selection?')}
{t('Are you certain of your choice?')}
</p>
<PrimaryButton
className={`${styles.confirmButton} confirm`}
Expand Down
2 changes: 1 addition & 1 deletion src/components/header/customCountDown.js
Expand Up @@ -34,7 +34,7 @@ class CustomCountDown extends React.Component {
childComponent: Options,
childComponentProps: {
title: t('Session timeout'),
text: t('Your session was timed out after 10 minutes of no network activitiy. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.'),
text: t('Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.'),
firstButton: {
text: t('Sign back in'),
onClickHandler: this.goTo.bind(this, routes.login.path),
Expand Down
10 changes: 5 additions & 5 deletions src/components/help/help.js
Expand Up @@ -25,7 +25,7 @@ class Help extends React.Component {
<aside className={`${grid['col-sm-12']} ${grid['col-md-4']} ${styles.sideBar}`}>
<header>
<h2>{this.props.t('Help')}</h2>
<p>{this.props.t('Search through our tutorials, FAQs or connect to our community all over the world.')}</p>
<p>{this.props.t('Browse through our tutorials, check out the FAQ or connect with our knowledgeable community.')}</p>
{
this.props.account.address ?
<a className='help-onboarding' onClick={() => this.initOnboarding() }>{this.props.t('New to Hub? Take a tour')}
Expand All @@ -43,9 +43,9 @@ class Help extends React.Component {
</h2>
<div className={styles.articleContainer}>
<div>
<p>{this.props.t('Search for advice and answers in our extensive ')}
<p>{this.props.t('Search for answers in our extensive FAQ')}
{fAQIcon()}
{this.props.t(' or get in touch in the ')}
{this.props.t(' or get in touch in via chat ')}
{chatIcon()}.
</p>
</div>
Expand All @@ -64,7 +64,7 @@ class Help extends React.Component {
</h2>
<div className={styles.articleContainer}>
<div>
<p>{this.props.t('The Lisk Academy aims to make learning about blockchain technology interactive and enjoyable.')}
<p>{this.props.t('Learn about blockchain with our comprehensive knowledge base.')}
</p>
</div>
<div>
Expand Down Expand Up @@ -99,7 +99,7 @@ class Help extends React.Component {
</h2>
<div className={styles.articleContainer}>
<div>
<p>{this.props.t('Don’t be a stranger! Connect to our community all over the world.')}
<p>{this.props.t('Don’t be a stranger! Connect with our worldwide community.')}
</p>
</div>
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/passphrase/ConfirmSecond/confirmSecond.js
Expand Up @@ -70,7 +70,7 @@ class confirmSecond extends React.Component {
</TransitionWrapper>
<TransitionWrapper current={this.state.step} step='confirm' animationName='slide'>
<h2>
{t('Great!\nYou’re almost finished')}
{t('Great!\nYou’re almost done')}
</h2>
</TransitionWrapper>
<TransitionWrapper current={this.state.step} step='pending' animationName='slide'>
Expand Down
6 changes: 3 additions & 3 deletions src/components/passphrase/createSecond/create.js
Expand Up @@ -34,13 +34,13 @@ class Create extends React.Component {
id="generatorHeader" >
{t('Secure the use of your Lisk ID')}
<br />
{t('with a 2nd passphrase')}
{t('with a second passphrase')}
</h2>
</header>
<p className={styles.info}>
{t('After registration, you will need it to use your Lisk ID, like sending and voting.')}
{t('After registration, your second passphrase will be required when confirming every transaction and every vote.')}
<br />
{t('You are responsible for keeping your 2nd passphrase safe. No one can restore it, not even Lisk.')}
{t('You are responsible for safekeeping your second passphrase. No one can restore it, not even Lisk.')}
</p>
<PrimaryButton
className={`${styles.nextButton} next`}
Expand Down
2 changes: 1 addition & 1 deletion src/components/passphraseSteps/index.js
Expand Up @@ -113,7 +113,7 @@ class PassphraseSteps extends React.Component {
},
secondPassphrase: {
key: 'secondPassphrase',
header: this.props.t('Enter your 2nd passphrase'),
header: this.props.t('Enter your second passphrase'),
state: this.state.secondPassphrase,
className: 'second-passphrase',
buttonClassName: 'second-passphrase-next',
Expand Down

0 comments on commit 7914917

Please sign in to comment.