fix merge issues

packages/blockchain-wallet-v4-frontend/src/assets/locales/bg.json

@@ -1099,7 +1099,7 @@
   "scenes.reset2fa.secondstep.back": null,
   "scenes.reset2fa.secondstep.continue": null,
   "scenes.reset2fa.thirdstep.reset": "",
-  "scenes.reset2fa.thirdstep.step3": "",
+  "scenes.reset2fa.thirdstep.step2": "",
   "scenes.reset2fa.thirdstep.captcha": null,
   "scenes.reset2fa.thirdstep.back": null,
   "scenes.reset2fatoken.error": "",
@@ -1525,4 +1525,4 @@
   "scenes.services.sfoxservice.buysellorderhistory.list.orderstatusbody.sell.rejected": "",
   "scenes.services.sfoxservice.buysellorderhistory.list.orderstatusbody.sell.failed": "",
   "scenes.buysellorderhistory.list.orderstatusbody.unknown": ""
-}
+}

packages/blockchain-wallet-v4-frontend/src/assets/locales/da.json

@@ -1099,7 +1099,7 @@
   "scenes.reset2fa.secondstep.back": null,
   "scenes.reset2fa.secondstep.continue": null,
   "scenes.reset2fa.thirdstep.reset": "",
-  "scenes.reset2fa.thirdstep.step3": "",
+  "scenes.reset2fa.thirdstep.step2": "",
   "scenes.reset2fa.thirdstep.captcha": null,
   "scenes.reset2fa.thirdstep.back": null,
   "scenes.reset2fatoken.error": "",
@@ -1525,4 +1525,4 @@
   "scenes.services.sfoxservice.buysellorderhistory.list.orderstatusbody.sell.rejected": "",
   "scenes.services.sfoxservice.buysellorderhistory.list.orderstatusbody.sell.failed": "",
   "scenes.buysellorderhistory.list.orderstatusbody.unknown": ""
-}
+}

packages/blockchain-wallet-v4-frontend/src/assets/locales/de.json

@@ -1079,7 +1079,7 @@
   "scenes.reminder.back": "Zurückgehen",
   "scenes.reminder.continue": "Weiter",
   "scenes.reset2fa.firststep.reset": "2FA rücksetzen",
-  "scenes.reset2fa.firststep.step1": "Schritt 1 von 3",
+  "scenes.reset2fa.firststep.step1": "Schritt 1 von 2",
   "scenes.reset2fa.firststep.explain": "Füllen Sie das nachfolgende Formular aus, um erneut Zugang zu Ihrer Wallet durch den Reset Ihrer 2-Faktor-Authentifzierung, eingeschränken IP-Adresse und verifizierten E-Mail-Adresse zu erlangen.",
   "scenes.reset2fa.firststep.explain2": "Hinweis: Ihre IP-Adresse und Browser-Informationen werden bei Einreichung aufgezeichnet.",
   "scenes.reset2fa.firststep.firststepform.guid": "Wallet-ID",
@@ -1099,7 +1099,7 @@
   "scenes.reset2fa.secondstep.back": "Zurückgehen",
   "scenes.reset2fa.secondstep.continue": "Weiter",
   "scenes.reset2fa.thirdstep.reset": "Zurücksetzen",
-  "scenes.reset2fa.thirdstep.step3": "Schritt 3 von 3",
+  "scenes.reset2fa.thirdstep.step2": "Schritt 2 von 2",
   "scenes.reset2fa.thirdstep.captcha": "CAPTCHA",
   "scenes.reset2fa.thirdstep.back": "Zurückgehen",
   "scenes.reset2fatoken.error": "<span>Oh-oh. Etwas hat nicht geklappt. Fehler: </span> {error}",

packages/blockchain-wallet-v4-frontend/src/assets/locales/el.json

@@ -1079,7 +1079,7 @@
   "scenes.reminder.back": "Μετάβαση Πίσω",
   "scenes.reminder.continue": "Συνέχεια",
   "scenes.reset2fa.firststep.reset": "Επαναφορά πιστοποίησης ταυτότητας δύο παραγόντων",
-  "scenes.reset2fa.firststep.step1": "Βήμα 1 από 3",
+  "scenes.reset2fa.firststep.step1": "Βήμα 1 από 2",
   "scenes.reset2fa.firststep.explain": "Συμπληρώστε την πιο κάτω φόρμα για να αποκτήσετε ξανά πρόσβαση στο πορτοφόλι σας με επαναφορά πιστοποίησης ταυτότητας δύο παραγόντων, με περιορισμό IP και επαληθευμένο email.",
   "scenes.reset2fa.firststep.explain2": "Σημείωση: Η διεύθυνση IP και οι πληροφορίες του προγράμματος περιήγησης θα καταγραφούν με την υποβολή.",
   "scenes.reset2fa.firststep.firststepform.guid": "Αναγνωριστικό Πορτοφολιού",
