Resolution conflicts

This commit is contained in:
Jean-Baptiste Dominguez 2018-09-06 18:21:04 +09:00
commit b6f63706f3
53 changed files with 2015 additions and 1393 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
@ -2916,10 +2916,15 @@ msgid "Sweep"
msgstr ""
#: www/views/includes/incomingDataMenu.html:89
#: www/views/paperWallet.html:3
msgctxt "List item"
msgid "Sweep paper wallet"
msgstr ""
#: www/views/paperWallet.html:3
msgctxt "Page title"
msgid "Sweep Paper Wallet"
msgstr ""
#: src/js/services/onGoingProcess.js:33
msgid "Sweeping Wallet..."
msgstr ""
@ -3783,6 +3788,10 @@ msgstr ""
msgid "Bitcoin Cash Games"
msgstr ""
#: www/views/includes/community.html:29
msgid "Share the Wallet App"
msgstr ""
#: src/js/services/bitcoincomService.js:28
msgid "News"
msgstr ""
@ -3857,4 +3866,68 @@ msgstr ""
#: src/js/controllers/amount.controller.js:239
msgid "Unknown error."
msgstr ""
#: www/views/paperWallet.html:48
msgid "No Bitcoin Cash wallet to transfer funds to found."
msgstr ""
#: www/views/paperWallet.html:54
msgid "No Bitcoin Cash found."
msgstr ""
#: www/views/paperWallet.html:60
msgid "Bitcoin Core found:"
msgstr ""
#: www/views/paperWallet.html:98
msgid "No Bitcoin Core wallet to transfer funds to found."
msgstr ""
#: www/views/paperWallet.html:104
msgid "No Bitcoin Core found."
msgstr ""
#: 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 ""
#: src/js/services/shapeshift.service.js.html:90
msgid "Invalid address"
msgstr ""
#: src/js/services/shapeshift.service.js.html:90
msgid "Amount is not defined"
msgstr ""
#: src/js/services/shapeshift.service.js.html:90
msgid "Amount is below the minimun"
msgstr ""
#: src/js/services/shapeshift.service.js.html:90
msgid "Amount is above the limit"
msgstr ""
#: src/js/services/shapeshift.service.js.html:90
msgid "Invalid response from Shapeshift"
msgstr ""