Merged wallet/sprint20 into wallet/task/475.

# Conflicts:
#	src/js/services/bitcoincomService.js
This commit is contained in:
Brendon Duncan 2018-07-18 10:47:43 +12:00
commit ef121f52fa
43 changed files with 789 additions and 999 deletions

View file

@ -611,10 +611,14 @@ msgstr ""
msgid "Connection reset by peer"
msgstr ""
#: www/views/tab-send.html:45
#: www/views/tab-send.html:85
msgid "Contacts"
msgstr ""
#: www/views/tab-send.html:86
msgid "Saved frequently used addresses"
msgstr ""
#: www/views/onboarding/notifications.html:9
msgid "Continue"
msgstr ""
@ -815,7 +819,7 @@ msgstr ""
#: www/views/onboarding/tour.html:51
#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
#: www/views/tab-send.html:75
msgid "Create bitcoin wallet"
msgstr ""
@ -2525,6 +2529,14 @@ msgstr ""
msgid "Search or enter bitcoin address"
msgstr ""
#: src/js/controllers/tab-send.js:28
msgid "Clipboard"
msgstr ""
#: src/js/controllers/tab-send.js:29
msgid "Your Clipboard is empty"
msgstr ""
#: www/views/modals/search.html:16
msgid "Search transactions"
msgstr ""
@ -2583,9 +2595,70 @@ msgid "Send by email"
msgstr ""
#: src/js/controllers/confirm.js:177
#: src/js/controllers/tab-send.js:94
msgid "Send from"
msgstr ""
#: src/js/controllers/tab-send.js:77
msgid "Send to"
msgstr ""
#: www/views/tab-send.html:20
msgid "Paste Clipboard"
msgstr ""
#: www/views/tab-send.html:21
msgid "Paste Address"
msgstr ""
#: www/views/tab-send.html:27
msgid "Wallet to Wallet Transfer"
msgstr ""
#: www/views/tab-send.html:35
msgid "Scan QR Code"
msgstr ""
#: www/views/tab-send.html:46
msgid "Send Bitcoin faster!"
msgstr ""
#: www/views/tab-send.html:46
msgid "Send Bitcoin faster!"
msgstr ""
#: www/views/tab-send.html:50
msgid "Save frequently used addresses and send them Bitcoin in just one tap"
msgstr ""
#: www/views/tab-send.html:55
msgid "Add your first contact"
msgstr ""
#: www/views/tab-send.html:65
msgid "Your Bitcoin wallet is empty"
msgstr ""
#: www/views/tab-send.html:69
msgid "To get started, buy Bitcoin Cash (BCH) or Bitcoin Core (BTC), or share your address."
msgstr ""
#: www/views/tab-send.html:70
msgid "You can receive bitcoin from any wallet or service."
msgstr ""
#: www/views/tab-send.html:72
msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin."
msgstr ""
#: www/views/tab-send.html:74
msgid "Buy Bitcoin now"
msgstr ""
#: www/views/tab-send.html:76
msgid "Show my address"
msgstr ""
#: www/views/includes/itemSelector.html:8
msgid "Send max amount"
msgstr ""