diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index c9e1a1f1e..229a7cf03 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -29,6 +29,11 @@ msgstr ""
msgid "5-star ratings help us get {{appName}} into more hands, and more users means more resources can be committed to the app!"
msgstr ""
+#: www/views/mercadoLibre.html:18
+#: www/views/mercadoLibre.html:40
+msgid "Only redeemable on Mercado Livre (Brazil)"
+msgstr ""
+
#: src/js/controllers/feedback/send.js:27
#: www/views/feedback/complete.html:21
msgid "A member of the team will review your feedback as soon as possible."
@@ -238,7 +243,7 @@ msgstr ""
msgid "Are you sure you want to delete this contact?"
msgstr ""
-#: src/js/controllers/preferencesDelete.js:26
+#: src/js/controllers/preferencesDelete.js:25
msgid "Are you sure you want to delete this wallet?"
msgstr ""
@@ -386,6 +391,7 @@ msgid "Browser unsupported"
msgstr ""
#: www/views/buyAmazon.html:5
+#: www/views/buyMercadoLibre.html:6
msgid "Buy"
msgstr ""
@@ -397,6 +403,11 @@ msgstr ""
msgid "Buy Bitcoin"
msgstr ""
+#: www/views/mercadoLibre.html:22
+#: www/views/mercadoLibre.html:50
+msgid "Buy a Gift Card"
+msgstr ""
+
#: src/js/controllers/buyAmazon.js:332
msgid "Buy from"
msgstr ""
@@ -410,6 +421,7 @@ msgid "Calculating fee"
msgstr ""
#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
#: src/js/controllers/confirm.js:495
#: src/js/controllers/topup.js:285
#: src/js/services/popupService.js:62
@@ -475,6 +487,7 @@ msgid "Click"
msgstr ""
#: www/views/customAmount.html:4
+#: www/views/modals/mercadolibre-card-details.html:3
#: www/views/modals/paypro.html:4
#: www/views/modals/pin.html:3
#: www/views/modals/search.html:3
@@ -500,6 +513,7 @@ msgid "Completed"
msgstr ""
#: src/js/controllers/buyAmazon.js:309
+#: src/js/controllers/buyMercadoLibre.js:303
#: src/js/controllers/confirm.js:494
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:283
@@ -516,6 +530,7 @@ msgid "Confirm & Finish"
msgstr ""
#: www/views/buyAmazon.html:90
+#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr ""
@@ -597,11 +612,15 @@ msgstr ""
#: www/views/includes/incomingDataMenu.html:51
#: www/views/includes/incomingDataMenu.html:70
#: www/views/includes/incomingDataMenu.html:94
-#: www/views/preferencesLogs.html:10
+#: www/views/includes/logOptions.html:9
#: www/views/tab-export-file.html:78
msgid "Copy to clipboard"
msgstr ""
+#: src/js/controllers/buyMercadoLibre.js:101
+msgid "Could not access Gift Card Service"
+msgstr ""
+
#: www/views/tab-import-phrase.html:2
msgid "Could not access the wallet at the server. Please check:"
msgstr ""
@@ -635,6 +654,7 @@ msgid "Could not create the invoice"
msgstr ""
#: src/js/controllers/buyAmazon.js:163
+#: src/js/controllers/buyMercadoLibre.js:163
#: src/js/controllers/topup.js:141
msgid "Could not create transaction"
msgstr ""
@@ -667,11 +687,12 @@ msgstr ""
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr ""
-#: src/js/controllers/modals/feeLevels.js:113
+#: src/js/controllers/modals/feeLevels.js:112
msgid "Could not get fee levels"
msgstr ""
#: src/js/controllers/buyAmazon.js:121
+#: src/js/controllers/buyMercadoLibre.js:121
#: src/js/controllers/topup.js:99
msgid "Could not get the invoice"
msgstr ""
@@ -680,13 +701,13 @@ msgstr ""
msgid "Could not get transactions"
msgstr ""
-#: src/js/services/profileService.js:595
-#: src/js/services/profileService.js:629
-#: src/js/services/profileService.js:652
+#: src/js/services/profileService.js:597
+#: src/js/services/profileService.js:631
+#: src/js/services/profileService.js:654
msgid "Could not import"
msgstr ""
-#: src/js/services/profileService.js:564
+#: src/js/services/profileService.js:566
msgid "Could not import. Check input file and spending password"
msgstr ""
@@ -716,11 +737,12 @@ msgid "Could not send payment"
msgstr ""
#: src/js/controllers/buyAmazon.js:323
+#: src/js/controllers/buyMercadoLibre.js:316
#: src/js/controllers/topup.js:297
msgid "Could not send transaction"
msgstr ""
-#: www/views/walletDetails.html:199
+#: www/views/walletDetails.html:198
msgid "Could not update transaction history"
msgstr ""
@@ -787,6 +809,7 @@ msgstr ""
msgid "Custom Fee"
msgstr ""
+#: www/views/modals/mercadolibre-card-details.html:56
#: www/views/modals/txp-details.html:89
#: www/views/tx-details.html:68
msgid "Date"
@@ -829,6 +852,8 @@ msgid "Derivation Strategy"
msgstr ""
#: www/views/buyAmazon.html:39
+#: www/views/buyMercadoLibre.html:38
+#: www/views/modals/mercadolibre-card-details.html:6
#: www/views/topup.html:45
msgid "Details"
msgstr ""
@@ -897,10 +922,6 @@ msgstr ""
msgid "Enable the camera to get started."
msgstr ""
-#: www/views/amount.html:4
-msgid "Enter Amount"
-msgstr ""
-
#: src/js/services/walletService.js:1048
#: src/js/services/walletService.js:1063
msgid "Enter Spending Password"
@@ -910,6 +931,10 @@ msgstr ""
msgid "Enter Two Factor for your BitPay account"
msgstr ""
+#: www/views/amount.html:4
+msgid "Enter amount"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:41
msgid "Enter custom fee"
msgstr ""
@@ -943,6 +968,8 @@ msgstr ""
#: src/js/controllers/bitpayCardIntro.js:81
#: src/js/controllers/buyAmazon.js:23
#: src/js/controllers/buyAmazon.js:34
+#: src/js/controllers/buyMercadoLibre.js:23
+#: src/js/controllers/buyMercadoLibre.js:34
#: src/js/controllers/confirm.js:276
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:155
@@ -984,13 +1011,13 @@ msgstr ""
#: src/js/controllers/join.js:165
#: src/js/controllers/join.js:173
#: src/js/controllers/join.js:191
-#: src/js/controllers/modals/feeLevels.js:10
+#: src/js/controllers/modals/feeLevels.js:9
#: src/js/controllers/modals/txpDetails.js:134
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
#: src/js/controllers/preferencesBitpayServices.js:50
-#: src/js/controllers/preferencesDelete.js:37
+#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
#: src/js/controllers/tab-send.js:132
@@ -1000,6 +1027,8 @@ msgstr ""
#: src/js/controllers/topup.js:31
#: src/js/controllers/tx-details.js:102
#: src/js/services/incomingData.js:98
+#: www/views/mercadoLibreCards.html:19
+#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr ""
@@ -1012,6 +1041,7 @@ msgid "Error creating gift card"
msgstr ""
#: src/js/controllers/buyAmazon.js:93
+#: src/js/controllers/buyMercadoLibre.js:93
msgid "Error creating the invoice"
msgstr ""
@@ -1024,6 +1054,7 @@ msgid "Error getting SendMax information"
msgstr ""
#: src/js/controllers/buyAmazon.js:135
+#: src/js/controllers/buyMercadoLibre.js:135
#: src/js/controllers/topup.js:113
msgid "Error in Payment Protocol"
msgstr ""
@@ -1050,6 +1081,8 @@ msgstr ""
#: src/js/controllers/confirm.js:411
#: www/views/confirm.html:27
+#: www/views/mercadoLibreCards.html:25
+#: www/views/modals/mercadolibre-card-details.html:34
#: www/views/modals/txp-details.html:121
msgid "Expired"
msgstr ""
@@ -1102,11 +1135,11 @@ msgstr ""
msgid "Fee"
msgstr ""
-#: www/views/modals/chooseFeeLevel.html:73
+#: www/views/modals/chooseFeeLevel.html:75
msgid "Fee level"
msgstr ""
-#: src/js/controllers/modals/feeLevels.js:101
+#: src/js/controllers/modals/feeLevels.js:100
msgid "Fee level is not defined"
msgstr ""
@@ -1132,6 +1165,10 @@ msgstr ""
msgid "File/Text"
msgstr ""
+#: www/views/preferencesLogs.html:17
+msgid "Filter setting"
+msgstr ""
+
#: src/js/services/fingerprintService.js:43
#: src/js/services/fingerprintService.js:48
msgid "Finger Scan Failed"
@@ -1149,6 +1186,7 @@ msgstr ""
#: src/js/controllers/topup.js:306
#: www/views/buyAmazon.html:29
+#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
#: www/views/modals/txp-details.html:74
#: www/views/topup.html:34
@@ -1212,8 +1250,12 @@ msgstr ""
msgid "Get news and updates from BitPay"
msgstr ""
-#: www/views/bitpayCard.html:49
#: www/views/onboarding/welcome.html:8
+msgctxt "button"
+msgid "Get started"
+msgstr ""
+
+#: www/views/bitpayCard.html:49
msgid "Get started"
msgstr ""
@@ -1225,7 +1267,13 @@ msgstr ""
msgid "Getting fee levels..."
msgstr ""
+#: www/views/modals/mercadolibre-card-details.html:30
+#: www/views/modals/mercadolibre-card-details.html:35
+msgid "Gift Card is not available to use anymore"
+msgstr ""
+
#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
msgid "Gift card"
msgstr ""
@@ -1410,6 +1458,11 @@ msgstr ""
msgid "In order to verify your wallet backup, please type your password."
msgstr ""
+#: www/views/mercadoLibreCards.html:24
+#: www/views/modals/mercadolibre-card-details.html:29
+msgid "Inactive"
+msgstr ""
+
#: www/views/includes/walletItem.html:11
#: www/views/includes/walletSelector.html:18
#: www/views/tab-home.html:90
@@ -1451,6 +1504,7 @@ msgid "Invalid"
msgstr ""
#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
#: src/js/controllers/topup.js:114
msgid "Invalid URL"
msgstr ""
@@ -1480,10 +1534,16 @@ msgid "Invitation to share a {{appName}} Wallet"
msgstr ""
#: www/views/buyAmazon.html:49
+#: www/views/buyMercadoLibre.html:48
#: www/views/topup.html:56
msgid "Invoice Fee"
msgstr ""
+#: www/views/mercadoLibreCards.html:20
+#: www/views/modals/mercadolibre-card-details.html:48
+msgid "Invoice expired"
+msgstr ""
+
#: src/js/controllers/feedback/send.js:79
msgid "Is there anything we could do better?"
msgstr ""
@@ -1575,6 +1635,10 @@ msgstr ""
msgid "Locktime in effect. Please wait to remove this spend proposal"
msgstr ""
+#: www/views/includes/logOptions.html:3
+msgid "Log options"
+msgstr ""
+
#: www/views/modals/bitpay-card-confirmation.html:14
msgid "Log out"
msgstr ""
@@ -1611,6 +1675,14 @@ msgstr ""
msgid "Memo"
msgstr ""
+#: www/views/mercadoLibre.html:6
+msgid "Mercado Livre Brazil Gift Cards"
+msgstr ""
+
+#: src/js/controllers/buyMercadoLibre.js:97
+msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
+msgstr ""
+
#: www/views/modals/txp-details.html:133
msgid "Merchant Message"
msgstr ""
@@ -1653,6 +1725,7 @@ msgid "Name"
msgstr ""
#: www/views/buyAmazon.html:55
+#: www/views/buyMercadoLibre.html:54
#: www/views/topup.html:63
msgid "Network Fee"
msgstr ""
@@ -1682,6 +1755,7 @@ msgid "No Wallet"
msgstr ""
#: src/js/controllers/buyAmazon.js:114
+#: src/js/controllers/buyMercadoLibre.js:114
msgid "No access key defined"
msgstr ""
@@ -1693,6 +1767,10 @@ msgstr ""
msgid "No contacts yet"
msgstr ""
+#: www/views/preferencesLogs.html:16
+msgid "No entries for this log level"
+msgstr ""
+
#: www/views/preferencesExternal.html:12
msgid "No hardware information available."
msgstr ""
@@ -1714,7 +1792,7 @@ msgstr ""
msgid "No signing proposal: No private key"
msgstr ""
-#: www/views/walletDetails.html:193
+#: www/views/walletDetails.html:192
msgid "No transactions yet"
msgstr ""
@@ -1727,6 +1805,7 @@ msgid "No wallet selected"
msgstr ""
#: src/js/controllers/buyAmazon.js:298
+#: src/js/controllers/buyMercadoLibre.js:290
#: src/js/controllers/confirm.js:83
#: src/js/controllers/topup.js:263
msgid "No wallets available"
@@ -1819,6 +1898,10 @@ msgstr ""
msgid "Oh no!"
msgstr ""
+#: src/js/controllers/buyMercadoLibre.js:304
+msgid "Ok"
+msgstr ""
+
#: www/views/tab-home.html:39
msgid "On this screen you can see all your wallets, accounts, and assets."
msgstr ""
@@ -1961,6 +2044,11 @@ msgstr ""
msgid "Payment request"
msgstr ""
+#: www/views/mercadoLibreCards.html:22
+#: www/views/modals/mercadolibre-card-details.html:39
+msgid "Pending"
+msgstr ""
+
#: www/views/proposals.html:4
msgid "Pending Proposals"
msgstr ""
@@ -2022,7 +2110,7 @@ msgstr ""
msgid "Preparing backup..."
msgstr ""
-#: src/js/routes.js:1188
+#: src/js/routes.js:1240
msgid "Press again to exit"
msgstr ""
@@ -2060,7 +2148,7 @@ msgstr ""
msgid "Proposal Rejected"
msgstr ""
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:177
msgid "Proposals"
msgstr ""
@@ -2068,6 +2156,10 @@ msgstr ""
msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day"
msgstr ""
+#: src/js/controllers/buyMercadoLibre.js:280
+msgid "Purchase amount must be a value between 50 and 2000"
+msgstr ""
+
#: www/views/onboarding/notifications.html:3
msgid "Push Notifications"
msgstr ""
@@ -2151,7 +2243,7 @@ msgstr ""
msgid "Recovery phrase"
msgstr ""
-#: www/views/walletDetails.html:117
+#: www/views/walletDetails.html:116
#: www/views/walletDetails.html:36
msgid "Recreate"
msgstr ""
@@ -2160,6 +2252,10 @@ msgstr ""
msgid "Recreating Wallet..."
msgstr ""
+#: www/views/modals/mercadolibre-card-details.html:22
+msgid "Redeem now"
+msgstr ""
+
#: src/js/controllers/modals/txpDetails.js:57
#: src/js/controllers/tx-details.js:63
msgid "Rejected"
@@ -2174,6 +2270,7 @@ msgid "Release information"
msgstr ""
#: www/views/addressbook.view.html:36
+#: www/views/modals/mercadolibre-card-details.html:69
msgid "Remove"
msgstr ""
@@ -2292,6 +2389,10 @@ msgstr ""
msgid "Security"
msgstr ""
+#: www/views/modals/mercadolibre-card-details.html:64
+msgid "See invoice"
+msgstr ""
+
#: www/views/tab-import-file.html:7
msgid "Select a backup file"
msgstr ""
@@ -2328,7 +2429,7 @@ msgstr ""
msgid "Send addresses by email"
msgstr ""
-#: www/views/preferencesLogs.html:13
+#: www/views/includes/logOptions.html:17
#: www/views/tab-export-file.html:82
msgid "Send by email"
msgstr ""
@@ -2392,6 +2493,7 @@ msgid "Server response could not be verified"
msgstr ""
#: src/js/controllers/buyAmazon.js:96
+#: src/js/controllers/buyMercadoLibre.js:96
msgid "Service not available"
msgstr ""
@@ -2491,6 +2593,7 @@ msgid "Slide"
msgstr ""
#: www/views/buyAmazon.html:96
+#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr ""
@@ -2511,7 +2614,7 @@ msgstr ""
msgid "Spending Password needed"
msgstr ""
-#: www/views/walletDetails.html:162
+#: www/views/walletDetails.html:161
msgid "Spending this balance will need significant Bitcoin network fees"
msgstr ""
@@ -2523,6 +2626,11 @@ msgstr ""
msgid "Startup Lock"
msgstr ""
+#: www/views/mercadoLibreCards.html:21
+#: www/views/modals/mercadolibre-card-details.html:42
+msgid "Still pending"
+msgstr ""
+
#: www/views/topup.html:101
msgid "Success"
msgstr ""
@@ -2552,12 +2660,12 @@ msgstr ""
msgid "Take control of your money,
get started with bitcoin."
msgstr ""
-#: www/views/walletDetails.html:140
-#: www/views/walletDetails.html:60
+#: www/views/walletDetails.html:139
+#: www/views/walletDetails.html:59
msgid "Tap and hold to show"
msgstr ""
-#: www/views/walletDetails.html:112
+#: www/views/walletDetails.html:111
#: www/views/walletDetails.html:31
msgid "Tap to retry"
msgstr ""
@@ -2721,7 +2829,7 @@ msgstr ""
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr ""
-#: www/views/walletDetails.html:116
+#: www/views/walletDetails.html:115
#: www/views/walletDetails.html:35
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr ""
@@ -2761,12 +2869,13 @@ msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr ""
#: www/views/buyAmazon.html:61
+#: www/views/buyMercadoLibre.html:60
#: www/views/modals/wallet-balance.html:23
#: www/views/topup.html:70
msgid "Total"
msgstr ""
-#: www/views/walletDetails.html:185
+#: www/views/walletDetails.html:184
msgid "Total Locked Balance"
msgstr ""
@@ -2801,6 +2910,7 @@ msgid "Transaction already broadcasted"
msgstr ""
#: src/js/controllers/buyAmazon.js:306
+#: src/js/controllers/buyMercadoLibre.js:299
#: src/js/controllers/topup.js:279
msgid "Transaction has not been created"
msgstr ""
@@ -2818,7 +2928,7 @@ msgstr ""
msgid "Transaction not found"
msgstr ""
-#: www/views/modals/chooseFeeLevel.html:54
+#: www/views/modals/chooseFeeLevel.html:55
msgid "Transactions without fee are not supported."
msgstr ""
@@ -2854,7 +2964,7 @@ msgstr ""
msgid "Unit"
msgstr ""
-#: www/views/walletDetails.html:179
+#: www/views/walletDetails.html:178
msgid "Unsent transactions"
msgstr ""
@@ -2874,7 +2984,7 @@ msgstr ""
msgid "Updating pending proposals. Please stand by"
msgstr ""
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:210
msgid "Updating transaction history. Please stand by."
msgstr ""
@@ -2928,7 +3038,11 @@ msgstr ""
msgid "View on blockchain"
msgstr ""
-#: www/views/walletDetails.html:171
+#: www/views/mercadoLibre.html:26
+msgid "Visit mercadolivre.com.br →"
+msgstr ""
+
+#: www/views/walletDetails.html:170
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr ""
@@ -3041,7 +3155,7 @@ msgid "Wallet already exists"
msgstr ""
#: src/js/services/profileService.js:498
-msgid "Wallet already in Copay"
+msgid "Wallet already in {{appName}}"
msgstr ""
#: www/views/includes/walletActivity.html:6
@@ -3074,7 +3188,7 @@ msgid "Wallet needs backup"
msgstr ""
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:157
+#: www/views/walletDetails.html:156
msgid "Wallet not backed up"
msgstr ""
@@ -3109,7 +3223,7 @@ msgstr ""
#: src/js/controllers/addressbookView.js:23
#: src/js/controllers/modals/txpDetails.js:147
#: src/js/controllers/modals/txpDetails.js:164
-#: src/js/controllers/preferencesDelete.js:25
+#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
msgid "Warning!"
@@ -3219,7 +3333,7 @@ msgstr ""
msgid "You control your bitcoin."
msgstr ""
-#: www/views/modals/chooseFeeLevel.html:63
+#: www/views/modals/chooseFeeLevel.html:64
msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte."
msgstr ""
@@ -3235,6 +3349,11 @@ msgstr ""
msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide."
msgstr ""
+#: www/views/mercadoLibre.html:57
+#: www/views/mercadoLibreCards.html:6
+msgid "Your Gift Cards"
+msgstr ""
+
#: www/views/includes/confirmBackupPopup.html:6
msgid "Your bitcoin wallet is backed up!"
msgstr ""
@@ -3243,7 +3362,7 @@ msgstr ""
msgid "Your bitcoin wallet is ready!"
msgstr ""
-#: www/views/modals/chooseFeeLevel.html:60
+#: www/views/modals/chooseFeeLevel.html:61
msgid "Your fee is lower than recommended."
msgstr ""
@@ -3284,8 +3403,8 @@ msgstr ""
#: www/views/paperWallet.html:35
#: www/views/tab-home.html:96
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:138
+#: www/views/walletDetails.html:58
msgid "[Balance Hidden]"
msgstr ""
@@ -3327,6 +3446,10 @@ msgstr ""
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr ""
+#: src/js/controllers/buyMercadoLibre.js:236
+msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
+msgstr ""
+
#: www/views/preferencesBwsUrl.html:21
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr ""
@@ -3339,11 +3462,11 @@ msgstr ""
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr ""
-#: www/views/walletDetails.html:212
+#: www/views/walletDetails.html:211
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr ""
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:12
+#: www/views/includes/walletInfo.html:13
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr ""