diff --git a/Gruntfile.js b/Gruntfile.js index bae9c9032..049f8696e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -93,7 +93,14 @@ module.exports = function(grunt) { 'src/js/controllers/**/*.js' ], tasks: ['concat:js'] - } + }, + gettext: { + files: [ + 'i18n/po/*.po', + 'i18n/po/*.pot' + ], + tasks: ['nggettext_compile','concat'] + }, }, sass: { dist: { diff --git a/README.md b/README.md index e85f9a032..a713c6835 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,11 @@ cd copay Ensure you have [Node](https://nodejs.org/) installed, then install and start Copay: ```sh -npm install +npm run apply:copay npm start ``` -Visit [`localhost:3000`](http://localhost:3000/) to view the app. +Visit [`localhost:8100`](http://localhost:8100/) to view the app. A watch task is also available to rebuild components of the app as changes are made. This task can be run in a separate process – while the server started by `npm start` is running – to quickly test changes. diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json index 1e1b40255..e76151b7e 100644 --- a/app-template/bitpay/appConfig.json +++ b/app-template/bitpay/appConfig.json @@ -17,13 +17,13 @@ "url": "https://bitpay.com", "appDescription": "Secure Bitcoin Wallet", "winAppName": "BitPayWallet", - "wpPublisherId": "{}", - "wpProductId": "{}", + "WindowsStoreIdentityName": "18C7659D.BitPaySecureBitcoinWallet", + "WindowsStoreDisplayName": "BitPay - Secure Bitcoin Wallet", "windowsAppId": "2d1002d7-ee34-4f60-bd29-0c871ba0c195", "pushSenderId": "1036948132229", "description": "Secure Bitcoin Wallet", - "version": "3.5.0", - "androidVersion": "350000", + "version": "3.6.3", + "androidVersion": "363000", "_extraCSS": null, "_enabledExtensions": { "coinbase": true, diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 7bc20644b..ce2fd3f9e 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -17,6 +17,9 @@ + + + @@ -43,7 +46,7 @@ - + @@ -68,10 +71,13 @@ + + + - + diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json index deab492ac..5f685382b 100644 --- a/app-template/copay/appConfig.json +++ b/app-template/copay/appConfig.json @@ -17,13 +17,13 @@ "url": "https://copay.io", "appDescription": "Copay Bitcoin Wallet", "winAppName": "CopayWallet", - "wpPublisherId": "{31cdd08b-457c-413d-b440-f6665eec847d}", - "wpProductId": "{5381aa50-9069-11e4-84cc-293caf9cbdc8}", + "WindowsStoreIdentityName": "18C7659D.Copay-SecureBitcoinWallet", + "WindowsStoreDisplayName": "Copay - Secure Bitcoin Wallet", "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c", "pushSenderId": "1036948132229", "description": "A Secure Bitcoin Wallet", - "version": "3.5.0", - "androidVersion": "350000", + "version": "3.6.3", + "androidVersion": "363000", "_extraCSS": null, "_enabledExtensions": { "coinbase": true, diff --git a/app-template/package-template.json b/app-template/package-template.json index 9e440a9e5..568e74bce 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -81,7 +81,7 @@ }, "scripts": { "postinstall": "bower install", - "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", + "start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0", "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", "start:android": "npm run build:www && npm run build:android && npm run run:android", "start:windows": "npm run build:www && npm run build:windows", @@ -91,10 +91,10 @@ "build:www-release": "grunt prod", "build:ios": "cordova prepare ios && cordova build ios --debug", "build:android": "cordova prepare android && cordova build android --debug", - "build:windows": "cordova prepare windows && cordova build windows -- --arch=\"x86\"", + "build:windows": "cordova prepare windows && cordova build windows -- --arch=\"ARM\"", "build:ios-release": "cordova prepare ios && cordova build ios --release", "build:android-release": "cordova prepare android && cordova build android --release", - "build:windows-release": "cordova prepare windows && cordova build windows --release --arch=\"x86\"", + "build:windows-release": "cordova prepare windows && cordova build windows --release --arch=\"ARM\"", "build:desktop": "grunt desktop", "build:osx": "grunt osx", "open:ios": "open platforms/ios/*.xcodeproj", diff --git a/build.json b/build.json new file mode 100644 index 000000000..921006b10 --- /dev/null +++ b/build.json @@ -0,0 +1,11 @@ +{ + "windows": { + "debug": { + "packageCertificateKeyFile": "platforms\\windows\\CordovaApp_TemporaryKey.pfx" + }, + "release": { + "packageThumbprint": "ABCABCABCABC123123123123", + "publisherId": "CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" + } + } +} \ No newline at end of file diff --git a/i18n/po/de.po b/i18n/po/de.po index 47f7e8fdf..ef038ec04 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -11,27 +11,27 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: German\n" "Language: de\n" -"PO-Revision-Date: 2017-06-06 10:18-0400\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 "" +"PO-Revision-Date: 2017-06-29 07:15-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "(Vertraut)" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "(mögliche Doppelausgabe)" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* Ein Zahlungsvorschlag kann gelöscht werden, wenn 1) Du diesen erzeugt hast und noch kein anderer Copayer unterschrieben hat, oder 2) 24 Stunden vergangen sind, seit der Vorschlag erstellt wurde." -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" msgstr "" #: www/views/feedback/rateApp.html:7 @@ -43,11 +43,11 @@ msgstr "Eine 5-Sterne Bewertung hilft uns, {{appName}} unter die Leute zu bringe msgid "A member of the team will review your feedback as soon as possible." msgstr "Ein Mitarbeiter wird Ihr Feedback so bald wie möglich überprüfen." -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "Insgesamt wurden {{amountAboveMaxSizeStr}} ausgeschlossen. Die maximale Größe für eine Transaktion wurde überschritten." -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "Insgesamt wurden {{amountBelowFeeStr}} ausgeschlossen. Diese Gelder stammen aus UTXOs, die kleiner sind als die Netzwerkgebühr." @@ -57,7 +57,7 @@ msgid "About" msgstr "Über" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "Akzeptiert" @@ -76,15 +76,15 @@ msgstr "Kontonummer" msgid "Accounts" msgstr "Konten" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "Aktivität" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "Konto hinzufügen" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "BitPay-Konto hinzufügen?" @@ -97,7 +97,7 @@ msgstr "Kontakt hinzufügen" msgid "Add Funds" msgstr "Guthaben aufladen" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "Notiz hinzufügen" @@ -117,10 +117,18 @@ msgstr "Konto hinzufügen" msgid "Add an optional password to secure the recovery phrase" msgstr "Ein optionales Passwort zur Sicherung der Wiederherstellungsphrase hinzufügen" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "Beschreibung hinzufügen" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "" + #: www/views/add.html:3 msgid "Add wallet" msgstr "Wallet hinzufügen" @@ -153,7 +161,7 @@ msgstr "Erweitert" msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "Alle" @@ -197,11 +205,15 @@ msgstr "Betrag" msgid "Amount below minimum allowed" msgstr "Betrag unter zulässigem Minimum" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "Betrag zu hoch" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "Ein Aktualisierung für diese App ist verfügbar. Zu Ihrer Sicherheit bitte auf die neueste Version aktualisieren." @@ -209,6 +221,10 @@ msgstr "Ein Aktualisierung für diese App ist verfügbar. Zu Ihrer Sicherheit bi msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "Jeder mit Ihrer Wiederherstellungsphrase hat Zugriff auf ihre Bitcoins und kann diese ausgeben." +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "Werden Sie beobachtet?" @@ -324,7 +340,7 @@ msgstr "BitPay Visa® Karten" msgid "Bitcoin Address" msgstr "Bitcoin-Adresse" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -359,7 +375,7 @@ msgid "Broadcast Payment" msgstr "Zahlung übermitteln" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "Gesendet" @@ -375,7 +391,7 @@ msgstr "Browser wird nicht unterstützt" msgid "Buy & Sell Bitcoin" msgstr "Kaufe & Verkaufe Bitcoins" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "Kaufe Bitcoins" @@ -387,8 +403,9 @@ msgstr "Kaufe Bitcoins..." msgid "Calculating fee" msgstr "Mining-Fee Berechnung" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -441,8 +458,7 @@ msgstr "Leeren" msgid "Clear cache" msgstr "Cache leeren" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "Klick" @@ -466,12 +482,13 @@ msgstr "Hash übertragen" msgid "Complete the backup process to use this option" msgstr "Beenden Sie den Backupvorgang um diese Option zu nutzen" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -488,27 +505,19 @@ msgstr "Bestätigen & Beenden" msgid "Confirm your PIN" msgstr "PIN bestätigen" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "Bestätigen Sie Ihr neues Passwort" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "Bestätigungen" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: www/views/modals/wallet-balance.html:61 msgid "Confirming" msgstr "Bestätigen" -#: 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 "Verbinde meine BitPay-Karte" @@ -525,7 +534,7 @@ msgstr "Verbinde mit Glidera..." msgid "Connection reset by peer" msgstr "Verbindung von Peer zurückgesetzt" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "Kontakte" @@ -580,7 +589,7 @@ msgstr "Kein Zugriff auf Wallet des Servers. Überprüfen Sie bitte:" msgid "Could not access wallet" msgstr "Auf Wallet konnte nicht zugegriffen werden" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "Nachricht kann nicht an die importierte Wallet hinzugefügt werden ohne einem gemeinsamen Verschlüsselungsschlüssel" @@ -592,10 +601,18 @@ msgstr "Zahlung konnte nicht gesendet werden" msgid "Could not build transaction" msgstr "Transaktion konnte nicht erstellt werden" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "Adresse konnte nicht erstellt werden" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "Erzeugung mit erweiterten privaten Schlüssel nicht möglich" @@ -608,7 +625,7 @@ msgstr "Erzeugung mit dem angegebenen erweiterten öffentlichen Schlüssel nicht msgid "Could not create: Invalid wallet recovery phrase" msgstr "Wallet-Wiederherstellungsphrase nicht gültig" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "Datei konnte nicht entschlüsselt werden, bitte das Passwort überprüfen" @@ -616,21 +633,25 @@ msgstr "Datei konnte nicht entschlüsselt werden, bitte das Passwort überprüfe msgid "Could not delete payment proposal" msgstr "Zahlungsvorschlag konnte nicht gelöscht werden" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "Dynamische Gebühr konnten nicht abgerufen werden" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "Dynamische Gebühr für den Level konnte nicht abgerufen werden: {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "Transaktionen konnten nicht gefunden werden" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "Import nicht möglich" @@ -655,7 +676,7 @@ msgstr "Konto konnte nicht entfernt werden" msgid "Could not remove card" msgstr "Karte konnte nicht gelöscht werden" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "Die Einstellungen konnten nicht am Server gespeichert werden" @@ -663,21 +684,21 @@ msgstr "Die Einstellungen konnten nicht am Server gespeichert werden" msgid "Could not send payment" msgstr "Zahlung kann nicht gesendet werden" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "Die Transaktionshistorie konnte nicht aktualisiert werden" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "Wallet konnte nicht aktualisiert werden" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "Wallets konnten nicht aktualisiert werden" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "Erstelle eine persönliche Wallet" @@ -687,8 +708,8 @@ msgid "Create Shared Wallet" msgstr "Erstelle eine gemeinsame Wallet" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "Erstelle Bitcoin-Wallet" @@ -735,7 +756,7 @@ msgstr "Datum" msgid "Delete" msgstr "Löschen" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "Zahlungsvorschlag löschen" @@ -767,8 +788,12 @@ msgstr "Ableitungsstruktur" msgid "Derivation Strategy" msgstr "Ableitungstrategie" +#: www/views/topup.html:45 +msgid "Details" +msgstr "" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "Deaktiviert" @@ -786,7 +811,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "Wird deine Sprache auf Crowdin nicht angezeigt? Kontaktiere den Support von Crowdin, denn wir würden deine Sprache gerne hinzufügen." #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "Herunterladen" @@ -794,7 +819,7 @@ msgstr "Herunterladen" 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 "Jede Bitcoin-Wallet kann Milliarden von Adressen aus Ihrem 12-Wort Backup erzeugen. Jedesmal wenn Sie eine Zahlung erhalten wird neue Adresse automatisch generiert und dargestellten." -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "Wirtschaftlich" @@ -835,16 +860,16 @@ msgstr "Aktivieren Sie die Kamera um loszulegen." msgid "Enter Amount" msgstr "Betrag eingeben" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "Berechtigungscode eingeben" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "Eingabe des Zwei-Faktor-Authentifizierungs-Codes für das BitPay Konto" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Neuen Berechtigungscode eingeben" @@ -866,13 +891,12 @@ msgstr "Passwort eingeben" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -889,30 +913,30 @@ msgstr "Passwort eingeben" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -920,14 +944,18 @@ msgstr "Passwort eingeben" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Fehler" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "Fehler beim bestätigen" @@ -935,6 +963,14 @@ msgstr "Fehler beim bestätigen" msgid "Error creating wallet" msgstr "Fehler beim Erstellen des Wallets" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" msgstr "" @@ -955,14 +991,14 @@ msgstr "Fehler beim Aktualisieren der Debitkarten" msgid "Exceeded daily limit of $500 per user" msgstr "Tageslimit von $500 pro Benutzer überschritten" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "Abgelaufen" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "Gültig bis" @@ -979,7 +1015,7 @@ msgstr "In eine Datei exportieren" msgid "Export wallet" msgstr "Wallet exportieren" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "Für diese Wallet ist Export per QR nicht unterstützt" @@ -1005,12 +1041,12 @@ msgstr "Fehler beim Exportieren" msgid "Family vacation funds" msgstr "Familienurlaub" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "Gebühr" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" msgstr "" @@ -1048,6 +1084,7 @@ msgstr "Zur Kontrolle" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "Von" @@ -1056,6 +1093,10 @@ msgstr "Von" msgid "From BitPay account" msgstr "Von BitPay Konto" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "Gehen Sie auf Wallet Hinzufügen > Wallet Importieren von dem Zielgerät und scannen Sie diesen QR-Code" @@ -1068,10 +1109,18 @@ msgstr "Beträge sind durch ausstehende Zahlungsvorschläge gesperrt" msgid "Funds found:" msgstr "Betrag gefunden:" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "Betrag übermittelt" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "Beträge werden überwiesen an" @@ -1109,20 +1158,20 @@ msgstr "Starten Sie indem Sie ihr erstes hinzufügen." msgid "Getting fee levels..." msgstr "Entgelt-Level werden abgerufen..." -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "Zurück" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "Zurück" @@ -1149,7 +1198,7 @@ msgstr "Hardware-Wallet" msgid "Help & Support" msgstr "Hilfe & Support" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "Hilfe und Support-Informationen gibt es auf der Website." @@ -1258,7 +1307,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca msgstr "Wenn Sie einen Screenshot erstellen, kann die Sicherung von anderen Apps angesehen werden. Sie können ein sicheres Backup mit Papier und Stift erstellen." #: www/views/tab-import-hardware.html:42 -#: www/views/tab-import-phrase.html:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "Import" @@ -1284,7 +1333,7 @@ msgstr "Um die Sicherung der Wallet zu überprüfen, geben Sie bitte Ihr Passwor #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "Unvollständig" @@ -1297,31 +1346,36 @@ msgstr "Unvollständige Wallet" msgid "Incorrect PIN, try again." msgstr "Falscher PIN, bitte erneut versuchen." -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "Falsche Netzwerk-Adresse" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "QR code hat falsches Format" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "Nicht ausreichendes Guthaben" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Nicht ausreichendes Guthaben für die Gebühr" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "Ungültig" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "Ungültige Kontonummer" @@ -1334,8 +1388,8 @@ msgid "Invalid data" msgstr "Ungültige Daten" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "Ungültige Ableitungsstruktur" @@ -1343,6 +1397,10 @@ msgstr "Ungültige Ableitungsstruktur" msgid "Invitation to share a {{appName}} Wallet" msgstr "Einladung um eine {{appName}} Wallet zu teilen" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "Gibt es etwas, das wir besser machen können?" @@ -1393,16 +1451,10 @@ msgstr "Schlüssel ist bereits mit einem existierenden Wallet verbunden" msgid "Language" msgstr "Sprache" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 msgid "Last Month" msgstr "Letzter Monat" -#: 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 "Überprüfen Sie Ihre Wiederherstellungsphrase." @@ -1444,6 +1496,10 @@ msgstr "Zeitsperre aktiv. Bitte auf die Entfernung des Zahlungsvorschlags warten msgid "Log out" msgstr "" +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "" + #: www/views/includes/walletHistory.html:27 msgid "Low fees" msgstr "Niedrige Gebühren" @@ -1469,14 +1525,14 @@ msgstr "Ich" msgid "Meh - it's alright" msgstr "Meh - ist in Ordnung" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "Notiz" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "Händlernachricht" @@ -1497,12 +1553,12 @@ msgstr "Zum Signieren fehlen die privaten Schlüssel" msgid "More Options" msgstr "Weitere Optionen" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "Verschoben" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "Guthaben verschoben" @@ -1525,6 +1581,10 @@ msgstr "Name" msgid "Network" msgstr "Netzwerk" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "Netzwerkfehler" @@ -1533,7 +1593,7 @@ msgstr "Netzwerkfehler" msgid "New Proposal" msgstr "Neuer Vorschlag" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "Neue Adresse konnte nicht erstellt werden. Bitte versuche es erneut." @@ -1573,7 +1633,11 @@ msgstr "Keine ausstehenden Vorschläge" msgid "No recent transactions" msgstr "Keine aktuellen Transaktionen" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "Noch keine Transaktionen" @@ -1585,15 +1649,15 @@ msgstr "Kein Wallet gefunden" msgid "No wallet selected" msgstr "Kein Wallet ausgewählt" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" -msgstr "Keine Wallet verfügbar" +msgstr "" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" msgstr "Keine Wallet verfügbar um Guthaben zu erhalten" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "Normal" @@ -1601,7 +1665,7 @@ msgstr "Normal" msgid "Not authorized" msgstr "Nicht berechtigt" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "Das Guthaben reicht nicht für die Gebühr" @@ -1635,7 +1699,7 @@ msgstr "Benachrichtigungen" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" msgstr "" @@ -1647,8 +1711,9 @@ msgstr "Jetzt ist ein guter Zeitpunkt um Ihre Wallet zu sichern. Wenn das Gerät msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "Jetzt ist die perfekte Zeit um Ihre Umgebung zu überprüfen. In der Nähe eines Fensters? Versteckte Kameras? Schulter-Spione?" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "OK" @@ -1667,11 +1732,11 @@ msgstr "Offizieller englischer Haftungsausschluss" msgid "Oh no!" msgstr "Oh nein!" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "Auf diesem Bildschirm sehen Sie alle Ihre Wallets, Konten und Guthaben." -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Öffnen" @@ -1688,8 +1753,8 @@ msgstr "Öffne GitHub" msgid "Open GitHub Project" msgstr "Öffne GitHub Projekt" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "Öffne Insight" @@ -1724,7 +1789,7 @@ msgstr "BitPay-Karte bestellen" msgid "Password" msgstr "Passwort" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "Passwort erforderlich. Geben Sie Ihr Passwort in den erweiterten Optionen ein" @@ -1760,7 +1825,7 @@ msgstr "Zahlungsvorschlag" msgid "Payment Proposal Created" msgstr "Zahlungsvorschlag erstellt" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "Zahlungsvorschläge" @@ -1783,7 +1848,7 @@ msgstr "Zahlung abgelehnt" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Zahlung gesendet" @@ -1796,7 +1861,7 @@ msgstr "Zahlung akzeptiert, aber noch nicht übermittelt" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "Zahlung akzeptiert. Sie wird durch Glidera übermittelt. Falls ein Problem auftritt, kann sie nach einer Wartezeit von 6 Stunden gelöscht werden." -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "Zahlungsdetails" @@ -1804,10 +1869,6 @@ msgstr "Zahlungsdetails" msgid "Payment request" msgstr "Zahlungsanforderung" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "Ausstehend" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "Anstehende Vorschläge" @@ -1828,12 +1889,12 @@ msgstr "Notieren Sie bitte sorgfältig diese Phrase." msgid "Please connect a camera to get started." msgstr "Bitte verbinden Sie eine Kamera um loszulegen." -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "Bitte geben Sie die Wiederherstellungsphrase ein" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "Bitte geben Sie die Wallet-Wiederherstellungsphrase ein" @@ -1849,11 +1910,11 @@ msgstr "Bitte tippen Sie jedes Wort in der richtigen Reihenfolge." msgid "Please upgrade Copay to perform this action" msgstr "Bitte Copay aktualisieren, um diese Aktion auszuführen" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "Bitte die Sicherungsdatei wählen" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" msgstr "" @@ -1869,11 +1930,11 @@ msgstr "Adressen werden vorbereitet..." msgid "Preparing backup..." msgstr "Sicherung wird vorbereitet..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "Zum Beenden erneut drücken" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "höchste Priorität" @@ -1890,7 +1951,7 @@ msgid "Proposal Accepted" msgstr "Vorschlag angenommen" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Vorschlag erstellt" @@ -1903,7 +1964,7 @@ msgstr "Vorschlag gelöscht" msgid "Proposal Rejected" msgstr "Vorschlag abgelehnt" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "Vorschläge" @@ -1924,7 +1985,7 @@ msgid "Quick review!" msgstr "Schnelle Überprüfung!" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "Per Zufall" @@ -1950,16 +2011,16 @@ msgstr "Empfangen" msgid "Received" msgstr "Empfangen" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "Erhaltener Betrag" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "Eingehend" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "Kürzlich" @@ -1969,12 +2030,12 @@ msgid "Recent Transaction Card" msgstr "Kürzlich Ausgeführte Transaktionen Karte" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "Kürzliche Transaktionen" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "Empfänger" @@ -1996,7 +2057,7 @@ msgid "Recreating Wallet..." msgstr "Wallet wiederherstellen..." #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "Abgelehnt" @@ -2072,7 +2133,6 @@ msgstr "Kamera nochmals versuchen" #: 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 @@ -2092,6 +2152,10 @@ msgstr "QR-Code scannen" msgid "Scan addresses for funds" msgstr "Adresse auf neue Beträge überprüfen" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "Scannen Sie bitte Ihren Fingerabdruck" @@ -2108,7 +2172,7 @@ msgstr "Screenshots sind nicht sicher" msgid "Search Transactions" msgstr "Transaktionen durchsuchen" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "Bitcoin-Adresse suchen oder eingeben" @@ -2166,7 +2230,7 @@ msgstr "Adressen per e-Mail versenden" msgid "Send by email" msgstr "Per E-Mail versenden" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "Senden von" @@ -2201,17 +2265,18 @@ msgstr "Sende maximalen Betrag" msgid "Sending transaction" msgstr "Sende Transaktion" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Sende {{amountStr}} aus Ihrer Wallet {{name}}" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "Gesendet" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "Guthaben senden" @@ -2276,11 +2341,11 @@ msgstr "Adresse anzeigen" msgid "Show advanced options" msgstr "Erweiterte Optionen anzeigen" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "Bitcoin-Adresse anzeigen" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "Mehr anzeigen" @@ -2306,13 +2371,12 @@ msgstr "Wallet mit einer einzigen Adresse" msgid "Skip" msgstr "Überspringen" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "Schieben" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "Wiederherstellungsphrase angeben..." @@ -2328,7 +2392,11 @@ msgstr "Zahlungsvorschlag wurde nicht gefunden" msgid "Spending Password needed" msgstr "Berechtigungscode erforderlich" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "Starte mit dem Senden der Bitcoins" @@ -2340,7 +2408,11 @@ msgstr "Wird gestartet..." msgid "Startup Lock" msgstr "Sperre des Startups" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "Niedrigste Priorität" @@ -2386,7 +2458,7 @@ msgid "Terms of Use" msgstr "Nutzungsbedingungen" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "Testnet" @@ -2445,7 +2517,7 @@ msgstr "Die offizielle englischen Nutzungsbedingungen sind auf der BitPay Websit msgid "The password of the recovery phrase (if set)" msgstr "Das Passwort der Wiederherstellungsphrase (wenn eingestellt)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "Die Zahlung wurde erzeugt, kann aber nicht abgeschlossen werden. Bitte erneut über die Startseite versuchen" @@ -2488,13 +2560,13 @@ msgstr "Die URL des Wallet-Diensts" msgid "There are no wallets to make this payment" msgstr "Es gibt keine Wallets, um diese Zahlung auszuführen" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "Es steht eine neue Version von {{appName}} zur Verfügung" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "Es ist ein Fehler im Formular aufgetreten" @@ -2511,7 +2583,7 @@ msgstr "Diese App ist fantastisch!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "Diese App speichert Ihre Bitcoins mit modernster Sicherheit." -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "Diese Bitcoin Zahlungsaufforderung ist abgelaufen." @@ -2525,6 +2597,10 @@ msgstr "Dieses Passwort kann nicht wiederhergestellt werden. Wenn das Passwort v msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "Diese Wiederherstellungsphrase entstand mit einem Passwort. Zur Wiederherstellung der Wallet sind die Wiederherstellungsphrase und das Passwort erforderlich." +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "" + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "Die Bestätigung dieser Transaktion kann sehr lange dauern oder verworfen werden, da vom Absender nur geringe Gebühren eingestellt wurden" @@ -2534,33 +2610,46 @@ msgstr "Die Bestätigung dieser Transaktion kann sehr lange dauern oder verworfe msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "Dieses Wallet ist nicht beim angegebenen Bitcore Wallet Service (BWS) registriert. Bitte aus den lokalen Informationen wiederherstellen" -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "Zeitachse" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "An" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Um loszulegen kaufe Bitcoins oder teilen Sie ihre Adresse. Sie können Bitcoins von jeder beliebigen Wallet oder von einem Dienstleister/Broker empfangen." -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Um loszulegen müssen Sie eine Bitcoin-Wallet erstellen und einige Bitcoins erhalten." +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "" + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "Gesamt" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "Ingesamt gesperrter Gesamtsaldo" @@ -2568,6 +2657,10 @@ msgstr "Ingesamt gesperrter Gesamtsaldo" msgid "Total number of copayers" msgstr "Gesamtanzahl der Copayer" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2590,12 +2683,20 @@ msgstr "Transaktion wurde bereits übermittelt" msgid "Transaction created" msgstr "Transaktion erstellt" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "Transaktion ist zu diesem Zeitpunkt nicht verfügbar" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "Transaktion konnte nicht gefunden werden" @@ -2603,7 +2704,7 @@ msgstr "Transaktion konnte nicht gefunden werden" msgid "Transfer to" msgstr "" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "Übertragung zur Wallet" @@ -2623,7 +2724,7 @@ msgstr "Wiederherstellungsphrase eingeben (in der Regel 12 Wörter)" msgid "Uh oh..." msgstr "Uh oh..." -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -2631,7 +2732,7 @@ msgstr "Unbestätigt" msgid "Unit" msgstr "Währungseinheit" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "Nicht vesendete Transaktionen" @@ -2643,7 +2744,7 @@ msgstr "Nicht verwendete Adressen" msgid "Unused Addresses Limit" msgstr "Nicht genutzte Adressen Limit" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "Aktualisierung verfügbar" @@ -2651,7 +2752,7 @@ msgstr "Aktualisierung verfügbar" msgid "Updating pending proposals. Please stand by" msgstr "Aktualisiere anstehende Vorschläge. Bitte warten" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "Aktualisieren des Transaktionsverlaufs. Bitte warten." @@ -2659,7 +2760,7 @@ msgstr "Aktualisieren des Transaktionsverlaufs. Bitte warten." msgid "Updating... Please stand by" msgstr "Aktualisiere... Bitte warten" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "Dringend" @@ -2671,6 +2772,10 @@ msgstr "Unbestätigte Mittel einsetzen" msgid "Validating recovery phrase..." msgstr "Überprüfe Wiederherstellungsphrase..." +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2688,20 +2793,20 @@ msgstr "Alle Adressen anzeigen" msgid "View Terms of Service" msgstr "Nutzungsbedingungen anzeigen" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "Transaktionen auf Insight anzeigen" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "Aktualisierungen anzeigen" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "Auf blockchain anzeigen" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "Warnung: Ableitung der Schlüssel funktioniert nicht auf diesem Gerät/Wallet. Aktionen können nicht mit dieser Wallet durchgeführt werden." @@ -2759,6 +2864,10 @@ msgstr "Wallet-Id" msgid "Wallet Information" msgstr "Wallet-Informationen" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "Wallet Einladung" @@ -2792,7 +2901,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "Wallet-Wiederherstellungsphrase ist ungültig" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "URL des Wallet-Diensts" @@ -2801,6 +2910,7 @@ msgid "Wallet Settings" msgstr "Wallet-Einstellungen" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "Wallet-Typ" @@ -2850,7 +2960,7 @@ msgstr "Wallet nicht gesichert" msgid "Wallet not found" msgstr "Wallet nicht gefunden" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "Wallet nicht registriert" @@ -2866,7 +2976,7 @@ msgstr "Wiederherstellungsphrase für die Wallet nicht verfügbar." msgid "Wallet service not found" msgstr "Wallet-Dienst nicht gefunden" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "Wallets" @@ -2935,7 +3045,7 @@ msgstr "Wären Sie bereit {{appName}} im App Store zu bewerten?" msgid "Would you like to receive push notifications about payments?" msgstr "Möchten Sie Push-Benachrichtigungen über Zahlungen erhalten?" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "Falsche Anzahl von Wiederherstellungswörtern:" @@ -2992,14 +3102,14 @@ msgid "You'll receive email notifications about payments sent and received from msgstr "Sie erhalten E-Mail Benachrichtigungen über gesendete und empfangen Zahlungen aus Ihren Wallets." #: 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." +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." msgstr "" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "Ihre Bitcoin-Wallet wurde gesichert!" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "Ihre Bitcoin-Wallet ist fertig!" @@ -3024,13 +3134,13 @@ msgstr "Passwort" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "Ihre Wallet wird nie auf einem Cloud-Speicher oder einer Standard-Geräte-Backup gespeichert." -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "Ihre Wallet wird verschlüsselt. Der Berechtigungscode kann nicht wiederhergestellt werden. Achten Sie darauf ihn aufzuschreiben." #: www/views/includes/walletSelector.html:23 #: www/views/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3057,17 +3167,17 @@ msgstr "name@beispiel.com" msgid "preparing..." msgstr "in Arbeit..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "zu akzeptieren" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "zu zahlen" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "zu senden" @@ -3075,11 +3185,15 @@ msgstr "zu senden" 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 "{{appName}} hängt von Bitcore Wallet Service (BWS) ab bezüglich Blockchain Informationen, Vernetzung und Copayer Synchronisation. Die Standard Konfiguration verweist auf https://bws.bitpay.com (BitPays öffentlicher BWS Instanz)." -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} wird für Bitcoin-Netzwerkgebühren abgezogen werden." -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} Transaktionen werden heruntergeladen" diff --git a/i18n/po/es.po b/i18n/po/es.po index ccedb568d..08dc79913 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -11,28 +11,28 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Spanish\n" "Language: es\n" -"PO-Revision-Date: 2017-06-06 13:25-0400\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 "(Transacciones Pre-Auth Holds) El comerciante mantendrá sus fondos inaccesibles hasta que la transacción hacia ellos este totalmente asentada. Los fondos se van a liberar dentro de 30 días si es que el comerciante decide no completar la transacción." +"PO-Revision-Date: 2017-06-29 08:05-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "(De confianza)" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "(Posible doble gasto)" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* Una propuesta de pago puede ser eliminada si 1) Tú eres el creador, y ningún otro copayer la haya firmado, o 2) hayan transcurrido 24 horas desde la creación de la propuesta." -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" -msgstr "- {{feeRateStr}} de la transacción" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "- {{btx.feeRateStr}} de la transacción" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" +msgstr "- {{tx.feeRateStr}} de la transacción" #: 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!" @@ -43,11 +43,11 @@ msgstr "Una calificación de 5 estrellas nos ayuda a que {{appName}} sea más ut msgid "A member of the team will review your feedback as soon as possible." msgstr "Un miembro del equipo revisará tus comentarios tan pronto como sea posible." -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "Se excluyeron un total de {{amountAboveMaxSizeStr}}. Fue excedido el tamaño máximo permitido para una transacción." -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "Se excluyeron un total de {{amountBelowFeeStr}}. Estos fondos provienen del UTXOs más pequeños que la comisión de red provista." @@ -57,7 +57,7 @@ msgid "About" msgstr "Acerca de" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "Aceptado" @@ -76,15 +76,15 @@ msgstr "Número de cuenta" msgid "Accounts" msgstr "Cuentas" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "Actividad" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "Agregar Cuenta" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "¿Agregar cuenta de BitPay?" @@ -97,7 +97,7 @@ msgstr "Agregar contacto" msgid "Add Funds" msgstr "Añadir fondos" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "Añadir nota" @@ -117,10 +117,18 @@ msgstr "Agregar cuenta" msgid "Add an optional password to secure the recovery phrase" msgstr "Agregar una contraseña opcional para asegurar la frase de recuperación" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "Añadir descripción" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "Agregar fondos" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "¿Agregar esta cuenta BitPay ({{email}})?" + #: www/views/add.html:3 msgid "Add wallet" msgstr "Agregar billetera" @@ -153,7 +161,7 @@ msgstr "Avanzado" msgid "Advanced Settings" msgstr "Preferencias Avanzadas" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "Todos" @@ -197,11 +205,15 @@ msgstr "Importe" msgid "Amount below minimum allowed" msgstr "Cantidad por debajo del mínimo permitido" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "Monto demasiado grande" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "Monto insuficiente para enviar" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "Actualización disponible. Por seguridad, actualiza a la versión más reciente." @@ -209,6 +221,10 @@ msgstr "Actualización disponible. Por seguridad, actualiza a la versión más r msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "Cualquier persona con tu copia de seguridad puede gastar tus bitcoins." +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "Comisión aproximada de la red Bitcoin para transferir el saldo de esta billetera (con prioridad normal)" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "¿Estás siendo observado?" @@ -324,7 +340,7 @@ msgstr "Tarjetas BitPay Visa®" msgid "Bitcoin Address" msgstr "Dirección Bitcoin" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -359,7 +375,7 @@ msgid "Broadcast Payment" msgstr "Enviar Pago" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "Enviado" @@ -375,7 +391,7 @@ msgstr "Navegador no soportado" msgid "Buy & Sell Bitcoin" msgstr "Comprar & Vender Bitcoin" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "Comprar Bitcoin" @@ -387,8 +403,9 @@ msgstr "Comprando Bitcoins..." msgid "Calculating fee" msgstr "Calculando comisión" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -441,8 +458,7 @@ msgstr "Anular" msgid "Clear cache" msgstr "Limpiar cache" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "Click" @@ -466,12 +482,13 @@ msgstr "Commit hash" msgid "Complete the backup process to use this option" msgstr "Completar el proceso de respaldo para usar esta opción" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" msgstr "Terminadas" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -488,27 +505,19 @@ msgstr "Confirmar y terminar" msgid "Confirm your PIN" msgstr "Confirma tu PIN" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "Confirme su contraseña para enviar" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "Confirmaciones" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: www/views/modals/wallet-balance.html:61 msgid "Confirming" msgstr "Confirmando" -#: www/views/bitpayCard.html:59 -msgid "Confirming load transactions that are underpaid may require at least six blockchain confirmations to process." -msgstr "Confirmar aquellas transacciones que han sido de bajo pago requieren por lo menos seis confirmaciones en blockchain para ser procesadas." - -#: www/views/bitpayCard.html:55 -msgid "Confirming transactions take up to 1 block confirmation to proccess." -msgstr "Las transacciones en espera de confirmación requieren de 1 confirmación en blockchain para ser procesadas." - #: www/views/bitpayCardIntro.html:37 msgid "Connect my BitPay Card" msgstr "Conecte mi BitPay Card" @@ -525,7 +534,7 @@ msgstr "Conectando a Glidera..." msgid "Connection reset by peer" msgstr "Conexión re establecida" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "Contactos" @@ -580,7 +589,7 @@ msgstr "No se pudo acceder a la billetera desde el servidor. Por favor verificar msgid "Could not access wallet" msgstr "No se pudo acceder a la billetera" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "No se puede agregar mensajes a una billetera importada sin la clave cifrada compartida" @@ -592,10 +601,18 @@ msgstr "No se pudo enviar el pago" msgid "Could not build transaction" msgstr "No se pudo construir la transacción" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "No se pudo crear la dirección" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "No se pudo crear la factura" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "No se pudo crear la transacción" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "No se pudo crear la billetera usando la clave privada ingresada" @@ -608,7 +625,7 @@ msgstr "No se pudo crear con la clave pública extendida especificada" msgid "Could not create: Invalid wallet recovery phrase" msgstr "No se pudo crear: frase de recuperación inválida" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "No se pudo descifrar el archivo, verifique su contraseña" @@ -616,21 +633,25 @@ msgstr "No se pudo descifrar el archivo, verifique su contraseña" msgid "Could not delete payment proposal" msgstr "No se pudo eliminar la propuesta de pago" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "No se pudo obtener comisión dinámica" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "No se pudo obtener comisión dinámica: {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "No se pudo obtener la factura" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "No se pudo obtener las transacciones" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "No se pudo importar" @@ -655,7 +676,7 @@ msgstr "No se pudo eliminar la cuenta" msgid "Could not remove card" msgstr "No se pudo quitar tarjeta" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "No se pueden guardar las preferencias en el servidor" @@ -663,21 +684,21 @@ msgstr "No se pueden guardar las preferencias en el servidor" msgid "Could not send payment" msgstr "No se pudo enviar el pago" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "No se pudo enviar la transacción" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "No se pudo actualizar el historial de transacciones" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "No se pudo actualizar la billetera" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "No se pudieron actualizar las billeteras" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "Crear billetera Personal" @@ -687,8 +708,8 @@ msgid "Create Shared Wallet" msgstr "Crear billetera compartida" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "Crear billetera" @@ -735,7 +756,7 @@ msgstr "Fecha" msgid "Delete" msgstr "Eliminar" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "Eliminar Propuesta de Pago" @@ -767,8 +788,12 @@ msgstr "Camino de derivación" msgid "Derivation Strategy" msgstr "Estrategia de derivación" +#: www/views/topup.html:45 +msgid "Details" +msgstr "Detalles" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "Deshabilitado" @@ -786,7 +811,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "¿No ves tu idioma en Crowdin? Contacta con el encargado del proyecto! Nos encantaría soportar tu idioma." #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "Descargar" @@ -794,7 +819,7 @@ msgstr "Descargar" 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 "Cada billetera puede generar billones de direcciones desde sus 12 palabras. Se genera una nueva dirección automáticamente cada vez que se recibe un pago." -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "Económico" @@ -835,16 +860,16 @@ msgstr "Activar la cámara empezar." msgid "Enter Amount" msgstr "Ingrese el monto" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "Ingrese contraseña para pagos" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "Ingrese Autenticación de Dos Pasos para su cuenta de BitPay" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Ingrese una nueva contraseña para pagos" @@ -866,13 +891,12 @@ msgstr "Ingrese su contraseña" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -889,30 +913,30 @@ msgstr "Ingrese su contraseña" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -920,14 +944,18 @@ msgstr "Ingrese su contraseña" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Error" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "Error al confirmar" @@ -935,6 +963,14 @@ msgstr "Error al confirmar" msgid "Error creating wallet" msgstr "Error al crear billetera" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "Error al obtener información de SendMax" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "Error en el Protocolo de Pago" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" msgstr "Error de sincronización con la cuenta de BitPay" @@ -955,14 +991,14 @@ msgstr "Error al actualizar las tarjetas de débito" msgid "Exceeded daily limit of $500 per user" msgstr "Se excedió el limite de $500 por usuario" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "Expirada" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "Expira" @@ -979,7 +1015,7 @@ msgstr "Exportar a archivo" msgid "Export wallet" msgstr "Exportar billetera" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "Exportar vía código QR no es compatible para esta billetera" @@ -1005,12 +1041,12 @@ msgstr "Error al exportar" msgid "Family vacation funds" msgstr "Fondos para vacaciones en familia" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "Comisión" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" msgstr "Comisión:" @@ -1048,6 +1084,7 @@ msgstr "Para propósitos de auditoría" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "Desde" @@ -1056,6 +1093,10 @@ msgstr "Desde" msgid "From BitPay account" msgstr "De la cuenta de BitPay" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "Billetera Física" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "Desde el dispositivo de destino, ir a Agregar billetera > Importar y escanear este código QR" @@ -1068,10 +1109,18 @@ msgstr "Los fondos están bloqueados por propuestas de gastos pendientes" msgid "Funds found:" msgstr "Fondos encontrados:" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "Fondos a agregar" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "Fondos transferidos" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "Los fondos se agregaron a la tarjeta de débito" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "Los fondos serán transferidos a" @@ -1109,20 +1158,20 @@ msgstr "Comienza agregando el primero." msgid "Getting fee levels..." msgstr "Obteniendo niveles de comisión..." -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "Volver" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "Volver" @@ -1149,7 +1198,7 @@ msgstr "Billetera física" msgid "Help & Support" msgstr "Ayuda & Soporte" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "La ayuda está disponible en el sitio web." @@ -1258,7 +1307,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca msgstr "Si tomas una captura de pantalla, otras aplicaciones podrían ver tu copia de seguridad. La forma más acertada es resguardarla con tinta y papel." #: www/views/tab-import-hardware.html:42 -#: www/views/tab-import-phrase.html:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "Importar" @@ -1284,7 +1333,7 @@ msgstr "Para verificar la copia de seguridad de la billetera, por favor escriba #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "Incompleta" @@ -1297,31 +1346,36 @@ msgstr "Billetera Incompleta" msgid "Incorrect PIN, try again." msgstr "PIN Incorrecto. Inténtelo de nuevo." -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "Dirección de red incorrecta" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "Formato de código incorrecto" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "Dirección de red incorrecta" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "Fondos insuficientes" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Fondos insuficientes para el pago de la comisión" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "Inválido" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "URL incorrecta" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "Número de cuenta inválido" @@ -1334,8 +1388,8 @@ msgid "Invalid data" msgstr "Datos no válidos" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "Camino de derivación no válido" @@ -1343,6 +1397,10 @@ msgstr "Camino de derivación no válido" msgid "Invitation to share a {{appName}} Wallet" msgstr "Invitación para unirse a la billetera {{appName}} compartida" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "Cargo por factura" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "¿Hay algo que podríamos mejorar?" @@ -1393,16 +1451,10 @@ msgstr "La clave ya esta asociada a un monedero existente" msgid "Language" msgstr "Idioma" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 msgid "Last Month" msgstr "Mes pasado" -#: www/views/bitpayCard.html:56 -#: www/views/bitpayCard.html:60 -#: www/views/bitpayCard.html:64 -msgid "Learn More" -msgstr "Aprender más" - #: www/views/backup.html:36 msgid "Let's verify your backup phrase." msgstr "Verifiquemos la copia de seguridad." @@ -1444,6 +1496,10 @@ msgstr "Bloqueo temporal. Por favor espera para eliminar esta propuesta de gasto msgid "Log out" msgstr "Cerrar Sesión" +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "Entradas de monto bajo" + #: www/views/includes/walletHistory.html:27 msgid "Low fees" msgstr "Comisión baja" @@ -1469,14 +1525,14 @@ msgstr "Yo" msgid "Meh - it's alright" msgstr "Buu - está bien" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "Nota" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "Mensaje del comerciante" @@ -1497,12 +1553,12 @@ msgstr "Faltan las claves privadas para firmar" msgid "More Options" msgstr "Más opciones" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "Movido" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "Fondos movidos" @@ -1525,6 +1581,10 @@ msgstr "Nombre" msgid "Network" msgstr "Red" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "Comisión de la Red" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "Error de red" @@ -1533,7 +1593,7 @@ msgstr "Error de red" msgid "New Proposal" msgstr "Nueva propuesta de pago" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "No se pudo generar la nueva dirección. Por favor inténtalo de nuevo." @@ -1573,7 +1633,11 @@ msgstr "No propuestas de pago pendientes" msgid "No recent transactions" msgstr "No hay transacciones recientes" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "Propuesta sin firmar: No existe la clave privada" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "Aun no hay transacciones" @@ -1585,7 +1649,7 @@ msgstr "Se se encontró la billetera" msgid "No wallet selected" msgstr "No se seleccionó una billetera" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" msgstr "No hay billeteras disponibles" @@ -1593,7 +1657,7 @@ msgstr "No hay billeteras disponibles" msgid "No wallets available to receive funds" msgstr "No hay billeteras disponibles para recibir fondos" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "Normal" @@ -1601,7 +1665,7 @@ msgstr "Normal" msgid "Not authorized" msgstr "No autorizado" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "No hay suficientes fondos para la comisión" @@ -1635,7 +1699,7 @@ msgstr "Notificaciones" msgid "Notifications by email" msgstr "Notificaciones por correo electrónico" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" msgstr "Notificarme si se confirma" @@ -1647,8 +1711,9 @@ msgstr "Es un buen momento para realizar una copia de seguridad de la billetera. msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "Es el momento perfecto para mirar a tu alrededor. ¿ventanas? ¿cámaras? ¿gente curiosa?" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "OK" @@ -1667,11 +1732,11 @@ msgstr "Renuncia oficial en inglés" msgid "Oh no!" msgstr "¡Oh no!" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "En esta pantalla puedes ver tus billeteras, cuentas y activos." -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Abrir" @@ -1688,8 +1753,8 @@ msgstr "Abrir GitHub" msgid "Open GitHub Project" msgstr "Abrir Proyecto en GitHub" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "Abrir Insight" @@ -1724,7 +1789,7 @@ msgstr "Solicitar BitPay Card" msgid "Password" msgstr "Contraseña" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "Se requiere contraseña. Asegúrate de introducirla en opciones avanzadas" @@ -1760,7 +1825,7 @@ msgstr "Propuesta de Pago" msgid "Payment Proposal Created" msgstr "Propuesta de Pago Creada" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "Propuestas de Pago" @@ -1783,7 +1848,7 @@ msgstr "Pago Rechazado" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Pago Enviado" @@ -1796,7 +1861,7 @@ msgstr "Pago aceptado, pero aún no fue enviado" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "Pago aceptado. Se transmitirá por Glidera. En caso de que haya un problema, puedes eliminar la transacción 6 horas después de fue creada." -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "Detalles del pago" @@ -1804,10 +1869,6 @@ msgstr "Detalles del pago" msgid "Payment request" msgstr "Solicitud de pago" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "Pendiente" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "Propuestas de pago pendientes" @@ -1828,12 +1889,12 @@ msgstr "Por favor, anota cuidadosamente esta frase." msgid "Please connect a camera to get started." msgstr "Por favor, conecta una cámara para empezar." -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "Por favor ingresa la frase de recuperación" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "Por favor ingresa la frase de recuperación de la billetera" @@ -1849,11 +1910,11 @@ msgstr "Escoje las palabras en el orden correcto." msgid "Please upgrade Copay to perform this action" msgstr "Por favor actualiza Copay para realizar esta acción" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "Por favor, selecciona el archivo de copia de seguridad" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" msgstr "Pre-Auth Holds" @@ -1869,11 +1930,11 @@ msgstr "Preparando direcciones..." msgid "Preparing backup..." msgstr "Preparando copia de seguridad..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "Presione nuevamente para salir" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "Prioritario" @@ -1890,7 +1951,7 @@ msgid "Proposal Accepted" msgstr "Propuesta Aceptada" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Propuesta Creada" @@ -1903,7 +1964,7 @@ msgstr "Propuesta Eliminada" msgid "Proposal Rejected" msgstr "Propuesta Rechazada" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "Propuestas" @@ -1924,7 +1985,7 @@ msgid "Quick review!" msgstr "¡Revisión rápida!" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "Al azar" @@ -1950,16 +2011,16 @@ msgstr "Recibir" msgid "Received" msgstr "Recibido" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "Fondos recibidos" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "Recibiendo" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "Recientes" @@ -1969,12 +2030,12 @@ msgid "Recent Transaction Card" msgstr "Tarjeta con transacciones recientes" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "Transacciones Recientes" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "Destinatario" @@ -1996,7 +2057,7 @@ msgid "Recreating Wallet..." msgstr "Recreando billetera..." #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "Rechazado" @@ -2072,7 +2133,6 @@ msgstr "Reintentar" #: 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 @@ -2092,6 +2152,10 @@ msgstr "Escanear Código QR" msgid "Scan addresses for funds" msgstr "Busca direcciones con fondos" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "Escanear de nuevo" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "Por favor ingrese su huella digital" @@ -2108,7 +2172,7 @@ msgstr "Las capturas de pantallas no son seguras" msgid "Search Transactions" msgstr "Buscar transacciones" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "Buscar o introducir dirección bitcoin" @@ -2166,7 +2230,7 @@ msgstr "Enviar las direcciones por email" msgid "Send by email" msgstr "Enviar por correo electrónico" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "Enviar desde" @@ -2201,17 +2265,18 @@ msgstr "Enviando cantidad máxima" msgid "Sending transaction" msgstr "Enviando transacción" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Enviando {{amountStr}} desde tu billetera {{name}}" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "Enviado" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "Fondos enviados" @@ -2276,11 +2341,11 @@ msgstr "Mostrar dirección" msgid "Show advanced options" msgstr "Mostrar opciones avanzadas" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "Mostrar dirección bitcoin" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "Ver más" @@ -2306,13 +2371,12 @@ msgstr "Billetera de una sola dirección" msgid "Skip" msgstr "Omitir" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "Desliza" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "Especificar la frase de recuperación..." @@ -2328,7 +2392,11 @@ msgstr "La propuesta de gasto no se ha encontrado" msgid "Spending Password needed" msgstr "Se necesita la contraseña para pagos" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "Gastar este balance requiere de significativas comisiones de la red" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "Empezar a enviar bitcoin" @@ -2340,7 +2408,11 @@ msgstr "Iniciando..." msgid "Startup Lock" msgstr "Bloqueo inicial" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "Listo" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "Súper Económico" @@ -2386,7 +2458,7 @@ msgid "Terms of Use" msgstr "Términos de Uso" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "Testnet" @@ -2445,7 +2517,7 @@ msgstr "Los términos y condiciones oficiales en inglés se encuentran disponibl msgid "The password of the recovery phrase (if set)" msgstr "La contraseña de la frase de recuperación (si existe)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "El pago fue creado pero no se pudo completar. Por favor intenta nuevamente desde la pantalla de inicio" @@ -2488,13 +2560,13 @@ msgstr "URL de Wallet Service" msgid "There are no wallets to make this payment" msgstr "No dispone de billeteras para realizar este pago" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "Hay una nueva versión de {{appName}} disponible" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "Hay un error en el formulario" @@ -2511,7 +2583,7 @@ msgstr "¡Esta aplicación es fantástica!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "Esta aplicación almacena tus bitcoins con seguridad avanzada." -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "Esta solicitud de pago ha caducado." @@ -2525,42 +2597,59 @@ msgstr "Esta contraseña no se puede recuperar. Si la pierdes, no hay manera de msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "Esta frase de recuperación fue creada con una contraseña. Para recuperar esta billetera, la frase de recuperación y la contraseña son necesarios." +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "Este monto en la transacción es demasiado bajo comparado con las comisiones de la red Bitcoin. Para gastar estos fondos se requiere disponer de un monto superior a la comisión requerida por la red Bitcoin." + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" -msgstr "Esta transacción podría tomar mucho tiempo para confirmar o podría caer debido a la baja comisión por el remitente" +msgstr "Esta transacción podría tardar mucho tiempo en confirmar o podría caer debido a la baja comisión establecida por el remitente" #: www/views/walletDetails.html:116 #: 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 "Esta billetera no está registrada en el servidor de Bitcore Wallet Service (BWS). Debes re-crearla con la información local disponible." -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "Línea de tiempo" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "Para" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Para empezar, compra bitcoin o comparte tu dirección. Puedes recibir bitcoin desde cualquier billetera o servicio." -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Para empezar, necesitarás crear una billetera y obtener bitcoins." +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "Para {{reason}} primero debes agregar tu cuenta de BitPay - {{email}}" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "Recarda en progreso..." + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "Recargar {{amountStr}} a la tarjeta de débito ({{cardLastNumber}})" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "Total" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "Balance Total Bloqueado" @@ -2568,6 +2657,10 @@ msgstr "Balance Total Bloqueado" msgid "Total number of copayers" msgstr "Número total de copayers" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "Total de entradas de la billetera" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2590,12 +2683,20 @@ msgstr "La transacción ya fue enviada" msgid "Transaction created" msgstr "Transacción creada" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "La transacción no ha sido creada" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "Transacción iniciada" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "La transacción no esta disponible en este momento" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "Transacción no encontrada" @@ -2603,7 +2704,7 @@ msgstr "Transacción no encontrada" msgid "Transfer to" msgstr "Transferir a" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "Transferir a billetera" @@ -2623,7 +2724,7 @@ msgstr "Escribe la frase de recuperación (normalmente 12 palabras)" msgid "Uh oh..." msgstr "Ouch..." -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "Sin confirmar" @@ -2631,7 +2732,7 @@ msgstr "Sin confirmar" msgid "Unit" msgstr "Unidad" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "Transacciones no enviadas" @@ -2643,7 +2744,7 @@ msgstr "Direcciones no utilizadas" msgid "Unused Addresses Limit" msgstr "Limite de direcciones sin uso" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "Actualización Disponible" @@ -2651,7 +2752,7 @@ msgstr "Actualización Disponible" msgid "Updating pending proposals. Please stand by" msgstr "Actualizando propuestas de pago pendientes. Por favor, espera" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "Actualizando el historial de transacciones. Por favor aguarda un momento." @@ -2659,7 +2760,7 @@ msgstr "Actualizando el historial de transacciones. Por favor aguarda un momento msgid "Updating... Please stand by" msgstr "Actualizando... Por favor, espera" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "Urgente" @@ -2671,6 +2772,10 @@ msgstr "Utilizar los fondos sin confirmar" msgid "Validating recovery phrase..." msgstr "Validando la frase de recuperación..." +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "Verificar tu identidad" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2688,20 +2793,20 @@ msgstr "Ver todas las direcciones" msgid "View Terms of Service" msgstr "Ver Términos de Uso" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "Ver Transacción en Insight" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "Ver Actualización" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "Ver en blockchain" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "ADVERTENCIA: Derivación de la clave no funciona en este dispositivo/billetera. Acciones no pueden realizarse en esta billetera." @@ -2759,6 +2864,10 @@ msgstr "Id de la Billetera" msgid "Wallet Information" msgstr "Información de la Billetera" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "Entradas de la billetera" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "Invitación para unirse a la billetera" @@ -2792,7 +2901,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "La frase de recuperación no es válida" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "Wallet Service URL" @@ -2801,6 +2910,7 @@ msgid "Wallet Settings" msgstr "Preferencias de la billetera" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "Tipo de billetera" @@ -2850,7 +2960,7 @@ msgstr "Billetera sin copia de seguridad" msgid "Wallet not found" msgstr "Billetera no encontrada" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "Billetera no registrada" @@ -2866,7 +2976,7 @@ msgstr "Frase de recuperación de la billetera no disponible." msgid "Wallet service not found" msgstr "Wallet Service no encontrado" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "Billeteras" @@ -2935,7 +3045,7 @@ msgstr "¿Estaría usted dispuesto a opinar sobre {{appName}} en la app store?" msgid "Would you like to receive push notifications about payments?" msgstr "¿Quieres recibir notificaciones push sobre sus transacciones?" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "Número incorrecto de palabras:" @@ -2992,14 +3102,14 @@ msgid "You'll receive email notifications about payments sent and received from msgstr "Recibirás notificaciones por correo electrónico acerca de pagos enviados y recibidos de tus billeteras." #: 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 "BitPay Card lista. Añade fondos para empezar a usar su tarjeta en cajeros automáticos y tiendas en todo el mundo." +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." +msgstr "Tu Tarjeta BitPay ya esta lista. Agrega fondos para comenzar a utilizarla en negocios y cajeros automáticos de todo el mundo." #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "¡Su billetera bitcoin está resguardada!" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "¡Su billetera bitcoin está lista!" @@ -3024,13 +3134,13 @@ msgstr "Contraseña" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "Tu billetera nunca se sube a la nube ni se resguarda automáticamente en el dispositivo." -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "La clave de la billetera será cifrada. La contraseña para pagos no puede ser recuperada. Asegúrate de anotarla." #: www/views/includes/walletSelector.html:23 #: www/views/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3057,17 +3167,17 @@ msgstr "nombre@ejemplo.com" msgid "preparing..." msgstr "preparando..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "para aceptar" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "para pagar" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "para enviar" @@ -3075,11 +3185,15 @@ msgstr "para enviar" 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 "{{appName}} depende de Bitcore Wallet Service (BWS) para obtener información sobre blockchain y sincronización del Copayer. La configuración por defecto apunta a https://bws.bitpay.com (instancia pública de BitPay)." -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} se descontará por comisión de la red bitcoin." -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "{{tx.txp[wallet.id].feeRatePerStr}} de la cantidad a enviar" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} transacciones descargadas" diff --git a/i18n/po/fr.po b/i18n/po/fr.po index 4b3a5f093..41b41f11a 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -11,28 +11,28 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: French\n" "Language: fr\n" -"PO-Revision-Date: 2017-06-06 13:25-0400\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 "(Blocages pré-autorisés des transactions) Le commerçant a initié un blocage afin de rendre ces fonds indisponibles jusqu'au paiement complet de votre transaction. Les fonds sont libérés sous 30 jours, au plus tard, dans le cas où le commerçant décide de ne pas finaliser la transaction." +"PO-Revision-Date: 2017-06-29 08:10-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "(Fiable)" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "(double dépense possible)" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* Une proposition de paiement peut être supprimée si vous en êtes le créateur et qu'aucun des autres copayers n'a signé, ou si 24 heures sont passées depuis la création de la proposition." -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" -msgstr "- {{feeRateStr}} de la transaction" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "- {{btx.feeRateStr}} de la transaction" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" +msgstr "- {{tx.feeRateStr}} de la transaction" #: 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!" @@ -43,11 +43,11 @@ msgstr "Une note de 5 étoiles permet à {{appName}} de gagner en popularité, e msgid "A member of the team will review your feedback as soon as possible." msgstr "Un membre de l’équipe passera en revue votre avis dès que possible." -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "Un total de {{amountAboveMaxSizeStr}} a été exclu. La taille maximale autorisée pour une transaction a été dépassée." -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "Un total de {{amountBelowFeeStr}} a été exclu. Ces fonds proviennent d'UTXOs plus petites que les frais de réseau prévus." @@ -57,7 +57,7 @@ msgid "About" msgstr "À propos" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "Acceptée" @@ -76,15 +76,15 @@ msgstr "Numéro de compte" msgid "Accounts" msgstr "Comptes" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "Activité" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "Ajouter un compte" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "Ajouter un compte BitPay ?" @@ -97,7 +97,7 @@ msgstr "Ajouter un contact" msgid "Add Funds" msgstr "Ajouter des fonds" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "Ajouter une note" @@ -117,10 +117,18 @@ msgstr "Ajouter un compte" msgid "Add an optional password to secure the recovery phrase" msgstr "Ajouter un mot de passe optionnel pour sécuriser la phrase de récupération" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "Ajouter une description" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "Ajouter des fonds" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "Voulez-vous ajouter ce compte BitPay ({{email}}) ?" + #: www/views/add.html:3 msgid "Add wallet" msgstr "Ajouter un portefeuille" @@ -153,7 +161,7 @@ msgstr "Paramètres avancés" msgid "Advanced Settings" msgstr "Paramètres avancés" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "Tout" @@ -197,11 +205,15 @@ msgstr "Montant" msgid "Amount below minimum allowed" msgstr "Montant en dessous du minimum autorisé" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "Le montant est trop élevé" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "Le montant est trop faible pour être dépensé" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "Une mise à jour de cette appli est disponible. Pour votre sécurité, veuillez mettre à jour vers la dernière version." @@ -209,6 +221,10 @@ msgstr "Une mise à jour de cette appli est disponible. Pour votre sécurité, v msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "Quelqu'un disposant de votre phrase de sauvegarde peut accéder ou dépenser vos bitcoins." +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "Frais de réseau Bitcoin approximatifs pour transférer le solde du portefeuille (avec des frais normaux)" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "Êtes-vous surveillé(e) ?" @@ -324,7 +340,7 @@ msgstr "BitPay Visa® Cards" msgid "Bitcoin Address" msgstr "Adresse bitcoin" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -359,7 +375,7 @@ msgid "Broadcast Payment" msgstr "Diffuser le paiement" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "Diffusée" @@ -375,7 +391,7 @@ msgstr "Navigateur non supporté" msgid "Buy & Sell Bitcoin" msgstr "Acheter & vendre des bitcoins" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "Acheter des bitcoins" @@ -387,8 +403,9 @@ msgstr "Achat de bitcoins..." msgid "Calculating fee" msgstr "Calcul des frais" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -441,8 +458,7 @@ msgstr "Effacer" msgid "Clear cache" msgstr "Vider le cache" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "Cliquez" @@ -466,12 +482,13 @@ msgstr "Commit hash" msgid "Complete the backup process to use this option" msgstr "Terminez le processus de sauvegarde pour utiliser cette option" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" msgstr "Terminé" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -488,27 +505,19 @@ msgstr "Confirmer & Terminer" msgid "Confirm your PIN" msgstr "Confirmez votre PIN" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "Confirmez votre nouveau code de dépenses" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "Confirmations" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: www/views/modals/wallet-balance.html:61 msgid "Confirming" msgstr "Confirmation" -#: www/views/bitpayCard.html:59 -msgid "Confirming load transactions that are underpaid may require at least six blockchain confirmations to process." -msgstr "Les transactions sous-payées peuvent nécessiter 6 confirmations blockchain pour être traitées." - -#: www/views/bitpayCard.html:55 -msgid "Confirming transactions take up to 1 block confirmation to proccess." -msgstr "Les transactions requièrent 1 confirmation blockchain pour être traitées." - #: www/views/bitpayCardIntro.html:37 msgid "Connect my BitPay Card" msgstr "Connecter ma BitPay Card" @@ -525,7 +534,7 @@ msgstr "Connexion à Glidera..." msgid "Connection reset by peer" msgstr "Connexion réinitialisée par un pair" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "Contacts" @@ -580,7 +589,7 @@ msgstr "Impossible d'accéder au portefeuille via le serveur. Veuillez vérifier msgid "Could not access wallet" msgstr "Impossible d’accéder au portefeuille" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "Could not add message to imported wallet without shared encrypting key" @@ -592,10 +601,18 @@ msgstr "Impossible de diffuser le paiement" msgid "Could not build transaction" msgstr "Impossible de créer la transaction" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "Impossible de créer l'adresse" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "Impossible de créer la facture" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "Impossible de créer la transaction" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "Impossible de créer en utilisant la clé privée étendue spécifiée" @@ -608,7 +625,7 @@ msgstr "Impossible de créer en utilisant la clé publique étendue spécifiée" msgid "Could not create: Invalid wallet recovery phrase" msgstr "Impossible de créer : Phrase de récupération du portefeuille invalide" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe" @@ -616,21 +633,25 @@ msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe" msgid "Could not delete payment proposal" msgstr "Impossible de supprimer la proposition de paiement" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "Impossible d'obtenir les frais dynamiques" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "Impossible d'obtenir les frais dynamiques pour ce choix : {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "Impossible d'obtenir la facture" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "Impossible de récupérer les transactions" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "Impossible d'importer" @@ -655,7 +676,7 @@ msgstr "Impossible de supprimer le compte" msgid "Could not remove card" msgstr "Impossible de supprimer la carte" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "Impossible d'enregistrer les préférences sur le serveur" @@ -663,21 +684,21 @@ msgstr "Impossible d'enregistrer les préférences sur le serveur" msgid "Could not send payment" msgstr "Impossible d'envoyer le paiement" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "Impossible d'envoyer la transaction" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "Impossible de mettre à jour l'historique des transactions" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "Impossible de mettre à jour le portefeuille" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "Impossible de mettre à jour les portefeuilles" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "Créer un portefeuille personnel" @@ -687,8 +708,8 @@ msgid "Create Shared Wallet" msgstr "Créer un portefeuille partagé" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "Créer un portefeuille bitcoin" @@ -735,7 +756,7 @@ msgstr "Date" msgid "Delete" msgstr "Supprimer" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "Supprimer la proposition de paiement" @@ -767,8 +788,12 @@ msgstr "Chemin de dérivation" msgid "Derivation Strategy" msgstr "Stratégie de dérivation" +#: www/views/topup.html:45 +msgid "Details" +msgstr "Détails" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "Désactivé" @@ -786,7 +811,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "Vous ne voyez pas votre langue sur Crowdin ? Contactez le propriétaire sur Crowdin ! Nous serions ravis de prendre en charge votre langue." #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "Télécharger" @@ -794,7 +819,7 @@ msgstr "Télécharger" 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 "Chaque portefeuille bitcoin peut générer des milliards d’adresses depuis votre sauvegarde de 12 mots. Une nouvelle adresse est automatiquement générée et affichée à chaque fois que vous recevez un paiement." -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "Faibles" @@ -835,16 +860,16 @@ msgstr "Autorisez la caméra commencer." msgid "Enter Amount" msgstr "Saisissez un montant" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "Saisissez le code de dépenses" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "Saisissez le code à deux facteurs pour votre compte BitPay" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Saisissez un nouveau code de dépenses" @@ -866,13 +891,12 @@ msgstr "Écrivez votre mot de passe" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -889,30 +913,30 @@ msgstr "Écrivez votre mot de passe" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -920,14 +944,18 @@ msgstr "Écrivez votre mot de passe" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Erreur" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "Erreur à la confirmation" @@ -935,6 +963,14 @@ msgstr "Erreur à la confirmation" msgid "Error creating wallet" msgstr "Erreur de création du portefeuille" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "Erreur d’obtention de l'information SendMax" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "Erreur dans le protocole de paiement" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" msgstr "Erreur d'appariement du compte BitPay" @@ -955,14 +991,14 @@ msgstr "Erreur de mise à jour des cartes de débit" msgid "Exceeded daily limit of $500 per user" msgstr "La limite quotidienne de 500$ par utilisateur a été dépassée" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "Expiré" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "Expire" @@ -979,7 +1015,7 @@ msgstr "Exporter vers un fichier" msgid "Export wallet" msgstr "Exporter le portefeuille" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "L'exportation via QR n'est pas supportée pour ce portefeuille" @@ -1005,12 +1041,12 @@ msgstr "Impossible d'exporter" msgid "Family vacation funds" msgstr "Fonds pour les vacances familiales" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "Frais" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" msgstr "Frais :" @@ -1048,6 +1084,7 @@ msgstr "À des fins de vérification" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "De" @@ -1056,6 +1093,10 @@ msgstr "De" msgid "From BitPay account" msgstr "Depuis un compte BitPay" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "Depuis un portefeuille matériel" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "Depuis l'appareil de destination, allez sur « Ajouter un portefeuille » > « Importer » et numérisez ce code QR" @@ -1068,10 +1109,18 @@ msgstr "Les fonds sont verrouillés par des propositions de dépenses en attente msgid "Funds found:" msgstr "Fonds trouvés :" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "Fonds à ajouter" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "Fonds transférés" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "Les fonds ont été ajoutés à la carte de débit" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "Les fonds seront transférés à" @@ -1109,20 +1158,20 @@ msgstr "Commencez par ajouter votre premier contact." msgid "Getting fee levels..." msgstr "Obtention des niveaux de frais..." -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "Retour" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "Retour" @@ -1149,7 +1198,7 @@ msgstr "Portefeuille matériel" msgid "Help & Support" msgstr "Aide & Support" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "Des informations d'assistance et de support sont disponibles sur le site internet." @@ -1235,7 +1284,7 @@ msgstr "Je l'ai bien écrite" #: www/views/preferences.html:50 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." -msgstr "Si activé, toutes les informations sensibles (clé privée et phrase de récupération) ainsi que les opérations (dépenses et exportation) associées à ce portefeuille seront protégées." +msgstr "Si activé, toutes les informations sensibles (clé privée et phrase de récupération) ainsi que les opérations (dépenses et exportations) associées à ce portefeuille seront protégées." #: www/views/advancedSettings.html:22 msgid "If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab." @@ -1258,7 +1307,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca msgstr "Si vous prenez une capture d’écran, votre sauvegarde peut être vue par d’autres applications. Vous pouvez faire une sauvegarde physique sécurisée avec du papier et un stylo." #: www/views/tab-import-hardware.html:42 -#: www/views/tab-import-phrase.html:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "Importer" @@ -1284,7 +1333,7 @@ msgstr "Afin de vérifier la sauvegarde de votre portefeuille, veuillez saisir v #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "Non terminé" @@ -1297,31 +1346,36 @@ msgstr "Portefeuille non terminé" msgid "Incorrect PIN, try again." msgstr "PIN incorrect, veuillez réessayer." -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "Adresse réseau incorrecte" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "Format du code incorrect" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "Adresse réseau invalide" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "Fonds insuffisants" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Fonds insuffisants pour les frais" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "Invalide" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "URL invalide" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "Numéro de compte invalide" @@ -1334,8 +1388,8 @@ msgid "Invalid data" msgstr "Données invalides" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "Chemin de dérivation invalide" @@ -1343,6 +1397,10 @@ msgstr "Chemin de dérivation invalide" msgid "Invitation to share a {{appName}} Wallet" msgstr "Invitation pour partager un portefeuille {{appName}}" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "Frais de facturation" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "Y a-t-il quelque chose que nous pourrions améliorer ?" @@ -1393,16 +1451,10 @@ msgstr "La clé est déjà associée avec un portefeuille existant" msgid "Language" msgstr "Langue" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 msgid "Last Month" msgstr "Le mois dernier" -#: www/views/bitpayCard.html:56 -#: www/views/bitpayCard.html:60 -#: www/views/bitpayCard.html:64 -msgid "Learn More" -msgstr "En savoir plus" - #: www/views/backup.html:36 msgid "Let's verify your backup phrase." msgstr "Vérifions votre phrase de sauvegarde." @@ -1444,6 +1496,10 @@ msgstr "Locktime effectif. Veuillez patienter pour supprimer cette proposition d msgid "Log out" msgstr "Se déconnecter" +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "Entrées de faible montant" + #: www/views/includes/walletHistory.html:27 msgid "Low fees" msgstr "Frais faibles" @@ -1469,14 +1525,14 @@ msgstr "Moi" msgid "Meh - it's alright" msgstr "Ça peut aller" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "Note" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "Message marchand" @@ -1497,12 +1553,12 @@ msgstr "Clés privées manquantes pour signer" msgid "More Options" msgstr "Plus d'options" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "Déplacés" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "Fonds déplacés" @@ -1525,6 +1581,10 @@ msgstr "Nom" msgid "Network" msgstr "Réseau" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "Frais de réseau" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "Erreur réseau" @@ -1533,7 +1593,7 @@ msgstr "Erreur réseau" msgid "New Proposal" msgstr "Nouvelle proposition" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "La nouvelle adresse n'a pas pu être générée. Veuillez réessayer." @@ -1573,7 +1633,11 @@ msgstr "Aucune proposition en attente" msgid "No recent transactions" msgstr "Aucune transaction récente" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "Aucune proposition de signature : aucune clé privée" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "Aucune transaction" @@ -1585,7 +1649,7 @@ msgstr "Aucun portefeuille trouvé" msgid "No wallet selected" msgstr "Aucun portefeuille sélectionné" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" msgstr "Aucun portefeuille disponible" @@ -1593,7 +1657,7 @@ msgstr "Aucun portefeuille disponible" msgid "No wallets available to receive funds" msgstr "Aucun portefeuille disponible pour recevoir des fonds" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "Normaux" @@ -1601,7 +1665,7 @@ msgstr "Normaux" msgid "Not authorized" msgstr "Non autorisé" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "Pas assez de fonds pour les frais" @@ -1635,7 +1699,7 @@ msgstr "Notifications" msgid "Notifications by email" msgstr "Notifications par e-mail" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" msgstr "Me notifier si la transaction se confirme" @@ -1645,10 +1709,11 @@ msgstr "C'est un bon moment pour sauvegarder votre portefeuille. Si cet appareil #: www/views/backupWarning.html:11 msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" -msgstr "C'est un bon moment pour observer autour de vous. Personne aux fenêtres ? Derrière vous ? Aucune caméra cachée ?" +msgstr "C'est le moment d'observer autour de vous ! Personne aux fenêtres ? Derrière vous ? Aucune caméra cachée ?" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "Ok" @@ -1667,11 +1732,11 @@ msgstr "Clause de non-responsabilité anglaise officielle" msgid "Oh no!" msgstr "Oh non !" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "Vous pouvez visualiser tous vos portefeuilles, comptes et actifs sur cet écran." -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Ouvrir" @@ -1688,8 +1753,8 @@ msgstr "Ouvrir GitHub" msgid "Open GitHub Project" msgstr "Ouvrir le projet GitHub" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "Ouvrir Insight" @@ -1724,7 +1789,7 @@ msgstr "Commander la BitPay Card" msgid "Password" msgstr "Mot de passe" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "Mot de passe requis. Veuillez saisir votre mot de passe dans les options avancées" @@ -1760,7 +1825,7 @@ msgstr "Proposition de paiement" msgid "Payment Proposal Created" msgstr "Proposition de paiement créée" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "Propositions de paiement" @@ -1783,7 +1848,7 @@ msgstr "Paiement rejeté" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Paiement envoyé" @@ -1796,7 +1861,7 @@ msgstr "Paiement accepté, mais pas encore diffusé" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "Paiement accepté. Il sera diffusé par Glidera. Dans le cas où il y a un problème, il peut être supprimé 6 heures après avoir été créé." -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "Détails du paiement" @@ -1804,10 +1869,6 @@ msgstr "Détails du paiement" msgid "Payment request" msgstr "Demande de paiement" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "En attente" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "Propositions en attente" @@ -1828,12 +1889,12 @@ msgstr "Veuillez écrire soigneusement cette phrase." msgid "Please connect a camera to get started." msgstr "Veuillez connecter une caméra pour commencer." -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "Veuillez saisir la phrase de récupération" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "Veuillez saisir la phrase de récupération du portefeuille" @@ -1849,11 +1910,11 @@ msgstr "Veuillez sélectionner chaque mot dans le bon ordre." msgid "Please upgrade Copay to perform this action" msgstr "Veuillez mettre à jour Copay pour effectuer cette action" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "Veuillez sélectionner votre fichier de sauvegarde" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" msgstr "Blocages pré-autorisés" @@ -1869,11 +1930,11 @@ msgstr "Préparation des adresses..." msgid "Preparing backup..." msgstr "Préparation de la sauvegarde..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "Appuyez de nouveau pour quitter" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "Élevés" @@ -1890,7 +1951,7 @@ msgid "Proposal Accepted" msgstr "Proposition acceptée" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Proposition créée" @@ -1903,7 +1964,7 @@ msgstr "Proposition supprimée" msgid "Proposal Rejected" msgstr "Proposition rejetée" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "Propositions" @@ -1924,7 +1985,7 @@ msgid "Quick review!" msgstr "Revue rapide !" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "Aléatoire" @@ -1950,16 +2011,16 @@ msgstr "Recevoir" msgid "Received" msgstr "Reçus" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "Fonds reçus" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "Réception" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "Transactions récentes" @@ -1969,12 +2030,12 @@ msgid "Recent Transaction Card" msgstr "Carte des transactions récentes" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "Transactions récentes" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "Destinataire" @@ -1996,7 +2057,7 @@ msgid "Recreating Wallet..." msgstr "Recréation du portefeuille..." #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "Rejetée" @@ -2072,7 +2133,6 @@ msgstr "Réessayer la caméra" #: 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 @@ -2092,6 +2152,10 @@ msgstr "Numérisez des codes QR" msgid "Scan addresses for funds" msgstr "Analyser les adresses pour des fonds" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "Réanalyser" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "Veuillez scanner votre empreinte digitale" @@ -2108,7 +2172,7 @@ msgstr "Les captures d’écran ne sont pas sécurisées" msgid "Search Transactions" msgstr "Rechercher des transactions" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "Recherchez ou saisissez une adresse bitcoin" @@ -2166,7 +2230,7 @@ msgstr "Envoyer les adresses par e-mail" msgid "Send by email" msgstr "Envoyer par e-mail" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "Envoyer à partir de" @@ -2201,17 +2265,18 @@ msgstr "Envoi du montant maximal" msgid "Sending transaction" msgstr "Envoi de la transaction" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Envoi de {{amountStr}} depuis votre portefeuille {{name}}" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "Envoyés" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "Fonds envoyés" @@ -2276,11 +2341,11 @@ msgstr "Afficher l'adresse" msgid "Show advanced options" msgstr "Afficher les options avancées" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "Afficher vos adresses bitcoin" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "En afficher plus" @@ -2306,13 +2371,12 @@ msgstr "Portefeuille d'adresse unique" msgid "Skip" msgstr "Ignorer" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "Faites glisser" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "Spécifier la phrase de récupération..." @@ -2328,7 +2392,11 @@ msgstr "Propostion de dépense introuvable" msgid "Spending Password needed" msgstr "Code de dépenses requis" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "La dépense de ce solde demandera d'importants frais de réseau Bitcoin" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "Commencez à envoyer des bitcoins" @@ -2340,7 +2408,11 @@ msgstr "Démarrage..." msgid "Startup Lock" msgstr "Verrou au démarrage de l'appli" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "Succès" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "Infimes" @@ -2386,7 +2458,7 @@ msgid "Terms of Use" msgstr "Conditions d'utilisation" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "Testnet" @@ -2445,7 +2517,7 @@ msgstr "Les conditions d'utilisation officielles en anglais sont disponibles sur msgid "The password of the recovery phrase (if set)" msgstr "Le mot de passe de la phrase de récupération (si configuré)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "Le paiement a été créé mais n'a pas pu être achevé. Veuillez réessayer depuis l'écran d'accueil" @@ -2488,13 +2560,13 @@ msgstr "L’URL du service de portefeuille" msgid "There are no wallets to make this payment" msgstr "Il n'y a pas de portefeuilles pour faire ce paiement" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "Une nouvelle version de {{appName}} est disponible" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "Il y a une erreur dans la forme" @@ -2511,7 +2583,7 @@ msgstr "Cette appli est fantastique !" msgid "This app stores your bitcoin with cutting-edge security." msgstr "Cette appli conserve vos bitcoins avec une sécurité de pointe." -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "Cette demande de paiement bitcoin a expiré." @@ -2525,6 +2597,10 @@ msgstr "Ce mot de passe ne peut pas être récupéré. Si le mot de passe est pe msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "Cette phrase de récupération a été créée avec un mot de passe. Pour récupérer ce portefeuille, la phrase de récupération et le mot de passe sont requis." +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "Ce montant de transaction est trop faible par rapport aux actuels frais de réseau Bitcoin. La dépense de ces fonds demandera des frais de réseau Bitcoin comparables aux fonds eux-mêmes." + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "Cette transaction pourrait prendre beaucoup de temps pour être confirmée ou pourrait être abandonnée à cause du faible niveau de frais fixé par l'expéditeur" @@ -2534,33 +2610,46 @@ msgstr "Cette transaction pourrait prendre beaucoup de temps pour être confirm msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "Ce portefeuille n'est pas enregistré dans le Bitcore Wallet Service (BWS) donné. Vous pouvez le recréer depuis l'information locale." -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "Chronologie" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "À" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Pour commencer, achetez des bitcoins ou partagez votre adresse. Vous pouvez recevoir des bitcoins de n'importe quel portefeuille ou service." -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Pour commencer, vous aurez besoin de créer un portefeuille bitcoin et d'obtenir quelques bitcoins." +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "Pour {{reason}} vous devez d'abord ajouter votre compte BitPay - {{email}}" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "Rechargement en cours..." + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "Rechargement de {{amountStr}} vers la carte de débit ({{cardLastNumber}})" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "Total" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "Solde verrouillé total" @@ -2568,6 +2657,10 @@ msgstr "Solde verrouillé total" msgid "Total number of copayers" msgstr "Nombre total de copayers" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "Entrées de portefeuille totales" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2590,12 +2683,20 @@ msgstr "Transaction déjà diffusée" msgid "Transaction created" msgstr "Transaction créée" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "La transaction n'a pas été créée" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "Transaction initiée" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "La transaction n'est pas disponible pour l'instant" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "Transaction introuvable" @@ -2603,7 +2704,7 @@ msgstr "Transaction introuvable" msgid "Transfer to" msgstr "Transférer à" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "Transférer vers un portefeuille" @@ -2623,7 +2724,7 @@ msgstr "Saisissez la phrase de récupération (généralement 12 mots)" msgid "Uh oh..." msgstr "Oh là là..." -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "Non confirmée" @@ -2631,7 +2732,7 @@ msgstr "Non confirmée" msgid "Unit" msgstr "Unité" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "Transactions non envoyées" @@ -2643,7 +2744,7 @@ msgstr "Adresses inutilisées" msgid "Unused Addresses Limit" msgstr "Limite des adresses inutilisées" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "Mise à jour disponible" @@ -2651,7 +2752,7 @@ msgstr "Mise à jour disponible" msgid "Updating pending proposals. Please stand by" msgstr "Mise à jour des propositions en attente. Veuillez patienter" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "Mise à jour de l'historique des transactions. Veuillez patienter." @@ -2659,7 +2760,7 @@ msgstr "Mise à jour de l'historique des transactions. Veuillez patienter." msgid "Updating... Please stand by" msgstr "Mise à jour... veuillez patienter" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "Très élevés" @@ -2671,6 +2772,10 @@ msgstr "Utiliser les fonds non confirmés" msgid "Validating recovery phrase..." msgstr "Validation de la phrase de récupération..." +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "Vérification de votre identité" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2688,20 +2793,20 @@ msgstr "Voir toutes les adresses" msgid "View Terms of Service" msgstr "Voir les conditions d'utilisation" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "Voir la transaction sur Insight" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "Voir la mise à jour" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "Voir sur la blockchain" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "ATTENTION : La dérivation de la clé ne fonctionne pas sur cet appareil / portefeuille. Impossible d’effectuer des actions sur ce portefeuille." @@ -2759,6 +2864,10 @@ msgstr "Id du portefeuille" msgid "Wallet Information" msgstr "Informations du portefeuille" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "Entrées de portefeuille" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "Invitation de portefeuille" @@ -2792,7 +2901,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "La phrase de récupération du portefeuille est invalide" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "Wallet Service URL" @@ -2801,6 +2910,7 @@ msgid "Wallet Settings" msgstr "Paramètres du portefeuille" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "Type de portefeuille" @@ -2850,7 +2960,7 @@ msgstr "Le portefeuille n'est pas sauvegardé" msgid "Wallet not found" msgstr "Portefeuille introuvable" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "Portefeuille non enregistré" @@ -2866,7 +2976,7 @@ msgstr "La phrase de récupération du portefeuille est indisponible." msgid "Wallet service not found" msgstr "Wallet Service introuvable" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "Portefeuilles" @@ -2935,7 +3045,7 @@ msgstr "Seriez-vous prêt à évaluer {{appName}} dans la boutique d'application msgid "Would you like to receive push notifications about payments?" msgstr "Souhaitez-vous recevoir des notifications relatives aux paiements ?" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "Nombre incorrect de mots de récupération :" @@ -2992,14 +3102,14 @@ msgid "You'll receive email notifications about payments sent and received from msgstr "Vous recevrez des notifications par e-mail concernant les paiements envoyés et reçus depuis vos portefeuilles." #: 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." +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." msgstr "Votre BitPay Card est prête. Ajoutez des fonds sur votre carte pour commencer à l'utiliser dans des magasins et distributeurs automatiques à travers le monde entier." #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "Votre portefeuille bitcoin est sauvegardé !" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "Votre portefeuille bitcoin est prêt !" @@ -3024,13 +3134,13 @@ msgstr "Votre mot de passe" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "Votre portefeuille n’est jamais enregistré en dehors de votre appareil ou dans des sauvegardes qui lui sont propres." -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "La clé de votre portefeuille sera chiffrée. Le code de dépenses ne peut pas être récupéré. N'oubliez pas de l'écrire." #: www/views/includes/walletSelector.html:23 #: www/views/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3057,17 +3167,17 @@ msgstr "nom@exemple.com" msgid "preparing..." msgstr "préparation..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "pour accepter" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "pour payer" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "pour envoyer" @@ -3075,11 +3185,15 @@ msgstr "pour envoyer" 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 "{{appName}} repose sur Bitcore Wallet Service (BWS) pour les informations de blockchain, le réseau et la synchronisation des Copayers. La configuration par défaut est orientée vers https://bws.bitpay.com (instance BWS publique de BitPay)." -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} seront déduits pour les frais de réseau Bitcoin." -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "{{tx.txp[wallet.id].feeRatePerStr}} du montant d'envoi" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} transactions téléchargées" diff --git a/i18n/po/it.po b/i18n/po/it.po index 4cf308c52..6a96652ac 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -11,27 +11,27 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Italian\n" "Language: it\n" -"PO-Revision-Date: 2017-06-06 10:18-0400\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 "" +"PO-Revision-Date: 2017-06-29 07:15-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "(Fidato)" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "(possibile doppia spesa)" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* Una proposta di pagamento può essere eliminata se 1) Tu sei il creatore e nessun altro copayer ha firmato, oppure 2) Sono passate 24 ore da quando la proposta e' stata creata." -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" msgstr "" #: www/views/feedback/rateApp.html:7 @@ -43,11 +43,11 @@ msgstr "Darci un voto a 5 stelle ci aiuta a portare {{appName}} a più mani, e p msgid "A member of the team will review your feedback as soon as possible." msgstr "Un membro del team esaminerà il tuo feedback appena possibile." -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "Un totale di{{amountAboveMaxSizeStr}} sono state escluse. La dimensione massima consentita per una transazione è stata superata." -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "Un totale di {{amountBelowFeeStr}} è stato escluso. Questi fondi provengono da UTXO più piccole rispetto alla commissione di rete fornita." @@ -57,7 +57,7 @@ msgid "About" msgstr "Informazioni" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "Accettata" @@ -76,15 +76,15 @@ msgstr "Numero del Conto" msgid "Accounts" msgstr "Account" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "Attività" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "Aggiungere Account" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "Aggiungere il conto BitPay?" @@ -97,7 +97,7 @@ msgstr "Aggiungi Contatto" msgid "Add Funds" msgstr "Aggiungere fondi" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "Aggiungi Memo" @@ -117,10 +117,18 @@ msgstr "Aggiungere account" msgid "Add an optional password to secure the recovery phrase" msgstr "Aggiungere una password facoltativa per proteggere la frase di recupero" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "Aggiungi descrizione" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "" + #: www/views/add.html:3 msgid "Add wallet" msgstr "Aggiungi un portafoglio" @@ -153,7 +161,7 @@ msgstr "Avanzato" msgid "Advanced Settings" msgstr "Impostazioni avanzate" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "Tutto" @@ -197,11 +205,15 @@ msgstr "Ammontare" msgid "Amount below minimum allowed" msgstr "Importo inferiore al minimo consentito" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "Quantità troppo grande" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "Un aggiornamento dell'app è disponibile. Per la tua sicurezza è consigliato aggiornare all'ultima versione." @@ -209,6 +221,10 @@ msgstr "Un aggiornamento dell'app è disponibile. Per la tua sicurezza è consig msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "Qualcuno con il tuo backup phrase potrebbe avere accesso o spendere i tuoi bitcoin." +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "Sei osservato?" @@ -223,7 +239,7 @@ msgstr "Sei sicuro di voler eliminare questo portafoglio?" #: src/js/controllers/addressbookView.js:24 msgid "Are you sure you want to delete this contact?" -msgstr "" +msgstr "Sei sicuro di voler cancellare questo contatto?" #: src/js/controllers/preferencesDelete.js:26 msgid "Are you sure you want to delete this wallet?" @@ -243,7 +259,7 @@ msgstr "Sei sicuro di voler saltare?" #: www/views/modals/bitpay-card-confirmation.html:4 msgid "Are you sure you would like to log out of your BitPay Card account?" -msgstr "" +msgstr "Sei sicuro che vuoi uscire dal tuo account BitPay Card?" #: src/js/controllers/preferencesBitpayCard.js:7 #: src/js/controllers/preferencesBitpayServices.js:20 @@ -324,7 +340,7 @@ msgstr "Carte di BitPay Visa®" msgid "Bitcoin Address" msgstr "Indirizzo Bitcoin" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -359,7 +375,7 @@ msgid "Broadcast Payment" msgstr "Diffusione del Pagamento" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "Trasmesso" @@ -375,7 +391,7 @@ msgstr "Browser non supportato" msgid "Buy & Sell Bitcoin" msgstr "Comprare & Vendere Bitcoin" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "Acquista Bitcoin" @@ -387,8 +403,9 @@ msgstr "Comprare Bitcoin..." msgid "Calculating fee" msgstr "Calcolo commissione" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -399,7 +416,7 @@ msgstr "Annulla" #: www/views/copayers.html:37 msgid "Cancel invitation" -msgstr "" +msgstr "Annulla invito" #: src/js/controllers/onboarding/tour.js:52 msgid "Cannot Create Wallet" @@ -441,8 +458,7 @@ msgstr "Elimina" msgid "Clear cache" msgstr "Svuota la cache" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "Click" @@ -466,12 +482,13 @@ msgstr "Commit hash" msgid "Complete the backup process to use this option" msgstr "Completare il processo di backup per utilizzare questa opzione" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" -msgstr "" +msgstr "Completato" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -488,27 +505,19 @@ msgstr "Confirm & concludi" msgid "Confirm your PIN" msgstr "Conferma il tuo PIN" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "Conferma la tua nuova password di spesa" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "Conferme" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: www/views/modals/wallet-balance.html:61 msgid "Confirming" msgstr "Confermando" -#: 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 "Collegare la mia Carta BitPay" @@ -525,7 +534,7 @@ msgstr "Connessione a Glidera..." msgid "Connection reset by peer" msgstr "Connessione ripristinata dall'utente" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "Contatti" @@ -580,7 +589,7 @@ msgstr "Non può accedere al portafoglio sul server. Si prega di controllare:" msgid "Could not access wallet" msgstr "Impossibile accedere al portafoglio" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "Non puoi aggiungere un messaggio da importare nel portafoglio senza condividere la chiave criptata" @@ -592,10 +601,18 @@ msgstr "Impossibile trasmettere il pagamento" msgid "Could not build transaction" msgstr "Non è possibile generare la transazione" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "Impossibile creare un indirizzo" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "Non posso crearlo utilizzando la chiave privata estesa specificata" @@ -608,7 +625,7 @@ msgstr "Non è possibile creare usando questa chiave estesa pubblica" msgid "Could not create: Invalid wallet recovery phrase" msgstr "Impossibile creare: Frase di recupero portafoglio non valida" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "Impossibile decifrare il file, controlla la tua password" @@ -616,21 +633,25 @@ msgstr "Impossibile decifrare il file, controlla la tua password" msgid "Could not delete payment proposal" msgstr "Impossibile eliminare la proposta di pagamento" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "Impossibile avere commissioni dinamiche" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "Impossibile avere la commissione per il livello: {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "Non è possibile ottenere le transazioni" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "Impossibile importare" @@ -655,7 +676,7 @@ msgstr "Rimozione account non riuscita" msgid "Could not remove card" msgstr "Impossibile rimuovere la carta" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "Impossibile salvare le preferenze nel server" @@ -663,21 +684,21 @@ msgstr "Impossibile salvare le preferenze nel server" msgid "Could not send payment" msgstr "Impossibile inviare il pagamento" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "Impossibile aggiornare la cronologia delle transazioni" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "Impossibile aggiornare il portafoglio" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "Impossibile aggiornare i portafogli" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "Creare il portafoglio personale" @@ -687,8 +708,8 @@ msgid "Create Shared Wallet" msgstr "Creare portafoglio condiviso" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "Creare portafoglio bitcoin" @@ -735,7 +756,7 @@ msgstr "Data" msgid "Delete" msgstr "Elimina" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "Elimina Proposta di Pagamento" @@ -767,8 +788,12 @@ msgstr "Percorso derivato" msgid "Derivation Strategy" msgstr "Strategia di derivazione" +#: www/views/topup.html:45 +msgid "Details" +msgstr "" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "Disabilitato" @@ -786,7 +811,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "Non vedi la tua lingua su Crowdin? Contatta il proprietario su Crowdin! Ci piacerebbe supportare la lingua." #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "Download" @@ -794,13 +819,13 @@ msgstr "Download" 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 "Ogni portafoglio bitcoin è in grado di generare miliardi di indirizzi dal tuo backup di 12 parole. Un nuovo indirizzo verrà automaticamente generato e mostrato ogni volta che riceverai un pagamento." -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "Economia" #: www/views/onboarding/collectEmail.html:27 msgid "Edit" -msgstr "" +msgstr "Modifica" #: www/views/addressbook.add.html:29 #: www/views/addressbook.view.html:22 @@ -835,16 +860,16 @@ msgstr "Abilita la fotocamera per iniziare." msgid "Enter Amount" msgstr "Inserisci importo" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "Inserisci Password di spesa" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "Inserisci Due Fattori per il tuo account BitPay" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Inserisci la nuova password di spesa" @@ -856,7 +881,7 @@ msgstr "Inserire la frase di recupero (BIP39)" #: www/views/onboarding/collectEmail.html:13 msgid "Enter your email" -msgstr "" +msgstr "Inserisci la tua e-mail" #: www/views/backup.html:62 msgid "Enter your password" @@ -866,13 +891,12 @@ msgstr "Inserisci la tua password" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -889,30 +913,30 @@ msgstr "Inserisci la tua password" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -920,14 +944,18 @@ msgstr "Inserisci la tua password" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Errore" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "Errore di conferma" @@ -935,9 +963,17 @@ msgstr "Errore di conferma" msgid "Error creating wallet" msgstr "Errore creazione portafoglio" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" -msgstr "" +msgstr "Errore di accoppiamento BitPay Account" #: src/js/controllers/paperWallet.js:41 msgid "Error scanning funds:" @@ -955,14 +991,14 @@ msgstr "Errore durante l'aggiornamento delle carte di debito" msgid "Exceeded daily limit of $500 per user" msgstr "Superato il limite giornaliero di $500 per utente" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "Scaduta" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "Scadenza" @@ -979,7 +1015,7 @@ msgstr "Esporta in un file" msgid "Export wallet" msgstr "Esporta portafoglio" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "Per questo portafoglio non è supportata l'esportazione tramite QR" @@ -1005,14 +1041,14 @@ msgstr "Esportazione non riuscita" msgid "Family vacation funds" msgstr "Fondi vacanza di famiglia" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "Tassa" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" -msgstr "" +msgstr "Commissione:" #: src/js/controllers/feedback/send.js:23 msgid "Feedback could not be submitted. Please try again later." @@ -1048,6 +1084,7 @@ msgstr "Per finalità di controllo" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "Da" @@ -1056,6 +1093,10 @@ msgstr "Da" msgid "From BitPay account" msgstr "Dal conto BitPay" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "Dal dispositivo di destinazione, andare in Aggiungi portafoglio > Importare portafoglio e scansionare questo codice QR" @@ -1068,17 +1109,25 @@ msgstr "I fondi sono bloccati in attesa della proposta di pagamento" msgid "Funds found:" msgstr "Fondi trovati:" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "Fondi trasferiti" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "I fondi saranno trasferiti a" #: www/views/tab-receive.html:51 msgid "Generate new address" -msgstr "" +msgstr "Genera un nuovo indirizzo" #: src/js/services/onGoingProcess.js:22 msgid "Generating .csv file..." @@ -1109,20 +1158,20 @@ msgstr "Inizia aggiungendo il tuo primo." msgid "Getting fee levels..." msgstr "Ottenendo i livelli di commissione..." -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "Indietro" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "Indietro" @@ -1149,7 +1198,7 @@ msgstr "Portafoglio hardware" msgid "Help & Support" msgstr "Aiuto e Assistenza" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "Guida e informazioni di supporto tecnico sono disponibili sul sito web." @@ -1258,7 +1307,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca msgstr "Se esegui uno screenshot, il backup può essere visualizzato da altre applicazioni. Si può fare un backup sicuro con la carta fisica e una penna." #: www/views/tab-import-hardware.html:42 -#: www/views/tab-import-phrase.html:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "Importa" @@ -1284,7 +1333,7 @@ msgstr "Per verificare il backup del tuo portafoglio, inserire la password." #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "Incompleto" @@ -1297,31 +1346,36 @@ msgstr "Portafoglio incompleto" msgid "Incorrect PIN, try again." msgstr "PIN errato, riprovare." -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "Indirizzo della rete incorretto" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "Formato qrcode non corretto" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "Fondi insufficienti" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Fondi insufficienti per la commissione" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "Invalido" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "Numero di conto non valido" @@ -1334,8 +1388,8 @@ msgid "Invalid data" msgstr "Dati non validi" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "Percorso di derivazione non valido" @@ -1343,6 +1397,10 @@ msgstr "Percorso di derivazione non valido" msgid "Invitation to share a {{appName}} Wallet" msgstr "Invito a condividere un {{appName}} portafoglio" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "C'è qualcosa che potevamo fare meglio?" @@ -1393,16 +1451,10 @@ msgstr "Chiave già associata ad un portafoglio esistente" msgid "Language" msgstr "Lingua" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 msgid "Last Month" msgstr "Scorso Mese" -#: 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 "Verifichiamo la tua frase di backup." @@ -1442,6 +1494,10 @@ msgstr "Locktime in effetto. Si prega di attendere per rimuovere questa proposta #: www/views/modals/bitpay-card-confirmation.html:14 msgid "Log out" +msgstr "Esci" + +#: www/views/addresses.html:87 +msgid "Low amount inputs" msgstr "" #: www/views/includes/walletHistory.html:27 @@ -1469,14 +1525,14 @@ msgstr "Io" msgid "Meh - it's alright" msgstr "Beh - è tutto ok" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "Nota" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "Messaggio dal commerciante" @@ -1497,12 +1553,12 @@ msgstr "Chiavi private per la firma mancanti" msgid "More Options" msgstr "Altre Opzioni" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "Spostato" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "Fondi trasferiti" @@ -1525,6 +1581,10 @@ msgstr "Nome" msgid "Network" msgstr "Network" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "Errore di rete" @@ -1533,7 +1593,7 @@ msgstr "Errore di rete" msgid "New Proposal" msgstr "Nuova proposta" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "Il nuovo indirizzo non può essere generato. Si prega di riprovare." @@ -1573,7 +1633,11 @@ msgstr "Nessuna proposta in attesa" msgid "No recent transactions" msgstr "Nessuna transazione recente" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "Ancora nessuna transazione" @@ -1585,15 +1649,15 @@ msgstr "Nessun portafoglio trovato" msgid "No wallet selected" msgstr "Nessun portafoglio selezionato" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" -msgstr "Nessun portafoglio disponibile" +msgstr "" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" msgstr "Nessun portafoglo disponibile per ricevere i fondi" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "Normale" @@ -1601,7 +1665,7 @@ msgstr "Normale" msgid "Not authorized" msgstr "Non autorizzato" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "Non ci sono abbastanza fondi per la commissione" @@ -1633,11 +1697,11 @@ msgstr "Notifiche" #: www/views/onboarding/collectEmail.html:9 msgid "Notifications by email" -msgstr "" +msgstr "Notifiche via email" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" -msgstr "" +msgstr "Notificami se confermato" #: 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." @@ -1647,8 +1711,9 @@ msgstr "Ora è un buon momento per effettuare un backup del tuo portafoglio. Se msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "È il momento perfetto per valutare l'ambiente circostante. Finestre nelle vicinanze? Telecamere nascoste? Spie alle spalle?" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "Ok" @@ -1667,11 +1732,11 @@ msgstr "Dichiarazione di esclusione di responsabilità ufficiale in inglese" msgid "Oh no!" msgstr "Oh no!" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "In questa schermata puoi vedere tutti i portafogli, gli account e i beni." -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Apri" @@ -1688,8 +1753,8 @@ msgstr "Aprire Github" msgid "Open GitHub Project" msgstr "Aprire il progetto GitHub" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "Aprire Insight" @@ -1724,7 +1789,7 @@ msgstr "Ordinare la carta BitPay" msgid "Password" msgstr "Password" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "Password necessaria. Assicurarsi di immettere la password nelle impostazioni avanzate" @@ -1760,7 +1825,7 @@ msgstr "Proposta di Pagamento" msgid "Payment Proposal Created" msgstr "Proposta di Pagamento Creata" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "Proposte di Pagamento" @@ -1783,7 +1848,7 @@ msgstr "Pagamento Rifiutato" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Pagamento Inviato" @@ -1796,7 +1861,7 @@ msgstr "Pagamento accettato, ma non ancora inviata alla rete" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "Pagamento accettato. Esso sarà trasmesso attraverso la rete Glidera. Nel caso in cui ci fosse un problema, si potrà eliminarlo 6 ore dopo che è stato creato." -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "Dettagli pagamento" @@ -1804,10 +1869,6 @@ msgstr "Dettagli pagamento" msgid "Payment request" msgstr "Richiesta di pagamento" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "In Sospeso" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "Proposte in attesa" @@ -1828,12 +1889,12 @@ msgstr "Si prega di annotare accuratamente questa frase." msgid "Please connect a camera to get started." msgstr "Si prega di collegare una telecamera per iniziare." -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "Si prega di inserire la frase di recupero" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "Si prega di inserire la frase di recupero del portafoglio" @@ -1849,11 +1910,11 @@ msgstr "Si prega di toccare ogni parola nell'ordine corretto." msgid "Please upgrade Copay to perform this action" msgstr "Si prega di aggiornare Copay per eseguire questa azione" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "Per favore, selezione il tuo file di backup" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" msgstr "" @@ -1869,11 +1930,11 @@ msgstr "Preparazione indirizzi..." msgid "Preparing backup..." msgstr "Preparando il backup..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "Premi ancora per uscire" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "Priorità" @@ -1890,7 +1951,7 @@ msgid "Proposal Accepted" msgstr "Proposta accettata" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Proposta creata" @@ -1903,7 +1964,7 @@ msgstr "Proposta eliminata" msgid "Proposal Rejected" msgstr "Proposta respinta" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "Proposte" @@ -1924,7 +1985,7 @@ msgid "Quick review!" msgstr "Breve recensione!" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "Casuale" @@ -1950,16 +2011,16 @@ msgstr "Ricevi" msgid "Received" msgstr "Ricevuti" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "Fondi ricevuti" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "Ricezione" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "Recente" @@ -1969,12 +2030,12 @@ msgid "Recent Transaction Card" msgstr "Transazione recente della carta" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "Transazioni recenti" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "Destinatario" @@ -1996,7 +2057,7 @@ msgid "Recreating Wallet..." msgstr "Ricreando Portafoglio..." #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "Respinto" @@ -2010,7 +2071,7 @@ msgstr "Informazioni sul rilascio" #: www/views/addressbook.view.html:36 msgid "Remove" -msgstr "" +msgstr "Rimuovere" #: src/js/controllers/preferencesBitpayServices.js:7 msgid "Remove BitPay Account?" @@ -2072,7 +2133,6 @@ msgstr "Riprova con fotocamera" #: 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 @@ -2092,6 +2152,10 @@ msgstr "Scansiona il codici QR" msgid "Scan addresses for funds" msgstr "Scansione degli indirizzi per fondi" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "Per cortesia procedere alla scansione dell'impronta digitale" @@ -2108,7 +2172,7 @@ msgstr "Gli screenshot non sono sicuri" msgid "Search Transactions" msgstr "Cerca Transazioni" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "Cerca o inserisci indirizzo bitcoin" @@ -2166,7 +2230,7 @@ msgstr "Invia indirizzi via Email" msgid "Send by email" msgstr "Invia via email" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "Inviata Da" @@ -2201,17 +2265,18 @@ msgstr "Invio dell'importo massimo" msgid "Sending transaction" msgstr "Invio transazione" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "L'invio di {{amountStr}} dal tuo portafoglio {{name}}" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "Inviato" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "Inviare Fondi" @@ -2276,11 +2341,11 @@ msgstr "Visualizza indirizzo" msgid "Show advanced options" msgstr "Mostra opzioni avanzate" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "Visualizza indirizzo bitcoin" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "Mostra di più" @@ -2306,13 +2371,12 @@ msgstr "Singolo indirizzo di portafoglio" msgid "Skip" msgstr "Salta" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "Trascina" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "Specificare la frase di recupero..." @@ -2328,7 +2392,11 @@ msgstr "Proposta di pagamento non trovata" msgid "Spending Password needed" msgstr "Necessaria password di spesa" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "Iniziare a inviare bitcoin" @@ -2340,7 +2408,11 @@ msgstr "Avvio..." msgid "Startup Lock" msgstr "Blocco all'avvio" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "Super Economica" @@ -2386,7 +2458,7 @@ msgid "Terms of Use" msgstr "Termini di Utilizzo" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "Testnet" @@ -2445,7 +2517,7 @@ msgstr "I termini di servizio ufficiali in inglese sono disponibili sul sito web msgid "The password of the recovery phrase (if set)" msgstr "La password della frase recupero (se impostata)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "Il pagamento è stato creato ma è stato impossibile completarlo. Per favore prova di nuovo dalla schermata iniziale" @@ -2488,13 +2560,13 @@ msgstr "L'URL del servizio di portafoglio" msgid "There are no wallets to make this payment" msgstr "Non ci sono portafogli per effettuare questo pagamento" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "C'è una nuova versione di {{appName}} disponibile" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "C'è un errore nel form" @@ -2511,7 +2583,7 @@ msgstr "Questa applicazione è fantastica!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "Questa app memorizza i tuoi bitcoin con sicurezza all'avanguardia." -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "Questa richiesta di pagamento in bitcoin è scaduta." @@ -2525,6 +2597,10 @@ msgstr "Questa password non può essere recuperata. Se si dimentica la password, msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "Questa frase di recupero è stata creata con una password. Per recuperare questo portafoglio sono necessari sia la frase di recupero e che la password." +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "" + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "Questa operazione potrebbe richiedere molto tempo per essere confermata o potrebbe essere abbandonata a causa delle commissioni basse impostate dal mittente" @@ -2534,33 +2610,46 @@ msgstr "Questa operazione potrebbe richiedere molto tempo per essere confermata msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "Questo portafoglio non è registrato al Bitcore Wallet Service (BWS). Puoi ricrearlo dalle informazioni locali." -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "Cronologia" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "A" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Per iniziare, acquista bitcoin o condividi il tuo indirizzo. È possibile ricevere bitcoin da qualsiasi servizio o portafoglio." -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Per iniziare, è necessario che tu crei un portafoglio bitcoin e ottenerne qualcuno." +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "" + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "Totale" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "Totale Importo Bloccato" @@ -2568,6 +2657,10 @@ msgstr "Totale Importo Bloccato" msgid "Total number of copayers" msgstr "Numero totale di copayer" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2590,20 +2683,28 @@ msgstr "Transazione già trasmessa" msgid "Transaction created" msgstr "Transazione creata" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "Transazione non disponibile in questo momento" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "Transazione non trovata" #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" -msgstr "" +msgstr "Trasferisci a" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "Trasferire su portafoglio" @@ -2623,7 +2724,7 @@ msgstr "Digitare la Frase di Recupero (tipicamente 12 parole)" msgid "Uh oh..." msgstr "Oh oh..." -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "Non confermato" @@ -2631,7 +2732,7 @@ msgstr "Non confermato" msgid "Unit" msgstr "Unità" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "Transazioni non inviate" @@ -2643,7 +2744,7 @@ msgstr "Indirizzi non utilizzati" msgid "Unused Addresses Limit" msgstr "Limite di indirizzi non utilizzati" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "Aggiornamento Disponibile" @@ -2651,7 +2752,7 @@ msgstr "Aggiornamento Disponibile" msgid "Updating pending proposals. Please stand by" msgstr "Aggiornamento in attesa di proposte. Si prega di attendere" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "Aggiornamento cronologia delle transazioni. Siete pregati di attendere." @@ -2659,7 +2760,7 @@ msgstr "Aggiornamento cronologia delle transazioni. Siete pregati di attendere." msgid "Updating... Please stand by" msgstr "In aggiornamento... Attendere" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "Urgente" @@ -2671,6 +2772,10 @@ msgstr "Usa i fondi non confermati" msgid "Validating recovery phrase..." msgstr "Validazione della frase di recupero..." +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2688,20 +2793,20 @@ msgstr "Mostra tutti gli indirizzi" msgid "View Terms of Service" msgstr "Visualizza i termini di servizio" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "Visualizzazione della transazione su Insight" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "Visualizza aggiornamenti" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "Mostra su blockchain" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "ATTENZIONE: La derivazione della chiave non funziona su questo dispositivo/portafoglio. Le operazioni non possono essere eseguite su questo portafoglio." @@ -2759,6 +2864,10 @@ msgstr "Id portafoglio" msgid "Wallet Information" msgstr "Informazioni sul portafoglio" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "Invito Portafoglio" @@ -2792,7 +2901,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "Frase di recupero del portafoglio non è valida" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "URL del servizio di portafoglio" @@ -2801,6 +2910,7 @@ msgid "Wallet Settings" msgstr "Impostazioni del portafoglio" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "Tipo di portafoglio" @@ -2850,7 +2960,7 @@ msgstr "Portafoglio senza backup" msgid "Wallet not found" msgstr "Portafoglio non trovato" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "Portafoglio non registrato" @@ -2866,7 +2976,7 @@ msgstr "Frase di recupero del portafoglio non disponibile." msgid "Wallet service not found" msgstr "Wallet service non trovato" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "Portafogli" @@ -2935,7 +3045,7 @@ msgstr "Sareste disposti a votare {{appName}} sull'app store?" msgid "Would you like to receive push notifications about payments?" msgstr "Vorresti ricevere le notifiche push sui pagamenti?" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "Numero errato delle parole di recupero:" @@ -2985,21 +3095,21 @@ msgstr "Controlli i tuoi bitcoin." #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." -msgstr "" +msgstr "Sarà necessario accedere nuovamente per riempire la vostra carta BitPay." #: www/views/preferencesNotifications.html:28 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "Riceverai notifiche e-mail per i pagamenti inviati e ricevuti dai tuoi portafogli." #: 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." +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." msgstr "" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "Il tuo portafoglio bitcoin ha eseguito il backup!" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "Il tuo portafoglio bitcoin è pronto!" @@ -3024,13 +3134,13 @@ msgstr "La tua password" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "Il tuo portafoglio non viene mai salvato in archiviazione cloud o nel normale backup del dispositivo." -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "La chiave del tuo portafoglio verrà cifrata. La Password Per Spendere non può essere recuperata. Assicurati di scrivertela." #: www/views/includes/walletSelector.html:23 #: www/views/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3057,17 +3167,17 @@ msgstr "nome@esempio.com" msgid "preparing..." msgstr "preparazione..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "per accettare" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "a pagare" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "per inviare" @@ -3075,11 +3185,15 @@ msgstr "per inviare" 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 "{{appName}} dipende dal servizio portafoglio di Bitcore (BWS) per informazioni blockchain, networking e sincronizzazione di Copayer. La configurazione predefinita fa riferimento a https://bws.bitpay.com (istanza di BitPay BWS pubblica)." -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} verranno detratti come commissione per il network." -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} transazioni scaricate" diff --git a/i18n/po/ja.po b/i18n/po/ja.po index 4d4f8bc04..dfa3a42ba 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -11,28 +11,28 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Japanese\n" "Language: ja\n" -"PO-Revision-Date: 2017-06-06 10:18-0400\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 "" +"PO-Revision-Date: 2017-06-29 07:15-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "(信頼済み)" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "(二重払い可能性あり)" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* 送金の提案の取下げは①他のウォレット参加者に署名されていなかった場合、提案者に提案を取り下げることができます。②提案の起案から24時間が経っても解決しなかった場合、全員に取り下げることができます。" -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" -msgstr "" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "- {{btx.feeRateStr}}のレート" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" +msgstr "- {{tx.feeRateStr}}のレート" #: 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!" @@ -43,11 +43,11 @@ msgstr "5つ星の評価をいただけると、もっとたくさんの人に msgid "A member of the team will review your feedback as soon as possible." msgstr "ただちに開発メンバーでいただいた評価を拝読し参考にさせていただきます。" -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "注意：合計{{amountAboveMaxSizeStr}} を除外しました。取引に許可される最大サイズを超えました" -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "注意：合計 {{amountBelowFeeStr}} を除外しました。これらのビットコインは手数料よりも低い額となるため除外しました。" @@ -57,7 +57,7 @@ msgid "About" msgstr "このアプリについて" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "承諾済" @@ -76,15 +76,15 @@ msgstr "ポケット番号" msgid "Accounts" msgstr "アカウント一覧" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "履歴" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "アカウントを追加" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "BitPay アカウントを追加しますか？" @@ -97,7 +97,7 @@ msgstr "連絡先を追加" msgid "Add Funds" msgstr "資金を追加" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "メモを追加" @@ -117,10 +117,18 @@ msgstr "アカウントを追加" msgid "Add an optional password to secure the recovery phrase" msgstr "フレーズを守るために任意のパスワードをかけて下さい" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "詳細を追加" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "このBitPayアカウント ({{email}}) を追加しますか？" + #: www/views/add.html:3 msgid "Add wallet" msgstr "ウォレットを追加" @@ -153,7 +161,7 @@ msgstr "上級者向け" msgid "Advanced Settings" msgstr "詳細の設定" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "すべて" @@ -197,11 +205,15 @@ msgstr "金額" msgid "Amount below minimum allowed" msgstr "送金可能最少額を下回っています" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "金額が大きすぎます" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "小さすぎて送れない額" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "このアプリのアップデートがあります。セキュリティーを保持するために最新版にアップデートして下さい。" @@ -209,6 +221,10 @@ msgstr "このアプリのアップデートがあります。セキュリティ msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "復元フレーズを知る者はあなたのビットコインが勝手に送れてしまいます。" +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "ウォレットの残高を送るために推測される必要なビットコインネットワーク手数料(優先度：普通)" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "見られていませんか？" @@ -224,7 +240,7 @@ msgstr "本当にこのウォレットをキャンセルし、削除しても\n" #: src/js/controllers/addressbookView.js:24 msgid "Are you sure you want to delete this contact?" -msgstr "" +msgstr "本当にこの連絡先を削除しますか？" #: src/js/controllers/preferencesDelete.js:26 msgid "Are you sure you want to delete this wallet?" @@ -245,7 +261,7 @@ 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 "" +msgstr "BitPayカードアカウントからログアウトしてもよろしいですか?" #: src/js/controllers/preferencesBitpayCard.js:7 #: src/js/controllers/preferencesBitpayServices.js:20 @@ -326,7 +342,7 @@ msgstr "BitPayのVISA® カード" msgid "Bitcoin Address" msgstr "ビットコインアドレス" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -361,7 +377,7 @@ msgid "Broadcast Payment" msgstr "取引送信" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "送信済み" @@ -377,7 +393,7 @@ msgstr "ブラウザ未対応" msgid "Buy & Sell Bitcoin" msgstr "ビットコインの購入&売却" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "ビットコインを購入" @@ -389,8 +405,9 @@ msgstr "ビットコインを購入中..." msgid "Calculating fee" msgstr "手数料計算中..." -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -401,7 +418,7 @@ msgstr "キャンセル" #: www/views/copayers.html:37 msgid "Cancel invitation" -msgstr "" +msgstr "招待状のキャンセル" #: src/js/controllers/onboarding/tour.js:52 msgid "Cannot Create Wallet" @@ -443,8 +460,7 @@ msgstr "やり直し" msgid "Clear cache" msgstr "キャッシュを消去" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "クリックして" @@ -468,12 +484,13 @@ msgstr "コミットのハッシュ値" msgid "Complete the backup process to use this option" msgstr "この機能をご利用いただくにはバックアップを行う必要があります" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" -msgstr "" +msgstr "完了" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -490,27 +507,19 @@ msgstr "承諾して終了する" msgid "Confirm your PIN" msgstr "確認のためPINを再入力してください" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "新しい送金時パスワードを確認してください" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "承認回数" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: 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 "BitPay カードを接続" @@ -527,7 +536,7 @@ msgstr "Glidera に接続中…" msgid "Connection reset by peer" msgstr "接続がピアによってリセットされました" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "連絡先" @@ -582,7 +591,7 @@ msgstr "サーバーにてウォレットの確認ができませんでした。 msgid "Could not access wallet" msgstr "ウォレットにアクセスできませんでした。" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "共有キー無しでインポートされたウォレットへのメッセージの追加ができません" @@ -594,10 +603,18 @@ msgstr "送金を配信できませんでした。" msgid "Could not build transaction" msgstr "取引を作成できませんでした。" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "アドレスを生成できませんでした。" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "請求を作成できませんでした" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "取引を作成できませんでした。" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "指定された拡張秘密鍵で作成できませんでした。" @@ -610,7 +627,7 @@ msgstr "指定された拡張公開鍵で作成できませんでした。" msgid "Could not create: Invalid wallet recovery phrase" msgstr "作成できません：ウォレットの復元フレーズが不正です。" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "複合化できませんでした。パスワードが正しいかご確認下さい。" @@ -618,21 +635,25 @@ msgstr "複合化できませんでした。パスワードが正しいかご確 msgid "Could not delete payment proposal" msgstr "送金の提案を削除できませんでした" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "手数料の金額を取得できませんでした。" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "次の手数料レートを取得できませんでした: {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "請求の取得ができませんでした" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "取引を取得できませんでした。" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "インポートできませんでした。" @@ -657,7 +678,7 @@ msgstr "アカウントを削除できませんでした。" msgid "Could not remove card" msgstr "カードを削除できませんでした。" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "設定をサーバーと同期できませんでした。" @@ -665,21 +686,21 @@ msgstr "設定をサーバーと同期できませんでした。" msgid "Could not send payment" msgstr "送金できませんでした。" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "取引が送れませんでした" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "取引履歴を更新できませんでした。" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "ウォレットが更新できませんでした。" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "ウォレットが更新できませんでした。" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "個人用ウォレットを作成" @@ -689,8 +710,8 @@ msgid "Create Shared Wallet" msgstr "共有ウォレットを作成" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "ビットコインウォレット作成" @@ -737,7 +758,7 @@ msgstr "日付" msgid "Delete" msgstr "削除する" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "送金の提案を削除" @@ -769,8 +790,12 @@ msgstr "派生パス" msgid "Derivation Strategy" msgstr "派生パス" +#: www/views/topup.html:45 +msgid "Details" +msgstr "" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "無効" @@ -788,7 +813,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "ご自分の言語はCrowdinで見当たりませんか？Crowdinの管理者に連絡とってみてください。是非とも対応したく思っております。" #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "ダウンロード" @@ -796,13 +821,13 @@ msgstr "ダウンロード" 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 "12個の単語から無限大のアドレスを生成することができ、それをビットコインウォレットと呼びます。送金を受け取る度に新しいアドレスを生成して受取画面でお見せします。" -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "節約" #: www/views/onboarding/collectEmail.html:27 msgid "Edit" -msgstr "" +msgstr "編集" #: www/views/addressbook.add.html:29 #: www/views/addressbook.view.html:22 @@ -837,16 +862,16 @@ msgstr "始めるためにカメラを有効にして下さい。" msgid "Enter Amount" msgstr "金額を入力" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "送金時のパスワード入力して下さい。" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "BitPay アカウントの2段階認証コードを入力して下さい" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "新しい送金時パスワードを入力してください" @@ -858,7 +883,7 @@ msgstr "復元フレーズの単語をご入力下さい。" #: www/views/onboarding/collectEmail.html:13 msgid "Enter your email" -msgstr "" +msgstr "メールアドレスを入力してください" #: www/views/backup.html:62 msgid "Enter your password" @@ -868,13 +893,12 @@ msgstr "パスワードを入力して下さい。" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -891,30 +915,30 @@ msgstr "パスワードを入力して下さい。" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -922,14 +946,18 @@ msgstr "パスワードを入力して下さい。" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "エラー" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "確認のエラー" @@ -937,9 +965,17 @@ msgstr "確認のエラー" msgid "Error creating wallet" msgstr "ウォレット作成時にエラー" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "全額送金データ取得時にエラー" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "支払い検証のエラー" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" -msgstr "" +msgstr "Bitpayアカウントを接続中にエラー" #: src/js/controllers/paperWallet.js:41 msgid "Error scanning funds:" @@ -957,14 +993,14 @@ msgstr "デビットカードの更新エラー" msgid "Exceeded daily limit of $500 per user" msgstr "ユーザーの1日当たりの制限 500 米ドルを超えました" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "期限切れ" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "有効期限：" @@ -981,7 +1017,7 @@ msgstr "ファイルへのエクスポート" msgid "Export wallet" msgstr "ウォレットをエクスポート" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "このウォレットはQRによるエクスポートに対応していません" @@ -1007,14 +1043,14 @@ msgstr "エクスポートに失敗しました。" msgid "Family vacation funds" msgstr "家族旅行貯金" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "手数料" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" -msgstr "" +msgstr "手数料:" #: src/js/controllers/feedback/send.js:23 msgid "Feedback could not be submitted. Please try again later." @@ -1050,6 +1086,7 @@ msgstr "監査用機能" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "送信者" @@ -1058,6 +1095,10 @@ msgstr "送信者" msgid "From BitPay account" msgstr " BitPayアカウントから" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "ハードウェアウォレットから" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "移行先の端末では、ウォレットを追加から、ウォレットをインポートの画面でQRをスキャンして下さい。" @@ -1070,17 +1111,25 @@ msgstr "協議中の送金の提案により、資金がロックされていま msgid "Funds found:" msgstr "残高がありました:" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "入金されました" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "デビットカードへ入金されました" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "送金先" #: www/views/tab-receive.html:51 msgid "Generate new address" -msgstr "" +msgstr "新規アドレスを生成" #: src/js/services/onGoingProcess.js:22 msgid "Generating .csv file..." @@ -1111,20 +1160,20 @@ msgstr "初めての連絡先を追加しましょう。" msgid "Getting fee levels..." msgstr "手数料レベルを取得しています…" -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "戻る" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "戻る" @@ -1151,7 +1200,7 @@ msgstr "ハードウェアウォレット" msgid "Help & Support" msgstr "ヘルプ＆サポート" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "サポートに関する情報はウェブサイトに掲載しております。" @@ -1260,7 +1309,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:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "インポート" @@ -1286,7 +1335,7 @@ msgstr "ウォレットのバックアップを確認するためには、復元 #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "未完成" @@ -1299,31 +1348,36 @@ msgstr "未完成のウォレット" msgid "Incorrect PIN, try again." msgstr "PINが間違っています。もう一度やり直して下さい。" -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "アドレスのネットワークが不正です。" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "コードの形式が異なります" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "サーバーのアドレスが不正です" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "残高不足" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "手数料付けるには残高が足りません" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "無効" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "無効なURL" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "無効なポケット番号です。" @@ -1336,8 +1390,8 @@ msgid "Invalid data" msgstr "無効のデータ" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "無効な派生パス" @@ -1345,6 +1399,10 @@ msgstr "無効な派生パス" msgid "Invitation to share a {{appName}} Wallet" msgstr "{{appName}} 共有ウォレットへの招待" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "もっと頑張って欲しいところはありますか？" @@ -1395,16 +1453,10 @@ msgstr "この鍵は既存のウォレットにて登録されています" msgid "Language" msgstr "言語設定" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 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 "復元フレーズを確認しましょう。" @@ -1444,7 +1496,11 @@ msgstr "Locktime待ち中です。この送金の提案が削除できるまで #: www/views/modals/bitpay-card-confirmation.html:14 msgid "Log out" -msgstr "" +msgstr "ログアウト" + +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "少額の入力" #: www/views/includes/walletHistory.html:27 msgid "Low fees" @@ -1471,14 +1527,14 @@ msgstr "自分" msgid "Meh - it's alright" msgstr "まあまあです" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "メモ" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "お店からのメッセージ：" @@ -1499,12 +1555,12 @@ msgstr "署名するための秘密鍵がありません。" msgid "More Options" msgstr "その他オプション" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "移動済" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "資金を移動済み" @@ -1527,6 +1583,10 @@ msgstr "名前" msgid "Network" msgstr "ネットワーク" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "ネットワークにエラーが発生した" @@ -1535,7 +1595,7 @@ msgstr "ネットワークにエラーが発生した" msgid "New Proposal" msgstr "新しい提案" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "アドレスを生成できませんでした。もう一度やり直してください。" @@ -1575,7 +1635,11 @@ msgstr "保留中の提案はありません" msgid "No recent transactions" msgstr "最近の取引がありません" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "提案に署名できない：秘密鍵がありません" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "取引がありません" @@ -1587,15 +1651,15 @@ msgstr "ウォレットが見つかりません" msgid "No wallet selected" msgstr "ウォレットが選択されていません" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" -msgstr "利用可能なウォレットがありません" +msgstr "" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" msgstr "ペーパーウォレットの出金を受け取るためのウォレットが入っていません。" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "通常" @@ -1603,7 +1667,7 @@ msgstr "通常" msgid "Not authorized" msgstr "権限がありません。" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "手数料含めたら残高が不足しています。" @@ -1635,11 +1699,11 @@ msgstr "通知設定" #: www/views/onboarding/collectEmail.html:9 msgid "Notifications by email" -msgstr "" +msgstr "メール通知" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" -msgstr "" +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." @@ -1649,8 +1713,9 @@ msgstr "お金を受け取る前に、このウォレットのバックアップ msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "今一度周りの環境をよく見てみましょう。隠しカメラ、窓、覗いてくる人などありませんか？" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "OK" @@ -1669,11 +1734,11 @@ msgstr "公式免責事項 (英語)" msgid "Oh no!" msgstr "おっと!" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "この画面では、全てのウォレット、アカウント、資産が閲覧できます。" -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "開く" @@ -1690,8 +1755,8 @@ msgstr "GitHubを開く" msgid "Open GitHub Project" msgstr "GitHub のプロジェクトを開く" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "Insightを開く" @@ -1726,7 +1791,7 @@ msgstr "BitPay カードを申し込み" msgid "Password" msgstr "パスワード" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "パスワードが必要です。上級者向け設定にてパスワードを入力してください。" @@ -1762,7 +1827,7 @@ msgstr "送金の提案" msgid "Payment Proposal Created" msgstr "送金の提案が作成されました" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "送金の提案" @@ -1785,7 +1850,7 @@ msgstr "送金が却下されました" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "送金が完了しました" @@ -1798,7 +1863,7 @@ msgstr "取引が承認されましたが、まだ送信していません。" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "取引が承認されました。Glideraより送信されます。問題があった場合、送金命令を出す６時間以内に取り消すことができます。" -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "支払いの詳細" @@ -1806,10 +1871,6 @@ msgstr "支払いの詳細" msgid "Payment request" msgstr "支払い請求" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "未決" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "保留中の提案" @@ -1830,12 +1891,12 @@ msgstr "丁寧に復元フレーズを紙に書き留めて下さい" msgid "Please connect a camera to get started." msgstr "始めるためにカメラを接続して下さい。" -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "復元フレーズをご入力下さい" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "復元フレーズをご入力下さい" @@ -1851,13 +1912,13 @@ msgstr "正しい順序で各単語をタップしてください。" msgid "Please upgrade Copay to perform this action" msgstr "この操作を実行するにはCopayを最新バージョンに更新してください" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "バックアップファイルを選択" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" -msgstr "" +msgstr "承認前の保留" #: www/views/tab-settings.html:40 msgid "Preferences" @@ -1871,11 +1932,11 @@ msgstr "アドレスを処理中…" msgid "Preparing backup..." msgstr "バックアップを準備中..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "もう一度押して終了" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "優先" @@ -1892,7 +1953,7 @@ msgid "Proposal Accepted" msgstr "提案が承諾されました" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "提案が作成されました" @@ -1905,7 +1966,7 @@ msgstr "提案が削除されました" msgid "Proposal Rejected" msgstr "提案が却下されました" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "提案" @@ -1926,7 +1987,7 @@ msgid "Quick review!" msgstr "おさらい！" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "乱数" @@ -1952,16 +2013,16 @@ msgstr "受取" msgid "Received" msgstr "受取済み" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "受領した資金" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "受け取り中" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "履歴" @@ -1971,12 +2032,12 @@ msgid "Recent Transaction Card" msgstr "最近の取引カード" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "最近の取引" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "受取人" @@ -1998,7 +2059,7 @@ msgid "Recreating Wallet..." msgstr "ウォレットを再作成中…" #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "却下済み" @@ -2012,7 +2073,7 @@ msgstr "リリース情報" #: www/views/addressbook.view.html:36 msgid "Remove" -msgstr "" +msgstr "削除" #: src/js/controllers/preferencesBitpayServices.js:7 msgid "Remove BitPay Account?" @@ -2074,7 +2135,6 @@ 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 @@ -2094,6 +2154,10 @@ msgstr "QRコードを読み取る" msgid "Scan addresses for funds" msgstr "アドレスの残高照会" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "もう一度スキャンし直してください。" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "指紋をスキャンしてください" @@ -2110,7 +2174,7 @@ msgstr "画面写真を撮ってしまうと危険です！" msgid "Search Transactions" msgstr "取引を検索" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "連絡先検索かビットコインアドレスを指定" @@ -2168,7 +2232,7 @@ msgstr "ビットコインアドレスをメールにて共有" msgid "Send by email" msgstr "メールで送信" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "ここから送金" @@ -2203,17 +2267,18 @@ msgstr "全残高を送金" msgid "Sending transaction" msgstr "取引送信中" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "ウォレット {{name}} から {{amountStr}} の送金を行います。" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "送金済み" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "資金を送金済み" @@ -2280,11 +2345,11 @@ msgstr "アドレスを表示" msgid "Show advanced options" msgstr "詳細設定を表示" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "ビットコインアドレスを表示" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "すべて表示" @@ -2310,13 +2375,12 @@ msgstr "単一アドレスウォレット" msgid "Skip" msgstr "スキップ" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "スライドして" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "復元フレーズを指定…" @@ -2332,7 +2396,11 @@ msgstr "送金の提案が見つかりませんでした。" msgid "Spending Password needed" msgstr "パスワードが必要" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "この入力の組み合わせを送金するために膨大なビットコインネットワーク手数料を必要とします" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "ビットコインの送金を始めましょう" @@ -2344,7 +2412,11 @@ msgstr "開始中..." msgid "Startup Lock" msgstr "起動ロック" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "成功" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "超節約" @@ -2390,7 +2462,7 @@ msgid "Terms of Use" msgstr "利用規約" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "テスト用ネットワーク" @@ -2449,7 +2521,7 @@ msgstr "英語公式の規約は BitPay のウェブサイトにてご覧いた msgid "The password of the recovery phrase (if set)" msgstr "復元フレーズ用のパスワード(設定してある場合のみ)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "送金の提案は作成されましたが完了できませんでした。ホーム画面からやり直して下さい。" @@ -2494,13 +2566,13 @@ msgstr "ウォレットサービスのURL" msgid "There are no wallets to make this payment" msgstr "送金可能なウォレットがありません" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "{{appName}} の新しいバージョンがあります。" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "フォームにエラーがありました" @@ -2517,7 +2589,7 @@ msgstr "このアプリは素晴らしいです!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "このアプリは、最先端のセキュリティであなたのビットコインをお守りします。" -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "ビットコインペイメントの請求期限が切れています。" @@ -2531,6 +2603,10 @@ msgstr "このパスワードは復元できません。リセットすること msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "この復元フレーズにパスワードがかかっています。このウォレットを復元するためには、復元フレーズに加え、パスワードも必要です。" +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "この取引の金額はビットコインネットワーク手数料より低いです。送金額より大きい手数料を払ってしまうことになります。" + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "この取引は承認されるまで非常に時間のかかる可能性があります。承認されずにネットワークに捨てられてしまう危険性もありますので、承認されるまでお待ちいただくことを強くおすすめします。" @@ -2540,33 +2616,46 @@ msgstr "この取引は承認されるまで非常に時間のかかる可能性 msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "現在設定中のBitcore Wallet Service (BWS) サーバーにて、このウォレットの登録がありません。再登録を行うこともできます。" -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "履歴" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "宛先" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "はじめるには、ビットコインを購入したり、アドレスを他の人に共有したりしましょう。どのビットコインウォレットやサービスから受け取れます。" -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "はじめに、ビットコインウォレットを作成し、ビットコインを入手する必要があります。" +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "{{reason}}：その前にBitPayアカウントを追加する必要があります - {{email}}" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "残高補充処理中..." + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "デビットカード ({{cardLastNumber}}) に {{amountStr}} の入金を行う" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "合計" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "ロック中の残高" @@ -2574,6 +2663,10 @@ msgstr "ロック中の残高" msgid "Total number of copayers" msgstr "参加人数を選択して下さい。" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "合計ウォレット入力" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2596,20 +2689,28 @@ msgstr "取引は既に配信されました。" msgid "Transaction created" msgstr "取引情報を作成しました" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "取引が開始されました" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "現在この取引はご覧いただけません。" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "取引は見つかりません" #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" -msgstr "" +msgstr "移動先" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "ウォレットに移動" @@ -2629,7 +2730,7 @@ msgstr "復元フレーズの単語 (通常 12 個) を入力して下さい。" msgid "Uh oh..." msgstr "あら…" -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "未承認" @@ -2637,7 +2738,7 @@ msgstr "未承認" msgid "Unit" msgstr "単位" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "未送信取引" @@ -2649,7 +2750,7 @@ msgstr "未使用アドレス" msgid "Unused Addresses Limit" msgstr "未使用アドレス生成上限" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "利用可能なアップデートあり" @@ -2657,7 +2758,7 @@ msgstr "利用可能なアップデートあり" msgid "Updating pending proposals. Please stand by" msgstr "協議中の送金提案を更新します。しばらくお待ちください。" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "取引履歴を更新します。しばらくお待ちください。" @@ -2665,7 +2766,7 @@ msgstr "取引履歴を更新します。しばらくお待ちください。" msgid "Updating... Please stand by" msgstr "更新中... お待ち下さい" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "緊急" @@ -2677,6 +2778,10 @@ msgstr "未承認ビットコインを使用" msgid "Validating recovery phrase..." msgstr "復元フレーズを検証中…" +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "認証を行って下さい" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2694,20 +2799,20 @@ msgstr "全アドレスを表示" msgid "View Terms of Service" msgstr "サービス利用規約を表示" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "Insightにて取引を表示" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "更新情報を表示" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "ブロックチェーンで詳細を閲覧" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "注意：このデバイスでは鍵の派生がちゃんと動いておりません。このウォレットは正常に動作しません。" @@ -2765,6 +2870,10 @@ msgstr "ウォレットID" msgid "Wallet Information" msgstr "ウォレット詳細" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "ウォレットの入力" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "ウォレット招待" @@ -2798,7 +2907,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "ウォレットシードが不正です。" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "ウォレットサービスのURL" @@ -2807,6 +2916,7 @@ msgid "Wallet Settings" msgstr "ウォレットの設定" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "ウォレットタイプ" @@ -2856,7 +2966,7 @@ msgstr "ウォレットがバックアップされていません" msgid "Wallet not found" msgstr "ウォレットが見つかりません。" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "ウォレットが未登録" @@ -2872,7 +2982,7 @@ msgstr "ウォレットの復元フレーズが削除されているため表示 msgid "Wallet service not found" msgstr "Wallet serviceが見つかりません。" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "ウォレット" @@ -2941,7 +3051,7 @@ msgstr "アプリケーションストアにレビューを書いてみません msgid "Would you like to receive push notifications about payments?" msgstr "送金発生時にプッシュ通知を受け取りますか?" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "単語の数が間違っています：" @@ -2991,21 +3101,21 @@ msgstr "ビットコインの自己管理" #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." -msgstr "" +msgstr "BitPayカードに入金するためにログインする必要があります。" #: 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 "" +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." +msgstr "BitPayカードの準備が整いました。入金して全世界のお店やATMでご利用下さい。" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "ビットコインウォレットがバックアップされました!" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "ビットコインウォレットが完成しました!" @@ -3030,13 +3140,13 @@ msgstr "パスワード" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "ウォレットは一度もクラウドへ保存されたりすることはありませんし、携帯電話などに付いている標準バックアップ機能ではバックアップされません！！！！" -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "ウォレットの鍵が暗号化されます。Copayでは送金時のパスワードをリセットしてくれる機能がありませんので、パスワードを忘れないよう、控えておいて下さい。" #: www/views/includes/walletSelector.html:23 #: www/views/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3063,17 +3173,17 @@ msgstr "name@example.com" msgid "preparing..." msgstr "準備中..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "承諾する" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "支払う" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "送金する" @@ -3081,11 +3191,15 @@ 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 "{{appName}}はブロックチェーンの情報を取得したり参加者を同期させたりするためにBitcore Wallet Service (BWS)に依存します。初期値としてBitPay社が提供する https://bws.bitpay.com (BitPay公式のBWSサーバー)を設定していますが、独自で運用してウォレットをそちらに接続しても構いません。" -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} のビットコインネットワーク手数料が差し引かれます。" -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "送金額に対する {{tx.txp[wallet.id].feeRatePerStr}}" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} 個の取引ダウンロード済み" diff --git a/i18n/po/pl.po b/i18n/po/pl.po index a4074958d..be0328bf7 100644 --- a/i18n/po/pl.po +++ b/i18n/po/pl.po @@ -11,27 +11,27 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Polish\n" "Language: pl\n" -"PO-Revision-Date: 2017-06-06 10:18-0400\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 "" +"PO-Revision-Date: 2017-06-29 07:15-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "(Zaufany)" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "(możliwa podwójna wypłata)" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* Wniosek wypłaty może być usunięty jeśli: 1) Po utworzeniu nie zatwierdził go żaden inny współwłaściciel portfela lub 2) minęły 24 godziny od kiedy wniosek został utworzony." -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" msgstr "" #: www/views/feedback/rateApp.html:7 @@ -43,11 +43,11 @@ msgstr "5-gwiazdkowa ocena pozwoli na wzrost popularności {{appName}}, a więks msgid "A member of the team will review your feedback as soon as possible." msgstr "Członek zespołu zweryfikuje twoją opinię tak szybko, jak to możliwe." -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "Uwaga: łącznie kwota {{amountAboveMaxSizeStr}} została wyłączona. Został przekroczony maksymalny rozmiar dozwolony dla transakcji." -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "Uwaga: łącznie kwota {{amountBelowFeeStr}} została wyłączona. Środki te pochodzą z UTXOs mniejszych niż gwarantowana prowizja sieci." @@ -57,7 +57,7 @@ msgid "About" msgstr "O programie" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "Zatwierdzono" @@ -76,15 +76,15 @@ msgstr "Numer konta" msgid "Accounts" msgstr "Konta" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "Transakcje" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "Dodaj konto" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "Dodać konto BitPay?" @@ -97,7 +97,7 @@ msgstr "Dodaj kontakt" msgid "Add Funds" msgstr "Dodaj środki" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "Dodaj notatkę" @@ -117,10 +117,18 @@ msgstr "Dodaj konto" msgid "Add an optional password to secure the recovery phrase" msgstr "Dodaj opcjonalnie hasło w celu zabezpieczenia kluczowej frazy" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "Dodaj opis" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "" + #: www/views/add.html:3 msgid "Add wallet" msgstr "Dodaj portfel" @@ -153,7 +161,7 @@ msgstr "Zaawansowane" msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "Wszystko" @@ -197,11 +205,15 @@ msgstr "Kwota" msgid "Amount below minimum allowed" msgstr "Kwota poniżej minimum dozwolona" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "Zbyt duża kwota" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "Dostępna jest aktualizacja aplikacji. Ze względów bezpieczeństwa należy zaktualizować do najnowszej wersji." @@ -209,6 +221,10 @@ msgstr "Dostępna jest aktualizacja aplikacji. Ze względów bezpieczeństwa nal msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "Każdy, kto ma Twoją kluczową frazę może uzyskać dostęp lub wydać Twoje bitcoiny." +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "Czy jesteś obserwowany?" @@ -324,7 +340,7 @@ msgstr "Karty BitPay Visa®" msgid "Bitcoin Address" msgstr "Adres bitcoin" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -359,7 +375,7 @@ msgid "Broadcast Payment" msgstr "Przekaż płatność" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "Nadawane" @@ -375,7 +391,7 @@ msgstr "Przeglądarka nieobsługiwana" msgid "Buy & Sell Bitcoin" msgstr "Kup & sprzedaj bitcoiny" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "Kup bitcoiny" @@ -387,8 +403,9 @@ msgstr "Zakup bitcoinów..." msgid "Calculating fee" msgstr "Obliczanie prowizji" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -441,8 +458,7 @@ msgstr "Wyczyść" msgid "Clear cache" msgstr "Wyczyść pamięć podręczną" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "Kliknij" @@ -466,12 +482,13 @@ msgstr "Zatwierdzony hash" msgid "Complete the backup process to use this option" msgstr "Zakończ proces tworzenia kopii zapasowej, aby użyć tej opcji" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -488,27 +505,19 @@ msgstr "Potwierdź & zakończenie" msgid "Confirm your PIN" msgstr "Potwierdź kod PIN" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "Potwierdź nowe hasło wypłat" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "Potwierdzenia" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: www/views/modals/wallet-balance.html:61 msgid "Confirming" msgstr "Potwierdzający" -#: 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 "Podłącz kartę BitPay" @@ -525,7 +534,7 @@ msgstr "Łączenie z Gildera..." msgid "Connection reset by peer" msgstr "Połączenie zostało zresetowane" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "Kontakty" @@ -580,7 +589,7 @@ msgstr "Nie można uzyskać dostępu do portfela na serwerze. Proszę sprawdzić msgid "Could not access wallet" msgstr "Nie można uzyskać dostępu do portfela" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "Nie można dodać wiadomość do importowanego portfela bez udostępnionego klucza szyfrowania" @@ -592,10 +601,18 @@ msgstr "Wypłata nie może zostać wysłana" msgid "Could not build transaction" msgstr "Nie udało się utworzyć transakcji" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "Nie można utworzyć adresu" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "Nie można utworzyć przy użyciu określonego rozszerzonego klucza prywatnego" @@ -608,7 +625,7 @@ msgstr "Nie można utworzyć przy użyciu określonego rozszerzonego klucza publ msgid "Could not create: Invalid wallet recovery phrase" msgstr "Nie można utworzyć: niepoprawna kluczowa fraza" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "Nie można odszyfrować pliku, sprawdź hasło" @@ -616,21 +633,25 @@ msgstr "Nie można odszyfrować pliku, sprawdź hasło" msgid "Could not delete payment proposal" msgstr "Nie można usunąć wniosku wypłaty" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "Nie można pobrać dynamicznej prowizji" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "Nie można uzyskać dynamicznej prowizji dla poziomu: {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "Nie można pobrać transakcji" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "Nie można zaimportować" @@ -655,7 +676,7 @@ msgstr "Nie można usunąć konta" msgid "Could not remove card" msgstr "Nie można usunąć karty" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "Nie można zapisać ustawień na serwerze" @@ -663,21 +684,21 @@ msgstr "Nie można zapisać ustawień na serwerze" msgid "Could not send payment" msgstr "Wypłata nie może zostać wysłana" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "Nie można zaktualizować historii transakcji" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "Nie można zaktualizować portfela" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "Nie można zaktualizować portfeli" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "Utwórz osobisty portfel" @@ -687,8 +708,8 @@ msgid "Create Shared Wallet" msgstr "Utwórz współdzielony portfel" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "Utwórz portfel bitcoin" @@ -735,7 +756,7 @@ msgstr "Data" msgid "Delete" msgstr "Usuń" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "Usuń wniosek wypłaty" @@ -767,8 +788,12 @@ msgstr "Ścieżka derywacji" msgid "Derivation Strategy" msgstr "Strategia derywacji" +#: www/views/topup.html:45 +msgid "Details" +msgstr "" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "Wyłącz" @@ -786,7 +811,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "Nie widzisz swojego języka na Crowdin? Skontaktuj się z właścicielem projektu, ponieważ bardzo chcielibyśmy, wspierać twój język." #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "Pobierz" @@ -794,7 +819,7 @@ msgstr "Pobierz" 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 "Każdy portfel bitcoin może wygenerować miliardy adresów z twojej 12-wyrazowej kopii zapasowej. Nowy adres jest automatycznie generowany i pokazany za każdym razem, kiedy otrzymasz płatność." -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "Ekonomiczna" @@ -835,16 +860,16 @@ msgstr "Włącz kamerę aby rozpocząć." msgid "Enter Amount" msgstr "Podaj ilość" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "Wprowadź hasło wypłaty" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "Wprowadź podwójne uwierzytelnienie swojego konta BitPay" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Wprowadź nowe hasło wypłaty" @@ -866,13 +891,12 @@ msgstr "Wprowadź hasło" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -889,30 +913,30 @@ msgstr "Wprowadź hasło" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -920,14 +944,18 @@ msgstr "Wprowadź hasło" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Błąd" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "Błąd w potwierdzeniu" @@ -935,6 +963,14 @@ msgstr "Błąd w potwierdzeniu" msgid "Error creating wallet" msgstr "Błąd podczas tworzenia portfela" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" msgstr "" @@ -955,14 +991,14 @@ msgstr "Błąd aktualizacji kart debetowych" msgid "Exceeded daily limit of $500 per user" msgstr "Dzienny limit 500$ na użytkownika został przekroczony" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "Wygasł" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "Wygasa" @@ -979,7 +1015,7 @@ msgstr "Eksportuj do pliku" msgid "Export wallet" msgstr "Eksportuj portfel" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "Dla tego portfela nie jest obsługiwany eksport za pomocą kodu QR" @@ -1005,12 +1041,12 @@ msgstr "Nie udało się wyeksportować" msgid "Family vacation funds" msgstr "Środki na rodzinne wakacje" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "Prowizja" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" msgstr "" @@ -1048,6 +1084,7 @@ msgstr "Do celów audytu" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "Z" @@ -1056,6 +1093,10 @@ msgstr "Z" msgid "From BitPay account" msgstr "Z konta BitPay" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "Z urządzenia docelowego, przejdź do Dodaj portfel > Import portfela i Zeskanuj ten kod QR" @@ -1068,10 +1109,18 @@ msgstr "Środki są zablokowane przez rozpatrywane wniosku wypłaty" msgid "Funds found:" msgstr "Znaleziono środki:" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "Środki przelewane" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "Środki będą przekazane do" @@ -1109,20 +1158,20 @@ msgstr "Zacznij dodając swój pierwszy kontakt." msgid "Getting fee levels..." msgstr "Uzyskiwanie informacji o prowizji..." -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "Powrót" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "Powrót" @@ -1149,7 +1198,7 @@ msgstr "Portfel sprzętowy" msgid "Help & Support" msgstr "Centrum pomocy" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "Informacja o pomocy i wsparciu technicznym jest dostępna na stronie internetowej." @@ -1258,7 +1307,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca msgstr "Jeśli zrobisz zrzut ekranu, twoja kopia zapasowa może być widziana przez inne aplikacje. Najbezpieczniejsza metoda utworzenia kopii zapasowej to długopis i papier." #: www/views/tab-import-hardware.html:42 -#: www/views/tab-import-phrase.html:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "Importuj" @@ -1284,7 +1333,7 @@ msgstr "W celu weryfikacji kopii zapasowej portfela wpisz swoje hasło." #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "Nie wszyscy współwłaściciele dołączyli" @@ -1297,31 +1346,36 @@ msgstr "Nie wszyscy współwłaściciele dołączyli" msgid "Incorrect PIN, try again." msgstr "Nieprawidłowy kod PIN. Spróbuj ponownie." -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "Nieprawidłowy adres sieciowy" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "Niepoprawny format kodu" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "Nie ma wystarczającej ilości środków" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Niewystarczające środki na prowizję" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "Nieprawidłowy" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "Nieprawidłowy numer konta" @@ -1334,8 +1388,8 @@ msgid "Invalid data" msgstr "Nieprawidłowe dane" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "Nieprawidłowa ścieżka derywacji" @@ -1343,6 +1397,10 @@ msgstr "Nieprawidłowa ścieżka derywacji" msgid "Invitation to share a {{appName}} Wallet" msgstr "Zaproszenie do współdzielenia portfela {{appName}}" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "Czy jest coś, co możemy poprawić?" @@ -1393,16 +1451,10 @@ msgstr "Klucz jest już powiązany z istniejącym portfelem" msgid "Language" msgstr "Język" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 msgid "Last Month" msgstr "Zeszły miesiąc" -#: 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 "Sprawdź swoją kluczową frazę." @@ -1444,6 +1496,10 @@ msgstr "Skuteczna blokada. Proszę czekać, aby usunąć wniosek wypłaty" msgid "Log out" msgstr "" +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "" + #: www/views/includes/walletHistory.html:27 msgid "Low fees" msgstr "Niskie opłaty" @@ -1469,14 +1525,14 @@ msgstr "Ja" msgid "Meh - it's alright" msgstr "Spoko - może być" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "Notatka" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "Wiadomość handlowa" @@ -1497,12 +1553,12 @@ msgstr "Brak kluczy prywatnych do podpisania" msgid "More Options" msgstr "Więcej opcji" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "Przeniesiony" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "Przesuń środki" @@ -1525,6 +1581,10 @@ msgstr "Nazwa" msgid "Network" msgstr "Sieć" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "Błąd sieci" @@ -1533,7 +1593,7 @@ msgstr "Błąd sieci" msgid "New Proposal" msgstr "Nowa propozycja" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "Nowy adres nie mógł zostać utworzony. Spróbuj jeszcze raz." @@ -1573,7 +1633,11 @@ msgstr "Brak propozycji płatności" msgid "No recent transactions" msgstr "Brak wcześniejszych transakcji" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "Brak transakcji" @@ -1585,15 +1649,15 @@ msgstr "Nie znaleziono portfela" msgid "No wallet selected" msgstr "Nie wybrano portfela" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" -msgstr "Brak dostępnych portfeli" +msgstr "" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" msgstr "Brak portfeli do otrzymania środków" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "Zwykła" @@ -1601,7 +1665,7 @@ msgstr "Zwykła" msgid "Not authorized" msgstr "Brak autoryzacji" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "Brak środków na opłacenie prowizji" @@ -1635,7 +1699,7 @@ msgstr "Powiadomienia" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" msgstr "" @@ -1647,8 +1711,9 @@ msgstr "Najwyższy czas na wykonanie kopii zapasowej portfela. Jeśli utracisz t msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "Nadszedł czas, aby sprawdzić swoje otoczenie. Czy jesteś w pobliżu okna? Czy są gdzieś ukryte kamery? Osoby zerkające przez ramię?" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "OK" @@ -1667,11 +1732,11 @@ msgstr "Oficjalna rezygnacja w języku angielskim" msgid "Oh no!" msgstr "O nie!" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "Na tym ekranie można zobaczyć wszystkie swoje portfele, konta i środki." -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Otwórz" @@ -1688,8 +1753,8 @@ msgstr "Otwórz GitHub" msgid "Open GitHub Project" msgstr "Otwórz projekt GitHub" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "Otwórz Insight" @@ -1724,7 +1789,7 @@ msgstr "Zamów kartę BitPay" msgid "Password" msgstr "Hasło" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "Wymagane hasło. Upewnij się, aby wprowadzić hasło w opcjach zaawansowanych" @@ -1760,7 +1825,7 @@ msgstr "Wniosek wypłaty" msgid "Payment Proposal Created" msgstr "Wniosek wypłaty utworzony" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "Wniosek wypłaty" @@ -1783,7 +1848,7 @@ msgstr "Wypłata odrzucona" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Płatność wysłana" @@ -1796,7 +1861,7 @@ msgstr "Wypłata zaakceptowana, ale jeszcze nie nadana" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "Wypłata zaakceptowana. Będzie nadana przez Glidera. W przypadku wystąpienia problemu, może być usunięta 6 godzin po utworzeniu." -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "Szczegóły wypłaty" @@ -1804,10 +1869,6 @@ msgstr "Szczegóły wypłaty" msgid "Payment request" msgstr "Wniosek o płatność" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "Oczekiwanie" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "Rozpatrywane płatności" @@ -1828,12 +1889,12 @@ msgstr "Proszę dokładnie zanotować tę kluczową frazę." msgid "Please connect a camera to get started." msgstr "Proszę podłączyć kamerę, aby zacząć." -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "Wpisz kluczową frazę" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "Wpisz kluczową frazę portfela" @@ -1849,11 +1910,11 @@ msgstr "Proszę wpisać każde słowo we właściwej kolejności." msgid "Please upgrade Copay to perform this action" msgstr "Proszę uaktualnić Copay, by móc wykonać tę operację" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "Proszę wybrać plik kopii zapasowej" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" msgstr "" @@ -1869,11 +1930,11 @@ msgstr "Przygotowywanie adresów..." msgid "Preparing backup..." msgstr "Przygotowywanie kopii zapasowej..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "Naciśnij ponownie, aby wyjść" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "Priorytetowa" @@ -1890,7 +1951,7 @@ msgid "Proposal Accepted" msgstr "Płatność przyjęta" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Płatność utworzona" @@ -1903,7 +1964,7 @@ msgstr "Płatność usunięta" msgid "Proposal Rejected" msgstr "Płatność odrzucona" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "Proponowane płatności" @@ -1924,7 +1985,7 @@ msgid "Quick review!" msgstr "Szybki przegląd!" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "Losowo" @@ -1950,16 +2011,16 @@ msgstr "Otrzymaj" msgid "Received" msgstr "Otrzymane" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "Otrzymane środki" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "Otrzymywanie" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "Ostatnie" @@ -1969,12 +2030,12 @@ msgid "Recent Transaction Card" msgstr "Ostatnia transakcja kartą" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "Ostatnie transakcje" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "Odbiorca" @@ -1996,7 +2057,7 @@ msgid "Recreating Wallet..." msgstr "Przywracanie portfela..." #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "Odrzucono" @@ -2072,7 +2133,6 @@ msgstr "Spróbuj ponownie z aparatem" #: 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 @@ -2092,6 +2152,10 @@ msgstr "Zeskanuj kod QR" msgid "Scan addresses for funds" msgstr "Skanuj adresy w celu znalezienia środków" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "Proszę zeskanować linie papilarne" @@ -2108,7 +2172,7 @@ msgstr "Zrzuty ekranu nie są bezpieczne" msgid "Search Transactions" msgstr "Szukaj transakcji" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "Wyszukaj lub wpisz adres bitcoin" @@ -2166,7 +2230,7 @@ msgstr "Wyślij adresy przez e-mail" msgid "Send by email" msgstr "Wyślij przez e-mail" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "Wyślij z" @@ -2201,17 +2265,18 @@ msgstr "Wysyłanie całej kwoty" msgid "Sending transaction" msgstr "Wysyłanie transakcji" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Wysyłanie {{amountStr}} z twojego portfela {{name}}" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "Wysłane" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "Wysłane środki" @@ -2276,11 +2341,11 @@ msgstr "Pokaż adres" msgid "Show advanced options" msgstr "Pokaż opcje zaawansowane" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "Pokaż adres bitcoin" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "Pokaż więcej" @@ -2306,13 +2371,12 @@ msgstr "Pojedynczy adres portfela" msgid "Skip" msgstr "Pomiń" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "Przesuń" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "Podaj kluczową frazę..." @@ -2328,7 +2392,11 @@ msgstr "Wniosek wypłaty nie został znaleziony" msgid "Spending Password needed" msgstr "Wymagane hasło wypłat" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "Zacznij wysyłać bitcoiny" @@ -2340,7 +2408,11 @@ msgstr "Rozpoczynanie..." msgid "Startup Lock" msgstr "Blokada uruchamiania" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "Super Ekonomiczna" @@ -2386,7 +2458,7 @@ msgid "Terms of Use" msgstr "Warunki użytkowania" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "Testnet" @@ -2445,7 +2517,7 @@ msgstr "Oficjalne Warunki użytkowania w języku angielskim dostępne są na str msgid "The password of the recovery phrase (if set)" msgstr "Hasło kluczowej frazy (jeśli ustawione)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "Wypłata została utworzona, ale nie może być zakończona. Spróbuj ponownie na stronie głównej" @@ -2488,13 +2560,13 @@ msgstr "Adres URL usługi portfela" msgid "There are no wallets to make this payment" msgstr "Brak portfela, aby dokonać tej wypłaty" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "Dostępna jest nowa wersja {{appName}}" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "Wystąpił błąd w postaci" @@ -2511,7 +2583,7 @@ msgstr "Ta aplikacja jest fantastyczna!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "Ta aplikacja przechowuje Twoje bitcoiny z zaawansowanymi zabezpieczeniami." -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "Ten wniosek płatności wygasł." @@ -2525,6 +2597,10 @@ msgstr "To hasło nie może zostać odzyskane. Jeśli je utracisz, nie będziesz msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "Ta kluczowa fraza został utworzona przy użyciu hasła. Aby odzyskać portfel potrzebna jest kluczowa fraza i hasło." +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "" + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "Potwierdzenie transakcja może trwać długo lub zostać przerwane z powodu niskiej prowizji ustalonej przez nadawcę" @@ -2534,33 +2610,46 @@ msgstr "Potwierdzenie transakcja może trwać długo lub zostać przerwane z pow msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "Ten portfel nie jest zarejestrowany na Bitcore Wallet Service (BWS). Możesz go odtworzyć z lokalnego nośnika." -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "Historia" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "Do" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Aby zacząć, kup bitcoiny lub udostępnij swój adres. Możesz otrzymać bitcoiny z dowolnego portfela lub usługi." -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Aby rozpocząć należy utworzyć portfel i dostać trochę bitcoinów." +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "" + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "Łącznie" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "Łącznie zablokowane środki" @@ -2568,6 +2657,10 @@ msgstr "Łącznie zablokowane środki" msgid "Total number of copayers" msgstr "Liczba współwłaścicieli portfela" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2590,12 +2683,20 @@ msgstr "Transakcja została już wysłana" msgid "Transaction created" msgstr "Transakcja utworzona" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "Transakcja w tej chwili niedostępna" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "Nie znaleziono transakcji" @@ -2603,7 +2704,7 @@ msgstr "Nie znaleziono transakcji" msgid "Transfer to" msgstr "" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "Przenieś do portfela" @@ -2623,7 +2724,7 @@ msgstr "Wpisz kluczową frazę (zwyczajowo 12 słów)" msgid "Uh oh..." msgstr "Ups..." -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "Niepotwierdzone" @@ -2631,7 +2732,7 @@ msgstr "Niepotwierdzone" msgid "Unit" msgstr "Jednostka" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "Niewysłane transakcje" @@ -2643,7 +2744,7 @@ msgstr "Nieużywane adresy" msgid "Unused Addresses Limit" msgstr "Limit nieużywanych adresów" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "Dostępna aktualizacja" @@ -2651,7 +2752,7 @@ msgstr "Dostępna aktualizacja" msgid "Updating pending proposals. Please stand by" msgstr "Aktualizacja wniosków płatności. Proszę czekać" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "Aktualizowanie historii transakcji. Proszę czekać." @@ -2659,7 +2760,7 @@ msgstr "Aktualizowanie historii transakcji. Proszę czekać." msgid "Updating... Please stand by" msgstr "Aktualizacja... Proszę czekać" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "Pilna" @@ -2671,6 +2772,10 @@ msgstr "Użyj niepotwierdzonych środków" msgid "Validating recovery phrase..." msgstr "Sprawdzanie poprawności kluczowej frazy..." +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2688,20 +2793,20 @@ msgstr "Zobacz wszystkie adresy" msgid "View Terms of Service" msgstr "Zobacz zasady użytkowania" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "Zobacz transakcje na Insight" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "Zobacz aktualizacje" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "Zobacz na blockchainie" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "Ostrzeżenie: klucz derywacji nie działa na tym urządzeniu/portfelu. Działania dla tego portfela nie można wykonać." @@ -2759,6 +2864,10 @@ msgstr "Id Portfela" msgid "Wallet Information" msgstr "Informacje o portfelu" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "Zaproszenie do portfela" @@ -2792,7 +2901,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "Kluczowa fraza jest nieprawidłowa" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "Adres usług portfela" @@ -2801,6 +2910,7 @@ msgid "Wallet Settings" msgstr "Ustawienia portfela" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "Rodzaj portfela" @@ -2850,7 +2960,7 @@ msgstr "Portfel nie ma kopii zapasowej" msgid "Wallet not found" msgstr "Nie znaleziono portfela" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "Portfel nie jest zarejestrowany" @@ -2866,7 +2976,7 @@ msgstr "Kluczowa fraza niedostępna." msgid "Wallet service not found" msgstr "Nie znaleziono serwera" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "Portfele" @@ -2935,7 +3045,7 @@ msgstr "Czy zechciałbyś ocenić {{appName}} w app store?" msgid "Would you like to receive push notifications about payments?" msgstr "Czy chcesz otrzymywać wyskakujące powiadomienia o płatnościach?" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "Nieprawidłowa ilość słów frazy:" @@ -2992,14 +3102,14 @@ msgid "You'll receive email notifications about payments sent and received from msgstr "Będziesz otrzymywać powiadomienia e-mail o płatności wysyłanych i odbieranych ze swoich portfeli." #: 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." +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." msgstr "" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "Kopia zapasowa portfela została utworzona!" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "Twój portfel jest gotowy!" @@ -3024,13 +3134,13 @@ msgstr "Twoje hasło" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "Twój portfel nigdy nie jest przechowywany w chmurze lub na urządzeniach do tworzenia kopii zapasowych." -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "Twój portfel będzie zaszyfrowany. Hasło wypłat nie będzie mogło być odzyskane. Pamiętaj, aby je zapisać." #: www/views/includes/walletSelector.html:23 #: www/views/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3057,17 +3167,17 @@ msgstr "nazwa@przyklad.com" msgid "preparing..." msgstr "Przygotowywanie..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "do akceptacji" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "do zapłaty" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "do wysłania" @@ -3075,11 +3185,15 @@ msgstr "do wysłania" 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 "{{appName}} jest zależny od Bitcore Wallet Service (BWS) jeśli chodzi o informacje dotyczące blokcheina, sieci i synchronizacji współwłaścicieli portfela. Domyślnie jest to https://bws.bitpay.com (BitPay's public BWS instance)." -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} zostanie potrącone jako prowizja sieci bitcoin." -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} transakcje pobrane" diff --git a/i18n/po/pt.po b/i18n/po/pt.po index 7e0b40ddd..251749d4d 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -11,28 +11,28 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" -"PO-Revision-Date: 2017-06-06 10:18-0400\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 "" +"PO-Revision-Date: 2017-06-29 08:05-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "(Confiável)" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "(Possível gasto duplo)" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* Uma proposta de pagamento pode ser apagada se 1) você é o criador e outro copayer não subscreveu, ou 2) Passaram-se 24 horas desde que a proposta foi criada." -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" -msgstr "" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "- {{btx.feeRateStr}} da transação" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" +msgstr "- {{tx.feeRateStr}} da transação" #: 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!" @@ -43,11 +43,11 @@ msgstr "Classificações de 5 estrelas ajudam-nos a que o {{appName}} chegue ás msgid "A member of the team will review your feedback as soon as possible." msgstr "Um membro da equipa irá rever a sua avaliação assim que possível." -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "O montante de {{amountAboveMaxSizeStr}} foi excluido. O valor máximo permitido para uma transação foi excedido." -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "O montante de {{amountBelowFeeStr}} foi excluido. Estes fundos vieram de UTXOs menores que a taxa de rede fornecida." @@ -57,7 +57,7 @@ msgid "About" msgstr "Sobre" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "Aceite" @@ -76,15 +76,15 @@ msgstr "Número de conta" msgid "Accounts" msgstr "Contas" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "Atividade" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "Adicionar conta" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "Adicionar conta BitPay?" @@ -97,7 +97,7 @@ msgstr "Adicionar contacto" msgid "Add Funds" msgstr "Adicionar fundos" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "Adicionar nota" @@ -117,10 +117,18 @@ msgstr "Adicionar conta" msgid "Add an optional password to secure the recovery phrase" msgstr "Adicionar uma senha opcional para asegurar a frase de recuperação" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "Adicionar descrição" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "Adicionar esta conta BitPay ({{email}})?" + #: www/views/add.html:3 msgid "Add wallet" msgstr "Adicionar carteira" @@ -153,7 +161,7 @@ msgstr "Avançado" msgid "Advanced Settings" msgstr "Definições avançadas" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "Todos" @@ -197,11 +205,15 @@ msgstr "Valor" msgid "Amount below minimum allowed" msgstr "Montante abaixo do mínimo permitido" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "Montante muito grande" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "Quantidade muito baixa para gastar" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "Está disponível uma actualização para esta aplicação. Para sua segurança, por favor atualize para a versão mais recente." @@ -209,6 +221,10 @@ msgstr "Está disponível uma actualização para esta aplicação. Para sua seg msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "Qualquer pessoa com sua frase de segurança pode aceder ou gastar os seus bitcoins." +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "Taxa de rede Bitcoin aproximada para transferir o saldo da carteira (com prioridade normal)" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "Você está sendo vigiado?" @@ -223,7 +239,7 @@ msgstr "Tem certeza que deseja cancelar e eliminar esta carteira?" #: src/js/controllers/addressbookView.js:24 msgid "Are you sure you want to delete this contact?" -msgstr "" +msgstr "Tem certeza que deseja excluir este contato?" #: src/js/controllers/preferencesDelete.js:26 msgid "Are you sure you want to delete this wallet?" @@ -243,7 +259,7 @@ msgstr "Tem a certeza que deseja ignorar?" #: www/views/modals/bitpay-card-confirmation.html:4 msgid "Are you sure you would like to log out of your BitPay Card account?" -msgstr "" +msgstr "Tem certeza que você deseja sair da sua conta do BitPay Card?" #: src/js/controllers/preferencesBitpayCard.js:7 #: src/js/controllers/preferencesBitpayServices.js:20 @@ -324,7 +340,7 @@ msgstr "Cartões BitPay Visa®" msgid "Bitcoin Address" msgstr "Endereço Bitcoin" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -359,7 +375,7 @@ msgid "Broadcast Payment" msgstr "Transmitir Pagamento" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "Transmitido" @@ -375,7 +391,7 @@ msgstr "Navegador não suportado" msgid "Buy & Sell Bitcoin" msgstr "Comprar & Vender Bitcoin" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "Comprar Bitcoin" @@ -387,8 +403,9 @@ msgstr "A comprar Bitcoin..." msgid "Calculating fee" msgstr "A calcular taxa" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -399,7 +416,7 @@ msgstr "Cancelar" #: www/views/copayers.html:37 msgid "Cancel invitation" -msgstr "" +msgstr "Cancelar convite" #: src/js/controllers/onboarding/tour.js:52 msgid "Cannot Create Wallet" @@ -441,8 +458,7 @@ msgstr "Eliminar" msgid "Clear cache" msgstr "Limpar cache" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "Clique" @@ -466,12 +482,13 @@ msgstr "Commit de hash" msgid "Complete the backup process to use this option" msgstr "Complete o processo de backup para usar esta opção" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" -msgstr "" +msgstr "Concluído" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -488,27 +505,19 @@ msgstr "Confirmar & Terminado" msgid "Confirm your PIN" msgstr "Confirme o seu PIN" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "Confirme a nova senha de pagamento" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "Confirmações" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: www/views/modals/wallet-balance.html:61 msgid "Confirming" msgstr "A confirmar" -#: 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 "Introduzir o meu cartão do BitPay" @@ -525,7 +534,7 @@ msgstr "A conectar ao Glidera..." msgid "Connection reset by peer" msgstr "Ligação redefinida pelo mesmo nível" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "Contactos" @@ -580,7 +589,7 @@ msgstr "Não foi possível acessar a carteira no servidor. Por favor, verifique: msgid "Could not access wallet" msgstr "Impossível aceder à carteira" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "Não foi possível adicionar mensagem à carteira importada sem chave de criptografia compartilhada" @@ -592,10 +601,18 @@ msgstr "Não foi possível transmitir o pagamento" msgid "Could not build transaction" msgstr "Não foi possível criar a transacção" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "Não foi possível criar o endereço" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "Não foi possível criar a fatura" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "Não foi possível criar a transação" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "Não foi possível criar usando a chave privada estendida especificada" @@ -608,7 +625,7 @@ msgstr "Não foi possível criar usando a chave privada estendida especificada" msgid "Could not create: Invalid wallet recovery phrase" msgstr "Não foi possível criar: Frase de recuperação de carteira inválida" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "Não foi possível descriptografar o arquivo, verifique sua senha" @@ -616,21 +633,25 @@ msgstr "Não foi possível descriptografar o arquivo, verifique sua senha" msgid "Could not delete payment proposal" msgstr "Não foi possível excluir a proposta de pagamento" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "Não foi possível obter taxa dinâmica" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "Não foi possível obter a taxa dinâmica para nível: {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "Não foi possível obter a fatura" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "Não foi possível obter o histórico das transações" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "Não foi possível importar" @@ -655,7 +676,7 @@ msgstr "Não foi possível remover a conta" msgid "Could not remove card" msgstr "Não foi possível remover o cartão" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "Não foi possível guardar as suas preferências no servidor" @@ -663,21 +684,21 @@ msgstr "Não foi possível guardar as suas preferências no servidor" msgid "Could not send payment" msgstr "Não foi possível enviar o pagamento" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "Não foi possível enviar a transação" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "Não foi possível atualizar o histórico de transações" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "Não foi possível atualizar a carteira" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "Não foi possível atualizar as carteiras" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "Criar carteira pessoal" @@ -687,8 +708,8 @@ msgid "Create Shared Wallet" msgstr "Criar carteira partilhada" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "Criar carteira bitcoin" @@ -735,7 +756,7 @@ msgstr "Data" msgid "Delete" msgstr "Eliminar" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "Excluir Proposta de Pagamento" @@ -767,8 +788,12 @@ msgstr "Caminho de derivação" msgid "Derivation Strategy" msgstr "Estratégia de derivação" +#: www/views/topup.html:45 +msgid "Details" +msgstr "" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "Desativado" @@ -786,7 +811,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "Não vê o seu idioma no Crowdin? Contacte o Dono no Crowdin! Nós adoraríamos suportar a sua linguagem." #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "Download" @@ -794,13 +819,13 @@ msgstr "Download" 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 "Cada carteira de Bitcoin pode gerar biliões de endereços através do seu backup de 12-palavras. Um novo endereço é gerado automáticamente e mostrado cada vez que receber um pagamento." -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "Economia" #: www/views/onboarding/collectEmail.html:27 msgid "Edit" -msgstr "" +msgstr "Editar" #: www/views/addressbook.add.html:29 #: www/views/addressbook.view.html:22 @@ -835,16 +860,16 @@ msgstr "Ative a câmera para começar." msgid "Enter Amount" msgstr "Inserir montante" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "Inserir senha de compra" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "Insira verificação dois passos para sua conta BitPay" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Insira a nova senha para pagamento" @@ -856,7 +881,7 @@ msgstr "Digite a frase de recuperação (BIP39)" #: www/views/onboarding/collectEmail.html:13 msgid "Enter your email" -msgstr "" +msgstr "Digite seu e-mail" #: www/views/backup.html:62 msgid "Enter your password" @@ -866,13 +891,12 @@ msgstr "Digite sua senha" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -889,30 +913,30 @@ msgstr "Digite sua senha" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -920,14 +944,18 @@ msgstr "Digite sua senha" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Erro" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "Erro na confirmação" @@ -935,9 +963,17 @@ msgstr "Erro na confirmação" msgid "Error creating wallet" msgstr "Erro na criação da carteira" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "Erro ao obter informações de SendMax" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "Erro no Protocolo de Pagamento" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" -msgstr "" +msgstr "Erro de emparelhamento na Conta BitPay" #: src/js/controllers/paperWallet.js:41 msgid "Error scanning funds:" @@ -955,14 +991,14 @@ msgstr "Erro na atualização dos Cartões de Débito" msgid "Exceeded daily limit of $500 per user" msgstr "Excedido limite diário de $500 por usuário" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "Expirado" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "Expira" @@ -979,7 +1015,7 @@ msgstr "Exportar para arquivo" msgid "Export wallet" msgstr "Exportar carteira" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "Exportação via QR code não suportada por essa carteira" @@ -1005,14 +1041,14 @@ msgstr "Falha ao exportar" msgid "Family vacation funds" msgstr "Fundos de férias com a família" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "Taxa" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" -msgstr "" +msgstr "Taxa:" #: src/js/controllers/feedback/send.js:23 msgid "Feedback could not be submitted. Please try again later." @@ -1048,6 +1084,7 @@ msgstr "Para fins de auditoria" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "De" @@ -1056,6 +1093,10 @@ msgstr "De" msgid "From BitPay account" msgstr "De conta BitPay" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "De uma Carteira de Hardware" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "Do dispositivo de destino, go em Adicionar Carteira > Importar Carteira e faça a varredura do código QR" @@ -1068,17 +1109,25 @@ msgstr "O saldo está bloqueado por um pedido de gasto pendente" msgid "Funds found:" msgstr "Saldos encontrados:" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "Saldos transferidos" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "Os fundos foram adicionados ao cartão de débito" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "Os saldos serão transferidos para" #: www/views/tab-receive.html:51 msgid "Generate new address" -msgstr "" +msgstr "Gerar novo endereço" #: src/js/services/onGoingProcess.js:22 msgid "Generating .csv file..." @@ -1109,20 +1158,20 @@ msgstr "Comece adicionando o primeiro." msgid "Getting fee levels..." msgstr "Obtendo níveis de taxa..." -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "Retroceder" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "Retroceder" @@ -1149,7 +1198,7 @@ msgstr "Carteira de hardware" msgid "Help & Support" msgstr "Ajuda e suporte" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "Informações de Ajuda e Suporte estão disponíveis no site." @@ -1258,7 +1307,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca msgstr "Se você fizer uma Captura de tela, seu backup poderá ser visto por outros aplicativos. Você pode fazer um backup físico com um papel e caneta." #: www/views/tab-import-hardware.html:42 -#: www/views/tab-import-phrase.html:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "Importar" @@ -1284,7 +1333,7 @@ msgstr "A fim de verificar o seu backup de carteira, por favor, digite sua senha #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "Incompleto" @@ -1297,31 +1346,36 @@ msgstr "Carteira incompleta" msgid "Incorrect PIN, try again." msgstr "PIN incorreto, tente novamente." -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "Endereço de rede incorrecto" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "Formato de código incorreto" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "Endereço de rede incorreto" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "Fundos insuficientes" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Fundos insuficientes para taxa" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "Inválido" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "URL inválida" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "Número de conta inválido" @@ -1334,8 +1388,8 @@ msgid "Invalid data" msgstr "Dados inválidos" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "Caminho de derivação inválido" @@ -1343,6 +1397,10 @@ msgstr "Caminho de derivação inválido" msgid "Invitation to share a {{appName}} Wallet" msgstr "Convite para compartilhar a Carteira {{appName}}" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "Há algo mais que podemos ajudar?" @@ -1393,16 +1451,10 @@ msgstr "Chave já associada com uma carteira existente" msgid "Language" msgstr "Idioma" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 msgid "Last Month" msgstr "Mês anterior" -#: 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 "Vamos verificar a sua frase de backup." @@ -1442,7 +1494,11 @@ msgstr "Bloqueio de tempo em ação. Por favor espere para remover esta proposta #: www/views/modals/bitpay-card-confirmation.html:14 msgid "Log out" -msgstr "" +msgstr "Sair" + +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "Quantidade de entrada baixa" #: www/views/includes/walletHistory.html:27 msgid "Low fees" @@ -1469,14 +1525,14 @@ msgstr "Eu" msgid "Meh - it's alright" msgstr "Meh - está tudo bem" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "Nota" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "Mensagem Publicitária" @@ -1497,12 +1553,12 @@ msgstr "Faltam chaves privadas para assinar" msgid "More Options" msgstr "Mais opções" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "Movido" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "Valores transferidos" @@ -1525,6 +1581,10 @@ msgstr "Nome" msgid "Network" msgstr "Rede" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "Erro de rede" @@ -1533,7 +1593,7 @@ msgstr "Erro de rede" msgid "New Proposal" msgstr "Nova proposta" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "Novo endereço não pode ser gerado. Por favor tente novamente" @@ -1573,7 +1633,11 @@ msgstr "Sem propostas pendentes" msgid "No recent transactions" msgstr "Não há transações recentes" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "Nenhuma proposta de assinatura: Nenhuma chave privada" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "Nenhuma transação ainda" @@ -1585,15 +1649,15 @@ msgstr "Carteira não encontrada" msgid "No wallet selected" msgstr "Sem carteira selecionada" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" -msgstr "Não há carteiras disponíveis" +msgstr "" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" msgstr "Nenhuma Carteira disponível para receber fundos" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "Normal" @@ -1601,7 +1665,7 @@ msgstr "Normal" msgid "Not authorized" msgstr "Não autorizada" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "Não há fundos para taxa" @@ -1633,11 +1697,11 @@ msgstr "Notificações" #: www/views/onboarding/collectEmail.html:9 msgid "Notifications by email" -msgstr "" +msgstr "Notificações por e-mail" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" -msgstr "" +msgstr "Me informe se confirmado" #: 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." @@ -1647,8 +1711,9 @@ msgstr "Agora é uma boa hora para fazer backup de sua carteira. Se este disposi msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "Agora é a hora perfeita para olhar em volta. Próximo de janelas? Câmeras escondidas? Espião atrás do ombro?" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "OK" @@ -1667,11 +1732,11 @@ msgstr "Aviso Legal Oficial em Inglês" msgid "Oh no!" msgstr "Oh não!" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "Nesta tela você pode ver todas as suas carteiras, contas e ativos." -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Abrir" @@ -1688,8 +1753,8 @@ msgstr "Abrir GitHub" msgid "Open GitHub Project" msgstr "Abrir Projeto no GitHub" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "Abrir Insight" @@ -1724,7 +1789,7 @@ msgstr "Solicitar o Cartão Bitpay" msgid "Password" msgstr "Senha" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "Necessário Senha. Certifique-se de digitar sua senha em opções avançadas" @@ -1760,7 +1825,7 @@ msgstr "Proposta de Pagamento" msgid "Payment Proposal Created" msgstr "Proposta de Pagamento Criada" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "Propostas de Pagamento" @@ -1783,7 +1848,7 @@ msgstr "Pagamento Rejeitado" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Pagamento Enviado" @@ -1796,7 +1861,7 @@ msgstr "Pagamento aceito, mas ainda não publicado" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "Pagamento aceito. Ele será publicado por Glidera. Em caso de problema, pode ser deletado até 6 horas depois de criado." -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "Detalhes do pagamento" @@ -1804,10 +1869,6 @@ msgstr "Detalhes do pagamento" msgid "Payment request" msgstr "Pedido de pagamento" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "Pendente" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "Proposta pendente" @@ -1828,12 +1889,12 @@ msgstr "Por favor, anote esta frase com cuidado." msgid "Please connect a camera to get started." msgstr "Por favor conecte uma câmera para iniciar." -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "Por favor, digite a frase de recuperação" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "Por favor, digite a frase de recuperação da carteira" @@ -1849,13 +1910,13 @@ msgstr "Por favor escolhe cada palavra na ordem correta." msgid "Please upgrade Copay to perform this action" msgstr "Por favor atualize Copay para executar esta ação" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "Por favor, selecione seu arquivo de backup" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" -msgstr "" +msgstr "Bloqueio Pré-Autorização" #: www/views/tab-settings.html:40 msgid "Preferences" @@ -1869,11 +1930,11 @@ msgstr "A preparar os endereços..." msgid "Preparing backup..." msgstr "A preparar o backup..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "Pressione novamente para sair" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "Prioridade" @@ -1890,7 +1951,7 @@ msgid "Proposal Accepted" msgstr "Proposta aceite" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Proposta criada" @@ -1903,7 +1964,7 @@ msgstr "Proposta eliminada" msgid "Proposal Rejected" msgstr "Proposta rejeitada" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "Propostas" @@ -1924,7 +1985,7 @@ msgid "Quick review!" msgstr "Avaliação rápida!" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "Aleatório" @@ -1950,16 +2011,16 @@ msgstr "Receber" msgid "Received" msgstr "Recebido" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "Valores recebidos" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "A receber" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "Recente" @@ -1969,12 +2030,12 @@ msgid "Recent Transaction Card" msgstr "Transações recentes do cartão" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "Transações recentes" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "Destinatário" @@ -1996,7 +2057,7 @@ msgid "Recreating Wallet..." msgstr "Recriando Carteira…" #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "Rejeitado" @@ -2010,7 +2071,7 @@ msgstr "Informação de lançamento" #: www/views/addressbook.view.html:36 msgid "Remove" -msgstr "" +msgstr "Remover" #: src/js/controllers/preferencesBitpayServices.js:7 msgid "Remove BitPay Account?" @@ -2072,7 +2133,6 @@ msgstr "Tentar Camera novamente" #: 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 @@ -2092,6 +2152,10 @@ msgstr "Digitalizar códigos QR" msgid "Scan addresses for funds" msgstr "Pesquisando endereços por fundos" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "Escanear novamente" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "Escaneie sua impressão digital, por favor" @@ -2108,7 +2172,7 @@ msgstr "Capturas de Tela não são seguras" msgid "Search Transactions" msgstr "Procurar transações" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "Procure ou digite o endereço bitcoin" @@ -2166,7 +2230,7 @@ msgstr "Enviar endereços por e-mail" msgid "Send by email" msgstr "Enviar por E-mail" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "Enviar De" @@ -2201,17 +2265,18 @@ msgstr "Quantidade máxima de envio" msgid "Sending transaction" msgstr "Enviando transação" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Enviando {{amountStr}} de sua carteira {{name}}" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "Enviado" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "Enviar Fundos" @@ -2276,11 +2341,11 @@ msgstr "Mostrar endereço" msgid "Show advanced options" msgstr "Mostrar opções avançadas" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "Mostrar endereço bitcoin" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "Mostrar mais" @@ -2306,13 +2371,12 @@ msgstr "Único endereço carteira" msgid "Skip" msgstr "Pular" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "Deslize" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "Especifique a frase de recuperação..." @@ -2328,7 +2392,11 @@ msgstr "Proposta de pagamento não encontrada" msgid "Spending Password needed" msgstr "Digitar a senha é necessária" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "Gastar este balanço necessitará uma taxa de rede Bitcoin significativa" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "Comece a enviar bitcoin" @@ -2340,7 +2408,11 @@ msgstr "A iniciar..." msgid "Startup Lock" msgstr "Bloqueio de Inicialização" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "Sucesso" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "Super Econômico" @@ -2386,7 +2458,7 @@ msgid "Terms of Use" msgstr "Termos de uso" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "Testnet" @@ -2445,7 +2517,7 @@ msgstr "Os Termos de Serviço oficiais estão disponíveis no site BitPay." msgid "The password of the recovery phrase (if set)" msgstr "A senha da frase de recuperação (se configurada)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "O pagamento foi criado mas não pode ser completado. Por favor, tente novamente a partir da tela inicial." @@ -2488,13 +2560,13 @@ msgstr "O URL do serviço carteira" msgid "There are no wallets to make this payment" msgstr "Não há carteiras para fazer esse pagamento" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "Existe uma nova versão do {{appName}} disponível" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "Existe um erro no formulário" @@ -2511,7 +2583,7 @@ msgstr "Esta aplicação é fantástica!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "Este aplicativo armazena seu bitcoin com segurança de ponta." -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "Este bitcoin pagamento pedido expirou." @@ -2525,6 +2597,10 @@ msgstr "Esta senha não pode ser recuperada. Se a senha for perdida, não há ne msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "Esta frase de recuperação foi criada com uma senha. Para recuperar esta carteira, tanto a frase de recuperação como a senha são necessárias." +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "Este valor de transação é muito pequeno em comparação com as taxas de rede Bitcoin atuais. Gastar estes fundos terão uma taxa de rede Bitcoin maior do que o fundo em si." + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "Esta operação poderá demorar muito tempo para ser confirmada ou poderá ser descartada devido às baixas taxas definidas pelo remetente" @@ -2534,33 +2610,46 @@ msgstr "Esta operação poderá demorar muito tempo para ser confirmada ou poder msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "Esta carteira não está registrada no dado serviço Wallet Service Bitcore (BWS) informado. Você pode recriá-la a partir da informação local." -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "Cronograma" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "Para" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Para começar, compre bitcoins ou compartilhe seu endereço. Você pode receber bitcoins de qualquer carteira ou serviço." -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Para começar, você precisa criar uma carteira de bitcoins e obter alguns bitcoins." +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "Para {{reason}} você deve primeiro adicionar sua conta BitPay - {{email}}" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "Recarga em andamento..." + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "Recarga de {{amountStr}} para cartão de débito ({{cardLastNumber}})" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "Total" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "Saldo Total Bloqueado" @@ -2568,6 +2657,10 @@ msgstr "Saldo Total Bloqueado" msgid "Total number of copayers" msgstr "Número total de copayers" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "Total de entradas da carteira" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2590,20 +2683,28 @@ msgstr "Transação foi publicada" msgid "Transaction created" msgstr "Transação criada" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "Transação iniciada" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "Transação não está disponível neste momento" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "Transação não encontrada" #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" -msgstr "" +msgstr "Transferir para" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "Transferir para carteira" @@ -2623,7 +2724,7 @@ msgstr "Digite a frase de recuperação (normalmente 12 palavras)" msgid "Uh oh..." msgstr "Uh oh..." -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "Não confirmado" @@ -2631,7 +2732,7 @@ msgstr "Não confirmado" msgid "Unit" msgstr "Unidade" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "Transações não enviadas" @@ -2643,7 +2744,7 @@ msgstr "Endereços não utilizados" msgid "Unused Addresses Limit" msgstr "Limite de endereços não utilizados" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "Atualização Disponível" @@ -2651,7 +2752,7 @@ msgstr "Atualização Disponível" msgid "Updating pending proposals. Please stand by" msgstr "Atualizando propostas pendentes. Por favor, aguarde" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "Atualizando o histórico de transações. Por favor, aguarde." @@ -2659,7 +2760,7 @@ msgstr "Atualizando o histórico de transações. Por favor, aguarde." msgid "Updating... Please stand by" msgstr "Atualizando... Por favor, aguarde" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "Urgente" @@ -2671,6 +2772,10 @@ msgstr "Utilizar fundos não confirmados" msgid "Validating recovery phrase..." msgstr "Validando a frase de recuperação..." +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "Verifique a sua identidade" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2688,30 +2793,30 @@ msgstr "Ver todos os endereços" msgid "View Terms of Service" msgstr "Ver os Termos de Serviço" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "Exibir Transação no Insight" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "Ver atualizações" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "Ver no blockchain" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "Aviso: Derivação de chave não está funcionando neste dispositivo/carteira. Ações não podem ser executadas nesta carteira." #: www/views/tab-export-file.html:45 msgid "WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export." -msgstr "AVISO: A não inclusão da chave privada permite verificar o saldo da carteira, o histórico de transações e criar propostas de gastos a partir da exportação. No entanto, não permite aprovar (assinar) propostas, assim fundos não serão acessíveis a partir da exportação ." +msgstr "ATENÇÃO: Não incluir a chave privada permite verificar o saldo da carteira, o histórico de transações e criar propostas de gastos a partir da exportação. No entanto, não permite aprovar (assinar) propostas, assim fundos não serão acessíveis a partir da exportação." #: www/views/tab-export-file.html:36 msgid "WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export." -msgstr "AVISO: A chave privada desta carteira não está disponível. A exportação permite verificar o saldo da carteira, o histórico de transações e criar propostas de gastos a partir da exportação. No entanto, não permite aprovar (assinar) propostas, assim fundos não serão acessíveis a partir da exportação ." +msgstr "ATENÇÃO: A chave privada desta carteira não está disponível. A exportação permite verificar o saldo da carteira, o histórico de transações e criar propostas de gastos a partir da exportação. No entanto, não permite aprovar (assinar) propostas, assim fundos não serão acessíveis a partir da exportação." #: www/views/modals/paypro.html:42 msgid "WARNING: UNTRUSTED CERTIFICATE" @@ -2759,6 +2864,10 @@ msgstr "Id da carteira" msgid "Wallet Information" msgstr "Informações da carteira" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "Entradas da carteira" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "Convite para Carteira" @@ -2792,7 +2901,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "Frase de recuperação da carteira é inválida" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "URL do serviço de carteira" @@ -2801,6 +2910,7 @@ msgid "Wallet Settings" msgstr "Configurações da carteira" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "Tipo da carteira" @@ -2850,7 +2960,7 @@ msgstr "Carteira sem backup" msgid "Wallet not found" msgstr "Carteira não encontrada" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "Carteira não registrada" @@ -2866,13 +2976,13 @@ msgstr "Frase de recuperação da carteira não disponível." msgid "Wallet service not found" msgstr "Serviço de carteira não encontrado" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "Carteiras" #: www/views/tab-settings.html:102 msgid "Wallets & Integrations" -msgstr "Carteiras e integrações" +msgstr "Carteiras & Integrações" #: src/js/controllers/addressbookView.js:23 #: src/js/controllers/modals/txpDetails.js:143 @@ -2935,7 +3045,7 @@ msgstr "Você estaria disposto a dar uma nota ao {{appName}} na app store?" msgid "Would you like to receive push notifications about payments?" msgstr "Gostaria de receber notificações push sobre pagamentos?" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "Número errado de palavras de recuperação:" @@ -2985,21 +3095,21 @@ msgstr "Você controla o seu bitcoin." #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." -msgstr "" +msgstr "Você precisará entrar de novo para completar seu BitPay Card." #: www/views/preferencesNotifications.html:28 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "Você receberá notificações por e-mail sobre pagamentos enviados e recebidos de suas carteiras." #: 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 "" +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." +msgstr "Seu BitPay Card está pronto. Adicione fundos ao seu cartão para começar a usá-lo em lojas e caixas eletrônicos em todo o mundo." #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "O backup de sua carteira de bitcoins está feito!" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "Sua carteira de bitcoins está pronta!" @@ -3024,13 +3134,13 @@ msgstr "Sua senha" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "Sua carteira nunca foi salva num armazenamento em nuvem ou dispositivo padrão de backups." -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "Sua chave da carteira será criptografada. A senha de gastos não poderá ser recuperada. Não se esqueça de anotá-la." #: www/views/includes/walletSelector.html:23 #: www/views/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3057,29 +3167,33 @@ msgstr "nome@exemplo.pt" msgid "preparing..." msgstr "a preparar..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "a aceitar" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "a pagar" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "a enviar" #: 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 "{{AppName}} depende do Serviço Bitkey Wallet (BWS) para informações sobre cadeias de blocos, rede e sincronização Copayer. A configuração padrão aponta para https://bws.bitpay.com (instância pública do BWS do BitPay)." +msgstr "{{appName}} depende do Bitcore Wallet Service (BWS) para informações sobre cadeias de blocos, rede e sincronização Copayer. A configuração padrão aponta para https://bws.bitpay.com (instância pública BWS do BitPay)." -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} será deduzido para taxas de rede bitcoins." -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "{{tx.txp[wallet.id].feeRatePerStr}} da quantidade de envio" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "Transações de {{updatingTxHistoryProgress}} transferidas" diff --git a/i18n/po/ru.po b/i18n/po/ru.po index ffa2bb7c0..0e46c3681 100644 --- a/i18n/po/ru.po +++ b/i18n/po/ru.po @@ -11,27 +11,27 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Russian\n" "Language: ru\n" -"PO-Revision-Date: 2017-06-06 10:18-0400\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 "" +"PO-Revision-Date: 2017-06-29 07:15-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "(Доверенный)" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "(возможна двойная трата)" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* Предложенный платёж может быть удалён если 1) вы создали этот платёж и никто его еще не подписал, или 2) если прошло более 24 часов с момента его создания." -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" msgstr "" #: www/views/feedback/rateApp.html:7 @@ -43,11 +43,11 @@ msgstr "=896t7!" msgid "A member of the team will review your feedback as soon as possible." msgstr "Участник команды рассмотрит ваш отзыв при первой возможности." -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "Всего {{amountAboveMaxSizeStr}} было исключено. Превышен максимальный размер, разрешенный для транзакции." -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "Примечание: в общей сложности {{amountBelowFeeStr}} было исключено. Эти средства входят поступившие в UTXOs меньше чем комиссия сети." @@ -57,7 +57,7 @@ msgid "About" msgstr "О проекте" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "Принято" @@ -76,15 +76,15 @@ msgstr "Номер учётной записи" msgid "Accounts" msgstr "Аккаунты" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "Активность" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "Добавить учётную запись" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "L; pkoi[jpiouhouihuiykjb jvgbgyfcthgfvjyuhnij; okml',./; lkmjnhbg v?" @@ -97,7 +97,7 @@ msgstr "Добавить контакт" msgid "Add Funds" msgstr "Пополнить счёт" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "Добавить памятку" @@ -117,10 +117,18 @@ msgstr "gfhcdtgfdth" msgid "Add an optional password to secure the recovery phrase" msgstr "Добавьте необязательный пароль для защиты ключевого словосочетания" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "Добавить описание" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "" + #: www/views/add.html:3 msgid "Add wallet" msgstr "Добавить кошелёк" @@ -153,7 +161,7 @@ msgstr "Дополнительные возможности" msgid "Advanced Settings" msgstr "Расширенные настройки" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "Все" @@ -197,11 +205,15 @@ msgstr "Сумма" msgid "Amount below minimum allowed" msgstr "Сумма ниже допустимого минимума" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "Слишком большая сумма" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "Доступно обновление. Для вашей же безопасности, пожалуйста, обновитесь до последней версии." @@ -209,6 +221,10 @@ msgstr "Доступно обновление. Для вашей же безоп msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "Любой, у кого есть доступ к вашему ключевому словосочетанию, может потратить ваши биткойны." +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "За вами сейчас кто-нибудь смотрит?" @@ -324,7 +340,7 @@ msgstr "BitPay Visa® картыllllll" msgid "Bitcoin Address" msgstr "Биткойн-адрес" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -359,7 +375,7 @@ msgid "Broadcast Payment" msgstr "Отправить платёж" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "Отправка" @@ -375,7 +391,7 @@ msgstr "Браузер не поддерживается" msgid "Buy & Sell Bitcoin" msgstr "Купить & продать биткойн" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "Купить биткойн" @@ -387,8 +403,9 @@ msgstr "Покупка биткойн..." msgid "Calculating fee" msgstr "Вычисление комиссии" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -441,8 +458,7 @@ msgstr "Очистить" msgid "Clear cache" msgstr "Очистить кэш" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "Click" @@ -466,12 +482,13 @@ msgstr "Хэш версии" msgid "Complete the backup process to use this option" msgstr "Завершите процесс резервного копирования для использования этой опции" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -488,27 +505,19 @@ msgstr "Подтвердить & Завершить" msgid "Confirm your PIN" msgstr "Подтвердите Ваш PIN-код" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "Подтвердите ваш новый платёжный пароль" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "Подтверждения" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: 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 "Подключить мою BitPay Card" @@ -525,7 +534,7 @@ msgstr "Подключение к Glidera..." msgid "Connection reset by peer" msgstr "Соединение сброшено другой стороной" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "Контакты" @@ -580,7 +589,7 @@ msgstr "Не удалось получить доступ к кошельку н msgid "Could not access wallet" msgstr "Не удалось получить доступ к кошельку" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "Не удалось добавить сообщение в импортированный кошелёк без общего ключа шифрования" @@ -592,10 +601,18 @@ msgstr "Не удалось отправить платёж" msgid "Could not build transaction" msgstr "Не удалось создать транзакцию" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "Не удалось создать адрес" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "Не удалось создать используя указанный расширенный закрытый ключ" @@ -608,7 +625,7 @@ msgstr "Не удалось создать используя указанный msgid "Could not create: Invalid wallet recovery phrase" msgstr "Не удалось создать: недействительное ключевое словосочетание" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "Не удалось расшифровать файл, проверьте пароль" @@ -616,21 +633,25 @@ msgstr "Не удалось расшифровать файл, проверьт msgid "Could not delete payment proposal" msgstr "Не удалось удалить предложенный платёж" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "Не удалось получить динамическую комиссию" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "Не удалось получить динамическую комиссию для уровня: {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "Не удалось получить транзакции" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "Не удалось импортировать" @@ -655,7 +676,7 @@ msgstr "Не удалось удалить аккаунт" msgid "Could not remove card" msgstr "Не удалось удалить карту" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "Не удалось сохранить параметры на сервере" @@ -663,21 +684,21 @@ msgstr "Не удалось сохранить параметры на серв msgid "Could not send payment" msgstr "Не удалось отправить платёж" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "Не удалось обновить журнал транзакций" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "Не удалось обновить кошелёк" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "Не удалось обновить кошельки" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "Создать личный кошелёк" @@ -687,8 +708,8 @@ msgid "Create Shared Wallet" msgstr "Создать общий кошелёк" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "Создать биткойн-кошелёк" @@ -735,7 +756,7 @@ msgstr "Дата" msgid "Delete" msgstr "Удалить" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "Удалить предложенный платёж" @@ -767,8 +788,12 @@ msgstr "Путь деривации" msgid "Derivation Strategy" msgstr "Стратегия деривации" +#: www/views/topup.html:45 +msgid "Details" +msgstr "" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "Отключено" @@ -786,7 +811,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "Не видите свой язык на Crowdin? Свяжитесь с владельцем по Crowdin! Мы с удовольствием поддержим ваш язык." #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "Скачать" @@ -794,7 +819,7 @@ msgstr "Скачать" 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 "Любой биткойн-кошелёк может создать миллиарды адресов из вашей ключевой фразы. Новый адрес автоматически генерируется каждый раз, когда вы получаете платеж." -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "Экономичная" @@ -835,16 +860,16 @@ msgstr "Чтобы начать, включите камеру." msgid "Enter Amount" msgstr "Введите сумму" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "Введите платёжный пароль" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "Введите второй фактор вашей учётной записи BitPay" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Введите новый платёжный пароль" @@ -866,13 +891,12 @@ msgstr "Введите пароль" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -889,30 +913,30 @@ msgstr "Введите пароль" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -920,14 +944,18 @@ msgstr "Введите пароль" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Ошибка" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "Ошибка при подтверждении" @@ -935,6 +963,14 @@ msgstr "Ошибка при подтверждении" msgid "Error creating wallet" msgstr "Ошибка создания кошелька" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" msgstr "" @@ -955,14 +991,14 @@ msgstr "Ошибка обновления Дебетовых Карт" msgid "Exceeded daily limit of $500 per user" msgstr "Превышен дневной лимит в 500$ на пользователя" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "Истекла" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "истёк" @@ -979,7 +1015,7 @@ msgstr "Экспорт в файл" msgid "Export wallet" msgstr "Экспорт кошелька" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "Экспорт QR-кодом не поддерживается для этого кошелька" @@ -1005,12 +1041,12 @@ msgstr "Не удалось экспортировать" msgid "Family vacation funds" msgstr "Отпускной бюджет" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "Комиссия" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" msgstr "" @@ -1048,6 +1084,7 @@ msgstr "Для целей ревизии" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "От" @@ -1056,6 +1093,10 @@ msgstr "От" msgid "From BitPay account" msgstr "С аккаунта BitPay" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "На целевом устройстве выберите \"Добавить кошелёк\" > \"Импорт кошелька\" и отсканируйте этот QR-код" @@ -1068,10 +1109,18 @@ msgstr "Средства заблокированы предложенным п msgid "Funds found:" msgstr "Обнаружены средства:" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "Средства переведены" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "Средства будут переведены на" @@ -1109,20 +1158,20 @@ msgstr "Начните, добавив первый контакт." msgid "Getting fee levels..." msgstr "Получение информации о комиссиях..." -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "Вернуться" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "Вернуться" @@ -1149,7 +1198,7 @@ msgstr "Аппаратный кошелёк" msgid "Help & Support" msgstr "Помощь и поддержка" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "Информация о помощи и поддержке доступна на сайте." @@ -1258,7 +1307,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:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "Импорт" @@ -1284,7 +1333,7 @@ msgstr "Для проверки резервной копии требуется #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "Не все совладельцы присоединились" @@ -1297,31 +1346,36 @@ msgstr "Не все совладельцы присоединились" msgid "Incorrect PIN, try again." msgstr "Неверный PIN-код, попробуйте снова." -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "Неверный адрес" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "Некорректный формат QR-кода" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "Недостаточно средств" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Недостаточно средств на комиссию" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "Недействительно" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "Недопустимый номер учётной записи" @@ -1334,8 +1388,8 @@ msgid "Invalid data" msgstr "Недопустимые данные" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "Недействительный путь деривации" @@ -1343,6 +1397,10 @@ msgstr "Недействительный путь деривации" msgid "Invitation to share a {{appName}} Wallet" msgstr "Приглашение присоединиться к кошельку {{appName}}" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "Есть ли что-то, что мы могли бы сделать лучше?" @@ -1393,16 +1451,10 @@ msgstr "Ключ уже связан с существующим кошельк msgid "Language" msgstr "Язык" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 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 "Давайте проверим ваше ключевое словосочетание." @@ -1444,6 +1496,10 @@ msgstr "Действует блокировка. Пожалуйста, подо msgid "Log out" msgstr "" +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "" + #: www/views/includes/walletHistory.html:27 msgid "Low fees" msgstr "Маленькая комиссия" @@ -1469,14 +1525,14 @@ msgstr "Я" msgid "Meh - it's alright" msgstr "Ну так, терпимо" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "Памятка" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "Сообщение от продавца" @@ -1497,12 +1553,12 @@ msgstr "Отсутствуют закрытые ключи для подписи msgid "More Options" msgstr "Дополнительные параметры" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "Перемещено" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "Перемещённые средства" @@ -1525,6 +1581,10 @@ msgstr "Название" msgid "Network" msgstr "Сеть" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "Ошибка сети" @@ -1533,7 +1593,7 @@ msgstr "Ошибка сети" msgid "New Proposal" msgstr "Предложить платёж" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "Адрес не может быть сгенерирован. Попробуйте позже." @@ -1573,7 +1633,11 @@ msgstr "Нет предложенных платежей" msgid "No recent transactions" msgstr "Нет недавних транзакций" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "Транзакций пока не было" @@ -1585,15 +1649,15 @@ msgstr "Кошельки не обнаружены" msgid "No wallet selected" msgstr "Не выбран кошелёк" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" -msgstr "Кошельки недоступны" +msgstr "" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" msgstr "Некуда перевести средства" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "Обычная" @@ -1601,7 +1665,7 @@ msgstr "Обычная" msgid "Not authorized" msgstr "Не авторизован" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "Недостаточно средств для уплаты комиссии" @@ -1635,7 +1699,7 @@ msgstr "Уведомления" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" msgstr "" @@ -1647,8 +1711,9 @@ msgstr "Если это устройство окажется утеряно, б msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "Самое время оценить окружение. Окна поблизости? Скрытые камеры? Плечешпионы?" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "ХОРОШО" @@ -1667,11 +1732,11 @@ msgstr "Официальный оригинал" msgid "Oh no!" msgstr "О, нет!" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "На этой вкладке вы можете видеть все ваши кошельки, учетные записи и активы." -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Открыть" @@ -1688,8 +1753,8 @@ msgstr "Открытые GitHub" msgid "Open GitHub Project" msgstr "Откройте проект GitHub" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "Открыть Insight" @@ -1724,7 +1789,7 @@ msgstr "Заказать BitPay Card" msgid "Password" msgstr "Пароль" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "Необходим пароль. Убедитесь, что вы ввели ваш пароль в дополнительных настройках" @@ -1760,7 +1825,7 @@ msgstr "Предложенный платёж" msgid "Payment Proposal Created" msgstr "Платёж предложен" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "Предложенные платежи" @@ -1783,7 +1848,7 @@ msgstr "Платёж отклонён" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Платёж отправлен" @@ -1796,7 +1861,7 @@ msgstr "Платёж принят, но пока не отправлен" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "Платёж принят и будет отправлен Glidera. В случае проблем он может быть удалён спустя шесть часов после создания." -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "Детали платежа" @@ -1804,10 +1869,6 @@ msgstr "Детали платежа" msgid "Payment request" msgstr "Запрос платежа" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "Ожидают" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "Рассматриваемые платежи" @@ -1828,12 +1889,12 @@ msgstr "Внимательно запишите ключевое словосо msgid "Please connect a camera to get started." msgstr "Чтобы начать, подключите камеру." -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "Введите ключевое словосочетание" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "Введите ключевое словосочетание кошелька" @@ -1849,11 +1910,11 @@ msgstr "Тапните каждое слово в правильном поря msgid "Please upgrade Copay to perform this action" msgstr "Пожалуйста, обновите Copay для выполнения этого действия" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "Пожалуйста, выберите ваш файл резервной копии" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" msgstr "" @@ -1869,11 +1930,11 @@ msgstr "Подготовка адресов..." msgid "Preparing backup..." msgstr "Подготовка резервной копии..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "Нажмите еще раз для выхода" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "Приоритетная" @@ -1890,7 +1951,7 @@ msgid "Proposal Accepted" msgstr "Платёж принят" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Платёж создан" @@ -1903,7 +1964,7 @@ msgstr "Платёж удалён" msgid "Proposal Rejected" msgstr "Платёж отклонён" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "Предложенные платежи" @@ -1924,7 +1985,7 @@ msgid "Quick review!" msgstr "Быстрый просмотр!" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "Случайное" @@ -1950,16 +2011,16 @@ msgstr "Получить" msgid "Received" msgstr "Получено" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "Полученные средства" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "Получение" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "Недавние" @@ -1969,12 +2030,12 @@ msgid "Recent Transaction Card" msgstr "Недавние транзакции" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "Недавние транзакции" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "Получатель" @@ -1996,7 +2057,7 @@ msgid "Recreating Wallet..." msgstr "Воссоздаю кошелёк..." #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "Отклонён" @@ -2072,7 +2133,6 @@ 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 @@ -2092,6 +2152,10 @@ msgstr "Сканирование QR-кодов" msgid "Scan addresses for funds" msgstr "Просканировать адреса для обнаружения средств" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "Пожалуйста, отсканируйте ваш отпечаток пальца" @@ -2108,7 +2172,7 @@ msgstr "Скриншоты не безопасны" msgid "Search Transactions" msgstr "Поиск транзакций" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "Найти или ввести биткойн-адрес" @@ -2166,7 +2230,7 @@ msgstr "Отправить адреса по email" msgid "Send by email" msgstr "Отправить на email" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "Отправить от" @@ -2201,17 +2265,18 @@ msgstr "Отправляю максимальную сумму" msgid "Sending transaction" msgstr "Отправка транзакции" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Отправка {{amountStr}} из вашего кошелька {{name}}" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "Отправлено" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "Отправленные средства" @@ -2276,11 +2341,11 @@ msgstr "Показать адрес" msgid "Show advanced options" msgstr "Показать дополнительные параметры" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "Показать биткойн-адрес" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "Показать еще" @@ -2306,13 +2371,12 @@ msgstr "Кошелёк с одним адресом" msgid "Skip" msgstr "Пропустить" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "Сдвинуть" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "Указать ключевое словосочетание..." @@ -2328,7 +2392,11 @@ msgstr "Платёж не найден" msgid "Spending Password needed" msgstr "Необходим платёжный пароль" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "Начать отправку bitcoin" @@ -2340,7 +2408,11 @@ msgstr "Запуск..." msgid "Startup Lock" msgstr "Блокировка при запуске" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "Очень экономичная" @@ -2386,7 +2458,7 @@ msgid "Terms of Use" msgstr "Условия использования" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "Testnet" @@ -2445,7 +2517,7 @@ msgstr "Официальные Условия обслуживания на ан msgid "The password of the recovery phrase (if set)" msgstr "Пароль ключевого словосочетания (если установлен)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "Платёж был создан, но не может быть завершен. Пожалуйста, вернитесь на вкладку Обзор и попробуйте снова" @@ -2488,13 +2560,13 @@ msgstr "Адрес сервера Bitcore" msgid "There are no wallets to make this payment" msgstr "Нет кошельков, чтобы осуществить этот платёж" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "Доступна новая версия {{appName}}" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "Ошибка в форме" @@ -2511,7 +2583,7 @@ msgstr "Замечательное приложение!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "" -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "Этот запрос платежа истёк." @@ -2525,6 +2597,10 @@ msgstr "" msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "Это ключевое словосочетание было создано с паролем. Для восстановления кошелька необходимо ключевое словосочетание и его пароль." +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "" + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "" @@ -2534,33 +2610,46 @@ msgstr "" msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "Это кошелёк не зарегистрирован на данном сервере Bitcore. Вы можете воссоздать его из локальной информации." -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "Хронология" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "Кому" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Чтобы начать работу, купите биткойн или поделитесь вашим адресом. Вы можете получать биткойны из любого кошелька или сервиса." -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Чтобы начать работу, вам нужно создать кошелёк и получить биткойн." +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "" + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "Баланс кошелька" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "Всего заблокировано средств" @@ -2568,6 +2657,10 @@ msgstr "Всего заблокировано средств" msgid "Total number of copayers" msgstr "Количество совладельцев" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2590,12 +2683,20 @@ msgstr "Транзакция уже отправлена" msgid "Transaction created" msgstr "Транзакция создана" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "Транзакция недоступна в данный момент" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "Транзакция не обнаружена" @@ -2603,7 +2704,7 @@ msgstr "Транзакция не обнаружена" msgid "Transfer to" msgstr "" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "Перевод в кошелёк" @@ -2623,7 +2724,7 @@ msgstr "Введите ключевое словосочетание (обычн msgid "Uh oh..." msgstr "Упс..." -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "Неподтверждено" @@ -2631,7 +2732,7 @@ msgstr "Неподтверждено" msgid "Unit" msgstr "Единица измерения" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "Неотправленные транзакции" @@ -2643,7 +2744,7 @@ msgstr "Неиспользованные адреса" msgid "Unused Addresses Limit" msgstr "Лимит неиспользованных адресов" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "Доступно обновление" @@ -2651,7 +2752,7 @@ msgstr "Доступно обновление" msgid "Updating pending proposals. Please stand by" msgstr "Обновление ожидающих рассмотрения платежей. Подождите, пожалуйста" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "Обновление истории транзакций. Подождите, пожалуйста." @@ -2659,7 +2760,7 @@ msgstr "Обновление истории транзакций. Подожди msgid "Updating... Please stand by" msgstr "Обновление... Подождите, пожалуйста" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "Срочно" @@ -2671,6 +2772,10 @@ msgstr "Использовать неподтверждённые средств msgid "Validating recovery phrase..." msgstr "Проверка ключевого словосочетания..." +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2688,20 +2793,20 @@ msgstr "Просмотреть все адреса" msgid "View Terms of Service" msgstr "Посмотреть Условия обслуживания" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "Просмотреть транзакцию на Insight" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "Просмотреть обновление" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "Посмотреть в блокчейне" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "ВНИМАНИЕ: Деривация ключей не работает на этом устройстве/кошельке. Никакие действия не могут быть произведены с этим кошельком." @@ -2759,6 +2864,10 @@ msgstr "Идентификатор кошелька" msgid "Wallet Information" msgstr "Информация о кошельке" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "Приглашение присоединиться к кошельку" @@ -2792,7 +2901,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "Ключевое словосочетание кошелька недействительно" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "Адрес сервера Bitcore" @@ -2801,6 +2910,7 @@ msgid "Wallet Settings" msgstr "Параметры кошелька" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "Тип кошелька" @@ -2850,7 +2960,7 @@ msgstr "Резервное копирование не выполнено" msgid "Wallet not found" msgstr "Кошелёк не найден" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "Кошелёк не зарегистрирован" @@ -2866,7 +2976,7 @@ msgstr "Ключевое словосочетание недоступно." msgid "Wallet service not found" msgstr "Сервер Bitcore не найден" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "Кошельки" @@ -2935,7 +3045,7 @@ msgstr "" msgid "Would you like to receive push notifications about payments?" msgstr "Вы хотели бы получать push-уведомления о платежах?" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "Неподходящее количество слов в ключевом словосочетании:" @@ -2992,14 +3102,14 @@ msgid "You'll receive email notifications about payments sent and received from msgstr "Вы будете получать email-уведомления о входящих и исходящих платежах." #: 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." +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." msgstr "" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "Резервная копия кошелька создана!" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "Ваш кошелёк готов!" @@ -3024,13 +3134,13 @@ msgstr "Ваш пароль" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "Ваш кошелёк никогда не сохраняется в облачное хранилище или в резервные копии устройства." -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 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/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3057,17 +3167,17 @@ msgstr "name@example.com" msgid "preparing..." msgstr "Подготавливается..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "принять" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "оплатить" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "отправить" @@ -3075,11 +3185,15 @@ 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 "{{appName}} требует Bitcore для координации совладельцев и получения информации из блокчейна. По-умолчанию используется сервер https://bws.bitpay.com (публичный сервер Bitcore компании BitPay)." -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} будет использовано для оплаты комиссии." -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} транзакций загружено" diff --git a/i18n/po/template.pot b/i18n/po/template.pot index b267e4465..7d5b41420 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -4,25 +4,25 @@ 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:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" msgstr "" #: www/views/feedback/rateApp.html:7 @@ -34,11 +34,11 @@ msgstr "" msgid "A member of the team will review your feedback as soon as possible." msgstr "" -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "" -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "" @@ -48,7 +48,7 @@ msgid "About" msgstr "" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "" @@ -67,15 +67,15 @@ msgstr "" msgid "Accounts" msgstr "" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "" @@ -88,7 +88,7 @@ msgstr "" msgid "Add Funds" msgstr "" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "" @@ -108,10 +108,18 @@ msgstr "" msgid "Add an optional password to secure the recovery phrase" msgstr "" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "" + #: www/views/add.html:3 msgid "Add wallet" msgstr "" @@ -144,7 +152,7 @@ msgstr "" msgid "Advanced Settings" msgstr "" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "" @@ -188,11 +196,15 @@ msgstr "" msgid "Amount below minimum allowed" msgstr "" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "" @@ -200,6 +212,10 @@ msgstr "" msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "" +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "" @@ -315,7 +331,7 @@ msgstr "" msgid "Bitcoin Address" msgstr "" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -350,7 +366,7 @@ msgid "Broadcast Payment" msgstr "" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "" @@ -366,7 +382,7 @@ msgstr "" msgid "Buy & Sell Bitcoin" msgstr "" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "" @@ -378,8 +394,9 @@ msgstr "" msgid "Calculating fee" msgstr "" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -432,8 +449,7 @@ msgstr "" msgid "Clear cache" msgstr "" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "" @@ -457,12 +473,13 @@ msgstr "" msgid "Complete the backup process to use this option" msgstr "" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -479,27 +496,19 @@ msgstr "" msgid "Confirm your PIN" msgstr "" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: 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 "" @@ -516,7 +525,7 @@ msgstr "" msgid "Connection reset by peer" msgstr "" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "" @@ -571,7 +580,7 @@ msgstr "" msgid "Could not access wallet" msgstr "" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "" @@ -583,10 +592,18 @@ msgstr "" msgid "Could not build transaction" msgstr "" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "" @@ -599,7 +616,7 @@ msgstr "" msgid "Could not create: Invalid wallet recovery phrase" msgstr "" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "" @@ -607,21 +624,25 @@ msgstr "" msgid "Could not delete payment proposal" msgstr "" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "" @@ -646,7 +667,7 @@ msgstr "" msgid "Could not remove card" msgstr "" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "" @@ -654,21 +675,21 @@ msgstr "" msgid "Could not send payment" msgstr "" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "" @@ -678,8 +699,8 @@ msgid "Create Shared Wallet" msgstr "" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "" @@ -726,7 +747,7 @@ msgstr "" msgid "Delete" msgstr "" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "" @@ -758,8 +779,12 @@ msgstr "" msgid "Derivation Strategy" msgstr "" +#: www/views/topup.html:45 +msgid "Details" +msgstr "" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "" @@ -777,7 +802,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "" #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "" @@ -785,7 +810,7 @@ msgstr "" 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 "" -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "" @@ -826,16 +851,16 @@ msgstr "" msgid "Enter Amount" msgstr "" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "" @@ -857,13 +882,12 @@ msgstr "" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -880,30 +904,30 @@ msgstr "" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -911,14 +935,18 @@ msgstr "" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "" @@ -926,6 +954,14 @@ msgstr "" msgid "Error creating wallet" msgstr "" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" msgstr "" @@ -946,14 +982,14 @@ msgstr "" msgid "Exceeded daily limit of $500 per user" msgstr "" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "" @@ -970,7 +1006,7 @@ msgstr "" msgid "Export wallet" msgstr "" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "" @@ -996,12 +1032,12 @@ msgstr "" msgid "Family vacation funds" msgstr "" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" msgstr "" @@ -1039,6 +1075,7 @@ msgstr "" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "" @@ -1047,6 +1084,10 @@ msgstr "" msgid "From BitPay account" msgstr "" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "" @@ -1059,10 +1100,18 @@ msgstr "" msgid "Funds found:" msgstr "" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "" @@ -1100,20 +1149,20 @@ msgstr "" msgid "Getting fee levels..." msgstr "" -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "" @@ -1140,7 +1189,7 @@ msgstr "" msgid "Help & Support" msgstr "" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "" @@ -1249,7 +1298,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:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "" @@ -1275,7 +1324,7 @@ msgstr "" #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "" @@ -1288,31 +1337,36 @@ msgstr "" msgid "Incorrect PIN, try again." msgstr "" -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "" @@ -1325,8 +1379,8 @@ msgid "Invalid data" msgstr "" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "" @@ -1334,6 +1388,10 @@ msgstr "" msgid "Invitation to share a {{appName}} Wallet" msgstr "" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "" @@ -1384,16 +1442,10 @@ msgstr "" msgid "Language" msgstr "" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 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 "" @@ -1435,6 +1487,10 @@ msgstr "" msgid "Log out" msgstr "" +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "" + #: www/views/includes/walletHistory.html:27 msgid "Low fees" msgstr "" @@ -1460,14 +1516,14 @@ msgstr "" msgid "Meh - it's alright" msgstr "" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "" @@ -1488,12 +1544,12 @@ msgstr "" msgid "More Options" msgstr "" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "" @@ -1516,6 +1572,10 @@ msgstr "" msgid "Network" msgstr "" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "" @@ -1524,7 +1584,7 @@ msgstr "" msgid "New Proposal" msgstr "" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "" @@ -1564,7 +1624,11 @@ msgstr "" msgid "No recent transactions" msgstr "" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "" @@ -1576,7 +1640,7 @@ msgstr "" msgid "No wallet selected" msgstr "" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" msgstr "" @@ -1584,7 +1648,7 @@ msgstr "" msgid "No wallets available to receive funds" msgstr "" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "" @@ -1592,7 +1656,7 @@ msgstr "" msgid "Not authorized" msgstr "" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "" @@ -1626,7 +1690,7 @@ msgstr "" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" msgstr "" @@ -1638,8 +1702,9 @@ msgstr "" msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "" @@ -1658,11 +1723,11 @@ msgstr "" msgid "Oh no!" msgstr "" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "" -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "" @@ -1679,8 +1744,8 @@ msgstr "" msgid "Open GitHub Project" msgstr "" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "" @@ -1715,7 +1780,7 @@ msgstr "" msgid "Password" msgstr "" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "" @@ -1751,7 +1816,7 @@ msgstr "" msgid "Payment Proposal Created" msgstr "" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "" @@ -1774,7 +1839,7 @@ msgstr "" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "" @@ -1787,7 +1852,7 @@ msgstr "" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "" -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "" @@ -1795,10 +1860,6 @@ msgstr "" msgid "Payment request" msgstr "" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "" @@ -1819,12 +1880,12 @@ msgstr "" msgid "Please connect a camera to get started." msgstr "" -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "" @@ -1840,11 +1901,11 @@ msgstr "" msgid "Please upgrade Copay to perform this action" msgstr "" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" msgstr "" @@ -1860,11 +1921,11 @@ msgstr "" msgid "Preparing backup..." msgstr "" -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "" @@ -1881,7 +1942,7 @@ msgid "Proposal Accepted" msgstr "" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "" @@ -1894,7 +1955,7 @@ msgstr "" msgid "Proposal Rejected" msgstr "" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "" @@ -1915,7 +1976,7 @@ msgid "Quick review!" msgstr "" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "" @@ -1941,16 +2002,16 @@ msgstr "" msgid "Received" msgstr "" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "" @@ -1960,12 +2021,12 @@ msgid "Recent Transaction Card" msgstr "" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "" @@ -1987,7 +2048,7 @@ msgid "Recreating Wallet..." msgstr "" #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "" @@ -2063,7 +2124,6 @@ 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 @@ -2083,6 +2143,10 @@ msgstr "" msgid "Scan addresses for funds" msgstr "" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "" @@ -2099,7 +2163,7 @@ msgstr "" msgid "Search Transactions" msgstr "" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "" @@ -2157,7 +2221,7 @@ msgstr "" msgid "Send by email" msgstr "" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "" @@ -2192,17 +2256,18 @@ msgstr "" msgid "Sending transaction" msgstr "" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "" @@ -2267,11 +2332,11 @@ msgstr "" msgid "Show advanced options" msgstr "" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "" @@ -2297,13 +2362,12 @@ msgstr "" msgid "Skip" msgstr "" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "" @@ -2319,7 +2383,11 @@ msgstr "" msgid "Spending Password needed" msgstr "" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "" @@ -2331,7 +2399,11 @@ msgstr "" msgid "Startup Lock" msgstr "" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "" @@ -2377,7 +2449,7 @@ msgid "Terms of Use" msgstr "" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "" @@ -2436,7 +2508,7 @@ msgstr "" msgid "The password of the recovery phrase (if set)" msgstr "" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "" @@ -2479,13 +2551,13 @@ msgstr "" msgid "There are no wallets to make this payment" msgstr "" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "" @@ -2502,7 +2574,7 @@ msgstr "" msgid "This app stores your bitcoin with cutting-edge security." msgstr "" -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "" @@ -2516,6 +2588,10 @@ msgstr "" msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "" +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "" + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "" @@ -2525,33 +2601,46 @@ msgstr "" msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "" -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "" -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "" +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "" + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "" @@ -2559,6 +2648,10 @@ msgstr "" msgid "Total number of copayers" msgstr "" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2581,12 +2674,20 @@ msgstr "" msgid "Transaction created" msgstr "" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "" @@ -2594,7 +2695,7 @@ msgstr "" msgid "Transfer to" msgstr "" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "" @@ -2614,7 +2715,7 @@ msgstr "" msgid "Uh oh..." msgstr "" -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "" @@ -2622,7 +2723,7 @@ msgstr "" msgid "Unit" msgstr "" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "" @@ -2634,7 +2735,7 @@ msgstr "" msgid "Unused Addresses Limit" msgstr "" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "" @@ -2642,7 +2743,7 @@ msgstr "" msgid "Updating pending proposals. Please stand by" msgstr "" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "" @@ -2650,7 +2751,7 @@ msgstr "" msgid "Updating... Please stand by" msgstr "" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "" @@ -2662,6 +2763,10 @@ msgstr "" msgid "Validating recovery phrase..." msgstr "" +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2679,20 +2784,20 @@ msgstr "" msgid "View Terms of Service" msgstr "" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "" @@ -2750,6 +2855,10 @@ msgstr "" msgid "Wallet Information" msgstr "" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "" @@ -2783,7 +2892,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "" @@ -2792,6 +2901,7 @@ msgid "Wallet Settings" msgstr "" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "" @@ -2841,7 +2951,7 @@ msgstr "" msgid "Wallet not found" msgstr "" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "" @@ -2857,7 +2967,7 @@ msgstr "" msgid "Wallet service not found" msgstr "" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "" @@ -2926,7 +3036,7 @@ msgstr "" msgid "Would you like to receive push notifications about payments?" msgstr "" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "" @@ -2983,14 +3093,14 @@ msgid "You'll receive email notifications about payments sent and received from 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." +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." msgstr "" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "" @@ -3015,13 +3125,13 @@ msgstr "" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "" -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 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/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3048,17 +3158,17 @@ msgstr "" msgid "preparing..." msgstr "" -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "" @@ -3066,11 +3176,15 @@ 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/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "" -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "" diff --git a/i18n/po/zh.po b/i18n/po/zh.po index 4838ef00d..c43130fb9 100644 --- a/i18n/po/zh.po +++ b/i18n/po/zh.po @@ -11,27 +11,27 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Chinese Simplified\n" "Language: zh\n" -"PO-Revision-Date: 2017-06-06 10:18-0400\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 "" +"PO-Revision-Date: 2017-06-29 07:15-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" msgstr "（可信的）" #: www/views/includes/txp.html:23 -#: www/views/includes/walletHistory.html:59 +#: www/views/includes/walletHistory.html:64 msgid "(possible double spend)" msgstr "（重复支付）" -#: www/views/modals/txp-details.html:160 +#: www/views/modals/txp-details.html:161 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 "* 如果 1) 你是创造者，及没有其他 copayer 签名，或 2) 24 小时已经过去，支付提议将被删除。" -#: www/views/confirm.html:84 -msgid "- {{feeRateStr}} of the transaction" +#: www/views/tx-details.html:84 +msgid "- {{btx.feeRateStr}} of the transaction" +msgstr "" + +#: www/views/modals/txp-details.html:104 +msgid "- {{tx.feeRateStr}} of the transaction" msgstr "" #: www/views/feedback/rateApp.html:7 @@ -43,11 +43,11 @@ msgstr "5 星评级帮助我们进入更多的人手, {{appName}} 和更多的 msgid "A member of the team will review your feedback as soon as possible." msgstr "团队的成员将尽快审查您的反馈意见。" -#: src/js/controllers/confirm.js:238 +#: src/js/controllers/confirm.js:347 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "备注︰共有{{amountAboveMaxSizeStr}} 被排除了。超出了交易允许的最大体积" -#: src/js/controllers/confirm.js:232 +#: src/js/controllers/confirm.js:341 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "备注：共有{{amountBelowFeeStr}} 被排除了。这些来自 UTXOs 的资金小于提供的网络费用。" @@ -57,7 +57,7 @@ msgid "About" msgstr "关于" #: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:66 +#: src/js/controllers/tx-details.js:60 msgid "Accepted" msgstr "同意" @@ -76,15 +76,15 @@ msgstr "帐号" msgid "Accounts" msgstr "帐户" -#: www/views/bitpayCard.html:68 +#: www/views/bitpayCard.html:56 msgid "Activity" msgstr "活动" -#: src/js/services/bitpayAccountService.js:77 +#: src/js/services/bitpayAccountService.js:83 msgid "Add Account" msgstr "添加帐户" -#: src/js/services/bitpayAccountService.js:68 +#: src/js/services/bitpayAccountService.js:69 msgid "Add BitPay Account?" msgstr "添加 BitPay 帐户吗？" @@ -97,7 +97,7 @@ msgstr "添加联系人" msgid "Add Funds" msgstr "添加金额" -#: www/views/confirm.html:89 +#: www/views/confirm.html:96 msgid "Add Memo" msgstr "添加备注" @@ -117,10 +117,18 @@ msgstr "添加帐户" msgid "Add an optional password to secure the recovery phrase" msgstr "添加可选的密码，以保护恢复短语" -#: src/js/controllers/confirm.js:297 +#: src/js/controllers/confirm.js:370 msgid "Add description" msgstr "添加描述" +#: www/views/topup.html:6 +msgid "Add funds" +msgstr "" + +#: src/js/services/bitpayAccountService.js:78 +msgid "Add this BitPay account ({{email}})?" +msgstr "" + #: www/views/add.html:3 msgid "Add wallet" msgstr "添加钱包" @@ -153,7 +161,7 @@ msgstr "進階" msgid "Advanced Settings" msgstr "进阶设置" -#: www/views/bitpayCard.html:74 +#: www/views/bitpayCard.html:62 msgid "All" msgstr "全选" @@ -197,11 +205,15 @@ msgstr "数额" msgid "Amount below minimum allowed" msgstr "数额低于最低允许值" -#: src/js/controllers/confirm.js:414 +#: src/js/controllers/confirm.js:188 msgid "Amount too big" msgstr "量太大" -#: src/js/controllers/tab-home.js:143 +#: www/views/includes/walletHistory.html:31 +msgid "Amount too low to spend" +msgstr "" + +#: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." msgstr "本程序有一个可用的更新。为了您的安全，请更新到最新版本。" @@ -209,6 +221,10 @@ msgstr "本程序有一个可用的更新。为了您的安全，请更新到最 msgid "Anyone with your backup phrase can access or spend your bitcoin." msgstr "任何人只要持有你的备份短语，就可以访问或者花掉你的比特币。" +#: www/views/addresses.html:94 +msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "" + #: www/views/backupWarning.html:10 msgid "Are you being watched?" msgstr "你正在被监视吗？" @@ -324,7 +340,7 @@ msgstr "BitPay Visa® 牌" msgid "Bitcoin Address" msgstr "比特币地址" -#: www/views/modals/chooseFeeLevel.html:7 +#: www/views/modals/chooseFeeLevel.html:4 #: www/views/preferencesFee.html:4 #: www/views/tab-settings.html:85 msgid "Bitcoin Network Fee Policy" @@ -359,7 +375,7 @@ msgid "Broadcast Payment" msgstr "广播支付" #: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:68 +#: src/js/controllers/tx-details.js:62 msgid "Broadcasted" msgstr "广播商" @@ -375,7 +391,7 @@ msgstr "不受支持的浏览器" msgid "Buy & Sell Bitcoin" msgstr "购买或出售比特币" -#: www/views/tab-send.html:31 +#: www/views/tab-send.html:35 msgid "Buy Bitcoin" msgstr "购买比特币" @@ -387,8 +403,9 @@ msgstr "正在发送 比特币..." msgid "Calculating fee" msgstr "正在计算费用" -#: src/js/controllers/confirm.js:498 -#: src/js/services/popupService.js:59 +#: src/js/controllers/confirm.js:491 +#: src/js/controllers/topup.js:277 +#: src/js/services/popupService.js:60 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 #: www/views/includes/note.html:6 @@ -441,8 +458,7 @@ msgstr "清除" msgid "Clear cache" msgstr "清空缓存" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Click" msgstr "点击" @@ -466,12 +482,13 @@ msgstr "提交哈希" msgid "Complete the backup process to use this option" msgstr "" -#: www/views/bitpayCard.html:99 +#: www/views/bitpayCard.html:93 msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:497 +#: src/js/controllers/confirm.js:490 #: src/js/controllers/copayers.js:55 +#: src/js/controllers/topup.js:275 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -488,27 +505,19 @@ msgstr "确认并完成" msgid "Confirm your PIN" msgstr "" -#: src/js/services/walletService.js:940 +#: src/js/services/walletService.js:1034 msgid "Confirm your new spending password" msgstr "" -#: www/views/tx-details.html:92 +#: www/views/tx-details.html:98 msgid "Confirmations" msgstr "确认" -#: www/views/bitpayCard.html:79 +#: www/views/bitpayCard.html:68 #: 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 "我 BitPay 卡连接" @@ -525,7 +534,7 @@ msgstr "正在连接 Glidera..." msgid "Connection reset by peer" msgstr "连接被对方重置" -#: www/views/tab-send.html:41 +#: www/views/tab-send.html:45 msgid "Contacts" msgstr "联系人" @@ -580,7 +589,7 @@ msgstr "无法访问服务器上的钱包。请确认︰" msgid "Could not access wallet" msgstr "无法访问钱包" -#: src/js/controllers/confirm.js:408 +#: src/js/controllers/confirm.js:182 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "无法将消息添加到进口钱包没有共享的加密密钥" @@ -592,10 +601,18 @@ msgstr "无法广播支付" msgid "Could not build transaction" msgstr "无法建立交易" -#: src/js/services/walletService.js:838 +#: src/js/services/walletService.js:857 msgid "Could not create address" msgstr "无法创建地址" +#: src/js/controllers/topup.js:86 +msgid "Could not create the invoice" +msgstr "" + +#: src/js/controllers/topup.js:136 +msgid "Could not create transaction" +msgstr "" + #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" msgstr "无法使用指定的扩展私人密钥创建" @@ -608,7 +625,7 @@ msgstr "无法使用指定的扩展的公钥创建" msgid "Could not create: Invalid wallet recovery phrase" msgstr "无法创建 ︰ 无效的钱包恢复短语" -#: src/js/controllers/import.js:83 +#: src/js/controllers/import.js:99 msgid "Could not decrypt file, check your password" msgstr "无法解密文件，请检查你的密码" @@ -616,21 +633,25 @@ msgstr "无法解密文件，请检查你的密码" msgid "Could not delete payment proposal" msgstr "无法删除支付提议" -#: src/js/services/feeService.js:52 +#: src/js/services/feeService.js:68 msgid "Could not get dynamic fee" msgstr "不能动态费用" -#: src/js/services/feeService.js:32 +#: src/js/services/feeService.js:38 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "无法获取水平动态费用︰ {{feeLevel}}" +#: src/js/controllers/topup.js:94 +msgid "Could not get the invoice" +msgstr "" + #: src/js/controllers/bitpayCard.js:69 msgid "Could not get transactions" msgstr "不能交易" #: src/js/services/profileService.js:595 -#: src/js/services/profileService.js:627 -#: src/js/services/profileService.js:650 +#: src/js/services/profileService.js:629 +#: src/js/services/profileService.js:652 msgid "Could not import" msgstr "无法导入" @@ -655,7 +676,7 @@ msgstr "无法删除帐户" msgid "Could not remove card" msgstr "无法删除卡" -#: src/js/services/walletService.js:757 +#: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" msgstr "无法在服务器上保存首选项" @@ -663,21 +684,21 @@ msgstr "无法在服务器上保存首选项" msgid "Could not send payment" msgstr "无法发送支付" -#: www/views/walletDetails.html:197 +#: src/js/controllers/topup.js:289 +msgid "Could not send transaction" +msgstr "" + +#: www/views/walletDetails.html:199 msgid "Could not update transaction history" msgstr "无法更新交易历史记录" #: src/js/controllers/addresses.js:34 #: src/js/controllers/addresses.js:42 #: src/js/controllers/copayers.js:30 -#: src/js/controllers/walletDetails.js:63 +#: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" msgstr "无法更新钱包" -#: src/js/controllers/confirm.js:130 -msgid "Could not update wallets" -msgstr "无法更新钱包" - #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" msgstr "创建个人的钱包" @@ -687,8 +708,8 @@ msgid "Create Shared Wallet" msgstr "创建自己的免费钱包" #: www/views/onboarding/tour.html:51 -#: www/views/tab-home.html:76 -#: www/views/tab-send.html:32 +#: www/views/tab-home.html:77 +#: www/views/tab-send.html:36 msgid "Create bitcoin wallet" msgstr "创建比特币的钱包" @@ -735,7 +756,7 @@ msgstr "日期" msgid "Delete" msgstr "删除" -#: www/views/modals/txp-details.html:165 +#: www/views/modals/txp-details.html:166 msgid "Delete Payment Proposal" msgstr "删除支付提议" @@ -767,8 +788,12 @@ msgstr "衍生路径" msgid "Derivation Strategy" msgstr "衍生策略" +#: www/views/topup.html:45 +msgid "Details" +msgstr "" + #: src/js/controllers/lockSetup.js:9 -#: src/js/controllers/tab-settings.js:59 +#: src/js/controllers/tab-settings.js:60 msgid "Disabled" msgstr "" @@ -786,7 +811,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo msgstr "在 Crowdin 找不到你的语言？请联系 Crowdin 的所有者！我们很乐意支持你的语言。" #: www/views/tab-export-file.html:59 -#: www/views/tab-home.html:21 +#: www/views/tab-home.html:22 msgid "Download" msgstr "下载" @@ -794,7 +819,7 @@ msgstr "下载" 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 "每个比特币钱包可以从您的 12 字备份生成亿万个地址。一个新的地址是自动生成和显示每个时间你收到付款。" -#: src/js/services/feeService.js:11 +#: src/js/services/feeService.js:13 msgid "Economy" msgstr "经济" @@ -835,16 +860,16 @@ msgstr "使该摄像机开始。" msgid "Enter Amount" msgstr "输入金额" -#: src/js/services/walletService.js:954 -#: src/js/services/walletService.js:969 +#: src/js/services/walletService.js:1048 +#: src/js/services/walletService.js:1063 msgid "Enter Spending Password" msgstr "输入支出密码" -#: src/js/services/bitpayAccountService.js:104 +#: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" msgstr "为您的 BitPay 帐户输入两个因素" -#: src/js/services/walletService.js:936 +#: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "输入新的消费密码" @@ -866,13 +891,12 @@ msgstr "请输入你的密码" #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbookAdd.js:30 #: src/js/controllers/addressbookView.js:29 -#: src/js/controllers/addresses.js:105 -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:130 +#: src/js/controllers/addresses.js:131 #: src/js/controllers/bitpayCard.js:69 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:191 -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -889,30 +913,30 @@ msgstr "请输入你的密码" #: src/js/controllers/export.js:47 #: src/js/controllers/export.js:53 #: src/js/controllers/feedback/send.js:23 -#: src/js/controllers/import.js:100 -#: src/js/controllers/import.js:118 -#: src/js/controllers/import.js:168 -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:205 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:232 -#: src/js/controllers/import.js:243 -#: src/js/controllers/import.js:253 -#: src/js/controllers/import.js:266 -#: src/js/controllers/import.js:278 -#: src/js/controllers/import.js:288 -#: src/js/controllers/import.js:298 -#: src/js/controllers/import.js:322 -#: src/js/controllers/import.js:334 -#: src/js/controllers/import.js:54 -#: src/js/controllers/import.js:67 -#: src/js/controllers/import.js:88 -#: 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/import.js:104 +#: src/js/controllers/import.js:116 +#: src/js/controllers/import.js:134 +#: src/js/controllers/import.js:185 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:222 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:249 +#: src/js/controllers/import.js:260 +#: src/js/controllers/import.js:270 +#: src/js/controllers/import.js:294 +#: src/js/controllers/import.js:307 +#: src/js/controllers/import.js:317 +#: src/js/controllers/import.js:327 +#: src/js/controllers/import.js:351 +#: src/js/controllers/import.js:364 +#: src/js/controllers/import.js:70 +#: src/js/controllers/import.js:83 +#: src/js/controllers/join.js:121 +#: src/js/controllers/join.js:135 +#: src/js/controllers/join.js:142 +#: src/js/controllers/join.js:165 +#: src/js/controllers/join.js:173 +#: src/js/controllers/join.js:191 #: src/js/controllers/modals/txpDetails.js:130 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 @@ -920,14 +944,18 @@ msgstr "请输入你的密码" #: src/js/controllers/preferencesBitpayServices.js:50 #: src/js/controllers/preferencesDelete.js:37 #: src/js/controllers/preferencesExternal.js:20 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 +#: src/js/controllers/tab-send.js:132 +#: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:15 +#: src/js/controllers/topup.js:26 +#: src/js/controllers/tx-details.js:100 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "错误！" -#: src/js/controllers/confirm.js:382 +#: src/js/controllers/confirm.js:443 msgid "Error at confirm" msgstr "在确认错误" @@ -935,6 +963,14 @@ msgstr "在确认错误" msgid "Error creating wallet" msgstr "创建钱包时出现错误" +#: src/js/controllers/confirm.js:261 +msgid "Error getting SendMax information" +msgstr "" + +#: src/js/controllers/topup.js:108 +msgid "Error in Payment Protocol" +msgstr "" + #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" msgstr "" @@ -955,14 +991,14 @@ msgstr "更新借记卡时出错" msgid "Exceeded daily limit of $500 per user" msgstr "超过 500 美元，每个用户的每日限额" -#: src/js/controllers/confirm.js:342 +#: src/js/controllers/confirm.js:407 #: www/views/confirm.html:27 -#: www/views/modals/txp-details.html:120 +#: www/views/modals/txp-details.html:121 msgid "Expired" msgstr "已过期" #: www/views/modals/paypro.html:54 -#: www/views/modals/txp-details.html:126 +#: www/views/modals/txp-details.html:127 msgid "Expires" msgstr "到期" @@ -979,7 +1015,7 @@ msgstr "导出到文件" msgid "Export wallet" msgstr "导出钱包" -#: src/js/services/walletService.js:1081 +#: src/js/services/walletService.js:1175 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" msgstr "此钱包不支持通过 QR 的导出" @@ -1005,12 +1041,12 @@ msgstr "导出失败" msgid "Family vacation funds" msgstr "家庭度假资金" -#: www/views/modals/txp-details.html:101 #: www/views/tx-details.html:81 msgid "Fee" msgstr "费用" #: www/views/confirm.html:81 +#: www/views/modals/txp-details.html:101 msgid "Fee:" msgstr "" @@ -1048,6 +1084,7 @@ msgstr "供审计目的" #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 +#: www/views/topup.html:34 #: www/views/tx-details.html:52 msgid "From" msgstr "来自" @@ -1056,6 +1093,10 @@ msgstr "来自" msgid "From BitPay account" msgstr "从 BitPay 帐户" +#: www/views/tab-import-phrase.html:54 +msgid "From Hardware Wallet" +msgstr "" + #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "从目标设备，请到添加钱包 > 导入钱包和扫描此 QR 代码" @@ -1068,10 +1109,18 @@ msgstr "资金由未决的花费提议锁定" msgid "Funds found:" msgstr "找到资金" +#: www/views/topup.html:49 +msgid "Funds to be added" +msgstr "" + #: www/views/paperWallet.html:53 msgid "Funds transferred" msgstr "资金转移" +#: www/views/topup.html:103 +msgid "Funds were added to debit card" +msgstr "" + #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" msgstr "资金将会转移到" @@ -1109,20 +1158,20 @@ msgstr "通过添加您的第一个开始。" msgid "Getting fee levels..." msgstr "正在获取收费水平..." -#: src/js/controllers/bitpayCard.js:171 #: src/js/controllers/bitpayCard.js:181 +#: src/js/controllers/bitpayCard.js:191 #: 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-home.js:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:169 +#: src/js/controllers/tx-details.js:174 msgid "Go Back" msgstr "返回 #" #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 -#: src/js/services/bitpayAccountService.js:78 +#: src/js/services/bitpayAccountService.js:84 msgid "Go back" msgstr "上一页" @@ -1149,7 +1198,7 @@ msgstr "硬件钱包" msgid "Help & Support" msgstr "帮助与支持" -#: src/js/controllers/bitpayCard.js:169 +#: src/js/controllers/bitpayCard.js:179 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "" @@ -1258,7 +1307,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:63 +#: www/views/tab-import-phrase.html:77 msgid "Import" msgstr "导入" @@ -1284,7 +1333,7 @@ msgstr "为了验证您的钱包的备份，请键入您的密码。" #: www/views/includes/walletItem.html:11 #: www/views/includes/walletSelector.html:18 -#: www/views/tab-home.html:89 +#: www/views/tab-home.html:90 #: www/views/tab-settings.html:117 msgid "Incomplete" msgstr "不完整" @@ -1297,31 +1346,36 @@ msgstr "不完整的钱包" msgid "Incorrect PIN, try again." msgstr "" -#: src/js/services/bwcError.js:113 -msgid "Incorrect address network" -msgstr "地址网络不正确" - #. Trying to import a malformed wallet export QR code -#: src/js/controllers/import.js:54 +#: src/js/controllers/import.js:70 msgid "Incorrect code format" msgstr "代码格式不正确" +#: src/js/services/bwcError.js:113 +msgid "Incorrect network address" +msgstr "" + #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:99 msgid "Insufficient funds" msgstr "资金不足" +#: src/js/controllers/topup.js:159 +#: src/js/controllers/topup.js:171 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "费用的资金不足" -#: www/views/includes/walletHistory.html:44 +#: www/views/includes/walletHistory.html:49 msgid "Invalid" msgstr "无效" +#: src/js/controllers/topup.js:109 +msgid "Invalid URL" +msgstr "" + #: src/js/controllers/create.js:175 -#: src/js/controllers/import.js:298 -#: src/js/controllers/join.js:141 +#: src/js/controllers/import.js:327 +#: src/js/controllers/join.js:142 msgid "Invalid account number" msgstr "帐户号无效" @@ -1334,8 +1388,8 @@ msgid "Invalid data" msgstr "无效的数据" #: src/js/controllers/create.js:155 -#: src/js/controllers/import.js:232 -#: src/js/controllers/join.js:120 +#: src/js/controllers/import.js:249 +#: src/js/controllers/join.js:121 msgid "Invalid derivation path" msgstr "衍生路径无效" @@ -1343,6 +1397,10 @@ msgstr "衍生路径无效" msgid "Invitation to share a {{appName}} Wallet" msgstr "邀请分享 {{appName}} 钱包" +#: www/views/topup.html:56 +msgid "Invoice Fee" +msgstr "" + #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" msgstr "有什么我们可以做得更好吗？" @@ -1393,16 +1451,10 @@ msgstr "钥已经关联现有的钱包" msgid "Language" msgstr "语言" -#: www/views/bitpayCard.html:73 +#: www/views/bitpayCard.html:61 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 "让我们验证您备份的短语。" @@ -1444,6 +1496,10 @@ msgstr "Locktime 在进行中。请稍等以删除花费提议" msgid "Log out" msgstr "" +#: www/views/addresses.html:87 +msgid "Low amount inputs" +msgstr "" + #: www/views/includes/walletHistory.html:27 msgid "Low fees" msgstr "" @@ -1469,14 +1525,14 @@ msgstr "我" msgid "Meh - it's alright" msgstr "咩-没关系" -#: src/js/controllers/tx-details.js:141 +#: src/js/controllers/tx-details.js:146 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 msgid "Memo" msgstr "便签" -#: www/views/modals/txp-details.html:132 +#: www/views/modals/txp-details.html:133 msgid "Merchant Message" msgstr "商人的消息" @@ -1497,12 +1553,12 @@ msgstr "遗失需要签名的私钥" msgid "More Options" msgstr "更多的选择" -#: www/views/includes/walletHistory.html:42 +#: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" msgstr "已调动" -#: src/js/controllers/tx-details.js:117 +#: src/js/controllers/tx-details.js:112 msgid "Moved Funds" msgstr "转移资金" @@ -1525,6 +1581,10 @@ msgstr "名称" msgid "Network" msgstr "网络" +#: www/views/topup.html:63 +msgid "Network Fee" +msgstr "" + #: src/js/services/bwcError.js:47 msgid "Network error" msgstr "网络错误" @@ -1533,7 +1593,7 @@ msgstr "网络错误" msgid "New Proposal" msgstr "新建议" -#: src/js/controllers/addresses.js:106 +#: src/js/controllers/addresses.js:131 msgid "New address could not be generated. Please try again." msgstr "无法生成新的地址。请再试一次。" @@ -1573,7 +1633,11 @@ msgstr "没有挂起的建议" msgid "No recent transactions" msgstr "没有最近的交易" -#: www/views/walletDetails.html:191 +#: src/js/controllers/topup.js:41 +msgid "No signing proposal: No private key" +msgstr "" + +#: www/views/walletDetails.html:193 msgid "No transactions yet" msgstr "没有交易记录" @@ -1585,15 +1649,15 @@ msgstr "发现没有钱包" msgid "No wallet selected" msgstr "没有选定的钱包" -#: www/views/confirm.html:96 +#: src/js/controllers/topup.js:255 msgid "No wallets available" -msgstr "没有可用的钱包" +msgstr "" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" msgstr "没有可用于接收资金的钱包" -#: src/js/services/feeService.js:10 +#: src/js/services/feeService.js:12 msgid "Normal" msgstr "常规" @@ -1601,7 +1665,7 @@ msgstr "常规" msgid "Not authorized" msgstr "尚未授权" -#: src/js/controllers/confirm.js:197 +#: src/js/controllers/confirm.js:271 msgid "Not enough funds for fee" msgstr "费用的资金不足" @@ -1635,7 +1699,7 @@ msgstr "通知" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:110 +#: www/views/tx-details.html:116 msgid "Notify me if confirmed" msgstr "" @@ -1647,8 +1711,9 @@ msgstr "现在是很好的时间进行备份你的钱包。如果此设备丢失 msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "现在是一个完美的时间来评估你的周围。附近的窗户吗？隐藏的摄像机？肩-间谍吗？" -#: src/js/services/popupService.js:15 -#: src/js/services/popupService.js:58 +#: src/js/controllers/topup.js:276 +#: src/js/services/popupService.js:16 +#: src/js/services/popupService.js:59 msgid "OK" msgstr "好的" @@ -1667,11 +1732,11 @@ msgstr "官方英文免责声明" msgid "Oh no!" msgstr "出错。" -#: www/views/tab-home.html:38 +#: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "在此屏幕上您可以看到您的钱包、 帐户和资产。" -#: src/js/controllers/bitpayCard.js:170 +#: src/js/controllers/bitpayCard.js:180 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "打开" @@ -1688,8 +1753,8 @@ msgstr "打开 GitHub" msgid "Open GitHub Project" msgstr "打开 GitHub 项目" -#: src/js/controllers/bitpayCard.js:180 -#: src/js/controllers/tx-details.js:168 +#: src/js/controllers/bitpayCard.js:190 +#: src/js/controllers/tx-details.js:173 msgid "Open Insight" msgstr "开放的洞察力" @@ -1724,7 +1789,7 @@ msgstr "订单 BitPay 卡" msgid "Password" msgstr "密码" -#: src/js/controllers/import.js:67 +#: src/js/controllers/import.js:83 msgid "Password required. Make sure to enter your password in advanced options" msgstr "需要密码。请务必在高级选项中输入你的密码" @@ -1760,7 +1825,7 @@ msgstr "支付提议" msgid "Payment Proposal Created" msgstr "支付提议已创建" -#: www/views/tab-home.html:45 +#: www/views/tab-home.html:46 msgid "Payment Proposals" msgstr "支付提议" @@ -1783,7 +1848,7 @@ msgstr "支付被拒绝" #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:187 +#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "支付已发送" @@ -1796,7 +1861,7 @@ msgstr "支付已被接受，但尚未广播" msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." msgstr "支付以被接受。它将由 Glidera 广播。如果出现问题，它可以在创建后的 6 个小时内删除。" -#: www/views/modals/txp-details.html:108 +#: www/views/modals/txp-details.html:109 msgid "Payment details" msgstr "支付明细" @@ -1804,10 +1869,6 @@ msgstr "支付明细" msgid "Payment request" msgstr "支付请求" -#: www/views/includes/cardActivity.html:41 -msgid "Pending" -msgstr "处理中" - #: www/views/proposals.html:5 msgid "Pending Proposals" msgstr "支付提议" @@ -1828,12 +1889,12 @@ msgstr "请仔细记下这句话。" msgid "Please connect a camera to get started." msgstr "请连接相机入门。" -#: src/js/controllers/import.js:243 +#: src/js/controllers/import.js:260 msgid "Please enter the recovery phrase" msgstr "请输入恢复短语" #: src/js/controllers/create.js:168 -#: src/js/controllers/join.js:134 +#: src/js/controllers/join.js:135 msgid "Please enter the wallet recovery phrase" msgstr "请输入钱包恢复短语" @@ -1849,11 +1910,11 @@ msgstr "请点击每个单词按照正确的顺序。" msgid "Please upgrade Copay to perform this action" msgstr "请升级 Copay 以执行此操作" -#: src/js/controllers/import.js:205 +#: src/js/controllers/import.js:222 msgid "Please, select your backup file" msgstr "请选择你的备份文件" -#: www/views/bitpayCard.html:89 +#: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" msgstr "" @@ -1869,11 +1930,11 @@ msgstr "正在准备地址..." msgid "Preparing backup..." msgstr "正在准备备份..." -#: src/js/routes.js:1176 +#: src/js/routes.js:1196 msgid "Press again to exit" msgstr "再按一次退出" -#: src/js/services/feeService.js:9 +#: src/js/services/feeService.js:11 msgid "Priority" msgstr "优先" @@ -1890,7 +1951,7 @@ msgid "Proposal Accepted" msgstr "提案被接受" #: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:65 +#: src/js/controllers/tx-details.js:59 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "建议创建" @@ -1903,7 +1964,7 @@ msgstr "建议删除" msgid "Proposal Rejected" msgstr "被拒绝的建议" -#: www/views/walletDetails.html:176 +#: www/views/walletDetails.html:178 msgid "Proposals" msgstr "建议" @@ -1924,7 +1985,7 @@ msgid "Quick review!" msgstr "快速审查 ！" #: src/js/controllers/create.js:79 -#: src/js/controllers/join.js:64 +#: src/js/controllers/join.js:65 msgid "Random" msgstr "随机" @@ -1950,16 +2011,16 @@ msgstr "接收" msgid "Received" msgstr "已接收" -#: src/js/controllers/tx-details.js:116 +#: src/js/controllers/tx-details.js:111 msgid "Received Funds" msgstr "收到的资金" -#: www/views/includes/walletHistory.html:52 +#: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" msgstr "接收" -#: www/views/bitpayCard.html:72 +#: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" msgstr "最近" @@ -1969,12 +2030,12 @@ msgid "Recent Transaction Card" msgstr "最近交易卡" #: www/views/activity.html:4 -#: www/views/tab-home.html:57 +#: www/views/tab-home.html:58 msgid "Recent Transactions" msgstr "最近的交易" #: www/views/amount.html:18 -#: www/views/tab-send.html:8 +#: www/views/tab-send.html:9 msgid "Recipient" msgstr "收件人" @@ -1996,7 +2057,7 @@ msgid "Recreating Wallet..." msgstr "正在重新创建的钱包..." #: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:67 +#: src/js/controllers/tx-details.js:61 msgid "Rejected" msgstr "拒绝" @@ -2072,7 +2133,6 @@ 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 @@ -2092,6 +2152,10 @@ msgstr "扫描 QR 码" msgid "Scan addresses for funds" msgstr "扫描资金的地址" +#: www/views/modals/fingerprintCheck.html:11 +msgid "Scan again" +msgstr "" + #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" msgstr "请扫描你的指纹" @@ -2108,7 +2172,7 @@ msgstr "截图是不安全的" msgid "Search Transactions" msgstr "搜索交易" -#: www/views/tab-send.html:11 +#: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" msgstr "搜索或输入比特币地址" @@ -2166,7 +2230,7 @@ msgstr "通过电邮发送地址" msgid "Send by email" msgstr "通过电邮发送" -#: src/js/controllers/confirm.js:276 +#: src/js/controllers/confirm.js:148 msgid "Send from" msgstr "从发送" @@ -2201,17 +2265,18 @@ msgstr "发送的最大金额" msgid "Sending transaction" msgstr "正在发送交易" -#: src/js/controllers/confirm.js:493 +#: src/js/controllers/confirm.js:486 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "从你的 {{name}} 钱包发送 {{amountStr}}" -#: www/views/includes/walletHistory.html:37 +#: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 +#: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" msgstr "已发送" -#: src/js/controllers/tx-details.js:115 +#: src/js/controllers/tx-details.js:110 msgid "Sent Funds" msgstr "已发送的资金" @@ -2276,11 +2341,11 @@ msgstr "" msgid "Show advanced options" msgstr "显示高级选项" -#: www/views/tab-send.html:33 +#: www/views/tab-send.html:37 msgid "Show bitcoin address" msgstr "显示比特币地址" -#: www/views/tab-send.html:55 +#: www/views/tab-send.html:59 msgid "Show more" msgstr "显示更多" @@ -2306,13 +2371,12 @@ msgstr "单一地址钱包" msgid "Skip" msgstr "跳过" -#: src/js/controllers/confirm.js:66 -#: src/js/controllers/modals/txpDetails.js:25 +#: src/js/controllers/modals/txpDetails.js:33 msgid "Slide" msgstr "滑动" #: src/js/controllers/create.js:83 -#: src/js/controllers/join.js:67 +#: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." msgstr "指定恢复短语......" @@ -2328,7 +2392,11 @@ msgstr "找不到花费提议" msgid "Spending Password needed" msgstr "需要支付密码" -#: www/views/tab-send.html:24 +#: www/views/walletDetails.html:162 +msgid "Spending this balance will need significant Bitcoin network fees" +msgstr "" + +#: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "开始发送比特币" @@ -2340,7 +2408,11 @@ msgstr "正在启动..." msgid "Startup Lock" msgstr "" -#: src/js/services/feeService.js:12 +#: www/views/topup.html:101 +msgid "Success" +msgstr "" + +#: src/js/services/feeService.js:14 msgid "Super Economy" msgstr "超级经济" @@ -2386,7 +2458,7 @@ msgid "Terms of Use" msgstr "使用条款" #: www/views/tab-create-personal.html:116 -#: www/views/tab-import-phrase.html:58 +#: www/views/tab-import-phrase.html:65 msgid "Testnet" msgstr "Testnet" @@ -2445,7 +2517,7 @@ msgstr "官方的英语术语服务是可在 BitPay 网站上。" msgid "The password of the recovery phrase (if set)" msgstr "恢复短语的密码 (如已设置)" -#: src/js/services/walletService.js:1046 +#: src/js/services/walletService.js:1140 msgid "The payment was created but could not be completed. Please try again from home screen" msgstr "支付已创建，但无法完成。请从首页再试一次" @@ -2488,13 +2560,13 @@ msgstr "钱包服务 URL" msgid "There are no wallets to make this payment" msgstr "没有钱包以进行此支付" -#: src/js/controllers/tab-home.js:37 +#: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "有可用的新版本的 {{appName}}" -#: src/js/controllers/import.js:196 -#: src/js/controllers/import.js:220 -#: src/js/controllers/import.js:288 +#: src/js/controllers/import.js:213 +#: src/js/controllers/import.js:237 +#: src/js/controllers/import.js:317 msgid "There is an error in the form" msgstr "表格中有错误" @@ -2511,7 +2583,7 @@ msgstr "这个应用程序太棒了 ！" msgid "This app stores your bitcoin with cutting-edge security." msgstr "此应用程序商店你比特币与尖端的安全。" -#: src/js/controllers/confirm.js:475 +#: src/js/controllers/confirm.js:464 msgid "This bitcoin payment request has expired." msgstr "这比特币付款请求已过期。" @@ -2525,6 +2597,10 @@ msgstr "此密码将无法恢复。如果密码丢失，有是没有办法，你 msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." msgstr "此恢复短语是用密码创建。为了恢复此钱包，需要恢复短语和密码。" +#: www/views/tx-details.html:93 +msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "" + #: www/views/tx-details.html:89 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" msgstr "" @@ -2534,33 +2610,46 @@ msgstr "" msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "此钱包不在给定的 Bitcore Wallet Service (BWS) 注册。你可以从本地信息重新创建它。" -#: www/views/modals/txp-details.html:137 -#: www/views/tx-details.html:113 +#: www/views/modals/txp-details.html:138 +#: www/views/tx-details.html:119 msgid "Timeline" msgstr "时间轴" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 -#: www/views/modals/txp-details.html:110 +#: www/views/modals/txp-details.html:111 #: www/views/modals/txp-details.html:53 #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" msgstr "发送到" -#: www/views/tab-send.html:28 +#: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "若要开始，请买比特币或共享您的地址。你可以从任何钱包或服务接收比特币。" -#: www/views/tab-send.html:29 +#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "若要开始，您将需要创建一个比特币的钱包，并获得一些比特币。" +#: src/js/services/bitpayAccountService.js:73 +msgid "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "" + +#: src/js/services/onGoingProcess.js:48 +msgid "Top up in progress..." +msgstr "" + +#: src/js/controllers/topup.js:198 +msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" +msgstr "" + #: www/views/modals/wallet-balance.html:23 +#: www/views/topup.html:70 msgid "Total" msgstr "总计" -#: www/views/walletDetails.html:183 +#: www/views/walletDetails.html:185 msgid "Total Locked Balance" msgstr "锁定结余的总额" @@ -2568,6 +2657,10 @@ msgstr "锁定结余的总额" msgid "Total number of copayers" msgstr "Copayers 的总数" +#: www/views/addresses.html:81 +msgid "Total wallet inputs" +msgstr "" + #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" @@ -2590,12 +2683,20 @@ msgstr "交易已经广播" msgid "Transaction created" msgstr "创建的交易记录" -#: src/js/controllers/tx-details.js:106 +#: src/js/controllers/topup.js:271 +msgid "Transaction has not been created" +msgstr "" + +#: www/views/topup.html:104 +msgid "Transaction initiated" +msgstr "" + +#: src/js/controllers/tx-details.js:100 msgid "Transaction not available at this time" msgstr "" #: src/js/controllers/activity.js:45 -#: src/js/controllers/tab-home.js:170 +#: src/js/controllers/tab-home.js:174 msgid "Transaction not found" msgstr "找不到交易" @@ -2603,7 +2704,7 @@ msgstr "找不到交易" msgid "Transfer to" msgstr "" -#: www/views/tab-send.html:63 +#: www/views/tab-send.html:67 msgid "Transfer to Wallet" msgstr "转移到钱包" @@ -2623,7 +2724,7 @@ msgstr "键入恢复短语 （通常 12 个字）" msgid "Uh oh..." msgstr "哦哦......" -#: www/views/tx-details.html:94 +#: www/views/tx-details.html:100 msgid "Unconfirmed" msgstr "未确认" @@ -2631,7 +2732,7 @@ msgstr "未确认" msgid "Unit" msgstr "单位" -#: www/views/walletDetails.html:177 +#: www/views/walletDetails.html:179 msgid "Unsent transactions" msgstr "未发送的交易" @@ -2643,7 +2744,7 @@ msgstr "未使用的地址" msgid "Unused Addresses Limit" msgstr "未使用的地址" -#: src/js/controllers/tab-home.js:142 +#: src/js/controllers/tab-home.js:146 msgid "Update Available" msgstr "可用的更新" @@ -2651,7 +2752,7 @@ msgstr "可用的更新" msgid "Updating pending proposals. Please stand by" msgstr "正在更新挂起的建议。请袖手旁观" -#: www/views/walletDetails.html:209 +#: www/views/walletDetails.html:211 msgid "Updating transaction history. Please stand by." msgstr "更新交易历史记录。请等待。" @@ -2659,7 +2760,7 @@ msgstr "更新交易历史记录。请等待。" msgid "Updating... Please stand by" msgstr "更新中… 请等待" -#: src/js/services/feeService.js:8 +#: src/js/services/feeService.js:10 msgid "Urgent" msgstr "" @@ -2671,6 +2772,10 @@ msgstr "使用未经确认的资金" msgid "Validating recovery phrase..." msgstr "正在验证恢复短语。。。" +#: www/views/modals/fingerprintCheck.html:4 +msgid "Verify your identity" +msgstr "" + #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" @@ -2688,20 +2793,20 @@ msgstr "查看所有地址" msgid "View Terms of Service" msgstr "查看服务条款" -#: src/js/controllers/bitpayCard.js:179 -#: src/js/controllers/tx-details.js:167 +#: src/js/controllers/bitpayCard.js:189 +#: src/js/controllers/tx-details.js:172 msgid "View Transaction on Insight" msgstr "查看交易记录的洞察" -#: src/js/controllers/tab-home.js:144 +#: src/js/controllers/tab-home.js:148 msgid "View Update" msgstr "查看更新" -#: www/views/tx-details.html:139 +#: www/views/tx-details.html:145 msgid "View on blockchain" msgstr "在 blockchain 上查看" -#: www/views/walletDetails.html:165 +#: www/views/walletDetails.html:171 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." msgstr "警告︰此设备/钱包无法运行钥匙衍生。无法在此钱包上执行操作。" @@ -2759,6 +2864,10 @@ msgstr "钱包 Id" msgid "Wallet Information" msgstr "钱包信息" +#: www/views/addresses.html:76 +msgid "Wallet Inputs" +msgstr "" + #: www/views/join.html:26 msgid "Wallet Invitation" msgstr "钱包邀请" @@ -2792,7 +2901,7 @@ msgid "Wallet Recovery Phrase is invalid" msgstr "无效的钱包恢复短语" #: www/views/preferencesAdvanced.html:25 -#: www/views/tab-import-phrase.html:53 +#: www/views/tab-import-phrase.html:70 msgid "Wallet Service URL" msgstr "钱包服务 URL" @@ -2801,6 +2910,7 @@ msgid "Wallet Settings" msgstr "钱包的设置" #: www/views/tab-import-hardware.html:11 +#: www/views/tab-import-phrase.html:58 msgid "Wallet Type" msgstr "钱包类型" @@ -2850,7 +2960,7 @@ msgstr "未备份的钱包" msgid "Wallet not found" msgstr "找不到钱包" -#: src/js/controllers/tab-home.js:216 +#: src/js/controllers/tab-home.js:220 msgid "Wallet not registered" msgstr "未注册的钱包" @@ -2866,7 +2976,7 @@ msgstr "钱包恢复短语不可用。" msgid "Wallet service not found" msgstr "找不到 Wallet Service" -#: www/views/tab-home.html:68 +#: www/views/tab-home.html:69 msgid "Wallets" msgstr "钱包" @@ -2935,7 +3045,7 @@ msgstr "" msgid "Would you like to receive push notifications about payments?" msgstr "你想收到推式通知有关付款吗？" -#: src/js/controllers/import.js:253 +#: src/js/controllers/import.js:270 msgid "Wrong number of recovery words:" msgstr "恢复词句数不正确：" @@ -2992,14 +3102,14 @@ msgid "You'll receive email notifications about payments sent and received from 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." +msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." msgstr "" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" msgstr "你的比特币钱包被备份 ！" -#: www/views/tab-home.html:35 +#: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" msgstr "你的比特币钱包是准备好了 ！" @@ -3024,13 +3134,13 @@ msgstr "你的密码" msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "你的钱包是永远不会保存到云存储或标准设备备份。" -#: src/js/services/walletService.js:937 +#: src/js/services/walletService.js:1031 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/paperWallet.html:35 -#: www/views/tab-home.html:95 +#: www/views/tab-home.html:96 #: www/views/tab-receive.html:74 #: www/views/walletDetails.html:139 #: www/views/walletDetails.html:59 @@ -3057,17 +3167,17 @@ msgstr "name@example.com" msgid "preparing..." msgstr "准备中..." -#: src/js/controllers/confirm.js:71 -#: src/js/controllers/modals/txpDetails.js:34 +#: src/js/controllers/confirm.js:325 +#: src/js/controllers/modals/txpDetails.js:42 msgid "to accept" msgstr "接受" -#: src/js/controllers/confirm.js:69 +#: src/js/controllers/confirm.js:323 msgid "to pay" msgstr "付款" -#: src/js/controllers/confirm.js:73 -#: src/js/controllers/modals/txpDetails.js:32 +#: src/js/controllers/confirm.js:327 +#: src/js/controllers/modals/txpDetails.js:40 msgid "to send" msgstr "发送" @@ -3075,11 +3185,15 @@ 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 "{{appName}} 中的区块链信息依赖于 Bitcore Wallet Service (BWS)、网络和 Copayer synchronization。默认配置指向 https://bws.bitpay.com (BitPay 的公共 BWS 实例)。" -#: src/js/controllers/confirm.js:211 +#: src/js/controllers/confirm.js:354 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} 将比特币网络费用中扣除。" -#: www/views/walletDetails.html:210 +#: www/views/confirm.html:87 +msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "" + +#: www/views/walletDetails.html:212 msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "下载的 {{updatingTxHistoryProgress}} 交易" diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js index cfc324521..47ec668ce 100644 --- a/src/js/controllers/addresses.js +++ b/src/js/controllers/addresses.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('addressesController', function($scope, $log, $stateParams, $state, $timeout, $ionicHistory, $ionicScrollDelegate, configService, popupService, gettextCatalog, ongoingProcess, lodash, profileService, walletService, bwcError, platformInfo, appConfigService) { +angular.module('copayApp.controllers').controller('addressesController', function($scope, $log, $stateParams, $state, $timeout, $ionicHistory, $ionicScrollDelegate, configService, popupService, gettextCatalog, ongoingProcess, lodash, profileService, walletService, bwcError, platformInfo, appConfigService, txFormatService, feeService) { var UNUSED_ADDRESS_LIMIT = 5; var BALANCE_ADDRESS_LIMIT = 5; var config = configService.getSync().wallet.settings; @@ -55,7 +55,7 @@ angular.module('copayApp.controllers').controller('addressesController', functio $scope.latestWithBalance = lodash.slice(withBalance, 0, BALANCE_ADDRESS_LIMIT); lodash.each(withBalance, function(a) { - a.balanceStr = (a.amount * satToUnit).toFixed(unitDecimals) + ' ' + unitName; + a.balanceStr = txFormatService.formatAmount(a.amount); }); $scope.viewAll = { @@ -72,6 +72,31 @@ angular.module('copayApp.controllers').controller('addressesController', functio }); }); }); + + + + feeService.getFeeLevels(function(err, levels){ + walletService.getLowUtxos($scope.wallet, levels, function(err, resp) { + if (err) return; + + if (resp.allUtxos && resp.allUtxos.length) { + + + var allSum = lodash.sum(resp.allUtxos || 0, 'satoshis'); + var per = (resp.minFee / allSum) * 100; + + $scope.lowWarning = resp.warning; + $scope.lowUtxosNb = resp.lowUtxos.length; + $scope.allUtxosNb = resp.allUtxos.length; + $scope.lowUtxosSum = txFormatService.formatAmountStr(lodash.sum(resp.lowUtxos || 0, 'satoshis')); + $scope.allUtxosSum = txFormatService.formatAmountStr(allSum); + $scope.minFee = txFormatService.formatAmountStr(resp.minFee || 0); + $scope.minFeePer = per.toFixed(2) + '%'; + + + } + }); + }); }; function processPaths(list) { @@ -116,7 +141,14 @@ angular.module('copayApp.controllers').controller('addressesController', functio }; $scope.viewAllAddresses = function() { - $state.go('tabs.settings.allAddresses', { + var fromView = $ionicHistory.currentStateName(); + var path; + if (fromView.indexOf('settings') !== -1) { + path = 'tabs.settings.allAddresses'; + } else { + path = 'tabs.wallet.allAddresses'; + } + $state.go(path, { walletId: $scope.wallet.id }); }; diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js index 5b213b053..cd065200c 100644 --- a/src/js/controllers/advancedSettings.js +++ b/src/js/controllers/advancedSettings.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService) { +angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService, platformInfo) { var updateConfig = function() { var config = configService.getSync(); @@ -50,6 +50,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', }; $scope.$on("$ionicView.beforeEnter", function(event, data) { + $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; updateConfig(); }); diff --git a/src/js/controllers/buyCoinbase.js b/src/js/controllers/buyCoinbase.js index fb6a625a5..6066207ba 100644 --- a/src/js/controllers/buyCoinbase.js +++ b/src/js/controllers/buyCoinbase.js @@ -44,66 +44,77 @@ angular.module('copayApp.controllers').controller('buyCoinbaseController', funct $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.isFiat = data.stateParams.currency != 'bits' && data.stateParams.currency != 'BTC' ? true : false; var parsedAmount = txFormatService.parseAmount( - data.stateParams.amount, + data.stateParams.amount, data.stateParams.currency); - amount = parsedAmount.amount; - currency = parsedAmount.currency; + // Buy always in BTC + amount = (parsedAmount.amountSat / 100000000).toFixed(8); + currency = 'BTC'; + $scope.amountUnitStr = parsedAmount.amountUnitStr; - $scope.network = coinbaseService.getNetwork(); - $scope.wallets = profileService.getWallets({ - onlyComplete: true, - network: $scope.network - }); - - if (lodash.isEmpty($scope.wallets)) { - showErrorAndBack('No wallets available'); - return; - } - $scope.wallet = $scope.wallets[0]; // Default first wallet - - ongoingProcess.set('connectingCoinbase', true); - coinbaseService.init(function(err, res) { + ongoingProcess.set('calculatingFee', true); + coinbaseService.checkEnoughFundsForFee(amount, function(err) { + ongoingProcess.set('calculatingFee', false); if (err) { - ongoingProcess.set('connectingCoinbase', false); showErrorAndBack(err); return; } - var accessToken = res.accessToken; - coinbaseService.buyPrice(accessToken, coinbaseService.getAvailableCurrency(), function(err, b) { - $scope.buyPrice = b.data || null; + $scope.network = coinbaseService.getNetwork(); + $scope.wallets = profileService.getWallets({ + onlyComplete: true, + network: $scope.network }); - $scope.paymentMethods = []; - $scope.selectedPaymentMethodId = { value : null }; - coinbaseService.getPaymentMethods(accessToken, function(err, p) { + if (lodash.isEmpty($scope.wallets)) { + showErrorAndBack('No wallets available'); + return; + } + $scope.wallet = $scope.wallets[0]; // Default first wallet + + ongoingProcess.set('connectingCoinbase', true); + coinbaseService.init(function(err, res) { if (err) { ongoingProcess.set('connectingCoinbase', false); showErrorAndBack(err); return; } + var accessToken = res.accessToken; - var hasPrimary; - var pm; - for(var i = 0; i < p.data.length; i++) { - pm = p.data[i]; - if (pm.allow_buy) { - $scope.paymentMethods.push(pm); + coinbaseService.buyPrice(accessToken, coinbaseService.getAvailableCurrency(), function(err, b) { + $scope.buyPrice = b.data || null; + }); + + $scope.paymentMethods = []; + $scope.selectedPaymentMethodId = { value : null }; + coinbaseService.getPaymentMethods(accessToken, function(err, p) { + if (err) { + ongoingProcess.set('connectingCoinbase', false); + showErrorAndBack(err); + return; } - if (pm.allow_buy && pm.primary_buy) { - hasPrimary = true; - $scope.selectedPaymentMethodId.value = pm.id; + + var hasPrimary; + var pm; + for(var i = 0; i < p.data.length; i++) { + pm = p.data[i]; + if (pm.allow_buy) { + $scope.paymentMethods.push(pm); + } + if (pm.allow_buy && pm.primary_buy) { + hasPrimary = true; + $scope.selectedPaymentMethodId.value = pm.id; + } } - } - if (lodash.isEmpty($scope.paymentMethods)) { - ongoingProcess.set('connectingCoinbase', false); - showErrorAndBack('No payment method available to buy'); - return; - } - if (!hasPrimary) $scope.selectedPaymentMethodId.value = $scope.paymentMethods[0].id; - $scope.buyRequest(); + if (lodash.isEmpty($scope.paymentMethods)) { + ongoingProcess.set('connectingCoinbase', false); + showErrorAndBack('No payment method available to buy'); + return; + } + if (!hasPrimary) $scope.selectedPaymentMethodId.value = $scope.paymentMethods[0].id; + $scope.buyRequest(); + }); }); }); }); @@ -139,12 +150,12 @@ angular.module('copayApp.controllers').controller('buyCoinbaseController', funct }; $scope.buyConfirm = function() { - var message = 'Buy bitcoin for ' + amount + ' ' + currency; + var message = 'Buy bitcoin for ' + $scope.amountUnitStr; var okText = 'Confirm'; var cancelText = 'Cancel'; popupService.showConfirm(null, message, okText, cancelText, function(ok) { if (!ok) return; - + ongoingProcess.set('buyingBitcoin', true, statusChangeHandler); coinbaseService.init(function(err, res) { if (err) { diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 105c51f7f..2e408d123 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,14 +1,38 @@ 'use strict'; angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bwcError) { - var cachedTxp = {}; - var feeLevel; - var feePerKb; - var toAmount; - var isChromeApp = platformInfo.isChromeApp; + var countDown = null; - var cachedSendMax = {}; - $scope.isCordova = platformInfo.isCordova; + var CONFIRM_LIMIT_USD = 20; + var FEE_TOO_HIGH_LIMIT_PER = 15; + + var tx = {}; + + // Config Related values + var config = configService.getSync(); + var walletConfig = config.wallet; + var unitToSatoshi = walletConfig.settings.unitToSatoshi; + var unitDecimals = walletConfig.settings.unitDecimals; + var satToUnit = 1 / unitToSatoshi; + var configFeeLevel = walletConfig.settings.feeLevel ? walletConfig.settings.feeLevel : 'normal'; + + + // Platform info + var isChromeApp = platformInfo.isChromeApp; + var isCordova = platformInfo.isCordova; + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + + function refresh() { + $timeout(function() { + $scope.$apply(); + }, 1); + } + + + $scope.showWalletSelector = function() { + $scope.walletSelector = true; + refresh(); + }; $scope.$on("$ionicView.beforeLeave", function(event, data) { $ionicConfig.views.swipeBackEnabled(true); @@ -18,305 +42,346 @@ angular.module('copayApp.controllers').controller('confirmController', function( $ionicConfig.views.swipeBackEnabled(false); }); + + function exitWithError(err) { + $log.info('Error setting wallet selector:' + err); + popupService.showAlert(gettextCatalog.getString(), bwcError.msg(err), function() { + $ionicHistory.nextViewOptions({ + disableAnimate: true, + historyRoot: true + }); + $ionicHistory.clearHistory(); + $state.go('tabs.send'); + }); + }; + + function setNoWallet(msg) { + $scope.wallet = null; + $scope.noWalletMessage = gettextCatalog.getString(msg); + $log.warn('Not ready to make the payment:' + msg); + $timeout(function() { + $scope.$apply(); + }); + }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { - toAmount = data.stateParams.toAmount; - cachedSendMax = {}; + function setWalletSelector(network, minAmount, cb) { + + // no min amount? (sendMax) => look for no empty wallets + minAmount = minAmount || 1; + + $scope.wallets = profileService.getWallets({ + onlyComplete: true, + network: network + }); + + if (!$scope.wallets || !$scope.wallets.length) { + setNoWallet('No wallets available'); + return cb(); + } + + var filteredWallets = []; + var index = 0; + var walletsUpdated = 0; + + lodash.each($scope.wallets, function(w) { + walletService.getStatus(w, {}, function(err, status) { + if (err || !status) { + $log.error(err); + } else { + walletsUpdated++; + w.status = status; + + if (!status.availableBalanceSat) + $log.debug('No balance available in: ' + w.name); + + if (status.availableBalanceSat > minAmount) { + filteredWallets.push(w); + } + } + + if (++index == $scope.wallets.length) { + if (!walletsUpdated) + return cb('Could not update any wallet'); + + if (lodash.isEmpty(filteredWallets)) { + setNoWallet('Insufficent funds'); + } + $scope.wallets = lodash.clone(filteredWallets); + return cb(); + } + }); + }); + }; + + // Setup $scope + + // Grab stateParams + tx = { + toAmount: parseInt(data.stateParams.toAmount), + sendMax: data.stateParams.useSendMax == 'true' ? true : false, + toAddress: data.stateParams.toAddress, + description: data.stateParams.description, + paypro: data.stateParams.paypro, + + feeLevel: configFeeLevel, + spendUnconfirmed: walletConfig.spendUnconfirmed, + + // Vanity tx info (not in the real tx) + recipientType: data.stateParams.recipientType || null, + toName: data.stateParams.toName, + toEmail: data.stateParams.toEmail, + toColor: data.stateParams.toColor, + network: (new bitcore.Address(data.stateParams.toAddress)).network.name, + txp: {}, + }; + + + // Other Scope vars + $scope.isCordova = isCordova; + $scope.isWindowsPhoneApp = isWindowsPhoneApp; $scope.showAddress = false; - $scope.useSendMax = data.stateParams.useSendMax == 'true' ? true : false; - $scope.recipientType = data.stateParams.recipientType || null; - $scope.toAddress = data.stateParams.toAddress; - $scope.toName = data.stateParams.toName; - $scope.toEmail = data.stateParams.toEmail; - $scope.toColor = data.stateParams.toColor; - $scope.description = data.stateParams.description; - $scope.paypro = data.stateParams.paypro; - $scope.insufficientFunds = false; - $scope.noMatchingWallet = false; - $scope.paymentExpired = { - value: false - }; - $scope.remainingTimeStr = { - value: null - }; - $scope.network = (new bitcore.Address($scope.toAddress)).network.name; - setFee(); - resetValues(); - setwallets(); - applyButtonText(); + + updateTx(tx, null, {}, function() { + + $scope.walletSelectorTitle = gettextCatalog.getString('Send from'); + + setWalletSelector(tx.network, tx.toAmount, function(err) { + if (err) { + return exitWithError('Could not update wallets'); + } + + if ($scope.wallets.length > 1) { + $scope.showWalletSelector(); + } else if ($scope.wallets.length) { + setWallet($scope.wallets[0], tx); + } + }); + + }); }); - function setFee(customFeeLevel, cb) { - feeService.getCurrentFeeValue($scope.network, customFeeLevel, function(err, currentFeePerKb) { - var config = configService.getSync().wallet; - var configFeeLevel = (config.settings && config.settings.feeLevel) ? config.settings.feeLevel : 'normal'; - feePerKb = currentFeePerKb; - feeLevel = customFeeLevel ? customFeeLevel : configFeeLevel; - $scope.feeLevel = feeService.feeOpts[feeLevel]; - if (cb) return cb(); + + function getSendMaxInfo(tx, wallet, cb) { + if (!tx.sendMax) return cb(); + + //ongoingProcess.set('retrievingInputs', true); + walletService.getSendMaxInfo(wallet, { + feePerKb: tx.feeRate, + excludeUnconfirmedUtxos: !tx.spendUnconfirmed, + returnInputs: true, + }, cb); + }; + + + function getTxp(tx, wallet, dryRun, cb) { + + // ToDo: use a credential's (or fc's) function for this + if (tx.description && !wallet.credentials.sharedEncryptingKey) { + var msg = gettextCatalog.getString('Could not add message to imported wallet without shared encrypting key'); + $log.warn(msg); + return setSendError(msg); + } + + if (tx.toAmount > Number.MAX_SAFE_INTEGER) { + var msg = gettextCatalog.getString('Amount too big'); + $log.warn(msg); + return setSendError(msg); + } + + var txp = {}; + + txp.outputs = [{ + 'toAddress': tx.toAddress, + 'amount': tx.toAmount, + 'message': tx.description + }]; + + if (tx.sendMaxInfo) { + txp.inputs = tx.sendMaxInfo.inputs; + txp.fee = tx.sendMaxInfo.fee; + } else { + txp.feeLevel = tx.feeLevel; + } + + txp.message = tx.description; + + if (tx.paypro) { + txp.payProUrl = tx.paypro.url; + } + txp.excludeUnconfirmedUtxos = !tx.spendUnconfirmed; + txp.dryRun = dryRun; + walletService.createTx(wallet, txp, function(err, ctxp) { + if (err) { + setSendError(err); + return cb(err); + } + return cb(null, ctxp); + }); + }; + + function updateTx(tx, wallet, opts, cb) { + + if (opts.clearCache) { + tx.txp = {}; + } + + $scope.tx = tx; + + function updateAmount() { + if (!tx.toAmount) return; + + // Amount + tx.amountStr = txFormatService.formatAmountStr(tx.toAmount); + tx.amountValueStr = tx.amountStr.split(' ')[0]; + tx.amountUnitStr = tx.amountStr.split(' ')[1]; + txFormatService.formatAlternativeStr(tx.toAmount, function(v) { + tx.alternativeAmountStr = v; + }); + } + + updateAmount(); + refresh(); + + // End of quick refresh, before wallet is selected. + if (!wallet)return cb(); + + feeService.getFeeRate(tx.network, tx.feeLevel, function(err, feeRate) { + if (err) return cb(err); + + tx.feeRate = feeRate; + tx.feeLevelName = feeService.feeOpts[tx.feeLevel]; + + if (!wallet) + return cb(); + + getSendMaxInfo(lodash.clone(tx), wallet, function(err, sendMaxInfo) { + if (err) { + var msg = gettextCatalog.getString('Error getting SendMax information'); + return setSendError(msg); + } + + if (sendMaxInfo) { + + $log.debug('Send max info', sendMaxInfo); + + if (tx.sendMax && sendMaxInfo.amount == 0) { + setNoWallet('Insufficent funds'); + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee')); + return cb('no_funds'); + } + + tx.sendMaxInfo = sendMaxInfo; + tx.toAmount = tx.sendMaxInfo.amount; + updateAmount(); + showSendMaxWarning(sendMaxInfo); + } + + // txp already generated for this wallet? + if (tx.txp[wallet.id]) { + refresh(); + return cb(); + } + + getTxp(lodash.clone(tx), wallet, opts.dryRun, function(err, txp) { + if (err) return cb(err); + + txp.feeStr = txFormatService.formatAmountStr(txp.fee); + txFormatService.formatAlternativeStr(txp.fee, function(v) { + txp.alternativeFeeStr = v; + }); + + var per = (txp.fee / (txp.amount + txp.fee) * 100); + txp.feeRatePerStr = per.toFixed(2) + '%'; + txp.feeToHigh = per > FEE_TOO_HIGH_LIMIT_PER; + + + tx.txp[wallet.id] = txp; + $log.debug('Confirm. TX Fully Updated for wallet:' + wallet.id, tx); + refresh(); + + return cb(); + }); + }); }); } function useSelectedWallet() { - if (!$scope.useSendMax) displayValues(); + + if (!$scope.useSendMax) { + showAmount(tx.toAmount); + } + $scope.onWalletSelect($scope.wallet); } - function applyButtonText(multisig) { - $scope.buttonText = $scope.isCordova ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' '; + function setButtonText(isMultisig, isPayPro) { + $scope.buttonText = gettextCatalog.getString(isCordova && !isWindowsPhoneApp ? 'Slide' : 'Click') + ' '; - if ($scope.paypro) { + if (isPayPro) { $scope.buttonText += gettextCatalog.getString('to pay'); - } else if (multisig) { + } else if (isMultisig) { $scope.buttonText += gettextCatalog.getString('to accept'); } else $scope.buttonText += gettextCatalog.getString('to send'); }; - function setwallets() { - $scope.wallets = profileService.getWallets({ - onlyComplete: true, - network: $scope.network - }); - - if (!$scope.wallets || !$scope.wallets.length) { - $scope.noMatchingWallet = true; - displayValues(); - $log.warn('No ' + $scope.network + ' wallets to make the payment'); - $timeout(function() { - $scope.$apply(); - }); - return; - } - - var filteredWallets = []; - var index = 0; - var enoughFunds = false; - var walletsUpdated = 0; - - lodash.each($scope.wallets, function(w) { - walletService.getStatus(w, {}, function(err, status) { - if (err || !status) { - $log.error(err); - } else { - walletsUpdated++; - w.status = status; - if (!status.availableBalanceSat) $log.debug('No balance available in: ' + w.name); - if (status.availableBalanceSat > toAmount) { - filteredWallets.push(w); - enoughFunds = true; - } - } - - if (++index == $scope.wallets.length) { - if (!lodash.isEmpty(filteredWallets)) { - $scope.wallets = lodash.clone(filteredWallets); - if ($scope.useSendMax) { - if ($scope.wallets.length > 1) - $scope.showWalletSelector(); - else { - $scope.wallet = $scope.wallets[0]; - $scope.getSendMaxInfo(); - } - } else initConfirm(); - } else { - - // Were we able to update any wallet? - if (walletsUpdated) { - if (!enoughFunds) $scope.insufficientFunds = true; - displayValues(); - $log.warn('No wallet available to make the payment'); - } else { - popupService.showAlert(gettextCatalog.getString('Could not update wallets'), bwcError.msg(err), function() { - $ionicHistory.nextViewOptions({ - disableAnimate: true, - historyRoot: true - }); - $ionicHistory.clearHistory(); - $state.go('tabs.send'); - }); - } - - } - $timeout(function() { - $scope.$apply(); - }); - } - }); - }); - }; $scope.toggleAddress = function() { $scope.showAddress = !$scope.showAddress; }; - var initConfirm = function() { - if ($scope.paypro) _paymentTimeControl($scope.paypro.expires); - displayValues(); - if ($scope.wallets.length > 1) $scope.showWalletSelector(); - else setWallet($scope.wallets[0]); - $timeout(function() { - $scope.$apply(); - }); - }; + function showSendMaxWarning(sendMaxInfo) { - function displayValues() { - toAmount = parseInt(toAmount); - $scope.amountStr = txFormatService.formatAmountStr(toAmount); - $scope.displayAmount = getDisplayAmount($scope.amountStr); - $scope.displayUnit = getDisplayUnit($scope.amountStr); - txFormatService.formatAlternativeStr(toAmount, function(v) { - $scope.alternativeAmountStr = v; - }); - }; - - function resetValues() { - $scope.displayAmount = $scope.displayUnit = $scope.fee = $scope.feeFiat = $scope.feeRateStr = $scope.alternativeAmountStr = $scope.insufficientFunds = $scope.noMatchingWallet = null; - $scope.showAddress = false; - }; - - $scope.getSendMaxInfo = function() { - resetValues(); - var config = configService.getSync().wallet; - - ongoingProcess.set('retrievingInputs', true); - walletService.getSendMaxInfo($scope.wallet, { - feePerKb: feePerKb, - excludeUnconfirmedUtxos: !config.spendUnconfirmed, - returnInputs: true, - }, function(err, resp) { - ongoingProcess.set('retrievingInputs', false); - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), err); - return; + function verifyExcludedUtxos() { + var warningMsg = []; + if (sendMaxInfo.utxosBelowFee > 0) { + warningMsg.push(gettextCatalog.getString("A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided.", { + amountBelowFeeStr: txFormatService.formatAmountStr(sendMaxInfo.amountBelowFee) + })); } - if (resp.amount == 0) { - $scope.insufficientFunds = true; - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee')); - return; + if (sendMaxInfo.utxosAboveMaxSize > 0) { + warningMsg.push(gettextCatalog.getString("A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded.", { + amountAboveMaxSizeStr: txFormatService.formatAmountStr(sendMaxInfo.amountAboveMaxSize) + })); } + return warningMsg.join('\n'); + }; - $scope.sendMaxInfo = { - sendMax: true, - amount: resp.amount, - inputs: resp.inputs, - fee: resp.fee, - feePerKb: feePerKb, - }; - - cachedSendMax[$scope.wallet.id] = $scope.sendMaxInfo; - - var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees.", { - fee: txFormatService.formatAmountStr(resp.fee) - }); - var warningMsg = verifyExcludedUtxos(); - - if (!lodash.isEmpty(warningMsg)) - msg += '\n' + warningMsg; - - popupService.showAlert(null, msg, function() { - setSendMaxValues(resp); - - createTx($scope.wallet, true, function(err, txp) { - if (err) return; - cachedTxp[$scope.wallet.id] = txp; - apply(txp); - }); - }); - - function verifyExcludedUtxos() { - var warningMsg = []; - if (resp.utxosBelowFee > 0) { - warningMsg.push(gettextCatalog.getString("A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided.", { - amountBelowFeeStr: txFormatService.formatAmountStr(resp.amountBelowFee) - })); - } - - if (resp.utxosAboveMaxSize > 0) { - warningMsg.push(gettextCatalog.getString("A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded.", { - amountAboveMaxSizeStr: txFormatService.formatAmountStr(resp.amountAboveMaxSize) - })); - } - return warningMsg.join('\n'); - }; + var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees.", { + fee: txFormatService.formatAmountStr(sendMaxInfo.fee) }); - }; + var warningMsg = verifyExcludedUtxos(); - function setSendMaxValues(data) { - resetValues(); - var config = configService.getSync().wallet; - var unitToSatoshi = config.settings.unitToSatoshi; - var satToUnit = 1 / unitToSatoshi; - var unitDecimals = config.settings.unitDecimals; + if (!lodash.isEmpty(warningMsg)) + msg += '\n' + warningMsg; - $scope.amountStr = txFormatService.formatAmountStr(data.amount, true); - $scope.displayAmount = getDisplayAmount($scope.amountStr); - $scope.displayUnit = getDisplayUnit($scope.amountStr); - $scope.fee = txFormatService.formatAmountStr(data.fee); - txFormatService.formatAlternativeStr(data.fee, function(v) { - $scope.feeFiat = v; - }); - toAmount = parseFloat((data.amount * satToUnit).toFixed(unitDecimals)); - txFormatService.formatAlternativeStr(data.amount, function(v) { - $scope.alternativeAmountStr = v; - }); - $scope.feeRateStr = (data.fee / (data.amount + data.fee) * 100).toFixed(2) + '%'; - $timeout(function() { - $scope.$apply(); - }); - }; - - $scope.$on('accepted', function(event) { - $scope.approve(); - }); - - $scope.showWalletSelector = function() { - $scope.walletSelectorTitle = gettextCatalog.getString('Send from'); - if (!$scope.useSendMax && ($scope.insufficientFunds || $scope.noMatchingWallet)) return; - $scope.showWallets = true; + popupService.showAlert(null, msg, function() {}); }; $scope.onWalletSelect = function(wallet) { - if ($scope.useSendMax) { - $scope.wallet = wallet; - if (cachedSendMax[wallet.id]) { - $log.debug('Send max cached for wallet:', wallet.id); - setSendMaxValues(cachedSendMax[wallet.id]); - return; - } - $scope.getSendMaxInfo(); - } else - setWallet(wallet); - - applyButtonText(wallet.credentials.m > 1); + setWallet(wallet, tx); }; - $scope.showDescriptionPopup = function() { + $scope.showDescriptionPopup = function(tx) { var message = gettextCatalog.getString('Add description'); var opts = { - defaultText: $scope.description + defaultText: tx.description }; popupService.showPrompt(null, message, opts, function(res) { - if (typeof res != 'undefined') $scope.description = res; + if (typeof res != 'undefined') tx.description = res; $timeout(function() { $scope.$apply(); }); }); }; - function getDisplayAmount(amountStr) { - return $scope.amountStr.split(' ')[0]; - }; - - function getDisplayUnit(amountStr) { - return $scope.amountStr.split(' ')[1]; - }; - function _paymentTimeControl(expirationTime) { - $scope.paymentExpired.value = false; + $scope.paymentExpired = false; setExpirationTime(); countDown = $interval(function() { @@ -334,12 +399,12 @@ angular.module('copayApp.controllers').controller('confirmController', function( var totalSecs = expirationTime - now; var m = Math.floor(totalSecs / 60); var s = totalSecs % 60; - $scope.remainingTimeStr.value = ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2); + $scope.remainingTimeStr = ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2); }; function setExpiredValues() { - $scope.paymentExpired.value = true; - $scope.remainingTimeStr.value = gettextCatalog.getString('Expired'); + $scope.paymentExpired = true; + $scope.remainingTimeStr = gettextCatalog.getString('Expired'); if (countDown) $interval.cancel(countDown); $timeout(function() { $scope.$apply(); @@ -347,31 +412,27 @@ angular.module('copayApp.controllers').controller('confirmController', function( }; }; - function setWallet(wallet, delayed) { - var stop; + /* sets a wallet on the UI, creates a TXPs for that wallet */ + + function setWallet(wallet, tx) { + $scope.wallet = wallet; - $scope.fee = $scope.txp = null; - if (stop) { - $timeout.cancel(stop); - stop = null; - } - if (cachedTxp[wallet.id]) { - apply(cachedTxp[wallet.id]); - } else { - stop = $timeout(function() { - createTx(wallet, true, function(err, txp) { - if (err) return; - cachedTxp[wallet.id] = txp; - apply(txp); - }); - }, delayed ? 2000 : 1); - } + setButtonText(wallet.credentials.m > 1, !!tx.paypro); + + if (tx.paypro) + _paymentTimeControl(tx.paypro.expires); + + updateTx(tx, wallet, { + dryRun: true + }, function(err) { + $timeout(function() { + $ionicScrollDelegate.resize(); + $scope.$apply(); + }, 10); + + }); - $timeout(function() { - $ionicScrollDelegate.resize(); - $scope.$apply(); - }, 10); }; var setSendError = function(msg) { @@ -382,75 +443,6 @@ angular.module('copayApp.controllers').controller('confirmController', function( popupService.showAlert(gettextCatalog.getString('Error at confirm'), bwcError.msg(msg)); }; - function apply(txp) { - $scope.fee = txFormatService.formatAmountStr(txp.fee); - txFormatService.formatAlternativeStr(txp.fee, function(v) { - $scope.feeFiat = v; - }); - $scope.txp = txp; - $scope.feeRateStr = (txp.fee / (txp.amount + txp.fee) * 100).toFixed(2) + '%'; - $timeout(function() { - $scope.$apply(); - }); - }; - - var createTx = function(wallet, dryRun, cb) { - var config = configService.getSync().wallet; - var currentSpendUnconfirmed = config.spendUnconfirmed; - var paypro = $scope.paypro; - var toAddress = $scope.toAddress; - var description = $scope.description; - var unitToSatoshi = config.settings.unitToSatoshi; - var unitDecimals = config.settings.unitDecimals; - - // ToDo: use a credential's (or fc's) function for this - if (description && !wallet.credentials.sharedEncryptingKey) { - var msg = gettextCatalog.getString('Could not add message to imported wallet without shared encrypting key'); - $log.warn(msg); - return setSendError(msg); - } - - if (toAmount > Number.MAX_SAFE_INTEGER) { - var msg = gettextCatalog.getString('Amount too big'); - $log.warn(msg); - return setSendError(msg); - } - - var txp = {}; - var amount; - - if ($scope.useSendMax) amount = parseFloat((toAmount * unitToSatoshi).toFixed(0)); - else amount = toAmount; - - txp.outputs = [{ - 'toAddress': toAddress, - 'amount': amount, - 'message': description - }]; - - if ($scope.sendMaxInfo) { - txp.inputs = $scope.sendMaxInfo.inputs; - txp.fee = $scope.sendMaxInfo.fee; - } else - txp.feeLevel = feeLevel; - - txp.message = description; - - if (paypro) { - txp.payProUrl = paypro.url; - } - txp.excludeUnconfirmedUtxos = !currentSpendUnconfirmed; - txp.dryRun = dryRun; - - walletService.createTx(wallet, txp, function(err, ctxp) { - if (err) { - setSendError(err); - return cb(err); - } - return cb(null, ctxp); - }); - }; - $scope.openPPModal = function() { $ionicModal.fromTemplateUrl('views/modals/paypro.html', { scope: $scope @@ -464,14 +456,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.payproModal.hide(); }; - $scope.approve = function(onSendStatusChange) { + $scope.approve = function(tx, wallet, onSendStatusChange) { - var wallet = $scope.wallet; - if (!wallet) { - return; - } + if (!tx || !wallet) return; - if ($scope.paypro && $scope.paymentExpired.value) { + if ($scope.paymentExpired) { popupService.showAlert(null, gettextCatalog.getString('This bitcoin payment request has expired.')); $scope.sendStatus = ''; $timeout(function() { @@ -481,46 +470,54 @@ angular.module('copayApp.controllers').controller('confirmController', function( } ongoingProcess.set('creatingTx', true, onSendStatusChange); - createTx(wallet, false, function(err, txp) { + getTxp(lodash.clone(tx), wallet, false, function(err, txp) { ongoingProcess.set('creatingTx', false, onSendStatusChange); if (err) return; - var config = configService.getSync(); - var spendingPassEnabled = walletService.isEncrypted(wallet); - var touchIdEnabled = config.touchIdFor && config.touchIdFor[wallet.id]; - var isCordova = $scope.isCordova; - var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20; - var message = gettextCatalog.getString('Sending {{amountStr}} from your {{name}} wallet', { - amountStr: $scope.amountStr, - name: wallet.name - }); - var okText = gettextCatalog.getString('Confirm'); - var cancelText = gettextCatalog.getString('Cancel'); + // confirm txs for more that 20usd, if not spending/touchid is enabled + function confirmTx(cb) { + if (walletService.isEncrypted(wallet)) + return cb(); - if (!spendingPassEnabled && !touchIdEnabled) { - if (isCordova) { - if (bigAmount) { - popupService.showConfirm(null, message, okText, cancelText, function(ok) { - if (!ok) { - $scope.sendStatus = ''; - $timeout(function() { - $scope.$apply(); - }); - return; - } - publishAndSign(wallet, txp, onSendStatusChange); - }); - } else publishAndSign(wallet, txp, onSendStatusChange); - } else { - popupService.showConfirm(null, message, okText, cancelText, function(ok) { - if (!ok) { - $scope.sendStatus = ''; - return; - } - publishAndSign(wallet, txp, onSendStatusChange); - }); + var amountUsd = parseFloat(txFormatService.formatToUSD(txp.amount)); + if (amountUsd <= CONFIRM_LIMIT_USD) + return cb(); + + var message = gettextCatalog.getString('Sending {{amountStr}} from your {{name}} wallet', { + amountStr: tx.amountStr, + name: wallet.name + }); + var okText = gettextCatalog.getString('Confirm'); + var cancelText = gettextCatalog.getString('Cancel'); + popupService.showConfirm(null, message, okText, cancelText, function(ok) { + return cb(!ok); + }); + }; + + function publishAndSign() { + if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { + $log.info('No signing proposal: No private key'); + + return walletService.onlyPublish(wallet, txp, function(err) { + if (err) setSendError(err); + }, onSendStatusChange); } - } else publishAndSign(wallet, txp, onSendStatusChange); + + walletService.publishAndSign(wallet, txp, function(err, txp) { + if (err) return setSendError(err); + }, onSendStatusChange); + }; + + confirmTx(function(nok) { + if (nok) { + $scope.sendStatus = ''; + $timeout(function() { + $scope.$apply(); + }); + return; + } + publishAndSign(); + }); }); }; @@ -543,68 +540,47 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.statusChangeHandler = statusChangeHandler; - $scope.onConfirm = function() { - $scope.approve(statusChangeHandler); - }; - $scope.onSuccessConfirm = function() { - var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName; - - $ionicHistory.nextViewOptions({ - disableAnimate: true - }); - $ionicHistory.removeBackView(); $scope.sendStatus = ''; - $ionicHistory.nextViewOptions({ disableAnimate: true, historyRoot: true }); - $ionicHistory.clearHistory(); $state.go('tabs.send').then(function() { + $ionicHistory.clearHistory(); $state.transitionTo('tabs.home'); }); }; - function publishAndSign(wallet, txp, onSendStatusChange) { + $scope.chooseFeeLevel = function(tx, wallet) { - if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { - $log.info('No signing proposal: No private key'); + var scope = $rootScope.$new(true); + scope.network = tx.network; + scope.feeLevel = tx.feeLevel; + scope.noSave = true; - return walletService.onlyPublish(wallet, txp, function(err) { - if (err) setSendError(err); - }, onSendStatusChange); - } - - walletService.publishAndSign(wallet, txp, function(err, txp) { - if (err) return setSendError(err); - }, onSendStatusChange); - }; - - $scope.chooseFeeLevel = function() { - - $scope.customFeeLevel = feeLevel; $ionicModal.fromTemplateUrl('views/modals/chooseFeeLevel.html', { - scope: $scope, + scope: scope, }).then(function(modal) { - $scope.chooseFeeLevelModal = modal; - $scope.openModal(); + scope.chooseFeeLevelModal = modal; + scope.openModal(); }); - $scope.openModal = function() { - $scope.chooseFeeLevelModal.show(); + scope.openModal = function() { + scope.chooseFeeLevelModal.show(); }; - $scope.hideModal = function(customFeeLevel) { - if (customFeeLevel) { - cachedTxp = {}; - cachedSendMax = {}; - ongoingProcess.set('gettingFeeLevels', true); - setFee(customFeeLevel, function() { - ongoingProcess.set('gettingFeeLevels', false); - resetValues(); - if ($scope.wallet) useSelectedWallet(); - }) - } - $scope.chooseFeeLevelModal.hide(); + + scope.hideModal = function(customFeeLevel) { + scope.chooseFeeLevelModal.hide(); + $log.debug('Custom fee level choosen:' + customFeeLevel + ' was:' + tx.feeLevel); + if (tx.feeLevel == customFeeLevel) + return; + + tx.feeLevel = customFeeLevel; + updateTx(tx, wallet, { + clearCache: true, + dryRun: true, + }, function() { + }); }; }; diff --git a/src/js/controllers/feedback/rateApp.js b/src/js/controllers/feedback/rateApp.js index ff3ad5e53..7e2bc8e41 100644 --- a/src/js/controllers/feedback/rateApp.js +++ b/src/js/controllers/feedback/rateApp.js @@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('rateAppController', function( $scope.appName = appConfigService.nameCase; var isAndroid = platformInfo.isAndroid; var isIOS = platformInfo.isIOS; - var isWP = platformInfo.isWP; + var config = configService.getSync(); $scope.skip = function() { @@ -42,8 +42,6 @@ angular.module('copayApp.controllers').controller('rateAppController', function( url = $scope.appName == 'Copay' ? defaults.rateApp.copay.android : defaults.rateApp.bitpay.android; if (isIOS) url = $scope.appName == 'Copay' ? defaults.rateApp.copay.ios : defaults.rateApp.bitpay.ios; - // if (isWP) - // url = $scope.appName == 'Copay' ? defaults.rateApp.copay.windows : defaults.rateApp.bitpay.windows; externalLinkService.open(url); $state.go('tabs.rate.complete', { diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 0acc5556b..2728b6eb0 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -50,6 +50,7 @@ angular.module('copayApp.controllers').controller('joinController', $scope.onQrCodeScannedJoin = function(data) { $scope.formData.secret = data; + $scope.$apply(); }; if ($stateParams.url) { @@ -136,7 +137,7 @@ angular.module('copayApp.controllers').controller('joinController', } if ($scope.formData.seedSource.id == walletService.externalSource.ledger.id || $scope.formData.seedSource.id == walletService.externalSource.trezor.id || $scope.formData.seedSource.id == walletService.externalSource.intelTEE.id) { - var account = $scope.account; + var account = $scope.formData.account; if (!account || account < 1) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); return; diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 01ab9277b..68c6d0778 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $log, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, bwcError, gettextCatalog, lodash, walletService, popupService, $ionicHistory) { +angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $log, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, bwcError, gettextCatalog, lodash, walletService, popupService, $ionicHistory, feeService) { var isGlidera = $scope.isGlidera; var GLIDERA_LOCK_TIME = 6 * 60 * 60; var now = Math.floor(Date.now() / 1000); @@ -9,37 +9,41 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.init = function() { $scope.loading = null; $scope.isCordova = platformInfo.isCordova; + $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + $scope.copayers = $scope.wallet.status.wallet.copayers; $scope.copayerId = $scope.wallet.credentials.copayerId; $scope.isShared = $scope.wallet.credentials.n > 1; $scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal(); $scope.color = $scope.wallet.color; $scope.data = {}; - $scope.displayAmount = getDisplayAmount($scope.tx.amountStr); - $scope.displayUnit = getDisplayUnit($scope.tx.amountStr); + displayFeeValues(); initActionList(); checkPaypro(); applyButtonText(); }; + function displayFeeValues() { + txFormatService.formatAlternativeStr($scope.tx.fee, function(v) { + $scope.tx.feeFiatStr = v; + }); + $scope.tx.feeRateStr = ($scope.tx.fee / ($scope.tx.amount + $scope.tx.fee) * 100).toFixed(2) + '%'; + $scope.tx.feeLevelStr = feeService.feeOpts[$scope.tx.feeLevel]; + }; + function applyButtonText() { - $scope.buttonText = $scope.isCordova ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' '; + $scope.buttonText = $scope.isCordova && !$scope.isWindowsPhoneApp ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' '; var lastSigner = lodash.filter($scope.tx.actions, { type: 'accept' }).length == $scope.tx.requiredSignatures - 1; - if (lastSigner) + if (lastSigner) { $scope.buttonText += gettextCatalog.getString('to send'); - else + $scope.successText = gettextCatalog.getString('Payment Sent'); + } else { $scope.buttonText += gettextCatalog.getString('to accept'); - }; - - function getDisplayAmount(amountStr) { - return amountStr.split(' ')[0]; - }; - - function getDisplayUnit(amountStr) { - return amountStr.split(' ')[1]; + $scope.successText = gettextCatalog.getString('Payment Accepted'); + } }; function initActionList() { diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js index 542a3a97d..83346fbbc 100644 --- a/src/js/controllers/paperWallet.js +++ b/src/js/controllers/paperWallet.js @@ -60,7 +60,7 @@ angular.module('copayApp.controllers').controller('paperWalletController', $scope.wallet.buildTxFromPrivateKey($scope.privateKey, destinationAddress, null, function(err, testTx) { if (err) return cb(err); var rawTxLength = testTx.serialize().length; - feeService.getCurrentFeeValue('livenet', null, function(err, feePerKB) { + feeService.getCurrentFeeRate('livenet', function(err, feePerKB) { var opts = {}; opts.fee = Math.round((feePerKB * rawTxLength) / 2000); $scope.wallet.buildTxFromPrivateKey($scope.privateKey, destinationAddress, opts, function(err, tx) { diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index 1057d5c69..ef95c00db 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesController', - function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService) { + function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo) { var wallet; var walletId; @@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('preferencesController', wallet = profileService.getWallet(data.stateParams.walletId); walletId = wallet.credentials.walletId; $scope.wallet = wallet; - + $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; $scope.externalSource = null; if (!wallet) diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js index 6ac32a1bf..3c3c6ce78 100644 --- a/src/js/controllers/preferencesFee.js +++ b/src/js/controllers/preferencesFee.js @@ -2,13 +2,14 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', function($scope, $timeout, $ionicHistory, lodash, gettextCatalog, configService, feeService, ongoingProcess, popupService) { - $scope.save = function(newFee) { + var network; - if ($scope.customFeeLevel) { - $scope.currentFeeLevel = newFee; - updateCurrentValues(); + $scope.save = function(newFee) { + $scope.currentFeeLevel = newFee; + updateCurrentValues(); + + if ($scope.noSave) return; - } var opts = { wallet: { @@ -20,8 +21,6 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu configService.set(opts, function(err) { if (err) $log.debug(err); - $scope.currentFeeLevel = newFee; - updateCurrentValues(); $timeout(function() { $scope.$apply(); }); @@ -33,8 +32,10 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu }); $scope.init = function() { + + $scope.network = $scope.network || 'livenet'; $scope.feeOpts = feeService.feeOpts; - $scope.currentFeeLevel = $scope.customFeeLevel ? $scope.customFeeLevel : feeService.getCurrentFeeLevel(); + $scope.currentFeeLevel = $scope.feeLevel || feeService.getCurrentFeeLevel(); $scope.loadingFee = true; feeService.getFeeLevels(function(err, levels) { $scope.loadingFee = false; @@ -45,22 +46,27 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu } $scope.feeLevels = levels; updateCurrentValues(); - $scope.$apply(); + $timeout(function() { + $scope.$apply(); + }); }); }; var updateCurrentValues = function() { if (lodash.isEmpty($scope.feeLevels) || lodash.isEmpty($scope.currentFeeLevel)) return; - var feeLevelValue = lodash.find($scope.feeLevels['livenet'], { + + var value = lodash.find($scope.feeLevels[$scope.network], { level: $scope.currentFeeLevel }); - if (lodash.isEmpty(feeLevelValue)) { + + if (lodash.isEmpty(value)) { $scope.feePerSatByte = null; $scope.avgConfirmationTime = null; return; } - $scope.feePerSatByte = (feeLevelValue.feePerKB / 1000).toFixed(); - $scope.avgConfirmationTime = feeLevelValue.nbBlocks * 10; + + $scope.feePerSatByte = (value.feePerKB / 1000).toFixed(); + $scope.avgConfirmationTime = value.nbBlocks * 10; }; $scope.chooseNewFee = function() { diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 51442a1d2..6c34dfdc5 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -12,6 +12,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.homeTip = $stateParams.fromOnboarding; $scope.isCordova = platformInfo.isCordova; $scope.isAndroid = platformInfo.isAndroid; + $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; $scope.isNW = platformInfo.isNW; $scope.showRateCard = {}; @@ -42,6 +43,11 @@ angular.module('copayApp.controllers').controller('tabHomeController', } storageService.getFeedbackInfo(function(error, info) { + + if ($scope.isWindowsPhoneApp) { + $scope.showRateCard.value = false; + return; + } if (!info) { initFeedBackInfo(); } else { diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index ba6577938..830cc167b 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog) { +angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService) { var originalList; var CONTACTS_SHOW_LIMIT; @@ -120,7 +120,20 @@ angular.module('copayApp.controllers').controller('tabSendController', function( }; $scope.openScanner = function() { - $state.go('tabs.scan'); + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + + if (!isWindowsPhoneApp) { + $state.go('tabs.scan'); + return; + } + + scannerService.useOldScanner(function(err, contents) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; + } + incomingData.redir(contents); + }); }; $scope.showMore = function() { diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index c3f238477..42c8e96b4 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -51,6 +51,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.isCordova = platformInfo.isCordova; + $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; $scope.isDevel = platformInfo.isDevel; $scope.appName = appConfigService.nameCase; configService.whenAvailable(function(config) { diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js index 42899e13e..a186879e3 100644 --- a/src/js/controllers/tabsController.js +++ b/src/js/controllers/tabsController.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash, popupService, gettextCatalog) { +angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, platformInfo, incomingData, lodash, popupService, gettextCatalog, scannerService) { $scope.onScan = function(data) { if (!incomingData.redir(data)) { @@ -22,8 +22,23 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro }, 1); }; - $scope.$on("$ionicView.beforeEnter", function(event, data) { - $rootScope.hideTabs = ''; - }); + $scope.chooseScanner = function() { + + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + + if (!isWindowsPhoneApp) { + $state.go('tabs.scan'); + return; + } + + scannerService.useOldScanner(function(err, contents) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; + } + incomingData.redir(contents); + }); + + }; }); diff --git a/src/js/controllers/topup.js b/src/js/controllers/topup.js index ce9ff7964..175d7e016 100644 --- a/src/js/controllers/topup.js +++ b/src/js/controllers/topup.js @@ -1,24 +1,18 @@ 'use strict'; -angular.module('copayApp.controllers').controller('topUpController', function($scope, $log, $state, $timeout, $ionicHistory, $ionicConfig, lodash, popupService, profileService, ongoingProcess, walletService, configService, platformInfo, bitpayService, bitpayCardService, payproService, bwcError, txFormatService, sendMaxService) { - - var amount; - var currency; - var cardId; - var sendMax; +angular.module('copayApp.controllers').controller('topUpController', function($scope, $log, $state, $timeout, $ionicHistory, $ionicConfig, lodash, popupService, profileService, ongoingProcess, walletService, configService, platformInfo, bitpayService, bitpayCardService, payproService, bwcError, txFormatService, sendMaxService, gettextCatalog) { $scope.isCordova = platformInfo.isCordova; - - $scope.$on("$ionicView.beforeLeave", function(event, data) { - $ionicConfig.views.swipeBackEnabled(true); - }); - - $scope.$on("$ionicView.enter", function(event, data) { - $ionicConfig.views.swipeBackEnabled(false); - }); + var cardId; + var useSendMax; + var amount; + var currency; + var createdTx; + var message; + var configWallet = configService.getSync().wallet; var showErrorAndBack = function(title, msg) { - title = title || 'Error'; + title = title || gettextCatalog.getString('Error'); $scope.sendStatus = ''; $log.error(msg); msg = msg.errors ? msg.errors[0].message : msg; @@ -27,17 +21,24 @@ angular.module('copayApp.controllers').controller('topUpController', function($s }); }; - var showError = function(title, msg) { - title = title || 'Error'; + var showError = function(title, msg, cb) { + cb = cb || function() {}; + title = title || gettextCatalog.getString('Error'); $scope.sendStatus = ''; $log.error(msg); msg = msg.errors ? msg.errors[0].message : msg; - popupService.showAlert(title, msg); + popupService.showAlert(title, msg, cb); + }; + + var satToFiat = function(sat, cb) { + txFormatService.toFiat(sat, $scope.currencyIsoCode, function(value) { + return cb(value); + }); }; var publishAndSign = function (wallet, txp, onSendStatusChange, cb) { if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { - var err = 'No signing proposal: No private key'; + var err = gettextCatalog.getString('No signing proposal: No private key'); $log.info(err); return cb(err); } @@ -50,7 +51,7 @@ angular.module('copayApp.controllers').controller('topUpController', function($s var statusChangeHandler = function (processName, showName, isOn) { $log.debug('statusChangeHandler: ', processName, showName, isOn); - if ( processName == 'topup' && !isOn) { + if (processName == 'topup' && !isOn) { $scope.sendStatus = 'success'; $timeout(function() { $scope.$digest(); @@ -60,137 +61,237 @@ angular.module('copayApp.controllers').controller('topUpController', function($s } }; - $scope.$on("$ionicView.beforeEnter", function(event, data) { - cardId = data.stateParams.id; - sendMax = data.stateParams.useSendMax; + var setTotalAmount = function(amountSat, invoiceFeeSat, networkFeeSat) { + satToFiat(amountSat, function(a) { + $scope.amount = Number(a); - if (!cardId) { - showErrorAndBack(null, 'No card selected'); - return; + satToFiat(invoiceFeeSat, function(i) { + $scope.invoiceFee = Number(i); + + satToFiat(networkFeeSat, function(n) { + $scope.networkFee = Number(n); + $scope.totalAmount = $scope.amount + $scope.invoiceFee + $scope.networkFee; + $timeout(function() { + $scope.$digest(); + }); + }); + }); + }); + }; + + var createInvoice = function(data, cb) { + bitpayCardService.topUp(cardId, data, function(err, invoiceId) { + if (err) { + return cb({ + title: gettextCatalog.getString('Could not create the invoice'), + message: err + }); + } + + bitpayCardService.getInvoice(invoiceId, function(err, inv) { + if (err) { + return cb({ + title: gettextCatalog.getString('Could not get the invoice'), + message: err + }); + } + return cb(null, inv); + }); + }); + }; + + var createTx = function(wallet, invoice, message, cb) { + var payProUrl = (invoice && invoice.paymentUrls) ? invoice.paymentUrls.BIP73 : null; + + if (!payProUrl) { + return cb({ + title: gettextCatalog.getString('Error in Payment Protocol'), + message: gettextCatalog.getString('Invalid URL') + }); } - - var parsedAmount = txFormatService.parseAmount( - data.stateParams.amount, - data.stateParams.currency); - amount = parsedAmount.amount; - currency = parsedAmount.currency; - $scope.amountUnitStr = parsedAmount.amountUnitStr; + var outputs = []; + var toAddress = invoice.bitcoinAddress; + var amountSat = parseInt(invoice.btcDue * 100000000); // BTC to Satoshi - $scope.network = bitpayService.getEnvironment().network; - $scope.wallets = profileService.getWallets({ - onlyComplete: true, - network: $scope.network, - hasFunds: true, - minAmount: parsedAmount.amountSat + outputs.push({ + 'toAddress': toAddress, + 'amount': amountSat, + 'message': message }); - if (lodash.isEmpty($scope.wallets)) { - showErrorAndBack(null, 'Insufficient funds'); - return; + var txp = { + toAddress: toAddress, + amount: amountSat, + outputs: outputs, + message: message, + payProUrl: payProUrl, + excludeUnconfirmedUtxos: configWallet.spendUnconfirmed ? false : true, + feeLevel: configWallet.settings.feeLevel || 'normal' + }; + + walletService.createTx(wallet, txp, function(err, ctxp) { + if (err) { + return cb({ + title: gettextCatalog.getString('Could not create transaction'), + message: bwcError.msg(err) + }); + } + return cb(null, ctxp); + }); + }; + + var calculateAmount = function(wallet, cb) { + // Global variables defined beforeEnter + var a = amount; + var c = currency; + + if (useSendMax) { + sendMaxService.getInfo(wallet, function(err, maxValues) { + if (err) { + return cb({ + title: null, + message: err + }) + } + + if (maxValues.amount == 0) { + return cb({message: gettextCatalog.getString('Insufficient funds for fee')}); + } + + var maxAmountBtc = Number((maxValues.amount / 100000000).toFixed(8)); + + createInvoice({amount: maxAmountBtc, currency: 'BTC'}, function(err, inv) { + if (err) return cb(err); + + var invoiceFeeSat = parseInt((inv.buyerPaidBtcMinerFee * 100000000).toFixed()); + var newAmountSat = maxValues.amount - invoiceFeeSat; + + if (newAmountSat <= 0) { + return cb({message: gettextCatalog.getString('Insufficient funds for fee')}); + } + + return cb(null, newAmountSat, 'sat'); + }); + }); + } else { + return cb(null, a, c); } - $scope.onWalletSelect($scope.wallets[0]); // Default first wallet + }; + + var initializeTopUp = function(wallet, parsedAmount) { + $scope.amountUnitStr = parsedAmount.amountUnitStr; + var dataSrc = { + amount: parsedAmount.amount, + currency: parsedAmount.currency + }; + ongoingProcess.set('loadingTxInfo', true); + createInvoice(dataSrc, function(err, invoice) { + if (err) { + ongoingProcess.set('loadingTxInfo', false); + showErrorAndBack(err.title, err.message); + return; + } + + var invoiceFeeSat = (invoice.buyerPaidBtcMinerFee * 100000000).toFixed(); + + message = gettextCatalog.getString("Top up {{amountStr}} to debit card ({{cardLastNumber}})", { + amountStr: $scope.amountUnitStr, + cardLastNumber: $scope.lastFourDigits + }); + + createTx(wallet, invoice, message, function(err, ctxp) { + ongoingProcess.set('loadingTxInfo', false); + if (err) { + showErrorAndBack(err.title, err.message); + return; + } + + // Save TX in memory + createdTx = ctxp; + + $scope.totalAmountStr = txFormatService.formatAmountStr(ctxp.amount); + + setTotalAmount(parsedAmount.amountSat, invoiceFeeSat, ctxp.fee); + + }); + + }); + + }; + + $scope.$on("$ionicView.beforeLeave", function(event, data) { + $ionicConfig.views.swipeBackEnabled(true); + }); + + $scope.$on("$ionicView.enter", function(event, data) { + $ionicConfig.views.swipeBackEnabled(false); + }); + + $scope.$on("$ionicView.beforeEnter", function(event, data) { + + cardId = data.stateParams.id; + useSendMax = data.stateParams.useSendMax; + amount = data.stateParams.amount; + currency = data.stateParams.currency; bitpayCardService.get({ cardId: cardId, noRefresh: true }, function(err, card) { if (err) { showErrorAndBack(null, err); return; } - $scope.cardInfo = card[0]; - bitpayCardService.setCurrencySymbol($scope.cardInfo); - bitpayCardService.getRates($scope.cardInfo.currency, function(err, data) { - if (err) $log.error(err); - $scope.rate = data.rate; - }); - }); + bitpayCardService.setCurrencySymbol(card[0]); + $scope.lastFourDigits = card[0].lastFourDigits; + $scope.currencySymbol = card[0].currencySymbol; + $scope.currencyIsoCode = card[0].currency; + $scope.wallets = profileService.getWallets({ + onlyComplete: true, + network: bitpayService.getEnvironment().network, + hasFunds: true + }); + + if (lodash.isEmpty($scope.wallets)) { + showErrorAndBack(null, gettextCatalog.getString('No wallets available')); + return; + } + + bitpayCardService.getRates($scope.currencyIsoCode, function(err, r) { + if (err) $log.error(err); + $scope.rate = r.rate; + }); + + $scope.onWalletSelect($scope.wallets[0]); // Default first wallet + }); }); $scope.topUpConfirm = function() { - var config = configService.getSync(); - var configWallet = config.wallet; - var walletSettings = configWallet.settings; + if (!createdTx) { + showError(null, gettextCatalog.getString('Transaction has not been created')); + return; + } - var message = 'Add ' + amount + ' ' + currency + ' to debit card'; - var okText = 'Confirm'; - var cancelText = 'Cancel'; - popupService.showConfirm(null, message, okText, cancelText, function(ok) { - if (!ok) return; + var title = gettextCatalog.getString('Confirm'); + var okText = gettextCatalog.getString('OK'); + var cancelText = gettextCatalog.getString('Cancel'); + popupService.showConfirm(title, message, okText, cancelText, function(ok) { + if (!ok) { + $scope.sendStatus = ''; + return; + } - var dataSrc = { - amount: amount, - currency: currency - }; ongoingProcess.set('topup', true, statusChangeHandler); - bitpayCardService.topUp(cardId, dataSrc, function(err, invoiceId) { + publishAndSign($scope.wallet, createdTx, function() {}, function(err, txSent) { if (err) { - ongoingProcess.set('topup', false, statusChangeHandler); - showErrorAndBack('Could not create the invoice', err); + ongoingProcess.set('topup', false); + $scope.sendStatus = ''; + showError(gettextCatalog.getString('Could not send transaction'), err); return; } - - bitpayCardService.getInvoice(invoiceId, function(err, invoice) { - if (err) { - ongoingProcess.set('topup', false, statusChangeHandler); - showError('Could not get the invoice', err); - return; - } - - var payProUrl = (invoice && invoice.paymentUrls) ? invoice.paymentUrls.BIP73 : null; - - if (!payProUrl) { - ongoingProcess.set('topup', false, statusChangeHandler); - showError('Error in Payment Protocol', 'Invalid URL'); - return; - } - - payproService.getPayProDetails(payProUrl, function(err, payProDetails) { - if (err) { - ongoingProcess.set('topup', false, statusChangeHandler); - showError('Error fetching invoice', err); - return; - } - - var outputs = []; - var toAddress = payProDetails.toAddress; - var amountSat = payProDetails.amount; - var comment = 'Top up ' + amount + ' ' + currency + ' to Debit Card (' + $scope.cardInfo.lastFourDigits + ')'; - - outputs.push({ - 'toAddress': toAddress, - 'amount': amountSat, - 'message': comment - }); - - var txp = { - toAddress: toAddress, - amount: amountSat, - outputs: outputs, - message: comment, - payProUrl: payProUrl, - excludeUnconfirmedUtxos: configWallet.spendUnconfirmed ? false : true, - feeLevel: walletSettings.feeLevel || 'normal' - }; - - walletService.createTx($scope.wallet, txp, function(err, ctxp) { - if (err) { - ongoingProcess.set('topup', false, statusChangeHandler); - showError('Could not create transaction', bwcError.msg(err)); - return; - } - publishAndSign($scope.wallet, ctxp, function() {}, function(err, txSent) { - ongoingProcess.set('topup', false, statusChangeHandler); - if (err) { - showError('Could not send transaction', err); - return; - } - }); - }); - }, true); // Disable loader - }); - }); - }); + ongoingProcess.set('topup', false, statusChangeHandler); + }); + }); }; $scope.showWalletSelector = function() { @@ -200,29 +301,19 @@ angular.module('copayApp.controllers').controller('topUpController', function($s $scope.onWalletSelect = function(wallet) { $scope.wallet = wallet; - if (sendMax) { - ongoingProcess.set('retrievingInputs', true); - sendMaxService.getInfo($scope.wallet, function(err, values) { - ongoingProcess.set('retrievingInputs', false); - if (err) { - showErrorAndBack(null, err); - return; - } - var config = configService.getSync().wallet.settings; - var unitName = config.unitName; - var amountUnit = txFormatService.satToUnit(values.amount); - var parsedAmount = txFormatService.parseAmount( - amountUnit, - unitName); - - amount = parsedAmount.amount; - currency = parsedAmount.currency; - $scope.amountUnitStr = parsedAmount.amountUnitStr; - $timeout(function() { - $scope.$digest(); - }, 100); - }); - } + ongoingProcess.set('retrievingInputs', true); + calculateAmount(wallet, function(err, a, c) { + ongoingProcess.set('retrievingInputs', false); + if (err) { + createdTx = message = $scope.totalAmountStr = $scope.amountUnitStr = $scope.wallet = null; + showError(err.title, err.message, function() { + $scope.showWalletSelector(); + }); + return; + } + var parsedAmount = txFormatService.parseAmount(a, c); + initializeTopUp(wallet, parsedAmount); + }); }; $scope.goBackHome = function() { diff --git a/src/js/controllers/tx-details.js b/src/js/controllers/tx-details.js index 2205feebf..a7da4c9ca 100644 --- a/src/js/controllers/tx-details.js +++ b/src/js/controllers/tx-details.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $log, $ionicHistory, $scope, $timeout, walletService, lodash, gettextCatalog, profileService, externalLinkService, popupService, ongoingProcess, txFormatService, txConfirmNotification) { +angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $log, $ionicHistory, $scope, $timeout, walletService, lodash, gettextCatalog, profileService, externalLinkService, popupService, ongoingProcess, txFormatService, txConfirmNotification, feeService) { var txId; var listeners = []; @@ -11,20 +11,22 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.wallet = profileService.getWallet(data.stateParams.walletId); $scope.color = $scope.wallet.color; $scope.copayerId = $scope.wallet.credentials.copayerId; - $scope.isShared = $scope.wallet.credentials.n > 1; + $scope.isShared = $scope.wallet.credentials.n > 1; txConfirmNotification.checkIfEnabled(txId, function(res) { - $scope.txNotification = { value: res }; + $scope.txNotification = { + value: res + }; }); - }); - $scope.$on("$ionicView.afterEnter", function(event) { updateTx(); listeners = [ $rootScope.$on('bwsEvent', function(e, walletId, type, n) { if (type == 'NewBlock' && n && n.data && n.data.network == 'livenet') { - updateTxDebounced({hideLoading: true}); + updateTxDebounced({ + hideLoading: true + }); } }) ]; @@ -36,14 +38,6 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio }); }); - function getDisplayAmount(amountStr) { - return amountStr.split(' ')[0]; - } - - function getDisplayUnit(amountStr) { - return amountStr.split(' ')[1]; - } - function updateMemo() { walletService.getTxNote($scope.wallet, $scope.btx.txid, function(err, note) { if (err) { @@ -108,7 +102,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.btx = txFormatService.processTx(tx); txFormatService.formatAlternativeStr(tx.fees, function(v) { - $scope.feeFiatStr = v; + $scope.btx.feeFiatStr = v; + $scope.btx.feeRateStr = ($scope.btx.fees / ($scope.btx.amount + $scope.btx.fees) * 100).toFixed(2) + '%'; }); if ($scope.btx.action != 'invalid') { @@ -117,20 +112,30 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio if ($scope.btx.action == 'moved') $scope.title = gettextCatalog.getString('Moved Funds'); } - $scope.displayAmount = getDisplayAmount($scope.btx.amountStr); - $scope.displayUnit = getDisplayUnit($scope.btx.amountStr); - updateMemo(); initActionList(); getFiatRate(); $timeout(function() { - $scope.$apply(); + $scope.$digest(); + }); + + feeService.getFeeLevels(function(err, levels) { + if (err) return; + walletService.getLowAmount($scope.wallet, levels, function(err, amount) { + if (err) return; + $scope.btx.lowAmount = tx.amount < amount; + + $timeout(function() { + $scope.$apply(); + }); + + }); }); }); }; var updateTxDebounced = lodash.debounce(updateTx, 5000); - + $scope.showCommentPopup = function() { var opts = {}; if ($scope.btx.message) { @@ -197,7 +202,9 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.txConfirmNotificationChange = function() { if ($scope.txNotification.value) { - txConfirmNotification.subscribe($scope.wallet, { txid: txId }); + txConfirmNotification.subscribe($scope.wallet, { + txid: txId + }); } else { txConfirmNotification.unsubscribe($scope.wallet, txId); } diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 24cf0afbc..a41c32c2c 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window, bwcError, gettextCatalog, timeService) { +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window, bwcError, gettextCatalog, timeService, feeService) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -47,6 +47,21 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.txps = lodash.sortBy(txps, 'createdOn').reverse(); }; + var analyzeUtxosDone; + + var analyzeUtxos = function() { + if (analyzeUtxosDone) return; + + feeService.getFeeLevels(function(err, levels){ + if (err) return; + walletService.getLowUtxos($scope.wallet, levels, function(err, resp){ + if (err || !resp) return; + analyzeUtxosDone = true; + $scope.lowUtxosWarning = resp.warning; + }); + }); + }; + var updateStatus = function(force) { $scope.updatingStatus = true; $scope.updateStatusError = null; @@ -72,6 +87,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.$apply(); }); + analyzeUtxos(); + }); }; @@ -154,9 +171,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); }; - $timeout(function() { + feeService.getFeeLevels(function(err, levels){ walletService.getTxHistory($scope.wallet, { progressFn: progressFn, + feeLevels: levels, }, function(err, txHistory) { $scope.updatingTxHistory = false; if (err) { diff --git a/src/js/directives/clickToAccept.js b/src/js/directives/clickToAccept.js index 2127075dd..bb31b45b4 100644 --- a/src/js/directives/clickToAccept.js +++ b/src/js/directives/clickToAccept.js @@ -8,9 +8,7 @@ angular.module('copayApp.directives') transclude: true, scope: { sendStatus: '=clickSendStatus', - hasWalletChosen: '=hasWalletChosen', - insufficientFunds: '=insufficientFunds', - noMatchingWallet: '=noMatchingWallet' + isDisabled: '=isDisabled', }, link: function(scope, element, attrs) { scope.$watch('sendStatus', function() { diff --git a/src/js/directives/countdown.js b/src/js/directives/countdown.js new file mode 100644 index 000000000..1e9ee4100 --- /dev/null +++ b/src/js/directives/countdown.js @@ -0,0 +1,67 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('timer', function() { + return { + restrict: 'EAC', + replace: false, + scope: { + countdown: "=", + interval: "=", + active: "=", + onZeroCallback: "=" + }, + template:"{{formatted}}", + controller: function ($scope, $attrs, $timeout, lodash) { + $scope.format = $attrs.outputFormat; + + var queueTick = function () { + $scope.timer = $timeout(function () { + if ($scope.countdown > 0) { + $scope.countdown -= 1; + + if ($scope.countdown > 0) { + queueTick(); + } else { + $scope.countdown = 0; + $scope.active = false; + if (!lodash.isUndefined($scope.onZeroCallback)) { + $scope.onZeroCallback(); + } + } + } + }, $scope.interval); + }; + + if ($scope.active) { + queueTick(); + } + + $scope.$watch('active', function (newValue, oldValue) { + if (newValue !== oldValue) { + if (newValue === true) { + if ($scope.countdown > 0) { + queueTick(); + } else { + $scope.active = false; + } + } else { + $timeout.cancel($scope.timer); + } + } + }); + $scope.$watch('countdown', function () { + updateFormatted(); + }); + + var updateFormatted = function () { + $scope.formatted = moment($scope.countdown * $scope.interval).format($scope.format); + }; + updateFormatted(); + + $scope.$on('$destroy', function () { + $timeout.cancel($scope.timer); + }); + } + }; + }); diff --git a/src/js/directives/noLowFee.js b/src/js/directives/noLowFee.js index b332272e5..68046056b 100644 --- a/src/js/directives/noLowFee.js +++ b/src/js/directives/noLowFee.js @@ -12,7 +12,7 @@ angular.module('copayApp.directives') elem.bind('click', function() { configService.whenAvailable(function(config) { - if (config.wallet.settings.feeLevel.match(/conomy/)) { + if (config.wallet.settings.feeLevel && config.wallet.settings.feeLevel.match(/conomy/)) { $log.debug('Economy Fee setting... disabling link:' + elem.text()); popupService.showAlert('Low Fee Error', 'Please change your Bitcoin Network Fee Policy setting to Normal or higher to use this service', function() { $ionicHistory.goBack(); diff --git a/src/js/directives/qrScanner.js b/src/js/directives/qrScanner.js index 8a144bc2b..158f71c7e 100644 --- a/src/js/directives/qrScanner.js +++ b/src/js/directives/qrScanner.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.directives') - .directive('qrScanner', function($state, $rootScope, $log, $ionicHistory) { + .directive('qrScanner', function($state, $rootScope, $log, $ionicHistory, platformInfo, scannerService, popupService) { return { restrict: 'E', @@ -9,26 +9,49 @@ angular.module('copayApp.directives') onScan: "&" }, replace: true, - template: '', + template: '', link: function(scope, el, attrs) { + scope.chooseScanner = function() { + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + + if (!isWindowsPhoneApp) { + scope.openScanner(); + return; + } + + scannerService.useOldScanner(function(err, contents) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; + } + scope.onScan({ + data: contents + }); + }); + }; + scope.openScanner = function() { $log.debug('Opening scanner by directive...'); $ionicHistory.nextViewOptions({ disableAnimate: true }); - $state.go('scanner', { passthroughMode: 1 }); + $state.go('scanner', { + passthroughMode: 1 + }); }; var afterEnter = $rootScope.$on('$ionicView.afterEnter', function() { - if($rootScope.scanResult) { - scope.onScan({ data: $rootScope.scanResult }); + if ($rootScope.scanResult) { + scope.onScan({ + data: $rootScope.scanResult + }); $rootScope.scanResult = null; } }); // Destroy event - scope.$on('$destroy', function(){ + scope.$on('$destroy', function() { afterEnter(); }); } diff --git a/src/js/directives/showTabs.js b/src/js/directives/showTabs.js new file mode 100644 index 000000000..5c56ec0db --- /dev/null +++ b/src/js/directives/showTabs.js @@ -0,0 +1,15 @@ +'use strict'; +angular.module('copayApp.directives') + .directive('showTabs', function($rootScope, $timeout) { + return { + restrict: 'A', + link: function($scope, $el) { + $scope.$on("$ionicView.beforeEnter", function(event, data) { + $timeout(function() { + $rootScope.hideTabs = ''; + $rootScope.$apply(); + }); + }); + } + }; + }); diff --git a/src/js/directives/slideToAccept.js b/src/js/directives/slideToAccept.js index e57aaecff..3f4db0ef9 100644 --- a/src/js/directives/slideToAccept.js +++ b/src/js/directives/slideToAccept.js @@ -9,7 +9,7 @@ angular.module('copayApp.directives') scope: { sendStatus: '=slideSendStatus', onConfirm: '&slideOnConfirm', - wallet: '=hasWalletChosen' + isDisabled: '=isDisabled' }, link: function(scope, element, attrs) { diff --git a/src/js/directives/slideToAcceptSuccess.js b/src/js/directives/slideToAcceptSuccess.js index b5e9b20bc..fbd588bfe 100644 --- a/src/js/directives/slideToAcceptSuccess.js +++ b/src/js/directives/slideToAcceptSuccess.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.directives') - .directive('slideToAcceptSuccess', function($timeout) { + .directive('slideToAcceptSuccess', function($timeout, platformInfo) { return { restrict: 'E', templateUrl: 'views/includes/slideToAcceptSuccess.html', @@ -12,10 +12,13 @@ angular.module('copayApp.directives') hideOnConfirm: '=slideSuccessHideOnConfirm' }, link: function(scope, element, attrs) { + + scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + var elm = element[0]; elm.style.display = 'none'; scope.$watch('isShown', function() { - if(scope.isShown) { + if (scope.isShown) { elm.style.display = 'flex'; $timeout(function() { scope.fillScreen = true; @@ -24,7 +27,7 @@ angular.module('copayApp.directives') }); scope.onConfirmButtonClick = function() { scope.onConfirm(); - if(scope.hideOnConfirm) { + if (scope.hideOnConfirm) { scope.fillScreen = false; elm.style.display = 'none'; } diff --git a/src/js/routes.js b/src/js/routes.js index 69ef54ea6..21b9515f9 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -112,11 +112,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('starting', { url: '/starting', - template: '{{starting}}', - controller: function($scope, $log, gettextCatalog) { - $log.info('Starting...'); - $scope.starting = gettextCatalog.getString('Starting...'); - } + template: '' }) /* @@ -136,10 +132,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) } }) - .state('uripayment', { - url: '/uri-payment/:url', - templateUrl: 'views/paymentUri.html' - }) /* * @@ -202,6 +194,25 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) + .state('tabs.wallet.addresses', { + url: '/addresses/:walletId/:toAddress', + views: { + 'tab-home@tabs': { + controller: 'addressesController', + templateUrl: 'views/addresses.html' + } + } + }) + .state('tabs.wallet.allAddresses', { + url: '/allAddresses/:walletId', + views: { + 'tab-home@tabs': { + controller: 'addressesController', + templateUrl: 'views/allAddresses.html' + } + } + }) + /* * * Tabs @@ -1204,10 +1215,12 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr $ionicHistory.goBack(); } else if ($rootScope.backButtonPressedOnceToExit) { - ionic.Platform.exitApp(); + navigator.app.exitApp(); } else { $rootScope.backButtonPressedOnceToExit = true; - window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit')); + $rootScope.$apply(function() { + ionicToast.show(gettextCatalog.getString('Press again to exit'), 'bottom', false, 1000); + }); $timeout(function() { $rootScope.backButtonPressedOnceToExit = false; }, 3000); diff --git a/src/js/services/bitpayAccountService.js b/src/js/services/bitpayAccountService.js index 7ab5a1bf7..8204da246 100644 --- a/src/js/services/bitpayAccountService.js +++ b/src/js/services/bitpayAccountService.js @@ -14,18 +14,18 @@ angular.module('copayApp.services').factory('bitpayAccountService', function($lo * email: email address associated with bitpay account * otp: two-factor one-time use password * } - * + * * pairingReason - text string to be embedded into popup message. If `null` then the reason * message is not shown to the UI. * "To {{reason}} you must pair this app with your BitPay account ({{email}})." - * + * * cb - callback after completion * callback(err, paired, apiContext) * * err - something unexpected happened which prevented the pairing - * + * * paired - boolean indicating whether the pairing was compledted by the user - * + * * apiContext - the context needed for making future api calls * { * token: api token for use in future calls @@ -33,6 +33,7 @@ angular.module('copayApp.services').factory('bitpayAccountService', function($lo * appIdentity: the identity of this app * } */ + root.pair = function(pairData, pairingReason, cb) { checkOtp(pairData, function(otp) { pairData.otp = otp; @@ -66,14 +67,19 @@ angular.module('copayApp.services').factory('bitpayAccountService', function($lo fetchBasicInfo(apiContext, function(err, basicInfo) { if (err) return cb(err); var title = gettextCatalog.getString('Add BitPay Account?'); - var msgDetail = 'Add this BitPay account ({{email}})?'; + var msg; + if (pairingReason) { - msgDetail = 'To {{reason}} you must first add your BitPay account - {{email}}'; - } - var msg = gettextCatalog.getString(msgDetail, { - reason: pairingReason, - email: pairData.email - }); + msg = gettextCatalog.getString('To {{reason}} you must first add your BitPay account - {{email}}', { + reason: pairingReason, + email: pairData.email + }); + } else { + msg = gettextCatalog.getString('Add this BitPay account ({{email}})?', { + email: pairData.email + }); + } + var ok = gettextCatalog.getString('Add Account'); var cancel = gettextCatalog.getString('Go back'); popupService.showConfirm(title, msg, ok, cancel, function(res) { @@ -182,5 +188,5 @@ angular.module('copayApp.services').factory('bitpayAccountService', function($lo }; return root; - + }); diff --git a/src/js/services/bwcError.js b/src/js/services/bwcError.js index 9740af88e..417350868 100644 --- a/src/js/services/bwcError.js +++ b/src/js/services/bwcError.js @@ -110,7 +110,7 @@ angular.module('copayApp.services') body = gettextCatalog.getString('Amount below minimum allowed'); break; case 'INCORRECT_ADDRESS_NETWORK': - body = gettextCatalog.getString('Incorrect address network'); + body = gettextCatalog.getString('Incorrect network address'); break; case 'COPAYER_REGISTERED': body = gettextCatalog.getString('Key already associated with an existing wallet'); diff --git a/src/js/services/coinbaseService.js b/src/js/services/coinbaseService.js index cce8544de..1bee17990 100644 --- a/src/js/services/coinbaseService.js +++ b/src/js/services/coinbaseService.js @@ -1,11 +1,11 @@ 'use strict'; -angular.module('copayApp.services').factory('coinbaseService', function($http, $log, $window, $filter, platformInfo, lodash, storageService, configService, appConfigService, txFormatService, buyAndSellService, $rootScope) { +angular.module('copayApp.services').factory('coinbaseService', function($http, $log, $window, $filter, platformInfo, lodash, storageService, configService, appConfigService, txFormatService, buyAndSellService, $rootScope, feeService) { var root = {}; var credentials = {}; var isCordova = platformInfo.isCordova; var isNW = platformInfo.isNW; - var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; root.priceSensitivity = [{ value: 0.5, @@ -107,6 +107,19 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ }; }; + root.checkEnoughFundsForFee = function(amount, cb) { + _getNetAmount(amount, function(err, reducedAmount) { + if (err) return cb(err); + + // Check if transaction has enough funds to transfer bitcoin from Coinbase to Copay + if (reducedAmount < 0) { + return cb('Not enough funds for fee'); + } + + return cb(); + }); + }; + root.getSignupUrl = function() { return credentials.HOST + '/signup'; } @@ -153,6 +166,17 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ }); }; + var _getNetAmount = function(amount, cb) { + // Fee Normal for a single transaction (450 bytes) + var txNormalFeeKB = 450 / 1000; + feeService.getFeeRate(null, 'normal', function(err, feePerKB) { + if (err) return cb(err); + var feeBTC = (feePerKB * txNormalFeeKB / 100000000).toFixed(8); + + return cb(null, amount - feeBTC, feeBTC); + }); + }; + var _refreshToken = function(refreshToken, cb) { var req = { method: 'POST', @@ -303,14 +327,14 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ }; root.getBuyOrder = function(token, accountId, buyId, cb) { - if (!token) return cb('Invalid Token'); - $http(_get('/accounts/' + accountId + '/buys/' + buyId, token)).then(function(data) { - $log.info('Coinbase Buy Info: SUCCESS'); - return cb(null, data.data); - }, function(data) { - $log.error('Coinbase Buy Info: ERROR ' + data.statusText); - return cb(data.data); - }); + if (!token) return cb('Invalid Token'); + $http(_get('/accounts/' + accountId + '/buys/' + buyId, token)).then(function(data) { + $log.info('Coinbase Buy Info: SUCCESS'); + return cb(null, data.data); + }, function(data) { + $log.error('Coinbase Buy Info: ERROR ' + data.statusText); + return cb(data.data); + }); }; root.getTransaction = function(token, accountId, transactionId, cb) { @@ -657,13 +681,7 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ var _sendToWallet = function(tx, accessToken, accountId, coinbasePendingTransactions) { if (!tx) return; var desc = appConfigService.nameCase + ' Wallet'; - var data = { - to: tx.toAddr, - amount: tx.amount.amount, - currency: tx.amount.currency, - description: desc - }; - root.sendTo(accessToken, accountId, data, function(err, res) { + _getNetAmount(tx.amount.amount, function(err, amountBTC, feeBTC) { if (err) { _savePendingTransaction(tx, { status: 'error', @@ -672,8 +690,18 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ if (err) $log.debug(err); _updateTxs(coinbasePendingTransactions); }); - } else { - if (res.data && !res.data.id) { + return; + } + + var data = { + to: tx.toAddr, + amount: amountBTC, + currency: tx.amount.currency, + description: desc, + fee: feeBTC + }; + root.sendTo(accessToken, accountId, data, function(err, res) { + if (err) { _savePendingTransaction(tx, { status: 'error', error: err @@ -681,19 +709,29 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ if (err) $log.debug(err); _updateTxs(coinbasePendingTransactions); }); - return; - } - root.getTransaction(accessToken, accountId, res.data.id, function(err, sendTx) { - _savePendingTransaction(tx, { - remove: true - }, function(err) { - _savePendingTransaction(sendTx.data, {}, function(err) { + } else { + if (res.data && !res.data.id) { + _savePendingTransaction(tx, { + status: 'error', + error: err + }, function(err) { if (err) $log.debug(err); _updateTxs(coinbasePendingTransactions); }); + return; + } + root.getTransaction(accessToken, accountId, res.data.id, function(err, sendTx) { + _savePendingTransaction(tx, { + remove: true + }, function(err) { + _savePendingTransaction(sendTx.data, {}, function(err) { + if (err) $log.debug(err); + _updateTxs(coinbasePendingTransactions); + }); + }); }); - }); - } + } + }); }); }; @@ -723,7 +761,7 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ var register = function() { - root.isActive(function(err, isActive){ + root.isActive(function(err, isActive) { if (err) return; buyAndSellService.register({ @@ -742,7 +780,7 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ $rootScope.$on('bwsEvent', function(e, walletId, type, n) { if (type == 'NewBlock' && n && n.data && n.data.network == 'livenet') { - root.isActive(function(err,isActive){ + root.isActive(function(err, isActive) { // Update Coinbase if (isActive) root.updatePendingTransactions(); diff --git a/src/js/services/configService.js b/src/js/services/configService.js index becb06852..5a2e1d1f7 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -1,8 +1,10 @@ 'use strict'; -angular.module('copayApp.services').factory('configService', function(storageService, lodash, $log, $timeout, $rootScope) { +angular.module('copayApp.services').factory('configService', function(storageService, lodash, $log, $timeout, $rootScope, platformInfo) { var root = {}; + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + var defaultConfig = { // wallet limits limits: { @@ -73,7 +75,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer }, hideNextSteps: { - enabled: false, + enabled: isWindowsPhoneApp ? true : false, }, rates: { diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index 889ffb83e..cdab6a7a5 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -1,8 +1,10 @@ 'use strict'; -angular.module('copayApp.services').factory('feeService', function($log, $stateParams, bwcService, walletService, configService, gettext, lodash, txFormatService, gettextCatalog) { +angular.module('copayApp.services').factory('feeService', function($log, $timeout, $stateParams, bwcService, walletService, configService, gettext, lodash, txFormatService, gettextCatalog) { var root = {}; + var CACHE_TIME_TS = 60; // 1 min + // Constant fee options to translate root.feeOpts = { urgent: gettext('Urgent'), @@ -12,22 +14,26 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP superEconomy: gettext('Super Economy') }; + var cache = { + updateTs: 0, + }; + root.getCurrentFeeLevel = function() { return configService.getSync().wallet.settings.feeLevel || 'normal'; }; - root.getCurrentFeeValue = function(network, customFeeLevel, cb) { - network = network || 'livenet'; - var feeLevel = customFeeLevel || root.getCurrentFeeLevel(); - root.getFeeLevels(function(err, levels) { + root.getFeeRate = function(network, feeLevel, cb) { + network = network || 'livenet'; + + root.getFeeLevels(function(err, levels, fromCache) { if (err) return cb(err); - var feeLevelValue = lodash.find(levels[network], { + var feeLevelRate = lodash.find(levels[network], { level: feeLevel }); - if (!feeLevelValue || !feeLevelValue.feePerKB) { + if (!feeLevelRate || !feeLevelRate.feePerKB) { return cb({ message: gettextCatalog.getString("Could not get dynamic fee for level: {{feeLevel}}", { feeLevel: feeLevel @@ -35,14 +41,24 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP }); } - var fee = feeLevelValue.feePerKB; - $log.debug('Dynamic fee: ' + feeLevel + ' ' + fee + ' SAT'); + var feeRate = feeLevelRate.feePerKB; - return cb(null, fee); + if (!fromCache) $log.debug('Dynamic fee: ' + feeLevel + '/' + network + ' ' + (feeLevelRate.feePerKB / 1000).toFixed() + ' SAT/B'); + + return cb(null, feeRate); }); }; + root.getCurrentFeeRate = function(network, cb) { + return root.getFeeRate(network, root.getCurrentFeeLevel(), cb); + }; + root.getFeeLevels = function(cb) { + + if (cache.updateTs > Date.now() - CACHE_TIME_TS * 1000) { + return cb(null, cache.data, true); + } + var walletClient = bwcService.getClient(); var unitName = configService.getSync().wallet.settings.unitName; @@ -51,13 +67,18 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP if (errLivenet || errTestnet) { return cb(gettextCatalog.getString('Could not get dynamic fee')); } - return cb(null, { + + cache.updateTs = Date.now(); + cache.data = { 'livenet': levelsLivenet, 'testnet': levelsTestnet - }); + }; + + return cb(null, cache.data); }); }); }; + return root; }); diff --git a/src/js/services/glideraService.js b/src/js/services/glideraService.js index ad62d3ef4..1685ad9c7 100644 --- a/src/js/services/glideraService.js +++ b/src/js/services/glideraService.js @@ -4,7 +4,7 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l var root = {}; var credentials = {}; var isCordova = platformInfo.isCordova; - var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; var setCredentials = function() { if (!$window.externalServices || !$window.externalServices.glidera) { diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index 7a2fd1ff9..e0f82fc40 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -3,7 +3,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $timeout, $filter, lodash, $ionicLoading, gettext, platformInfo) { var root = {}; var isCordova = platformInfo.isCordova; - var isWP = platformInfo.isWP; + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; var ongoingProcess = {}; @@ -17,8 +17,8 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'creatingTx': gettext('Creating transaction'), 'creatingWallet': gettext('Creating Wallet...'), 'deletingWallet': gettext('Deleting Wallet...'), - 'extractingWalletInfo': gettext('Extracting Wallet Information...'), - 'fetchingPayPro': gettext('Fetching Payment Information'), + 'extractingWalletInfo': gettext('Extracting Wallet information...'), + 'fetchingPayPro': gettext('Fetching payment information'), 'generatingCSV': gettext('Generating .csv file...'), 'gettingFeeLevels': gettext('Getting fee levels...'), 'importingWallet': gettext('Importing Wallet...'), @@ -45,12 +45,12 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'cancelingGiftCard': 'Canceling Gift Card...', 'creatingGiftCard': 'Creating Gift Card...', 'buyingGiftCard': 'Buying Gift Card...', - 'topup': 'Top up in progress...' + 'topup': gettext('Top up in progress...') }; root.clear = function() { ongoingProcess = {}; - if (isCordova && !isWP) { + if (isCordova && !isWindowsPhoneApp) { window.plugins.spinnerDialog.hide(); } else { $ionicLoading.hide(); @@ -80,19 +80,19 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti if (customHandler) { customHandler(processName, showName, isOn); } else if (root.onGoingProcessName) { - if (isCordova && !isWP) { + if (isCordova && !isWindowsPhoneApp) { window.plugins.spinnerDialog.show(null, showName, root.clear); } else { var tmpl; - if (isWP) tmpl = '
' + showName + '
'; + if (isWindowsPhoneApp) tmpl = '
' + showName + '
'; else tmpl = '
' + showName + '
'; $ionicLoading.show({ template: tmpl }); } } else { - if (isCordova && !isWP) { + if (isCordova && !isWindowsPhoneApp) { window.plugins.spinnerDialog.hide(); } else { $ionicLoading.hide(); diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js index 83ea3180b..566171949 100644 --- a/src/js/services/popupService.js +++ b/src/js/services/popupService.js @@ -3,16 +3,17 @@ angular.module('copayApp.services').service('popupService', function($log, $ionicPopup, platformInfo, gettextCatalog) { var isCordova = platformInfo.isCordova; + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; /*************** Ionic ****************/ - var _ionicAlert = function(title, message, cb, buttonName) { + var _ionicAlert = function(title, message, cb, okText) { if (!cb) cb = function() {}; $ionicPopup.alert({ title: title, subTitle: message, okType: 'button-clear button-positive', - okText: buttonName || gettextCatalog.getString('OK'), + okText: okText || gettextCatalog.getString('OK'), }).then(cb); }; @@ -45,9 +46,11 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni /*************** Cordova ****************/ - var _cordovaAlert = function(title, message, cb, buttonName) { + var _cordovaAlert = function(title, message, cb, okText) { if (!cb) cb = function() {}; - navigator.notification.alert(message, cb, title, buttonName); + title = title ? title : ''; + okText = okText || gettextCatalog.getString('OK'); + navigator.notification.alert(message, cb, title, okText); }; var _cordovaConfirm = function(title, message, okText, cancelText, cb) { @@ -57,6 +60,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni } okText = okText || gettextCatalog.getString('OK'); cancelText = cancelText || gettextCatalog.getString('Cancel'); + title = title ? title : ''; navigator.notification.confirm(message, onConfirm, title, [cancelText, okText]); }; @@ -65,7 +69,10 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni if (results.buttonIndex == 1) return cb(results.input1); else return cb(); } - navigator.notification.prompt(message, onPrompt, title, null, opts.defaultText); + var okText = gettextCatalog.getString('OK'); + var cancelText = gettextCatalog.getString('Cancel'); + title = title ? title : ''; + navigator.notification.prompt(message, onPrompt, title, [cancelText, okText], opts.defaultText); }; /** @@ -76,14 +83,14 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni * @param {Callback} Function (optional) */ - this.showAlert = function(title, msg, cb, buttonName) { + this.showAlert = function(title, msg, cb, okText) { var message = (msg && msg.message) ? msg.message : msg; $log.warn(title ? (title + ': ' + message) : message); if (isCordova) - _cordovaAlert(title, message, cb, buttonName); + _cordovaAlert(title, message, cb, okText); else - _ionicAlert(title, message, cb, buttonName); + _ionicAlert(title, message, cb, okText); }; /** @@ -121,7 +128,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni opts = opts ||  {}; - if (isCordova && !opts.forceHTMLPrompt) + if (isCordova && !isWindowsPhoneApp && !opts.forceHTMLPrompt) _cordovaPrompt(title, message, opts, cb); else _ionicPrompt(title, message, opts, cb); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 8c5a93662..ae44c7b26 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -5,12 +5,12 @@ angular.module('copayApp.services') var isChromeApp = platformInfo.isChromeApp; var isCordova = platformInfo.isCordova; - var isWP = platformInfo.isWP; + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; var isIOS = platformInfo.isIOS; var root = {}; var errors = bwcService.getErrors(); - var usePushNotifications = isCordova && !isWP; + var usePushNotifications = isCordova && !isWindowsPhoneApp; var UPDATE_PERIOD = 15; @@ -208,9 +208,9 @@ angular.module('copayApp.services') }; var shouldSkipValidation = function(walletId) { - return root.profile.isChecked(platformInfo.ua, walletId) || isIOS || isWP; - } - // Used when reading wallets from the profile + return root.profile.isChecked(platformInfo.ua, walletId) || isIOS || isWindowsPhoneApp; + } + // Used when reading wallets from the profile root.bindWallet = function(credentials, cb) { if (!credentials.walletId || !credentials.m) return cb('bindWallet should receive credentials JSON'); diff --git a/src/js/services/scannerService.js b/src/js/services/scannerService.js index 0c3f28916..ddf62895d 100644 --- a/src/js/services/scannerService.js +++ b/src/js/services/scannerService.js @@ -17,27 +17,27 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti var canChangeCamera = false; var canOpenSettings = false; - function _checkCapabilities(status){ + function _checkCapabilities(status) { $log.debug('scannerService is reviewing platform capabilities...'); // Permission can be assumed on the desktop builds - hasPermission = (isDesktop || status.authorized)? true: false; - isDenied = status.denied? true : false; - isRestricted = status.restricted? true : false; - canEnableLight = status.canEnableLight? true : false; - canChangeCamera = status.canChangeCamera? true : false; - canOpenSettings = status.canOpenSettings? true : false; + hasPermission = (isDesktop || status.authorized) ? true : false; + isDenied = status.denied ? true : false; + isRestricted = status.restricted ? true : false; + canEnableLight = status.canEnableLight ? true : false; + canChangeCamera = status.canChangeCamera ? true : false; + canOpenSettings = status.canOpenSettings ? true : false; _logCapabilities(); } - function _logCapabilities(){ - function _orIsNot(bool){ - return bool? '' : 'not '; + function _logCapabilities() { + function _orIsNot(bool) { + return bool ? '' : 'not '; } $log.debug('A camera is ' + _orIsNot(isAvailable) + 'available to this app.'); var access = 'not authorized'; - if(hasPermission) access = 'authorized'; - if(isDenied) access = 'denied'; - if(isRestricted) access = 'restricted'; + if (hasPermission) access = 'authorized'; + if (isDenied) access = 'denied'; + if (isRestricted) access = 'restricted'; $log.debug('Camera access is ' + access + '.'); $log.debug('Support for opening device settings is ' + _orIsNot(canOpenSettings) + 'available on this platform.'); $log.debug('A light is ' + _orIsNot(canEnableLight) + 'available on this platform.'); @@ -47,7 +47,7 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti /** * Immediately return known capabilities of the current platform. */ - this.getCapabilities = function(){ + this.getCapabilities = function() { return { isAvailable: isAvailable, hasPermission: hasPermission, @@ -68,18 +68,18 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti * The `status` of QRScanner is returned to the callback. */ this.gentleInitialize = function(callback) { - if(initializeStarted && !isDesktop){ - QRScanner.getStatus(function(status){ + if (initializeStarted && !isDesktop) { + QRScanner.getStatus(function(status) { _completeInitialization(status, callback); }); return; } initializeStarted = true; $log.debug('Trying to pre-initialize QRScanner.'); - if(!isDesktop){ - QRScanner.getStatus(function(status){ + if (!isDesktop) { + QRScanner.getStatus(function(status) { _checkCapabilities(status); - if(status.authorized){ + if (status.authorized) { $log.debug('Camera permission already granted.'); initialize(callback); } else { @@ -92,14 +92,14 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti } }; - function initialize(callback){ + function initialize(callback) { $log.debug('Initializing scanner...'); - QRScanner.prepare(function(err, status){ - if(err){ + QRScanner.prepare(function(err, status) { + if (err) { isAvailable = false; $log.error(err); // does not return `status` if there is an error - QRScanner.getStatus(function(status){ + QRScanner.getStatus(function(status) { _completeInitialization(status, callback); }); } else { @@ -112,18 +112,19 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti // This could be much cleaner with a Promise API // (needs a polyfill for some platforms) var initializeCompleted = false; - function _completeInitialization(status, callback){ + + function _completeInitialization(status, callback) { _checkCapabilities(status); initializeCompleted = true; $rootScope.$emit('scannerServiceInitialized'); - if(typeof callback === "function"){ + if (typeof callback === "function") { callback(status); } } - this.isInitialized = function(){ + this.isInitialized = function() { return initializeCompleted; }; - this.initializeStarted = function(){ + this.initializeStarted = function() { return initializeStarted; }; @@ -140,21 +141,21 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti */ this.activate = function(callback) { $log.debug('Activating scanner...'); - QRScanner.show(function(status){ - initializeCompleted = true; - _checkCapabilities(status); - if(typeof callback === "function"){ - callback(status); - } - }); - if(nextHide !== null){ - $timeout.cancel(nextHide); - nextHide = null; - } - if(nextDestroy !== null){ - $timeout.cancel(nextDestroy); - nextDestroy = null; + QRScanner.show(function(status) { + initializeCompleted = true; + _checkCapabilities(status); + if (typeof callback === "function") { + callback(status); } + }); + if (nextHide !== null) { + $timeout.cancel(nextHide); + nextHide = null; + } + if (nextDestroy !== null) { + $timeout.cancel(nextDestroy); + nextDestroy = null; + } }; /** @@ -193,18 +194,18 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti // Natively hide the QRScanner's preview // On mobile platforms, this can reduce GPU/power usage // On desktop, this fully turns off the camera (and any associated privacy lights) - function _hide(){ + function _hide() { $log.debug('Scanner not in use for ' + hideAfterSeconds + ' seconds, hiding...'); QRScanner.hide(); } // Reduce QRScanner power/processing consumption by the maximum amount - function _destroy(){ + function _destroy() { $log.debug('Scanner not in use for ' + destroyAfterSeconds + ' seconds, destroying...'); QRScanner.destroy(); } - this.reinitialize = function(callback){ + this.reinitialize = function(callback) { initializeCompleted = false; QRScanner.destroy(); initialize(callback); @@ -217,17 +218,18 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti */ this.toggleLight = function(callback) { $log.debug('Toggling light...'); - if(lightEnabled){ + if (lightEnabled) { QRScanner.disableLight(_handleResponse); } else { QRScanner.enableLight(_handleResponse); } - function _handleResponse(err, status){ - if(err){ + + function _handleResponse(err, status) { + if (err) { $log.error(err); } else { lightEnabled = status.lightEnabled; - var state = lightEnabled? 'enabled' : 'disabled'; + var state = lightEnabled ? 'enabled' : 'disabled'; $log.debug('Light ' + state + '.'); } callback(lightEnabled); @@ -241,16 +243,17 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti * is complete. */ this.toggleCamera = function(callback) { - var nextCamera = backCamera? 1 : 0; - function cameraToString(index){ - return index === 1? 'front' : 'back'; // front = 1, back = 0 + var nextCamera = backCamera ? 1 : 0; + + function cameraToString(index) { + return index === 1 ? 'front' : 'back'; // front = 1, back = 0 } $log.debug('Toggling to the ' + cameraToString(nextCamera) + ' camera...'); - QRScanner.useCamera(nextCamera, function(err, status){ - if(err){ + QRScanner.useCamera(nextCamera, function(err, status) { + if (err) { $log.error(err); } - backCamera = status.currentCamera === 1? false : true; + backCamera = status.currentCamera === 1 ? false : true; $log.debug('Camera toggled. Now using the ' + cameraToString(backCamera) + ' camera.'); callback(status); }); @@ -260,4 +263,15 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti $log.debug('Attempting to open device settings...'); QRScanner.openSettings(); }; + + this.useOldScanner = function(callback) { + cordova.plugins.barcodeScanner.scan( + function(result) { + callback(null, result.text); + }, + function(error) { + callback(error); + } + ); + } }); diff --git a/src/js/services/sendMax.js b/src/js/services/sendMax.js index fa716e260..a9c238a1e 100644 --- a/src/js/services/sendMax.js +++ b/src/js/services/sendMax.js @@ -10,7 +10,7 @@ angular.module('copayApp.services').service('sendMaxService', function(feeServic * */ this.getInfo = function(wallet, cb) { - feeService.getCurrentFeeValue(wallet.credentials.network, null, function(err, feePerKb) { + feeService.getCurrentFeeRate(wallet.credentials.network, function(err, feePerKb) { if (err) return cb(err); var config = configService.getSync().wallet; diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js index 7524bb548..0df46fe86 100644 --- a/src/js/services/txFormatService.js +++ b/src/js/services/txFormatService.js @@ -23,6 +23,26 @@ angular.module('copayApp.services').factory('txFormatService', function($filter, return root.formatAmount(satoshis) + ' ' + config.unitName; }; + root.toFiat = function(satoshis, code, cb) { + if (isNaN(satoshis)) return; + var val = function() { + var v1 = rateService.toFiat(satoshis, code); + if (!v1) return null; + + return v1.toFixed(2); + }; + + // Async version + if (cb) { + rateService.whenAvailable(function() { + return cb(val()); + }); + } else { + if (!rateService.isAvailable()) return null; + return val(); + }; + }; + root.formatToUSD = function(satoshis, cb) { if (isNaN(satoshis)) return; var val = function() { @@ -93,6 +113,11 @@ angular.module('copayApp.services').factory('txFormatService', function($filter, tx.alternativeAmountStr = root.formatAlternativeStr(tx.amount); tx.feeStr = root.formatAmountStr(tx.fee || tx.fees); + if (tx.amountStr) { + tx.amountValueStr = tx.amountStr.split(' ')[0]; + tx.amountUnitStr = tx.amountStr.split(' ')[1]; + } + return tx; }; @@ -164,9 +189,15 @@ angular.module('copayApp.services').factory('txFormatService', function($filter, var alternativeIsoCode = config.alternativeIsoCode; // If fiat currency - if (currency != 'bits' && currency != 'BTC') { + if (currency != 'bits' && currency != 'BTC' && currency != 'sat') { amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency; amountSat = rateService.fromFiat(amount, currency).toFixed(0); + } else if (currency == 'sat') { + amountSat = amount; + amountUnitStr = root.formatAmountStr(amountSat); + // convert sat to BTC + amount = (amountSat * satToBtc).toFixed(8); + currency = 'BTC'; } else { amountSat = parseInt((amount * unitToSatoshi).toFixed(0)); amountUnitStr = root.formatAmountStr(amountSat); @@ -176,8 +207,8 @@ angular.module('copayApp.services').factory('txFormatService', function($filter, } return { - amount: amount, - currency: currency, + amount: amount, + currency: currency, alternativeIsoCode: alternativeIsoCode, amountSat: amountSat, amountUnitStr: amountUnitStr diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index a9d45f3ff..5414da09c 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -1,7 +1,12 @@ 'use strict'; angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, intelTEE, storageService, configService, rateService, uxLanguage, $filter, gettextCatalog, bwcError, $ionicPopup, fingerprintService, ongoingProcess, gettext, $rootScope, txFormatService, $ionicModal, $state, bwcService, bitcore, popupService) { - // `wallet` is a decorated version of client. + + // Ratio low amount warning (fee/amount) in incoming TX + var LOW_AMOUNT_RATIO = 0.15; + + // Ratio of "many utxos" warning in total balance (fee/amount) + var TOTAL_LOW_WARNING_RATIO = .3; var root = {}; @@ -401,6 +406,11 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim var progressFn = opts.progressFn || function() {}; var foundLimitTx = false; + + if (opts.feeLevels) { + opts.lowAmount = root.getLowAmount(wallet, opts.feeLevels); + } + var fixTxsUnit = function(txs) { if (!txs || !txs[0] || !txs[0].amountStr) return; @@ -413,7 +423,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim $log.debug('Fixing Tx Cache Unit to:' + name) lodash.each(txs, function(tx) { - tx.amountStr = txFormatService.formatAmount(tx.amount) + name; tx.feeStr = txFormatService.formatAmount(tx.fees) + name; }); @@ -511,6 +520,16 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); } + function updateLowAmount(txs) { + if (!opts.lowAmount) return; + + lodash.each(txs, function(tx) { + tx.lowAmount = tx.amount < opts.lowAmount; + }); + }; + + updateLowAmount(txs); + updateNotes(function() { // @@ -567,9 +586,9 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim root.getTx = function(wallet, txid, cb) { - function finish(list){ + function finish(list) { var tx = lodash.find(list, { - txid: txid + txid: txid }); if (!tx) return cb('Could not get transaction'); @@ -602,7 +621,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; - + root.getTxHistory = function(wallet, opts, cb) { opts = opts || {}; @@ -873,6 +892,81 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; + + // These 2 functions were taken from + // https://github.com/bitpay/bitcore-wallet-service/blob/master/lib/model/txproposal.js#L243 + + function getEstimatedSizeForSingleInput(wallet) { + switch (wallet.credentials.addressType) { + case 'P2PKH': + return 147; + default: + case 'P2SH': + return wallet.m * 72 + wallet.n * 36 + 44; + } + }; + + + root.getEstimatedTxSize = function(wallet, nbOutputs) { + // Note: found empirically based on all multisig P2SH inputs and within m & n allowed limits. + var safetyMargin = 0.02; + + var overhead = 4 + 4 + 9 + 9; + var inputSize = getEstimatedSizeForSingleInput(wallet); + var outputSize = 34; + var nbInputs = 1; //Assume 1 input + var nbOutputs = nbOutputs || 2; // Assume 2 outputs + + var size = overhead + inputSize * nbInputs + outputSize * nbOutputs; + return parseInt((size * (1 + safetyMargin)).toFixed(0)); + }; + + + // Approx utxo amount, from which the uxto is economically redeemable + root.getMinFee = function(wallet, feeLevels, nbOutputs) { + var lowLevelRate = (lodash.find(feeLevels[wallet.network], { + level: 'normal', + }).feePerKB / 1000).toFixed(0); + + var size = root.getEstimatedTxSize(wallet, nbOutputs); + return size * lowLevelRate; + }; + + + // Approx utxo amount, from which the uxto is economically redeemable + root.getLowAmount = function(wallet, feeLevels, nbOutputs) { + var minFee = root.getMinFee(wallet,feeLevels, nbOutputs); + return parseInt( minFee / LOW_AMOUNT_RATIO); + }; + + + + root.getLowUtxos = function(wallet, levels, cb) { + + wallet.getUtxos({}, function(err, resp) { + if (err || !resp || !resp.length) return cb(); + + var minFee = root.getMinFee(wallet, levels, resp.length); + + var balance = lodash.sum(resp, 'satoshis'); + + // for 2 outputs + var lowAmount = root.getLowAmount(wallet, levels); + var lowUtxos = lodash.filter(resp, function(x) { + return x.satoshis < lowAmount; + }); + + var totalLow = lodash.sum(lowUtxos, 'satoshis'); + + return cb(err, { + allUtxos: resp || [], + lowUtxos: lowUtxos || [], + warning: minFee / balance > TOTAL_LOW_WARNING_RATIO, + minFee: minFee, + }); + }); + }; + root.getAddress = function(wallet, forceNew, cb) { storageService.getLastAddress(wallet.id, function(err, addr) { if (err) return cb(err); diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index d49fc3821..c05bd8497 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -11,7 +11,7 @@ font-size: 14px; font-weight: 300; color: #727272; - padding: 2px 1rem; + padding: 1rem; background: #f8f8f9; i { position: absolute; @@ -52,8 +52,8 @@ width: 35px; } - span { - text-transform: capitalize; + .big-icon-svg { + padding: 0 12px 0 0; } } .amount-label{ @@ -101,6 +101,9 @@ color: $v-bitcoin-orange; } } + .total { + font-weight: bold; + } } .tx-icon { margin-right: 25px; diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 8adc61672..9ceee92c4 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -5,6 +5,10 @@ float: none; .fee-rate { display: inline-block; + .warn { + color: red; + } + } } .icon-amazon { diff --git a/src/sass/views/includes/clickToAccept.scss b/src/sass/views/includes/clickToAccept.scss index 3d8b96ada..a38455ac3 100644 --- a/src/sass/views/includes/clickToAccept.scss +++ b/src/sass/views/includes/clickToAccept.scss @@ -24,7 +24,6 @@ click-to-accept { height: 100%; width: 100%; z-index: 4; - text-transform: capitalize; -webkit-transform: translateY(2rem); transform: translateY(2rem); opacity: 0; diff --git a/src/sass/views/includes/slideToAccept.scss b/src/sass/views/includes/slideToAccept.scss index 97c307931..75502c6a8 100644 --- a/src/sass/views/includes/slideToAccept.scss +++ b/src/sass/views/includes/slideToAccept.scss @@ -95,7 +95,6 @@ slide-to-accept { width: 100%; font-size: 17px; letter-spacing: 0.02rem; - text-transform: capitalize; -webkit-transform: translateY(2rem); transform: translateY(2rem); opacity: 0; diff --git a/src/sass/views/includes/slideToAcceptSuccess.scss b/src/sass/views/includes/slideToAcceptSuccess.scss index faeefc7c9..bf6c5e269 100644 --- a/src/sass/views/includes/slideToAcceptSuccess.scss +++ b/src/sass/views/includes/slideToAcceptSuccess.scss @@ -12,6 +12,12 @@ slide-to-accept-success { .slide-success { $duration: 400ms; + &__windows-background { + background: $v-success-bg-color; + height: 100%; + width: 100%; + position: fixed; + } &__background { $start-radius: 5; $scale-factor: 20; diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index d08087180..8d21570f4 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -5,7 +5,12 @@ $item-vertical-padding: 10px; $item-border-color: #EFEFEF; $item-label-color: #6C6C6E; - + .item-note { + float: none; + .fee-rate { + display: inline-block; + } + } .list { background: #f5f5f5; } @@ -27,10 +32,6 @@ height: 35px; width: 35px; } - - span { - text-transform: capitalize; - } } .amount-label{ line-height: 30px; @@ -93,7 +94,7 @@ &.low-fees { display: flex; font-size: 14px; - color: #aaa; + color: #777; align-items: center; i { padding-right: 20px; @@ -107,7 +108,7 @@ margin-top: 5px; font-size: 14px; color: $item-label-color; - } + } .item-divider { padding-top: 1.2rem; color: $item-label-color; diff --git a/src/sass/views/integrations/amazon.scss b/src/sass/views/integrations/amazon.scss index e56535c77..0139f8784 100644 --- a/src/sass/views/integrations/amazon.scss +++ b/src/sass/views/integrations/amazon.scss @@ -11,7 +11,7 @@ stroke: black; fill: black; } - + .add-bottom-for-cta { bottom: 92px; } @@ -31,10 +31,6 @@ width: 35px; } - span { - text-transform: capitalize; - } - .big-icon-svg { margin-right: 0.6rem; } @@ -80,7 +76,7 @@ color: $item-label-color; margin-bottom: 8px; } - + .capitalized { text-transform: capitalize; } diff --git a/src/sass/views/integrations/coinbase.scss b/src/sass/views/integrations/coinbase.scss index d002aef37..e8ddfde2d 100644 --- a/src/sass/views/integrations/coinbase.scss +++ b/src/sass/views/integrations/coinbase.scss @@ -28,10 +28,6 @@ height: 35px; width: 35px; } - - span { - text-transform: capitalize; - } } .amount-label{ line-height: 30px; diff --git a/src/sass/views/integrations/glidera.scss b/src/sass/views/integrations/glidera.scss index d73c8fc62..c771e3099 100644 --- a/src/sass/views/integrations/glidera.scss +++ b/src/sass/views/integrations/glidera.scss @@ -28,10 +28,6 @@ height: 35px; width: 35px; } - - span { - text-transform: capitalize; - } } .amount-label{ line-height: 30px; diff --git a/src/sass/views/starting.scss b/src/sass/views/starting.scss index a410a8575..de24083f9 100644 --- a/src/sass/views/starting.scss +++ b/src/sass/views/starting.scss @@ -18,4 +18,7 @@ vertical-align: middle; text-align: center; } + .block-spinner { + display: block; + } } diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 3ee4846f4..9553bf489 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -85,7 +85,7 @@ font-size: 14px; font-weight: 300; color: #727272; - padding: 2px 1rem; + padding: 1rem; background: #f8f8f9; } } @@ -248,6 +248,7 @@ text-decoration: none; z-index: 9999; position: relative; + padding: 2px 5px; } a.item { diff --git a/www/views/activity.html b/www/views/activity.html index 3d9f94d84..360246855 100644 --- a/www/views/activity.html +++ b/www/views/activity.html @@ -1,4 +1,4 @@ - + {{'Recent Transactions'|translate}} diff --git a/www/views/add.html b/www/views/add.html index 6721477bd..23651096d 100644 --- a/www/views/add.html +++ b/www/views/add.html @@ -1,4 +1,4 @@ - + {{'Add wallet' | translate}} diff --git a/www/views/addresses.html b/www/views/addresses.html index 5e8ef5b32..d21d7ce74 100644 --- a/www/views/addresses.html +++ b/www/views/addresses.html @@ -1,4 +1,4 @@ - + {{'Wallet Addresses' | translate}} @@ -33,9 +33,9 @@
View All Addresses -
+ -
+
Unused Addresses
@@ -70,6 +70,34 @@
{{w.balanceStr}}
+ + +
+
+ Wallet Inputs +
+ +
+ Total wallet inputs +
+ {{allUtxosNb}} [{{allUtxosSum}}] +
+
+
+ Low amount inputs +
+ {{lowUtxosNb}} [{{ lowUtxosSum }}] +
+
+ +
+ Approximate Bitcoin network fee to transfer wallet's balance (with normal priority) +
+ {{minFeePer}} [{{minFee}}] +
+
+ +
diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html index 7181505f8..68f1f58a5 100644 --- a/www/views/advancedSettings.html +++ b/www/views/advancedSettings.html @@ -1,4 +1,4 @@ - + {{'Advanced Settings' | translate}} @@ -16,7 +16,7 @@
- + Recent Transaction Card
@@ -25,7 +25,7 @@
- + Hide Next Steps Card
diff --git a/www/views/allAddresses.html b/www/views/allAddresses.html index 4e1768eab..d54c0710d 100644 --- a/www/views/allAddresses.html +++ b/www/views/allAddresses.html @@ -1,4 +1,4 @@ - + {{'All Addresses' | translate}} diff --git a/www/views/amazon.html b/www/views/amazon.html index e71519529..21ed894c4 100644 --- a/www/views/amazon.html +++ b/www/views/amazon.html @@ -1,4 +1,4 @@ - + diff --git a/www/views/amazonCards.html b/www/views/amazonCards.html index 03a989e06..eeb6560b1 100644 --- a/www/views/amazonCards.html +++ b/www/views/amazonCards.html @@ -1,4 +1,4 @@ - + @@ -16,7 +16,7 @@

{{item.amount | currency : '$ ' : 2}} {{item.currency}} -

+

Error Expired diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index 91c85b482..c81eb6e54 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -1,4 +1,4 @@ - + @@ -48,7 +48,7 @@

Get started

- Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide. + Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide.
@@ -64,8 +64,8 @@