Merge branch 'wallet/sprint/21' into wallet/task/501

This commit is contained in:
Jean-Baptiste Dominguez 2018-09-04 14:31:22 +09:00 committed by GitHub
commit 911247e463
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 4117 additions and 1852 deletions

View file

@ -511,7 +511,7 @@ msgid "Cannot Create Wallet"
msgstr ""
#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgid "Cannot join the same wallet more than once"
msgstr ""
#: www/views/includes/bitpayCardsCard.html:2
@ -3874,4 +3874,27 @@ msgstr ""
#: www/views/paperWallet.html:104
msgid "No Bitcoin Core found."
#: src/js/controllers/tab-scan.js:120
msgid "Scan Failed"
msgstr ""
#: src/js/controllers/tab-scan.js:121
msgid "Data not recognised."
msgstr ""
#: src/js/controllers/tab-scan.js:121
msgid "Unsupported"
msgstr ""
#: src/js/controllers/tab-scan.js:121
msgid "Testnet is not supported."
msgstr ""
#: www/views/includes/incomingDataMenu.html:81
msgid "URL"
msgstr ""
#: www/views/includes/incomingDataMenu.html:90
msgid "Open in web browser"
msgstr ""