@@ -1099,7 +1099,7 @@
   "scenes.reset2fa.secondstep.back": "Μετάβαση Πίσω",
   "scenes.reset2fa.secondstep.continue": "Συνέχεια",
   "scenes.reset2fa.thirdstep.reset": "Επαναφορά",
-  "scenes.reset2fa.thirdstep.step3": "Βήμα 3 από 3",
+  "scenes.reset2fa.thirdstep.step2": "Βήμα 2 από 2",
   "scenes.reset2fa.thirdstep.captcha": "Κωδικός Captcha",
   "scenes.reset2fa.thirdstep.back": "Μετάβαση Πίσω",
   "scenes.reset2fatoken.error": "<span>Ωχ. Κάτι πήγε στραβά. Σφάλμα: </span> {error}",

packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json

@@ -283,7 +283,7 @@
   "scenes.faq.group.sfox.question6": "How can I exchange cryptocurrencies within my Blockchain wallet?",
   "scenes.faq.group.sfox.answer6.one": "We support exchanging between currencies in most regions across the globe. If you are in a supported region, you can navigate to your Exchange dashboard where you will see an option to exchange between BTC, ETH, and BCH. Enter the amount you would like to exchange, confirm your trade details, and wait for the exchange to complete.",
   "scenes.faq.group.sfox.answer6.two": "Pro tip: there are minimum and maximum buttons on the dashboard to quickly see your trading limits.",
-  "scenes.faq.group.noexchange.title": "Exchange Services (not available)",
+  "scenes.faq.group.noexchange.title": "Exchange Services",
   "scenes.faq.group.noexchange.question1": "Where can I buy and sell?",
   "scenes.faq.group.noexchange.answer1": "We partner with exchanges across the world to make buying and selling digital assets easier for you. If you’re located in select states across the US or SEPA, you can get started now by creating an account with one of our partners.",
   "scenes.faq.group.noexchange.question2": "How can I exchange cryptocurrencies within my Blockchain wallet?",
@@ -446,10 +446,8 @@
   "coinifyexchangedata.payment.mediumhelpers.bank.detail1": "One time ID verification",
   "coinifyexchangedata.payment.mediumhelpers.bank.detail2": "Receive bitcoin in 2-3 days",
   "coinifyexchangedata.payment.mediumhelpers.bank.detail3": "0.25% Payment Fee",
-  "coinify.payment.helper1.question": "Payment Medium placeholder 1?",
-  "coinify.payment.helper1.answer": "Answer1 placeholder",
-  "coinify.payment.helper2.question": "Payment Medium placeholder 2?",
-  "coinify.payment.helper2.answer": "Answer2 placeholder",
+  "coinifyexchangedata.payment.helper1.question": "Are there transaction fees?",
+  "coinifyexchangedata.payment.helper1.answer": "There is a 3% convenience fee when buying bitcoin with a credit card in order to expedite the transaction. Buying or selling through a bank transfer does not include a convenience fee, although there is a small trading fee (0.25%) that Coinify requires in order to mitigate risk.",
   "coinifyexchangedata.payment.continue": "Continue",
   "coinifyexchangedata.payment.header": "Select Payment Method",
   "coinifyexchangedata.payment.subheader": "You can link your bank account or credit card to buy cryptocurrency. Select the account that you would like to use to fund your purchases. You can always change your payment method.",
@@ -479,6 +477,8 @@
   "modals.disable2fa.title": "Disable Two-Step",
   "modals.disable2fa.sure": "Are you sure you wish to disable the",
   "modals.disable2fa.disable": "Disable",
+  "modals.deleteaddresslabel.cancel": "Cancel",
+  "modal.deleteaddresslabel.delete": "Delete Label",
   "modals.edittransactiondesc.title": "Edit Transaction Description",
   "modals.edittransactiondesc.description": "Description",
   "modals.edittransactiondesc.button": "Change Description",
@@ -670,6 +670,7 @@
   "modals.sendeth.secondstep.send": "Send Ether",
   "modals.sendeth.sendconfirm.back": "Go Back",
   "modals.sendether.title": "Send Ether",
+  "sfoxmicrodeposits.success": "YOU ARE NOW READY TO BUY & SELL",
   "sfoxmicrodeposits.header": "Verify Bank Deposits",
   "sfoxmicrodeposits.deposit1": "Deposit 1",
   "sfoxmicrodeposits.deposit2": "Deposit 2",
@@ -893,20 +894,19 @@
   "scenes.buysell.coinifycheckout.trades.completed": "Completed Orders",
   "scenes.buysell.coinifycheckout.content.orderreview.buy.revieworder.subtext": "Before we can start processing your order, review the order details below. If everything looks good to you, click submit to complete your order.",
   "scenes.buysell.coinifycheckout.content.orderreview.exchangerate": "Exchange Rate",
+  "coinifyexchangedata.cyo.helper1.question": "How long will the buy order take?",
+  "coinifyexchangedata.cyo.helper1.answer": "How long a buy order takes depends on your chosen payment method, which can always be changed. If buying through bank transfer, you will receive bitcoin within 2-3 days. If you chose to pay with a credit or debit card, you can plan to receive your bitcoin within 24 hours (depending on your bank’s transfer policies).",
+  "coinifyexchangedata.cyo.helper2.question": "Why does the exchange rate change?",
+  "coinifyexchangedata.cyo.helper3.question": "The small print",
+  "coinifyexchangedata.cyo.helper3.answer": "To read more about how Coinify stores your information and keeps it safe, please visit their [Terms and Conditions] and [Privacy Policy]. For help with or questions about your Blockchain wallet, please reach out to our support team [here].",
+  "coinifyexchangedata.cyo.helper4.question": "How long will the sell order take?",
+  "coinifyexchangedata.cyo.helper4.answer": "If the Bitcoin transaction of your sell order is broadcast and confirmed within the 15 minute time period for which Coinify guarantees the rate, the system will lock the exchange rate and your order will begin processing. This means that within 2 bank days we will send the funds to your bank account, as long as all details are correct and complete. Remember: you can only use a bank account registered in your own name to receive the payout.",
   "scenes.buysell.orderreview.wrong": "Sorry, something went wrong with your trade:",
-  "faq.how_long_to_receive_q": "How long does it take to get my funds?",
-  "faq.how_long_to_receive_a1": "The quote expires within 15 minutes of placing the order. If the transaction is not broadcasted during that time the order will not be processed.",
-  "faq.how_long_to_receive_a2": "Coinify will contact you with intructions on how to receive a BTC refund if they are received after the quote expires, and if the amount received is higher or lower that the one specified in the order.",
-  "faq.how_long_to_receive_a3": "Coinify won’t be refunding the bitcoin transaction fee.",
-  "faq.exchange_rate_q": "What is the exchange rate?",
-  "faq.exchange_rate_a": "The exchange rate varies from minute to minute.",
-  "faq.exchange_fees_q": "What are the fees?",
-  "faq.exchange_fees_a": "Each exchange takes a small percentage of the total amount as a fee.",
   "buy.quote_input.below_min": "Your limit of {curr}{max} is below the minimum allowed amount.",
   "buy.quote_input.over_effective_max": "Enter an amount less than your balance minus the priority fee ({effectiveMax} BTC)",
   "buy.quote_input.effective_max_under_min3": "buying",
   "buy.quote_input.effective_max_under_min5": "exchanging",
-  "buy.quote_input.effective_max_under_min1": "Your balance is less than the minimum sell amount minus priority fee {min}. ",
+  "buy.quote_input.effective_max_under_min1": "Your balance is less than the minimum sell amount minus priority fee {min} BTC. ",
   "buy.quote_input.effective_max_under_min2": "Fund your wallet by {buyLink} or {exchangeLink} before selling.",
   "buysell.quote_input.increase_limits": " Increase your limit.",
   "scenes.buysell.coinify.sell.orderreview.checkboxtext": "I accept that Coinify will process my order upon completion of the bitcoin transaction, and that bitcoin will be traded at the available exchange rate at the time, which may differ from the displayed rate.",
@@ -930,6 +930,7 @@
   "coinifyexchangedata.addcustomerdetails.continue": "Continue",
   "coinifyexchangedata.selectaccounts.header": "Select Account",
   "coinifyexchangedata.selectaccounts.subheader": "Where would you like your funds sent? You have the following bank accounts linked: ",
+  "coinifyexchangedata.selectaccounts.addaccount": "Add new account",
   "coinifyexchangedata.selectaccounts.continue": "Continue",
   "scenes.buysell.exchangecheckout.enteramount": "Enter Amount:",
   "scenes.buysell.exchangecheckout.enteramount.details": "Please enter an amount greater than {min} {curr}.",
