Skip to content

Commit

Permalink
Update local wallet syntax, add a short account explanation to accoun…
Browse files Browse the repository at this point in the history 
…t creation
  • Loading branch information
@svk31
svk31 committed Oct 9, 2017
1 parent 4445b25 commit 97d6a8d
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 44 deletions.
87 changes: 44 additions & 43 deletions app/assets/locales/locale-en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"unlock_password": "Cloud Wallet Login",
"unlock_short": "Login",
"help": "Help",
"locked_tip": "<br/>Click to login by unlocking your wallet.<br/><br/>Closing the browser window will also log you out.",
"unlocked_tip": "<br/>Click to log out by locking your wallet.<br/><br/>Closing the browser window will also log you out.",
"locked_tip": "<br/>Click to login.<br/><br/>Closing the browser window will also log you out.",
"unlocked_tip": "<br/>Click to log out.<br/><br/>Closing the browser window will also log you out.",
"account_notify": "The active account is now %(account)s",
"account_value": "Account value"
},
Expand All @@ -65,7 +65,7 @@
"buy_min": "You will receive at minimum this amount. If there are matching orders with a cheaper price than you specified, you will receive more than this amount.",
"borrow": "Borrow %(asset)s from the network. This creates a smart contract that locks your collateral until you either modify the position or a margin call is required.",
"transfer_actions": "Click here to make a transfer, or to deposit/withdraw those assets that support it.",
"deposit_tip": "To complete the deposit, go to your %(asset)s wallet and make a transfer to the address listed on this page. You will receive the deposit as soon as it has been confirmed. If a memo is shown , it is essential that you include this memo in your transfer.",
"deposit_tip": "To complete the deposit, go to your external %(asset)s wallet and make a transfer to the address listed on this page. You will receive the deposit as soon as it has been confirmed. If a memo is shown , it is essential that you include this memo in your transfer.",
"copy_tip": "Click here to copy the text to your clipboard",
"withdraw_full": "Click to withdraw the full balance",
"withdraw_address": "If you don't already have a %(asset)s address, please find a wallet provider and create one in order to complete the withdrawal.",
Expand Down Expand Up @@ -404,7 +404,7 @@
"again": "MAKE ANOTHER TRANSFER",
"see": "SEE MY TRANSFERS",
"close": "Close",
"memo_unlock": "Unlock your wallet in order to see this memo",
"memo_unlock": "Unlock your wallet/account in order to see this memo",
"optional": "Optional"
},
"operation": {
Expand Down Expand Up @@ -801,15 +801,15 @@
"reset": "Reset settings",
"disableChat": "Disable chat",
"general": "General",
"wallet": "Wallet",
"wallet": "Local Wallet",
"accounts": "Accounts",
"no_accounts": "This wallet does not contain any accounts.",
"no_accounts": "This local wallet does not contain any accounts.",
"password": "Password",
"backup": "Backup",
"restore": "Restore/Import",
"access": "Access",
"general_text": "Adjust the basic settings.",
"wallet_text": "Control the details of your wallet.",
"wallet_text": "Control the details of your local wallet.",
"accounts_text": "Your accounts list.",
"password_text": "Change your password.",
"backup_text": "Create backups here.",
Expand All @@ -819,12 +819,12 @@
"backup_backup": "Restore from a backup file (.bin)",
"backup_key": "Import a private key",
"backup_legacy": "Import a BTS 0.9.3c key export file (.json)",
"backup_brainkey": "Restore using a wallet brainkey",
"backupcreate_backup": "Create wallet backup",
"backup_brainkey": "Restore using a local wallet brainkey",
"backupcreate_backup": "Create local wallet backup",
"backupcreate_brainkey": "Create brainkey backup",
"lookup_text": "Click the button below to check for unclaimed balances from BTS 1.0",
"delete_select": "Select wallet to delete",
"restore_brainkey_text": "In order to restore from a brainkey, you will need to create a new wallet. Please provide a password and name for your new wallet below, then enter your brainkey.",
"delete_select": "Select local wallet to delete",
"restore_brainkey_text": "In order to restore from a brainkey, you will need to create a new local wallet. Please provide a password and name for your new local wallet below, then enter your brainkey.",
"restore_key_count": "# of keys",
"restore_default_success": "Settings have been reset successfully",
"api_closest": "Choose closest automatically",
Expand Down Expand Up @@ -971,24 +971,24 @@
"password": "Wallet password",
"existing_password": "Existing Password",
"change_password": "Change Password",
"change_wallet": "Change Wallet",
"wallet_created": "Wallet Created",
"create_wallet": "Create new wallet",
"create_importkeys_text": "In order to import keys, you first need to create a wallet to contain the keys. Complete the dialog below to create a new wallet.",
"change_wallet": "Change Local Wallet",
"wallet_created": "Local Wallet Created",
"create_wallet": "Create new local wallet",
"create_importkeys_text": "In order to import keys, you first need to create a local wallet to contain the keys. Complete the dialog below to create a new local wallet.",
"create_wallet_backup": "Create new wallet from backup",
"import_bts1": "Import from BitShares 0.9.3c",
"setup_wallet": "Setup your wallet",
"delete_wallet": "Delete Wallet",
"setup_wallet": "Setup your local wallet",
"delete_wallet": "Delete Local Wallet",
"delete_confirm_line1": "Are you ABSOLUTELY sure?",
"delete_confirm_line2": "Unexpected bad things will happen if you don’t read this!",
"delete_confirm_line3": "This action CANNOT be undone, and if you do not have a backup this wallet will be gone.",
"delete_confirm_line3": "This action CANNOT be undone, and if you do not have a backup this local wallet will be gone.",
"delete_confirm_line4": "Yes, delete wallet %(name)s",
"delete_wallet_name": "Delete Wallet (%(name)s)",
"delete_wallet_name": "Delete Local Wallet (%(name)s)",
"balance_claims": "Balance Claims",
"download": "Download",
"name": "Wallet Name",
"name": "Local Wallet Name",
"create": "Create",
"console": "Wallet Management Console",
"console": "Local Wallet Management Console",
"create_backup": "Create Backup",
"backup_brainkey": "Backup Brainkey",
"create_backup_of": "Create backup now",
Expand All @@ -998,8 +998,8 @@
"import_keys": "Import Keys",
"import_keys_tool": "Key Import Tool",
"brainkey": "Brainkey",
"new_wallet": "New Wallet",
"active_wallet": "Active Wallet",
"new_wallet": "New Local Wallet",
"active_wallet": "Active Local Wallet",
"verified": "Verified",
"verify_prior_backup": "Verify Prior Backup",
"brainkey_not_verified": "This Brainkey is not verified",
Expand All @@ -1012,9 +1012,9 @@
"confirm_password": "Confirm Password",
"pass_incorrect": "Incorrect password",
"confirm_error": "The confirmation does not match the password",
"new_wallet_name": "New Wallet Name",
"wallet_exist": "Wallet exists, choose a new name",
"wallet_exist_with_name": "Wallet (%(name)s) exists, please change the name",
"new_wallet_name": "New Local Wallet Name",
"wallet_exist": "A local wallet called that already exists, please choose a new name",
"wallet_exist_with_name": "A local wallet called (%(name)s) already exists, please change the name",
"accept": "Accept",
"ready_to_restore": "Ready to Restore",
"restore_wallet_of": "Restore (%(name)s Wallet)",
Expand All @@ -1034,21 +1034,21 @@
"show_brainkey": "Show Brainkey",
"brainkey_w1": "To complete your backup, print this out, or write it down.",
"brainkey_w2": "Anyone with access to your recovery key will",
"brainkey_w3": "have access to funds within this wallet.",
"brainkey_w3": "have access to funds within this local wallet.",
"custom_brainkey": "Use a custom brainkey (advanced)",
"last_backup": "Last backup",
"never_backed_up": "This wallet has never been backed up, you should create a backup now!",
"need_backup": "This wallet needs a backup",
"never_backed_up": "This local wallet has never been backed up, you should create a backup now!",
"need_backup": "This local wallet needs a backup",
"noneed_backup": "No backup is needed",
"restore": "Restore Wallet from Backup",
"create_text": "The BitShares wallet is stored in your browser, it is not stored in the cloud. A wallet can contain multiple accounts and can be easily transferred between browsers and computers using a backup file.",
"account_create_wallet_text": "This password will be used to create a new BitShares wallet for you, which will only be stored locally in your browser. A BitShares wallet can contain multiple accounts and can be easily transferred between browsers and computers using a backup file.",
"restore": "Restore Local Wallet from Backup",
"create_text": "The BitShares local wallet is stored in your browser, it is not stored in the cloud. A wallet can contain multiple accounts and can be easily transferred between browsers and computers using a backup file.",
"account_create_wallet_text": "This password will be used to create a new BitShares local wallet for you, which will only be stored locally in your browser. A BitShares wallet can contain multiple accounts and can be easily transferred between browsers and computers using a backup file.",
"create_account_text": "The account name you choose needs to be unique, as it will be registered publicly on the blockchain and will be your identifer for any transactions you make.",
"first_account_paid": "Since this is your first account, a faucet will pay the registration fee for you.",
"not_first_account": "Since you already have an account, you will need to pay for this new account yourself. In order to do so, your account needs to have lifetime membership, which can be bought in the account page.",
"must_be_ltm": "The fee paying account must be a lifetime member to perform that operation.",
"backup_explain": "Clicking on the button below will generate a backup file with a .bin extension. This file is encrypted with your wallet password, and contains all the private keys for your accounts. It can be used to restore your wallet, or move it to a different computer/browser.",
"backup_new_account": "Congratulations, you've just created a new account! It is strongly recommended that you make a backup of your wallet now. Without a backup there is no way to restore your account if something happens to your computer.",
"backup_new_account": "Congratulations, you've just created a new account on the Bitshares blockchain! It is strongly recommended that you make a backup of your wallet now. Without a backup there is no way to restore your account if something happens to your computer.",
"brainkey_not_backed_up": "This brainkey has never been backed up",
"brainkey_backed_up": "This brainkey was last backed up",
"new_password": "New password",
Expand All @@ -1067,11 +1067,11 @@
"import_bts": "Import a BTS 0.9.3c key export",
"import_private_key": "Import a private key",
"wallet_browser": "Your Web Browser is your Wallet",
"has_wallet": "When you create your first BitShares account, a BitShares wallet will be automatically created as well and stored in your browser. This wallet is encrypted with your password, and will contain any private keys belonging to your accounts. It is important that you take the time to backup this wallet once created!",
"has_wallet": "When you create your first BitShares account, a BitShares local wallet will be automatically created as well and stored in your browser. This local wallet is encrypted with your password, and will contain any private keys belonging to your accounts. It is important that you take the time to backup this wallet once created!",
"go_get_started": "See Get Started tips",
"wallet_crucial": "Your wallet is <strong>only stored</strong> in your browser, so it is crucial that you create a backup that will enable you to recover your wallet if the data in your browser is lost! <strong>Noone else can restore your account if you lose your backup.</strong>",
"wallet_move": "This backup file can also be used to move your wallet to different computers or different browsers. In order to restore your wallet using this backup <strong>you will also need your password!</strong>",
"wallet_lose_warning": "<strong>IMPORTANT: If you lose your wallet or your pass phrase you will be unable to access any of your funds again. Make sure you store the backup somewhere safe, and memorize or write down your password!</strong>",
"wallet_crucial": "Your local wallet is <strong>only stored</strong> in your browser, so it is crucial that you create a backup that will enable you to recover your wallet if the data in your browser is lost! <strong>Noone else can restore your account if you lose your backup.</strong>",
"wallet_move": "This backup file can also be used to move your local wallet to different computers or different browsers. In order to restore your local wallet using this backup <strong>you will also need your password!</strong>",
"wallet_lose_warning": "<strong>IMPORTANT: If you lose your local wallet or your pass phrase you will be unable to access any of your funds again. Make sure you store the backup somewhere safe, and memorize or write down your password!</strong>",
"tips_deposit": "Make a deposit",
"link_deposit": "Deposits",
"tips_dashboard": "See your dashboard",
Expand All @@ -1081,9 +1081,9 @@
"tips_account": "See your new account",
"link_account": "Account",
"wallet_new": "New BitShares account",
"create_w_a": "Create a wallet and an account",
"create_a": "Create a new account",
"create_success": "Your wallet has been created",
"create_w_a": "Create a local wallet containing an account",
"create_a": "Create a new blockchain account",
"create_success": "Your local wallet has been created",
"all_set": "You're all set!",
"step_1": "Create a wallet",
"step_2": "Create a backup",
Expand Down Expand Up @@ -1120,9 +1120,10 @@
"switch_model_password": "Switch to cloud wallet",
"account_public": "Account Name (Public)",
"current_pass": "Current password",
"no_wallet": "You do not have a wallet yet",
"no_wallet": "You do not have a local wallet yet",
"generated": "Generated password",
"understand_1": "I understand that no one can recover my password if I lose or forget it",
"account_exp": "This account will be created on the blockchain and will be your address for any transfers you want to make! <strong>There are no long Bitcoin-style addresses in Bitshares!</strong>",
"understand_1": "I understand that noone can recover my password if I lose or forget it",
"understand_2": "I have written down or oherwise stored my password",
"bts_rules": "The first rule of BitShares is: Do not lose your password.<br/>The second rule of BitShares is: Do not lose your password.<br />The third rule of BitShares is: We cannot recover your password.<br />The fourth rule: If you can remember the password, it's not secure.<br />The fifth rule: Use only randomly-generated passwords.<br />The sixth rule: Do not tell anyone your password.<br />The seventh rule: Always back up your password."
},
Expand Down Expand Up @@ -1191,7 +1192,7 @@
"connected": "Connected",
"not_connected": "Not connected",
"browser": "Unsupported browser",
"browser_text": "The Browser you are using has not been fully tested to support the BitShares Wallet. We highly recommend that you backup your wallet and import it using the Chrome Browser until we have had more time to fully test your browser of choice. Use at your own risk.",
"browser_text": "The Browser you are using has not been fully tested to support the BitShares Wallet. We highly recommend that you backup your local wallet and import it using the Chrome Browser until we have had more time to fully test your browser of choice. Use at your own risk.",
"understand": "I understand"
},
"refcode": {
Expand Down
3 changes: 2 additions & 1 deletion app/components/Account/CreateAccountPassword.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ class CreateAccountPassword extends React.Component {
noLabel
/>

<Translate component="p" content="wallet.account_exp" unsafe />
<section>
<label className="left-label"><Translate content="wallet.generated" />&nbsp;&nbsp;<span className="tooltip" data-html={true} data-tip={counterpart.translate("tooltip.generate")}><Icon name="question-circle" /></span></label>
<div style={{paddingBottom: "0.5rem"}}>
Expand All @@ -215,7 +216,7 @@ class CreateAccountPassword extends React.Component {
<input type="password" value={this.state.confirm_password} onChange={this._onInput.bind(this, "confirm_password")}/>
{this.state.confirm_password && this.state.confirm_password !== this.state.generatedPassword ?
<div className="has-error"><Translate content="wallet.confirm_error" /></div> : null}
</section>
</section>

<br />
<div className="confirm-checks" onClick={this._onInput.bind(this, "understand_1")}>
Expand Down

0 comments on commit 97d6a8d

Please sign in to comment.