From 4880a292afdbb62e9f9a13dce29a464f9f06bfd1 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 6 Jun 2017 10:31:17 -0300 Subject: [PATCH] Update translations --- i18n/po/template.pot | 610 ++++++++++++++++-------------- src/js/controllers/tab-receive.js | 2 +- 2 files changed, 321 insertions(+), 291 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index a91d87585..fdfee51fd 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -4,13 +4,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id-Version: \n" +#: www/views/bitpayCard.html:63 +msgid "(Pre-Auth Holds transactions) The merchant has initiated a hold to make those funds unavailable until your transaction to them has fully settled. Funds are released within 30 days at the latest in the event the merchant decides not to complete the transaction." +msgstr "" + #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "" -#: www/views/includes/txp.html:27 -#: www/views/modals/search.html:27 -#: www/views/walletDetails.html:273 +#: www/views/includes/txp.html:23 +#: www/views/includes/walletHistory.html:59 msgid "(possible double spend)" msgstr "" @@ -18,6 +21,10 @@ msgstr "" msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." msgstr "" +#: www/views/confirm.html:84 +msgid "- {{feeRateStr}} of the transaction" +msgstr "" + #: www/views/feedback/rateApp.html:7 msgid "5-star ratings help us get {{appName}} into more hands, and more users means more resources can be committed to the app!" msgstr "" @@ -27,11 +34,11 @@ msgstr "" msgid "A member of the team will review your feedback as soon as possible." msgstr "" -#: src/js/controllers/confirm.js:237 +#: src/js/controllers/confirm.js:238 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "" -#: src/js/controllers/confirm.js:231 +#: src/js/controllers/confirm.js:232 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "" @@ -41,7 +48,7 @@ msgid "About" msgstr "" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/tx-details.js:66 msgid "Accepted" msgstr "" @@ -50,7 +57,7 @@ msgid "Account" msgstr "" #: www/views/join.html:69 -#: www/views/tab-create-personal.html:42 +#: www/views/tab-create-personal.html:43 #: www/views/tab-create-shared.html:72 #: www/views/tab-import-hardware.html:19 msgid "Account Number" @@ -60,7 +67,7 @@ msgstr "" msgid "Accounts" msgstr "" -#: www/views/bitpayCard.html:57 +#: www/views/bitpayCard.html:68 msgid "Activity" msgstr "" @@ -81,12 +88,12 @@ msgstr "" msgid "Add Funds" msgstr "" -#: www/views/confirm.html:81 +#: www/views/confirm.html:89 msgid "Add Memo" msgstr "" #: www/views/join.html:84 -#: www/views/tab-create-personal.html:56 +#: www/views/tab-create-personal.html:57 #: www/views/tab-create-shared.html:86 msgid "Add a password" msgstr "" @@ -96,12 +103,12 @@ msgid "Add account" msgstr "" #: www/views/join.html:87 -#: www/views/tab-create-personal.html:59 +#: www/views/tab-create-personal.html:60 #: www/views/tab-create-shared.html:89 msgid "Add an optional password to secure the recovery phrase" msgstr "" -#: src/js/controllers/confirm.js:293 +#: src/js/controllers/confirm.js:297 msgid "Add description" msgstr "" @@ -110,7 +117,7 @@ msgid "Add wallet" msgstr "" #: www/views/addressbook.view.html:26 -#: www/views/customAmount.html:26 +#: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 #: www/views/paymentUri.html:15 msgid "Address" @@ -125,7 +132,7 @@ msgstr "" msgid "Address Type" msgstr "" -#: www/views/addresses.html:78 +#: www/views/addresses.html:64 msgid "Addresses With Balance" msgstr "" @@ -137,7 +144,7 @@ msgstr "" msgid "Advanced Settings" msgstr "" -#: www/views/bitpayCard.html:63 +#: www/views/bitpayCard.html:74 msgid "All" msgstr "" @@ -149,7 +156,7 @@ msgstr "" msgid "All of your bitcoin wallet balance may not be available for immediate spending." msgstr "" -#: www/views/tab-receive.html:33 +#: www/views/tab-receive.html:25 msgid "All signing devices must be added to this multisig wallet before bitcoin addresses can be created." msgstr "" @@ -171,7 +178,7 @@ msgid "Alternative Currency" msgstr "" #: www/views/amount.html:44 -#: www/views/customAmount.html:32 +#: www/views/customAmount.html:34 #: www/views/includes/output.html:7 #: www/views/paymentUri.html:16 msgid "Amount" @@ -181,7 +188,7 @@ msgstr "" msgid "Amount below minimum allowed" msgstr "" -#: src/js/controllers/confirm.js:410 +#: src/js/controllers/confirm.js:414 msgid "Amount too big" msgstr "" @@ -201,10 +208,14 @@ msgstr "" msgid "Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin." msgstr "" -#: src/js/controllers/copayers.js:42 +#: src/js/controllers/copayers.js:56 msgid "Are you sure you want to cancel and delete this wallet?" msgstr "" +#: src/js/controllers/addressbookView.js:24 +msgid "Are you sure you want to delete this contact?" +msgstr "" + #: src/js/controllers/preferencesDelete.js:26 msgid "Are you sure you want to delete this wallet?" msgstr "" @@ -221,6 +232,10 @@ msgstr "" msgid "Are you sure you want to skip it?" msgstr "" +#: www/views/modals/bitpay-card-confirmation.html:4 +msgid "Are you sure you would like to log out of your Bitpay Card account?" +msgstr "" + #: src/js/controllers/preferencesBitpayCard.js:7 #: src/js/controllers/preferencesBitpayServices.js:20 msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?" @@ -238,14 +253,15 @@ msgstr "" msgid "Available Balance" msgstr "" +#: www/views/modals/chooseFeeLevel.html:14 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "" -#: www/views/join.html:118 -#: www/views/tab-create-personal.html:89 -#: www/views/tab-create-shared.html:119 -#: www/views/tab-import-phrase.html:46 +#: www/views/join.html:140 +#: www/views/tab-create-personal.html:111 +#: www/views/tab-create-shared.html:140 +#: www/views/tab-import-phrase.html:48 msgid "BIP32 path for address derivation" msgstr "" @@ -257,7 +273,7 @@ msgstr "" msgid "Backup Needed" msgstr "" -#: src/js/controllers/lockSetup.js:50 +#: src/js/controllers/lockSetup.js:87 msgid "Backup all livenet wallets before using this function" msgstr "" @@ -275,7 +291,7 @@ msgstr "" msgid "Backup wallet" msgstr "" -#: src/js/controllers/lockSetup.js:47 +#: src/js/controllers/lockSetup.js:84 msgid "Backup your wallet before using this function" msgstr "" @@ -299,6 +315,7 @@ msgstr "" msgid "Bitcoin Address" msgstr "" +#: www/views/modals/chooseFeeLevel.html:7 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -312,7 +329,7 @@ msgstr "" msgid "Bitcoin Unit" msgstr "" -#: www/views/onboarding/tour.html:26 +#: www/views/onboarding/tour.html:31 msgid "Bitcoin is a currency." msgstr "" @@ -320,7 +337,7 @@ msgstr "" msgid "Bitcoin is different – it cannot be safely held with a bank or web service." msgstr "" -#: www/views/onboarding/tour.html:13 +#: www/views/onboarding/tour.html:18 msgid "Bitcoin is secure,
digital money." msgstr "" @@ -333,7 +350,7 @@ msgid "Broadcast Payment" msgstr "" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:64 +#: src/js/controllers/tx-details.js:68 msgid "Broadcasted" msgstr "" @@ -361,17 +378,20 @@ msgstr "" msgid "Calculating fee" msgstr "" -#: src/js/controllers/confirm.js:494 -#: src/js/controllers/lockSetup.js:102 +#: src/js/controllers/confirm.js:498 #: src/js/services/popupService.js:59 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 -#: www/views/includes/confirm-tx.html:30 #: www/views/includes/note.html:6 +#: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "" +#: www/views/copayers.html:37 +msgid "Cancel invitation" +msgstr "" + #: src/js/controllers/onboarding/tour.js:52 msgid "Cannot Create Wallet" msgstr "" @@ -412,11 +432,12 @@ msgstr "" msgid "Clear cache" msgstr "" -#: src/js/controllers/confirm.js:52 +#: src/js/controllers/confirm.js:66 #: src/js/controllers/modals/txpDetails.js:25 msgid "Click" msgstr "" +#: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 @@ -436,12 +457,16 @@ msgstr "" msgid "Complete the backup process to use this option" msgstr "" -#: src/js/controllers/confirm.js:493 -#: src/js/controllers/copayers.js:41 +#: www/views/bitpayCard.html:99 +msgid "Completed" +msgstr "" + +#: src/js/controllers/confirm.js:497 +#: src/js/controllers/copayers.js:55 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 -#: www/views/includes/confirm-tx.html:35 +#: www/views/onboarding/collectEmail.html:32 msgid "Confirm" msgstr "" @@ -450,11 +475,11 @@ msgstr "" msgid "Confirm & Finish" msgstr "" -#: www/views/pin.html:9 +#: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "" -#: src/js/services/walletService.js:938 +#: src/js/services/walletService.js:940 msgid "Confirm your new spending password" msgstr "" @@ -462,10 +487,19 @@ msgstr "" msgid "Confirmations" msgstr "" +#: www/views/bitpayCard.html:79 #: www/views/modals/wallet-balance.html:61 msgid "Confirming" msgstr "" +#: www/views/bitpayCard.html:59 +msgid "Confirming load transactions that are underpaid may require at least six blockchain confirmations to process." +msgstr "" + +#: www/views/bitpayCard.html:55 +msgid "Confirming transactions take up to 1 block confirmation to proccess." +msgstr "" + #: www/views/bitpayCardIntro.html:37 msgid "Connect my BitPay Card" msgstr "" @@ -486,7 +520,6 @@ msgstr "" msgid "Contacts" msgstr "" -#: src/js/controllers/lockSetup.js:101 #: www/views/onboarding/notifications.html:9 msgid "Continue" msgstr "" @@ -515,7 +548,7 @@ msgstr "" msgid "Copayer {{$index}}" msgstr "" -#: src/js/controllers/copayers.js:63 +#: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" @@ -538,7 +571,7 @@ msgstr "" msgid "Could not access wallet" msgstr "" -#: src/js/controllers/confirm.js:404 +#: src/js/controllers/confirm.js:408 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "" @@ -550,7 +583,7 @@ msgstr "" msgid "Could not build transaction" msgstr "" -#: src/js/services/walletService.js:836 +#: src/js/services/walletService.js:838 msgid "Could not create address" msgstr "" @@ -582,7 +615,7 @@ msgstr "" msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "" -#: src/js/controllers/bitpayCard.js:65 +#: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "" @@ -627,13 +660,12 @@ msgstr "" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 -#: src/js/controllers/copayers.js:23 -#: src/js/controllers/tab-receive.js:137 +#: src/js/controllers/copayers.js:30 #: src/js/controllers/walletDetails.js:63 msgid "Could not update wallet" msgstr "" -#: src/js/controllers/confirm.js:117 +#: src/js/controllers/confirm.js:130 msgid "Could not update wallets" msgstr "" @@ -645,13 +677,13 @@ msgstr "" msgid "Create Shared Wallet" msgstr "" -#: www/views/onboarding/tour.html:46 +#: www/views/onboarding/tour.html:51 #: www/views/tab-home.html:76 #: www/views/tab-send.html:32 msgid "Create bitcoin wallet" msgstr "" -#: www/views/tab-create-personal.html:107 +#: www/views/tab-create-personal.html:129 msgid "Create new wallet" msgstr "" @@ -659,7 +691,7 @@ msgstr "" msgid "Create shared wallet" msgstr "" -#: www/views/tab-create-shared.html:137 +#: www/views/tab-create-shared.html:158 msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet" msgstr "" @@ -676,11 +708,12 @@ msgstr "" msgid "Creating transaction" msgstr "" +#: www/views/modals/chooseFeeLevel.html:19 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "" -#: www/views/customAmount.html:4 +#: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "" @@ -697,12 +730,12 @@ msgstr "" msgid "Delete Payment Proposal" msgstr "" -#: www/views/preferencesAdvanced.html:29 +#: www/views/preferencesAdvanced.html:33 #: www/views/preferencesDeleteWallet.html:3 msgid "Delete Wallet" msgstr "" -#: www/views/copayers.html:59 +#: www/views/copayers.html:60 msgid "Delete it and create a new one" msgstr "" @@ -714,10 +747,10 @@ msgstr "" msgid "Deleting payment proposal" msgstr "" -#: www/views/join.html:116 -#: www/views/tab-create-personal.html:87 -#: www/views/tab-create-shared.html:117 -#: www/views/tab-import-phrase.html:44 +#: www/views/join.html:138 +#: www/views/tab-create-personal.html:109 +#: www/views/tab-create-shared.html:138 +#: www/views/tab-import-phrase.html:46 msgid "Derivation Path" msgstr "" @@ -726,7 +759,7 @@ msgid "Derivation Strategy" msgstr "" #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:58 +#: src/js/controllers/tab-settings.js:59 msgid "Disabled" msgstr "" @@ -748,7 +781,7 @@ msgstr "" msgid "Download" msgstr "" -#: www/views/addresses.html:23 +#: www/views/addresses.html:19 msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment." msgstr "" @@ -756,6 +789,10 @@ msgstr "" msgid "Economy" msgstr "" +#: www/views/onboarding/collectEmail.html:27 +msgid "Edit" +msgstr "" + #: www/views/addressbook.add.html:29 #: www/views/addressbook.view.html:22 msgid "Email" @@ -765,10 +802,6 @@ msgstr "" msgid "Email Address" msgstr "" -#: www/views/onboarding/collectEmail.html:9 -msgid "Email Notifications" -msgstr "" - #: src/js/services/bwcError.js:122 msgid "Empty addresses limit reached. New addresses cannot be generated." msgstr "" @@ -793,8 +826,8 @@ msgstr "" msgid "Enter Amount" msgstr "" -#: src/js/services/walletService.js:952 -#: src/js/services/walletService.js:967 +#: src/js/services/walletService.js:954 +#: src/js/services/walletService.js:969 msgid "Enter Spending Password" msgstr "" @@ -802,40 +835,42 @@ msgstr "" msgid "Enter Two Factor for your BitPay account" msgstr "" -#: src/js/services/walletService.js:934 +#: src/js/services/walletService.js:936 msgid "Enter new spending password" msgstr "" #: www/views/join.html:76 -#: www/views/tab-create-personal.html:48 +#: www/views/tab-create-personal.html:49 #: www/views/tab-create-shared.html:78 msgid "Enter the recovery phrase (BIP39)" msgstr "" +#: www/views/onboarding/collectEmail.html:13 +msgid "Enter your email" +msgstr "" + #: www/views/backup.html:62 msgid "Enter your password" msgstr "" #. Trying to import a malformed wallet export QR code #: src/js/controllers/activity.js:45 -#: src/js/controllers/addressbook.js:53 #: src/js/controllers/addressbookAdd.js:30 -#: src/js/controllers/addresses.js:98 -#: src/js/controllers/addresses.js:99 -#: src/js/controllers/bitpayCard.js:65 +#: src/js/controllers/addressbookView.js:29 +#: src/js/controllers/addresses.js:105 +#: src/js/controllers/addresses.js:106 +#: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:177 -#: src/js/controllers/confirm.js:190 -#: src/js/controllers/confirm.js:196 -#: src/js/controllers/copayers.js:53 -#: src/js/controllers/create.js:117 -#: src/js/controllers/create.js:145 -#: src/js/controllers/create.js:158 -#: src/js/controllers/create.js:165 -#: src/js/controllers/create.js:187 -#: src/js/controllers/create.js:194 -#: src/js/controllers/create.js:212 +#: src/js/controllers/confirm.js:191 +#: src/js/controllers/confirm.js:197 +#: src/js/controllers/copayers.js:67 +#: src/js/controllers/create.js:155 +#: src/js/controllers/create.js:168 +#: src/js/controllers/create.js:175 +#: src/js/controllers/create.js:197 +#: src/js/controllers/create.js:204 +#: src/js/controllers/create.js:222 #: src/js/controllers/export.js:109 #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -863,13 +898,12 @@ msgstr "" #: src/js/controllers/import.js:54 #: src/js/controllers/import.js:67 #: src/js/controllers/import.js:88 -#: src/js/controllers/join.js:119 -#: src/js/controllers/join.js:133 -#: src/js/controllers/join.js:140 -#: src/js/controllers/join.js:163 -#: src/js/controllers/join.js:171 -#: src/js/controllers/join.js:189 -#: src/js/controllers/join.js:97 +#: src/js/controllers/join.js:120 +#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:141 +#: src/js/controllers/join.js:164 +#: src/js/controllers/join.js:172 +#: src/js/controllers/join.js:190 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -879,12 +913,12 @@ msgstr "" #: src/js/controllers/preferencesExternal.js:20 #: src/js/controllers/tab-home.js:170 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:102 +#: src/js/controllers/tx-details.js:106 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "" -#: src/js/controllers/confirm.js:379 +#: src/js/controllers/confirm.js:382 msgid "Error at confirm" msgstr "" @@ -912,7 +946,7 @@ msgstr "" msgid "Exceeded daily limit of $500 per user" msgstr "" -#: src/js/controllers/confirm.js:338 +#: src/js/controllers/confirm.js:342 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:120 msgid "Expired" @@ -923,7 +957,7 @@ msgstr "" msgid "Expires" msgstr "" -#: www/views/preferencesAdvanced.html:17 +#: www/views/preferencesAdvanced.html:21 msgid "Export Wallet" msgstr "" @@ -936,7 +970,7 @@ msgstr "" msgid "Export wallet" msgstr "" -#: src/js/services/walletService.js:1079 +#: src/js/services/walletService.js:1081 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "" @@ -962,13 +996,15 @@ msgstr "" msgid "Family vacation funds" msgstr "" -#: www/views/confirm.html:88 -#: www/views/includes/confirm-tx.html:19 #: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "" +#: www/views/confirm.html:81 +msgid "Fee:" +msgstr "" + #: src/js/controllers/feedback/send.js:23 msgid "Feedback could not be submitted. Please try again later." msgstr "" @@ -992,13 +1028,12 @@ msgid "Finger Scan Failed" msgstr "" #: src/js/controllers/feedback/send.js:34 -#: www/views/customAmount.html:9 #: www/views/feedback/complete.html:7 msgid "Finish" msgstr "" -#: www/views/tab-create-personal.html:99 -#: www/views/tab-create-shared.html:129 +#: www/views/tab-create-personal.html:121 +#: www/views/tab-create-shared.html:150 msgid "For audit purposes" msgstr "" @@ -1024,14 +1059,18 @@ msgstr "" msgid "Funds found:" msgstr "" -#: www/views/paperWallet.html:34 +#: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "" -#: www/views/paperWallet.html:23 +#: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "" +#: www/views/tab-receive.html:51 +msgid "Generate new address" +msgstr "" + #: src/js/services/onGoingProcess.js:22 msgid "Generating .csv file..." msgstr "" @@ -1048,6 +1087,7 @@ msgstr "" msgid "Get news and updates from BitPay" msgstr "" +#: www/views/bitpayCard.html:49 #: www/views/onboarding/welcome.html:8 msgid "Get started" msgstr "" @@ -1060,12 +1100,14 @@ msgstr "" msgid "Getting fee levels..." msgstr "" +#: src/js/controllers/bitpayCard.js:171 +#: src/js/controllers/bitpayCard.js:181 #: src/js/controllers/onboarding/terms.js:23 #: src/js/controllers/preferencesAbout.js:16 #: src/js/controllers/preferencesLanguage.js:14 #: src/js/controllers/tab-home.js:145 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:163 +#: src/js/controllers/tx-details.js:169 msgid "Go Back" msgstr "" @@ -1077,7 +1119,7 @@ msgstr "" #: www/views/backupWarning.html:15 #: www/views/includes/confirmBackupPopup.html:8 -#: www/views/onboarding/tour.html:18 +#: www/views/onboarding/tour.html:23 msgid "Got it" msgstr "" @@ -1098,11 +1140,12 @@ msgstr "" msgid "Help & Support" msgstr "" +#: src/js/controllers/bitpayCard.js:169 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "" -#: www/views/addresses.html:29 +#: www/views/addresses.html:25 msgid "Hide" msgstr "" @@ -1115,12 +1158,12 @@ msgid "Hide Next Steps Card" msgstr "" #: www/views/join.html:46 -#: www/views/tab-create-personal.html:25 +#: www/views/tab-create-personal.html:26 #: www/views/tab-create-shared.html:55 #: www/views/tab-export-file.html:25 #: www/views/tab-import-file.html:28 #: www/views/tab-import-hardware.html:31 -#: www/views/tab-import-phrase.html:31 +#: www/views/tab-import-phrase.html:33 msgid "Hide advanced options" msgstr "" @@ -1150,9 +1193,9 @@ msgstr "" msgid "I have read, understood, and agree with the Terms of use." msgstr "" -#: www/views/join.html:112 -#: www/views/tab-create-personal.html:83 -#: www/views/tab-create-shared.html:113 +#: www/views/join.html:134 +#: www/views/tab-create-personal.html:105 +#: www/views/tab-create-shared.html:134 msgid "I have written it down" msgstr "" @@ -1206,7 +1249,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca msgstr "" #: www/views/tab-import-hardware.html:42 -#: www/views/tab-import-phrase.html:61 +#: www/views/tab-import-phrase.html:63 msgid "Import" msgstr "" @@ -1237,11 +1280,11 @@ msgstr "" msgid "Incomplete" msgstr "" -#: www/views/tab-receive.html:30 +#: www/views/tab-receive.html:22 msgid "Incomplete wallet" msgstr "" -#: www/views/pin.html:11 +#: www/views/modals/pin.html:12 msgid "Incorrect PIN, try again." msgstr "" @@ -1255,7 +1298,7 @@ msgid "Incorrect code format" msgstr "" #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:96 +#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "" @@ -1263,14 +1306,13 @@ msgstr "" msgid "Insufficient funds for fee" msgstr "" -#: www/views/modals/search.html:70 -#: www/views/walletDetails.html:260 +#: www/views/includes/walletHistory.html:44 msgid "Invalid" msgstr "" -#: src/js/controllers/create.js:165 +#: src/js/controllers/create.js:175 #: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:140 +#: src/js/controllers/join.js:141 msgid "Invalid account number" msgstr "" @@ -1282,13 +1324,13 @@ msgstr "" msgid "Invalid data" msgstr "" -#: src/js/controllers/create.js:145 +#: src/js/controllers/create.js:155 #: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:119 +#: src/js/controllers/join.js:120 msgid "Invalid derivation path" msgstr "" -#: src/js/controllers/copayers.js:74 +#: src/js/controllers/copayers.js:90 msgid "Invitation to share a {{appName}} Wallet" msgstr "" @@ -1304,7 +1346,7 @@ msgstr "" msgid "Is this email address correct?" msgstr "" -#: www/views/addresses.html:29 +#: www/views/addresses.html:25 msgid "It's a good idea to avoid reusing addresses - this both protects your privacy and keeps your bitcoins secure against hypothetical attacks by quantum computers." msgstr "" @@ -1312,15 +1354,11 @@ msgstr "" msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again." msgstr "" -#: www/views/join.html:18 -msgid "John" -msgstr "" - -#: www/views/join.html:126 +#: www/views/join.html:148 msgid "Join" msgstr "" -#: src/js/controllers/copayers.js:69 +#: src/js/controllers/copayers.js:85 msgid "Join my {{appName}} Wallet. Here is the invitation code: {{secret}} You can download {{appName}} for your phone or desktop at {{appUrl}}" msgstr "" @@ -1333,7 +1371,7 @@ msgstr "" msgid "Joining Wallet..." msgstr "" -#: www/views/onboarding/tour.html:17 +#: www/views/onboarding/tour.html:22 msgid "Just scan the code to pay." msgstr "" @@ -1346,16 +1384,22 @@ msgstr "" msgid "Language" msgstr "" -#: www/views/bitpayCard.html:62 +#: www/views/bitpayCard.html:73 msgid "Last Month" msgstr "" +#: www/views/bitpayCard.html:56 +#: www/views/bitpayCard.html:60 +#: www/views/bitpayCard.html:64 +msgid "Learn More" +msgstr "" + #: www/views/backup.html:36 msgid "Let's verify your backup phrase." msgstr "" -#: www/views/addresses.html:52 -#: www/views/allAddresses.html:18 +#: www/views/addresses.html:45 +#: www/views/allAddresses.html:14 msgid "Loading addresses..." msgstr "" @@ -1367,11 +1411,11 @@ msgstr "" msgid "Lock App" msgstr "" -#: src/js/controllers/lockSetup.js:21 +#: src/js/controllers/lockSetup.js:23 msgid "Lock by Fingerprint" msgstr "" -#: src/js/controllers/lockSetup.js:13 +#: src/js/controllers/lockSetup.js:14 msgid "Lock by PIN" msgstr "" @@ -1387,7 +1431,11 @@ msgstr "" msgid "Locktime in effect. Please wait to remove this spend proposal" msgstr "" -#: www/views/walletDetails.html:243 +#: www/views/modals/bitpay-card-confirmation.html:14 +msgid "Log out" +msgstr "" + +#: www/views/includes/walletHistory.html:27 msgid "Low fees" msgstr "" @@ -1395,11 +1443,11 @@ msgstr "" msgid "Make a payment to" msgstr "" -#: www/views/onboarding/tour.html:33 +#: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "" -#: src/js/controllers/modals/search.js:64 +#: src/js/controllers/modals/search.js:61 msgid "Matches:" msgstr "" @@ -1412,7 +1460,7 @@ msgstr "" msgid "Meh - it's alright" msgstr "" -#: src/js/controllers/tx-details.js:135 +#: src/js/controllers/tx-details.js:141 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1440,17 +1488,15 @@ msgstr "" msgid "More Options" msgstr "" -#: www/views/modals/search.html:67 +#: www/views/includes/walletHistory.html:42 #: www/views/tx-details.html:19 -#: www/views/walletDetails.html:258 msgid "Moved" msgstr "" -#: src/js/controllers/tx-details.js:113 +#: src/js/controllers/tx-details.js:117 msgid "Moved Funds" msgstr "" -#: www/views/includes/confirm-tx.html:13 #: www/views/modals/txp-details.html:57 msgid "Multiple recipients" msgstr "" @@ -1478,7 +1524,7 @@ msgstr "" msgid "New Proposal" msgstr "" -#: src/js/controllers/addresses.js:99 +#: src/js/controllers/addresses.js:106 msgid "New address could not be generated. Please try again." msgstr "" @@ -1490,11 +1536,7 @@ msgstr "" msgid "Next steps" msgstr "" -#: www/views/onboarding/collectEmail.html:27 -msgid "No" -msgstr "" - -#: www/views/tab-receive.html:7 +#: www/views/tab-receive.html:16 msgid "No Wallet" msgstr "" @@ -1534,11 +1576,11 @@ msgstr "" msgid "No wallet selected" msgstr "" -#: www/views/confirm.html:93 +#: www/views/confirm.html:96 msgid "No wallets available" msgstr "" -#: www/views/paperWallet.html:28 +#: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" msgstr "" @@ -1550,11 +1592,11 @@ msgstr "" msgid "Not authorized" msgstr "" -#: src/js/controllers/confirm.js:196 +#: src/js/controllers/confirm.js:197 msgid "Not enough funds for fee" msgstr "" -#: www/views/onboarding/tour.html:45 +#: www/views/onboarding/tour.html:50 msgid "Not even BitPay can access it." msgstr "" @@ -1580,6 +1622,14 @@ msgstr "" msgid "Notifications" msgstr "" +#: www/views/onboarding/collectEmail.html:9 +msgid "Notifications by email" +msgstr "" + +#: www/views/tx-details.html:110 +msgid "Notify me if confirmed" +msgstr "" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "" @@ -1612,10 +1662,7 @@ msgstr "" msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "" -#: www/views/lockedView.html:14 -msgid "One-touch Sign In" -msgstr "" - +#: src/js/controllers/bitpayCard.js:170 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "" @@ -1632,7 +1679,8 @@ msgstr "" msgid "Open GitHub Project" msgstr "" -#: src/js/controllers/tx-details.js:162 +#: src/js/controllers/bitpayCard.js:180 +#: src/js/controllers/tx-details.js:168 msgid "Open Insight" msgstr "" @@ -1648,7 +1696,7 @@ msgstr "" msgid "Open Website" msgstr "" -#: www/views/tab-receive.html:36 +#: www/views/tab-receive.html:27 msgid "Open wallet" msgstr "" @@ -1656,14 +1704,14 @@ msgstr "" msgid "Order the BitPay Card" msgstr "" -#: www/views/join.html:100 +#: www/views/join.html:102 #: www/views/join.html:93 -#: www/views/tab-create-personal.html:66 -#: www/views/tab-create-personal.html:72 -#: www/views/tab-create-shared.html:102 +#: www/views/tab-create-personal.html:67 +#: www/views/tab-create-personal.html:75 +#: www/views/tab-create-shared.html:104 #: www/views/tab-create-shared.html:96 #: www/views/tab-import-file.html:18 -#: www/views/tab-import-phrase.html:36 +#: www/views/tab-import-phrase.html:38 msgid "Password" msgstr "" @@ -1724,7 +1772,7 @@ msgstr "" msgid "Payment Rejected" msgstr "" -#: www/views/confirm.html:123 +#: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 #: www/views/modals/txp-details.html:187 #: www/views/modals/txp-details.html:42 @@ -1747,7 +1795,7 @@ msgstr "" msgid "Payment request" msgstr "" -#: www/views/bitpayCard.html:105 +#: www/views/includes/cardActivity.html:41 msgid "Pending" msgstr "" @@ -1775,24 +1823,15 @@ msgstr "" msgid "Please enter the recovery phrase" msgstr "" -#: src/js/controllers/create.js:117 -#: src/js/controllers/join.js:97 -msgid "Please enter the required fields" -msgstr "" - -#: src/js/controllers/create.js:158 -#: src/js/controllers/join.js:133 +#: src/js/controllers/create.js:168 +#: src/js/controllers/join.js:134 msgid "Please enter the wallet recovery phrase" msgstr "" -#: www/views/pin.html:8 +#: www/views/modals/pin.html:9 msgid "Please enter your PIN" msgstr "" -#: www/views/lockedView.html:15 -msgid "Please place your fingertip on the scanner to verify your identity" -msgstr "" - #: www/views/backup.html:46 msgid "Please tap each word in the correct order." msgstr "" @@ -1805,6 +1844,10 @@ msgstr "" msgid "Please, select your backup file" msgstr "" +#: www/views/bitpayCard.html:89 +msgid "Pre-Auth Holds" +msgstr "" + #: www/views/tab-settings.html:40 msgid "Preferences" msgstr "" @@ -1817,7 +1860,7 @@ msgstr "" msgid "Preparing backup..." msgstr "" -#: src/js/routes.js:1186 +#: src/js/routes.js:1176 msgid "Press again to exit" msgstr "" @@ -1825,7 +1868,7 @@ msgstr "" msgid "Priority" msgstr "" -#: src/js/controllers/paperWallet.js:142 +#: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "" @@ -1838,8 +1881,8 @@ msgid "Proposal Accepted" msgstr "" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:61 -#: www/views/confirm.html:124 +#: src/js/controllers/tx-details.js:65 +#: www/views/confirm.html:127 msgid "Proposal Created" msgstr "" @@ -1871,8 +1914,8 @@ msgstr "" msgid "Quick review!" msgstr "" -#: src/js/controllers/create.js:65 -#: src/js/controllers/join.js:50 +#: src/js/controllers/create.js:79 +#: src/js/controllers/join.js:64 msgid "Random" msgstr "" @@ -1880,11 +1923,11 @@ msgstr "" msgid "Rate on the app store" msgstr "" -#: www/views/addresses.html:66 +#: www/views/addresses.html:52 msgid "Read less" msgstr "" -#: www/views/addresses.html:65 +#: www/views/addresses.html:51 msgid "Read more" msgstr "" @@ -1893,23 +1936,22 @@ msgstr "" msgid "Receive" msgstr "" -#: www/views/modals/search.html:51 +#: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 -#: www/views/walletDetails.html:240 msgid "Received" msgstr "" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:116 msgid "Received Funds" msgstr "" +#: www/views/includes/walletHistory.html:52 #: www/views/tx-details.html:24 -#: www/views/walletDetails.html:266 msgid "Receiving" msgstr "" -#: www/views/bitpayCard.html:61 -#: www/views/walletDetails.html:219 +#: www/views/bitpayCard.html:72 +#: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "" @@ -1945,7 +1987,7 @@ msgid "Recreating Wallet..." msgstr "" #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:63 +#: src/js/controllers/tx-details.js:67 msgid "Rejected" msgstr "" @@ -1957,6 +1999,10 @@ msgstr "" msgid "Release information" msgstr "" +#: www/views/addressbook.view.html:36 +msgid "Remove" +msgstr "" + #: src/js/controllers/preferencesBitpayServices.js:7 msgid "Remove BitPay Account?" msgstr "" @@ -1969,6 +2015,12 @@ msgstr "" msgid "Removing your BitPay account will remove all associated BitPay account data from this device. Are you sure you would like to remove your BitPay Account ({{email}}) from this device?" msgstr "" +#: www/views/join.html:113 +#: www/views/join.html:121 +#: www/views/tab-create-personal.html:84 +#: www/views/tab-create-personal.html:92 +#: www/views/tab-create-shared.html:113 +#: www/views/tab-create-shared.html:121 #: www/views/tab-export-file.html:17 msgid "Repeat password" msgstr "" @@ -1981,7 +2033,7 @@ msgstr "" msgid "Request Fingerprint" msgstr "" -#: www/views/addresses.html:38 +#: www/views/tab-receive.html:45 msgid "Request Specific amount" msgstr "" @@ -2011,6 +2063,7 @@ msgstr "" #: www/views/addressbook.add.html:56 #: www/views/includes/note.html:9 +#: www/views/modals/chooseFeeLevel.html:31 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 #: www/views/preferencesNotifications.html:40 @@ -2026,14 +2079,10 @@ msgstr "" msgid "Scan QR Codes" msgstr "" -#: www/views/addresses.html:35 +#: www/views/addresses.html:31 msgid "Scan addresses for funds" msgstr "" -#: www/views/lockedView.html:17 -msgid "Scan again" -msgstr "" - #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "" @@ -2070,6 +2119,7 @@ msgstr "" msgid "Select a backup file" msgstr "" +#: src/js/controllers/tab-receive.js:133 #: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "" @@ -2094,24 +2144,20 @@ msgstr "" msgid "Send Feedback" msgstr "" -#: www/views/addressbook.view.html:30 +#: www/views/addressbook.view.html:31 msgid "Send Money" msgstr "" -#: www/views/allAddresses.html:25 +#: www/views/allAddresses.html:19 msgid "Send addresses by email" msgstr "" -#: www/views/includes/confirm-tx.html:3 -msgid "Send bitcoin" -msgstr "" - #: www/views/preferencesLogs.html:13 #: www/views/tab-export-file.html:82 msgid "Send by email" msgstr "" -#: src/js/controllers/confirm.js:272 +#: src/js/controllers/confirm.js:276 msgid "Send from" msgstr "" @@ -2124,10 +2170,9 @@ msgid "Send us feedback instead" msgstr "" #: www/views/confirm.html:15 -#: www/views/includes/txp.html:14 +#: www/views/includes/txp.html:12 #: www/views/modals/txp-details.html:19 #: www/views/tx-details.html:23 -#: www/views/walletDetails.html:265 msgid "Sending" msgstr "" @@ -2147,18 +2192,17 @@ msgstr "" msgid "Sending transaction" msgstr "" -#: src/js/controllers/confirm.js:489 +#: src/js/controllers/confirm.js:493 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "" -#: www/views/modals/search.html:60 +#: www/views/includes/walletHistory.html:37 #: www/views/modals/tx-status.html:9 #: www/views/tx-details.html:17 -#: www/views/walletDetails.html:253 msgid "Sent" msgstr "" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:115 msgid "Sent Funds" msgstr "" @@ -2187,21 +2231,12 @@ msgstr "" msgid "Settings" msgstr "" -#: www/views/customAmount.html:20 -#: www/views/tab-receive.html:67 -msgid "Share" -msgstr "" - -#: www/views/copayers.html:36 -msgid "Share invitation" -msgstr "" - #: www/views/feedback/complete.html:17 #: www/views/feedback/complete.html:26 msgid "Share the love by inviting your friends." msgstr "" -#: www/views/copayers.html:17 +#: www/views/copayers.html:21 msgid "Share this invitation with your copayers" msgstr "" @@ -2218,17 +2253,17 @@ msgstr "" msgid "Show Recovery Phrase" msgstr "" -#: www/views/tab-receive.html:58 +#: www/views/tab-receive.html:34 msgid "Show address" msgstr "" #: www/views/join.html:45 -#: www/views/tab-create-personal.html:24 +#: www/views/tab-create-personal.html:25 #: www/views/tab-create-shared.html:54 #: www/views/tab-export-file.html:24 #: www/views/tab-import-file.html:27 #: www/views/tab-import-hardware.html:30 -#: www/views/tab-import-phrase.html:30 +#: www/views/tab-import-phrase.html:32 msgid "Show advanced options" msgstr "" @@ -2252,22 +2287,23 @@ msgstr "" msgid "Since only you control your money, you’ll need to save your backup phrase in case this app is deleted." msgstr "" -#: www/views/tab-create-personal.html:98 -#: www/views/tab-create-shared.html:128 +#: www/views/tab-create-personal.html:120 +#: www/views/tab-create-shared.html:149 msgid "Single Address Wallet" msgstr "" #: www/views/onboarding/collectEmail.html:40 +#: www/views/onboarding/tour.html:11 msgid "Skip" msgstr "" -#: src/js/controllers/confirm.js:52 +#: src/js/controllers/confirm.js:66 #: src/js/controllers/modals/txpDetails.js:25 msgid "Slide" msgstr "" -#: src/js/controllers/create.js:69 -#: src/js/controllers/join.js:53 +#: src/js/controllers/create.js:83 +#: src/js/controllers/join.js:67 msgid "Specify Recovery Phrase..." msgstr "" @@ -2340,8 +2376,8 @@ msgstr "" msgid "Terms of Use" msgstr "" -#: www/views/tab-create-personal.html:94 -#: www/views/tab-import-phrase.html:55 +#: www/views/tab-create-personal.html:116 +#: www/views/tab-import-phrase.html:58 msgid "Testnet" msgstr "" @@ -2380,7 +2416,7 @@ msgstr "" msgid "The derivation path" msgstr "" -#: www/views/onboarding/tour.html:32 +#: www/views/onboarding/tour.html:37 msgid "The exchange rate changes with the market." msgstr "" @@ -2388,7 +2424,7 @@ msgstr "" msgid "The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy." msgstr "" -#: www/views/addresses.html:65 +#: www/views/addresses.html:51 msgid "The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab." msgstr "" @@ -2400,7 +2436,7 @@ msgstr "" msgid "The password of the recovery phrase (if set)" msgstr "" -#: src/js/services/walletService.js:1044 +#: src/js/services/walletService.js:1046 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "" @@ -2409,9 +2445,9 @@ msgid "The payment was removed by creator" msgstr "" #: www/views/join.html:88 -#: www/views/tab-create-personal.html:60 +#: www/views/tab-create-personal.html:61 #: www/views/tab-create-shared.html:90 -#: www/views/tab-import-phrase.html:38 +#: www/views/tab-import-phrase.html:40 msgid "The recovery phrase could require a password to be imported" msgstr "" @@ -2419,7 +2455,7 @@ msgstr "" msgid "The request could not be understood by the server" msgstr "" -#: www/views/addresses.html:66 +#: www/views/addresses.html:52 msgid "The restore process will stop when 20 addresses are generated in a row which contain no funds. To safely generate more addresses, make a payment to one of the unused addresses which has already been generated." msgstr "" @@ -2462,17 +2498,17 @@ msgstr "" msgid "This app is fantastic!" msgstr "" -#: www/views/onboarding/tour.html:42 +#: www/views/onboarding/tour.html:47 msgid "This app stores your bitcoin with cutting-edge security." msgstr "" -#: src/js/controllers/confirm.js:471 +#: src/js/controllers/confirm.js:475 msgid "This bitcoin payment request has expired." msgstr "" -#: www/views/join.html:108 -#: www/views/tab-create-personal.html:79 -#: www/views/tab-create-shared.html:109 +#: www/views/join.html:130 +#: www/views/tab-create-personal.html:101 +#: www/views/tab-create-shared.html:130 msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds." msgstr "" @@ -2490,7 +2526,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). msgstr "" #: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:106 +#: www/views/tx-details.html:113 msgid "Timeline" msgstr "" @@ -2532,7 +2568,7 @@ msgstr "" msgid "Transaction" msgstr "" -#: www/views/preferencesAdvanced.html:25 +#: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" msgstr "" @@ -2541,11 +2577,11 @@ msgstr "" msgid "Transaction already broadcasted" msgstr "" -#: www/views/confirm.html:125 +#: www/views/confirm.html:128 msgid "Transaction created" msgstr "" -#: src/js/controllers/tx-details.js:102 +#: src/js/controllers/tx-details.js:106 msgid "Transaction not available at this time" msgstr "" @@ -2554,11 +2590,15 @@ msgstr "" msgid "Transaction not found" msgstr "" +#: src/js/controllers/paperWallet.js:110 +msgid "Transfer to" +msgstr "" + #: www/views/tab-send.html:63 msgid "Transfer to Wallet" msgstr "" -#: www/views/pin.html:12 +#: www/views/modals/pin.html:13 msgid "Try again in {{expires}}" msgstr "" @@ -2574,7 +2614,6 @@ msgstr "" msgid "Uh oh..." msgstr "" -#: www/views/modals/search.html:36 #: www/views/tx-details.html:94 msgid "Unconfirmed" msgstr "" @@ -2587,11 +2626,11 @@ msgstr "" msgid "Unsent transactions" msgstr "" -#: www/views/addresses.html:59 +#: www/views/addresses.html:39 msgid "Unused Addresses" msgstr "" -#: www/views/addresses.html:64 +#: www/views/addresses.html:50 msgid "Unused Addresses Limit" msgstr "" @@ -2632,7 +2671,7 @@ msgstr "" msgid "View" msgstr "" -#: www/views/addresses.html:42 +#: www/views/addresses.html:34 msgid "View All Addresses" msgstr "" @@ -2640,7 +2679,8 @@ msgstr "" msgid "View Terms of Service" msgstr "" -#: src/js/controllers/tx-details.js:161 +#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/tx-details.js:167 msgid "View Transaction on Insight" msgstr "" @@ -2648,7 +2688,7 @@ msgstr "" msgid "View Update" msgstr "" -#: www/views/tx-details.html:132 +#: www/views/tx-details.html:139 msgid "View on blockchain" msgstr "" @@ -2676,15 +2716,16 @@ msgstr "" msgid "Waiting for Trezor..." msgstr "" -#: www/views/copayers.html:48 +#: www/views/copayers.html:49 msgid "Waiting for copayers" msgstr "" -#: www/views/copayers.html:53 +#: www/views/copayers.html:54 msgid "Waiting..." msgstr "" #: www/views/addresses.html:3 +#: www/views/preferencesAdvanced.html:17 msgid "Wallet Addresses" msgstr "" @@ -2714,7 +2755,7 @@ msgid "Wallet Invitation" msgstr "" #: www/views/join.html:57 -#: www/views/tab-create-personal.html:35 +#: www/views/tab-create-personal.html:36 #: www/views/tab-create-shared.html:65 msgid "Wallet Key" msgstr "" @@ -2732,7 +2773,7 @@ msgid "Wallet Network" msgstr "" #: www/views/join.html:74 -#: www/views/tab-create-personal.html:47 +#: www/views/tab-create-personal.html:48 #: www/views/tab-create-shared.html:77 msgid "Wallet Recovery Phrase" msgstr "" @@ -2741,8 +2782,8 @@ msgstr "" msgid "Wallet Recovery Phrase is invalid" msgstr "" -#: www/views/preferencesAdvanced.html:21 -#: www/views/tab-import-phrase.html:51 +#: www/views/preferencesAdvanced.html:25 +#: www/views/tab-import-phrase.html:53 msgid "Wallet Service URL" msgstr "" @@ -2766,7 +2807,7 @@ msgstr "" msgid "Wallet created" msgstr "" -#: www/views/copayers.html:58 +#: www/views/copayers.html:59 msgid "Wallet incomplete and broken" msgstr "" @@ -2791,7 +2832,7 @@ msgstr "" msgid "Wallet needs backup" msgstr "" -#: www/views/tab-receive.html:51 +#: www/views/tab-receive.html:59 #: www/views/walletDetails.html:157 msgid "Wallet not backed up" msgstr "" @@ -2824,6 +2865,7 @@ msgstr "" msgid "Wallets & Integrations" msgstr "" +#: src/js/controllers/addressbookView.js:23 #: src/js/controllers/modals/txpDetails.js:143 #: src/js/controllers/modals/txpDetails.js:160 #: src/js/controllers/preferencesDelete.js:25 @@ -2872,7 +2914,7 @@ msgstr "" msgid "Where would you like to receive email notifications about payments?" msgstr "" -#: www/views/addresses.html:23 +#: www/views/addresses.html:19 msgid "Why?" msgstr "" @@ -2893,7 +2935,6 @@ msgid "Wrong spending password" msgstr "" #: www/views/modals/confirmation.html:7 -#: www/views/onboarding/collectEmail.html:32 msgid "Yes" msgstr "" @@ -2917,7 +2958,7 @@ msgstr "" msgid "You can see the latest developments and contribute to this open source app by visiting our project on GitHub." msgstr "" -#: www/views/onboarding/tour.html:14 +#: www/views/onboarding/tour.html:19 msgid "You can spend bitcoin at millions of websites and stores worldwide." msgstr "" @@ -2925,18 +2966,26 @@ msgstr "" msgid "You can still export it from Advanced > Export." msgstr "" -#: www/views/onboarding/tour.html:27 +#: www/views/onboarding/tour.html:32 msgid "You can trade it for other currencies like US Dollars, Euros, or Pounds." msgstr "" -#: www/views/onboarding/tour.html:41 +#: www/views/onboarding/tour.html:46 msgid "You control your bitcoin." msgstr "" +#: www/views/modals/bitpay-card-confirmation.html:5 +msgid "You will need to log back for fill in your Bitpay Card." +msgstr "" + #: www/views/preferencesNotifications.html:28 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "" +#: www/views/bitpayCard.html:50 +msgid "Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide." +msgstr "" + #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "" @@ -2966,13 +3015,14 @@ msgstr "" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "" -#: src/js/services/walletService.js:935 +#: src/js/services/walletService.js:937 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "" #: www/views/includes/walletSelector.html:23 -#: www/views/includes/wallets.html:13 +#: www/views/paperWallet.html:35 #: www/views/tab-home.html:95 +#: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 msgid "[Balance Hidden]" @@ -2982,18 +3032,6 @@ msgstr "" msgid "add your BitPay Visa card(s)" msgstr "" -#: www/views/tab-receive.html:75 -msgid "address not available" -msgstr "" - -#: www/views/tab-receive.html:43 -msgid "address not yet available" -msgstr "" - -#: src/js/controllers/lockedView.js:5 -msgid "is locked" -msgstr "" - #: www/views/includes/available-balance.html:8 msgid "locked by pending payments" msgstr "" @@ -3010,16 +3048,16 @@ msgstr "" msgid "preparing..." msgstr "" -#: src/js/controllers/confirm.js:57 +#: src/js/controllers/confirm.js:71 #: src/js/controllers/modals/txpDetails.js:34 msgid "to accept" msgstr "" -#: src/js/controllers/confirm.js:55 +#: src/js/controllers/confirm.js:69 msgid "to pay" msgstr "" -#: src/js/controllers/confirm.js:59 +#: src/js/controllers/confirm.js:73 #: src/js/controllers/modals/txpDetails.js:32 msgid "to send" msgstr "" @@ -3028,15 +3066,7 @@ msgstr "" 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 "" -#: src/js/controllers/lockSetup.js:98 -msgid "{{appName}} startup is locked by PIN. Are you sure you want to disable it?" -msgstr "" - -#: www/views/includes/confirm-tx.html:23 -msgid "{{feeRateStr}} of the transaction" -msgstr "" - -#: src/js/controllers/confirm.js:210 +#: src/js/controllers/confirm.js:211 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "" @@ -3044,7 +3074,7 @@ msgstr "" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "" -#: www/views/copayers.html:46 +#: www/views/copayers.html:47 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "" diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 4a56d565b..39446924f 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -130,7 +130,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.showWalletSelector = function() { if ($scope.singleWallet) return; - $scope.walletSelectorTitle = gettextCatalog.getString('Address from'); + $scope.walletSelectorTitle = gettextCatalog.getString('Select a wallet'); $scope.showWallets = true; };