@@ -938,7 +939,6 @@
   "buy.sfoxcheckout.title.sell": "I want to sell",
   "buy.sfoxcheckout.inputmethod.title.buywith": "I will pay with",
   "buy.sfoxcheckout.outputmethod.title.sellwith": "I will receive funds into",
-  "buy.sfoxcheckout.revieworder": "Review Order",
   "buy.sfoxcheckout.loading": "Loading",
   "buy.sfoxcheckout.amount": "Amount",
   "scenes.buysell.sfoxcheckout.orderreview.helper1.question": "What are the fees?",
@@ -952,6 +952,7 @@
   "buy.sfoxcheckout.exchangerate": "Exchange Rate",
   "buysell.sfoxcheckout.orderreview.submit": "Submit",
   "buysell.sfoxcheckout.orderreview.cancel": "Cancel",
+  "buy.sfoxcheckout.revieworder": "Review Order",
   "scenes.buysell.sfoxcheckout.cyo.helper1.question": "What are the fees?",
   "scenes.buysell.sfoxcheckout.cyo.helper1.answer": "There is a trading fee that SFOX requires to execute a buy or sell trade. For sell trades specifically, there is an additional transaction fee that goes to network miners in order to send the amount you’re selling to SFOX.",
   "scenes.buysell.sfoxcheckout.cyo.helper2.question": "What is the exchange rate?",
@@ -1013,6 +1014,7 @@
   "scenes.exchange.shapeshift.stateregistration.subheader": "Blockchain works with exchange partners to make exchanging coins in your wallet secure and seamless.",
   "scenes.exchange.shapeshift.stateregistration.selectstate": "Select your state of residency:",
   "scenes.exchange.shapeshift.stateregistration.continue": "Continue",
+  "scenes.exchange.shapeshift.stateregistration.unavailable": "This service is not yet available in your state.",
   "scenes.exchange.shapeshift.error": "An error has occurred. Please try again.",
   "modals.exchange.shapeshift.title.success": "Success! Your exchange is complete",
   "modals.exchange.shapeshift.title.inprogress": "Exchange In Progress",
@@ -1194,6 +1196,7 @@
   "scenes.register.login": "Login",
   "scenes.register.explain": "Sign up for a free wallet below",
   "scenes.register.browserwarning": "Your browser is not supported. Please update to at least Chrome 45, Firefox 45, Safari 8, IE 11, or Opera ",
+  "scenes.register.msiewarning": "We recommend that you use a more secure browser like Chrome or Firefox.",
   "scenes.register.email": "Email",
   "scenes.register.password": "Password",
   "scenes.register.confirmpassword": "Confirm Password",
@@ -1206,29 +1209,25 @@
   "scenes.reminder.login": "Continue to Login",
   "scenes.reminder.remind": "Remind Me",
   "scenes.reset2fa.firststep.reset": "Reset 2FA",
-  "scenes.reset2fa.firststep.step1": "Step 1 of 3",
+  "scenes.reset2fa.firststep.step1": "Step 1 of 2",
   "scenes.reset2fa.firststep.explain": "Fill out the form below to regain access to your wallet by resetting your 2FA, restricted IP, and verified email.",
   "scenes.reset2fa.firststep.explain2": "Note: Your IP address and browser information will be recorded upon submission.",
   "scenes.reset2fa.firststep.firststepform.guid": "Wallet Identifier",
   "scenes.reset2fa.firststep.firststepform.guidexplain": "If you forgot your wallet identifier, please",
   "scenes.reset2fa.firststep.look": "look it up here.",
   "scenes.reset2fa.firststep.firststepform.email": "Registered Email",
+  "scenes.reset2fa.firststep.newEmail": "New Email (Optional)",
   "scenes.reset2fa.firststep.back": "Go Back",
   "scenes.reset2fa.firststep.firststepform.continue": "Continue",
-  "scenes.reset2fa.fourthstep.title": "Reset 2FA",
-  "scenes.reset2fa.fourthstep.message": "Thank you for submitting a two-factor authentication reset request. Please check your email for further instructions.",
-  "scenes.reset2fa.fourthstep.info": "This process usually takes two weeks. If you would like to learn more about the reset process, visit our ",
-  "scenes.reset2fa.fourthstep.infolink": "support page.",
-  "scenes.reset2fa.fourthstep.login": "Continue to Login",
-  "scenes.reset2fa.secondstep.reset": "Reset 2FA",
-  "scenes.reset2fa.secondstep.step2": "Step 2 of 3",
-  "scenes.reset2fa.secondstep.newEmail": "New Email (Optional)",
+  "scenes.reset2fa.secondstep.reset": "Reset",
+  "scenes.reset2fa.secondstep.step3": "Step 2 of 2",
+  "scenes.reset2fa.secondstep.captcha": "Captcha",
   "scenes.reset2fa.secondstep.back": "Go Back",
