LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge master into release #1920

Merged
neb-b merged 19 commits from master into release-0.25.0 2018-08-29 02:29:56 +02:00
Conversation 0 Commits 19 Files changed 16 +8 -9
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6f91908005 - Show all commits

17
src/renderer/page/settings/view.jsx
View file

@ -348,16 +348,15 @@ class SettingsPage extends React.PureComponent<Props, State> {
name="encrypt_wallet" name="encrypt_wallet"
onChange={e => this.onChangeEncryptWallet(e)} onChange={e => this.onChangeEncryptWallet(e)}
checked={walletEncrypted} checked={walletEncrypted}
postfix={__('Encrypt my wallet with a custom password.')}/> postfix={__('Encrypt my wallet with a custom password.')}
<div className="help help--padded"> {__( helper={__(
'Secure your local wallet data with a custom password. Lost passwords cannot be recovered.' 'Secure your local wallet data with a custom password. Lost passwords cannot be recovered.'
)}{' '} )}/>
<Button <Button
button="link" button="link"
label= {__('Learn more')} label= {__('Learn more')}
href="https://lbry.io/faq/wallet-encryption"/> href="https://lbry.io/faq/wallet-encryption"
</div> />
</section> </section>
<section className="card card--section"> <section className="card card--section">
<div className="card__title">{__('Application Cache')}</div> <div className="card__title">{__('Application Cache')}</div>