-  "scenes.reset2fa.secondstep.continue": "Continue",
-  "scenes.reset2fa.thirdstep.reset": "Reset",
-  "scenes.reset2fa.thirdstep.step3": "Step 3 of 3",
-  "scenes.reset2fa.thirdstep.captcha": "Captcha",
-  "scenes.reset2fa.thirdstep.back": "Go Back",
+  "scenes.reset2fa.thirdstep.title": "Reset 2FA",
+  "scenes.reset2fa.thirdstep.message": "Thank you for submitting a two-factor authentication reset request. Please check your email for further instructions.",
+  "scenes.reset2fa.thirdstep.info": "This process usually takes two weeks. If you would like to learn more about the reset process, visit our ",
+  "scenes.reset2fa.thirdstep.infolink": "support page.",
+  "scenes.reset2fa.thirdstep.login": "Continue to Login",
   "scenes.reset2fatoken.error": "<span>Uh Oh. Something went wrong. Error: </span> {error}",
   "scenes.securitysettings.advancedsecurity.activitylogging.title": "Activity Logging",
   "scenes.securitysettings.advancedsecurity.activitylogging.enabled": "Enabled",
@@ -1381,8 +1380,9 @@
   "modals.recoveryphrase.firststep.backup": "Backup Funds",
   "modals.recoveryphrase.secondstep.finishandcheckphrase": "Finish & Verify",
   "modals.recoveryphrase.secondstep.nextfourwords": "Next 4 Words",
+  "scenes.securitycenter.walletrecoveryphrase.thirdstep.incorrectword": "Incorrect Word",
+  "scenes.securitycenter.walletrecoveryphrase.thirdstep.reviewPhrase": "Review your backup phrase",
   "scenes.securitycenter.walletrecoveryphrase.thirdstep.confirm": "Confirm",
-  "scenes.securitycenter.walletrecoveryphrase.thirdstep.doublecheck": "Double check your backup phrase",
   "scenes.securitysettings.basicsecurity.walletrecovery.settings.backupagain": "Backup Again",
   "scenes.securitysettings.basicsecurity.walletrecovery.settings.backupfunds": "Backup Funds",
   "scenes.securitysettings.basicsecurity.recoveryphrase.title": "Backup Phrase",

packages/blockchain-wallet-v4-frontend/src/assets/locales/es.json

@@ -1079,7 +1079,7 @@
   "scenes.reminder.back": "Volver",
   "scenes.reminder.continue": "Continuar",
   "scenes.reset2fa.firststep.reset": "Restablecer autenticación 2FA",
-  "scenes.reset2fa.firststep.step1": "Paso 1 de 3",
+  "scenes.reset2fa.firststep.step1": "Paso 1 de 2",
   "scenes.reset2fa.firststep.explain": "Rellene el siguiente formulario para volver a tener acceso a su billetera restableciendo la autenticación 2FA, IP restringida o por correo electrónico verificado.",
   "scenes.reset2fa.firststep.explain2": "Nota: Su dirección IP y la información de su navegador quedarán registrados al enviarlo.",
   "scenes.reset2fa.firststep.firststepform.guid": "Identificador de billetera",
@@ -1099,7 +1099,7 @@
   "scenes.reset2fa.secondstep.back": "Volver",
   "scenes.reset2fa.secondstep.continue": "Continuar",
   "scenes.reset2fa.thirdstep.reset": "Restablecer",
-  "scenes.reset2fa.thirdstep.step3": "Paso 3 de 3",
+  "scenes.reset2fa.thirdstep.step2": "Paso 2 de 2",
   "scenes.reset2fa.thirdstep.captcha": "Captcha",
   "scenes.reset2fa.thirdstep.back": "Volver",
   "scenes.reset2fatoken.error": "<span>¡Vaya! Algo ha salido mal. Error: </span> {error}",

packages/blockchain-wallet-v4-frontend/src/assets/locales/fr.json

@@ -1099,7 +1099,7 @@
   "scenes.reset2fa.secondstep.back": "Précédent",
   "scenes.reset2fa.secondstep.continue": "Continuer",
   "scenes.reset2fa.thirdstep.reset": "Réinitialiser",
-  "scenes.reset2fa.thirdstep.step3": "",
+  "scenes.reset2fa.thirdstep.step2": "",
   "scenes.reset2fa.thirdstep.captcha": "Captcha",
   "scenes.reset2fa.thirdstep.back": "Précédent",
   "scenes.reset2fatoken.error": "Erreur",